From bed6e22a21e5d29c987d82699b9e75f583c20d47 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Mar 2023 14:02:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?improve:=20=E5=90=8E=E5=8F=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/marketing/live/add_goods.vue    | 34 +++++++++----------
 .../src/pages/setting/verifyOrder/index.vue   |  5 +--
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/template/admin/src/pages/marketing/live/add_goods.vue b/template/admin/src/pages/marketing/live/add_goods.vue
index f27158f9b..98855fa28 100644
--- a/template/admin/src/pages/marketing/live/add_goods.vue
+++ b/template/admin/src/pages/marketing/live/add_goods.vue
@@ -117,23 +117,23 @@ export default {
             });
           },
         },
-        {
-          key: 'cost_price',
-          title: '直播原价',
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                value: params.row.cost_price,
-              },
-              on: {
-                input: (val) => {
-                  this.tabList[params.index].cost_price = val;
-                },
-              },
-            });
-          },
-        },
+        // {
+        //   key: 'cost_price',
+        //   title: '直播原价',
+        //   render: (h, params) => {
+        //     return h('Input', {
+        //       props: {
+        //         type: 'number',
+        //         value: params.row.cost_price,
+        //       },
+        //       on: {
+        //         input: (val) => {
+        //           this.tabList[params.index].cost_price = val;
+        //         },
+        //       },
+        //     });
+        //   },
+        // },
         { key: 'stock', title: '库存' },
         { slot: 'action', fixed: 'right', title: '操作' },
       ],
diff --git a/template/admin/src/pages/setting/verifyOrder/index.vue b/template/admin/src/pages/setting/verifyOrder/index.vue
index 56ec22865..fb633af22 100644
--- a/template/admin/src/pages/setting/verifyOrder/index.vue
+++ b/template/admin/src/pages/setting/verifyOrder/index.vue
@@ -27,7 +27,7 @@
           </Col>
           <Col span="12" class="ivu-text-left">
             <FormItem label="筛选条件：">
-              <Input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 90%">
+              <Input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 430px">
                 <Select v-model="field_key" slot="prepend" style="width: 80px">
                   <Option value="all">全部</Option>
                   <Option value="order_id">订单号</Option>
@@ -41,7 +41,8 @@
           </Col>
           <Col span="12" class="mr">
             <FormItem label="选择门店：" label-for="store_name">
-              <Select v-model="formValidate.store_id" element-id="store_id" clearable @on-change="userSearchs">
+                
+              <Select v-model="formValidate.store_id" element-id="store_id" clearable @on-change="userSearchs" style="width: 430px">
                 <Option v-for="item in storeSelectList" :value="item.id" :key="item.id">{{ item.name }}</Option>
               </Select>
             </FormItem>

From c963500a95d21848ee12fd8e31e9a05cfe00f606 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Mar 2023 14:02:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?improve:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages.json                   | 3165 ++++++++---------
 .../uni-app/pages/admin/delivery/index.vue    | 1221 +++----
 .../uni-app/pages/admin/orderDetail/index.vue |    1 -
 .../pages/extension/customer_list/chat.vue    |    4 +-
 .../uni-app/pages/goods/goods_list/index.vue  |    1 +
 .../pages/goods/order_pay_status/index.vue    |    4 +-
 template/uni-app/pages/user/index.vue         |   46 +-
 7 files changed, 2219 insertions(+), 2223 deletions(-)

diff --git a/template/uni-app/pages.json b/template/uni-app/pages.json
index b80554efb..2d9c22c9b 100644
--- a/template/uni-app/pages.json
+++ b/template/uni-app/pages.json
@@ -1,1589 +1,1580 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页
-		{
-			"path": "pages/guide/index",
-			"style": {
-				"app-plus": {
-					"titleNView": false //禁用原生导航栏
-				}
-			}
-		},
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"scrollIndicator": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/order_addcart/order_addcart",
-			"style": {
-				"navigationBarTitleText": "购物车",
-				"app-plus": {
-					// #ifdef APP-PLUS
-					"titleNView": {
-						"type": "default"
-					}
-					// #endif
-				}
-
-			}
-		},
-		{
-			"path": "pages/user/index",
-			"style": {
-
-				"navigationBarTitleText": "个人中心",
-				"enablePullDownRefresh": true
-					// #ifdef MP || APP-PLUS
-					,
-				"navigationStyle": "custom",
-				// "navigationBarBackgroundColor": "#e93323",
-				"navigationBarTextStyle": "black"
-				// #endif
-			}
-		},
-		{
-			"path": "pages/goods_cate/goods_cate",
-			"style": {
-				"navigationBarTitleText": "商品分类",
-				"app-plus": {
-					// #ifdef APP-PLUS
-					"titleNView": {
-						"type": "default"
-					}
-					// #endif
-				}
-
-			}
-		}
-
-	],
-	"subPackages": [{ // 模块分包
-			"root": "pages/extension",
-			"name": "extension",
-			"pages": [{
-					"path": "customer_list/chat",
-					"style": {
+{
+	"pages": [ //pages数组中第一项表示应用启动页
+		{
+			"path": "pages/guide/index",
+			"style": {
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"scrollIndicator": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order_addcart/order_addcart",
+			"style": {
+				"navigationBarTitleText": "购物车",
+				"app-plus": {
+					// #ifdef APP-PLUS
+					"titleNView": {
+						"type": "default"
+					}
+					// #endif
+				}
+
+			}
+		},
+		{
+			"path": "pages/user/index",
+			"style": {
+
+				"navigationBarTitleText": "个人中心",
+				"enablePullDownRefresh": true
+					// #ifdef MP || APP-PLUS
+					,
+				"navigationStyle": "custom",
+				// "navigationBarBackgroundColor": "#e93323",
+				"navigationBarTextStyle": "black"
+				// #endif
+			}
+		},
+		{
+			"path": "pages/goods_cate/goods_cate",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"app-plus": {
+					// #ifdef APP-PLUS
+					"titleNView": {
+						"type": "default"
+					}
+					// #endif
+				}
+
+			}
+		}
+
+	],
+	"subPackages": [{ // 模块分包
+			"root": "pages/extension",
+			"name": "extension",
+			"pages": [{
+					"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/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": "admin_order_detail/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/lottery_comment",
-					"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_details_store/index",
-					"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": "goods_return/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": "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
-						}
-					}
-				}, {
-					"path": "order_confirm/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_refund_goods/index",
-					"style": {
-						"navigationBarTitleText": "退回商品",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},{
-					"path": "cashier/index",
-					"style": {
-						"navigationBarTitleText": "收银台",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				}
-			]
-		}, {
-			"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": "隐私协议",
-						"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_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
-						}
-					}
-				},
-				{
-					"path": "payment_on_behalf/index",
-					"style": {
-						"navigationBarTitleText": "好友代付",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				}, {
-					"path": "payment_on_behalf/pay_status",
-					"style": {
-						"navigationBarTitleText": "代付成功",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "staff_list/index",
-					"style": {
-						"navigationBarTitleText": "员工列表",
-						"navigationBarBackgroundColor": "#e93323"
-							// #ifdef MP
-							,
-						"navigationBarTextStyle": "#fff"
-						// #endif
-					}
-				}
-				// #ifdef H5
-				,
-				{
-					"path": "auth/index",
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				}
-				// #endif
-			],
-			"plugins": {
-				"live-player-plugin": {
-					"version": "1.3.5",
-					"provider": "wx2b03c6e691cd7370"
-				}
-			}
-		},
-		{
-			"root": "pages/goods_details",
-			"name": "goods_details",
-			"pages": [{
-				"path": "index",
-				"style": {
-					"navigationStyle": "custom",
-					"transparentTitle": "auto",
-					"app-plus": {
-						// #ifdef APP-PLUS
-						"titleNView": {
-							"padding-left": "10px",
-							"padding-right": "10px",
-							"type": "transparent",
-							"buttons": [ //原生标题栏按钮配置,
-								{
-									"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-								}
-							]
-						}
-						// #endif
-					}
-				}
-			}]
-		},
-		{
-			"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": {
-						// #ifdef MP
-						"navigationBarTitleText": "砍价活动",
-						// #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": {
-								"padding-left": "10px",
-								"padding-right": "10px",
-								"type": "transparent",
-								"buttons": [ //原生标题栏按钮配置,
-									{
-										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-									}
-								]
-							}
-							// #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": {
-								"padding-left": "10px",
-								"padding-right": "10px",
-								"type": "transparent",
-								"buttons": [ //原生标题栏按钮配置,
-									{
-										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-									}
-								]
-							}
-							// #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
-						}
-					}
-				}
-			]
-		},
-		{
-			"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
-						}
-					}
-				}
-			]
-		},
-		{
-			"root": "pages/columnGoods",
-			"name": "columnGoods",
-			"pages": [{
-					"path": "HotNewGoods/index",
-					"style": {
-						"navigationBarTitleText": "精品推荐",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "HotNewGoods/feedback",
-					"style": {
-						"navigationBarTitleText": "我的客服",
-						"navigationBarTextStyle": "white",
-						"navigationBarBackgroundColor": "#3A3A3A",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"type": "default"
-							}
-							// #endif
-						}
-					}
-				},
-				{
-					"path": "live_list/index",
-					"style": {
-						"navigationBarTitleText": "精彩内容"
-					}
-				}
-			]
-		},
-		{
-			"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_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
-						}
-
-					}
-				},
-				{
-					"path": "settled/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": {
-						"navigationStyle": "custom",
-						"app-plus": {
-							// #ifdef APP-PLUS
-							"titleNView": {
-								"padding-left": "10px",
-								"padding-right": "10px",
-								"type": "transparent",
-								"buttons": [ //原生标题栏按钮配置,
-									{
-										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
-									}
-								]
-							}
-							// #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
-						}
-					}
-				}
-			]
-		}
-	],
-	"tabBar": { // 底部菜单
-		"color": "#282828",
-		"selectedColor": "#ff3366",
-		"borderStyle": "white",
-		"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/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函数里面得到
-		}]
-	},
-	"embeddedAppIdList": ["wxef277996acc166c3"] //通联支付appid
+						"navigationBarBackgroundColor": "#3875EA",
+						"navigationBarTextStyle": "white"
+					}
+				},
+				{
+					"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/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": "admin_order_detail/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/lottery_comment",
+					"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_details_store/index",
+					"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": "goods_return/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": "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
+						}
+					}
+				}, {
+					"path": "order_confirm/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_refund_goods/index",
+					"style": {
+						"navigationBarTitleText": "退回商品",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "cashier/index",
+					"style": {
+						"navigationBarTitleText": "收银台",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}
+			]
+		}, {
+			"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": "隐私协议",
+						"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_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
+						}
+					}
+				},
+				{
+					"path": "payment_on_behalf/index",
+					"style": {
+						"navigationBarTitleText": "好友代付",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				}, {
+					"path": "payment_on_behalf/pay_status",
+					"style": {
+						"navigationBarTitleText": "代付成功",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "staff_list/index",
+					"style": {
+						"navigationBarTitleText": "员工列表",
+						"navigationBarBackgroundColor": "#e93323"
+							// #ifdef MP
+							,
+						"navigationBarTextStyle": "#fff"
+						// #endif
+					}
+				}
+				// #ifdef H5
+				,
+				{
+					"path": "auth/index",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+				// #endif
+			],
+			"plugins": {
+				"live-player-plugin": {
+					"version": "1.3.5",
+					"provider": "wx2b03c6e691cd7370"
+				}
+			}
+		},
+		{
+			"root": "pages/goods_details",
+			"name": "goods_details",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationStyle": "custom",
+					"transparentTitle": "auto",
+					"app-plus": {
+						// #ifdef APP-PLUS
+						"titleNView": {
+							"padding-left": "10px",
+							"padding-right": "10px",
+							"type": "transparent",
+							"buttons": [ //原生标题栏按钮配置,
+								{
+									"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+								}
+							]
+						}
+						// #endif
+					}
+				}
+			}]
+		},
+		{
+			"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": {
+						// #ifdef MP
+						"navigationBarTitleText": "砍价活动",
+						// #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": {
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
+							}
+							// #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": {
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
+							}
+							// #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
+						}
+					}
+				}
+			]
+		},
+		{
+			"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
+						}
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/columnGoods",
+			"name": "columnGoods",
+			"pages": [{
+					"path": "HotNewGoods/index",
+					"style": {
+						"navigationBarTitleText": "精品推荐",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "HotNewGoods/feedback",
+					"style": {
+						"navigationBarTitleText": "我的客服",
+						"navigationBarTextStyle": "white",
+						"navigationBarBackgroundColor": "#3A3A3A",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
+				{
+					"path": "live_list/index",
+					"style": {
+						"navigationBarTitleText": "精彩内容"
+					}
+				}
+			]
+		},
+		{
+			"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_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
+						}
+
+					}
+				},
+				{
+					"path": "settled/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": {
+						"navigationStyle": "custom",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"padding-left": "10px",
+								"padding-right": "10px",
+								"type": "transparent",
+								"buttons": [ //原生标题栏按钮配置,
+									{
+										"type": "menu" //原生标题栏增加分享按钮，点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听
+									}
+								]
+							}
+							// #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
+						}
+					}
+				}
+			]
+		}
+	],
+	"tabBar": { // 底部菜单
+		"color": "#282828",
+		"selectedColor": "#ff3366",
+		"borderStyle": "white",
+		"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/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函数里面得到
+		}]
+	},
+	"embeddedAppIdList": ["wxef277996acc166c3"] //通联支付appid
 }
diff --git a/template/uni-app/pages/admin/delivery/index.vue b/template/uni-app/pages/admin/delivery/index.vue
index 2ee4d2bdc..f1898df0e 100644
--- a/template/uni-app/pages/admin/delivery/index.vue
+++ b/template/uni-app/pages/admin/delivery/index.vue
@@ -1,610 +1,613 @@
-<template>
-	<view class="deliver-goods">
-		<header>
-			<view class="order-num acea-row row-between-wrapper">
-				<view class="num line1">{{$t(`订单号`)}}：{{ order_id }}</view>
-				<view class="name line1">
-					<span class="iconfont icon-yonghu2"></span>{{ delivery.nickname }}
-				</view>
-			</view>
-			<view class="address">
-				<view class="name">
-					{{ delivery.real_name
-          }}<span class="phone">{{ delivery.user_phone }}</span>
-				</view>
-				<view>{{ delivery.user_address }}</view>
-			</view>
-			<view class="line">
-				<image src="@/static/images/line.jpg" />
-			</view>
-		</header>
-		<view class="wrapper">
-			<view class="item acea-row row-between-wrapper">
-				<view>{{$t(`发货方式`)}}</view>
-				<view class="mode acea-row row-middle row-right">
-					<view class="goods" :class="active === index ? 'on' : ''" v-for="(item, index) in types"
-						:key="index" @click="changeType(item, index)">
-						{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
-					</view>
-				</view>
-			</view>
-			<block v-if="logistics.length>0">
-				<view class="list" v-show="active === 0">
-					<view class="item acea-row row-between-wrapper" v-if="delivery.config_export_open == 1">
-						<view>{{$t(`发货类型`)}}</view>
-						<view class="mode acea-row row-middle row-right">
-							<view class="goods" :class="curExpress === item.key ? 'on' : ''"
-								v-for="(item, index) in expressType" :key="index" @click="changeExpTpe(item, index)">
-								{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
-							</view>
-						</view>
-					</view>
-					<block v-if="curExpress == 1">
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`快递公司`)}}</view>
-							<view class="select-box">
-								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics"
-									range-key="name">
-									<!-- <view></view> -->
-									<view class="uni-input">{{logistics[seIndex].name}}</view>
-								</picker>
-							</view>
-						</view>
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`快递单号`)}}</view>
-							<input type="text" :placeholder="$t(`填写快递单号`)" v-model="delivery_id" class="mode" />
-							<!-- #ifdef MP -->
-							<text class="iconfont icon-xiangji" @click="scanCode"></text>
-							<!-- #endif -->
-							<!-- #ifdef H5 -->
-							<text v-if="isWeixin" class="iconfont icon-xiangji" @click="scanCode"></text>
-							<!-- #endif -->
-							<text class="trip" v-if="curExpress == 1">{{$t(`顺丰请输入单号 :收件人或寄件人手机号后四位`)}}</text>
-							<text class="trip" v-if="curExpress == 1">{{$t(`例如：SF000000000000:3941`)}}</text>
-						</view>
-					</block>
-					<block v-if="curExpress == 2">
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`快递公司`)}}</view>
-							<view class="select-box">
-								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics"
-									range-key="name">
-									<!-- <view></view> -->
-									<view class="uni-input">{{logistics[seIndex].name}}</view>
-								</picker>
-							</view>
-						</view>
-						<view class="item acea-row row-between-wrapper" v-if="expTemp.length>0">
-							<view>{{$t(`电子面单`)}}</view>
-							<div style="display: flex;align-items: center;">
-								<picker class="pickerBox" @change="bindTempChange" :value="expIndex" :range="expTemp"
-									range-key="title">
-									<view class="uni-input">{{expTemp[expIndex].title}}</view>
-								</picker>
-								<div class="look" @click="previewImage">{{$t(`预览`)}}</div>
-							</div>
-
-						</view>
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`寄件人姓名`)}}：</view>
-							<input type="text" :placeholder="$t(`填写寄件人姓名`)" v-model="to_name" class="mode" />
-						</view>
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`寄件人电话`)}}：</view>
-							<input type="text" :placeholder="$t(`填写寄件人电话`)" v-model="to_tel" class="mode" />
-						</view>
-						<view class="item acea-row row-between-wrapper">
-							<view>{{$t(`寄件人地址`)}}：</view>
-							<input type="text" :placeholder="$t(`填写寄件人地址`)" v-model="to_addr" class="mode" />
-						</view>
-					</block>
-				</view>
-			</block>
-
-			<view class="list" v-show="active === 1">
-				<view class="item acea-row row-between-wrapper">
-					<view>{{$t(`送货人`)}}</view>
-					<view class="select-box" v-if="postPeople.length>0">
-						<picker class="pickerBox" @change="bindPostChange" :value="postIndex" :range="postPeople"
-							range-key="wx_name">
-							<!-- <view></view> -->
-							<view class="uni-input">{{postPeople[postIndex].wx_name}}</view>
-						</picker>
-					</view>
-				</view>
-			</view>
-			<textarea v-show="active === 2" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
-				:placeholder="$t(`remark`)" :maxlength="500" auto-height />
-		</view>
-		<view style="height:1.2rem;"></view>
-		<view class="confirm" @click="saveInfo">{{$t(`确认提交`)}}</view>
-	</view>
-</template>
-<script>
-	import {
-		getAdminOrderDelivery,
-		setAdminOrderDelivery,
-		getLogistics,
-		orderExportTemp,
-		orderDeliveryInfo,
-		orderOrderDelivery
-	} from "@/api/admin";
-	import {
-		checkPhone
-	} from '@/utils/validate.js'
-	export default {
-		name: "GoodsDeliver",
-		components: {},
-		props: {},
-		data: function() {
-			return {
-				types: [{
-						type: "express",
-						title: this.$t(`发货`),
-						key: 1
-					},
-					{
-						type: "send",
-						title: this.$t(`送货`),
-						key: 2
-					},
-					{
-						type: "fictitious",
-						title: this.$t(`无需物流`),
-						key: 3
-					}
-				],
-				expressType: [{
-						title: this.$t(`手动填写`),
-						key: 1
-					},
-					{
-						title: this.$t(`电子面单打印`),
-						key: 2
-					},
-				],
-				curExpress: 1,
-				active: 0,
-				order_id: "",
-				delivery: [],
-				logistics: [],
-				delivery_type: "1",
-				delivery_name: "",
-				delivery_id: "",
-				seIndex: 0,
-				expIndex: 0,
-				expTemp: [], // 快递模板
-				to_name: '', // 发货人名称	
-				to_tel: '', // 发货人电话	
-				to_addr: "", // 发货人地址	
-				postPeople: [], //配送人
-				postIndex: 0,
-				fictitious_content: '',
-				// #ifdef H5
-				isWeixin: this.$wechat.isWeixin()
-				// #endif
-			};
-		},
-		watch: {
-			"$route.params.oid": function(newVal) {
-				let that = this;
-				if (newVal != undefined) {
-					that.order_id = newVal;
-					that.getIndex();
-				}
-			}
-		},
-		onLoad: function(option) {
-			this.order_id = option.id;
-			this.getIndex();
-			this.getLogistics();
-			this.orderDeliveryInfo()
-			this.geTorderOrderDelivery()
-		},
-		methods: {
-			// 扫描快递单号一维码
-			scanCode() {
-				// #ifdef MP
-				let that = this;
-				uni.scanCode({
-					scanType: ['barCode'],
-					success(res) {
-						that.delivery_id = res.result.replace('CODE_128,', '');
-					}
-				})
-				// #endif
-				// #ifdef H5
-				if (this.$wechat.isWeixin()) {
-					this.$wechat.wechatEvevt('scanQRCode', {
-						needResult: 1,
-						scanType: ['barCode']
-					}).then(res => {
-						this.delivery_id = res.resultStr.replace('CODE_128,', '');
-					});
-				}
-				// #endif
-			},
-			// 预览图片
-			previewImage() {
-				uni.previewImage({
-					urls: [this.expTemp[this.expIndex].pic],
-					success: function() {
-
-					},
-					fail: function(error) {
-
-					}
-				});
-			},
-			// 获取配送员列表
-			geTorderOrderDelivery() {
-				orderOrderDelivery().then(res => {
-					this.postPeople = res.data
-				})
-			},
-			// 配送员选择
-			bindPostChange(e) {
-				this.postIndex = e.detail.value
-			},
-			// 选择发货类型
-			changeExpTpe(item, index) {
-				this.curExpress = item.key
-				this.getLogistics(index || '');
-			},
-			changeType: function(item, index) {
-				this.active = index;
-				this.delivery_type = item.key;
-			},
-			getIndex: function() {
-				let that = this;
-				getAdminOrderDelivery(that.order_id).then(
-					res => {
-						that.delivery = res.data;
-					},
-					error => {
-						that.$util.Tips({
-							title: error
-						})
-					}
-				);
-			},
-			getLogistics(status) {
-				let that = this;
-				getLogistics({
-					status
-				}).then(
-					res => {
-						that.logistics = res.data;
-						that.getExpTemp(res.data[0].code)
-					},
-					error => {
-						that.$util.Tips({
-							title: error
-						})
-					}
-				);
-			},
-			async saveInfo() {
-				let that = this,
-					delivery_type = that.delivery_type,
-					delivery_name = that.logistics[that.seIndex].name,
-					delivery_id = that.delivery_id,
-					userName = that.delivery_name,
-					save = {};
-				save.delivery_type = delivery_name;
-				save.delivery_code = that.logistics[that.seIndex].code
-				save.delivery_name = that.logistics[that.seIndex].id
-				save.type = that.active + 1
-				if (delivery_type == 1 && this.curExpress == 1) {
-					if (!delivery_id) {
-						return this.$util.Tips({
-							title: that.$t(`填写快递单号`)
-						})
-					}
-					save.express_record_type = that.curExpress
-					save.delivery_id = delivery_id
-					that.setInfo(save);
-				}
-
-				if (delivery_type == 1 && this.curExpress == 2) {
-					if (!that.to_name) {
-						return this.$util.Tips({
-							title: that.$t(`填写寄件人姓名`)
-						})
-					}
-					if (!that.to_tel) {
-						return this.$util.Tips({
-							title: that.$t(`填写寄件人电话`)
-						})
-					}
-					if (!(/^1[3456789]\d{9}$/.test(that.to_tel))) {
-						return this.$util.Tips({
-							title: that.$t(`填写寄件人电话`)
-						})
-					}
-					if (!that.to_addr) {
-						return this.$util.Tips({
-							title: that.$t(`填写寄件人地址`) 
-						})
-					}
-					if (that.expTemp.length == 0) {
-						return this.$util.Tips({
-							title: that.$t(`请选择电子面单`)
-						})
-					}
-					save.express_record_type = that.curExpress
-					save.to_name = that.to_name
-					save.to_tel = that.to_tel
-					save.to_addr = that.to_addr
-					save.express_temp_id = that.expTemp[that.expIndex].temp_id
-					that.setInfo(save);
-				}
-				if (delivery_type == 2) {
-					let obj = this.postPeople[this.postIndex]
-					let params = {}
-					params.type = that.delivery_type
-					params.sh_delivery_name = obj.wx_name
-					params.sh_delivery_id = obj.phone
-					params.sh_delivery_uid = obj.uid
-					that.setInfo(params);
-				}
-				if (delivery_type == 3) {
-					let params = {}
-					params.type = that.delivery_type;
-					params.fictitious_content = that.fictitious_content;
-					that.setInfo(params);
-				}
-				// switch (delivery_type) {
-				// 	case "2":
-				// 		if (!userName) {
-				// 			return that.$util.Tips({
-				// 				title: '请填写送货人姓名'
-				// 			})
-				// 		}
-				// 		if (!delivery_id || !checkPhone(delivery_id)) {
-				// 			return that.$util.Tips({
-				// 				title: '请填写正确的手机号码'
-				// 			})
-				// 		}
-				// 		save.delivery_name = userName;
-				// 		save.delivery_id = delivery_id;
-				// 		that.setInfo(save);
-				// 		break;
-				// 	case "1":
-				// 		if (!delivery_id) {
-				// 			return this.$util.Tips({
-				// 				title: '请填写快递单号'
-				// 			})
-				// 		}
-				// 		save.delivery_name = delivery_name;
-				// 		save.delivery_id = delivery_id;
-				// 		that.setInfo(save);
-				// 		break;
-				// 	case "3":
-				// 		that.setInfo(save);
-				// 		break;
-				// }
-			},
-			setInfo: function(item) {
-				let that = this;
-				setAdminOrderDelivery(that.delivery.id, item).then(
-					res => {
-						that.$util.Tips({
-							title: res.msg,
-							icon: 'success',
-							mask: true
-						})
-						setTimeout(res => {
-							uni.navigateBack();
-						}, 2000)
-					},
-					error => {
-						that.$util.Tips({
-							title: error
-						})
-					}
-				);
-			},
-			bindPickerChange(e) {
-				this.seIndex = e.detail.value
-				this.getExpTemp(this.logistics[e.detail.value].code)
-
-			},
-			bindTempChange(e) {
-				this.expIndex = e.detail.value
-			},
-			getExpTemp(code) {
-				orderExportTemp({
-					com: code
-				}).then(res => {
-					this.expTemp = res.data.data
-				})
-			},
-			// 获取订单打印默认配置
-			orderDeliveryInfo() {
-				orderDeliveryInfo().then(res => {
-					this.to_name = res.data.to_name;
-					this.to_tel = res.data.to_tel;
-					this.to_addr = res.data.to_add;
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	/*发货*/
-	.deliver-goods header {
-		width: 100%;
-		background-color: #fff;
-		margin-top: 10upx;
-	}
-
-	.deliver-goods header .order-num {
-		padding: 0 30upx;
-		border-bottom: 1px solid #f5f5f5;
-		height: 67upx;
-	}
-
-	.deliver-goods header .order-num .num {
-		width: 430upx;
-		font-size: 26upx;
-		color: #282828;
-		position: relative;
-	}
-
-	.deliver-goods header .order-num .num:after {
-		position: absolute;
-		content: '';
-		width: 1px;
-		height: 30upx;
-		background-color: #ddd;
-		top: 50%;
-		margin-top: -15upx;
-		right: 0;
-	}
-
-	.deliver-goods header .order-num .name {
-		width: 260upx;
-		font-size: 26upx;
-		color: #282828;
-		text-align: center;
-	}
-
-	.deliver-goods header .order-num .name .iconfont {
-		font-size: 35upx;
-		color: #477ef3;
-		vertical-align: middle;
-		margin-right: 10upx;
-	}
-
-	.deliver-goods header .address {
-		font-size: 26upx;
-		color: #868686;
-		background-color: #fff;
-		padding: 30upx;
-	}
-
-	.deliver-goods header .address .name {
-		font-size: 34upx;
-		color: #282828;
-		margin-bottom: 10upx;
-	}
-
-	.deliver-goods header .address .name .phone {
-		margin-left: 40upx;
-	}
-
-	.deliver-goods header .line {
-		width: 100%;
-		height: 3upx;
-	}
-
-	.deliver-goods header .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.deliver-goods .wrapper {
-		width: 100%;
-		background-color: #fff;
-	}
-
-	.deliver-goods .wrapper .item {
-		border-bottom: 1px solid #f0f0f0;
-		padding: 0 30upx;
-		height: 96upx;
-		font-size: 32upx;
-		color: #282828;
-		position: relative;
-	}
-
-	.deliver-goods .wrapper .item .mode {
-		width: 460upx;
-		height: 100%;
-		text-align: right;
-	}
-
-	.deliver-goods .wrapper .item .mode .iconfont {
-		font-size: 30upx;
-		margin-left: 13upx;
-	}
-
-	.deliver-goods .wrapper .item .mode .goods~.goods {
-		margin-left: 30upx;
-	}
-
-	.deliver-goods .wrapper .item .mode .goods {
-		color: #bbb;
-	}
-
-	.deliver-goods .wrapper .item .mode .goods.on {
-		color: #477ef3;
-	}
-
-	.deliver-goods .wrapper .item .icon-up {
-		position: absolute;
-		font-size: 35upx;
-		color: #2c2c2c;
-		right: 30upx;
-	}
-
-	.deliver-goods .wrapper .item select {
-		direction: rtl;
-		padding-right: 60upx;
-		position: relative;
-		z-index: 2;
-	}
-
-	.deliver-goods .wrapper .item input::placeholder {
-		color: #bbb;
-	}
-
-	.deliver-goods .confirm {
-		font-size: 32upx;
-		color: #fff;
-		width: 100%;
-		height: 100upx;
-		background-color: #477ef3;
-		text-align: center;
-		line-height: 100upx;
-		position: fixed;
-		bottom: 0;
-	}
-
-	.select-box {
-		flex: 1;
-		height: 100%;
-
-		.pickerBox {
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			width: 100%;
-			height: 100%;
-		}
-	}
-
-	.look {
-		margin-left: 20rpx;
-		color: #1890FF;
-	}
-
-	.textarea {
-		display: block;
-		min-height: 192rpx;
-		padding: 30rpx;
-	}
-
-	.icon-xiangji {
-		font-size: 35rpx;
-		color: #477ef3;
-	}
-
-	.trip {
-		font-size: 22rpx;
-		color: #ccc;
-		padding: 6rpx 10rpx;
-	}
+<template>
+	<view class="deliver-goods">
+		<header>
+			<view class="order-num acea-row row-between-wrapper">
+				<view class="num line1">{{$t(`订单号`)}}：{{ order_id }}</view>
+				<view class="name line1">
+					<span class="iconfont icon-yonghu2"></span>{{ delivery.nickname }}
+				</view>
+			</view>
+			<view class="address">
+				<view class="name">
+					{{ delivery.real_name
+          }}<span class="phone">{{ delivery.user_phone }}</span>
+				</view>
+				<view>{{ delivery.user_address }}</view>
+			</view>
+			<view class="line">
+				<image src="@/static/images/line.jpg" />
+			</view>
+		</header>
+		<view class="wrapper">
+			<view class="item acea-row row-between-wrapper">
+				<view>{{$t(`发货方式`)}}</view>
+				<view class="mode acea-row row-middle row-right">
+					<view class="goods" :class="active === item.key ? 'on' : ''" v-for="(item, index) in types"
+						:key="index" @click="changeType(item, index)">
+						{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
+					</view>
+				</view>
+			</view>
+			<block v-if="logistics.length>0">
+				<view class="list" v-show="active === 1">
+					<view class="item acea-row row-between-wrapper" v-if="delivery.config_export_open == 1">
+						<view>{{$t(`发货类型`)}}</view>
+						<view class="mode acea-row row-middle row-right">
+							<view class="goods" :class="curExpress === item.key ? 'on' : ''"
+								v-for="(item, index) in expressType" :key="index" @click="changeExpTpe(item, index)">
+								{{ item.title }}<span class="iconfont icon-xuanzhong2"></span>
+							</view>
+						</view>
+					</view>
+					<block v-if="curExpress == 1">
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`快递公司`)}}</view>
+							<view class="select-box">
+								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics"
+									range-key="name">
+									<!-- <view></view> -->
+									<view class="uni-input">{{logistics[seIndex].name}}</view>
+								</picker>
+							</view>
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`快递单号`)}}</view>
+							<input type="text" :placeholder="$t(`填写快递单号`)" v-model="delivery_id" class="mode" />
+							<!-- #ifdef MP -->
+							<text class="iconfont icon-xiangji" @click="scanCode"></text>
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<text v-if="isWeixin" class="iconfont icon-xiangji" @click="scanCode"></text>
+							<!-- #endif -->
+							<text class="trip" v-if="curExpress == 1">{{$t(`顺丰请输入单号 :收件人或寄件人手机号后四位`)}}</text>
+							<text class="trip" v-if="curExpress == 1">{{$t(`例如：SF000000000000:3941`)}}</text>
+						</view>
+					</block>
+					<block v-if="curExpress == 2">
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`快递公司`)}}</view>
+							<view class="select-box">
+								<picker class="pickerBox" @change="bindPickerChange" :value="seIndex" :range="logistics"
+									range-key="name">
+									<!-- <view></view> -->
+									<view class="uni-input">{{logistics[seIndex].name}}</view>
+								</picker>
+							</view>
+						</view>
+						<view class="item acea-row row-between-wrapper" v-if="expTemp.length>0">
+							<view>{{$t(`电子面单`)}}</view>
+							<div style="display: flex;align-items: center;">
+								<picker class="pickerBox" @change="bindTempChange" :value="expIndex" :range="expTemp"
+									range-key="title">
+									<view class="uni-input">{{expTemp[expIndex].title}}</view>
+								</picker>
+								<div class="look" @click="previewImage">{{$t(`预览`)}}</div>
+							</div>
+
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`寄件人姓名`)}}：</view>
+							<input type="text" :placeholder="$t(`填写寄件人姓名`)" v-model="to_name" class="mode" />
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`寄件人电话`)}}：</view>
+							<input type="text" :placeholder="$t(`填写寄件人电话`)" v-model="to_tel" class="mode" />
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>{{$t(`寄件人地址`)}}：</view>
+							<input type="text" :placeholder="$t(`填写寄件人地址`)" v-model="to_addr" class="mode" />
+						</view>
+					</block>
+				</view>
+			</block>
+
+			<view class="list" v-show="active === 2">
+				<view class="item acea-row row-between-wrapper">
+					<view>{{$t(`送货人`)}}</view>
+					<view class="select-box" v-if="postPeople.length>0">
+						<picker class="pickerBox" @change="bindPostChange" :value="postIndex" :range="postPeople"
+							range-key="wx_name">
+							<!-- <view></view> -->
+							<view class="uni-input">{{postPeople[postIndex].wx_name}}</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<textarea v-show="active === 3" v-model="fictitious_content" class="textarea" @blur="bindTextAreaBlur"
+				:placeholder="$t(`备注`)" :maxlength="500" auto-height />
+		</view>
+		<view style="height:1.2rem;"></view>
+		<view class="confirm" @click="saveInfo">{{$t(`确认提交`)}}</view>
+	</view>
+</template>
+<script>
+	import {
+		getAdminOrderDelivery,
+		setAdminOrderDelivery,
+		getLogistics,
+		orderExportTemp,
+		orderDeliveryInfo,
+		orderOrderDelivery
+	} from "@/api/admin";
+	import {
+		checkPhone
+	} from '@/utils/validate.js'
+	export default {
+		name: "GoodsDeliver",
+		components: {},
+		props: {},
+		data: function() {
+			return {
+				types: [{
+						type: "express",
+						title: this.$t(`发货`),
+						key: 1
+					},
+
+					{
+						type: "fictitious",
+						title: this.$t(`无需物流`),
+						key: 3
+					}
+				],
+				expressType: [{
+						title: this.$t(`手动填写`),
+						key: 1
+					},
+					{
+						title: this.$t(`电子面单打印`),
+						key: 2
+					},
+				],
+				curExpress: 1,
+				active: 1,
+				order_id: "",
+				delivery: [],
+				logistics: [],
+				delivery_type: "1",
+				delivery_name: "",
+				delivery_id: "",
+				seIndex: 0,
+				expIndex: 0,
+				expTemp: [], // 快递模板
+				to_name: '', // 发货人名称	
+				to_tel: '', // 发货人电话	
+				to_addr: "", // 发货人地址	
+				postPeople: [], //配送人
+				postIndex: 0,
+				fictitious_content: '',
+				// #ifdef H5
+				isWeixin: this.$wechat.isWeixin()
+				// #endif
+			};
+		},
+		watch: {
+			"$route.params.oid": function(newVal) {
+				let that = this;
+				if (newVal != undefined) {
+					that.order_id = newVal;
+					that.getIndex();
+				}
+			}
+		},
+		onLoad: function(option) {
+			this.order_id = option.id;
+			this.getIndex();
+			this.getLogistics();
+			this.orderDeliveryInfo()
+			this.geTorderOrderDelivery()
+		},
+		methods: {
+			// 扫描快递单号一维码
+			scanCode() {
+				// #ifdef MP
+				let that = this;
+				uni.scanCode({
+					scanType: ['barCode'],
+					success(res) {
+						that.delivery_id = res.result.replace('CODE_128,', '');
+					}
+				})
+				// #endif
+				// #ifdef H5
+				if (this.$wechat.isWeixin()) {
+					this.$wechat.wechatEvevt('scanQRCode', {
+						needResult: 1,
+						scanType: ['barCode']
+					}).then(res => {
+						this.delivery_id = res.resultStr.replace('CODE_128,', '');
+					});
+				}
+				// #endif
+			},
+			// 预览图片
+			previewImage() {
+				uni.previewImage({
+					urls: [this.expTemp[this.expIndex].pic],
+					success: function() {
+
+					},
+					fail: function(error) {
+
+					}
+				});
+			},
+			// 获取配送员列表
+			geTorderOrderDelivery() {
+				orderOrderDelivery().then(res => {
+					if (res.data.length) {
+						this.postPeople = res.data
+						this.types.push({
+							type: "send",
+							title: this.$t(`送货`),
+							key: 2
+						})
+					}
+				})
+			},
+			// 配送员选择
+			bindPostChange(e) {
+				this.postIndex = e.detail.value
+			},
+			// 选择发货类型
+			changeExpTpe(item, index) {
+				this.curExpress = item.key
+				this.getLogistics(index || '');
+			},
+			changeType: function(item, index) {
+				this.active = item.key;
+				this.delivery_type = item.key;
+			},
+			getIndex: function() {
+				let that = this;
+				getAdminOrderDelivery(that.order_id).then(
+					res => {
+						that.delivery = res.data;
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			getLogistics(status) {
+				let that = this;
+				getLogistics({
+					status
+				}).then(
+					res => {
+						that.logistics = res.data;
+						that.getExpTemp(res.data[0].code)
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			async saveInfo() {
+				let that = this,
+					delivery_type = that.delivery_type,
+					delivery_name = that.logistics[that.seIndex].name,
+					delivery_id = that.delivery_id,
+					userName = that.delivery_name,
+					save = {};
+				save.delivery_type = delivery_name;
+				save.delivery_code = that.logistics[that.seIndex].code
+				save.delivery_name = that.logistics[that.seIndex].id
+				save.type = that.active + 1
+				if (delivery_type == 1 && this.curExpress == 1) {
+					if (!delivery_id) {
+						return this.$util.Tips({
+							title: that.$t(`填写快递单号`)
+						})
+					}
+					save.express_record_type = that.curExpress
+					save.delivery_id = delivery_id
+					that.setInfo(save);
+				}
+
+				if (delivery_type == 1 && this.curExpress == 2) {
+					if (!that.to_name) {
+						return this.$util.Tips({
+							title: that.$t(`填写寄件人姓名`)
+						})
+					}
+					if (!that.to_tel) {
+						return this.$util.Tips({
+							title: that.$t(`填写寄件人电话`)
+						})
+					}
+					if (!(/^1[3456789]\d{9}$/.test(that.to_tel))) {
+						return this.$util.Tips({
+							title: that.$t(`填写寄件人电话`)
+						})
+					}
+					if (!that.to_addr) {
+						return this.$util.Tips({
+							title: that.$t(`填写寄件人地址`)
+						})
+					}
+					if (that.expTemp.length == 0) {
+						return this.$util.Tips({
+							title: that.$t(`请选择电子面单`)
+						})
+					}
+					save.express_record_type = that.curExpress
+					save.to_name = that.to_name
+					save.to_tel = that.to_tel
+					save.to_addr = that.to_addr
+					save.express_temp_id = that.expTemp[that.expIndex].temp_id
+					that.setInfo(save);
+				}
+				if (delivery_type == 2) {
+					let obj = this.postPeople[this.postIndex]
+					let params = {}
+					params.type = that.delivery_type
+					params.sh_delivery_name = obj.wx_name
+					params.sh_delivery_id = obj.phone
+					params.sh_delivery_uid = obj.uid
+					that.setInfo(params);
+				}
+				if (delivery_type == 3) {
+					let params = {}
+					params.type = that.delivery_type;
+					params.fictitious_content = that.fictitious_content;
+					that.setInfo(params);
+				}
+				// switch (delivery_type) {
+				// 	case "2":
+				// 		if (!userName) {
+				// 			return that.$util.Tips({
+				// 				title: '请填写送货人姓名'
+				// 			})
+				// 		}
+				// 		if (!delivery_id || !checkPhone(delivery_id)) {
+				// 			return that.$util.Tips({
+				// 				title: '请填写正确的手机号码'
+				// 			})
+				// 		}
+				// 		save.delivery_name = userName;
+				// 		save.delivery_id = delivery_id;
+				// 		that.setInfo(save);
+				// 		break;
+				// 	case "1":
+				// 		if (!delivery_id) {
+				// 			return this.$util.Tips({
+				// 				title: '请填写快递单号'
+				// 			})
+				// 		}
+				// 		save.delivery_name = delivery_name;
+				// 		save.delivery_id = delivery_id;
+				// 		that.setInfo(save);
+				// 		break;
+				// 	case "3":
+				// 		that.setInfo(save);
+				// 		break;
+				// }
+			},
+			setInfo: function(item) {
+				let that = this;
+				setAdminOrderDelivery(that.delivery.id, item).then(
+					res => {
+						that.$util.Tips({
+							title: res.msg,
+							icon: 'success',
+							mask: true
+						})
+						setTimeout(res => {
+							uni.navigateBack();
+						}, 2000)
+					},
+					error => {
+						that.$util.Tips({
+							title: error
+						})
+					}
+				);
+			},
+			bindPickerChange(e) {
+				this.seIndex = e.detail.value
+				this.getExpTemp(this.logistics[e.detail.value].code)
+
+			},
+			bindTempChange(e) {
+				this.expIndex = e.detail.value
+			},
+			getExpTemp(code) {
+				orderExportTemp({
+					com: code
+				}).then(res => {
+					this.expTemp = res.data.data
+				})
+			},
+			// 获取订单打印默认配置
+			orderDeliveryInfo() {
+				orderDeliveryInfo().then(res => {
+					this.to_name = res.data.to_name;
+					this.to_tel = res.data.to_tel;
+					this.to_addr = res.data.to_add;
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	/*发货*/
+	.deliver-goods header {
+		width: 100%;
+		background-color: #fff;
+		margin-top: 10upx;
+	}
+
+	.deliver-goods header .order-num {
+		padding: 0 30upx;
+		border-bottom: 1px solid #f5f5f5;
+		height: 67upx;
+	}
+
+	.deliver-goods header .order-num .num {
+		width: 430upx;
+		font-size: 26upx;
+		color: #282828;
+		position: relative;
+	}
+
+	.deliver-goods header .order-num .num:after {
+		position: absolute;
+		content: '';
+		width: 1px;
+		height: 30upx;
+		background-color: #ddd;
+		top: 50%;
+		margin-top: -15upx;
+		right: 0;
+	}
+
+	.deliver-goods header .order-num .name {
+		width: 260upx;
+		font-size: 26upx;
+		color: #282828;
+		text-align: center;
+	}
+
+	.deliver-goods header .order-num .name .iconfont {
+		font-size: 35upx;
+		color: #477ef3;
+		vertical-align: middle;
+		margin-right: 10upx;
+	}
+
+	.deliver-goods header .address {
+		font-size: 26upx;
+		color: #868686;
+		background-color: #fff;
+		padding: 30upx;
+	}
+
+	.deliver-goods header .address .name {
+		font-size: 34upx;
+		color: #282828;
+		margin-bottom: 10upx;
+	}
+
+	.deliver-goods header .address .name .phone {
+		margin-left: 40upx;
+	}
+
+	.deliver-goods header .line {
+		width: 100%;
+		height: 3upx;
+	}
+
+	.deliver-goods header .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.deliver-goods .wrapper {
+		width: 100%;
+		background-color: #fff;
+	}
+
+	.deliver-goods .wrapper .item {
+		border-bottom: 1px solid #f0f0f0;
+		padding: 0 30upx;
+		height: 96upx;
+		font-size: 32upx;
+		color: #282828;
+		position: relative;
+	}
+
+	.deliver-goods .wrapper .item .mode {
+		width: 460upx;
+		height: 100%;
+		text-align: right;
+	}
+
+	.deliver-goods .wrapper .item .mode .iconfont {
+		font-size: 30upx;
+		margin-left: 13upx;
+	}
+
+	.deliver-goods .wrapper .item .mode .goods~.goods {
+		margin-left: 30upx;
+	}
+
+	.deliver-goods .wrapper .item .mode .goods {
+		color: #bbb;
+	}
+
+	.deliver-goods .wrapper .item .mode .goods.on {
+		color: #477ef3;
+	}
+
+	.deliver-goods .wrapper .item .icon-up {
+		position: absolute;
+		font-size: 35upx;
+		color: #2c2c2c;
+		right: 30upx;
+	}
+
+	.deliver-goods .wrapper .item select {
+		direction: rtl;
+		padding-right: 60upx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.deliver-goods .wrapper .item input::placeholder {
+		color: #bbb;
+	}
+
+	.deliver-goods .confirm {
+		font-size: 32upx;
+		color: #fff;
+		width: 100%;
+		height: 100upx;
+		background-color: #477ef3;
+		text-align: center;
+		line-height: 100upx;
+		position: fixed;
+		bottom: 0;
+	}
+
+	.select-box {
+		flex: 1;
+		height: 100%;
+
+		.pickerBox {
+			display: flex;
+			align-items: center;
+			justify-content: flex-end;
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.look {
+		margin-left: 20rpx;
+		color: #1890FF;
+	}
+
+	.textarea {
+		display: block;
+		min-height: 192rpx;
+		padding: 30rpx;
+	}
+
+	.icon-xiangji {
+		font-size: 35rpx;
+		color: #477ef3;
+	}
+
+	.trip {
+		font-size: 22rpx;
+		color: #ccc;
+		padding: 6rpx 10rpx;
+	}
 </style>
diff --git a/template/uni-app/pages/admin/orderDetail/index.vue b/template/uni-app/pages/admin/orderDetail/index.vue
index 6e0aab65b..b62d11c39 100644
--- a/template/uni-app/pages/admin/orderDetail/index.vue
+++ b/template/uni-app/pages/admin/orderDetail/index.vue
@@ -718,7 +718,6 @@
 
 	.order-details .wrapper .item .conter {
 		color: #868686;
-		width: 500upx;
 		text-align: right;
 	}
 
diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue
index 5f7047c59..4885f18a3 100644
--- a/template/uni-app/pages/extension/customer_list/chat.vue
+++ b/template/uni-app/pages/extension/customer_list/chat.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="chat-box" :style="colorStyle">
 		<!-- #ifdef MP -->
-		<view class="head-box">
+<!-- 		<view class="head-box">
 			<view class="system-head" :style="{ height: sysHead }"></view>
 			<view class="title-hd">
 				<view class="iconfont icon-fanhui" @click="goBack"></view>
 				<view>{{ titleName }}</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- #endif -->
 		<view class="broadcast-details_order">
 			<!-- 商品信息 -->
diff --git a/template/uni-app/pages/goods/goods_list/index.vue b/template/uni-app/pages/goods/goods_list/index.vue
index 0c6624d80..99ba59f93 100644
--- a/template/uni-app/pages/goods/goods_list/index.vue
+++ b/template/uni-app/pages/goods/goods_list/index.vue
@@ -59,6 +59,7 @@
 		<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 			<view class='emptyBox'>
 				<image :src="imgHost + '/statics/images/no-thing.png'"></image>
+				<view class="tips">{{$t(`暂无商品，去看点别的吧`)}}</view>
 			</view>
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>
diff --git a/template/uni-app/pages/goods/order_pay_status/index.vue b/template/uni-app/pages/goods/order_pay_status/index.vue
index 9cfd086c0..2d0657d76 100644
--- a/template/uni-app/pages/goods/order_pay_status/index.vue
+++ b/template/uni-app/pages/goods/order_pay_status/index.vue
@@ -38,9 +38,11 @@
 			<view @tap="goOrderDetails" v-if="status==0">
 				<button formType="submit" class='returnBnt bg-color' hover-class='none'>{{$t(`查看订单`)}}</button>
 			</view>
-			<view @tap="getOrderPayInfo" v-if="payType == 'ALLINPAY_PAY'">
+			<!-- #ifdef H5 -->
+			<view @tap="getOrderPayInfo" v-if="order_pay_info.paid==0">
 				<button class='returnBnt bg-color' hover-class='none'>{{$t(`刷新支付状态`)}}</button>
 			</view>
+			<!-- #endif -->
 			<view @tap="goOrderDetails" v-if="order_pay_info.paid==0 && status==1">
 				<button class='returnBnt bg-color' hover-class='none'>{{$t(`重新购买`)}}</button>
 			</view>
diff --git a/template/uni-app/pages/user/index.vue b/template/uni-app/pages/user/index.vue
index c287d123c..f82a53ebb 100644
--- a/template/uni-app/pages/user/index.vue
+++ b/template/uni-app/pages/user/index.vue
@@ -529,30 +529,30 @@
 				})
 			},
 			getphonenumber(e) {
-				Routine.getCode()
-					.then(code => {
-						let data = {
-							code,
-							iv: e.detail.iv,
-							encryptedData: e.detail.encryptedData,
-						}
-						mpBindingPhone(data).then(res => {
-							this.getUserInfo()
-							this.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							});
-						}).catch(err => {
-							return this.$util.Tips({
-								title: err
-							});
+				if (e.detail.errMsg == 'getPhoneNumber:ok') {
+					Routine.getCode()
+						.then(code => {
+							let data = {
+								code,
+								iv: e.detail.iv,
+								encryptedData: e.detail.encryptedData,
+							}
+							mpBindingPhone(data).then(res => {
+								this.getUserInfo()
+								this.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								});
+							}).catch(err => {
+								return this.$util.Tips({
+									title: err
+								});
+							})
 						})
-					})
-					.catch(error => {
-						uni.hideLoading();
-					});
-
-				console.log(e)
+						.catch(error => {
+							uni.hideLoading();
+						});
+				}
 			},
 			/**
 			 * 获取个人用户信息