From 3ac7e9b2893de7c11fa7160ab8f4d5fab0fe7957 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 21 四月 2026 20:28:10 +0800
Subject: [PATCH] 门店
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json
index 0179247..9c4cee4 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json
+++ b/small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json
@@ -1,7 +1,11 @@
{
+<<<<<<< HEAD
"navigationBarTitleText": "闂ㄥ簵閽卞寘",
"navigationStyle": "custom",
"usingComponents": {
"custom-tabbar": "/components/custom-tabbar/custom-tabbar"
}
+=======
+ "navigationBarTitleText": "闂ㄥ簵閽卞寘"
+>>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}
\ No newline at end of file
--
Gitblit v1.9.3