From c0cb31a27522f2b480d7f98784eef37c2fb75f2d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 30 七月 2024 09:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_jiaxuan/app.json |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wechat_jiaxuan/app.json b/wechat_jiaxuan/app.json
index c37523e..d2f1198 100644
--- a/wechat_jiaxuan/app.json
+++ b/wechat_jiaxuan/app.json
@@ -16,6 +16,7 @@
     "pages/productVideo/index",
     "pages/homeId/index",
     "pages/kefu/index",
+    "pages/kefu/service",
     "pages/detailDis/product",
     "pages/detailDis/case",
     "pages/detailDis/realpic",
@@ -24,11 +25,13 @@
     "pages/userinfo/collect",
     "pages/userinfo/favorite",
     "pages/sets/index",
-    "pages/sets/protocol"
+    "pages/sets/protocol",
+    "pages/richText/index"
   ],
   "window": {
     "navigationBarTitleText": "蹇楅偊瀹堕��",
     "navigationBarTextStyle": "black",
+    "backgroundTextStyle": "dark",
     "navigationBarBackgroundColor": "#fff",
     "navigationStyle": "default"
   },
@@ -52,7 +55,7 @@
         "pagePath": "pages/consult/consult",
         "iconPath": "static/tabbar/nav_mendian.png",
         "selectedIconPath": "static/tabbar/nav_mendianAc.png",
-        "text": "鍜ㄨ"
+        "text": "璧勮"
       },
       {
         "pagePath": "pages/mine/mine",
@@ -71,12 +74,14 @@
   },
   "requiredPrivateInfos": [
     "getLocation",
-    "chooseLocation",
-    "getFuzzyLocation"
+    "chooseLocation"
   ],
   "permission": {
     "scope.userLocation": {
       "desc": "浣犵殑浣嶇疆淇℃伅灏嗙敤浜庡皬绋嬪簭浣嶇疆鎺ュ彛鐨勬晥鏋滃睍绀�"
+    },
+    "scope.userInfo": {
+      "desc": "浣犵殑寰俊鍛㈢О灏嗙敤浜庡皬绋嬪簭鍛㈢О鐨勬晥鏋滃睍绀�"
     }
   },
   "componentFramework": "glass-easel",

--
Gitblit v1.9.3