From c4657cb86940a12f867fb68607e0a63c87acb2b3 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 30 Apr 2020 10:47:42 +0800
Subject: [PATCH] 1.   要有门店的跳转 2.  首页如果是自定义模板，就要用默认的

---
 app.json                     | 12 ++++++++----
 pages/index/index/index.js   |  4 ++++
 pages/index/index/index.json |  3 +--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app.json b/app.json
index a4cc7fe..eb0793a 100644
--- a/app.json
+++ b/app.json
@@ -1,5 +1,5 @@
 {
-  "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": {
diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 4706a81..a708ce8 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -122,6 +122,10 @@ Page({
 	  });
     } else {
       await this.init_fir();
+      wx.setNavigationBarColor({
+        frontColor: '#ffffff', // 必写项
+        backgroundColor: '#ff7295', // 必写项
+      })
     }
 
     //--正再拼团中的处理--
diff --git a/pages/index/index/index.json b/pages/index/index/index.json
index 4fc1363..3a921ec 100644
--- a/pages/index/index/index.json
+++ b/pages/index/index/index.json
@@ -1,6 +1,5 @@
 {
-    "navigationBarBackgroundColor": "#ff7295",
-    "navigationBarTextStyle": "white",
+     
     "usingComponents": {
         "goods_recommend":"/components/goods_list/goods_list",
         "nav": "/components/diy_nav/diy_nav",
--
libgit2 0.21.4