lhl 2 years ago
parent
commit
ba1495b946

+ 17 - 1
App.vue

@@ -1,4 +1,7 @@
-<script>
+<script>
+	import {
+		getUpApp
+	} from './utils/upApp.js';
 	import {
 		checkLogin
 	} from './libs/login';
@@ -375,6 +378,19 @@
 			// 		}).catch(err => {
 			// 		})
 			// }
+			// #endif
+			
+			// #ifdef APP-PLUS
+			// 判断是否升级
+			getUpApp();
+			// 获取当前运行系统
+			let system = uni.getStorageSync('platform') || '';
+			if (!system) {
+				uni.setStorage({
+					key: 'platform',
+					data: uni.getSystemInfoSync().platform
+				});
+			}
 			// #endif
 		},
 		mounted() {

+ 1 - 1
androidPrivacy.json

@@ -25,4 +25,4 @@
             "color" : "#ccc"
         }
     }
-}
+}

+ 33 - 15
components/payment/index.vue

@@ -4,21 +4,39 @@
 		<view class="payment" :class="pay_close ? 'on' : ''">
 			<view class="title acea-row row-center-wrapper">
 				选择付款方式<text class="iconfont icon-guanbi" @click='close'></text>
-			</view>
-			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
-				v-if='item.payStatus' @click="payType(item.number || 0 , item.value,index)">
-				<view class="left acea-row row-between-wrapper">
-					<view class="iconfont" :class="item.icon"></view>
-					<view class="text">
-						<view class="name">{{item.name}}</view>
-						<view class="info" v-if="item.value == 'yue'">
-							{{item.title}} <span class="money">¥{{ item.number }}</span>
-						</view>
-						<view class="info" v-else>{{item.title}}</view>
-					</view>
-				</view>
-				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
-			</view>
+			</view>
+			<!-- #ifndef APP-PLUS -->
+			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
+				v-if='item.payStatus' @click="payType(item.number || 0 , item.value,index)">
+				<view class="left acea-row row-between-wrapper">
+					<view class="iconfont" :class="item.icon"></view>
+					<view class="text">
+						<view class="name">{{item.name}}</view>
+						<view class="info" v-if="item.value == 'yue'">
+							{{item.title}} <span class="money">¥{{ item.number }}</span>
+						</view>
+						<view class="info" v-else>{{item.title}}</view>
+					</view>
+				</view>
+				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS -->
+			<view class="item acea-row row-between-wrapper" v-for="(item,index) in payMode" :key="index"
+				v-if='item.payStatus && item.name != "微信支付"' @click="payType(item.number || 0 , item.value,index)">
+				<view class="left acea-row row-between-wrapper">
+					<view class="iconfont" :class="item.icon"></view>
+					<view class="text">
+						<view class="name">{{item.name}}</view>
+						<view class="info" v-if="item.value == 'yue'">
+							{{item.title}} <span class="money">¥{{ item.number }}</span>
+						</view>
+						<view class="info" v-else>{{item.title}}</view>
+					</view>
+				</view>
+				<view class="iconfont" :class="active==index?'icon-xuanzhong11 font-num':'icon-weixuan'"></view>
+			</view>
+			<!-- #endif -->
 			<view class="payMoney">支付<span class="font-color">¥<span class="money">{{totalPrice}}</span></span></view>
 			<view class="button bg-color acea-row row-center-wrapper" @click='goPay(number, paytype)'>去付款</view>
 			<slot name="buttom"></slot>

+ 23 - 20
libs/login.js

@@ -67,27 +67,30 @@ function _toLogin(push, pathLogin) {
 	if (!pathLogin)
 		pathLogin = '/page/users/login/index'
 	Cache.set('login_back_url', path);
-	// #ifdef H5
-	if (isWeixin()) {
-		let urlData = location.pathname + location.search
-		if (urlData.indexOf('?') !== -1) {
-			urlData += '&go_longin=1';
-		} else {
-			urlData += '?go_longin=1';
-		}
-		if (!Cache.has('snsapiKey')) {
-			auth.oAuth('snsapi_base', urlData);
-		} else {
-			uni.navigateTo({
-				url: '/pages/users/wechat_login/index',
-			});
-		}
-
-	} else {
-		uni.navigateTo({
-			url: '/pages/users/login/index'
+	// #ifdef H5
+		uni.navigateTo({
+			url: '/pages/users/login/index'
 		})
-	}
+	// if (isWeixin()) {
+	// 	let urlData = location.pathname + location.search
+	// 	if (urlData.indexOf('?') !== -1) {
+	// 		urlData += '&go_longin=1';
+	// 	} else {
+	// 		urlData += '?go_longin=1';
+	// 	}
+	// 	if (!Cache.has('snsapiKey')) {
+	// 		auth.oAuth('snsapi_base', urlData);
+	// 	} else {
+	// 		uni.navigateTo({
+	// 			url: '/pages/users/wechat_login/index',
+	// 		});
+	// 	}
+
+	// } else {
+	// 	uni.navigateTo({
+	// 		url: '/pages/users/login/index'
+	// 	})
+	// }
 	// #endif
 
 	// #ifdef MP 

+ 13 - 21
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易博优购",
     "appid" : "__UNI__331F6F8",
     "description" : "易博优购",
-    "versionName" : "2.1.1",
-    "versionCode" : 211,
+    "versionName" : "1.4.4",
+    "versionCode" : 144,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -22,12 +22,11 @@
         },
         /* 模块配置 */
         "modules" : {
+            "Maps" : {},
+            "Geolocation" : {},
             "VideoPlayer" : {},
-            "OAuth" : {},
             "Payment" : {},
-            "Maps" : {},
-            "LivePusher" : {},
-            "Geolocation" : {}
+            "Share" : {}
         },
         "safearea" : {
             "bottom" : {
@@ -39,24 +38,19 @@
             /* android打包配置 */
             "android" : {
                 "permissions" : [
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
                     "<uses-permission android:name=\"android.permission.CAPTURE_AUDIO_OUTPUT\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-permission android:name=\"android.permission.INTERNET\"/>",
                     "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
@@ -93,22 +87,16 @@
             /* SDK配置 */
             "sdkConfigs" : {
                 "payment" : {
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxe86bd3a95cfa66c3",
-                        "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
-                    },
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
                     }
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx69a5bfe28c8b39e6",
+                        "appid" : "wxe86bd3a95cfa66c3",
                         "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
                     }
                 },
-                "push" : {},
                 "maps" : {
                     "amap" : {
                         "appkey_ios" : "aeb768547b9d752891e37e1ca0a2b66d",
@@ -118,7 +106,6 @@
                 "oauth" : {
                     "weixin" : {
                         "appid" : "wxe86bd3a95cfa66c3",
-                        "appsecret" : "",
                         "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
                     },
                     "apple" : {}
@@ -133,8 +120,13 @@
                 }
             },
             "splashscreen" : {
-                "androidStyle" : "common",
-                "useOriginalMsgbox" : true
+                "androidStyle" : "default",
+                "useOriginalMsgbox" : true,
+                "android" : {
+                    "hdpi" : "unpackage/res/base/480.png",
+                    "xhdpi" : "unpackage/res/base/720.png",
+                    "xxhdpi" : "unpackage/res/base/1080.png"
+                }
             },
             "icons" : {
                 "android" : {

+ 1957 - 1947
pages.json

@@ -1,1948 +1,1958 @@
-{
-  "easycom": {
-    "^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/index.vue" //二维码条形码的配置 如果是uni_modules
-  },
-  "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-    {
-      "path": "pages/guide/index",
-      "style": {
-        "app-plus": {
-          "titleNView": false //禁用原生导航栏
-        },
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/store_cate/store_cate",
-      "style": {
-        "navigationBarTitleText": "门店",
-        "navigationStyle": "custom",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/index/index",
-      "style": {
-        "navigationBarTitleText": "",
-        "navigationStyle": "custom",
-        "navigationBarTextStyle": "white"
-      }
-    },
-    {
-      "path": "pages/order_addcart/order_addcart",
-      "style": {
-        "navigationBarTitleText": "购物车",
-        "app-plus": {
-          // #ifdef APP-PLUS
-          "titleNView": {
-            "type": "default"
-          }
-          // #endif
-        }
-
-      }
-    },
-    {
-      "path": "pages/user/index",
-      "style": {
-
-        "navigationBarTitleText": "个人中心",
-        // #ifdef MP || APP-PLUS
-        "navigationStyle": "custom",
-        // "navigationBarBackgroundColor": "#e93323",
-        "navigationBarTextStyle": "black",
-        // #endif
-				// #ifdef MP
-				"disableScroll": true,
-				// #endif
-        "app-plus": {
-          // 将回弹属性关掉
-          "bounce": "none"
-        }
-      }
-    },
-    {
-      "path": "pages/goods_cate/goods_cate",
-      "style": {
-        "navigationBarTitleText": "商品分类",
-        // #ifdef MP || APP-PLUS
-        "navigationStyle": "custom",
-        // #endif
-        "app-plus": {
-          // #ifdef APP-PLUS
-          // "titleNView": {
-          // 	"type": "default"
-          // }
-          // #endif
-        }
-      }
-    }
-    //#ifdef H5
-    ,
-    {
-      "path": "pages/auth/index",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    }
-    //#endif
-  ],
-  // "plugins": {
-  // 	"live-player-plugin": {
-  // 		"version": "1.3.2",
-  // 		"provider": "wx2b03c6e691cd7370"
-  // 	}
-  // },
-  "subPackages": [{
-      "root": "pages/users",
-      "name": "users",
-      "pages": [{
-          "path": "user_vip_areer/index",
-          "style": {
-            "navigationBarTitleText": "经验记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "privacy/index",
-          "style": {
-            "navigationBarTitleText": "协议",
-          	// #ifdef MP || APP-PLUS
-          	"navigationStyle": "custom",
-          	// #endif
-            "app-plus": {
-              // #ifdef APP-PLUS
-              // "titleNView": {
-              //   "type": "default"
-              // }
-              // #endif
-            }
-          }
-        }, {
-          "path": "user_cancellation/index",
-          "style": {
-            "navigationBarTitleText": "注销说明",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "message_center/index",
-          "style": {
-            "navigationBarTitleText": "消息中心",
-            "enablePullDownRefresh": true,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "message_center/messageDetail",
-          "style": {
-            "navigationBarTitleText": "消息详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_invoice_order/index",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "scan_login/index",
-          "style": {
-            "navigationBarTitleText": "授权登录"
-          }
-        },
-        {
-          "path": "user_invoice_list/index",
-          "style": {
-            "navigationBarTitleText": "发票管理",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_invoice_form/index",
-          "style": {
-            "navigationBarTitleText": "添加新发票",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        //#ifdef H5
-        {
-          "path": "alipay_invoke/index",
-          "style": {
-            "navigationBarTitleText": "支付提示"
-          }
-        },
-        //#endif
-        {
-          "path": "wechat_login/index",
-          "style": {
-            "navigationBarTitleText": "账户登录",
-            "navigationStyle": "custom",
-            "app-plus": {
-              "scrollIndicator": false //禁用原生导航栏
-            }
-          }
-        },
-        {
-          "path": "retrievePassword/index",
-          "style": {
-            "navigationBarTitleText": "忘记密码",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-				{
-				  "path": "user_set/index",
-				  "style": {
-				    "navigationBarTitleText": "设置",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
-				},
-        {
-          "path": "user_info/index",
-          "style": {
-            "navigationBarTitleText": "个人资料",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_get_coupon/index",
-          "style": {
-            "navigationBarTitleText": "领取优惠券",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "visit_list/index",
-          "style": {
-            "navigationBarTitleText": "浏览记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_goods_collection/index",
-          "style": {
-            "navigationBarTitleText": "收藏商品",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_sgin/index",
-          "style": {
-            "navigationBarTitleText": "签到",
-            // #ifdef MP
-            // "navigationBarTextStyle": "white",
-            // "navigationBarBackgroundColor": "#e93323"
-            // #endif
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_sgin_list/index",
-          "style": {
-            "navigationBarTitleText": "签到记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_money/index",
-          "style": {
-            "navigationBarTitleText": "我的账户",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_bill/index",
-          "style": {
-            "navigationBarTitleText": "账单明细",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_integral/index",
-          "style": {
-            "navigationBarTitleText": "积分详情"
-
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "black",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_coupon/index",
-          "style": {
-            "navigationBarTitleText": "我的优惠券",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_spread_user/index",
-          "style": {
-            "navigationBarTitleText": "我的推广"
-
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "black",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_spread_code/index",
-          "style": {
-            "navigationBarTitleText": "分销海报",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_spread_money/index",
-          "style": {
-            "navigationBarTitleText": "佣金记录"
-
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "black",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_cash/index",
-          "style": {
-            "navigationBarTitleText": "提现",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #ifdef MP || APP-PLUS
-              ,
-            "navigationBarTextStyle": "black"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_vip/index",
-          "style": {
-            "navigationBarTitleText": "我的等级",
-            "navigationBarBackgroundColor": "#232323"
-              // #ifdef MP || APP-PLUS
-              ,
-            "navigationBarTextStyle": "white"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "user_distribution_level/index",
-          "style": {
-            "navigationBarTitleText": "分销等级",
-            "navigationBarBackgroundColor": "#232323"
-              // #ifdef MP || APP-PLUS
-              ,
-            "navigationBarTextStyle": "white"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_address_list/index",
-          "style": {
-            "navigationBarTitleText": "地址管理",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_address/index",
-          "style": {
-            "navigationBarTitleText": "添加地址",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_phone/index",
-          "style": {
-            "navigationBarTitleText": "绑定手机",
-
-            // #ifdef MP
-            // "navigationBarTextStyle": "white",
-            // "navigationBarBackgroundColor": "#e93323"
-            // #endif
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_payment/index",
-          "style": {
-            "navigationBarTitleText": "余额充值",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_pwd_edit/index",
-          "style": {
-            "navigationBarTitleText": "修改密码"
-
-              // #ifdef MP
-              // 	,
-              // "navigationBarTextStyle": "white"
-              // "navigationBarBackgroundColor": "#e93323"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "promoter-list/index",
-          "style": {
-            "navigationBarTitleText": "推广人列表"
-              // #ifdef MP
-              ,
-            "navigationBarBackgroundColor": "#FFFFFF",
-            "navigationBarTextStyle": "black"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "promoter-order/index",
-          "style": {
-            "navigationBarTitleText": "推广人订单"
-
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "black",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "promoter_rank/index",
-          "style": {
-            "navigationBarTitleText": "推广人排行"
-
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "black",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "commission_rank/index",
-          "style": {
-            "navigationBarTitleText": "佣金排行",
-            "navigationBarBackgroundColor": "#FFFFFF"
-              // #ifdef MP || APP-PLUS
-              ,
-            "navigationBarTextStyle": "black"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "user_return_list/index",
-          "style": {
-            "navigationBarTitleText": "退货列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "login/index",
-          "style": {
-            "navigationBarTitleText": "登录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/short_video",
-      "name": "shortVideo",
-      "pages": [{
-        "enablePullDownRefresh": false,
-        //#ifdef APP
-        "path": "appSwiper/index",
-        //#endif	
-        //#ifndef APP
-        "path": "nvueSwiper/index",
-        //#endif
-        "style": {
-					"navigationBarTitleText": "短视频",
-          "app-plus": {
-            "titleNView": false,
-            "bounce": "none"
-          }
-        }
-
-      }
-		]
-    },
-    {
-      "root": "pages/goods_details",
-      "name": "goods_details",
-      "pages": [{
-          "path": "index",
-          "style": {
-            "navigationStyle": "custom"
-            // "app-plus": {
-            // 	// #ifdef APP-PLUS
-            // 	"titleNView": {
-            // 		"type": "default"
-            // 	}
-            // 	// #endif
-            // }
-          }
-        },
-        {
-          "path": "discountsGoodsList",
-          "style": {
-            "navigationBarTitleText": "套餐列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    // 门店分包
-    {
-      "root": "pages/store",
-      "name": "store",
-      "pages": [{
-          "path": "service/index",
-          "style": {
-            "navigationBarTitleText": "小米之家",
-						"app-plus": {
-						  // #ifdef APP-PLUS
-						  "titleNView": {
-						    "type": "default"
-						  }
-						  // #endif
-						}
-          }
-        }, {
-          "path": "search_stores/index",
-          "style": {
-            "navigationBarTitleText": "搜索列表",
-            "app-plus": {
-              "titleNView": {
-                "type": "搜索列表"
-              }
-            }
-          }
-        }, 
-				{
-          "path": "newcomers/index",
-					"style": {
-					  "navigationBarTitleText": "新人专享区",
-						"app-plus": {
-						  // #ifdef APP-PLUS
-						  "titleNView": {
-						    "type": "default"
-						  }
-						  // #endif
-						}
-					}
-        },
-				{
-				  "path": "ruleInfo/index",
-					"style": {
-					  "navigationBarTitleText": "活动规则",
-						"app-plus": {
-						  // #ifdef APP-PLUS
-						  "titleNView": {
-						    "type": "default"
-						  }
-						  // #endif
-						}
-					}
-				},
-        {
-          "path": "map/index",
-          "style": {
-            "navigationBarTitleText": "门店地图"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/activity",
-      "name": "activity",
-      "pages": [{
-          "path": "goods_bargain/index",
-          "style": {
-            // #ifdef MP
-            // "navigationBarTextStyle": "white",
-            // "navigationBarBackgroundColor": "#E93323",
-            "navigationBarTitleText": "砍价列表",
-            // #endif
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_bargain_details/index",
-          "style": {
-            "navigationStyle": "custom"
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "white"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_combination/index",
-          "style": {
-            // #ifdef MP
-            // "navigationBarTextStyle": "white",
-            // "navigationBarBackgroundColor": "#E93323",
-            "navigationBarTitleText": "拼团活动",
-            // #endif
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_combination_details/index",
-          "style": {
-            "navigationStyle": "custom",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              // "titleNView": {
-              // 	"type": "default"
-              // }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_combination_status/index",
-          "style": {
-            "navigationBarTitleText": "拼团",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_seckill/index",
-          "style": {
-            "navigationBarTitleText": "限时秒杀"
-              // #ifdef MP
-              // "navigationBarTextStyle": "white"
-              // "navigationBarBackgroundColor": "#e93323"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_seckill_details/index",
-          "style": {
-            "navigationStyle": "custom"
-              // #ifdef MP
-              ,
-            "navigationBarTextStyle": "white"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              // "titleNView": {
-              // 	"type": "default"
-              // }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "poster-poster/index",
-          "style": {
-            "navigationBarTitleText": "砍价海报"
-              // #ifdef MP
-              // "navigationBarTextStyle": "white"
-              // "navigationBarBackgroundColor": "#d22516"
-              // #endif
-              ,
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "bargain/index",
-          "style": {
-            "navigationBarTitleText": "砍价记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "presell/index",
-          "style": {
-            "navigationBarTitleText": "预售列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "discount/index",
-          "style": {
-            "navigationBarTitleText": "优惠活动",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/admin",
-      "name": "adminOrder",
-      "pages": [{
-          "path": "custom_date/index",
-          "style": {
-            "navigationBarTitleText": "选择日期"
-          }
-        },
-        {
-          "path": "order/index",
-          "style": {
-            "navigationBarTitleText": "订单统计",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "orderList/index",
-          "style": {
-            "navigationBarTitleText": "订单列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "orderDetail/index",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "delivery/index",
-          "style": {
-            "navigationBarTitleText": "订单发货",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "statistics/index",
-          "style": {
-            "navigationBarTitleText": "订单数据统计",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_cancellation/index",
-          "style": {
-            "navigationBarTitleText": "订单核销",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "store/index",
-          "style": {
-            "navigationBarTextStyle": "white",
-            "navigationBarBackgroundColor": "#333333",
-            "navigationBarTitleText": "门店中心",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "store/custom_date/index",
-          "style": {
-            "navigationBarTitleText": "选择日期"
-          }
-        },
-        {
-          "path": "store/statistics/index",
-          "style": {
-            "navigationBarTitleText": "数据详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "store/orderDetail/index",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "store/order/index",
-          "style": {
-            "navigationBarTitleText": "订单管理",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "store/deliverGoods/index",
-          "style": {
-            "navigationBarTitleText": "订单发货",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "distribution/index",
-          "style": {
-            "navigationBarTextStyle": "white",
-            "navigationBarBackgroundColor": "#333333",
-            "navigationBarTitleText": "配送员",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "distribution/scanning/index",
-          "style": {
-            "navigationBarTitleText": "扫描结果",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "distribution/scanning/detail/index",
-          "style": {
-            "navigationBarTitleText": "扫描结果详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "distribution/orderDetail/index",
-          "style": {
-            "navigationBarTitleText": "配送员订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "store/scanning/index",
-          "style": {
-            "navigationBarTitleText": "扫描结果",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "store/scanning/detail/index",
-          "style": {
-            "navigationBarTitleText": "扫描结果详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/columnGoods",
-      "name": "columnGoods",
-      "pages": [{
-          "path": "HotNewGoods/index",
-          "style": {
-            "navigationBarTitleText": "精品推荐",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "live_list/index",
-          "style": {
-            "navigationBarTitleText": "推荐好货"
-          }
-        },
-        {
-          "path": "HotNewGoods/feedback",
-          "style": {
-            "navigationBarTitleText": "我的客服",
-            "navigationBarTextStyle": "white",
-            "navigationBarBackgroundColor": "#3A3A3A",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/annex",
-      "pages": [{
-          "path": "web_view/index",
-          "style": {
-            "navigationBarTitleText": "",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "vip_paid/index",
-          "style": {
-            "navigationBarTitleText": "SVIP会员",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-				{
-				  "path": "vip_grade/index",
-				  "style": {
-				    "navigationBarTitleText": "会员中心",
-						"navigationBarTextStyle": "white",
-						"navigationBarBackgroundColor": "#302F35",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
-				},
-				{
-				  "path": "record_list/index",
-				  "style": {
-				    "navigationBarTitleText": "消费记录",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
-				},
-				{
-				  "path": "vip_grade_active/index",
-				  "style": {
-				    "navigationBarTitleText": "会员卡激活",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
-				},
-        {
-          "path": "vip_coupon/index",
-          "style": {
-            "navigationBarTitleText": "会员优惠券",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "vip_clause/index",
-          "style": {
-            "navigationBarTitleText": "会员协议",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "vip_active/index",
-          "style": {
-            "navigationBarTitleText": "激活会员",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "offline_pay/index",
-          "style": {
-            "navigationBarTitleText": "支付",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "offline_result/index",
-          "style": {
-            "navigationBarTitleText": "支付结果",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "special/index",
-          "style": {
-            "navigationBarTitleText": "专题页",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/points_mall",
-      "pages": [{
-          "path": "index",
-          "style": {
-            "navigationBarTextStyle": "white",
-            "navigationBarBackgroundColor": "#333333",
-            "navigationBarTitleText": "积分商城",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "integral_goods_list",
-          "style": {
-            "navigationBarTitleText": "商品列表",
-            // "navigationBarTextStyle": "white",
-            // "navigationBarBackgroundColor": "#E93323",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "integral_goods_details",
-          "style": {
-            "navigationBarTitleText": "商品详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "exchange_record",
-          "style": {
-            "navigationBarTitleText": "兑换记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "integral_order",
-          "style": {
-            "navigationBarTitleText": "积分订单",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "user_address",
-          "style": {
-            "navigationBarTitleText": "选择地址",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "integral_order_status",
-          "style": {
-            "navigationBarTitleText": "兑换成功",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "integral_order_details",
-          "style": {
-            "navigationBarTitleText": "兑换订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "logistics_details",
-          "style": {
-            "navigationBarTitleText": "兑换物流详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/extension",
-      "name": "extension",
-      "pages": [{
-          "path": "invite_friend/index",
-          "style": {
-            "navigationBarTitleText": "邀请好友",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "customer_list/chat",
-          "style": {
-            "navigationBarTitleText": "对话详情",
-            "navigationStyle": "custom",
-            "app-plus": {
-              "scrollIndicator": false //禁用原生导航栏
-                // #ifdef APP-PLUS
-                ,
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            },
-            "disableScroll": true
-          }
-        },
-        {
-          "path": "news_list/index",
-          "style": {
-            "navigationBarTitleText": "资讯",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "news_details/index",
-          "style": {
-            "navigationBarTitleText": "资讯详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/work",
-      "name": "work",
-      "pages": [{
-          "path": "userInfo/index",
-          "style": {
-            "navigationBarTitleText": "客户信息"
-          }
-        },
-        {
-          "path": "orderList/index",
-          "style": {
-            "navigationBarTitleText": "交易管理"
-          }
-        },
-        {
-          "path": "orderDetail/index",
-          "style": {
-            "navigationBarTitleText": "订单详情"
-          }
-        },
-        {
-          "path": "record/index",
-          "style": {
-            "navigationBarTitleText": "记录"
-          }
-        },
-        {
-          "path": "groupInfo/index",
-          "style": {
-            "navigationBarTitleText": ""
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/goods",
-      "name": "goods",
-      "pages": [{
-          "path": "goods_list/index",
-          "style": {
-            "navigationBarTitleText": "商品列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_search/index",
-          "style": {
-            "navigationBarTitleText": "搜索商品",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_pay_status/index",
-          "style": {
-            "navigationBarTitleText": "支付成功",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }, {
-          "path": "order_pay_status/payLottery",
-          "style": {
-            "navigationBarTitleText": "支付成功",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_comment_list/index",
-          "style": {
-            "navigationBarTitleText": "商品评分",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_comment_con/index",
-          "style": {
-            "navigationBarTitleText": "商品评价",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_comment_con/comment_con",
-          "style": {
-            "navigationBarTitleText": "评价详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_comment_con/lottery_comment",
-          "style": {
-            "navigationBarTitleText": "订单评价",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_logistics/index",
-          "style": {
-            "navigationBarTitleText": "物流信息",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-				{
-				  "path": "delivery_detail/index",
-				  "style": {
-				    "navigationBarTitleText": "配送信息",
-				    "app-plus": {
-				      // #ifdef APP-PLUS
-				      "titleNView": {
-				        "type": "default"
-				      }
-				      // #endif
-				    }
-				  }
-				},
-        {
-          "path": "goods_details_store/index",
-          "style": {
-            "navigationBarTitleText": "门店列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_return_list/index",
-          "style": {
-            "navigationBarTitleText": "退货列表",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "goods_return/index",
-          "style": {
-            "navigationBarTitleText": "申请退货",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_details/index",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_list/index",
-          "style": {
-            "navigationBarTitleText": "我的订单",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_pay/index",
-          "style": {
-            "navigationBarTitleText": "订单支付",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_refund_goods/index",
-          "style": {
-            "navigationBarTitleText": "退回商品",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "admin_order_detail/index",
-          "style": {
-            "navigationBarTitleText": "订单详情",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "order_confirm/index",
-          "style": {
-            "navigationBarTitleText": "提交订单",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "lottery/grids/index",
-          "style": {
-            "navigationBarTitleText": "抽奖活动",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        },
-        {
-          "path": "lottery/grids/record",
-          "style": {
-            "navigationBarTitleText": "中奖记录",
-            "app-plus": {
-              // #ifdef APP-PLUS
-              "titleNView": {
-                "type": "default"
-              }
-              // #endif
-            }
-          }
-        }
-      ]
-    }
-  ],
-  "tabBar": {
-    "color": "#282828",
-    "selectedColor": "#ff3366",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "list": [{
-        "pagePath": "pages/index/index",
-        "iconPath": "static/images/1-001.png",
-        "selectedIconPath": "static/images/1-002.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/goods_cate/goods_cate",
-        "iconPath": "static/images/2-001.png",
-        "selectedIconPath": "static/images/2-002.png",
-        "text": "分类"
-      },
-      {
-        "pagePath": "pages/store_cate/store_cate",
-        "iconPath": "static/images/5-001.png",
-        "selectedIconPath": "static/images/5-002.png",
-        "text": "门店"
-      },
-      {
-        "pagePath": "pages/order_addcart/order_addcart",
-        "iconPath": "static/images/3-001.png",
-        "selectedIconPath": "static/images/3-002.png",
-        "text": "购物车"
-      },
-      {
-        "pagePath": "pages/user/index",
-        "iconPath": "static/images/4-001.png",
-        "selectedIconPath": "static/images/4-002.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "加载中",
-    "navigationBarBackgroundColor": "#fff",
-    "backgroundColor": "#F8F8F8",
-    "titleNView": false
-  },
-  "condition": { //模式配置,仅开发期间生效
-    "current": 0, //当前激活的模式(list 的索引项)
-    "list": [{
-      "name": "", //模式名称
-      "path": "", //启动页面,必选
-      "query": "" //启动参数,在页面的onLoad函数里面得到
-    }]
-  }
+{
+	"easycom": {
+		"^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/index.vue" //二维码条形码的配置 如果是uni_modules
+	},
+	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/guide/index",
+			"style": {
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				},
+				"navigationStyle": "custom"
+			}
+		},
+		// #ifdef APP-PLUS
+		{
+			"path": "pages/index/downLoad",
+			"style": {
+				"navigationBarTitleText": "下载",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
+		},
+		// #endif
+		{
+			"path": "pages/store_cate/store_cate",
+			"style": {
+				"navigationBarTitleText": "门店",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/order_addcart/order_addcart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"app-plus": {
+					// #ifdef APP-PLUS
+					"titleNView": {
+						"type": "default"
+					}
+					// #endif
+				}
+
+			}
+		},
+		{
+			"path": "pages/user/index",
+			"style": {
+
+				"navigationBarTitleText": "个人中心",
+				// #ifdef MP || APP-PLUS
+				"navigationStyle": "custom",
+				// "navigationBarBackgroundColor": "#e93323",
+				"navigationBarTextStyle": "black",
+				// #endif
+				// #ifdef MP
+				"disableScroll": true,
+				// #endif
+				"app-plus": {
+					// 将回弹属性关掉
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/goods_cate/goods_cate",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				// #ifdef MP || APP-PLUS
+				"navigationStyle": "custom",
+				// #endif
+				"app-plus": {
+					// #ifdef APP-PLUS
+					// "titleNView": {
+					// 	"type": "default"
+					// }
+					// #endif
+				}
+			}
+		}
+		//#ifdef H5
+		,
+		{
+			"path": "pages/auth/index",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		}
+		//#endif
+	],
+	// "plugins": {
+	// 	"live-player-plugin": {
+	// 		"version": "1.3.2",
+	// 		"provider": "wx2b03c6e691cd7370"
+	// 	}
+	// },
+	"subPackages": [{
+			"root": "pages/users",
+			"name": "users",
+			"pages": [{
+					"path": "user_vip_areer/index",
+					"style": {
+						"navigationBarTitleText": "经验记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "privacy/index",
+					"style": {
+						"navigationBarTitleText": "协议",
+						// #ifdef MP || APP-PLUS
+						"navigationStyle": "custom",
+						// #endif
+						"app-plus": {
+							// #ifdef APP-PLUS
+							// "titleNView": {
+							//   "type": "default"
+							// }
+							// #endif
+						}
+					}
+				}, {
+					"path": "user_cancellation/index",
+					"style": {
+						"navigationBarTitleText": "注销说明",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "message_center/index",
+					"style": {
+						"navigationBarTitleText": "消息中心",
+						"enablePullDownRefresh": true,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "message_center/messageDetail",
+					"style": {
+						"navigationBarTitleText": "消息详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_invoice_order/index",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "scan_login/index",
+					"style": {
+						"navigationBarTitleText": "授权登录"
+					}
+				},
+				{
+					"path": "user_invoice_list/index",
+					"style": {
+						"navigationBarTitleText": "发票管理",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_invoice_form/index",
+					"style": {
+						"navigationBarTitleText": "添加新发票",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				//#ifdef H5
+				{
+					"path": "alipay_invoke/index",
+					"style": {
+						"navigationBarTitleText": "支付提示"
+					}
+				},
+				//#endif
+				{
+					"path": "wechat_login/index",
+					"style": {
+						"navigationBarTitleText": "账户登录",
+						"navigationStyle": "custom",
+						"app-plus": {
+							"scrollIndicator": false //禁用原生导航栏
+						}
+					}
+				},
+				{
+					"path": "retrievePassword/index",
+					"style": {
+						"navigationBarTitleText": "忘记密码",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_set/index",
+					"style": {
+						"navigationBarTitleText": "设置",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_info/index",
+					"style": {
+						"navigationBarTitleText": "个人资料",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_get_coupon/index",
+					"style": {
+						"navigationBarTitleText": "领取优惠券",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "visit_list/index",
+					"style": {
+						"navigationBarTitleText": "浏览记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_goods_collection/index",
+					"style": {
+						"navigationBarTitleText": "收藏商品",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_sgin/index",
+					"style": {
+						"navigationBarTitleText": "签到",
+						// #ifdef MP
+						// "navigationBarTextStyle": "white",
+						// "navigationBarBackgroundColor": "#e93323"
+						// #endif
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_sgin_list/index",
+					"style": {
+						"navigationBarTitleText": "签到记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_money/index",
+					"style": {
+						"navigationBarTitleText": "我的账户",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_bill/index",
+					"style": {
+						"navigationBarTitleText": "账单明细",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_integral/index",
+					"style": {
+						"navigationBarTitleText": "积分详情"
+
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_coupon/index",
+					"style": {
+						"navigationBarTitleText": "我的优惠券",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_spread_user/index",
+					"style": {
+						"navigationBarTitleText": "我的推广"
+
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_spread_code/index",
+					"style": {
+						"navigationBarTitleText": "分销海报",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_spread_money/index",
+					"style": {
+						"navigationBarTitleText": "佣金记录"
+
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_cash/index",
+					"style": {
+						"navigationBarTitleText": "提现",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #ifdef MP || APP-PLUS
+							,
+						"navigationBarTextStyle": "black"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_vip/index",
+					"style": {
+						"navigationBarTitleText": "我的等级",
+						"navigationBarBackgroundColor": "#232323"
+							// #ifdef MP || APP-PLUS
+							,
+						"navigationBarTextStyle": "white"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "user_distribution_level/index",
+					"style": {
+						"navigationBarTitleText": "分销等级",
+						"navigationBarBackgroundColor": "#232323"
+							// #ifdef MP || APP-PLUS
+							,
+						"navigationBarTextStyle": "white"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_address_list/index",
+					"style": {
+						"navigationBarTitleText": "地址管理",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_address/index",
+					"style": {
+						"navigationBarTitleText": "添加地址",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_phone/index",
+					"style": {
+						"navigationBarTitleText": "绑定手机",
+
+						// #ifdef MP
+						// "navigationBarTextStyle": "white",
+						// "navigationBarBackgroundColor": "#e93323"
+						// #endif
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_payment/index",
+					"style": {
+						"navigationBarTitleText": "余额充值",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_pwd_edit/index",
+					"style": {
+						"navigationBarTitleText": "修改密码"
+
+							// #ifdef MP
+							// 	,
+							// "navigationBarTextStyle": "white"
+							// "navigationBarBackgroundColor": "#e93323"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "promoter-list/index",
+					"style": {
+						"navigationBarTitleText": "推广人列表"
+							// #ifdef MP
+							,
+						"navigationBarBackgroundColor": "#FFFFFF",
+						"navigationBarTextStyle": "black"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "promoter-order/index",
+					"style": {
+						"navigationBarTitleText": "推广人订单"
+
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "promoter_rank/index",
+					"style": {
+						"navigationBarTitleText": "推广人排行"
+
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "black",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "commission_rank/index",
+					"style": {
+						"navigationBarTitleText": "佣金排行",
+						"navigationBarBackgroundColor": "#FFFFFF"
+							// #ifdef MP || APP-PLUS
+							,
+						"navigationBarTextStyle": "black"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "user_return_list/index",
+					"style": {
+						"navigationBarTitleText": "退货列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "login/index",
+					"style": {
+						"navigationBarTitleText": "登录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/short_video",
+			"name": "shortVideo",
+			"pages": [{
+				"enablePullDownRefresh": false,
+				//#ifdef APP
+				"path": "appSwiper/index",
+				//#endif	
+				//#ifndef APP
+				"path": "nvueSwiper/index",
+				//#endif
+				"style": {
+					"navigationBarTitleText": "短视频",
+					"app-plus": {
+						"titleNView": false,
+						"bounce": "none"
+					}
+				}
+
+			}]
+		},
+		{
+			"root": "pages/goods_details",
+			"name": "goods_details",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationStyle": "custom"
+						// "app-plus": {
+						// 	// #ifdef APP-PLUS
+						// 	"titleNView": {
+						// 		"type": "default"
+						// 	}
+						// 	// #endif
+						// }
+					}
+				},
+				{
+					"path": "discountsGoodsList",
+					"style": {
+						"navigationBarTitleText": "套餐列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		// 门店分包
+		{
+			"root": "pages/store",
+			"name": "store",
+			"pages": [{
+					"path": "service/index",
+					"style": {
+						"navigationBarTitleText": "小米之家",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "search_stores/index",
+					"style": {
+						"navigationBarTitleText": "搜索列表",
+						"app-plus": {
+							"titleNView": {
+								"type": "搜索列表"
+							}
+						}
+					}
+				},
+				{
+					"path": "newcomers/index",
+					"style": {
+						"navigationBarTitleText": "新人专享区",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "ruleInfo/index",
+					"style": {
+						"navigationBarTitleText": "活动规则",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "map/index",
+					"style": {
+						"navigationBarTitleText": "门店地图"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/activity",
+			"name": "activity",
+			"pages": [{
+					"path": "goods_bargain/index",
+					"style": {
+						// #ifdef MP
+						// "navigationBarTextStyle": "white",
+						// "navigationBarBackgroundColor": "#E93323",
+						"navigationBarTitleText": "砍价列表",
+						// #endif
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_bargain_details/index",
+					"style": {
+						"navigationStyle": "custom"
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "white"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_combination/index",
+					"style": {
+						// #ifdef MP
+						// "navigationBarTextStyle": "white",
+						// "navigationBarBackgroundColor": "#E93323",
+						"navigationBarTitleText": "拼团活动",
+						// #endif
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_combination_details/index",
+					"style": {
+						"navigationStyle": "custom",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							// "titleNView": {
+							// 	"type": "default"
+							// }
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_combination_status/index",
+					"style": {
+						"navigationBarTitleText": "拼团",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_seckill/index",
+					"style": {
+						"navigationBarTitleText": "限时秒杀"
+							// #ifdef MP
+							// "navigationBarTextStyle": "white"
+							// "navigationBarBackgroundColor": "#e93323"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_seckill_details/index",
+					"style": {
+						"navigationStyle": "custom"
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "white"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							// "titleNView": {
+							// 	"type": "default"
+							// }
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "poster-poster/index",
+					"style": {
+						"navigationBarTitleText": "砍价海报"
+							// #ifdef MP
+							// "navigationBarTextStyle": "white"
+							// "navigationBarBackgroundColor": "#d22516"
+							// #endif
+							,
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "bargain/index",
+					"style": {
+						"navigationBarTitleText": "砍价记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "presell/index",
+					"style": {
+						"navigationBarTitleText": "预售列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "discount/index",
+					"style": {
+						"navigationBarTitleText": "优惠活动",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/admin",
+			"name": "adminOrder",
+			"pages": [{
+					"path": "custom_date/index",
+					"style": {
+						"navigationBarTitleText": "选择日期"
+					}
+				},
+				{
+					"path": "order/index",
+					"style": {
+						"navigationBarTitleText": "订单统计",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "orderList/index",
+					"style": {
+						"navigationBarTitleText": "订单列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "orderDetail/index",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "delivery/index",
+					"style": {
+						"navigationBarTitleText": "订单发货",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "statistics/index",
+					"style": {
+						"navigationBarTitleText": "订单数据统计",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_cancellation/index",
+					"style": {
+						"navigationBarTitleText": "订单核销",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "store/index",
+					"style": {
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#333333",
+						"navigationBarTitleText": "门店中心",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "store/custom_date/index",
+					"style": {
+						"navigationBarTitleText": "选择日期"
+					}
+				},
+				{
+					"path": "store/statistics/index",
+					"style": {
+						"navigationBarTitleText": "数据详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "store/orderDetail/index",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "store/order/index",
+					"style": {
+						"navigationBarTitleText": "订单管理",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "store/deliverGoods/index",
+					"style": {
+						"navigationBarTitleText": "订单发货",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "distribution/index",
+					"style": {
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#333333",
+						"navigationBarTitleText": "配送员",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "distribution/scanning/index",
+					"style": {
+						"navigationBarTitleText": "扫描结果",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "distribution/scanning/detail/index",
+					"style": {
+						"navigationBarTitleText": "扫描结果详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "distribution/orderDetail/index",
+					"style": {
+						"navigationBarTitleText": "配送员订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "store/scanning/index",
+					"style": {
+						"navigationBarTitleText": "扫描结果",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "store/scanning/detail/index",
+					"style": {
+						"navigationBarTitleText": "扫描结果详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/columnGoods",
+			"name": "columnGoods",
+			"pages": [{
+					"path": "HotNewGoods/index",
+					"style": {
+						"navigationBarTitleText": "精品推荐",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "live_list/index",
+					"style": {
+						"navigationBarTitleText": "推荐好货"
+					}
+				},
+				{
+					"path": "HotNewGoods/feedback",
+					"style": {
+						"navigationBarTitleText": "我的客服",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#3A3A3A",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/annex",
+			"pages": [{
+					"path": "web_view/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "vip_paid/index",
+					"style": {
+						"navigationBarTitleText": "SVIP会员",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "vip_grade/index",
+					"style": {
+						"navigationBarTitleText": "会员中心",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#302F35",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "record_list/index",
+					"style": {
+						"navigationBarTitleText": "消费记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "vip_grade_active/index",
+					"style": {
+						"navigationBarTitleText": "会员卡激活",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "vip_coupon/index",
+					"style": {
+						"navigationBarTitleText": "会员优惠券",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "vip_clause/index",
+					"style": {
+						"navigationBarTitleText": "会员协议",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "vip_active/index",
+					"style": {
+						"navigationBarTitleText": "激活会员",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "offline_pay/index",
+					"style": {
+						"navigationBarTitleText": "支付",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "offline_result/index",
+					"style": {
+						"navigationBarTitleText": "支付结果",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "special/index",
+					"style": {
+						"navigationBarTitleText": "专题页",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/points_mall",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#333333",
+						"navigationBarTitleText": "积分商城",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "integral_goods_list",
+					"style": {
+						"navigationBarTitleText": "商品列表",
+						// "navigationBarTextStyle": "white",
+						// "navigationBarBackgroundColor": "#E93323",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "integral_goods_details",
+					"style": {
+						"navigationBarTitleText": "商品详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "exchange_record",
+					"style": {
+						"navigationBarTitleText": "兑换记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "integral_order",
+					"style": {
+						"navigationBarTitleText": "积分订单",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "user_address",
+					"style": {
+						"navigationBarTitleText": "选择地址",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "integral_order_status",
+					"style": {
+						"navigationBarTitleText": "兑换成功",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "integral_order_details",
+					"style": {
+						"navigationBarTitleText": "兑换订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "logistics_details",
+					"style": {
+						"navigationBarTitleText": "兑换物流详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/extension",
+			"name": "extension",
+			"pages": [{
+					"path": "invite_friend/index",
+					"style": {
+						"navigationBarTitleText": "邀请好友",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "customer_list/chat",
+					"style": {
+						"navigationBarTitleText": "对话详情",
+						"navigationStyle": "custom",
+						"app-plus": {
+							"scrollIndicator": false //禁用原生导航栏
+								// #ifdef APP-PLUS
+								,
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						},
+						"disableScroll": true
+					}
+				},
+				{
+					"path": "news_list/index",
+					"style": {
+						"navigationBarTitleText": "资讯",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "news_details/index",
+					"style": {
+						"navigationBarTitleText": "资讯详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/work",
+			"name": "work",
+			"pages": [{
+					"path": "userInfo/index",
+					"style": {
+						"navigationBarTitleText": "客户信息"
+					}
+				},
+				{
+					"path": "orderList/index",
+					"style": {
+						"navigationBarTitleText": "交易管理"
+					}
+				},
+				{
+					"path": "orderDetail/index",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "record/index",
+					"style": {
+						"navigationBarTitleText": "记录"
+					}
+				},
+				{
+					"path": "groupInfo/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/goods",
+			"name": "goods",
+			"pages": [{
+					"path": "goods_list/index",
+					"style": {
+						"navigationBarTitleText": "商品列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_search/index",
+					"style": {
+						"navigationBarTitleText": "搜索商品",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_pay_status/index",
+					"style": {
+						"navigationBarTitleText": "支付成功",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "order_pay_status/payLottery",
+					"style": {
+						"navigationBarTitleText": "支付成功",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_comment_list/index",
+					"style": {
+						"navigationBarTitleText": "商品评分",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_comment_con/index",
+					"style": {
+						"navigationBarTitleText": "商品评价",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_comment_con/comment_con",
+					"style": {
+						"navigationBarTitleText": "评价详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_comment_con/lottery_comment",
+					"style": {
+						"navigationBarTitleText": "订单评价",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_logistics/index",
+					"style": {
+						"navigationBarTitleText": "物流信息",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "delivery_detail/index",
+					"style": {
+						"navigationBarTitleText": "配送信息",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_details_store/index",
+					"style": {
+						"navigationBarTitleText": "门店列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_return_list/index",
+					"style": {
+						"navigationBarTitleText": "退货列表",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "goods_return/index",
+					"style": {
+						"navigationBarTitleText": "申请退货",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_details/index",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_list/index",
+					"style": {
+						"navigationBarTitleText": "我的订单",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_pay/index",
+					"style": {
+						"navigationBarTitleText": "订单支付",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_refund_goods/index",
+					"style": {
+						"navigationBarTitleText": "退回商品",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "admin_order_detail/index",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "order_confirm/index",
+					"style": {
+						"navigationBarTitleText": "提交订单",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "lottery/grids/index",
+					"style": {
+						"navigationBarTitleText": "抽奖活动",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "lottery/grids/record",
+					"style": {
+						"navigationBarTitleText": "中奖记录",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		}
+	],
+	"tabBar": {
+		"color": "#282828",
+		"selectedColor": "#ff3366",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/images/1-001.png",
+				"selectedIconPath": "static/images/1-002.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/goods_cate/goods_cate",
+				"iconPath": "static/images/2-001.png",
+				"selectedIconPath": "static/images/2-002.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/store_cate/store_cate",
+				"iconPath": "static/images/5-001.png",
+				"selectedIconPath": "static/images/5-002.png",
+				"text": "门店"
+			},
+			{
+				"pagePath": "pages/order_addcart/order_addcart",
+				"iconPath": "static/images/3-001.png",
+				"selectedIconPath": "static/images/3-002.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/user/index",
+				"iconPath": "static/images/4-001.png",
+				"selectedIconPath": "static/images/4-002.png",
+				"text": "我的"
+			}
+		]
+	},
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "加载中",
+		"navigationBarBackgroundColor": "#fff",
+		"backgroundColor": "#F8F8F8",
+		"titleNView": false
+	},
+	"condition": { //模式配置,仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面,必选
+			"query": "" //启动参数,在页面的onLoad函数里面得到
+		}]
+	}
 }

+ 2 - 3
pages/activity/goods_combination_details/index.vue

@@ -259,13 +259,12 @@
 				</button>
 				<!-- #endif -->
 				<!-- #ifdef APP-PLUS -->
-				<view class="item" @click="appShare('WXSceneSession')">
-					<!-- <view class="iconfont icon-weixin3"></view> -->
+				<!-- <view class="item" @click="appShare('WXSceneSession')">
 					<view class="pictrue">
 						<image src="../../../static/images/weixin.png"></image>
 					</view>
 					<view class="">分享给好友</view>
-				</view>
+				</view> -->
 				<!-- <view class="item" @click="appShare('WXSenceTimeline')">
 					<view class="iconfont icon-pengyouquan"></view>
 					<view class="">微信朋友圈</view>

+ 2 - 3
pages/goods_details/index.vue

@@ -443,8 +443,7 @@
 						</div> -->
 								<!-- #endif -->
 								<!-- #ifdef APP-PLUS -->
-								<view class="item" @click="appShare('WXSceneSession')">
-									<!-- <view class="iconfont icon-weixin3"></view> -->
+								<!-- <view class="item" @click="appShare('WXSceneSession')">
 									<view class="pictrue">
 										<image src="../../static/images/weixin.png"></image>
 									</view>
@@ -455,7 +454,7 @@
 										<image src="./static/weixinCircle.png"></image>
 									</view>
 									<view class="">分享朋友圈</view>
-								</view>
+								</view> -->
 								<!-- #endif -->
 								<view class="item" @click="getpreviewImage">
 									<view class="pictrue">

+ 154 - 0
pages/index/downLoad.vue

@@ -0,0 +1,154 @@
+<template>
+	<view class="content">
+		<view class="main">
+			<view class="main-bg"><image src="../../static/images/download.png" mode=""></image></view>
+			<view class="title">软件更新</view>
+			<!-- <view class="jdt">
+				<u-line-progress :show-percent="false" :percent="percent" :striped-active="true" :striped="true" inactive-color="#f5957d" active-color="#fd6f3f"></u-line-progress>
+			</view> -->
+			<view class="num">{{ percent }}%</view>
+			<view class="tipSpan">软件更新中,请勿断开相框电源</view>
+			<!-- <view class="btn" @click="cancelDown()">取消更新</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			dtask: '',
+			percent: 0
+		};
+	},
+	onLoad(opt) {
+		this.downApp(opt.apk);
+	},
+	onShow() {},
+	onReachBottom() {},
+	onReady() {},
+	onBackPress() {
+		return true
+	},
+	methods: {
+		downApp(version) {
+			this.dtask = plus.downloader.createDownload('https://ygs.hqgjsmc.com' + version);
+			this.dtask.addEventListener('statechanged', this.onStateChanged, false);
+			this.dtask.start();
+		},
+		cancelDown() {
+			this.dtask.abort();
+			uni.navigateTo({
+				url: '/pages/index/index'
+			});
+		},
+		onStateChanged(download, status) {
+			let prg = 0;
+			console.log(this.percent);
+			switch (download.state) {
+				case 1:
+					// showLoading.setTitle("正在下载");
+					break;
+				case 2:
+					// showLoading.setTitle("已连接到服务器");
+					break;
+				case 3:
+					prg = parseInt(
+						//下载的进度
+						(parseFloat(download.downloadedSize) / parseFloat(download.totalSize)) * 100
+					);
+					// showLoading.setTitle("版本更新,正在下载" + prg + "% ");
+					this.percent = prg;
+					break;
+				case 4:
+					this.installApp(download.filename);
+					// plus.nativeUI.closeWaiting(); //关闭系统提示框
+					this.showProcess = false;
+					//下载完成
+					break;
+			}
+		},
+		installApp(path) {
+			plus.nativeUI.showWaiting('安装升级包...');
+			plus.runtime.install(
+				path,
+				{},
+				function() {
+					plus.nativeUI.closeWaiting();
+					uni.showToast({
+						icon: 'none',
+						title: '升级完成,准备重新载入'
+					});
+					setTimeout(_ => {
+						uni.hideToast();
+						plus.runtime.restart();
+					}, 1000);
+				},
+				function(e) {
+					plus.nativeUI.closeWaiting();
+					plus.nativeUI.alert('安装升级包失败[' + e.code + ']:' + e.message);
+				}
+			);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	min-height: 100%;
+	height: auto;
+}
+
+.main {
+	margin-top: 100rpx;
+	.main-bg {
+		margin: 0 auto;
+		width: 550rpx;
+		height: 340rpx;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.title {
+		text-align: center;
+		color: #000000;
+		font-size: 40rpx;
+		margin-top: 20rpx;
+		font-family: PingFang SC;
+		font-weight: bolder;
+	}
+	.jdt {
+		width: 550rpx;
+		margin: 20rpx auto;
+	}
+	.num {
+		text-align: center;
+		color: #ff7575;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+	}
+	.tipSpan {
+		margin-top: 20rpx;
+		text-align: center;
+		color: #ababab;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: 500;
+	}
+	.btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		color: #ffffff;
+		width: 400rpx;
+		height: 80rpx;
+		background: #ff4c4c;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+	}
+}
+</style>

+ 3 - 2
pages/user/index.vue

@@ -1424,7 +1424,7 @@
 			font-size: 28rpx;
 			font-weight: 400;
 			color: #333333;
-			margin-left: -60rpx;
+			margin-left: 60rpx;
 		}
 
 		.btn-login {
@@ -1435,7 +1435,8 @@
 			border-radius: 28rpx;
 			text-align: center;
 			line-height: 56rpx;
-			margin-right: 32rpx;
+			// margin-right: 32rpx;
+			margin-left: 32rpx;
 			font-size: 28rpx;
 			font-weight: 500;
 			color: #FFFFFF;

+ 2 - 2
pages/users/login/index.vue

@@ -62,7 +62,7 @@
 			<view class="logon" @click="loginMobile" v-if="current !== 0">登录</view>
 			<view class="logon" @click="submit" v-if="current === 0">登录</view>
 			<!-- #ifdef APP-PLUS -->
-			<view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
+			<!-- <view class="appLogin" v-if="!appLoginStatus && !appleLoginStatus">
 				<view class="hds">
 					<span class="line"></span>
 					<p>其他方式登录</p>
@@ -76,7 +76,7 @@
 						<view class="iconfont icon-s-pingguo"></view>
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<view class="protocol">
 				<checkbox-group @change='ChangeIsDefault'>

+ 1 - 1
pages/users/user_address/index.vue

@@ -32,7 +32,7 @@
 										<view class="font-num tip" v-if="isStreet">请补充县/区信息</view>
 									</view>
 								</view>
-								<text class="iconfont icon-dizhi fontcolor" @click="chooseLocation"></text>
+								<!-- <text class="iconfont icon-dizhi fontcolor" @click="chooseLocation"></text> -->
 							</view>
 						</view>
 						<view class='item acea-row row-between-wrapper'>

+ 1 - 1
pages/users/user_spread_code/index.vue

@@ -138,7 +138,7 @@
 		},
 		async onReady() {
 			if (this.isLogin) {
-				this.val = `${HTTP_REQUEST_URL}?spread=${this.uid}`
+				this.val = `${HTTP_REQUEST_URL}?spread=${this.uid}`
 				// #ifdef MP
 				await this.spreadMsg()
 				// #endif

BIN
static/images/download.png


+ 161 - 0
utils/upApp.js

@@ -0,0 +1,161 @@
+import store from '../store/index.js'
+// const baseurl = store.state.baseURL
+const getUpAppUrl = 'https://ygs.hqgjsmc.com/api/version'
+const iosAppStroeUrl =
+	'https://apps.apple.com/cn/app/%E6%98%93%E5%8D%9A%E4%BC%98%E8%B4%AD/id1642267825';
+// 获取app是否需要升级
+export function getUpApp() {
+	// 获取当前运行系统
+	let hj = uni.getSystemInfoSync().platform;
+	// 获取仓库app数据对象
+	let app = store.state.isShowIllegality;
+	// 当前系统为安卓则显示数据
+	if (hj === 'android') {
+		// 设置默认显示数据
+		app = true;
+		// store.commit('changeState', {
+		// 	name: 'app',
+		// 	value: app
+		// });
+	}
+	uni.request({
+		url: getUpAppUrl,
+		method: 'GET',
+		data: {},
+		success: res => {
+			let r = res.data.data;
+			plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
+				// 保存线上版本号
+				let version = r.apk;
+				// 获取线上版本 
+				console.log(r.apk, '+++++++++++')
+				const arr = r.version.split('.');
+
+				// 获取当前系统
+				const arr1 = wgtinfo.version.split('.');
+				console.log(arr,arr1);
+				console.log(arr, arr1);
+				for (let i = 0; i < arr.length; i++) {
+					// 线上版本号
+					const x = +arr[i];
+					// 线下版本号
+					const y = +arr1[i];
+					console.log(arr, arr1, "版本号")
+					// 判断当前版本是否为小于等于线上版本
+					if (x >= y) {
+						console.log('dashabi2020')
+						console.log(x, y)
+						// 只有ios才需要显示
+						if (hj === 'ios') {
+							// 设置显示数据
+							app = true;
+							store.commit('changeState', {
+								name: 'app',
+								value: app
+							});
+						}
+						// 当版本较低时更新数据
+						if (x > y) {
+							uni.showModal({
+								title: '提示',
+								content: '请更新应用',
+								showCancel: false,
+								success(e) {
+									if (hj === 'ios') {
+										plus.runtime.openURL(
+											iosAppStroeUrl
+										);
+									}
+									if (hj === 'android') {
+										// plus.runtime.openURL('http://lxscimg.liuniu946.com/lxscV' + version + '.apk');
+										downApp(version);
+
+									}
+								}
+							});
+							return;
+						}
+					}
+				}
+			});
+		},
+		fail: res => {
+			console.log(res, 'shib');
+		}
+	});
+}
+// 下载app
+export function downApp(version) {
+	console.log(version);
+	uni.navigateTo({
+		url: '/pages/index/downLoad?apk=' + version,
+		fail(err) {
+			console.log(err);
+		}
+	})
+	// dtask = plus.downloader.createDownload(version);
+	// dtask.addEventListener("statechanged", onStateChanged, false);
+	// dtask.start();
+	// uni.showLoading({
+	// 	title: '下载中...',
+	// 	mask: true
+	// });
+	// plus.nativeUI.showWaiting('下载升级包...');
+	// plus.downloader
+	// 	.createDownload(version, {}, (d, status) => {
+	// 		if (status == 200) {
+	// 			installApp(d.filename); // 安装app
+	// 		} else {
+	// 			plus.nativeUI.alert('下载升级包失败!');
+	// 		}
+	// 		plus.nativeUI.closeWaiting();
+	// 	})
+	// 	.start();
+}
+// 监听下载任务状态 
+function onStateChanged(download, status) {
+	switch (download.state) {
+		case 1:
+			// showLoading.setTitle("正在下载");
+			break;
+		case 2:
+			// showLoading.setTitle("已连接到服务器");
+			break;
+		case 3:
+			prg = parseInt( //下载的进度
+				(parseFloat(download.downloadedSize) / parseFloat(download.totalSize)) * 100
+			);
+			// showLoading.setTitle("版本更新,正在下载" + prg + "% ");
+			this.percent = prg;
+			console.log(prg);
+			break;
+		case 4:
+			// plus.nativeUI.closeWaiting(); //关闭系统提示框
+			this.showProcess = false;
+			//下载完成
+			break;
+	}
+
+}
+// 安装app
+export function installApp(path) {
+	plus.nativeUI.showWaiting('安装升级包...');
+	plus.runtime.install(
+		path, {},
+		function() {
+			plus.nativeUI.closeWaiting();
+			uni.showToast({
+				icon: 'none',
+				title: '升级完成,准备重新载入'
+			});
+			setTimeout(_ => {
+				uni.hideToast();
+				plus.runtime.restart();
+			}, 1000);
+		},
+		function(e) {
+			plus.nativeUI.closeWaiting();
+			plus.nativeUI.alert('安装升级包失败[' + e.code + ']:' + e.message);
+		}
+	);
+}