From 5776f4f5be2d5aa37a1e928ba95567dfc2e97d5c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 12 七月 2024 15:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/app.json |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index ebd3ce0..05c3a27 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -12,21 +12,22 @@
     "pages/store/staff",
     "pages/store/staffList",
     "pages/calculator/index",
-    "pages/webView/index"
+    "pages/webView/index",
+    "pages/detailDis/product",
+    "pages/detailDis/case",
+    "pages/detailDis/realpic",
+    "pages/userinfo/index",
+    "pages/userinfo/mysub",
+    "pages/userinfo/collect",
+    "pages/userinfo/favorite",
+    "pages/sets/index",
+    "pages/sets/protocol"
   ],
   "window": {
     "navigationBarTitleText": "蹇楅偊瀹堕��",
     "navigationBarTextStyle": "black",
-    "navigationBarBackgroundColor": "#fff"
-  },
-  "renderer": "skyline",
-  "rendererOptions": {
-    "skyline": {
-      "defaultDisplayBlock": true,
-      "disableABTest": true,
-      "sdkVersionBegin": "3.0.0",
-      "sdkVersionEnd": "15.255.255"
-    }
+    "navigationBarBackgroundColor": "#fff",
+    "navigationStyle": "default"
   },
   "tabBar": {
     "color": "#999",
@@ -65,6 +66,10 @@
     "van-empty": "@vant/weapp/empty/index",
     "navBar": "./components/navBar/navBar"
   },
+  "requiredPrivateInfos": [
+    "getLocation",
+    "chooseLocation"
+  ],
   "permission": {
     "scope.userLocation": {
       "desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"

--
Gitblit v1.9.3