From 1e4b7107d1eb58c0c209ae838930c15f6619c119 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 09:24:36 +0800
Subject: [PATCH] 代码提交
---
small-program/unpackage/dist/dev/mp-weixin/shop/pages/wallet/wallet.json | 8 ++++++++
1 files changed, 8 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 f001b90..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,3 +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