From e9a7cddce776382916e975402986144a88899ac5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 14 五月 2026 18:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json | 6 ++----
1 files changed, 2 insertions(+), 4 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 9c4cee4..2d80f88 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,11 +1,9 @@
{
-<<<<<<< HEAD
"navigationBarTitleText": "闂ㄥ簵閽卞寘",
"navigationStyle": "custom",
"usingComponents": {
+ "u-icon": "/node-modules/uview-ui/components/u-icon/u-icon",
+ "u-popup": "/node-modules/uview-ui/components/u-popup/u-popup",
"custom-tabbar": "/components/custom-tabbar/custom-tabbar"
}
-=======
- "navigationBarTitleText": "闂ㄥ簵閽卞寘"
->>>>>>> 50573d8f1149d7020c38afb695116cb2953a3d43
}
\ No newline at end of file
--
Gitblit v1.9.3