Merge branch 'dev' into 'test'

Dev See merge request !397

Merge branch 'dev' into 'test'
Dev See merge request !397
后端研发-苏明海
2 parents 994853fe 8d52ee9d
Showing 3 changed files with 13 additions and 6 deletions
app.json
pages/index/index/index.js
pages/index/index/index.json
 {
-  "pages": [ 
+  "pages": [ 	  
     "pages/index/index/index",    
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
@@ -83,9 +83,13 @@
     "pages/user/assistance/assistance_success",
     "pages/user/assistance/assistance",
     "pages/video/index",
-    "pages/template/index" 
-
+    "pages/template/index",
+    "pages/store/index"
+    
   ],   
+  
+ 
+  
   "permission": {
     "scope.userLocation": {
       "desc": "获取你的位置信息"
@@ -96,7 +100,7 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "加载中...",
     "navigationBarBackgroundColor": "#ffffff",
-    "backgroundColor": "#eeeeee",
+    "backgroundColor": "#ffffff",
     "enablePullDownRefresh": true
   },
   "tabBar": {
@@ -122,6 +122,10 @@ Page({
 	  });
     } else {
       await this.init_fir();
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff', // 必写项
+        backgroundColor: '#ff7295', // 必写项
+      })
     }
     //--正再拼团中的处理--
 {
-    "navigationBarBackgroundColor": "#ff7295",
-    "navigationBarTextStyle": "white",
+     
     "usingComponents": {
         "goods_recommend":"/components/goods_list/goods_list",
         "nav": "/components/diy_nav/diy_nav",