diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index b9d974e..6eb9eb9 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -26,7 +26,11 @@
 			latitude : '',
 			balancePrice : '',
 			balanceCardNo:'',
-			identificationCode:''
+			identificationCode:'',
+			//门店ID
+			storeid:'',
+			//门店名字
+			storename:''
 		},
 		onLaunch: function() {
 		},
diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index 8c39b9f..05de253 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -55,6 +55,26 @@ export const getStoreListByCoupon = params => {
 export const getMerchantStoreById = params => {
 	return POST('GET', `${base}/highMerchantStore/getMerchantStoreById`, params).then(res => res.data);
 }
+//获取优选商品分类
+export const getListGoodsType = params => {
+	return POST('GET', `${base}/highGoodsType/getListGoodsType`, params).then(res => res.data);
+}
+//获取优选商品品牌列表
+export const getBrandByList = params => {
+	return POST('GET', `${base}/highBrand/getBrandByList`, params).then(res => res.data);
+}
+// 优选商品列表
+export const getBrandCouponList = params => {
+	return POST('GET', `${base}/coupon/getCouponList`, params).then(res => res.data);
+}
+//优选商品详情
+export const getPreByOrderIdId = params => {
+	return POST('GET', `${base}/orderPre/getPreByOrderIdId`, params).then(res => res.data);
+}
+//优选商品预约完成
+export const orderComplete = params => {
+	return POST('POST', `${base}/orderPre/orderComplete`, params).then(res => res.data);
+}
 //根据门店ID 获取卡券
 export const getCouponListByStoreId = params => {
 	return POST('GET', `${base}/coupon/getCouponListByStoreId`, params).then(res => res.data);
@@ -189,10 +209,18 @@ export const paygetOrderById = params => {
 export const getCacheParam = params => {
 	return POST('GET', `${base}/highUser/getCacheParam`, params).then(res => res.data);
 }
+//删除保存的值
 export const delCacheParam = params => {
 	return POST('GET', `${base}/highUser/delCacheParam`, params).then(res => res.data);
 }
-
+//优惠券包列表
+export const getDiscountPackageList = params => {
+	return POST('GET', `${base}/discountPackage/getDiscountPackageList`, params).then(res => res.data);
+}
+//优惠券包详情
+export const getDiscountPackageDetail = params => {
+	return POST('GET', `${base}/discountPackage/getDiscountPackageDetail`, params).then(res => res.data);
+}
 /**
  * 工会卡
  */
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index 1b3f41e..7c64aad 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -1,587 +1,652 @@
-{
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-			"path": "pages/tabBar/home/home",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "嗨加油",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none",
-					"subNVues": [{
-						"id": "homeTitleNvue", // 唯一标识  
-						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
-						"type": "navigationBar"
-					}]
-				}
-			}
-		},{
-		    "path" : "pages/unionPay/unionPay-entrance/unionPay-entrance",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "嗨加油",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		},{
-		    "path" : "pages/unionPay/unionPay",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "嗨加油",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-		        "enablePullDownRefresh": false
-		    }
-		    
-		}, {
-			"path": "pages/user/bindingCardList/bindingCardList",
-			"style": {
-				"navigationBarTitleText": "卡列表",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"bounce": "none", //关闭窗口回弹效果
-					"softinputNavBar": "none"
-				}
-			}
-		}, {
-			"path": "pages/goods/refuel-succes/refuel-succes",
-			"style": {
-				// 支付成功
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/goods/refuel-confirm/refuel-confirm",
-			"style": {
-				"navigationBarTitleText": "确认订单",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/order_details/order_details",
-			"style": {
-				"navigationBarTitleText": "订单详情",
-				"navigationBarBackgroundColor": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/goods/refuel-details/refuel-details",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "加油站",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/goods/refuel/refuel",
-			"style": {
-				"navigationBarTitleText": "加油站列表",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/goods/goods-list/goods-list",
-			"style": {
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/goods/store-list/store-list",
-			"style": {
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "门店列表",
-				"enablePullDownRefresh": false
-			}
-
-		},
-		{
-			"path": "pages/tabBar/category/category",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "分类",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"bounce": "none"
-
-				}
-			}
-		},
-
-		{
-			"path": "pages/tabBar/user/user",
-			"style": {
-				"enablePullDownRefresh": true,
-				"navigationBarTitleText": "我的",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"subNVues": [{
-						"id": "userTitleNvue", // 唯一标识  
-						"path": "pages/tabBar/user/subNvue/userTitleNvue", // 页面路径  
-						"type": "navigationBar"
-					}]
-				}
-			}
-		},
-		{
-			"path": "pages/goods/HM-search/HM-search",
-			"style": {
-				"navigationBarTitleText": "搜索",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"softinputNavBar": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/goods/goods",
-			"style": {
-				"navigationBarTitleText": "",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTitleText": "详情",
-				"navigationBarTextStyle": "white",
-				"onReachBottomDistance": 50,
-				"h5": {
-					"titleNView": false
-				},
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"bounce": "none"
-				}
-			}
-		},
-
-		{
-			"path": "pages/login/register",
-			"style": {
-				"navigationBarTitleText": "手机号登录",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"bounce": "none", //关闭窗口回弹效果
-					"softinputNavBar": "none"
-				}
-			}
-		},
-		{
-			"path": "pages/login/resetpasswd",
-			"style": {
-				"navigationBarTitleText": "修改密码",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"bounce": "none", //关闭窗口回弹效果
-					"softinputNavBar": "none"
-				}
-			}
-		}, {
-			"path": "pages/order/confirmation",
-			"style": {
-				"navigationBarTitleText": "确认订单",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"softinputNavBar": "none"
-			}
-		}, {
-			"path": "pages/user/coupon/coupon",
-			"style": {
-				"navigationBarTitleText": "优惠券",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"app-plus": {
-					"bounce": "none"
-				}
-			}
-		}, {
-			"path": "pages/user/deposit/deposit",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "充值",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-		}, {
-			"path": "pages/pay/payment/payment",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "订单支付",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-		}, {
-			"path": "pages/pay/success/success",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "支付成功",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/goods/store-list/store-details",
-			"style": {
-				"navigationBarTitleText": "门店详情",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		},
-		{
-			"path": "pages/goods/coupon-details/coupon-details",
-			"style": {
-				"navigationBarTitleText": "卡券详情",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/business/business",
-			"style": {
-				"navigationBarTitleText": "门店",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/order_list/order_list",
-			"style": {
-				"navigationBarTitleText": "我的订单",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"backgroundColorBottom": "#ffffff"
-			}
-		}, {
-			"path": "pages/goods/recording/recording",
-			"style": {
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/mineCoupons/mineCoupons",
-			"style": {
-				"navigationBarTitleText": "我的卡券",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/goods/coupons-info-details/coupons-info-details",
-			"style": {
-				"navigationBarTitleText": "卡券详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/mineCouponsDestails/mineCouponsDestails",
-			"style": {
-				"navigationBarTitleText": "优惠券详情",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/goods/externalCoupon/externalCoupon",
-			"style": {
-				"navigationBarTitleText": "扫码领取优惠券",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/agentCoupons/agentCoupons",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/minePromotion/minePromotion",
-			"style": {
-				"navigationBarTitleText": "",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-		},
-		{
-			"path": "pages/user/runningWater/runningWater",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/user/Charge/Charge",
-			"style": {
-				"navigationBarBackgroundColor": "#ffffff",
-				"navigationBarTitleText": "充值",
-				"backgroundColorTop": "#ffffff",
-				"backgroundColorBottom": "#ffffff"
-			}
-
-		}, {
-			"path": "pages/user/positioning/positioning",
-			"style": {
-				"navigationBarTitleText": "地区选择",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/tabBar/order/order",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/qianZhuPay/qianZhuPay",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/tabBar/order/webUrl/webUrl",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/login/updatePas/updatePas",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "设置密码",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-		}, {
-			"path": "pages/login/updatePas/resetPas",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "修改密码",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/login/loginInvalid/loginInvalid",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/user/bindingCard/bindingCard",
-			"style": {
-				"navigationBarTitleText": "绑定卡号",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
-			}
-
-		}, {
-			"path": "pages/user/unionCard/unionCard",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "卡记录",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/userLogin/userLogin",
-			"style": {
-				"navigationBarTitleText": "嗨加油",
-				"enablePullDownRefresh": false,
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}, {
-			"path": "pages/user/cardDes/cardDes",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "绑定卡号",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-
-		}
-        ,{
-            "path" : "pages/unionPay/recharge/recharge",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "话费充值",
-                "navigationBarTextStyle": "white",
-                "navigationBarBackgroundColor": "#0083f5",
-                "backgroundColorTop": "#0083f5",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-      
-        ,{
-            "path" : "pages/unionPay/recharge-centre/recharge-centre",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-				"navigationBarTextStyle": "white",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-        
-        ,{
-            "path" : "pages/unionPay/unionorder-des/unionorder-des",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "充值详情",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-	"subpackages": [{
-		"root": "subPages",
-		"pages": [{
-			"path": "lottery/lottery",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "抽奖活动",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#e62601",
-				"backgroundColorTop": "#e62601",
-				"navigationBarTextStyle": "white"
-			}
-	
-		},{
-			"path": "unionPay-orderList/unionPay-orderList",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "话费订单",
-				"backgroundTextStyle": "light",
-				"navigationBarBackgroundColor": "#0083f5",
-				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
-			}
-	
-		}]
-	}],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#ffffff",
-		"backgroundColorTop": "#ffffff",
-		"backgroundColorBottom": "#ffffff"
-	},
-	"tabBar": {
-		"color": "#333333",
-		"selectedColor": "#0083f5",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-				"pagePath": "pages/tabBar/home/home",
-				"iconPath": "static/img/tabBar/home.png",
-				"selectedIconPath": "static/img/tabBar/home-on.png",
-				"text": "嗨加油"
-			},
-			// {
-			// 	"pagePath": "pages/tabBar/category/category",
-			// 	"iconPath": "static/img/tabBar/category.png",
-			// 	"selectedIconPath": "static/img/tabBar/category-on.png",
-			// 	"text": "导航"
-			// },
-			{
-				"pagePath": "pages/tabBar/user/user",
-				"iconPath": "static/img/tabBar/user.png",
-				"selectedIconPath": "static/img/tabBar/user-on.png",
-				"text": "我的"
-			}
-		]
-	}
+{
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/tabBar/home/home",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "嗨加油",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none",
+					"subNVues": [{
+						"id": "homeTitleNvue", // 唯一标识  
+						"path": "pages/tabBar/home/subNvue/homeTitleNvue", // 页面路径  
+						"type": "navigationBar"
+					}]
+				}
+			}
+		}, {
+			"path": "pages/unionPay/unionPay-entrance/unionPay-entrance",
+			"style": {
+				"navigationBarTitleText": "嗨加油",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/unionPay/unionPay",
+			"style": {
+				"navigationBarTitleText": "嗨加油",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/bindingCardList/bindingCardList",
+			"style": {
+				"navigationBarTitleText": "卡列表",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		}, {
+			"path": "pages/goods/refuel-succes/refuel-succes",
+			"style": {
+				// 支付成功
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goods/refuel-confirm/refuel-confirm",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/order_details/order_details",
+			"style": {
+				"navigationBarTitleText": "订单详情",
+				"navigationBarBackgroundColor": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goods/refuel-details/refuel-details",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "加油站",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/goods/refuel/refuel",
+			"style": {
+				"navigationBarTitleText": "加油站列表",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/goods/goods-list/goods-list",
+			"style": {
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/goods/store-list/store-list",
+			"style": {
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "门店列表",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/tabBar/category/category",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "分类",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"bounce": "none"
+
+				}
+			}
+		},
+
+		{
+			"path": "pages/tabBar/user/user",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "我的",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"subNVues": [{
+						"id": "userTitleNvue", // 唯一标识  
+						"path": "pages/tabBar/user/subNvue/userTitleNvue", // 页面路径  
+						"type": "navigationBar"
+					}]
+				}
+			}
+		},
+		{
+			"path": "pages/goods/HM-search/HM-search",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"softinputNavBar": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/goods/goods",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTitleText": "详情",
+				"navigationBarTextStyle": "white",
+				"onReachBottomDistance": 50,
+				"h5": {
+					"titleNView": false
+				},
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"bounce": "none"
+				}
+			}
+		},
+
+		{
+			"path": "pages/login/register",
+			"style": {
+				"navigationBarTitleText": "手机号登录",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/login/resetpasswd",
+			"style": {
+				"navigationBarTitleText": "修改密码",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none", //关闭窗口回弹效果
+					"softinputNavBar": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/confirmation",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"softinputNavBar": "none"
+			}
+		}, {
+			"path": "pages/user/coupon/coupon",
+			"style": {
+				"navigationBarTitleText": "优惠券",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/user/deposit/deposit",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "充值",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/pay/payment/payment",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "订单支付",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/pay/success/success",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "支付成功",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/goods/store-list/store-details",
+			"style": {
+				"navigationBarTitleText": "门店详情",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		},
+		{
+			"path": "pages/goods/coupon-details/coupon-details",
+			"style": {
+				"navigationBarTitleText": "卡券详情",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/business/business",
+			"style": {
+				"navigationBarTitleText": "门店",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/order_list/order_list",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"backgroundColorBottom": "#ffffff"
+			}
+		}, {
+			"path": "pages/goods/recording/recording",
+			"style": {
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/mineCoupons/mineCoupons",
+			"style": {
+				"navigationBarTitleText": "我的卡券",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goods/coupons-info-details/coupons-info-details",
+			"style": {
+				"navigationBarTitleText": "卡券详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/mineCouponsDestails/mineCouponsDestails",
+			"style": {
+				"navigationBarTitleText": "优惠券详情",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/goods/externalCoupon/externalCoupon",
+			"style": {
+				"navigationBarTitleText": "扫码领取优惠券",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/agentCoupons/agentCoupons",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/minePromotion/minePromotion",
+			"style": {
+				"navigationBarTitleText": "",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/user/runningWater/runningWater",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/user/Charge/Charge",
+			"style": {
+				"navigationBarBackgroundColor": "#ffffff",
+				"navigationBarTitleText": "充值",
+				"backgroundColorTop": "#ffffff",
+				"backgroundColorBottom": "#ffffff"
+			}
+
+		}, {
+			"path": "pages/user/positioning/positioning",
+			"style": {
+				"navigationBarTitleText": "地区选择",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/tabBar/order/order",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/qianZhuPay/qianZhuPay",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/tabBar/order/webUrl/webUrl",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/login/updatePas/updatePas",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "设置密码",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "pages/login/updatePas/resetPas",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "修改密码",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/login/loginInvalid/loginInvalid",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/user/bindingCard/bindingCard",
+			"style": {
+				"navigationBarTitleText": "绑定卡号",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false
+			}
+
+		}, {
+			"path": "pages/user/unionCard/unionCard",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "卡记录",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/userLogin/userLogin",
+			"style": {
+				"navigationBarTitleText": "嗨加油",
+				"enablePullDownRefresh": false,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/user/cardDes/cardDes",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "绑定卡号",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "pages/unionPay/recharge/recharge",
+			"style": {
+				"navigationBarTitleText": "话费充值",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"enablePullDownRefresh": false
+			}
+
+		}
+
+		, {
+			"path": "pages/unionPay/recharge-centre/recharge-centre",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"enablePullDownRefresh": false
+			}
+
+		}
+
+		, {
+			"path": "pages/unionPay/unionorder-des/unionorder-des",
+			"style": {
+				"navigationBarTitleText": "充值详情",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+	"subpackages": [{
+		"root": "subPages",
+		"pages": [{
+			"path": "coupon-comfirmation-success/coupon-comfirmation-success",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "支付成功",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "lottery/lottery",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "抽奖活动",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#e62601",
+				"backgroundColorTop": "#e62601",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "unionPay-orderList/unionPay-orderList",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "话费订单",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "sotre-details-list/sotre-details-list",
+			"style": {
+				"navigationBarTitleText": "门店列表",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "coupon-package/coupon-package",
+			"style": {
+				"navigationBarTitleText": "",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "coupon-packge-details/coupon-packge-details",
+			"style": {
+				"navigationBarTitleText": "优惠券包详情",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+		}, {
+			"path": "coupon-comfirmation/coupon-comfirmation",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "brand-classification/brand-classification",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "品牌分类",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}, {
+			"path": "preferred-goods/preferred-goods",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationBarTitleText": "商品分类",
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white"
+			}
+
+		}]
+	}],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#ffffff",
+		"backgroundColorTop": "#ffffff",
+		"backgroundColorBottom": "#ffffff"
+	},
+	"tabBar": {
+		"color": "#333333",
+		"selectedColor": "#0083f5",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/tabBar/home/home",
+				"iconPath": "static/img/tabBar/home.png",
+				"selectedIconPath": "static/img/tabBar/home-on.png",
+				"text": "嗨加油"
+			},
+			// {
+			// 	"pagePath": "pages/tabBar/category/category",
+			// 	"iconPath": "static/img/tabBar/category.png",
+			// 	"selectedIconPath": "static/img/tabBar/category-on.png",
+			// 	"text": "导航"
+			// },
+			{
+				"pagePath": "pages/tabBar/user/user",
+				"iconPath": "static/img/tabBar/user.png",
+				"selectedIconPath": "static/img/tabBar/user-on.png",
+				"text": "我的"
+			}
+		]
+	}
 }
diff --git a/high-unionPay/pages/goods/coupon-details/coupon-details.vue b/high-unionPay/pages/goods/coupon-details/coupon-details.vue
index b4bb224..5feaea7 100644
--- a/high-unionPay/pages/goods/coupon-details/coupon-details.vue
+++ b/high-unionPay/pages/goods/coupon-details/coupon-details.vue
@@ -1,381 +1,371 @@
-<template>
-	<view>
-		<view class="backcorf06 height100p"></view>
-		<view class="backcorfff backgrd width90 couhead">
-			<image class="couimg flleft" mode="widthFix" :src="imageUrl+couponDesInfo.couponInfo.couponImg"></image>
-			<view class="couhedcout">
-				<view class="height40 width100">
-					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 2">已使用</view>
-					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 1">未使用</view>
-					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 0">已过期</view>
-				</view>
-				<view class="fontwig6 font16 fcor333 mart5">{{couponDesInfo.couponInfo.couponName}}</view>
-				<view class="fontwig6 font13 fcor999 mart5" v-if="oneTime">领取时间:{{oneTime | formatDate('-')}}</view>
-				<view class="fontwig6 font13 fcor999 mart5" v-if="twoTime">使用有效期:{{twoTime | formatDate('-')}}</view>
-				<view class="fontwig6 font13 fcor999 mart5" v-if="threeTime">消费时间:{{threeTime | formatDate('-')}}</view>
-				<view class="fontwig6 font13 fcor999 mart5" v-if="storeName">加油站点:{{storeName}}</view>
-				
-			</view>
-
-		</view>
-		<view class="width90 backcorfff mart80 qrcs">
-			<view class="width100 fotct" v-if="couponDesInfo.couponInfo.couponSource == 4">
-				<view class="font28 fontlet mart5 marb10" style="color: #1593c3;">视频教程</view>
-				<yy-video-player
-				    :auto-play="false" 
-				    :url="imagewxUrl+imgadres3"  
-				    :poster="poster" 
-				    :show-back-btn="true"
-				  ></yy-video-player>
-				<image :src="imagewxUrl+imgadres2" mode="widthFix" class="mart10"></image>
-				<!-- <view class="mart20 width90 font18 fcor333 fontwig6">
-					使用流程：
-				</view> -->
-				<!-- <view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-					<view style="width: 5%;" class="flleft">1:</view>
-					<view style="margin-left: 5%;">客户使用积分兑换或者工会卡购买。</view>
-				</view>
-				<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-					<view style="width: 5%;" class="flleft">2:</view>
-					<view style="margin-left: 5%;">兑换成功后中石化给客户发送一张同等面额的码商券，保存在”加油中石化“APP中。</view>
-				</view>
-				<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-					<view style="width: 5%;" class="flleft">3:</view>
-					<view style="margin-left: 5%;">客户登录”加油中石化“APP，查看码商券详情。</view>
-				</view>
-				<view class="mart5 width80 font14 fcor999 fontwig6" style="list-style-type: decimal;">
-					<view style="width: 5%;" class="flleft">4:</view>
-					<view style="margin-left: 5%;">客户选择中石化任意加油站加油，加完油后，在加油中石化“APP中查看订单，选择支付，支付时选择码商券抵用。支付完成即可。</view>
-				</view> -->
-			</view>
-			<view class="mart20 fotct fcorred font15 marb20 height20"
-				v-if="couponDesInfo.couponInfo.reserveStatus &&  couponDesInfo.highUserCoupon.status  != 0">
-				预约订单已成功 门店会在24小时内联系您</view>
-			<view class="mart20 fotct fcorred font15 marb20 height20"
-				v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">
-				请出示核销码(商户扫客户)</view>
-			<view class="mart20 fotct fcorred font15 marb20 height20"
-				v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 3">
-				请告知加油员用码商支付</view>
-			<view class="width90 mart20 fotct" v-if="!couponDesInfo.couponInfo.reserveStatus">
-				<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
-			</view>
-			<view class="fotct fcor333 font15 marb10 mart10" v-if="couponDesInfo.couponInfo.couponSource != 4">{{couponDesInfo.couponCodeInfo.codeKey}}</view>
-		</view>
-		<view class="width90 mart10 googscs backcorfff" v-if="couponDesInfo.couponInfo.couponSource != 4">
-			<view class="width90 height45l font18 fcor666 aliitem">
-				<image mode="widthFix" style="width: 50rpx; max-height: 50rpx;margin-right: 10px;"
-					src="../../../static/img/adresw.png"></image> 门店信息
-			</view>
-			<view class="line1 width100"></view>
-			<view class="width90 stoCont" v-for="(store,i) in storeList" :key="i">
-				<view class="width80p flleft mart10">
-					<view class="font16 fcor333 fontwig6 ">{{store.storeName}}</view>
-					<view class="font13 fcor666 mart10">{{store.address}}</view>
-				</view>
-				<view class="width20 flright mart10 fotrt" @click="seeloaction(store)">
-					<image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1">
-					</image>
-					<view class="mart5 fcor999 font13">{{store.distance}}km</view>
-				</view>
-			</view>
-		</view>
-		<view class="height60"></view>
-		<!-- 	<button class="czlq width100" v-if="couponDesInfo.highUserCoupon.status  == 0"
-			@click="againReceiveCoupon">重新领取</button> -->
-	</view>
-</template>
-
-<script>
-	import {
-		getUserCouponDetail,
-		getStoreListByCoupon,
-		againReceiveCoupon
-	} from "../../../Utils/Api.js"
-	import xiaoVideoElement from '../../../components/yy-video-player/yy-video-player.nvue'
-	let app = getApp()
-	export default {
-		components: {
-			xiaoVideoElement
-		},
-		data() {
-			return {
-				couDesId: '',
-				imageUrl: app.globalData.imgUrl,
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres1: 'dhl.png',
-				imgadres2: 'video.jpg',
-				imgadres3: 'playVideo.mp4',
-				imgadres: 'noorder.png',
-				couponDesInfo: [],
-				storeList: [],
-				oneTime: '',
-				twoTime: '',
-				threeTime: '',
-				menddesId: '',
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				storeName : ''
-			}
-		},
-		onLoad(option) {
-			this.couDesId = option.id;
-			this.menddesId = option.mendId;
-			this.getUserCouponDetail();
-		},
-		filters: {
-			//过滤器 用于格式化时间
-			formatDate: function(value, spe = '/') {
-				let data = new Date(value);
-				let year = data.getFullYear();
-				let month = data.getMonth() + 1;
-				let day = data.getDate();
-				let h = data.getHours();
-				let mm = data.getMinutes();
-				let s = data.getSeconds();
-				month = month >= 10 ? month : "0" + month;
-				day = day >= 10 ? day : "0" + day;
-				h = h >= 10 ? h : "0" + h;
-				mm = mm >= 10 ? mm : "0" + mm;
-				s = s >= 10 ? s : "0" + s;
-				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
-			}
-		},
-		onReachBottom() {
-			this.getStoreListByCoupon();
-		},
-		methods: {
-			//我的卡券详情
-			getUserCouponDetail() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					userCouponId: this.couDesId
-				}
-				getUserCouponDetail(params).then(res => {
-					if (res.return_code == '000000') {
-						this.couponDesInfo = res.return_data;
-						uni.hideLoading();
-						if (res.return_data.couponInfo.couponSource == 4) {
-							this.oneTime = res.return_data.highUserCoupon.createTime;
-							this.twoTime = res.return_data.highUserCoupon.useEndTime;
-							this.threeTime = res.return_data.highUserCoupon.consumeTime;
-							return;
-						}
-						if(res.return_data.couponCodeInfo.storeName && res.return_data.couponCodeInfo.storeName != undefined){
-							this.storeName = res.return_data.couponCodeInfo.storeName;
-						}
-						this.getStoreListByCoupon();
-						this.oneTime = res.return_data.highUserCoupon.createTime;
-						this.twoTime = res.return_data.highUserCoupon.useEndTime;
-						this.threeTime = res.return_data.highUserCoupon.consumeTime;
-					} else {
-						uni.hideLoading()
-					}
-				})
-			},
-			//导航
-			seeloaction(e) {
-				uni.openLocation({
-					latitude: Number(e.latitude), //目的地的定位
-					longitude: Number(e.longitude), //目的地的定位
-					name: e.storeName,
-					address: e.address
-				})
-			},
-
-			/**
-			 * 查询门店列表
-			 */
-			getStoreListByCoupon() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					couponId: this.menddesId,
-					longitude: app.globalData.longitude,
-					latitude: app.globalData.latitude,
-					pageNum: pagenum,
-					pageSize: this.pageSize
-				}
-				getStoreListByCoupon(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.list != '') {
-						uni.hideLoading();
-						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
-						this.storeList = this.storeList.concat(res.return_data.list);
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
-							this.isNoMoreData = true;
-						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.storeList = [];
-						uni.hideLoading()
-					}
-				})
-			},
-			//领取
-			againReceiveCoupon() {
-				uni.showLoading({
-					title: '领取中...'
-				})
-				let params = {
-					couponId: this.couponDesInfo.couponInfo.id
-				}
-				againReceiveCoupon(params).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						uni.showToast({
-							icon: 'none',
-							title: '领取成功',
-							duration: 2000
-						})
-						this.couponDesInfo = res.return_data;
-						this.oneTime = res.return_data.highUserCoupon.createTime;
-						this.twoTime = res.return_data.highUserCoupon.useEndTime;
-						this.threeTime = res.return_data.highUserCoupon.consumeTime;
-					} else {
-						uni.hideLoading();
-						uni.showToast({
-							icon: 'none',
-							title: res.return_msg,
-							duration: 2000
-						})
-					}
-				})
-			},
-			scan() {
-				uni.scanCode({
-					success: function(res) {
-						console.log('条码类型：' + res.scanType);
-						console.log('条码内容：' + res.result);
-					}
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f5f5f5;
-	}
-
-	.couhead {
-		position: absolute;
-		top: 20px;
-		height: 320rpx;
-		border-radius: 10rpx;
-
-		.couimg {
-			width: 180rpx;
-			max-height: 180rpx;
-			margin-top: 70rpx;
-			margin-left: 10px;
-		}
-
-		.couhedcout {
-			margin-left: 210rpx;
-		}
-
-		.couStu {
-			background-color: #dceefe;
-			color: #0076dd;
-			height: 60rpx;
-			line-height: 60rpx;
-			width: 80px;
-			border-radius: 5px 0px 0px 5px;
-		}
-	}
-
-	.qrcs {
-		border-top-style: dotted;
-		border-top-color: #f6f6f6;
-		padding-bottom: 20px;
-		border-radius: 0px 0px 5px 5px;
-	}
-
-	.googscs {
-		border-radius: 5px;
-	}
-
-	.stoCont {
-		border-bottom: 1px solid #f6f6f6;
-		height: 160rpx;
-	}
-
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.coupon-status {
-		height: 35px;
-		line-height: 35px;
-	}
-
-	.coupon-mes {
-		margin-right: 90px;
-	}
-
-	.coupon-img {
-		width: 80px;
-		height: 80px;
-	}
-
-	.coupon-qr {
-		width: 250px;
-		height: 250px;
-	}
-
-	.coupon-des {
-		width: 80px;
-		height: 80px;
-		text-align: center;
-		color: white;
-		font-size: 28px;
-		border-radius: 10px;
-		background-color: red;
-	}
-
-	.coupon-cont-dh {
-		margin-left: 90px;
-	}
-
-	.coupon-map image {
-		width: 45px;
-		height: 45px;
-	}
-
-	.coupon-no {
-		height: 80px;
-		line-height: 80px;
-		border: 1px solid #b2b2b2;
-		border-radius: 10px;
-	}
-
-	.coupne-btn {
-		position: fixed;
-		bottom: 0px;
-		background-color: red;
+<template>
+	<view>
+		<view class="backcorf06 height100p"></view>
+		<view class="backcorfff backgrd width90 couhead">
+			<image class="couimg flleft" mode="widthFix" :src="imageUrl+couponDesInfo.couponInfo.couponImg"></image>
+			<view class="couhedcout">
+				<view class="height40 width100">
+					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 2">已使用</view>
+					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 1">未使用</view>
+					<view class="couStu flright fotct mart10" v-if="couponDesInfo.highUserCoupon.status == 0">已过期</view>
+				</view>
+				<view class="fontwig6 font16 fcor333 mart5">{{couponDesInfo.couponInfo.couponName}}</view>
+				<view class="fontwig6 font13 fcor999 mart5" v-if="oneTime">领取时间:{{oneTime | formatDate('-')}}</view>
+				<view class="fontwig6 font13 fcor999 mart5" v-if="twoTime">使用有效期:{{twoTime | formatDate('-')}}</view>
+				<view class="fontwig6 font13 fcor999 mart5" v-if="threeTime">消费时间:{{threeTime | formatDate('-')}}</view>
+				<view class="fontwig6 font13 fcor999 mart5" v-if="couponDesInfo.couponCodeInfo.storeName">
+					加油站点:{{couponDesInfo.couponCodeInfo.storeName}}</view>
+
+			</view>
+
+		</view>
+		<view class="width90 backcorfff mart80 qrcs">
+			<view class="width100 fotct" v-if="couponDesInfo.couponInfo.couponSource == 4">
+				<view class="font28 fontlet mart5 marb10" style="color: #1593c3;">视频教程</view>
+				<yy-video-player :auto-play="false" :url="imagewxUrl+imgadres3" :poster="poster" :show-back-btn="true">
+				</yy-video-player>
+				<image :src="imagewxUrl+imgadres2" mode="widthFix" class="mart10"></image>
+			</view>
+			<view class="mart20 fotct fcorred font15 marb20 height20"
+				v-if="couponDesInfo.couponInfo.reserveStatus &&  couponDesInfo.highUserCoupon.status  != 0">
+				预约订单已成功 门店会在24小时内联系您</view>
+			<view class="mart20 fotct fcorred font15 marb20 height20"
+				v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource == 3">
+				请出示核销码(商户扫客户)</view>
+			<view class="mart20 fotct fcorred font15 marb20 height20"
+				v-if="!couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0 && couponDesInfo.couponInfo.couponSource != 3">
+				请告知加油员用码商支付</view>
+			<view class="width90 mart20 fotct" v-if="!couponDesInfo.couponInfo.reserveStatus">
+				<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
+			</view>
+			<view class="fotct fcor333 font15 marb10 mart10"
+				v-if="couponDesInfo.couponInfo.couponSource != 4 && couponDesInfo.couponCodeInfo.codeKey">
+				{{couponDesInfo.couponCodeInfo.codeKey}}
+			</view>
+		</view>
+		<view class="width90 mart10 googscs backcorfff" v-if="couponDesInfo.couponInfo.couponSource != 4">
+			<view class="width90 height45l font18 fcor666 aliitem" v-if="storeList">
+				<view class="width50 alijusstart">
+					<image mode="widthFix" style="width: 50rpx; max-height: 50rpx;margin-right: 10px;"
+						src="../../../static/img/adresw.png"></image> 门店信息
+				</view>
+
+				<view class="width50 alijusend font15" @click="jumpstorelist">查看更多<image
+						style="width: 18px; height: 17px;" src="../../../static/img/jt.png">
+						</images>
+				</view>
+			</view>
+			<view class="line1 width100"></view>
+			<view class="width90 stoCont" v-for="(store,i) in storeList" :key="i">
+				<view class="width80p flleft mart10">
+					<view class="font16 fcor333 fontwig6 text1">{{store.storeName}}</view>
+					<view class="font13 fcor666 mart10 text2">{{store.address}}</view>
+				</view>
+				<view class="width20 flright mart10 fotrt" @click="seeloaction(store)">
+					<image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1">
+					</image>
+					<view class="mart5 fcor999 font13">{{store.distance}}km</view>
+				</view>
+			</view>
+		</view>
+		<view class="height60"></view>
+		<!-- 	<button class="czlq width100" v-if="couponDesInfo.highUserCoupon.status  == 0"
+			@click="againReceiveCoupon">重新领取</button> -->
+	</view>
+</template>
+
+<script>
+	import {
+		getUserCouponDetail,
+		getStoreListByCoupon,
+		againReceiveCoupon
+	} from "../../../Utils/Api.js"
+	import xiaoVideoElement from '../../../components/yy-video-player/yy-video-player.nvue'
+	let app = getApp()
+	export default {
+		components: {
+			xiaoVideoElement
+		},
+		data() {
+			return {
+				couDesId: '',
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres1: 'dhl.png',
+				imgadres2: 'video.jpg',
+				imgadres3: 'playVideo.mp4',
+				imgadres: 'noorder.png',
+				couponDesInfo: [],
+				storeList: [],
+				oneTime: '',
+				twoTime: '',
+				threeTime: '',
+				menddesId: '',
+				pageNum: 1,
+				pageSize: 1,
+				isNoMoreData: false
+			}
+		},
+		onLoad(option) {
+			this.couDesId = option.id;
+			this.menddesId = option.mendId;
+			this.getUserCouponDetail();
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		onReachBottom() {
+			// this.getStoreListByCoupon();
+		},
+		methods: {
+			//我的卡券详情
+			getUserCouponDetail() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					userCouponId: this.couDesId
+				}
+				getUserCouponDetail(params).then(res => {
+					if (res.return_code == '000000') {
+						this.couponDesInfo = res.return_data;
+						uni.hideLoading();
+						if (res.return_data.couponInfo.couponSource == 4) {
+							this.oneTime = res.return_data.highUserCoupon.createTime;
+							this.twoTime = res.return_data.highUserCoupon.useEndTime;
+							this.threeTime = res.return_data.highUserCoupon.consumeTime;
+							return;
+						}
+						this.getStoreListByCoupon();
+						this.oneTime = res.return_data.highUserCoupon.createTime;
+						this.twoTime = res.return_data.highUserCoupon.useEndTime;
+						this.threeTime = res.return_data.highUserCoupon.consumeTime;
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			//导航
+			seeloaction(e) {
+				uni.openLocation({
+					latitude: Number(e.latitude), //目的地的定位
+					longitude: Number(e.longitude), //目的地的定位
+					name: e.storeName,
+					address: e.address
+				})
+			},
+			//跳转门店
+			jumpstorelist() {
+				uni.navigateTo({
+					url: '../../../subPages/sotre-details-list/sotre-details-list?id=' + this.menddesId
+				})
+			},
+			/**
+			 * 查询门店列表
+			 */
+			getStoreListByCoupon() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					couponId: this.menddesId,
+					longitude: app.globalData.longitude,
+					latitude: app.globalData.latitude,
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getStoreListByCoupon(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.storeList = this.storeList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.storeList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//领取
+			againReceiveCoupon() {
+				uni.showLoading({
+					title: '领取中...'
+				})
+				let params = {
+					couponId: this.couponDesInfo.couponInfo.id
+				}
+				againReceiveCoupon(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						uni.showToast({
+							icon: 'none',
+							title: '领取成功',
+							duration: 2000
+						})
+						this.couponDesInfo = res.return_data;
+						this.oneTime = res.return_data.highUserCoupon.createTime;
+						this.twoTime = res.return_data.highUserCoupon.useEndTime;
+						this.threeTime = res.return_data.highUserCoupon.consumeTime;
+					} else {
+						uni.hideLoading();
+						uni.showToast({
+							icon: 'none',
+							title: res.return_msg,
+							duration: 2000
+						})
+					}
+				})
+			},
+			scan() {
+				uni.scanCode({
+					success: function(res) {
+						console.log('条码类型：' + res.scanType);
+						console.log('条码内容：' + res.result);
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f5f5f5;
+	}
+
+	.couhead {
+		position: absolute;
+		top: 20px;
+		height: 320rpx;
+		border-radius: 10rpx;
+
+		.couimg {
+			width: 180rpx;
+			max-height: 180rpx;
+			margin-top: 70rpx;
+			margin-left: 10px;
+		}
+
+		.couhedcout {
+			margin-left: 210rpx;
+		}
+
+		.couStu {
+			background-color: #dceefe;
+			color: #0076dd;
+			height: 60rpx;
+			line-height: 60rpx;
+			width: 60px;
+			border-radius: 5px 0px 0px 5px;
+		}
+	}
+
+	.qrcs {
+		border-top-style: dotted;
+		border-top-color: #f6f6f6;
+		padding-bottom: 20px;
+		border-radius: 0px 0px 5px 5px;
+	}
+
+	.googscs {
+		border-radius: 5px;
+	}
+
+	.stoCont {
+		border-bottom: 1px solid #f6f6f6;
+		height: 160rpx;
+	}
+
+	.loading-text {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 60upx;
+		color: #979797;
+		font-size: 24upx;
+	}
+
+	.coupon-status {
+		height: 35px;
+		line-height: 35px;
+	}
+
+	.coupon-mes {
+		margin-right: 90px;
+	}
+
+	.coupon-img {
+		width: 80px;
+		height: 80px;
+	}
+
+	.coupon-qr {
+		width: 250px;
+		height: 250px;
+	}
+
+	.coupon-des {
+		width: 80px;
+		height: 80px;
+		text-align: center;
+		color: white;
+		font-size: 28px;
+		border-radius: 10px;
+		background-color: red;
+	}
+
+	.coupon-cont-dh {
+		margin-left: 90px;
+	}
+
+	.coupon-map image {
+		width: 45px;
+		height: 45px;
+	}
+
+	.coupon-no {
+		height: 80px;
+		line-height: 80px;
+		border: 1px solid #b2b2b2;
+		border-radius: 10px;
+	}
+
+	.coupne-btn {
+		position: fixed;
+		bottom: 0px;
+		background-color: red;
 		color: #FFFFFF;
-	}
-
-	.czlq {
-		position: absolute;
-		bottom: 0;
-		background-color: red;
-		color: #FFFFFF;
-	}
+		border-radius: 0px;
+	}
+
+	.czlq {
+		position: absolute;
+		bottom: 0;
+		background-color: red;
+		color: #FFFFFF;
+	}
 </style>
diff --git a/high-unionPay/pages/goods/coupons-info-details/coupons-info-details.vue b/high-unionPay/pages/goods/coupons-info-details/coupons-info-details.vue
index 9f7b8b5..6b06dad 100644
--- a/high-unionPay/pages/goods/coupons-info-details/coupons-info-details.vue
+++ b/high-unionPay/pages/goods/coupons-info-details/coupons-info-details.vue
@@ -216,6 +216,7 @@
 		bottom: 0px;
 		background-color: red;
 		color: #FFFFFF;
+		border-radius: 0px;
 	}
 
 	.czlq {
diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue
index e4f52f9..ef10bbd 100644
--- a/high-unionPay/pages/goods/goods-list/goods-list.vue
+++ b/high-unionPay/pages/goods/goods-list/goods-list.vue
@@ -53,7 +53,8 @@
 <script>
 	import {
 		getCouponList,
-		getCmsContent
+		getCmsContent,
+		getBrandCouponList
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
@@ -80,29 +81,37 @@
 				pageSize: 10,
 				isNoMoreData: false,
 				typeId: '',
-				couponName: ''
+				couponName: '',
+				brandid : '',
+				goodtyid: ''
 			};
 		},
 		
 		onLoad: function(option) { //option为object类型，会序列化上个页面传递的参数
 			this.typeId = option.id;
+			this.brandid = option.brandId;
+			this.goodtyid = option.goodsId;
 			if (option.id == 1) {
 				uni.setNavigationBarTitle({
 					title: '商品列表'
 				});
+				this.getCouponListArea();
+				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
 			}
 			if (option.id == 2) {
 				uni.setNavigationBarTitle({
 					title: '积分列表'
 				});
+				this.getCouponListArea();
+				this.getCmsContent('CMS_WX_APPLETS_GOODS_LIST');
 			}
 			if (option.id == 3) {
 				uni.setNavigationBarTitle({
-					title: '商品列表'
+					title: '优选商品'
 				});
+				this.getCmsContent('CMS_PRE_LIST');
+				this.getBrandCouponList();
 			}
-			this.getCouponListArea();
-			this.getCmsContent();
 		},
 		onPageScroll(e) {
 
@@ -160,12 +169,48 @@
 					}
 				})
 			},
+			//优选商品列表
+			getBrandCouponList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					regionId: app.globalData.cityId,
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+					brandId: this.brandid,
+					goodsTypeId: this.goodtyid,
+					couponName: this.couponName
+				}
+				getBrandCouponList(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.goodsList = this.goodsList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.goodsList = [];
+					}
+				})
+			},
 			toSearch() {
 				this.pageNum = 1;
 				this.pageSize = 10;
 				this.isNoMoreData = false;
 				this.goodsList = [];
-				this.getCouponListArea();
+				if(this.typeId == 3){
+					this.getBrandCouponList();
+				}else{
+					this.getCouponListArea();
+				}
 			},
 			//商品跳转
 			toGoods(e) {
diff --git a/high-unionPay/pages/goods/goods.vue b/high-unionPay/pages/goods/goods.vue
index 43c5555..a6caf40 100644
--- a/high-unionPay/pages/goods/goods.vue
+++ b/high-unionPay/pages/goods/goods.vue
@@ -64,6 +64,15 @@
 				</view>
 			</view>
 		</view>
+		<!-- 服务-规则选择 -->
+		<view class="info-box spec" v-if="goodsData[0].reserveStatus" @click="jumpstore">
+			<view class="row" style="margin: 0px;">
+				<view class="text" style="color:  #689bc0; font-size: 14px !important;">点击去选择门店</view>
+				<view class="arrow font14" style="color: #689bc0;" v-if="storeName">
+					{{storeName}}
+				</view>
+			</view>
+		</view>
 		<view class="height60 width100 backcorfff" v-if="goodsData[0].handselCouponList != '' " @click="showPopup()">
 			<view class="width80p flleft" style="padding-left: 4%;line-height: 60px; ">
 				赠送卡券
@@ -134,8 +143,6 @@
 			return {
 				//控制渐变标题栏的参数
 				beforeHeaderzIndex: 11, //层级
-				afterHeaderzIndex: 10, //层级
-				beforeHeaderOpacity: 1, //不透明度
 				afterHeaderOpacity: 0, //不透明度
 				//是否显示返回按钮
 				// #ifndef MP
@@ -147,18 +154,14 @@
 				//轮播图下标
 				currentSwiper: 0,
 				anchorlist: [], //导航条锚点
-				selectAnchor: 0, //选中锚点
-				serviceClass: '', //服务弹窗css类，控制开关动画
-				specClass: '', //规格弹窗css类，控制开关动画
-				shareClass: '', //分享弹窗css类，控制开关动画
 				// 商品信息
 				goodsData: "",
-				selectSpec: null, //选中规格
-				isKeep: false, //收藏
 				//商品描述html
 				desid: '',
 				imageUrl: app.globalData.imgUrl,
-				user: ''
+				user: '',
+				storeId: '', // 门店id
+				storeName: '' //门店名字
 			};
 		},
 		filters: {
@@ -183,22 +186,17 @@
 			this.desid = option.id;
 			this.user = app.globalData.userInfo;
 			this.getCouponById();
+			app.globalData.storeid = '';
+			app.globalData.storename = '';
 			// #ifdef MP
 			//小程序隐藏返回按钮
 			this.showBack = false;
 			// #endif
 			//option为object类型，会序列化上个页面传递的参数
 		},
-		onReady() {
-			// this.calcAnchor(); //计算锚点高度，页面数据是ajax加载时，请把此行放在数据渲染完成事件中执行以保证高度计算正确
-		},
-		onPageScroll(e) {},
-		//上拉加载，需要自己在page.json文件中配置"onReachBottomDistance"
-		onReachBottom() {
-			// uni.showToast({ title: '触发上拉加载' });
-		},
-		mounted() {
-
+		onShow() {
+			this.storeId = app.globalData.storeid;
+			this.storeName = app.globalData.storename;
 		},
 		methods: {
 			//卡券详情
@@ -244,29 +242,7 @@
 			swiperChange(event) {
 				this.currentSwiper = event.detail.current;
 			},
-			hideShare() {
-				this.shareClass = 'hide';
-				setTimeout(() => {
-					this.shareClass = 'none';
-				}, 150);
-			},
-			//收藏
-			keep() {
-				this.isKeep = this.isKeep ? false : true;
-			},
-			// 加入购物车
-			joinCart() {
-				if (this.selectSpec == null) {
-					return this.showSpec(() => {
-						uni.showToast({
-							title: "已加入购物车"
-						});
-					});
-				}
-				uni.showToast({
-					title: "已加入购物车"
-				});
-			},
+			
 			//获取登陆信息
 			getuserinfo() {
 				let that = this;
@@ -323,13 +299,20 @@
 			},
 			buy() {
 				let that = this;
-				if(this.goodsData[0].stockCount == 0 && this.goodsData[0].couponSource !=4){
+				if (this.goodsData[0].stockCount == 0 && this.goodsData[0].couponSource != 4) {
 					uni.showToast({
 						title: '库存不足',
 						icon: "none"
 					});
 					return;
 				}
+				if(this.goodsData[0].reserveStatus && this.storeName == ''){
+					uni.showToast({
+						title: '请选择门店',
+						icon: "none"
+					});
+					return;
+				}
 				uni.showToast({
 					title: '提交订单...',
 					icon: 'none',
@@ -342,100 +325,11 @@
 				})
 			},
 
-			//跳转评论列表
-			showComments(goodsid) {
-
-			},
-			//选择规格
-			setSelectSpec(index) {
-				this.selectSpec = index;
-			},
-			//减少数量
-			sub() {
-				if (this.goodsData.number <= 1) {
-					return;
-				}
-				this.goodsData.number--;
-			},
-			//增加数量
-			add() {
-				this.goodsData.number++;
-			},
-			//跳转锚点
-			toAnchor(index) {
-				this.selectAnchor = index;
-				uni.pageScrollTo({
-					scrollTop: this.anchorlist[index].top,
-					duration: 200
-				});
-			},
-			//计算锚点高度
-			calcAnchor() {
-				this.anchorlist = [{
-						name: '主图',
-						top: 0
-					},
-					{
-						name: '评价',
-						top: 0
-					},
-					{
-						name: '详情',
-						top: 0
-					}
-				]
-				let commentsView = uni.createSelectorQuery().select("#comments");
-				commentsView.boundingClientRect((data) => {
-					let statusbarHeight = 0;
-					//APP内还要计算状态栏高度
-					// #ifdef APP-PLUS
-					statusbarHeight = plus.navigator.getStatusbarHeight()
-					// #endif
-					let headerHeight = uni.upx2px(100);
-					this.anchorlist[1].top = data.top - headerHeight - statusbarHeight;
-					this.anchorlist[2].top = data.bottom - headerHeight - statusbarHeight;
-
-				}).exec();
-			},
+		
 			//返回上一页
 			back() {
 				uni.navigateBack();
 			},
-			//服务弹窗
-			showService() {
-				console.log('show');
-				this.serviceClass = 'show';
-			},
-			//关闭服务弹窗
-			hideService() {
-				this.serviceClass = 'hide';
-				setTimeout(() => {
-					this.serviceClass = 'none';
-				}, 200);
-			},
-			//规格弹窗
-			showSpec(fun) {
-				console.log('show');
-				this.specClass = 'show';
-				this.specCallback = fun;
-			},
-			specCallback() {
-				return;
-			},
-			//关闭规格弹窗
-			hideSpec() {
-				this.specClass = 'hide';
-				//回调
-
-				this.selectSpec && this.specCallback && this.specCallback();
-				this.specCallback = false;
-				setTimeout(() => {
-					this.specClass = 'none';
-				}, 200);
-			},
-			discard() {
-				//丢弃
-			}
 		}
 	};
 </script>
diff --git a/high-unionPay/pages/goods/store-list/store-list.vue b/high-unionPay/pages/goods/store-list/store-list.vue
index fbaf38c..c123040 100644
--- a/high-unionPay/pages/goods/store-list/store-list.vue
+++ b/high-unionPay/pages/goods/store-list/store-list.vue
@@ -1,155 +1,161 @@
-<template>
-	<view>
-		<view v-if="storeList == '' " class="mart60 fotct font14 fcor666">
-			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
-		</view>
-		<view class="store-head width90" v-for="(goods,i) in storeList" :key="i">
-			<image class="mart10 flleft" :src='imageUrl+goods.ext1'></image>
-			<view class="storefig">
-				<view class="store-cont-le flleft" @click="jumpdetails(goods.id)">
-					<view class="text1 fcor333 font14 store-title paddtop10">{{goods.storeName}}</view>
-					<view class="width100 mart5 height22">
-						<view class="store-labl flleft fcor999 marglerig fotct font12">在线加油</view>
-						<view class="store-labl flleft fcor999 marglerig fotct font12">{{goods.operatorName}}</view>
-					</view>
-					<view class="text1 font13 fcor666 width100">{{goods.address}}</view>
-				</view>
-				<view class="store-cont-rg flright fotrt mart20" @click="seeloaction(goods)">
-					<image
-						src="data:image/png;base64,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">
-					</image>
-					<view class="font12 fcor666">{{goods.distance}}km</view>
-				</view>
-			</view>
-		</view>
-		<view class="loading-text">{{ loadingText }}</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getStoreListByCoupon
-	} from "../../../Utils/Api.js";
-	let app = getApp()
-	export default {
-		data() {
-			return {
-				storeList: [],
-				storeId: '',
-				imageUrl: app.globalData.imgUrl,
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				loadingText: ''
-			}
-		},
-		onLoad(options) {
-			this.storeId = options.id;
-			this.getStoreListByCoupon();
-		},
-		onReachBottom() {
-			// this.getStoreListByCoupon();
-		},
-		methods: {
-			/**
-			 * 查询门店列表
-			 */
-			getStoreListByCoupon() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					this.loadingText = '到底了';
-					return false;
-				}
-				// let pagenum = this.pageNum;
-				let params = {
-					couponId: this.storeId,
-					longitude: app.globalData.longitude,
-					latitude: app.globalData.latitude
-				}
-				getStoreListByCoupon(params).then(res => {
-					if (res.return_code == '000000') {
-						this.storeList = res.return_data
-						setTimeout(function() {
-							uni.hideLoading();
-						}, 2000);
-						// this.isNoMoreData = res.return_data.length == this.pageSize ? false : true;
-						// this.pageNum = res.return_data.length == this.pageSize ? ++pagenum : pagenum;
-						// this.storeList = this.storeList.concat(res.return_data);
-					} else {
-						uni.hideLoading()
-					}
-				})
-			},
-			/**
-			 * 定位
-			 */
-			seeloaction(e) {
-				uni.openLocation({
-					latitude: Number(e.latitude), //目的地的定位
-					longitude: Number(e.longitude), //目的地的定位
-					name: e.storeName,
-					address: e.address
-				})
-			},
-			/**
-			 * 跳转门店详情
-			 */
-			jumpdetails(e) {
-				uni.navigateTo({
-					url: './store-details?id=' + e
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.store-head {
-		height: 80px;
-		border-bottom: 1px solid #f4f4f4;
-
-		image {
-			width: 60px;
-			height: 60px;
-		}
-	}
-
-	.storefig {
-		margin-left: 70px;
-	}
-
-	.store-cont-le {
-		width: 80%;
-	}
-
-	.store-cont-rg {
-		width: 20%;
-
-		image {
-			width: 30px;
-			height: 30px;
-		}
-	}
-
-	.store-title {
-		font-weight: 600;
-	}
-
-	.store-labl {
-		border: 1px solid #f5f5f5;
-		box-shadow: 0px 0px 2px 0px;
-	}
+<template>
+	<view>
+		<view v-if="storeList == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="store-head width90" v-for="(goods,i) in storeList" :key="i">
+			<image class="mart10 flleft" :src='imageUrl+goods.ext1'></image>
+			<view class="storefig">
+				<view class="store-cont-le flleft" @click="jumpdetails(goods)">
+					<view class="text1 fcor333 font14 store-title paddtop10">{{goods.storeName}}</view>
+					<view class="width100 mart5 height22">
+						<!-- <view class="store-labl flleft fcor999 marglerig fotct font12">在线加油</view> -->
+						<view class="store-labl flleft fcor999 marglerig fotct font12">{{goods.operatorName}}</view>
+					</view>
+					<view class="text1 font13 fcor666 width100">{{goods.address}}</view>
+				</view>
+				<view class="store-cont-rg flright fotrt mart20" @click.stop="seeloaction(goods)">
+					<image
+						src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAdUklEQVR4Xu1daZgcR3l+v56ZnpVkJxwGO9JOz8qWND1ay5bxLAYnEBsIYIeQcMSQBEJIgsxpTIAEc1oGHxhfwueKIwlHMEcICYkNJByBXBaWjGzvTs9KsjQ9K2FjYw5L1k7PTH95analRxar7W9mambnqH6e/dXv91bVW/VuTXdXfUUwl1HAKHBMBchoYxQwChxbAWMQMzqMAgsoYAxihodRwBjEjAGjQHMKmBmkOd1M1IAoYAwyIB1tmtmcAsYgzelmogZEAWOQAelo08zmFDAGaU43EzUgChiDDEhHm2Y2p4AxSHO6magBUcAYZEA62jSzOQWMQZrTzUQNiALGIAPS0aaZzSlgDNKcbiZqQBQwBhmQjjbNbE4BY5DmdDNRA6KAMciAdLRpZnMKGIM0p5uJGhAFjEEGpKNNM5tTwBikOd1M1IAoYAwyIB1tmtmcAsYgzelmogZEAWOQAelo08zmFDAGaU43E9UGBQrp5Hkhh+cBdB4Bq+pFMD8M4Msh6PtrS8EX21DsgpTGIJ1W3JT3KwpMpZO/GzJfCOD3FpSHcadbCs7vpITGIJ1U25T1BAUK6eT5PGuMlzYijesHHRu3HSuoEQEMtr8VUD+l5ozx+821lDe5fuXi5mIbizIGaUwvg25BAW84+WKK8QZmvKwFmtlQwmvcYvD5lnkiCIxB2q2w4Uc+lXyRBd7AhJdrlOPzrh+8RiPfvFTGIO1WeID586nkC4l4A4BXtEGGR10/eGobeJ9AaQzSboUHkH/SSf6OmjEAvLKdze/Ew7oxSDt7cMC4C87Q8xmheiv1h51oujFIJ1Q2ZbSsgJceeh64bowLWiYTE9Ajrl9+mhjeJNDMIE0KZ8IALz107pwxXtVpPQj0iYxfVj/j2noZg7RV3v4kz48MnWNxqF7X/pHmFm4FcKaEk4h+N1Ms3yHBtoIxBmlFvQGLzQ/Hf5vI2gDCH2tu+jYGjxNoXMj7ddcPGvr6LuT9FZgxSLPKDVDcZCr+XEsZA/gTnc1m4B6Ax7N+ZdxzbDV7PEPCbxG9ZE2x/G8SbKsYY5BWFezj+IlU/DmxWWPo/iD3IzCPZ0qVcQI47yQuJNBtQin/xfWDJpeoCEs4AmYM0rhmfR/hOfHfBCz1Vuq1OhtLwI+YefPtpcr4pUCouBkgNXsQcIakrE49exyqizGIpFcGBJNPx88GWxcS8Kdam8zYrn5K3VuqbL4AqB3J7aUSbwTRrcLy/tn1gz8QYrXAjEG0yNjbJPl0/Nlzxnid1pYQ7qWQx9fM/pR6gjFUOZcC1qtnnz3WS8olovMzxfKdEqwujDGILiV7kGdyJPEsCknNGH+mufr3EdH4mmJZGaN6LG4vlXgTiG6RlE2Ef8oUA52LHSXFwhhEJFN/gaaGE2eFMdoAxp9rbtn9TDR+4ITyeG4rKgtxfwmIne7Yd7Nw9kBI57nT5W9orm8knTFIpET9AygMJ57J9e8Y/Bc6W8XABEDj4XHl8dFJBBLuhmYPxlczpaAdK4Ijq2oMEilR7wMKqcRY3Rjgv9TZGgImGLQ5ZpfHV+9EWcrNQKyQsreCcLokhplenC2VvynB6sYYg+hWtIv4vFQip4xB4DforBYBefXdYq9V3nzuHsw0yl1IJd7MRDcL4/7R9YO2LptfqB7GIMJe6iXYjnTiGdX669r6ngydVwGgW5NWeXxlE8ZQFWEgXkjbW8E4TVIxZnpRtlT+lgTbDowxSDtUXSTOHenEGUcYQ2ff7gDolmVheTw1jYOtNK+QTr6FmW8ScnzF9YOO7C05Vn10iihss4HpVmBqJLE+DNWX7/qMYeniJ2AXmG4+vlYeX74Pj7fKe/eZSBz3cP27xzoJVwh64Vq//O8SbLswxiDtUrYDvIWVidMRWhvmUujENBa5m5luCoLy+OkP4YAu3nw6+VZivlHI92XXDzq4AWv+WhmDCHurm2DesH2aSoYQgi4kQlxj3YrMdGM4Ux4ffRj7NfJiYi3s2P767HGqhJdgvSDjz3xbgm0nxhiknepq5s4P2+ssZQyqf/1O6KInoASiTXygvNl9BI/p4j2SJ+8k30bgjwu5v+T6Qcd3Kc5XN2MQYY8tJmwyZZ8aI97AIPWMkdRYl70W0Q3hUHncLbTHGKquO1YhWQ3qK3ZHRXUn6/luceY7ImybQcYgbRa4Ffodjr22BpW7tm6MoVa4jor9MYiujyXqH/h+qZF3XirPSV4E8CZhOV90/eDVQmzbYcYgbZe48QKm0nZWZTsn0AYGljTOMH8EgR9i0HWJeDB+ygP4hS7ehXi+O4Kh5WF9zZV09nieW5z5bifqJinDGESiUocwhRHb5fDwjLFUW7FED4P52qQVqA98P9fGKyCacpIXhcLZgwhfyBQD3fvdBbU8NsQYpCX59AR7K5MZClWWEFK7+JbpYa2z/JSBayoIxk/z8TONvCKq3SMYCkJ7GwNZSQBb1rnZPTPfk2A7hTEG6ZTS85STX5FcY8UPG+M4jVX5GQMfC8NgfHQaj2rkbYjKc5JvB/gGURDjH9xSoDUphKjcCJAxiA4VG+SYHE6uVq9rQVAzxvENhi8E/wUBHw1rwebsXvxUI2/DVKVhLDlg2fcAyEiCOQzPyU5X/1OC7STGGKSDak8MJ1fFLN5AgHr4/nWNRT9GjKvUjLHYxjjUJs9JXgzw9cI2duQoA2FdngAzBmlGtQZjppyhk0OE6uOeMsaTGgxfCH4AjCupFoxn9uERjbwtUe1bjqW/jNs/ArBaQhRy+NtrS9XvS7CdxhiDtFFxLz20ci53rfqO8WSNRR0E4YpYORhf/SDUKbBddRVSyXcw8XXCSn3O9QOt6YWE5YpgxiAimRoD5UeGRhDOzhgAntJY9ILoMgiXx+P2+Kpd+3+ikVcb1fYTsWwoaW9n4BQJaY3D546Wqj+QYBcDYwyiUfXJlUPpWP11bf3hW+fpRxUGPlKNJcbX7T7wkMYqa6fKp5J/RcTXCok/6/qB3hxcwoKlMGMQqVIL4CZOHnJitXAD6t8x+AQNlIcoagRcVrUSm0f3HHhQI29bqCaehuNiS+x7AayUFRD+lutX/1uGXRyUMUgLut+3fEkqEaupZAgXgkjnYS5MwEbbSoyv7AFjHJIwn0q+k4ivkUjKwGeyfqA3UZ2k4AYxxiANCqbg21csGU5aNZU+Ry0kfHoTFMcMYeAypvhta4uP/1gnb7u5vBNwPJba9wFIS8piCn8zW6z+jwS7mBhjkAbU91JLlzNVDz18n9RAaDSU8REgfqtbenxfNLj7EIV08p3M4tnj77N+oDubY1tEMQYRyDqZXvobxIeN8RuCEDGECFegFrslM31wrzioy4BeBsfTQXuCgZSkakzh2dli9X8l2MXGGIMs0AMTI8tOssLKoRljuc7OYuCqeC128+q9B6d18i4G11Q6+a6Q+WOSshn4u6wfvF6C7QaMMcg8vfDAymUnlmuHjbFCc0ddXanGblq372BJM++i0O1YhV+rBfYkAJFOocXPXrun8n+LUtkmCjUGOUK0nacc9/RqNVBJndV3jOEm9Dx2COOaWs26cXTfjK+Vd5HJvHTy3WC+WlQNwqfdYqA1L7Co3BZAxiBqz/RJeFotYR9aXSv6HS3VXC25sGOxTac80F/GUO3fdTJ+vVK18wBEz2VWyM9aM125S6pdN+AG2iCF5TghjNlqOYhKn+Po7RC+IYzFbli7e6aol7d72DzH/msAHxXViOlTbqmsNXm2qNwWQQNpkNIwnrLfsg89fI+0qOFR4fxxtmLXZ/fM7NHL211su0fwpCBMeAw6UVIzCvmszHRliwTbTZiBMkjRwZMfx2FjCJdDyLpL5ZslK3adW5zZLYvobZTn2H8D4CpZK+iTrl/WmmFeVm7rqIEwiPpvVw5t9eCtfk6d3LpsRzAQ3WIxXbvGn3lAK28Xk93r4Mk2JQtgFi2vIeZnZkqVH3Zxk45Ztb42yNxD5CFjiJZfyzuRbqswrllXKu+Sx/QHMu/Y7yHgSklrGPSJrF/WfQyDpGgtmL40iHo3z5Xkhlo9txRWaVFqjkSdqBRnXL16AI2hJJgYxlNilj0lXs7PPOaWKnfr7INOcvWVQepLHmaSG2aTrsm2e8rFpk/GQ3x01XR5pzym/5B5x76EgCskLVP/TLJ+Wc3gPXv1hUHUPoT4UHJDCFava9do7Q3Gp0Omq9ZOl3do5e1BsvwKPJVittJBsn2YY8S51cXKth5s6uEq97RB6ts77eQGVil0AFdnR6g1Q6jRldm9ZfVzwlwACo59Cctnj/GsX35jrwvXkwaZzbmUrJ/BJ83aJ+0otZGHYnSFu7tckMYMAm5u9lAvJCTpisK52UPlxerpq6cMolJZlsPDxlirWfnPkYXLM3sCTzNvX9AVUvZ7mXC5rDF0m+uX3yTDdjeqJwyizpeoBYeNIcsSLtWd8Q8Uw4eNMY4tmFqSw3FbfeeRZIGsWRbn1uypqLxYPX91tUHUsV3xA8lDZ/CJju6S9ggTbo8Bl60pBmqxnbkWUMBL2e8DqR2P0RcR3ZIplt8SjewNRFcaRJ2Gevwjh40hOhG1Abm/FAM2rvYDtYfBXBEK1Fc627ZaPhOZdZ4ZVSvOuczuyvZ+EbarDPJdIL48ldjAFl0oPWi+gY74SsjYuLYU3N9AzMBDvbT9fjA+LBGCmG/OlCpvlWB7BdMVBvkSEDstldhAVD9Rab1O8ZjxVWJsdKcDla/JXA0oUN9AVgnUquTIU64YqFCIXL/pvKgGYYAKqcSFc8Y4o4G+i4YSvlYj3jjaJw+L0Q3Wj/DS9gfAuEzCTMw3ZUqVt0mwvYRZNIPknUT9DD4Az9As2L+ExBvX9vgXXM2aNEx338plJyZqFbXZS3KqbplDjGWnA5UXq6+ujhtk9uRWfAbAmTqVZOBfiXljLy+M06lHq1x5x/6gyu4o4SHwjRm/cpEE22uYjhqkkEqMMZHuXWV31ELeONqDu9W6dbCodEexsKKSSyQEdZwJGWP9+vKjYwaZO0RG394JxjfCGG/spRQygsHWFZCCY3+QhbMHwB93/crbu6LibahExwxScJLfZ/BzWm0DA98ChRt7Ia9rq21djPjdI8tOKocVlcwuFlU+AQctINfP35Q6YpBCOnkeM98RJfhC9xn8HyF446hf/a9WeEzswgoUHPtDDFwq04k3uX7lYhm2N1EdMYjn2J8D0OQRv/ydkHljt55h15vdPn+tVQ5ii6sqR7BkXDxuEXL9vlRHIkTLY8Bz6oeqNLRkhJm/B+aN2elqVx0s37IYXUyQd+yNBHxQVkW+wfUr75BhexfVKYOoE1ibOZLspwzeRiC1K21bPKRtg77ltV1DTR3tAKrPHpLrAFnIDcIK6M4YJJX4iaYTmGaUUYiVabCtEsM95ku5ZDxHY7yU/WEQ3h+NBIj4ukyx8k4JttcxnTLIzSB6c1vEItzLjG1QswzVtj5YrG45F6i2paw+JS0ML1nBVk16DMN+xCg3KDsuO2KQyZT9Kotwe4fGl/rWUp9haqCtCbt81+qd+GWHyu7JYgpp+3JmvFdSeXWCbaZYeZcE2w+YjhhECeWl7DtAOG8RRHtQmWV2lsHdoRXf0mvn/7VTsx0rlgzXYjXpWSWPcY1yg5TIomMGmUjFnxMj6/vt7GwJNwP71c8xQrjNsmgL1WjLoCaBU3rlHftKAt4j0Q6Ma9xS8G4Rtk9AHTOI0mvCGXp+DOEnAWjOqN5Sb7D6ScagbUyhMsxd/bgqdT6F6sdYx2uiA30I+EUtpLFByw/WUYOoTtqZsk+tEr+BQa8lWQKylkZ/k8Eqs8lWgLaEVrglu6dyFwHKSH11eY6tzvZQZ3xIro+5fiDFSvh6AtNxgxxSZefyJalqrPoCWNYYmMcA5LpYsWkQ7ibGXUzWltrjM1tGH1Y/1Xr3mlg+5MTioehwHwJ+Xg1pbHQA064umkGOHlrbVywZTsRrY8QYA3iMQMo0kiRlizFKfwbgh2BssYjushKJLat27f/JYlSk2TK9lP0xEKRvo652/UCdBzJwV9cY5Gjl66enVobOBIfKKIf+0l3aQwGBtoDCLeDYHRl/5ttdWs96tXadPORUqrLZA8DPLFi5QTr/5Mi+61qDHD3ALgWsC9KJ9cTIEeZ+lhFO78aBSMAWMK7PlIJOfftpSIZ8OnEtMf2VMOijrh/I3nIJCXsJ1jMGmU/UXcPJ1RWLVbKHHBM9Uz3LELC0WzqAgEszfiDattqpOk+uHEpbtVB6fuKjICs3KMfKzdcHPW2QoxuklmvHUFuPkM+AhTEwxlh4wH27BmiMwrNXF6v/2y7+Rnk9J3E9QKI9HAxclfWDSxoto5/wfWWQoztGnRuCofgZFsXWW2CVPUUZRm9u34jRoH5uZfzgrG4YNPmRoREKQ+khoz9ly8r1+2m9Uf3S1waZr/FTI4n1qGF9SDgDsM5Ub8wA2FFCtXKfYL2gGx7cPSexCSBR9hEiXJEpBu9rpd39EDtwBvmVt2Wp5Ck14jNAWA9WpuEcQE/X2blMfF12kZeHe+mhleBQeBIvPRLGKLd294zoO4lOrbqNa+ANcnSHqIRp8Wp1PYjPIJUGVc003OqxbvRfrl9uOWFFK4Mnn0rcSESyvLmEy91iINob0kqdeiHWGCSil+5ejqVPSsTX1xBTRlnPqL81U88zjWgXxIJgePWDeHgxBkVDKZeYH64lYrnRB2ZEa7QWoz2dLLORTu5kvbq6LG/YPo0sXs+ozy7rQXROVIVDopesLZb/LQrXjvteOnkzmGUb1hgfcUvBB9pRj17kNAZpsdekr00ZuCzrBx9qsbiGw+9LJU9JEAuPruafVKrx3Lp9B6X7QxquT68FGIO02GMFJ/E6Bv1dJA3jG24p6PiGMc9J3gqw7LRZxofdUiDMahLZ4r4AGIO02I2FlYnTuUbqNNcFtWTg0aAcOKc/hAMtFikO3zH7hk44e+DBci02dvreg9K96eJ69DLQGERD7+UdW+2BjzzfhMPwnOx09T81FCmiyDvJcXVUtgS8WD8BJXVbTIwxiAb1vbT9aTBeH0VlEb17TbF8TRROx/2dw8lVVYt3CLl+DI7n3NLj+4T4gYEZg2joas9JXgTwJgHVl10/uECAaxniOclPAPyXEiKVyT3rB8J8vBLG/sEYg2joy8lU/LkWWZKfTsWMH6xs9/bdyeHkasviKWHT9oUUz5lML/OrZQwiHEULwbafiGXJZD3/8MlRdAzOZf3K1ihcK/e9lP0pEP5cwqEyuWe7bEm+pN6dwhiDaFLac+yvAHhFJB3zm9xS5bZIXJOA/IrkGopxQRi+t2YlcqN7DjwoxA8czBhEU5eLzxMn/K1bDET/3ZupWt6x/5aAP5PEMvChrB+ITrGV8PUjxhhEU69OOcmXhOCvR9ERMJHxg1OjcM3c91YmM6ixSlkkuabtWCJ38u4DD0nAg4oxBtHU87OHz9TuBfiEKMoaMDrqB5NRuEbv5x377wn4U1Ec4QNuMfiICDvAIGMQjZ2fdxL/TqAXCChf6/qBOnVL21UYsV0OkRcSluIJO9drqYqEbdMKMwbRKKc011Q7zhX3HPuzAF4jag7j/W4puFyEHXCQMYjGAeCl7T8BI3JmYMJd2WLwLF1FNzJ7MMOPV4LcYu1N0dXmTvEYg2hUeu4h+T4AiQhaZss6WVdCBC9lfx6EP5Y0hRnvy5aCKyRYg2lsV5zRS6CA59hb5jJBLoi2CK9YUwy+KqBcEDKVtrMhQ/rAv4eqwVhmH9SZkeYSKGBmEIFIjUDyTnIzgd8QFcPAlVk/EJ3qtBBXPm1/gRivjipP3WfgvVk/uFKCNZhZBYxBNI+EyVTizRbRzdG0/G3Xr0jeeB2Taodjr60BE9Fl1RG7l4VBLjWNR4V4AzMG0T8GCqnEGBOpn1lR12OVWGL1uhY+1HmO/UUAotXBDFyS9YOroipl7j9RATODtGFEeI6tvmZnoqiJ6PxMsXxnFG6++5Mp+1SLoF4ISK4HliDIpX2oYxvM1YACxiANiCWFFhz7dgZeFYlv4XuE59hfBvDKyDJmAe9x/UCdJmWuBhUwBmlQMAm84NjvUQ/hkVjC19xi8LJI3FEAlXYIFrYL43YlrSC3cg9+LsQb2BEKGIO0YTgUnKHnM8L/EFDvw5LAdQt4TIA9DMmn7H8kwsuFMX/j+sHVQqyBHaWAMUgbhoSXwfE4aKsdfSdF0TeayGFiJLE+FtazqEReDOy040HulAfwi0iwAcyrgDFImwaGl7bvBOPFUfTqpKdMqXx9FO7QfS9t/xMYfyDBdzJJhKQ+vYgxBmlTrxUc+wr1alVA/znXD14rwGEynXiGxSTarsvAjrgd5FbvxC8l3AYzvwLGIG0aGYW0/TJmRC8lIUz9uBiMngtUo6riOfY/A3hpFE7dJ6J3ZYrlayVYgzm2AsYgbRodheElK9iqqbxUS6KKqIV81uh0ZcGPi14qkQPRD6O41H1mTNHSINfow7+Ee9AwxiBt7PG8Y/8PAc+OLEKQyCHv2F8n4CWRXGr2YHpnplS+ToI1mIUVMAZp4wgppBI3MdFboopg0CeyfvmYKUInhhPPjFl0VxTP3H2vdjAYG30Y+4V4A1tAAWOQNg6PvJN4HQkyvzOwLesHZx6rKp5jq3NFzpdUtdG3YhLOQcYYg7Sx9xvZqxEy1q0tBfcfXZ3JkcSzrJBEx0gTkJ8pB2OdzCDfRvm6gtoYpM3dUHDs+yVHTxP4dRm/8pmjq+Ol7DtB0d9TZuPoHa5fvqHNTRooemOQNnd3wbE/w4DgOwdvcv3KxUdWJ5+On01s/bekigRMLp3d73FQgjcYmQLGIDKdmkblneTbCPzxKAIC/SDjl5/7BIM49jcJeGFU7NzscbHrlyUZ5mV0BjU7Jxsd2qvA1EjirDCk/4sqhYCDAdO6daXyLoWdcOK/FYP1g6i4uU6csGdX7M5I8AYjV8AYRK5VU8hLAevVjl0EMCwguMD1A7XPAw0koVP/597u+uXIWUpQvoEcpYAxSAeGhOfYXwPw+1FFMXBV1g8uaeC8EUV5f2x2zVU5it/cb1wBY5DGNWs4wkvZ7wMhMg8uA9/K+sGLPCfxbYCeJymIiN6WKZZvkmANpnEFjEEa16zhiCkn+Tsh+FvRgfQIh7U/JMv6bjS2jrivdlyQG51EIMQbWIMKGIM0KFgz8HtG8KQlYf055Nei4pn5e0R0ThRO3Seit2aKZUGKIQmbwcyngDFIh8aF5yS+A9C52ooj3Lv/hCCX24qKNk5D9CsKGIN0aFB4jq2yivy1ruKI+S2ZUuUWXXyGZ34FjEE6NDKm0vYrQoY6x7Dli4Af7fODMckmq5YLG3ACY5AODYCJ5UNOLB6q55DWL+Y3u6XKra0TGYYoBYxBohTSeN9z7LsBHHNZu6QoAu7Z7gdjFwA1Cd5gWlPAGKQ1/RqK9pzkrQC/saGgo8GC3Yct8ZvgJyhgDNLBAeGlEq8H0adbKHJbxg9yVD/JwFydUMAYpBMqz5Wxc/mSVCVe207Ak5splsFvzPqV8WZiTUxzChiDNKdb01Gek9gE0EVNEGx1/SDXRJwJaUEBY5AWxGsmND9sryPCv4LgNBIfo/Ds1cWqaOttI7wGu7ACxiCLMELyqeQLifib0qIZ2Jj1g0uleIPTp4AxiD4tG2KaSMWfE4N1CQjnLRC4lRjXZErB7Q2RG7A2BYxBtEnZHNHc2erKJOrvKQD2ArSbEX4261c2N8dqonQpYAyiS0nD05cKGIP0ZbeaRulSwBhEl5KGpy8VMAbpy241jdKlgDGILiUNT18qYAzSl91qGqVLAWMQXUoanr5UwBikL7vVNEqXAsYgupQ0PH2pgDFIX3araZQuBYxBdClpePpSAWOQvuxW0yhdChiD6FLS8PSlAsYgfdmtplG6FDAG0aWk4elLBYxB+rJbTaN0KWAMoktJw9OXChiD9GW3mkbpUsAYRJeShqcvFTAG6ctuNY3SpYAxiC4lDU9fKmAM0pfdahqlSwFjEF1KGp6+VMAYpC+71TRKlwLGILqUNDx9qcD/A06L3kFODForAAAAAElFTkSuQmCC">
+					</image>
+					<view class="font12 fcor666">{{goods.distance}}km</view>
+				</view>
+			</view>
+		</view>
+		<view class="loading-text">{{ loadingText }}</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getStoreListByCoupon
+	} from "../../../Utils/Api.js";
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				storeList: [],
+				storeId: '',
+				imageUrl: app.globalData.imgUrl,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				loadingText: ''
+			}
+		},
+		onLoad(options) {
+			this.storeId = options.id;
+			this.getStoreListByCoupon();
+		},
+		onReachBottom() {
+			this.getStoreListByCoupon();
+		},
+		methods: {
+			/**
+			 * 查询门店列表
+			 */
+			getStoreListByCoupon() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					this.loadingText = '到底了';
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					couponId: this.storeId,
+					longitude: app.globalData.longitude,
+					latitude: app.globalData.latitude,
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+				}
+				getStoreListByCoupon(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.storeList = this.storeList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.storeList = [];
+					}
+				})
+			},
+			/**
+			 * 定位
+			 */
+			seeloaction(e) {
+				uni.openLocation({
+					latitude: Number(e.latitude), //目的地的定位
+					longitude: Number(e.longitude), //目的地的定位
+					name: e.storeName,
+					address: e.address
+				})
+			},
+			/**
+			 * 跳转门店详情
+			 */
+			jumpdetails(e) {
+				// uni.navigateTo({
+				// 	url: './store-details?id=' + e
+				// })
+				app.globalData.storeid = e.id;
+				app.globalData.storename = e.storeName;
+				uni.navigateBack({
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.loading-text {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 60upx;
+		color: #979797;
+		font-size: 24upx;
+	}
+
+	.store-head {
+		height: 80px;
+		border-bottom: 1px solid #f4f4f4;
+
+		image {
+			width: 60px;
+			height: 60px;
+		}
+	}
+
+	.storefig {
+		margin-left: 70px;
+	}
+
+	.store-cont-le {
+		width: 80%;
+	}
+
+	.store-cont-rg {
+		width: 20%;
+
+		image {
+			width: 30px;
+			height: 30px;
+		}
+	}
+
+	.store-title {
+		font-weight: 600;
+	}
+
+	.store-labl {
+		border: 1px solid #f5f5f5;
+		box-shadow: 0px 0px 2px 0px;
+	}
 </style>
diff --git a/high-unionPay/pages/order/confirmation.vue b/high-unionPay/pages/order/confirmation.vue
index cae6f5a..62fdf88 100644
--- a/high-unionPay/pages/order/confirmation.vue
+++ b/high-unionPay/pages/order/confirmation.vue
@@ -1,843 +1,869 @@
-<template>
-	<view>
-
-		<view class="width94 comorder mart10">
-			<view class="height100p width94 goodsimg">
-				<image class="flleft" mode="widthFix" :src="imageUrl+couponList.couponImg"></image>
-				<view class="tcrig">
-					<view class="font18 fontwig6 fcor333 text1">{{couponList.couponName}}</view>
-					<view class="font13  fcor666 mart10">规格: 默认</view>
-					<view class="price-number mart10">
-						<view class="price font16" v-if="couponList.payType == 1">￥{{couponList.discountPrice}}</view>
-						<view class="price font16" v-else>
-							<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
-							</image>{{couponList.discountPrice*100}}
-						</view>
-						<view class="number fcor666 font13 margle" v-if="couponList.payType == 1">
-							￥{{couponList.salesPrice}}
-						</view>
-						<view class="number fcor666 font13 margle" v-else>
-							<image style="width: 15px;height: 15px;" src="../../static/img/jfh.png">
-							</image>{{couponList.salesPrice*100}}
-						</view>
-						<view class="flright fotrt paddleft10">x1</view>
-					</view>
-				</view>
-			</view>
-			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					商品总额
-				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999" v-if="couponList.payType == 1">
-					￥{{couponList.discountPrice}}
-				</view>
-				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666 aliitem" v-else>
-					<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
-					</image>{{couponList.discountPrice*100}}
-				</view>
-			</view>
-
-			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					配送费
-				</view>
-				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666">
-					￥0
-				</view>
-			</view>
-
-			<view class="width94 line1 mart5 marb5"></view>
-			<view class="height50 width100 backcorfff" @click="showPopup()">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					优惠抵扣<text class="yhqky">{{UserNormalDiscountList.length}}张可用</text>
-				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;" v-if="deductionPrice == 0">
-					未使用
-					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
-				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcoreb5 alijun"
-					style="align-items: center;" v-else>
-					-￥{{deductionPrice}}
-					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
-				</view>
-			</view>
-		</view>
-
-		<view class="width94 comorder mart10">
-			<view class="height50 width100 backcorfff">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					支付方式
-				</view>
-			</view>
-			<view class="width94 line1 mart5 marb5"></view>
-			<!-- <view class="height50 width100 backcorfff" @tap="paytype='jinbi'">
-				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
-					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
-				</view>
-				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					<radio :checked="paytype=='jinbi'" color="#0083f5" />
-				</view>
-			</view>
-			<view class="width94 line1 mart5 marb5"></view> -->
-			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'">
-				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
-					银联支付
-				</view>
-				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
-					style="align-items: center;">
-					<radio :checked="paytype=='unionPay'" color="#0083f5" />
-				</view>
-			</view>
-		</view>
-
-		<!-- <view class="width94 comorder mart10">
-			<view class="height50 width100 backcorfff">
-				<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
-					<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
-				</view>
-				<view class="width15 flright fotct">
-					<image class="jtcs" src="../../static/img/jt.png"></image>
-				</view>
-			</view>
-		</view> -->
-
-		<view class="width100 height60"></view>
-		<view class="footer">
-			<view class="settlement">
-				<view class="sum">实付:<view class="money" v-if="couponList.payType == 1">￥{{paytheprice}}</view>
-					<view class="money aliitem" v-else>
-						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../static/img/jfx.png">
-						</image>{{paytheprice*100}}
-					</view>
-				</view>
-				<!-- #ifdef MP -->
-				<button class="btn" open-type="getPhoneNumber" v-if="user.phone == null"
-					@getphonenumber="getPhoneNumber">立即支付</button>
-				<button class="btn" v-else @tap="toPay">立即支付</button>
-				<!-- #endif -->
-				<!-- #ifdef H5 -->
-				<button class="btn" v-if="user.phone == null" @click="jumpH5Bding">立即支付</button>
-				<button class="btn" v-else @tap="toPay">立即支付</button>
-				<!-- #endif -->
-
-			</view>
-		</view>
-
-		<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
-			<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
-				@click="radioChanges(items)">
-				<image mode="widthFix" class="flleft" :src="imageUrl+items.highDiscount.discountImg"></image>
-				<view class="tcrig">
-					<view class="yhprice">
-						<radio :checked="items.highDiscount.id == memDiscountId" color="#0083f5" />
-					</view>
-					<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view>
-					<view class="font13 fcor999 mart5">有效期至：{{items.highDiscount.salesEndTime | formatDate('-')}}</view>
-
-				</view>
-			</view>
-		</wybPopup>
-		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
-	</view>
-</template>
-
-<script>
-	import {
-		addOrder,
-		getCouponById,
-		GetPhoneNumber,
-		getUserNormalDiscountList,
-		bindUserPhone,
-		orderToPay,
-		orderToGoldPay,
-		findUser,
-		unionPay,
-		hltUnionCardPay,
-	} from '../../Utils/Api.js';
-	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
-	import ssPaymentPassword from '../../components/sanshui-payment-password'
-	let app = getApp();
-
-	export default {
-		components: {
-			wybPopup,
-			ssPaymentPassword
-		},
-		data() {
-			return {
-				buylist: [], //订单列表
-				goodsPrice: 0.0, //商品合计价格
-				sumPrice: 0.0, //用户付款价格
-				freight: 12.00, //运费
-				note: '', //备注
-				int: 1200, //抵扣积分
-				deduction: 0, //抵扣价格
-				couponId: '',
-				couponList: [],
-				UserNormalDiscountList: [],
-				imageUrl: app.globalData.imgUrl,
-				deductionPrice: '0.00',
-				paytheprice: '',
-				radioStatus: true,
-				memDiscountId: '',
-				user: '',
-				paytype: '',
-				PaymentPassword: '',
-				orderId: '',
-				jumpType: '',
+<template>
+	<view>
+
+		<view class="width94 comorder mart10">
+			<view class="height100p width94 goodsimg">
+				<image class="flleft" mode="widthFix" :src="imageUrl+couponList.couponImg"></image>
+				<view class="tcrig">
+					<view class="font18 fontwig6 fcor333 text1">{{couponList.couponName}}</view>
+					<view class="font13  fcor666 mart10">规格: 默认</view>
+					<view class="price-number mart10" v-if="isDiscont">
+						<view class="price font16" v-if="couponList.payType == 1">￥{{couponList.salesPrice}}</view>
+						<view class="price font16" v-else>
+							<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
+							</image>{{couponList.salesPrice * 100}}
+						</view>
+						<view class="flright fotrt paddleft10">x1</view>
+					</view>
+					<view class="price-number mart10" v-if="!isDiscont">
+						<view class="price font16" v-if="couponList.payType == 1">￥{{couponList.discountPrice}}</view>
+						<view class="price font16" v-else>
+							<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
+							</image>{{couponList.discountPrice*100}}
+						</view>
+
+						<view class="number fcor666 font13 margle"
+							v-if="couponList.payType == 1 && couponList.salesPrice != couponList.discountPrice">
+							￥{{couponList.salesPrice}}
+						</view>
+						<view class="number fcor666 font13 margle"
+							v-if="couponList.payType != 1 && couponList.salesPrice != couponList.discountPrice">
+							<image style="width: 15px;height: 15px;" src="../../static/img/jfh.png">
+							</image>{{couponList.salesPrice*100}}
+						</view>
+						<view class="flright fotrt paddleft10">x1</view>
+					</view>
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					商品总额
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999"
+					v-if="couponList.payType == 1 && isDiscont">
+					￥{{couponList.salesPrice}}
+				</view>
+				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666 aliitem"
+					v-if="couponList.payType != 1 && isDiscont">
+					<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
+					</image>{{couponList.salesPrice*100}}
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999"
+					v-if="couponList.payType == 1 && !isDiscont">
+					￥{{couponList.discountPrice}}
+				</view>
+				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666 aliitem"
+					v-if="couponList.payType != 1 && !isDiscont">
+					<image style="width: 15px;height: 15px;" src="../../static/img/jfx.png">
+					</image>{{couponList.discountPrice*100}}
+				</view>
+			</view>
+
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					配送费
+				</view>
+				<view class="width40 flright alijun paddtright10 font15 fontwig6 fcor666">
+					￥0
+				</view>
+			</view>
+
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff" @click="showPopup()">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					优惠抵扣<text class="yhqky">{{UserNormalDiscountList.length}}张可用</text>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;" v-if="deductionPrice == 0">
+					未使用
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcoreb5 alijun"
+					style="align-items: center;" v-else>
+					-￥{{deductionPrice}}
+					<image style="width: 40rpx;height: 40rpx;" src="../../static/img/jt.png"></image>
+				</view>
+			</view>
+		</view>
+
+		<view class="width94 comorder mart10">
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					支付方式
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
+			<!-- <view class="height50 width100 backcorfff" @tap="paytype='jinbi'">
+				<view class="width70 flleft fcor333 fontwig6 font16 text1" style="padding-left: 4%;">
+					积分支付<text class="font14 fcor666 margle">可用积分: {{user.gold}}</text>
+				</view>
+				<view class="width20 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;">
+					<radio :checked="paytype=='jinbi'" color="#0083f5" />
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view> -->
+			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					银联支付
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;">
+					<radio :checked="paytype=='unionPay'" color="#0083f5" />
+				</view>
+			</view>
+		</view>
+
+		<!-- <view class="width94 comorder mart10">
+			<view class="height50 width100 backcorfff">
+				<view class="width80p flleft fcor333 fontwig6 font14" style="padding-left: 4%;">
+					<text style="color: #0083F5;">《条约协议》</text>点击立即支付，即代表同意
+				</view>
+				<view class="width15 flright fotct">
+					<image class="jtcs" src="../../static/img/jt.png"></image>
+				</view>
+			</view>
+		</view> -->
+
+		<view class="width100 height60"></view>
+		<view class="footer">
+			<view class="settlement">
+				<view class="sum">实付:<view class="money" v-if="couponList.payType == 1">￥{{paytheprice}}</view>
+					<view class="money aliitem" v-else>
+						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../static/img/jfx.png">
+						</image>{{paytheprice*100}}
+					</view>
+				</view>
+				<!-- #ifdef MP -->
+				<button class="btn" open-type="getPhoneNumber" v-if="user.phone == null"
+					@getphonenumber="getPhoneNumber">立即支付</button>
+				<button class="btn" v-else @tap="toPay">立即支付</button>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<button class="btn" v-if="user.phone == null" @click="jumpH5Bding">立即支付</button>
+				<button class="btn" v-else @tap="toPay">立即支付</button>
+				<!-- #endif -->
+
+			</view>
+		</view>
+
+		<wybPopup ref="popup" type="bottom" width="500" radius="6" :showCloseIcon="true">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券选择</view>
+			<view class="width92 height110 tccs mart10" v-for="(items, index) in UserNormalDiscountList" :key="items"
+				@click="radioChanges(items)">
+				<image mode="widthFix" class="flleft" :src="imageUrl+items.highDiscount.discountImg"></image>
+				<view class="tcrig">
+					<view class="yhprice">
+						<radio :checked="items.highDiscount.id == memDiscountId" color="#0083f5" />
+					</view>
+					<view class="font16 fontwig6 fcor333 text1">{{items.highDiscount.discountName}}</view>
+					<view class="font13 fcor999 mart5">有效期至：{{items.highDiscount.salesEndTime | formatDate('-')}}</view>
+
+				</view>
+			</view>
+		</wybPopup>
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
+	</view>
+</template>
+
+<script>
+	import {
+		addOrder,
+		getCouponById,
+		GetPhoneNumber,
+		getUserNormalDiscountList,
+		bindUserPhone,
+		orderToPay,
+		orderToGoldPay,
+		findUser,
+		unionPay,
+		hltUnionCardPay,
+	} from '../../Utils/Api.js';
+	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
+	import ssPaymentPassword from '../../components/sanshui-payment-password'
+	let app = getApp();
+
+	export default {
+		components: {
+			wybPopup,
+			ssPaymentPassword
+		},
+		data() {
+			return {
+				buylist: [], //订单列表
+				goodsPrice: 0.0, //商品合计价格
+				sumPrice: 0.0, //用户付款价格
+				freight: 12.00, //运费
+				note: '', //备注
+				int: 1200, //抵扣积分
+				deduction: 0, //抵扣价格
+				couponId: '',
+				couponList: [],
+				UserNormalDiscountList: [],
+				imageUrl: app.globalData.imgUrl,
+				deductionPrice: '0.00',
+				paytheprice: '',
+				radioStatus: true,
+				memDiscountId: '',
+				user: '',
+				paytype: '',
+				PaymentPassword: '',
+				orderId: '',
+				jumpType: '',
 				tongCardPrice: 0,
-
-
-			};
-		},
-		onLoad(option) {
-			this.couponId = option.id;
-			this.getCouponById();
-		},
-		onShow() {
-			let that = this;
-			that.paytype = '';
-			that.user = app.globalData.userInfo;
-			that.getUserNormalDiscountList();
-			that.findUser();
-		},
-		onHide() {
-
-		},
-		onBackPress() {
-			//页面后退时候，清除订单信息
-		},
-		filters: {
-			toFixed: function(x) {
-				return parseFloat(x).toFixed(2);
-			},
-			//过滤器 用于格式化时间
-			formatDate: function(value, spe = '/') {
-				let data = new Date(value);
-				let year = data.getFullYear();
-				let month = data.getMonth() + 1;
-				let day = data.getDate();
-				let h = data.getHours();
-				let mm = data.getMinutes();
-				let s = data.getSeconds();
-				month = month >= 10 ? month : "0" + month;
-				day = day >= 10 ? day : "0" + day;
-				h = h >= 10 ? h : "0" + h;
-				mm = mm >= 10 ? mm : "0" + mm;
-				s = s >= 10 ? s : "0" + s;
-				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
-			}
-		},
-		methods: {
-			//查询积分
-			findUser() {
-				let params;
-				findUser(params).then(res => {
-					if (res.return_code == '000000') {
-						app.globalData.userInfo = res.return_data;
-						this.user = res.return_data;
-						uni.setStorage({
-							key: "user",
-							data: res.return_data
-						})
-					}
-				});
-			},
-			//查询卡券详情
-			getCouponById() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					couponId: this.couponId
-				}
-				getCouponById(params).then(res => {
-					if (res.return_code == '000000') {
-						this.couponList = res.return_data;
-						this.paytheprice = res.return_data.discountPrice;
-						uni.hideLoading()
-					} else {
-						uni.hideLoading()
-					}
-				})
-			},
-			//显示弹出
-			showPopup() {
-				this.$refs.popup.show();
-			},
-
-			radioChanges(item) {
-				if (this.memDiscountId == item.id) { // 如果已经选中，则取消选中
+				storeId: '',
+				isDiscont: false,
+				coupondiscountid:''
+
+			};
+		},
+		onLoad(option) {
+			this.couponId = option.id;
+			this.getCouponById();
+		},
+		onShow() {
+			let that = this;
+			that.paytype = '';
+			that.user = app.globalData.userInfo;
+			that.getUserNormalDiscountList();
+			that.findUser();
+		},
+		onHide() {
+
+		},
+		onBackPress() {
+			//页面后退时候，清除订单信息
+		},
+		filters: {
+			toFixed: function(x) {
+				return parseFloat(x).toFixed(2);
+			},
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		methods: {
+			//查询积分
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
+			//查询卡券详情
+			getCouponById() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					couponId: this.couponId
+				}
+				getCouponById(params).then(res => {
+					if (res.return_code == '000000') {
+						this.couponList = res.return_data;
+						this.paytheprice = res.return_data.discountPrice;
+						uni.hideLoading()
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			//显示弹出
+			showPopup() {
+				this.$refs.popup.show();
+			},
+
+			radioChanges(item) {
+				if (this.memDiscountId == item.highDiscount.id) { // 如果已经选中，则取消选中
 					this.memDiscountId = '';
-					this.paytheprice = this.couponList.discountPrice;
-					this.deductionPrice = '0.00';
-				} else { // 否则进行选中赋值
-					this.memDiscountId = item.id;
-					if (item.highDiscount.discountType == 1) {
-						if (this.couponList.salesPrice > item.highDiscount.discountPrice) {
-							//满减价格
-							this.deductionPrice = item.highDiscount.discountPrice;
-							this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) /
-								100);
-						} else {
-							uni.showToast({
-								title: '未满足满减条件',
-								icon: 'none',
-								duration: 2000
-							})
-						}
-					} else if (item.highDiscount.discountType == 2) {
-						//抵扣价格
-						this.deductionPrice = item.highDiscount.discountPrice;
-						this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) / 100);
-					} else if (item.highDiscount.discountType == 3) {
-						// 打折
-						this.deductionPrice = this.couponList.salesPrice - this.couponList.salesPrice * (
-							item.highDiscount.discountPrice / 10);
-						this.paytheprice = this.couponList.salesPrice * (item.highDiscount
-							.discountPrice / 10);
-					}
-				}
-				this.$refs.popup.hide();
-			},
-			//查询优惠券详情
-			getUserNormalDiscountList() {
-				let params = {
-					couponId: this.couponId
-				}
-				getUserNormalDiscountList(params).then(res => {
-					if (res.return_code == '000000') {
-						this.UserNormalDiscountList = res.return_data;
-					}
-				})
-			},
-			// H5获取手机号
-			jumpH5Bding() {
-				uni.navigateTo({
-					url: '/pages/login/register?id=2'
-				})
-			},
-			// 微信获取手机号
-			getPhoneNumber(PhoneNumber) {
-				let params = {
-					openId: app.globalData.openId,
-					iv: PhoneNumber.detail.iv,
-					encryptedData: PhoneNumber.detail.encryptedData
-				}
-				GetPhoneNumber(params).then(res => {
-					if (res.return_code == '000000') {
-						app.globalData.userInfo = res.return_data
-							.object
-							.highUser;
-						this.user = res.return_data
-							.object
-							.highUser;
-						uni.setStorage({
-							key: "user",
-							data: res.return_data
-								.object
-								.highUser
-						})
-						let that = this;
-						that.toPay();
-					}
-				});
-			},
-			toPay() {
-				if (this.paytype == '') {
-					uni.showToast({
-						title: '请选择支付方式',
-						icon: 'none',
-						duration: 2000
-					})
-					return;
-				}
-				uni.showLoading({
-					title: '提交订单中...'
+					this.coupondiscountid = '';
+					this.paytheprice = this.couponList.discountPrice;
+					this.deductionPrice = '0.00';
+					this.isDiscont = false;
+				} else { // 否则进行选中赋值
+					this.isDiscont = true;
+					this.memDiscountId = item.highDiscount.id;
+					this.coupondiscountid = item.id;
+					if (item.highDiscount.discountType == 1) {
+						//满减价格
+						this.deductionPrice = item.highDiscount.discountPrice;
+						this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+					} else if (item.highDiscount.discountType == 2) {
+						//抵扣价格
+						this.deductionPrice = item.highDiscount.discountPrice;
+						this.paytheprice = this.couponList.salesPrice - this.deductionPrice;
+					} else if (item.highDiscount.discountType == 3) {
+						// 打折		
+						this.deductionPrice = parseFloat(this.couponList.salesPrice - (this.couponList.salesPrice *
+							item
+							.highDiscount.discountPrice)).toFixed(2)
+						this.paytheprice = parseFloat(this.couponList.salesPrice * item.highDiscount.discountPrice)
+							.toFixed(2);
+					}
+				}
+				this.$refs.popup.hide();
+			},
+			//查询优惠券详情
+			getUserNormalDiscountList() {
+				let params = {
+					couponId: this.couponId
+				}
+				getUserNormalDiscountList(params).then(res => {
+					if (res.return_code == '000000') {
+						this.UserNormalDiscountList = res.return_data;
+					}
+				})
+			},
+			// H5获取手机号
+			jumpH5Bding() {
+				uni.navigateTo({
+					url: '/pages/login/register?id=2'
+				})
+			},
+			// 微信获取手机号
+			getPhoneNumber(PhoneNumber) {
+				let params = {
+					openId: app.globalData.openId,
+					iv: PhoneNumber.detail.iv,
+					encryptedData: PhoneNumber.detail.encryptedData
+				}
+				GetPhoneNumber(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data
+							.object
+							.highUser;
+						this.user = res.return_data
+							.object
+							.highUser;
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+								.object
+								.highUser
+						})
+						let that = this;
+						that.toPay();
+					}
+				});
+			},
+			toPay() {
+				if (this.paytype == '') {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '提交订单中...'
 				})
-				let goods = {
-					"memDiscountId": this.memDiscountId,
-					"identificationCode": app.globalData.identificationCode,
-					"highChildOrderList": [{
-						"goodsType": 1,
-						"goodsId": this.couponId,
-						"saleCount": 1
-					}]
-				}
-				addOrder(goods).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.jumpType = res.return_data.highChildOrderList[0].ext1;
-						this.orderId = res.return_data.id;
-						this.orderToPay(res.return_data);
-					} else {
-						uni.hideLoading();
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-			},
-			//获取选择支付方式
-			changeRiado() {
-				if (!this.user.isSetHltCard) {
-					uni.showToast({
-						icon: 'none',
-						title: '当前账号还未绑定,前往绑定',
-						duration: 2000,
-						success() {
-							setTimeout(() => {
-								uni.navigateTo({
-									url: '../user/bindingCard/bindingCard'
-								})
-							}, 1000)
-						}
-					});
-					return;
-				}
-			},
-			//获取订单数据
-			orderToPay(item) {
-				let that = this;
-				if (that.paytype == 'jinbi') {
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../login/updatePas/updatePas'
-						})
-						return;
-					}
-					that.$refs.paymentPassword.modalFun('show');
-				} else if (that.paytype == 'unionPay') {
-					this.unionPay();
-				} else {
-					uni.showToast({
-						title: '请选择支付方式',
-						icon: 'none',
-						duration: 2000
-					})
-				}
-			},
-			//银联获取信息
-			unionPay() {
-				let goods = {
-					"orderId": this.orderId
-				}
-				unionPay(goods).then(res => {
-					if (res.return_code == '000000') {
-						this.uniontopay(res.return_data.prepayid);
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-			},
-			//银联支付
-			uniontopay(item) {
-				let that = this;
-				upsdk.pluginReady(function() {
-					upsdk.pay({
-						tn: item,
-						success: function(res) {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '../pay/success/success?id=' + that.couponId
-							});
-						},
-						fail: function(err) {
-							uni.showToast({
-								title: err.msg,
-								icon: 'none',
-								duration: 2000
+				if (this.couponList.reserveStatus) {
+					this.storeId = app.globalData.storeid
+				}
+				let goods = {
+					"memDiscountId": this.coupondiscountid,
+					"identificationCode": app.globalData.identificationCode,
+					"highChildOrderList": [{
+						"goodsType": 1,
+						"goodsId": this.couponId,
+						"saleCount": 1,
+						"storeId": this.storeId
+					}]
+				}
+				addOrder(goods).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.jumpType = res.return_data.highChildOrderList[0].ext1;
+						this.orderId = res.return_data.id;
+						this.orderToPay(res.return_data);
+					} else {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//获取选择支付方式
+			changeRiado() {
+				if (!this.user.isSetHltCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			//获取订单数据
+			orderToPay(item) {
+				let that = this;
+				if (that.paytype == 'jinbi') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../login/updatePas/updatePas'
+						})
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				} else if (that.paytype == 'unionPay') {
+					this.unionPay();
+				} else {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			//银联获取信息
+			unionPay() {
+				let goods = {
+					"orderId": this.orderId
+				}
+				unionPay(goods).then(res => {
+					if (res.return_code == '000000') {
+						this.uniontopay(res.return_data.prepayid);
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//银联支付
+			uniontopay(item) {
+				let that = this;
+				upsdk.pluginReady(function() {
+					upsdk.pay({
+						tn: item,
+						success: function(res) {
+							uni.showToast({
+								title: '支付成功'
 							})
-							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
-						}
-					});
-				});
-			},
-			//支付密码弹出
-			submitHandle(e) {
-				this.PaymentPassword = e.value;
-				if (this.PaymentPassword == '') {
-					uni.showToast({
-						title: '请勿手动关闭弹窗',
-						icon: 'none',
-						duration: 2000
-					})
-					return;
-				}
-				uni.showLoading({
-					title: '支付中...'
-				})
-				let params = {
-					"orderId": this.orderId,
-					"password": this.PaymentPassword
-				}
-				orderToGoldPay(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						uni.showToast({
-							title: '支付成功'
-						})
-						uni.reLaunch({
-							url: '../pay/success/success?id=' + this.couponId
-						});
-					}
-					if (res.return_code == '102130') {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-					}
-					uni.showToast({
-						title: res.return_msg,
-						icon: 'none'
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f7f7f7;
-	}
-
-	.comorder {
-		background-color: #FFFFFF;
-		border-radius: 8px;
-	}
-
-	.jtcs {
-		width: 40rpx;
-		height: 40rpx;
-		margin-top: 30rpx;
-	}
-
-	.goodsimg {
-		align-items: center;
-		display: flex;
-
-		image {
-			width: 170rpx;
-			max-height: 170rpx;
-		}
-	}
-
-	.yhprice {
-		width: 100%;
-		height: 25px;
-		text-align: right;
-		margin-top: -20px;
-	}
-
-	.price-number {
-		width: 100%;
-		display: flex;
-		justify-content: space-between;
-		align-items: flex-end;
-		font-size: 28upx;
-		height: 40upx;
-
-		.price {
-			color: #FE4545;
-			display: flex;
-			max-width: 50%;
-			align-items: center;
-		}
-
-		.number {
-			display: flex;
-			align-items: center;
-			width: 50%;
-			text-decoration: line-through;
-
-		}
-	}
-
-	.yhqky {
-		background: #ff0034;
-		color: #ffffff;
-		font-size: 14px;
-		padding-left: 5px;
-		padding-right: 5px;
-		margin-left: 8px;
-		padding-top: 2px;
-		padding-bottom: 2px;
-	}
-
-
-
-	.addr {
-		width: 86%;
-		padding: 20upx 3%;
-		margin: 30upx auto 20upx auto;
-		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
-		border-radius: 20upx;
-		display: flex;
-
-		.icon {
-			width: 80upx;
-			height: 80upx;
-			display: flex;
-			align-items: center;
-
-			image {
-				width: 60upx;
-				height: 60upx;
-			}
-		}
-
-		.tel-name {
-			width: 100%;
-			display: flex;
-			font-size: 32upx;
-
-			.tel {
-				margin-left: 40upx;
-			}
-		}
-
-		.addres {
-			width: 100%;
-			font-size: 26upx;
-			color: #999;
-		}
-	}
-
-	.tccs {
-		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
-		border: 1px solid #f6f6f6;
-		border-radius: 8px;
-		align-items: center;
-		display: flex;
-
-		image {
-			width: 170rpx;
-			max-height: 170rpx;
-		}
-	}
-
-	.tcrig {
-		margin-left: 20rpx;
-	}
-
-	.info {
-		display: flex;
-		justify-content: space-between;
-		align-items: flex-end;
-		width: 92%;
-	}
-
-	.order {
-		width: 86%;
-		padding: 10upx 3%;
-		margin: 30upx auto 20upx auto;
-		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
-		border-radius: 20upx;
-
-		.row {
-			margin: 20upx 0;
-			height: 40upx;
-			display: flex;
-
-			.left {
-				font-size: 28upx;
-			}
-
-			.right {
-				margin-left: 40upx;
-				font-size: 26upx;
-				color: #999;
-
-				input {
-					font-size: 26upx;
-					color: #999;
-				}
-			}
-		}
-	}
-
-	.footer {
-		width: 92%;
-		padding: 0 4%;
-		background-color: #fbfbfb;
-		height: 100upx;
-		display: flex;
-		justify-content: flex-end;
-		align-items: center;
-		font-size: 28upx;
-		position: fixed;
-		bottom: 0upx;
-		z-index: 5;
-
-		.settlement {
-			width: 100%;
-			display: flex;
-			justify-content: flex-end;
-			align-items: center;
-
-			.sum {
-				width: 50%;
-				font-size: 18px;
-				margin-right: 10upx;
-				display: flex;
-				justify-content: flex-start;
-
-				.money {
-					color: #eb5823;
-					font-weight: 600;
-				}
-			}
-
-			.btn {
-				padding: 0 50rpx;
-				height: 80rpx;
-				background-color: #0083f5;
-				color: #fff;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 30upx;
-				border-radius: 40upx;
-			}
-		}
-	}
-
-	.goods-list {
-		width: 100%;
-		padding: 0;
-
-		.tis {
-			width: 100%;
-			height: 60upx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			font-size: 32upx;
-		}
-
-		.row {
-			width: calc(92%);
-			height: calc(22vw + 40upx);
-			margin: 20upx auto;
-
-			border-radius: 15upx;
-			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
-			display: flex;
-			align-items: center;
-			position: relative;
-			overflow: hidden;
-			z-index: 4;
-			border: 0;
-
-			.menu {
-				.icon {
-					color: #fff;
-					// font-size: 25upx;
-				}
-
-				position: absolute;
-				width: 30%;
-				height: 100%;
-				right: 0;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				background-color: red;
-				color: #fff;
-				z-index: 2;
-			}
-
-			.carrier {
-				.checkbox-box {
-					padding-left: 20upx;
-					flex-shrink: 0;
-					height: 22vw;
-					margin-right: 20upx;
-				}
-
-				position: absolute;
-				width: 94%;
-				margin-left: 3%;
-				padding: 0 0;
-				height: 100%;
-				z-index: 3;
-				display: flex;
-				align-items: center;
-
-				.goods-info {
-					width: 100%;
-					display: flex;
-					padding-right: 20upx;
-
-					.img {
-						width: 22vw;
-						height: 22vw;
-						border-radius: 10upx;
-						overflow: hidden;
-						flex-shrink: 0;
-						margin-right: 10upx;
-
-						image {
-							width: 22vw;
-							height: 22vw;
-						}
-					}
-
-					.info {
-						width: 100%;
-						height: 22vw;
-						overflow: hidden;
-						display: flex;
-						flex-wrap: wrap;
-						position: relative;
-
-						.title {
-							width: 100%;
-							font-size: 16px;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							// text-align: justify;
-							overflow: hidden;
-						}
-
-						.spec {
-							font-size: 14px;
-							color: #a7a7a7;
-							height: 30upx;
-							display: flex;
-							align-items: center;
-							padding: 0;
-							border-radius: 15upx;
-							margin-bottom: 20vw;
-						}
-
-						.price-number {
-							position: absolute;
-							width: 100%;
-							bottom: 0upx;
-							display: flex;
-							justify-content: space-between;
-							align-items: flex-end;
-							font-size: 28upx;
-							height: 60upx;
-						}
-					}
-				}
-			}
-		}
-	}
+							app.globalData.storeid = '';
+							app.globalData.storename = '';
+							uni.reLaunch({
+								url: '../pay/success/success?id=' + that.couponId
+							});
+						},
+						fail: function(err) {
+							uni.showToast({
+								title: err.msg,
+								icon: 'none',
+								duration: 2000
+							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
+						}
+					});
+				});
+			},
+			//支付密码弹出
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				if (this.PaymentPassword == '') {
+					uni.showToast({
+						title: '请勿手动关闭弹窗',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '支付中...'
+				})
+				let params = {
+					"orderId": this.orderId,
+					"password": this.PaymentPassword
+				}
+				orderToGoldPay(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						uni.showToast({
+							title: '支付成功'
+						})
+						uni.reLaunch({
+							url: '../pay/success/success?id=' + this.couponId
+						});
+					}
+					if (res.return_code == '102130') {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+					}
+					uni.showToast({
+						title: res.return_msg,
+						icon: 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f7f7f7;
+	}
+
+	.comorder {
+		background-color: #FFFFFF;
+		border-radius: 8px;
+	}
+
+	.jtcs {
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 30rpx;
+	}
+
+	.goodsimg {
+		align-items: center;
+		display: flex;
+
+		image {
+			width: 170rpx;
+			max-height: 170rpx;
+		}
+	}
+
+	.yhprice {
+		width: 100%;
+		height: 25px;
+		text-align: right;
+		margin-top: -20px;
+	}
+
+	.price-number {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		font-size: 28upx;
+		height: 40upx;
+
+		.price {
+			color: #FE4545;
+			display: flex;
+			max-width: 50%;
+			align-items: center;
+		}
+
+		.number {
+			display: flex;
+			align-items: center;
+			width: 50%;
+			text-decoration: line-through;
+
+		}
+	}
+
+	.yhqky {
+		background: #ff0034;
+		color: #ffffff;
+		font-size: 14px;
+		padding-left: 5px;
+		padding-right: 5px;
+		margin-left: 8px;
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+
+
+
+	.addr {
+		width: 86%;
+		padding: 20upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+		display: flex;
+
+		.icon {
+			width: 80upx;
+			height: 80upx;
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 60upx;
+				height: 60upx;
+			}
+		}
+
+		.tel-name {
+			width: 100%;
+			display: flex;
+			font-size: 32upx;
+
+			.tel {
+				margin-left: 40upx;
+			}
+		}
+
+		.addres {
+			width: 100%;
+			font-size: 26upx;
+			color: #999;
+		}
+	}
+
+	.tccs {
+		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
+		border: 1px solid #f6f6f6;
+		border-radius: 8px;
+		align-items: center;
+		display: flex;
+
+		image {
+			width: 170rpx;
+			max-height: 170rpx;
+		}
+	}
+
+	.tcrig {
+		margin-left: 20rpx;
+	}
+
+	.info {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		width: 92%;
+	}
+
+	.order {
+		width: 86%;
+		padding: 10upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+
+		.row {
+			margin: 20upx 0;
+			height: 40upx;
+			display: flex;
+
+			.left {
+				font-size: 28upx;
+			}
+
+			.right {
+				margin-left: 40upx;
+				font-size: 26upx;
+				color: #999;
+
+				input {
+					font-size: 26upx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.footer {
+		width: 92%;
+		padding: 0 4%;
+		background-color: #fbfbfb;
+		height: 100upx;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		font-size: 28upx;
+		position: fixed;
+		bottom: 0upx;
+		z-index: 5;
+
+		.settlement {
+			width: 100%;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+
+			.sum {
+				width: 50%;
+				font-size: 18px;
+				margin-right: 10upx;
+				display: flex;
+				justify-content: flex-start;
+
+				.money {
+					color: #eb5823;
+					font-weight: 600;
+				}
+			}
+
+			.btn {
+				padding: 0 50rpx;
+				height: 80rpx;
+				background-color: #0083f5;
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 30upx;
+				border-radius: 40upx;
+			}
+		}
+	}
+
+	.goods-list {
+		width: 100%;
+		padding: 0;
+
+		.tis {
+			width: 100%;
+			height: 60upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+		}
+
+		.row {
+			width: calc(92%);
+			height: calc(22vw + 40upx);
+			margin: 20upx auto;
+
+			border-radius: 15upx;
+			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+			display: flex;
+			align-items: center;
+			position: relative;
+			overflow: hidden;
+			z-index: 4;
+			border: 0;
+
+			.menu {
+				.icon {
+					color: #fff;
+					// font-size: 25upx;
+				}
+
+				position: absolute;
+				width: 30%;
+				height: 100%;
+				right: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: red;
+				color: #fff;
+				z-index: 2;
+			}
+
+			.carrier {
+				.checkbox-box {
+					padding-left: 20upx;
+					flex-shrink: 0;
+					height: 22vw;
+					margin-right: 20upx;
+				}
+
+				position: absolute;
+				width: 94%;
+				margin-left: 3%;
+				padding: 0 0;
+				height: 100%;
+				z-index: 3;
+				display: flex;
+				align-items: center;
+
+				.goods-info {
+					width: 100%;
+					display: flex;
+					padding-right: 20upx;
+
+					.img {
+						width: 22vw;
+						height: 22vw;
+						border-radius: 10upx;
+						overflow: hidden;
+						flex-shrink: 0;
+						margin-right: 10upx;
+
+						image {
+							width: 22vw;
+							height: 22vw;
+						}
+					}
+
+					.info {
+						width: 100%;
+						height: 22vw;
+						overflow: hidden;
+						display: flex;
+						flex-wrap: wrap;
+						position: relative;
+
+						.title {
+							width: 100%;
+							font-size: 16px;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							// text-align: justify;
+							overflow: hidden;
+						}
+
+						.spec {
+							font-size: 14px;
+							color: #a7a7a7;
+							height: 30upx;
+							display: flex;
+							align-items: center;
+							padding: 0;
+							border-radius: 15upx;
+							margin-bottom: 20vw;
+						}
+
+						.price-number {
+							position: absolute;
+							width: 100%;
+							bottom: 0upx;
+							display: flex;
+							justify-content: space-between;
+							align-items: flex-end;
+							font-size: 28upx;
+							height: 60upx;
+						}
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/pay/payment/payment.vue b/high-unionPay/pages/pay/payment/payment.vue
index b5c64d8..3e2eb00 100644
--- a/high-unionPay/pages/pay/payment/payment.vue
+++ b/high-unionPay/pages/pay/payment/payment.vue
@@ -1,363 +1,364 @@
-<template>
-	<view>
-		<view class="block">
-			<view class="content">
-				<view class="orderinfo">
-					<view class="row">
-						<view class="nominal">订单金额:</view>
-						<view class="text" v-if="pryType == 1">{{amount}} 元</view>
-						<view class="text" v-if="pryType == 2">{{amount*100}} 个积分</view>
-						<view class="text" v-if="pryType == 3">{{amount}}元</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="block">
-			<view class="title">
-				选择支付方式
-			</view>
-			<view class="content">
-				<view class="pay-list">
-				<!-- 	<view class="row" @tap="paytype='jinbi'">
-						<view class="left">
-							<image src="../../../static/img/jfx.png"></image>
-						</view>
-						<view class="center">
-							积分支付(积分:{{user.gold}})
-						</view>
-						<view class="right">
-							<radio :checked="paytype=='jinbi'" color="#0083f5" />
-						</view>
-					</view> -->
-					<view class="row" @tap="paytype='gonghuika'">
-						<view class="left">
-							<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png"></image>
-						</view>
-						<view class="center">
-							银联支付
-						</view>
-						<view class="right">
-							<radio :checked="paytype=='gonghuika'" color="#0083f5" />
-						</view>
-					</view>
-					<!-- <view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 ">
-						<view class="left">
-							<image :src="imagewxUrl+imgadres"></image>
-						</view>
-						<view class="center">
-							微信支付
-						</view>
-						<view class="right">
-							<radio :checked="paytype=='wxpay'" color="#0083f5" />
-						</view>
-					</view> -->
-				</view>
-			</view>
-		</view>
-		<view class="pay">
-			<view class="btn" @tap="orderToPay">立即支付</view>
-			<view class="tis">
-				点击立即支付，即代表您同意<view class="terms">
-					《条款协议》
-				</view>
-			</view>
-		</view>
-
-		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
-	</view>
-</template>
-
-<script>
-	import {
-		orderToPay,
-		orderToGoldPay,
-		hltUnionCardPay,
-		unionPay
-	} from '../../../Utils/Api.js'
-	import ssPaymentPassword from '../../../components/sanshui-payment-password'
-	let app = getApp();
-	export default {
-		components: {
-			ssPaymentPassword
-		},
-		data() {
-			return {
-				amount: 0,
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'wxpay.png',
-				pryType: '',
-				paytype: '', //支付类型
-				orderNo: '',
-				user: '',
-				couponId: '',
-				jumpType: '',
-				PaymentPassword: '',
-				tongCardPrice: 0
-			};
-		},
-		onLoad(e) {
-			this.pryType = e.paytype;
-			this.orderNo = e.orderId;
-			this.couponId = e.couponId;
-			this.jumpType = e.typeaout;
-			if (this.pryType == 1) {
-				this.paytype = 'wxpay';
-			} else if (this.pryType == 2) {
-				this.paytype = 'jinbi'
-			} else {
-				this.paytype = ''
-			}
-			this.amount = parseFloat(e.amount).toFixed(2);
-		},
-		onShow() {
-			let that = this;
-			that.user = app.globalData.userInfo;
-		},
-		methods: {
-
-			//获取订单数据
-			orderToPay() {
-				let that = this;
-				if (that.paytype == 'jinbi') {
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					that.$refs.paymentPassword.modalFun('show');
-				} else if (that.paytype == 'gonghuika') {
-					that.unionPay();
-				} else {
-					uni.showToast({
-						title: '请选择支付方式',
-						icon: 'none',
-						duration: 2000
-					})
-				}
-			},
-			//银联获取信息
-			unionPay() {
-				let goods = {
-					"orderId": this.orderNo
-				}
-				unionPay(goods).then(res => {
-					if (res.return_code == '000000') {
-						this.uniontopay(res.return_data.prepayid);
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-			},
-			//银联支付
-			uniontopay(item) {
-				let that = this;
-				upsdk.pluginReady(function() {
-					upsdk.pay({
-						tn: item,
-						success: function(res) {
-							uni.showToast({
-								title: '支付成功'
-							})
-							uni.reLaunch({
-								url: '../success/success?id=' + this.couponId
-							});
-						},
-						fail: function(err) {
-							uni.showToast({
-								title: err.msg,
-								icon: 'none',
-								duration: 2000
-							})
-							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
-						}
-					});
-				});
-			},
-			submitHandle(e) {
-				this.PaymentPassword = e.value;
-				uni.showLoading({
-					title: '支付中...'
-				})
-				if (this.paytype == 'jinbi') {
-					let params = {
-						"orderId": this.orderNo,
-						"password": this.PaymentPassword
-					}
-					orderToGoldPay(params).then(res => {
-						uni.hideLoading();
-						if (res.return_code == '000000') {
-							uni.showToast({
-								title: '支付成功'
-							})
-							if (this.jumpType == 4) {
-								uni.reLaunch({
-									url: '/pages/tabBar/user/user'
-								});
-								return;
-							}
-							uni.reLaunch({
-								url: '../success/success?id=' + this.couponId
-							});
-
-						}
-						if (res.return_code == '102130') {
-							uni.navigateTo({
-								url: '../../login/updatePas/updatePas'
-							})
-							return;
-						}
-
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none'
-						})
-					})
-					return;
-				}
-				let params = {
-					"orderId": this.orderNo,
-					"cardNo": this.user.hltCardNo.cardNo,
-					"password": this.PaymentPassword
-				}
-				hltUnionCardPay(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						uni.showToast({
-							title: '支付成功'
-						})
-						uni.reLaunch({
-							url: '../success/success?id=' + this.couponId
-						});
-						return;
-					}
-					if (res.return_code == '102130') {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					uni.showToast({
-						title: res.return_msg,
-						icon: 'none'
-					})
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.block {
-		width: 94%;
-		padding: 0 3% 40upx 3%;
-
-		.title {
-			width: 100%;
-			font-size: 34upx;
-		}
-
-		.content {
-			.orderinfo {
-				width: 100%;
-				border-bottom: solid 1upx #eee;
-
-				.row {
-					width: 100%;
-					height: 90upx;
-					display: flex;
-					align-items: center;
-
-					.nominal {
-						flex-shrink: 0;
-						font-size: 32upx;
-						color: #7d7d7d;
-					}
-
-					.text {
-						width: 70%;
-						margin-left: 10upx;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						font-size: 32upx;
-					}
-				}
-			}
-
-			.pay-list {
-				width: 100%;
-				border-bottom: solid 1upx #eee;
-
-				.row {
-					width: 100%;
-					height: 120upx;
-					display: flex;
-					align-items: center;
-
-					.left {
-						width: 100upx;
-						flex-shrink: 0;
-						display: flex;
-						align-items: center;
-
-						image {
-							width: 60upx;
-							height: 60upx;
-						}
-					}
-
-					.center {
-						width: 100%;
-						font-size: 30upx;
-					}
-
-					.right {
-						width: 100upx;
-						flex-shrink: 0;
-						display: flex;
-						justify-content: flex-end;
-					}
-				}
-			}
-		}
-	}
-
-	.pay {
-		margin-top: 20upx;
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		flex-wrap: wrap;
-
-		.btn {
-			width: 70%;
-			height: 80upx;
-			border-radius: 80upx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #fff;
-			background-color: #0083f5;
-			box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
-		}
-
-		.tis {
-			margin-top: 10upx;
-			width: 100%;
-			font-size: 24upx;
-			display: flex;
-			justify-content: center;
-			align-items: baseline;
-			color: #999;
-
-			.terms {
-				color: #5a9ef7;
-			}
-		}
-	}
+<template>
+	<view>
+		<view class="block">
+			<view class="content">
+				<view class="orderinfo">
+					<view class="row">
+						<view class="nominal">订单金额:</view>
+						<view class="text" v-if="pryType == 1">{{amount}} 元</view>
+						<view class="text" v-if="pryType == 2">{{amount*100}} 个积分</view>
+						<view class="text" v-if="pryType == 3">{{amount}}元</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				选择支付方式
+			</view>
+			<view class="content">
+				<view class="pay-list">
+					<!-- 	<view class="row" @tap="paytype='jinbi'">
+						<view class="left">
+							<image src="../../../static/img/jfx.png"></image>
+						</view>
+						<view class="center">
+							积分支付(积分:{{user.gold}})
+						</view>
+						<view class="right">
+							<radio :checked="paytype=='jinbi'" color="#0083f5" />
+						</view>
+					</view> -->
+					<view class="row" @tap="paytype='gonghuika'">
+						<view class="left">
+							<image mode="widthFix" style="border-radius: 50%;" src="../../../static/img/unionpay.png">
+							</image>
+						</view>
+						<view class="center">
+							银联支付
+						</view>
+						<view class="right">
+							<radio :checked="paytype=='gonghuika'" color="#0083f5" />
+						</view>
+					</view>
+					<!-- <view class="row" @tap="paytype='wxpay'" v-if="pryType == 1 || pryType==3 ">
+						<view class="left">
+							<image :src="imagewxUrl+imgadres"></image>
+						</view>
+						<view class="center">
+							微信支付
+						</view>
+						<view class="right">
+							<radio :checked="paytype=='wxpay'" color="#0083f5" />
+						</view>
+					</view> -->
+				</view>
+			</view>
+		</view>
+		<view class="pay">
+			<view class="btn" @tap="orderToPay">立即支付</view>
+			<view class="tis">
+				点击立即支付，即代表您同意<view class="terms">
+					《条款协议》
+				</view>
+			</view>
+		</view>
+
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
+	</view>
+</template>
+
+<script>
+	import {
+		orderToPay,
+		orderToGoldPay,
+		hltUnionCardPay,
+		unionPay
+	} from '../../../Utils/Api.js'
+	import ssPaymentPassword from '../../../components/sanshui-payment-password'
+	let app = getApp();
+	export default {
+		components: {
+			ssPaymentPassword
+		},
+		data() {
+			return {
+				amount: 0,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'wxpay.png',
+				pryType: '',
+				paytype: '', //支付类型
+				orderNo: '',
+				user: '',
+				couponId: '',
+				jumpType: '',
+				PaymentPassword: '',
+				tongCardPrice: 0
+			};
+		},
+		onLoad(e) {
+			this.pryType = e.paytype;
+			this.orderNo = e.orderId;
+			this.couponId = e.couponId;
+			this.jumpType = e.typeaout;
+			if (this.pryType == 1) {
+				this.paytype = 'wxpay';
+			} else if (this.pryType == 2) {
+				this.paytype = 'jinbi'
+			} else {
+				this.paytype = ''
+			}
+			this.amount = parseFloat(e.amount).toFixed(2);
+		},
+		onShow() {
+			let that = this;
+			that.user = app.globalData.userInfo;
+		},
+		methods: {
+
+			//获取订单数据
+			orderToPay() {
+				let that = this;
+				if (that.paytype == 'jinbi') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				} else if (that.paytype == 'gonghuika') {
+					that.unionPay();
+				} else {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			//银联获取信息
+			unionPay() {
+				let goods = {
+					"orderId": this.orderNo
+				}
+				unionPay(goods).then(res => {
+					if (res.return_code == '000000') {
+						this.uniontopay(res.return_data.prepayid);
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//银联支付
+			uniontopay(item) {
+				let that = this;
+				upsdk.pluginReady(function() {
+					upsdk.pay({
+						tn: item,
+						success: function(res) {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../success/success?id=' + this.couponId
+							});
+						},
+						fail: function(err) {
+							uni.showToast({
+								title: err.msg,
+								icon: 'none',
+								duration: 2000
+							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
+						}
+					});
+				});
+			},
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				uni.showLoading({
+					title: '支付中...'
+				})
+				if (this.paytype == 'jinbi') {
+					let params = {
+						"orderId": this.orderNo,
+						"password": this.PaymentPassword
+					}
+					orderToGoldPay(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							if (this.jumpType == 4) {
+								uni.reLaunch({
+									url: '/pages/tabBar/user/user'
+								});
+								return;
+							}
+							uni.reLaunch({
+								url: '../success/success?id=' + this.couponId
+							});
+
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../login/updatePas/updatePas'
+							})
+							return;
+						}
+
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
+				let params = {
+					"orderId": this.orderNo,
+					"cardNo": this.user.hltCardNo.cardNo,
+					"password": this.PaymentPassword
+				}
+				hltUnionCardPay(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						uni.showToast({
+							title: '支付成功'
+						})
+						uni.reLaunch({
+							url: '../success/success?id=' + this.couponId
+						});
+						return;
+					}
+					if (res.return_code == '102130') {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					uni.showToast({
+						title: res.return_msg,
+						icon: 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.block {
+		width: 94%;
+		padding: 0 3% 40upx 3%;
+
+		.title {
+			width: 100%;
+			font-size: 34upx;
+		}
+
+		.content {
+			.orderinfo {
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+
+				.row {
+					width: 100%;
+					height: 90upx;
+					display: flex;
+					align-items: center;
+
+					.nominal {
+						flex-shrink: 0;
+						font-size: 32upx;
+						color: #7d7d7d;
+					}
+
+					.text {
+						width: 70%;
+						margin-left: 10upx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						font-size: 32upx;
+					}
+				}
+			}
+
+			.pay-list {
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+
+				.row {
+					width: 100%;
+					height: 120upx;
+					display: flex;
+					align-items: center;
+
+					.left {
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						align-items: center;
+
+						image {
+							width: 60upx;
+							height: 60upx;
+						}
+					}
+
+					.center {
+						width: 100%;
+						font-size: 30upx;
+					}
+
+					.right {
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+	}
+
+	.pay {
+		margin-top: 20upx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		flex-wrap: wrap;
+
+		.btn {
+			width: 70%;
+			height: 80upx;
+			border-radius: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			background-color: #0083f5;
+			box-shadow: 0upx 5upx 10upx rgba(0, 0, 0, 0.2);
+		}
+
+		.tis {
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 24upx;
+			display: flex;
+			justify-content: center;
+			align-items: baseline;
+			color: #999;
+
+			.terms {
+				color: #5a9ef7;
+			}
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/pay/success/success.vue b/high-unionPay/pages/pay/success/success.vue
index 08de13e..963cbb6 100644
--- a/high-unionPay/pages/pay/success/success.vue
+++ b/high-unionPay/pages/pay/success/success.vue
@@ -52,6 +52,16 @@
 				</view>
 			</view>
 			<view class="width90 mart30 font20 fcor333 fotct marb40" v-if="!couponDesInfo">二维码生效中,前往个人中心查看</view>
+			<view class="width90 height45l font18 fcor666 aliitem" v-if="storeList">
+				<view class="width50 alijusstart">
+					<image mode="widthFix" style="width: 50rpx; max-height: 50rpx;margin-right: 10px;"
+						src="../../../static/img/adresw.png"></image> 门店信息
+				</view>
+				<view class="width50 alijusend font15" @click="jumpstorelist">查看更多<image style="width: 18px; height: 17px;"
+						src="../../../static/img/jt.png">
+						</images>
+				</view>
+			</view>
 			<view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
 				<view class="coupon-des flleft">
 					<image mode="widthFix" :src="imageUrl+store.ext1"></image>
@@ -106,7 +116,7 @@
 				twoTime: '',
 				threeTime: '',
 				pageNum: 1,
-				pageSize: 10,
+				pageSize: 1,
 				isNoMoreData: false
 			}
 		},
@@ -189,6 +199,12 @@
 				uni.reLaunch({
 					url:'../../../subPages/lottery/lottery?id='+this.couDesId
 				})
+			},
+			//跳转门店
+			jumpstorelist() {
+				uni.navigateTo({
+					url: '../../../subPages/sotre-details-list/sotre-details-list?id=' + this.couDesId
+				})
 			},
 			//导航
 			seeloaction(e) {
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 664a623..3183bd7 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -169,7 +169,7 @@
 			// if (app.globalData.cityName != '') {
 			// 	this.city = app.globalData.cityName;
 			// 	this.getCouponListArea();
-			// 	this.getCouponListgold();
+			// 	this.getCouponListgold();
 			// }
 		},
 		onLoad() {
@@ -219,11 +219,11 @@
 				upsdk.pluginReady(function() {
 					upsdk.getLocationCity({
 						success: function(cityCd) {
-							app.globalData.cityId = cityCd;
+							app.globalData.cityId = cityCd;
 							that.getCmsAactibity();
-							that.getCouponListArea();
-							that.getCmsContent();
-							that.getCmsContentcmshome();
+							that.getCouponListArea();
+							that.getCmsContent();
+							that.getCmsContentcmshome();
 							that.getCmsContentcmsContent();
 						},
 						fail: function(err) {}
@@ -284,15 +284,15 @@
 					}
 				});
 			},
-			getCmsAactibity() {
-				uni.showToast({
-					title:'加载中...'
+			getCmsAactibity() {
+				uni.showToast({
+					title: '加载中...'
 				})
 				let params = {
 					regionId: app.globalData.cityId,
 					categoryCode: 'CMS_UNIONPAY_ALERT'
 				}
-				getCmsContent(params).then(res => {
+				getCmsContent(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data != '') {
 						//弹窗首页广告
@@ -436,8 +436,19 @@
 						url: '/pages/goods/goods-list/goods-list?id=3'
 					})
 					return;
+				}
+				if (item.title == '优选商品') {
+					uni.navigateTo({
+						url: '../../../subPages/preferred-goods/preferred-goods'
+					})
+					return;
+				}
+				if (item.title == '优惠券包') {
+					uni.navigateTo({
+						url: '../../../subPages/coupon-package/coupon-package'
+					})
+					return;
 				}
-
 
 			},
 			//调整商品列表
diff --git a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
index 2017247..97445b7 100644
--- a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
+++ b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
@@ -12,9 +12,10 @@
 			选择金额
 		</view>
 		<view class="list">
-			<view class="box" :class="{'on':item.realPrice == inputAmount}" v-for="(item,index) in amountList"
+			<view class="box" :class="{'on':item.realPrice == inputAmount}" v-for="(item,index) in amountList" :key="index"
 				@click="select(item)">
 				<view class="heTitle">{{item.price}}元</view>
+				<view class="font13 fcor999" v-if="item.status == 2">已售空</view>
 			</view>
 		</view>
 		<view class="mart5 width90 font18 fcor333 fontwig6">
@@ -77,7 +78,8 @@
 				inputPhone: '',
 				amoutType: '',
 				codesVlues: '',
-				amountList: []
+				amountList: [],
+				amoutstatus:''
 			}
 		},
 		onLoad(options) {
@@ -114,6 +116,7 @@
 				this.inputAmount = amoutinfos.realPrice;
 				this.orderPrice = amoutinfos.price;
 				this.inputAmountId = amoutinfos.id;
+				this.amoutstatus = amoutinfos.status;
 			},
 
 			/**
@@ -138,6 +141,14 @@
 			 * 提交订单
 			 */
 			addOrderPay() {
+				if(this.amoutstatus == 2){
+					uni.showToast({
+						title: '当前面值已售空',
+						duration:2000,
+						icon: "none"
+					});
+					return;
+				}
 				if (this.inputPhone == '') {
 					uni.showToast({
 						title: '请输入充值号码',
diff --git a/high-unionPay/pages/unionPay/unionPay.vue b/high-unionPay/pages/unionPay/unionPay.vue
index 37f52f0..1424912 100644
--- a/high-unionPay/pages/unionPay/unionPay.vue
+++ b/high-unionPay/pages/unionPay/unionPay.vue
@@ -35,7 +35,6 @@
 				upsdk.pluginReady(function() {	
 					upsdk.pay({
 						tn: '554191640461075760517',
-						mode:'00',
 						success: function(res) {
 							// 支付成功, 开发者执行后续操作。
 						},
diff --git a/high-unionPay/pages/unionPay/unionorder-des/unionorder-des.vue b/high-unionPay/pages/unionPay/unionorder-des/unionorder-des.vue
index 6427002..0c6614d 100644
--- a/high-unionPay/pages/unionPay/unionorder-des/unionorder-des.vue
+++ b/high-unionPay/pages/unionPay/unionorder-des/unionorder-des.vue
@@ -90,7 +90,7 @@
 			</view>
 		</view>
 		<view class="width100 height60"></view>
-		<view class="footer">
+		<view class="footer" v-if="recinfo.status == 1">
 			<view class="settlement">
 				<view class="sum">合计:
 					<view class="money">￥{{recinfo.payPrice}}</view>
diff --git a/high-unionPay/pages/user/coupon/coupon.vue b/high-unionPay/pages/user/coupon/coupon.vue
index a8f4325..e393464 100644
--- a/high-unionPay/pages/user/coupon/coupon.vue
+++ b/high-unionPay/pages/user/coupon/coupon.vue
@@ -1,630 +1,609 @@
-<template>
-	<view>
-		<view class="tabr" :style="{top:headerTop}">
-			<view :class="{on:typeClass=='valid'}" @tap="switchType('valid')">可用({{couponValidList.length}})</view>
-			<view :class="{on:typeClass=='invalid'}" @tap="switchType('invalid')">已失效</view>
-			<view class="border" :class="typeClass"></view>
-		</view>
-		<view class="place"></view>
-		<view class="list">
-			<!-- 优惠券列表 -->
-			<view class="sub-list valid" :class="subState">
-				<view class="tis" v-if="couponValidList.length==0">
-					<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
-				</view>
-				<view class="row" v-for="(row,index) in couponValidList" :key="index" @click="jumpcoupons(row.id)">
-					<!-- 删除按钮 -->
-					<view class="menu" @tap.stop="deleteCoupon(row.id,couponValidList)">
-						<view class="icon shanchu"></view>
-					</view>
-					<!-- content -->
-					<view class="carrier">
-						<view class="left">
-							<view class="title">
-								{{row.highDiscount.discountName}}
-							</view>
-							<view class="term">
-								截止时间:{{row.useEndTime | formatDate('-')}}
-							</view>
-							<view class="gap-top"></view>
-							<view class="gap-bottom"></view>
-						</view>
-						<view class="right">
-							<view class="ticket">
-								<view class="num">
-									{{row.highDiscount.discountPrice}}
-								</view>
-								<view class="unit">
-									元
+<template>
+	<view>
+		<view class="tabr" :style="{top:headerTop}">
+			<view :class="{on:typeClass=='valid'}" @tap="switchType('valid')">可用({{couponcout}})</view>
+			<view :class="{on:typeClass=='invalid'}" @tap="switchType('invalid')">已失效</view>
+			<view class="border" :class="typeClass"></view>
+		</view>
+		<view class="place"></view>
+		<view class="list">
+			<!-- 优惠券列表 -->
+			<view class="sub-list valid" :class="subState">
+				<view class="tis" v-if="couponValidList.length==0">
+					<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+				</view>
+				<view class="row" v-for="(row,index) in couponValidList" :key="index" @click="jumpcoupons(row)">
+					<!-- 删除按钮 -->
+					<view class="menu" @tap.stop="deleteCoupon(row.id,couponValidList)">
+						<view class="icon shanchu"></view>
+					</view>
+					<!-- content -->
+					<view class="carrier">
+						<view class="left">
+							<view class="title">
+								{{row.highDiscount.discountName}}
+							</view>
+							<view class="term">
+								截止时间:{{row.useEndTime | formatDate('-')}}
+							</view>
+							<view class="gap-top"></view>
+							<view class="gap-bottom"></view>
+						</view>
+						<view class="right">
+							<view class="ticket">
+								<view class="num" v-if="row.highDiscount.discountType == 3">
+									{{row.highDiscount.discountPrice * 10}}
 								</view>
-							</view>
-							<!-- <view class="criteria">
-								{{row.highDiscount.discountName}}
-							</view> -->
-							<view class="use" >
-								去使用
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="sub-list invalid" :class="subState">
-				<view class="tis" v-if="couponinvalidList.length==0">
-					<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
-				</view>
-				<view class="row" v-for="(row,index) in couponinvalidList" :key="index">
-					<!-- 删除按钮 -->
-					<view class="menu" @tap.stop="deleteCoupon(row.id,couponinvalidList)">
-						<view class="icon shanchu"></view>
-					</view>
-					<!-- content -->
-					<view class="carrier">
-						<view class="left">
-							<view class="title">
-								{{row.highDiscount.discountName}}
-							</view>
-							<view class="term">
-								截止时间:{{row.highDiscount.salesEndTime | formatDate('-')}}
-							</view>
-							<view class="icon shixiao">
-
-							</view>
-							<view class="gap-top"></view>
-							<view class="gap-bottom"></view>
-						</view>
-						<view class="right invalid">
-							<view class="ticket">
-								<view class="num">
+								<view class="num" v-else>
 									{{row.highDiscount.discountPrice}}
+								</view>
+								<view class="unit" v-if="row.highDiscount.discountType == 3">
+									折
 								</view>
-								<view class="unit">
+								<view class="unit" v-else>
 									元
-								</view>
-							</view>
-							<view class="criteria">
-								{{row.highDiscount.discountName}}
-							</view>
-							<view class="use">
-								已失效
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	import {
-		getUserDiscountList
-	} from '../../../Utils/Api.js';
-	let app = getApp();
-	export default {
-		data() {
-			return {
-				couponValidList: [],
-				couponinvalidList: [],
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'noorder.png',
-				headerTop: 0,
-				//控制滑动效果
-				typeClass: 'valid',
-				subState: '',
-				theIndex: null,
-				oldIndex: null,
-				isStop: false,
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				loadingText: ''
-			}
-		},
-		onPageScroll(e) {
-
-		},
-		//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
-		onPullDownRefresh() {
-			setTimeout(function() {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		onLoad() {
-			this.getUserDiscountList(1);
-			//兼容H5下排序栏位置
-			// #ifdef H5
-			//定时器方式循环获取高度为止，这么写的原因是onLoad中head未必已经渲染出来。
-			let Timer = setInterval(() => {
-				let uniHead = document.getElementsByTagName('uni-page-head');
-				if (uniHead.length > 0) {
-					this.headerTop = uniHead[0].offsetHeight + 'px';
-					clearInterval(Timer); //清除定时器
-				}
-			}, 1);
-			// #endif
-		},
-		filters: {
-			//过滤器 用于格式化时间
-			formatDate: function(value, spe = '/') {
-				let data = new Date(value);
-				let year = data.getFullYear();
-				let month = data.getMonth() + 1;
-				let day = data.getDate();
-				let h = data.getHours();
-				let mm = data.getMinutes();
-				let s = data.getSeconds();
-				month = month >= 10 ? month : "0" + month;
-				day = day >= 10 ? day : "0" + day;
-				h = h >= 10 ? h : "0" + h;
-				mm = mm >= 10 ? mm : "0" + mm;
-				s = s >= 10 ? s : "0" + s;
-				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
-			}
-		},
-		onReachBottom() {
-			if (this.typeClass == 'valid') {
-				this.pageNum = 1;
-				this.couponValidList = []
-				this.isNoMoreData = false;
-				this.getUserDiscountList(1);
-			} else {
-				this.pageNum = 1;
-				this.couponinvalidList = []
-				this.isNoMoreData = false;
-				this.getUserDiscountList(2);
-			}
-		},
-		methods: {
-			//查询我的优惠券
-			getUserDiscountList(item) {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					this.loadingText = '到底了';
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					pageNum: pagenum,
-					status: item,
-					pageSize: this.pageSize
-				}
-				getUserDiscountList(params).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
-							this.isNoMoreData = true;
-						}
-						if (this.typeClass == 'valid') {
+								</view>
+							</view>
+							<!-- <view class="criteria">
+								{{row.highDiscount.discountName}}
+							</view> -->
+							<view class="use" >
+								去使用
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="sub-list invalid" :class="subState">
+				<view class="tis" v-if="couponinvalidList.length==0">
+					<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+				</view>
+				<view class="row" v-for="(row,index) in couponinvalidList" :key="index">
+					<!-- 删除按钮 -->
+					<view class="menu" @tap.stop="deleteCoupon(row.id,couponinvalidList)">
+						<view class="icon shanchu"></view>
+					</view>
+					<!-- content -->
+					<view class="carrier">
+						<view class="left">
+							<view class="title">
+								{{row.highDiscount.discountName}}
+							</view>
+							<view class="term">
+								截止时间:{{row.highDiscount.salesEndTime | formatDate('-')}}
+							</view>
+							<view class="icon shixiao">
+
+							</view>
+							<view class="gap-top"></view>
+							<view class="gap-bottom"></view>
+						</view>
+						<view class="right invalid">
+							<view class="ticket">
+								<view class="num">
+									{{row.highDiscount.discountPrice}}
+								</view>
+								<view class="unit">
+									元
+								</view>
+							</view>
+							<view class="criteria">
+								{{row.highDiscount.discountName}}
+							</view>
+							<view class="use">
+								已失效
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getUserDiscountList
+	} from '../../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				couponValidList: [],
+				couponinvalidList: [],
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres:'noorder.png',
+				headerTop: 0,
+				//控制滑动效果
+				typeClass: 'valid',
+				subState: '',
+				theIndex: null,
+				oldIndex: null,
+				isStop: false,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				loadingText: '',
+				couponcout:0
+			}
+		},
+		onPageScroll(e) {
+
+		},
+		//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
+		onPullDownRefresh() {
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onLoad() {
+			this.getUserDiscountList(1);
+			//兼容H5下排序栏位置
+			// #ifdef H5
+			//定时器方式循环获取高度为止，这么写的原因是onLoad中head未必已经渲染出来。
+			let Timer = setInterval(() => {
+				let uniHead = document.getElementsByTagName('uni-page-head');
+				if (uniHead.length > 0) {
+					this.headerTop = uniHead[0].offsetHeight + 'px';
+					clearInterval(Timer); //清除定时器
+				}
+			}, 1);
+			// #endif
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		onReachBottom() {
+			if (this.typeClass == 'valid') {
+				this.getUserDiscountList(1);
+			} else {
+				this.getUserDiscountList(2);
+			}
+		},
+		methods: {
+			//查询我的优惠券
+			getUserDiscountList(item) {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					this.loadingText = '到底了';
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					status: item,
+					pageSize: this.pageSize
+				}
+				getUserDiscountList(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						if (this.typeClass == 'valid') {
 							this.couponValidList = this.couponValidList.concat(res.return_data.list);
-						} else {
-							this.couponinvalidList = this.couponinvalidList.concat(res.return_data.list);
-						}
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.couponValidList = [];
-						this.couponinvalidList = [];
-						uni.hideLoading()
-					}
-				})
-			},
-			//跳转详情
+							this.couponcout = res.return_data.total;
+						} else {
+							this.couponinvalidList = this.couponinvalidList.concat(res.return_data.list);
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.couponValidList = [];
+						this.couponinvalidList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//跳转详情
 			jumpcoupons(e) {
-				uni.navigateTo({
-					url: '../mineCouponsDestails/mineCouponsDestails?id=' + e
-				})
-			},
-			switchType(type) {
-				if (this.typeClass == type) {
-					return;
-				}
-				uni.pageScrollTo({
-					scrollTop: 0,
-					duration: 0
-				})
-				this.typeClass = type;
-				this.subState = this.typeClass == '' ? '' : 'show' + type;
-				setTimeout(() => {
-					this.oldIndex = null;
-					this.theIndex = null;
-					this.subState = this.typeClass == 'valid' ? '' : this.subState;
-				}, 200)
-				if (this.typeClass == 'valid') {
-					this.pageNum = 1;
-					this.couponValidList = []
-					this.isNoMoreData = false;
-					this.getUserDiscountList(1);
-				} else {
-					this.pageNum = 1;
-					this.couponinvalidList = []
-					this.isNoMoreData = false;
-					this.getUserDiscountList(2);
-				}
-			},
-			//控制左滑删除效果-begin
-			touchStart(index, event) {
-				//多点触控不触发
-				if (event.touches.length > 1) {
-					this.isStop = true;
-					return;
-				}
-				this.oldIndex = this.theIndex;
-				this.theIndex = null;
-				//初始坐标
-				this.initXY = [event.touches[0].pageX, event.touches[0].pageY];
-			},
-			touchMove(index, event) {
-				//多点触控不触发
-				if (event.touches.length > 1) {
-					this.isStop = true;
-					return;
-				}
-				let moveX = event.touches[0].pageX - this.initXY[0];
-				let moveY = event.touches[0].pageY - this.initXY[1];
-
-				if (this.isStop || Math.abs(moveX) < 5) {
-					return;
-				}
-				if (Math.abs(moveY) > Math.abs(moveX)) {
-					// 竖向滑动-不触发左滑效果
-					this.isStop = true;
-					return;
-				}
-
-				if (moveX < 0) {
-					this.theIndex = index;
-					this.isStop = true;
-				} else if (moveX > 0) {
-					if (this.theIndex != null && this.oldIndex == this.theIndex) {
-						this.oldIndex = index;
-						this.theIndex = null;
-						this.isStop = true;
-						setTimeout(() => {
-							this.oldIndex = null;
-						}, 150)
-					}
-				}
-			},
-
-			touchEnd(index, $event) {
-				//解除禁止触发状态
-				this.isStop = false;
-			},
-
-			//删除商品
-			deleteCoupon(id, List) {
-				let len = List.length;
-				for (let i = 0; i < len; i++) {
-					if (id == List[i].id) {
-						List.splice(i, 1);
-						break;
-					}
-				}
-				this.oldIndex = null;
-				this.theIndex = null;
-			},
-
-			discard() {
-				//丢弃
-			}
-
-
-		}
-	}
-</script>
-<style lang="scss">
-	view {
-		display: flex;
-		flex-wrap: wrap;
-
-	}
-
-	page {
-		position: relative;
-		background-color: #f5f5f5;
-	}
-
-	.hidden {
-		display: none !important;
-	}
-
-	.place {
-		width: 100%;
-		height: 95upx;
-	}
-
-	.tabr {
-		background-color: #fff;
-		width: 94%;
-		height: 95upx;
-		padding: 0 3%;
-		border-bottom: solid 1upx #dedede;
-		position: fixed;
-		top: 0;
-		z-index: 10;
-
-		view {
-			width: 50%;
-			height: 90upx;
-			justify-content: center;
-			align-items: center;
-			font-size: 32upx;
-			color: #999;
-		}
-
-		.on {
-			color: #0083f5;
-		}
-
-		.border {
-			height: 4upx;
-			background-color: #0083f5;
-			transition: all .3s ease-out;
-
-			&.invalid {
-				transform: translate3d(100%, 0, 0);
-			}
-		}
-
-	}
-
-	.list {
-		width: 100%;
-		display: block;
-		position: relative;
-	}
-
-	@keyframes showValid {
-		0% {
-			transform: translateX(-100%);
-		}
-
-		100% {
-			transform: translateX(0);
-		}
-	}
-
-	@keyframes showInvalid {
-		0% {
-			transform: translateX(0);
-		}
-
-		100% {
-			transform: translateX(-100%);
-		}
-	}
-
-	.sub-list {
-		&.invalid {
-			position: absolute;
-			top: 0;
-			left: 100%;
-			display: none;
-		}
-
-		&.showvalid {
-			display: flex;
-			animation: showValid 0.20s linear both;
-		}
-
-		&.showinvalid {
-			display: flex;
-			animation: showInvalid 0.20s linear both;
-		}
-
-		width: 100%;
-		padding: 20upx 0 120upx 0;
-
-		.tis {
-			width: 100%;
-			height: 60upx;
-			justify-content: center;
-			align-items: center;
-			font-size: 32upx;
-		}
-
-		.row {
-			width: 92%;
-			height: 24vw;
-			margin: 20upx auto 10upx auto;
-			border-radius: 8upx;
-			// box-shadow: 0upx 0 10upx rgba(0,0,0,0.1);
-			align-items: center;
-			position: relative;
-			overflow: hidden;
-			z-index: 4;
-			border: 0;
-
-			.menu {
-				.icon {
-					color: #fff;
-					font-size: 50upx;
-				}
-
-				position: absolute;
-				width: 28%;
-				height: 100%;
-				right: 0;
-				justify-content: center;
-				align-items: center;
-				background-color: red;
-				color: #fff;
-				z-index: 2;
-			}
-
-			.carrier {
-				@keyframes showMenu {
-					0% {
-						transform: translateX(0);
-					}
-
-					100% {
-						transform: translateX(-28%);
-					}
-				}
-
-				@keyframes closeMenu {
-					0% {
-						transform: translateX(-28%);
-					}
-
-					100% {
-						transform: translateX(0);
-					}
-				}
-
-				&.open {
-					animation: showMenu 0.25s linear both;
-				}
-
-				&.close {
-					animation: closeMenu 0.15s linear both;
-				}
-
-				background-color: #fff;
-				position: absolute;
-				width: 100%;
-				padding: 0 0;
-				height: 100%;
-				z-index: 3;
-				flex-wrap: nowrap;
-
-				.left {
-					width: 100%;
-
-					.title {
-						padding-top: 3vw;
-						width: 90%;
-						margin: 0 5%;
-						font-size: 36upx;
-					}
-
-					.term {
-						width: 90%;
-						margin: 0 5%;
-						font-size: 26upx;
-						color: #999;
-					}
-
-					position: relative;
-
-					.gap-top,
-					.gap-bottom {
-						position: absolute;
-						width: 20upx;
-						height: 20upx;
-						right: -10upx;
-						border-radius: 100%;
-						background-color: #f5f5f5;
-					}
-
-					.gap-top {
-						top: -10upx;
-					}
-
-					.gap-bottom {
-						bottom: -10upx;
-					}
-
-					.shixiao {
-						position: absolute;
-						right: 20upx;
-						font-size: 150upx;
-						z-index: 6;
-						color: rgba(153, 153, 153, 0.2)
-					}
-				}
-
-				.right {
-					flex-shrink: 0;
-					width: 28%;
-					color: #fff;
-					background: linear-gradient(to right, #ec625c, #ee827f);
-
-					&.invalid {
-						background: linear-gradient(to right, #aaa, #999);
-
-						.use {
-							color: #aaa;
-						}
-					}
-
-					justify-content: center;
-
-					.ticket,
-					.criteria {
-						width: 100%;
-					}
-
-					.ticket {
-						padding-top: 1vw;
-						justify-content: center;
-						align-items: baseline;
-						height: 6vw;
-
-						.num {
-							font-size: 42upx;
-							font-weight: 600;
-						}
-
-						.unit {
-							font-size: 24upx;
-						}
-					}
-
-					.criteria {
-						justify-content: center;
-
-						font-size: 28upx;
-					}
-
-					.use {
-						width: 50%;
-						height: 40upx;
-						justify-content: center;
-						align-items: center;
-						font-size: 24upx;
-						background-color: #fff;
-						color: #ee827f;
-						border-radius: 40upx;
-						padding: 0 10upx;
-					}
-				}
-			}
-
-			/*
-			<view class="carrier" :class="[theIndex==index?'open':oldIndex==index?'close':'']" @touchstart="touchStart(index,$event)" @touchmove="touchMove(index,$event)" @touchend="touchEnd(index,$event)">
-				<view class="left">
-					<view class="title">
-						10元日常用品类
-					</view>
-					<view class="term">
-						2019-04-01~2019-05-30
-					</view>
-				</view>
-				<view class="right">
-					<view class="ticket">
-						<view class="num">
-							10
-						</view>
-						<view class="unit">
-							元
-						</view>
-					</view>
-					<view class="criteria">
-						满50使用
-					</view>
-					<view class="use">
-						去使用
-					</view>
-				</view>
-			</view>
-			* 
-			* */
-		}
-	}
+				if(e.highDiscount.useScope == 3){
+					uni.navigateTo({
+						url: '../../../subPages/recharge/recharge'
+					})
+				}else{
+					uni.navigateTo({
+						url: '../mineCouponsDestails/mineCouponsDestails?id=' + e.id
+					})
+				}
+				
+			},
+			switchType(type) {
+				if (this.typeClass == type) {
+					return;
+				}
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
+				})
+				this.typeClass = type;
+				this.subState = this.typeClass == '' ? '' : 'show' + type;
+				setTimeout(() => {
+					this.oldIndex = null;
+					this.theIndex = null;
+					this.subState = this.typeClass == 'valid' ? '' : this.subState;
+				}, 200)
+				if (this.typeClass == 'valid') {
+					this.pageNum = 1;
+					this.couponValidList = []
+					this.isNoMoreData = false;
+					this.getUserDiscountList(1);
+				} else {
+					this.pageNum = 1;
+					this.couponinvalidList = []
+					this.isNoMoreData = false;
+					this.getUserDiscountList(2);
+				}
+			},
+			//控制左滑删除效果-begin
+			touchStart(index, event) {
+				//多点触控不触发
+				if (event.touches.length > 1) {
+					this.isStop = true;
+					return;
+				}
+				this.oldIndex = this.theIndex;
+				this.theIndex = null;
+				//初始坐标
+				this.initXY = [event.touches[0].pageX, event.touches[0].pageY];
+			},
+			touchMove(index, event) {
+				//多点触控不触发
+				if (event.touches.length > 1) {
+					this.isStop = true;
+					return;
+				}
+				let moveX = event.touches[0].pageX - this.initXY[0];
+				let moveY = event.touches[0].pageY - this.initXY[1];
+
+				if (this.isStop || Math.abs(moveX) < 5) {
+					return;
+				}
+				if (Math.abs(moveY) > Math.abs(moveX)) {
+					// 竖向滑动-不触发左滑效果
+					this.isStop = true;
+					return;
+				}
+
+				if (moveX < 0) {
+					this.theIndex = index;
+					this.isStop = true;
+				} else if (moveX > 0) {
+					if (this.theIndex != null && this.oldIndex == this.theIndex) {
+						this.oldIndex = index;
+						this.theIndex = null;
+						this.isStop = true;
+						setTimeout(() => {
+							this.oldIndex = null;
+						}, 150)
+					}
+				}
+			},
+
+			touchEnd(index, $event) {
+				//解除禁止触发状态
+				this.isStop = false;
+			},
+
+			//删除商品
+			deleteCoupon(id, List) {
+				let len = List.length;
+				for (let i = 0; i < len; i++) {
+					if (id == List[i].id) {
+						List.splice(i, 1);
+						break;
+					}
+				}
+				this.oldIndex = null;
+				this.theIndex = null;
+			},
+
+			discard() {
+				//丢弃
+			}
+
+
+		}
+	}
+</script>
+<style lang="scss">
+	view {
+		display: flex;
+		flex-wrap: wrap;
+
+	}
+
+	page {
+		position: relative;
+		background-color: #f5f5f5;
+	}
+
+	.hidden {
+		display: none !important;
+	}
+
+	.place {
+		width: 100%;
+		height: 95upx;
+	}
+
+	.tabr {
+		background-color: #fff;
+		width: 94%;
+		height: 95upx;
+		padding: 0 3%;
+		border-bottom: solid 1upx #dedede;
+		position: fixed;
+		top: 0;
+		z-index: 10;
+
+		view {
+			width: 50%;
+			height: 90upx;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+			color: #999;
+		}
+
+		.on {
+			color: #0083f5;
+		}
+
+		.border {
+			height: 4upx;
+			background-color: #0083f5;
+			transition: all .3s ease-out;
+
+			&.invalid {
+				transform: translate3d(100%, 0, 0);
+			}
+		}
+
+	}
+
+	.list {
+		width: 100%;
+		display: block;
+		position: relative;
+	}
+
+	@keyframes showValid {
+		0% {
+			transform: translateX(-100%);
+		}
+
+		100% {
+			transform: translateX(0);
+		}
+	}
+
+	@keyframes showInvalid {
+		0% {
+			transform: translateX(0);
+		}
+
+		100% {
+			transform: translateX(-100%);
+		}
+	}
+
+	.sub-list {
+		&.invalid {
+			position: absolute;
+			top: 0;
+			left: 100%;
+			display: none;
+		}
+
+		&.showvalid {
+			display: flex;
+			animation: showValid 0.20s linear both;
+		}
+
+		&.showinvalid {
+			display: flex;
+			animation: showInvalid 0.20s linear both;
+		}
+
+		width: 100%;
+		padding: 20upx 0 120upx 0;
+
+		.tis {
+			width: 100%;
+			height: 60upx;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+		}
+
+		.row {
+			width: 92%;
+			height: 24vw;
+			margin: 20upx auto 10upx auto;
+			border-radius: 8upx;
+			// box-shadow: 0upx 0 10upx rgba(0,0,0,0.1);
+			align-items: center;
+			position: relative;
+			overflow: hidden;
+			z-index: 4;
+			border: 0;
+
+			.menu {
+				.icon {
+					color: #fff;
+					font-size: 50upx;
+				}
+
+				position: absolute;
+				width: 28%;
+				height: 100%;
+				right: 0;
+				justify-content: center;
+				align-items: center;
+				background-color: red;
+				color: #fff;
+				z-index: 2;
+			}
+
+			.carrier {
+				@keyframes showMenu {
+					0% {
+						transform: translateX(0);
+					}
+
+					100% {
+						transform: translateX(-28%);
+					}
+				}
+
+				@keyframes closeMenu {
+					0% {
+						transform: translateX(-28%);
+					}
+
+					100% {
+						transform: translateX(0);
+					}
+				}
+
+				&.open {
+					animation: showMenu 0.25s linear both;
+				}
+
+				&.close {
+					animation: closeMenu 0.15s linear both;
+				}
+
+				background-color: #fff;
+				position: absolute;
+				width: 100%;
+				padding: 0 0;
+				height: 100%;
+				z-index: 3;
+				flex-wrap: nowrap;
+
+				.left {
+					width: 100%;
+
+					.title {
+						padding-top: 3vw;
+						width: 90%;
+						margin: 0 5%;
+						font-size: 36upx;
+					}
+
+					.term {
+						width: 90%;
+						margin: 0 5%;
+						font-size: 26upx;
+						color: #999;
+					}
+
+					position: relative;
+
+					.gap-top,
+					.gap-bottom {
+						position: absolute;
+						width: 20upx;
+						height: 20upx;
+						right: -10upx;
+						border-radius: 100%;
+						background-color: #f5f5f5;
+					}
+
+					.gap-top {
+						top: -10upx;
+					}
+
+					.gap-bottom {
+						bottom: -10upx;
+					}
+
+					.shixiao {
+						position: absolute;
+						right: 20upx;
+						font-size: 150upx;
+						z-index: 6;
+						color: rgba(153, 153, 153, 0.2)
+					}
+				}
+
+				.right {
+					flex-shrink: 0;
+					width: 28%;
+					color: #fff;
+					background: linear-gradient(to right, #ec625c, #ee827f);
+
+					&.invalid {
+						background: linear-gradient(to right, #aaa, #999);
+
+						.use {
+							color: #aaa;
+						}
+					}
+
+					justify-content: center;
+
+					.ticket,
+					.criteria {
+						width: 100%;
+					}
+
+					.ticket {
+						padding-top: 1vw;
+						justify-content: center;
+						align-items: baseline;
+						height: 6vw;
+
+						.num {
+							font-size: 42upx;
+							font-weight: 600;
+						}
+
+						.unit {
+							font-size: 24upx;
+						}
+					}
+
+					.criteria {
+						justify-content: center;
+
+						font-size: 28upx;
+					}
+
+					.use {
+						width: 50%;
+						height: 40upx;
+						justify-content: center;
+						align-items: center;
+						font-size: 24upx;
+						background-color: #fff;
+						color: #ee827f;
+						border-radius: 40upx;
+						padding: 0 10upx;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index e1e0ea6..7ccc4f7 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -14,9 +14,9 @@
 			<view class="row">
 				<view class="goods-info">
 					<view class="img">
-						<image mode="widthFix" :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1"></image>
+						<image mode="widthFix" :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 || rec.goodsType == 7"></image>
 						<image mode="widthFix" :src="imagewxUrl+imgadres1" v-if="rec.goodsType == 6"></image>
-						<image mode="widthFix" :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6"></image>
+						<image mode="widthFix" :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6 && rec.goodsType != 7"></image>
 					</view>
 					<view class="info">
 						<view class="title">{{rec.goodsName}}</view>
@@ -61,38 +61,6 @@
 					{{recinfo.paySerialNo}}
 				</view>
 			</view>
-			<!-- <view class="row" v-if="recinfo.payModel">
-				<view class="left">
-					支付模式 :
-				</view>
-				<view class="right" v-if="recinfo.payModel == 1">
-					积分
-				</view>
-				<view class="right" v-if="recinfo.payModel == 2">
-					第三方平台
-				</view>
-				<view class="right" v-if="recinfo.payModel == 3">
-					混合
-				</view>
-			</view>
-
-			<view class="row" v-if="recinfo.payType">
-				<view class="left">
-					支付方式 :
-				</view>
-				<view class="right" v-if="recinfo.payType == 1">
-					支付宝
-				</view>
-				<view class="right" v-if="recinfo.payType == 2">
-					微信
-				</view>
-				<view class="right" v-if="recinfo.payType == 3">
-					积分
-				</view>
-				<view class="right" v-if="recinfo.payType == 4">
-					工会卡
-				</view>
-			</view> -->
 			<view class="row" v-if="recinfo.totalPrice">
 				<view class="left">
 					订单总额 :
@@ -186,7 +154,92 @@
 				</view>
 			</view>
 		</view>
+		<!-- 优选商品 -->
+		<view class="width94 font18 fcor333 fontwig6  height40" v-if="preByOrderInfo">预约订单详情</view>
+		<view class="order" v-if="preByOrderInfo">
+			<view class="row">
+				<view class="left">
+					预约状态 :
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 1">
+					预约中
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 2">
+					预约成功
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 3">
+					预约完成
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 4">
+					预约失败
+				</view>
+				<view class="right" v-if="preByOrderInfo.status == 5">
+					预约取消
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					预约订单号 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.preOrderNo}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.opUserName">
+				<view class="left">
+					预约门店 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.opUserName}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.reachAddress">
+				<view class="left">
+					到店地点 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.reachAddress}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.reachTime">
+				<view class="left">
+					到店时间 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.reachTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.statusFailDesc">
+				<view class="left">
+					预约失败说明 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.statusFailDesc}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.statusCancelDesc">
+				<view class="left">
+					预约取消说明 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.statusCancelDesc}}
+				</view>
+			</view>
+			<view class="row" v-if="preByOrderInfo.preUserRemark">
+				<view class="left">
+					预约备注 :
+				</view>
+				<view class="right">
+					{{preByOrderInfo.preUserRemark}}
+				</view>
+			</view>
+		</view>
 		<view class="width100 height60"></view>
+		<view class="footer" @click="orderComplete" v-if="preByOrderInfo && preByOrderInfo.status == 2">
+			<view class="settlement">
+				<view class="btn" style="background-color: #0083f5;color: #fff;width: 100% !important;">预约完成</view>
+			</view>
+		</view>
 		<view class="footer"
 			v-if="recinfo.orderStatus == 1 && recinfo.highChildOrderList[0].goodsType !=6 && recinfo.highChildOrderList[0].goodsType !=5 && recinfo.highChildOrderList[0].goodsType !=4">
 			<view class="settlement">
@@ -208,7 +261,9 @@
 <script>
 	import {
 		getOrderById,
-		cancelOrder
+		cancelOrder,
+		getPreByOrderIdId,
+		orderComplete
 	} from '../../../Utils/Api.js';
 	let app = getApp()
 	export default {
@@ -226,7 +281,7 @@
 				imageUrl: app.globalData.imgUrl,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres1: 'dhf.png',
-
+				preByOrderInfo:''
 			};
 		},
 		onShow() {
@@ -289,6 +344,55 @@
 					}
 				})
 			},
+			//查询预约商品详情
+			getPreByOrderIdId() {
+				let params = {
+					orderId: this.orderId,
+				}
+				getPreByOrderIdId(params).then(res => {
+					if (res.return_code == '000000') {
+						this.preByOrderInfo = res.return_data;
+					}
+				})
+			},
+			//预约商品完成
+			orderComplete(){
+				let that = this;
+				uni.showModal({
+					title: '预约完成',
+					content: '确定预约完成？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								preOrderId : this.preByOrderInfo.id
+							}
+							orderComplete(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									this.getPreByOrderIdId();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			cancelOrder() {
 				let that = this;
 				uni.showModal({
diff --git a/high-unionPay/pages/user/order_list/order_list.vue b/high-unionPay/pages/user/order_list/order_list.vue
index c618f9a..3f7bdc4 100644
--- a/high-unionPay/pages/user/order_list/order_list.vue
+++ b/high-unionPay/pages/user/order_list/order_list.vue
@@ -18,6 +18,11 @@
 							<image src="../../../static/img/order2.png" style="width: 50rpx;height: 50rpx;"></image>
 							卡券订单
 						</view>
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 7">
+							<image src="../../../static/img/order9.png" style="width: 50rpx;height: 50rpx;"></image>
+							优惠券包
+						</view>
 						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 3">
 							<image src="../../../static/img/order4.png" style="width: 50rpx;height: 50rpx;"></image>
 							团油订单
diff --git a/high-unionPay/static/img/order9.png b/high-unionPay/static/img/order9.png
new file mode 100644
index 0000000..5d0052c
Binary files /dev/null and b/high-unionPay/static/img/order9.png differ
diff --git a/high-unionPay/subPages/brand-classification/brand-classification.vue b/high-unionPay/subPages/brand-classification/brand-classification.vue
new file mode 100644
index 0000000..50f41fd
--- /dev/null
+++ b/high-unionPay/subPages/brand-classification/brand-classification.vue
@@ -0,0 +1,120 @@
+<template>
+	<view>
+		<image class="width94 mart20" mode="widthFix" :src="imagewxUrl+imgadres"></image>
+		<!-- 分割线 -->
+		<view class="title-split">
+			<view></view>
+			<text>品牌分类</text>
+			<view></view>
+		</view>
+		<view v-if="brandByList == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres1"></image>
+		</view>
+		<!-- 分类-->
+		<view class="width94">
+			<view class="width50 flleft fotct mart5" v-for="(item,index) in brandByList" :key="item" @click="jumpgoods(item.id)">
+				<image :src="imageUrl+item.img" class="preimg"></image>
+			</view>
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getBrandByList} from '../../Utils/Api.js';
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				brandByList:[],
+				imgadres: 'brand.png',
+				imgadres1: 'noorder.png',
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				desId:''
+			}
+		},
+		onLoad(options) {
+			this.desId = options.id;
+			this.getBrandByList();
+		},
+		onReachBottom() {
+			this.getBrandByList();
+		},
+		methods: {
+			//查询品牌
+			getBrandByList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+					goodTypeId : this.desId
+				}
+				getBrandByList(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.brandByList = this.brandByList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.brandByList = [];
+					}
+				})
+			},
+			// 跳转商品
+			jumpgoods(item){
+				uni.navigateTo({
+					url:'../../pages/goods/goods-list/goods-list?id=3'+'&goodsId='+this.desId+'&brandId='+item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title-split {
+		margin: 30rpx 0 28rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		text {
+			color: #161616;
+			font-weight: 500;
+			font-size: 30rpx;
+			padding: 0 24rpx;
+		}
+
+		view {
+			width: 140rpx;
+			height: 4rpx;
+			border-radius: 3rpx;
+
+			&:first-of-type {
+				background: linear-gradient(90deg, rgba(98, 98, 98, 0) 0%, #333333 100%);
+			}
+
+			&:last-of-type {
+				background: linear-gradient(90deg, #333333 0%, rgba(98, 98, 98, 0) 100%);
+			}
+		}
+	}
+
+	.preimg {
+		width: 120px;
+		height: 80px;
+	}
+</style>
diff --git a/high-unionPay/subPages/coupon-comfirmation-success/coupon-comfirmation-success.vue b/high-unionPay/subPages/coupon-comfirmation-success/coupon-comfirmation-success.vue
new file mode 100644
index 0000000..acb03cd
--- /dev/null
+++ b/high-unionPay/subPages/coupon-comfirmation-success/coupon-comfirmation-success.vue
@@ -0,0 +1,35 @@
+<template>
+	<view>
+		<image src="../static/coupsucces.png" mode="widthFix" class="sucimg mart30"></image>
+		<view class="width90 clor4cd964 mart30 font18 fotct">支付成功</view>
+		<view class="width90 height45l backcor89 fcorfff fotct border-r mart80" @click="jumpcoupon">查看我的优惠券</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			jumpcoupon(){
+				uni.switchTab({
+					url:'../../pages/tabBar/user/user'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.sucimg {
+		width: 20%;
+		margin-left: 40%;
+	}
+
+	.clor4cd964 {
+		color: #4cd964;
+	}
+</style>
diff --git a/high-unionPay/subPages/coupon-comfirmation/coupon-comfirmation.vue b/high-unionPay/subPages/coupon-comfirmation/coupon-comfirmation.vue
new file mode 100644
index 0000000..f71ae2a
--- /dev/null
+++ b/high-unionPay/subPages/coupon-comfirmation/coupon-comfirmation.vue
@@ -0,0 +1,802 @@
+<template>
+	<view>
+
+		<view class="width94 comorder mart10">
+			<view class="height100p width94 goodsimg">
+				<image class="flleft" mode="widthFix" :src="imageUrl+couponList.packageDetail.listImg"></image>
+				<view class="tcrig">
+					<view class="font18 fontwig6 fcor333 text1">{{couponList.packageDetail.title}}</view>
+					<view class="font13  fcor666 mart10">规格: 默认</view>
+					<view class="price-number mart10">
+						<view class="price font16">￥{{couponList.packageDetail.price}}</view>
+						<view class="flright fotrt paddleft10">x1</view>
+					</view>
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					商品总额
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor999">
+					￥{{couponList.packageDetail.price}}
+				</view>
+			</view>
+		</view>
+
+		<view class="width94 comorder mart10">
+			<view class="height50 width100 backcorfff">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					支付方式
+				</view>
+			</view>
+			<view class="width94 line1 mart5 marb5"></view>
+			<view class="height50 width100 backcorfff" @tap="paytype='unionPay'">
+				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+					银联支付
+				</view>
+				<view class="width40 flright fotrt paddtright10 font15 fontwig6 fcor666 alijun"
+					style="align-items: center;">
+					<radio :checked="paytype=='unionPay'" color="#0083f5" />
+				</view>
+			</view>
+		</view>
+
+		<view class="width100 height60"></view>
+		<view class="footer">
+			<view class="settlement">
+				<view class="sum">实付:<view class="money">￥{{paytheprice}}</view>
+				</view>
+				<!-- #ifdef MP -->
+				<button class="btn" open-type="getPhoneNumber" v-if="user == null"
+					@getphonenumber="loginByPhone">立即支付</button>
+				<button class="btn" v-else @tap="toPay">立即支付</button>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<button class="btn" v-if="user.phone == null" @click="jumpH5Bding">立即支付</button>
+				<button class="btn" v-else @tap="toPay">立即支付</button>
+				<!-- #endif -->
+			</view>
+		</view>
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
+	</view>
+</template>
+
+<script>
+	import {
+		addOrder,
+		getDiscountPackageDetail,
+		loginByPhone,
+		orderToPay,
+		unionPay,
+		orderToGoldPay,
+		findUser,
+		hltUnionCardPay,
+		getHuiLianTongCardBalance
+	} from '../../Utils/Api.js';
+	import ssPaymentPassword from '../../components/sanshui-payment-password'
+	let app = getApp();
+	// #ifdef H5
+	var jweixin = require('jweixin-module');
+	// #endif
+	export default {
+		components: {
+			ssPaymentPassword
+		},
+		data() {
+			return {
+				buylist: [], //订单列表
+				goodsPrice: 0.0, //商品合计价格
+				sumPrice: 0.0, //用户付款价格
+				freight: 12.00, //运费
+				note: '', //备注
+				int: 1200, //抵扣积分
+				deduction: 0, //抵扣价格
+				couponId: '',
+				couponList: [],
+				UserNormalDiscountList: [],
+				imageUrl: app.globalData.imgUrl,
+				deductionPrice: '0.00',
+				paytheprice: '',
+				radioStatus: true,
+				memDiscountId: '',
+				user: '',
+				paytype: '',
+				PaymentPassword: '',
+				orderId: '',
+				jumpType: '',
+				tongCardPrice: 0,
+				storeId: '',
+				isDiscont: false
+
+			};
+		},
+		onLoad(option) {
+			this.couponId = option.id;
+			this.getDiscountPackageDetail();
+		},
+		onShow() {
+			let that = this;
+			that.paytype = '';
+			that.user = app.globalData.userInfo;
+			that.findUser();
+		},
+		onHide() {
+
+		},
+		onBackPress() {
+			//页面后退时候，清除订单信息
+		},
+		filters: {
+			toFixed: function(x) {
+				return parseFloat(x).toFixed(2);
+			},
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		methods: {
+			//查询积分
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						this.getHuiLianTongCardBalance();
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
+			//查询优惠券包详情
+			getDiscountPackageDetail() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					packageId: this.couponId
+				}
+				getDiscountPackageDetail(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.couponList = res.return_data;
+						this.paytheprice = res.return_data.packageDetail.price;
+					}
+				})
+			},
+			//显示弹出
+			showPopup() {
+				this.$refs.popup.show();
+			},
+			//查询工会卡余额
+			//查询详情
+			getHuiLianTongCardBalance() {
+				let params = {
+					cardNo: this.user.hltCardNo.cardNo
+				}
+				getHuiLianTongCardBalance(params).then(res => {
+					if (res.return_code == '000000') {
+						this.tongCardPrice = res.return_data.balance;
+					}
+
+				});
+			},
+			// H5获取手机号
+			jumpH5Bding() {
+				uni.navigateTo({
+					url: '../../pages/login/register'
+				})
+			},
+			// 微信获取手机号
+			loginByPhone(PhoneNumber) {
+				if (PhoneNumber.detail.iv == undefined) {
+					uni.showToast({
+						title: "用户取消授权",
+						icon: "none"
+					});
+					return;
+				}
+				let params = {
+					openId: app.globalData.openId,
+					iv: PhoneNumber.detail.iv,
+					encryptedData: PhoneNumber.detail.encryptedData
+				}
+				loginByPhone(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data
+							.object
+							.highUser;
+						this.user = res.return_data
+							.object
+							.highUser;
+						app.globalData.token = res.return_data.uniqueCode;
+						uni.setStorage({
+							key: "token",
+							data: res.return_data.uniqueCode
+						})
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+								.object
+								.highUser
+						})
+						let that = this;
+						that.toPay();
+					}
+				});
+			},
+			toPay() {
+				if (this.paytype == '') {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '提交订单中...'
+				})
+				if (this.couponList.reserveStatus) {
+					this.storeId = app.globalData.storeid
+				}
+				let goods = {
+					"highChildOrderList": [{
+						"goodsType": 7,
+						"goodsId": this.couponId,
+						"saleCount": 1,
+						"storeId": this.storeId
+					}]
+				}
+				addOrder(goods).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.jumpType = res.return_data.highChildOrderList[0].ext1;
+						this.orderId = res.return_data.id;
+						this.orderToPay(res.return_data);
+					} else {
+						uni.hideLoading();
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//获取选择支付方式
+			changeRiado() {
+				if (!this.user.isSetHltCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../../pages/user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			//获取订单数据
+			orderToPay(item) {
+				let goods = {
+					"orderId": this.orderId
+				}
+				unionPay(goods).then(res => {
+					if (res.return_code == '000000') {
+						this.uniontopay(res.return_data.prepayid);
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+			},
+			//银联支付
+			uniontopay(item) {
+				let that = this;
+				upsdk.pluginReady(function() {
+					upsdk.pay({
+						tn: item,
+						success: function(res) {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../coupon-comfirmation-success/coupon-comfirmation-success'
+							});
+						},
+						fail: function(err) {
+							uni.showToast({
+								title: err.msg,
+								icon: 'none',
+								duration: 2000
+							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
+						}
+					});
+				});
+			},
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				if (this.PaymentPassword == '') {
+					uni.showToast({
+						title: '请勿手动关闭弹窗',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '支付中...'
+				})
+				if (this.paytype == 'jinbi') {
+					let params = {
+						"orderId": this.orderId,
+						"password": this.PaymentPassword
+					}
+					orderToGoldPay(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../coupon-comfirmation-success/coupon-comfirmation-success'
+							});
+							return;
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../pages/login/updatePas/updatePas'
+							})
+							return;
+						}
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
+
+				let params = {
+					"orderId": this.orderId,
+					"cardNo": this.user.hltCardNo.cardNo,
+					"password": this.PaymentPassword
+				}
+				hltUnionCardPay(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						uni.showToast({
+							title: '支付成功'
+						})
+						uni.reLaunch({
+							url: '../coupon-comfirmation-success/coupon-comfirmation-success'
+						});
+						return;
+					}
+					if (res.return_code == '102130') {
+						uni.navigateTo({
+							url: '../../pages/login/updatePas/updatePas'
+						})
+						return;
+					}
+					uni.showToast({
+						title: res.return_msg,
+						icon: 'none'
+					})
+				})
+
+
+			},
+			payRequest: function(self) {
+				uni.showLoading({
+					title: '支付中...'
+				})
+				jweixin.config({
+					// debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+					appId: self.return_data.appId, // 必填，公众号的唯一标识
+					timestamp: self.return_data.timeStamp, // 必填，生成签名的时间戳
+					nonceStr: self.return_data.nonceStr, // 必填，生成签名的随机串
+					signature: self.return_data.sign, // 必填，签名，见附录1
+					jsApiList: ['chooseWXPay'] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+				});
+				uni.hideLoading();
+				jweixin.ready(function() {
+					jweixin.checkJsApi({
+						jsApiList: ['chooseWXPay'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
+						success: function(res) {},
+						fail: function(res) {}
+					});
+					jweixin.chooseWXPay({
+						appId: self.return_data.appId,
+						timestamp: self.return_data
+							.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+						nonceStr: self.return_data.nonceStr, // 支付签名随机串，不长于 32 位
+						package: self.return_data
+							.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
+						signType: 'MD5', // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+						paySign: self.return_data.sign, // 支付签名
+						success: function(res) {
+							// 支付成功后的回调函数
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '../coupon-comfirmation-success/coupon-comfirmation-success'
+							});
+						},
+						cancel: function(r) {},
+						fail: function(res) {}
+					});
+				});
+
+				jweixin.error(function(res) {
+					uni.showToast({
+						icon: 'none',
+						title: '支付失败了',
+						duration: 4000
+					});
+				});
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f7f7f7;
+	}
+
+	.comorder {
+		background-color: #FFFFFF;
+		border-radius: 8px;
+	}
+
+	.jtcs {
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 30rpx;
+	}
+
+	.goodsimg {
+		align-items: center;
+		display: flex;
+
+		image {
+			width: 170rpx;
+			max-height: 170rpx;
+		}
+	}
+
+	.yhprice {
+		width: 100%;
+		height: 25px;
+		text-align: right;
+		margin-top: -20px;
+	}
+
+	.price-number {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		font-size: 28upx;
+		height: 40upx;
+
+		.price {
+			color: #FE4545;
+			display: flex;
+			max-width: 50%;
+			align-items: center;
+		}
+
+		.number {
+			display: flex;
+			align-items: center;
+			width: 50%;
+			text-decoration: line-through;
+
+		}
+	}
+
+	.yhqky {
+		background: #ff0034;
+		color: #ffffff;
+		font-size: 14px;
+		padding-left: 5px;
+		padding-right: 5px;
+		margin-left: 8px;
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+
+
+
+	.addr {
+		width: 86%;
+		padding: 20upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+		display: flex;
+
+		.icon {
+			width: 80upx;
+			height: 80upx;
+			display: flex;
+			align-items: center;
+
+			image {
+				width: 60upx;
+				height: 60upx;
+			}
+		}
+
+		.tel-name {
+			width: 100%;
+			display: flex;
+			font-size: 32upx;
+
+			.tel {
+				margin-left: 40upx;
+			}
+		}
+
+		.addres {
+			width: 100%;
+			font-size: 26upx;
+			color: #999;
+		}
+	}
+
+	.tccs {
+		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
+		border: 1px solid #f6f6f6;
+		border-radius: 8px;
+		align-items: center;
+		display: flex;
+
+		image {
+			width: 170rpx;
+			max-height: 170rpx;
+		}
+	}
+
+	.tcrig {
+		margin-left: 20rpx;
+	}
+
+	.info {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		width: 92%;
+	}
+
+	.order {
+		width: 86%;
+		padding: 10upx 3%;
+		margin: 30upx auto 20upx auto;
+		box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+		border-radius: 20upx;
+
+		.row {
+			margin: 20upx 0;
+			height: 40upx;
+			display: flex;
+
+			.left {
+				font-size: 28upx;
+			}
+
+			.right {
+				margin-left: 40upx;
+				font-size: 26upx;
+				color: #999;
+
+				input {
+					font-size: 26upx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.footer {
+		width: 92%;
+		padding: 0 4%;
+		background-color: #fbfbfb;
+		height: 100upx;
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		font-size: 28upx;
+		position: fixed;
+		bottom: 0upx;
+		z-index: 5;
+
+		.settlement {
+			width: 100%;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+
+			.sum {
+				width: 50%;
+				font-size: 18px;
+				margin-right: 10upx;
+				display: flex;
+				justify-content: flex-start;
+
+				.money {
+					color: #eb5823;
+					font-weight: 600;
+				}
+			}
+
+			.btn {
+				padding: 0 50rpx;
+				height: 80rpx;
+				background-color: #0083f5;
+				color: #fff;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 30upx;
+				border-radius: 40upx;
+			}
+		}
+	}
+
+	.goods-list {
+		width: 100%;
+		padding: 0;
+
+		.tis {
+			width: 100%;
+			height: 60upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+		}
+
+		.row {
+			width: calc(92%);
+			height: calc(22vw + 40upx);
+			margin: 20upx auto;
+
+			border-radius: 15upx;
+			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.1);
+			display: flex;
+			align-items: center;
+			position: relative;
+			overflow: hidden;
+			z-index: 4;
+			border: 0;
+
+			.menu {
+				.icon {
+					color: #fff;
+					// font-size: 25upx;
+				}
+
+				position: absolute;
+				width: 30%;
+				height: 100%;
+				right: 0;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				background-color: red;
+				color: #fff;
+				z-index: 2;
+			}
+
+			.carrier {
+				.checkbox-box {
+					padding-left: 20upx;
+					flex-shrink: 0;
+					height: 22vw;
+					margin-right: 20upx;
+				}
+
+				position: absolute;
+				width: 94%;
+				margin-left: 3%;
+				padding: 0 0;
+				height: 100%;
+				z-index: 3;
+				display: flex;
+				align-items: center;
+
+				.goods-info {
+					width: 100%;
+					display: flex;
+					padding-right: 20upx;
+
+					.img {
+						width: 22vw;
+						height: 22vw;
+						border-radius: 10upx;
+						overflow: hidden;
+						flex-shrink: 0;
+						margin-right: 10upx;
+
+						image {
+							width: 22vw;
+							height: 22vw;
+						}
+					}
+
+					.info {
+						width: 100%;
+						height: 22vw;
+						overflow: hidden;
+						display: flex;
+						flex-wrap: wrap;
+						position: relative;
+
+						.title {
+							width: 100%;
+							font-size: 16px;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							// text-align: justify;
+							overflow: hidden;
+						}
+
+						.spec {
+							font-size: 14px;
+							color: #a7a7a7;
+							height: 30upx;
+							display: flex;
+							align-items: center;
+							padding: 0;
+							border-radius: 15upx;
+							margin-bottom: 20vw;
+						}
+
+						.price-number {
+							position: absolute;
+							width: 100%;
+							bottom: 0upx;
+							display: flex;
+							justify-content: space-between;
+							align-items: flex-end;
+							font-size: 28upx;
+							height: 60upx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/high-unionPay/subPages/coupon-package/coupon-package.vue b/high-unionPay/subPages/coupon-package/coupon-package.vue
new file mode 100644
index 0000000..f460418
--- /dev/null
+++ b/high-unionPay/subPages/coupon-package/coupon-package.vue
@@ -0,0 +1,280 @@
+<template>
+	<view>
+		<view class="input-box">
+			<view class="icon search"></view>
+			<input placeholder="搜索商品" v-model="couponName" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
+		</view>
+		<view class="swiper">
+			<view class="swiper-box">
+				<swiper circular="true" autoplay="true" @change="swiperChange">
+					<swiper-item v-for="swiper in swiperList" :key="swiper.id">
+						<image :src="imageUrl+swiper.imgData"></image>
+					</swiper-item>
+				</swiper>
+				<view class="indicator">
+					<view class="dots" v-for="(swiper, index) in swiperList"
+						:class="[currentSwiper >= index ? 'on' : '']" :key="index"></view>
+				</view>
+			</view>
+		</view>
+
+		<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres"></image>
+		</view>
+		<view class="width90 height110 mart5" v-for="(row, index) in goodsList" :key="index" @click="toGoods(row.id)">
+			<image class="goodsimg flleft mart5" mode="widthFix" :src="imageUrl+row.listImg"></image>
+			<view class="goodsli ">
+				<view class="text2 fcor333 font14 fontwig6">{{row.title}}</view>
+				<view class="goodsxg font12 fotct">限购{{row.purchaseNum}}件</view>
+
+				<view class="info mart10">
+					<view class="price">
+						￥ {{row.price}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getDiscountPackageList,
+		getCmsContent,
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				goodsList: [],
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'noorder.png',
+				imageUrl: app.globalData.imgUrl,
+				// 轮播图片
+				swiperList: [{
+						id: 1,
+						src: 'url1',
+						img: 'banner2.png'
+					},
+					{
+						id: 2,
+						src: 'url2',
+						img: 'banner3.png'
+					}
+				],
+				currentSwiper: 0,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				typeId: '',
+				couponName: '',
+				brandid: '',
+				goodtyid: ''
+			};
+		},
+
+		onLoad: function() { //option为object类型，会序列化上个页面传递的参数
+			uni.setNavigationBarTitle({
+				title: '优惠券包列表'
+			});
+			this.getDiscountPackageList();
+			this.getCmsContent('CMS_DISCOUNT_BANNER');
+		},
+		onPageScroll(e) {
+
+		},
+		//上拉加载，需要自己在page.json文件中配置"onReachBottomDistance"
+		onReachBottom() {
+			this.getDiscountPackageList();
+		},
+		methods: {
+			//获取弹出或者弹窗
+			getCmsContent(item) {
+				let params = {
+					regionId: app.globalData.cityId,
+					categoryCode: item
+				}
+				getCmsContent(params).then(res => {
+					if (res.return_code == '000000') {
+						this.swiperList = res.return_data;
+					}
+				});
+			},
+			//轮播图指示器
+			swiperChange(event) {
+				this.currentSwiper = event.detail.current;
+			},
+			//优惠券包列表
+			getDiscountPackageList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					regionId: app.globalData.cityId,
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+					title: this.couponName
+				}
+				getDiscountPackageList(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.goodsList = this.goodsList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.goodsList = [];
+					}
+				})
+			},
+			toSearch() {
+				this.pageNum = 1;
+				this.pageSize = 10;
+				this.isNoMoreData = false;
+				this.goodsList = [];
+				this.getDiscountPackageList();
+			},
+			//商品跳转
+			toGoods(e) {
+				uni.navigateTo({
+					url: '../coupon-packge-details/coupon-packge-details?id=' + e
+				});
+			},
+		}
+
+	}
+</script>
+
+<style lang="scss">
+	.input-box {
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 15px;
+		height: 70rpx;
+		background-color: #f5f5f5;
+		border-radius: 10rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 2px;
+			left: 5px;
+			width: 60upx;
+			height: 60upx;
+			font-size: 34upx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 50upx;
+			height: 28upx;
+			font-size: 28upx;
+			width: 100%;
+		}
+	}
+
+	.swiper {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		margin-top: 20px;
+		margin-bottom: 20px;
+
+		.swiper-box {
+			width: 92%;
+			height: 150px;
+			overflow: hidden;
+			border-radius: 15upx;
+			box-shadow: 0upx 8upx 25upx rgba(0, 0, 0, 0.2);
+			//兼容ios，微信小程序
+			position: relative;
+			z-index: 1;
+
+			swiper {
+				width: 100%;
+				height: 150px;
+
+				swiper-item {
+					image {
+						width: 100%;
+						height: 150px;
+					}
+				}
+			}
+
+			.indicator {
+				position: absolute;
+				bottom: 20upx;
+				left: 20upx;
+				background-color: rgba(255, 255, 255, 0.4);
+				width: 150upx;
+				height: 5upx;
+				border-radius: 3upx;
+				overflow: hidden;
+				display: flex;
+
+				.dots {
+					width: 0upx;
+					background-color: rgba(255, 255, 255, 1);
+					transition: all 0.3s ease-out;
+
+					&.on {
+						width: (100%/3);
+					}
+				}
+			}
+		}
+	}
+
+	.goodsimg {
+		width: 90px;
+		height: 90px;
+	}
+
+	.goodsli {
+		margin-left: 100px;
+		padding-top: 5px;
+	}
+
+	.goodsxg {
+		margin-top: 5px;
+		border: 1px solid #eb5823;
+		border-radius: 5px;
+		color: #eb5823;
+		width: 55px;
+		padding: 3px;
+	}
+
+	.info {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		width: 100%;
+
+		.price {
+			color: #e65339;
+			font-size: 30upx;
+			font-weight: 600;
+			width: 50%;
+		}
+
+		.slogan {
+			width: 50%;
+			color: #807c87;
+			font-size: 24upx;
+			text-decoration: line-through;
+		}
+	}
+</style>
diff --git a/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue
new file mode 100644
index 0000000..f1f9991
--- /dev/null
+++ b/high-unionPay/subPages/coupon-packge-details/coupon-packge-details.vue
@@ -0,0 +1,988 @@
+<template>
+	<view>
+		<!-- #ifdef H5 -->
+		<view class="header">
+			<!-- 头部-默认显示 -->
+			<view class="before" :style="{ opacity: 1 - afterHeaderOpacity, zIndex: beforeHeaderzIndex }">
+				<view class="back">
+					<view class="icon xiangqian" @tap="back" v-if="showBack"></view>
+				</view>
+				<view class="middle"></view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<!-- 底部菜单 -->
+		<view class="footer">
+			<button class="width100 fotct btnfot" @click="buy">
+				立即兑换
+			</button>
+		</view>
+		<!-- 商品主图轮播 -->
+		<view class="swiper-box">
+			<swiper circular="true" autoplay="true" @change="swiperChange">
+				<swiper-item v-for="(swiper,index) in swiperList" :key="index">
+					<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
+				</swiper-item>
+			</swiper>
+			<view class="indicator">{{currentSwiper+1}}/{{swiperList.length}}</view>
+		</view>
+		<view class="width100 height60 backcorlr">
+			<view class="flleft width70 fcorfff">
+				<view class="font13 mart15 margle20">￥<text
+						class="font20 paddleft5">{{goodsData.packageDetail.price}}</text></view>
+			</view>
+			<view class="flright width30">
+				<view class="xgnum">限购{{goodsData.packageDetail.purchaseNum}}件</view>
+			</view>
+		</view>
+
+		<!-- 标题 价格 -->
+		<view class="info-box goods-info">
+			<view class="font16 fcor333 fontwig6">
+				{{goodsData.packageDetail.title}}
+			</view>
+			<view class="mart10 width100 font14 fcor999 height20">
+				<view class="width70 flleft">库存:{{goodsData.packageDetail.totalStock}}件</view>
+			</view>
+		</view>
+		<!-- 服务-规则选择 -->
+		<view class="height60 width100 backcorfff" @click="showPopup()">
+			<view class="width80p flleft" style="padding-left: 4%;line-height: 60px; ">
+				优惠券包
+			</view>
+			<view class="width15 flright fotct">
+				<image class="jtcs" src="../../static/img/jt.png"></image>
+			</view>
+		</view>
+		<!-- 详情 -->
+		<view class="description">
+			<view class="title">———— 商品详情 ————</view>
+			<view class="content marb65">
+				<image mode="widthFix" class="width100" v-for="codes in  couponDesc" :key="codes" :src="imageUrl+codes"
+					@click="perImage(codes)">
+				</image>
+			</view>
+		</view>
+		<wybPopup ref="popup" type="bottom" width="500" scrollY="true" radius="6" :showCloseIcon="true">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30">优惠券包</view>
+			<view class="width92 height110 tccs mart10" v-for="product in goodsData.discountList" :key="product.id">
+				<image mode="widthFix" class="flleft" src="../../static/img/logo.png"></image>
+				<view class="tcrig">
+					<view class="font16 fontwig6 fcor333 text2">{{ product.discountDetail.discountName}}</view>
+					<view class="font14 fcor999 mart5">数量: x{{product.num}}</view>
+				</view>
+			</view>
+		</wybPopup>
+	</view>
+</template>
+
+<script>
+	import {
+		getDiscountPackageDetail
+	} from '../../Utils/Api.js';
+	import wybPopup from '../../components/wyb-popup/wyb-popup.vue';
+	let app = getApp()
+	export default {
+		components: {
+			wybPopup
+		},
+		data() {
+			return {
+				//控制渐变标题栏的参数
+				beforeHeaderzIndex: 11, //层级
+				afterHeaderOpacity: 0, //不透明度
+				//是否显示返回按钮
+				// #ifndef MP
+				showBack: true,
+				// #endif
+				//轮播主图数据
+				swiperList: [],
+				couponDesc: [],
+				//轮播图下标
+				currentSwiper: 0,
+				// 商品信息
+				goodsData: "",
+				//商品描述html
+				desid: '',
+				imageUrl: app.globalData.imgUrl,
+
+			};
+		},
+		filters: {
+			//过滤器 用于格式化时间
+			formatDate: function(value, spe = '/') {
+				let data = new Date(value);
+				let year = data.getFullYear();
+				let month = data.getMonth() + 1;
+				let day = data.getDate();
+				let h = data.getHours();
+				let mm = data.getMinutes();
+				let s = data.getSeconds();
+				month = month >= 10 ? month : "0" + month;
+				day = day >= 10 ? day : "0" + day;
+				h = h >= 10 ? h : "0" + h;
+				mm = mm >= 10 ? mm : "0" + mm;
+				s = s >= 10 ? s : "0" + s;
+				return `${year}${spe}${month}${spe}${day} ${h}:${mm}:${s}`;
+			}
+		},
+		onLoad(option) {
+			this.desid = option.id;
+			this.getDiscountPackageDetail();
+			// #ifdef MP
+			//小程序隐藏返回按钮
+			this.showBack = false;
+			// #endif
+			//option为object类型，会序列化上个页面传递的参数
+		},
+		methods: {
+			//优惠券包详情
+			getDiscountPackageDetail() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					packageId: this.desid
+				}
+				getDiscountPackageDetail(params).then(res => {
+					if (res.return_code == '000000') {
+						this.goodsData = res.return_data;
+						this.swiperList = res.return_data.packageDetail.bannerImg.split(',');
+						this.couponDesc = res.return_data.packageDetail.detailsImg.split(',');
+						uni.hideLoading()
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			//显示弹出
+			showPopup() {
+				this.$refs.popup.show();
+			},
+			//查看大图
+			perImage(item) {
+				uni.previewImage({
+					current: 0, //预览图片的下标
+					urls: [this.imageUrl + item] //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+				})
+			},
+			//轮播图指示器
+			swiperChange(event) {
+				this.currentSwiper = event.detail.current;
+			},
+			buy() {
+				let that = this;
+				if (that.goodsData.totalStock == 0) {
+					uni.showToast({
+						title: '库存不足',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showToast({
+					title: '提交订单...',
+					icon: 'none',
+					duration: 2000,
+					success() {
+						uni.navigateTo({
+							url: '../coupon-comfirmation/coupon-comfirmation?id=' + that.desid
+						})
+					}
+				})
+			},
+			//返回上一页
+			back() {
+				uni.navigateBack();
+			},
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f8f8f8;
+	}
+
+	button::after {
+		border: none
+	}
+
+	.jtcs {
+		width: 40rpx;
+		height: 40rpx;
+		margin-top: 40rpx;
+	}
+
+	.tccs {
+		box-shadow: 0rpx 0rpx 10rpx rgba(0, 0, 0, 0.2);
+		border: 1px solid #f6f6f6;
+		border-radius: 8px;
+		align-items: center;
+		display: flex;
+
+		image {
+			width: 170rpx;
+			max-height: 170rpx;
+		}
+	}
+
+	.tcrig {
+		margin-left: 20rpx;
+	}
+
+	.info {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-end;
+		width: 92%;
+
+		.price {
+			color: #e65339;
+			font-size: 15px;
+			font-weight: 600;
+			display: flex;
+			align-items: center;
+		}
+
+		.slogan {
+			color: #807c87;
+			font-size: 24upx;
+			text-decoration: line-through;
+		}
+	}
+
+	.xgnum {
+		background-color: #FFFFFF;
+		color: #ff722e;
+		height: 30px;
+		line-height: 30px;
+		font-size: 13px;
+		width: 60%;
+		padding-left: 5%;
+		padding-right: 5%;
+		border-radius: 15px;
+		margin-top: 15px;
+		text-align: center;
+		font-weight: 600;
+	}
+
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+
+	@keyframes showLayer {
+		0% {
+			transform: translateY(0);
+		}
+
+		100% {
+			transform: translateY(-100%);
+		}
+	}
+
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(-100%);
+		}
+
+		100% {
+			transform: translateY(0);
+		}
+	}
+
+	.icon {
+		font-size: 26upx;
+	}
+
+	.status {
+		width: 100%;
+		height: 0;
+		position: fixed;
+		z-index: 10;
+		top: 0;
+		/*  #ifdef  APP-PLUS  */
+		height: var(--status-bar-height); //覆盖样式
+		/*  #endif  */
+		background-color: #f1f1f1;
+		transition: opacity 0.05s linear;
+	}
+
+	.header {
+		width: 100%;
+
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		position: fixed;
+		top: 0;
+		z-index: 10;
+		/*  #ifdef  APP-PLUS  */
+		top: var(--status-bar-height);
+
+		/*  #endif  */
+		.before,
+		.after {
+			width: 92%;
+			padding: 0 4%;
+			height: 100upx;
+			display: flex;
+			align-items: center;
+			position: fixed;
+			top: 0;
+			/*  #ifdef  APP-PLUS  */
+			top: var(--status-bar-height);
+			/*  #endif  */
+			transition: opacity 0.05s linear;
+
+			.back {
+				width: 125upx;
+				height: 60upx;
+				flex-shrink: 0;
+
+				.icon {
+					margin-left: -10%;
+					width: 60upx;
+					height: 60upx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 42upx;
+				}
+			}
+
+			.middle {
+				width: 100%;
+			}
+
+			.icon-btn {
+				width: 125upx;
+				height: 60upx;
+				flex-shrink: 0;
+				display: flex;
+
+				.icon {
+					&:first-child {
+						margin-right: 5upx;
+					}
+
+					width: 60upx;
+					height: 60upx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					font-size: 42upx;
+				}
+			}
+		}
+
+		.before {
+			.back {
+				.icon {
+					color: #fff;
+					background-color: rgba(0, 0, 0, 0.2);
+					border-radius: 100%;
+				}
+			}
+
+			.icon-btn {
+				.icon {
+					color: #fff;
+					background-color: rgba(0, 0, 0, 0.2);
+					border-radius: 100%;
+
+				}
+			}
+		}
+
+		.after {
+			background-color: #f1f1f1;
+
+			.back {
+				.icon {
+					color: #666;
+				}
+			}
+
+			.icon-btn {
+				.icon {
+					color: #666;
+				}
+			}
+
+			.middle {
+				font-size: 32upx;
+				height: 90upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				padding: 0 7%;
+
+				view {
+					width: (100%/3);
+					padding: 0 3%;
+					margin: 0 3%;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					&.on {
+						margin-bottom: -4upx;
+						color: #f47952;
+						border-bottom: solid 4upx #f47952;
+					}
+				}
+			}
+		}
+	}
+
+	.swiper-box {
+		position: relative;
+		width: 100%;
+
+		swiper {
+			width: 100%;
+
+			swiper-item {
+				image {
+					width: 100%;
+				}
+			}
+		}
+
+		.indicator {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 0 25upx;
+			height: 40upx;
+			border-radius: 40upx;
+			font-size: 22upx;
+			position: absolute;
+			bottom: 20upx;
+			right: 20upx;
+			color: #fff;
+			background-color: rgba(0, 0, 0, 0.2);
+		}
+	}
+
+	.info-box {
+		width: 92%;
+		padding: 4%;
+		background-color: #fff;
+		margin-bottom: 20rpx;
+	}
+
+	.goods-info {
+		.price {
+			font-size: 15px;
+			font-weight: 600;
+			color: #f47925;
+		}
+
+		.zprice {
+			text-decoration: line-through;
+		}
+
+		.title {
+			font-size: 30upx;
+		}
+	}
+
+	.spec {
+		.row {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			margin: 5px 0 5px 0;
+
+			.text {
+				font-size: 24upx;
+				color: #a2a2a2;
+				margin-right: 20upx;
+			}
+
+			.content {
+				font-size: 28upx;
+				display: flex;
+				flex-wrap: wrap;
+
+				.serviceitem {
+					margin-right: 10upx;
+				}
+
+				.sp {
+					width: 100%;
+					display: flex;
+
+					view {
+						background-color: #f6f6f6;
+						padding: 5upx 10upx;
+						color: #999;
+						margin-right: 10upx;
+						font-size: 20upx;
+						border-radius: 5upx;
+
+						&.on {
+							border: solid 1upx #f47952;
+							padding: 4upx 8upx;
+						}
+					}
+				}
+			}
+
+			.arrow {
+				position: absolute;
+				right: 4%;
+
+				.icon {
+					color: #ccc;
+				}
+			}
+		}
+	}
+
+	.comments {
+		.row {
+			width: 100%;
+			height: 40upx;
+			display: flex;
+			align-items: center;
+			margin: 0 0 30upx 0;
+
+			.text {
+				font-size: 30upx;
+			}
+
+			.arrow {
+				font-size: 28upx;
+				position: absolute;
+				right: 4%;
+				color: #17e6a1;
+
+				.show {
+					display: flex;
+					align-items: center;
+
+					.icon {
+						color: #17e6a1;
+					}
+				}
+			}
+		}
+
+		.comment {
+			width: 100%;
+
+			.user-info {
+				width: 100%;
+				height: 40upx;
+				display: flex;
+				align-items: center;
+
+				.face {
+					width: 40upx;
+					height: 40upx;
+					margin-right: 8upx;
+
+					image {
+						width: 40upx;
+						height: 40upx;
+						border-radius: 100%;
+					}
+				}
+
+				.username {
+					font-size: 24upx;
+					color: #999;
+				}
+			}
+
+			.content {
+				margin-top: 10upx;
+				font-size: 26upx;
+			}
+		}
+	}
+
+	.description {
+		.title {
+			width: 100%;
+			height: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 26upx;
+			color: #999;
+		}
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0upx;
+		width: 100%;
+		height: 99upx;
+		color: #FFFFFF;
+		border-top: solid 1upx #eee;
+		background-color: #0083f5;
+		z-index: 2;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.btnfot {
+			text-align: center;
+			padding: 0;
+			border-radius: 0;
+			height: 48px;
+			background-color: #0083f5;
+			color: #ffffff;
+		}
+
+		.icons {
+			display: flex;
+			height: 80upx;
+			margin-left: -4%;
+
+			.box {
+				width: 80upx;
+				height: 80upx;
+				display: flex;
+				justify-content: center;
+				flex-wrap: wrap;
+
+				.icon {
+					font-size: 40upx;
+					color: #828282;
+				}
+
+				.text {
+					display: flex;
+					justify-content: center;
+					width: 100%;
+					font-size: 22upx;
+					color: #666;
+				}
+			}
+		}
+
+		.btn {
+			height: 80upx;
+			border-radius: 40upx;
+			overflow: hidden;
+			display: flex;
+			margin-right: -2%;
+
+			.joinCart,
+			.buy {
+				height: 80upx;
+				padding: 0 40upx;
+				color: #fff;
+				display: flex;
+				align-items: center;
+				font-size: 28upx;
+			}
+
+			.joinCart {
+				background-color: #f0b46c;
+			}
+
+			.buy {
+				background-color: #0083f5;
+			}
+		}
+	}
+
+	.popup {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 20;
+		display: none;
+
+		.mask {
+			position: fixed;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			z-index: 21;
+			background-color: rgba(0, 0, 0, 0.6);
+		}
+
+		.layer {
+			position: fixed;
+			z-index: 22;
+			bottom: -70%;
+			width: 92%;
+			padding: 0 4%;
+			height: 70%;
+			border-radius: 20upx 20upx 0 0;
+			background-color: #fff;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: space-between;
+
+			.content {
+				width: 100%;
+				padding: 20upx 0;
+			}
+
+			.btn {
+				width: 100%;
+				height: 100upx;
+
+				.button {
+					width: 100%;
+					height: 80upx;
+					border-radius: 40upx;
+					color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background-color: #f47952;
+					font-size: 28upx;
+				}
+			}
+		}
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.2s linear both;
+			}
+		}
+
+		&.hide {
+			display: block;
+
+			.mask {
+				animation: hidePopup 0.2s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.2s linear both;
+			}
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.service {
+			.row {
+				margin: 30upx 0;
+
+				.title {
+					font-size: 30upx;
+					margin: 10upx 0;
+				}
+
+				.description {
+					font-size: 28upx;
+					color: #999;
+				}
+			}
+		}
+
+		&.spec {
+			.title {
+				font-size: 30upx;
+				margin: 30upx 0;
+			}
+
+			.sp {
+				display: flex;
+
+				view {
+					font-size: 28upx;
+					padding: 5upx 20upx;
+					border-radius: 8upx;
+					margin: 0 30upx 20upx 0;
+					background-color: #f6f6f6;
+
+					&.on {
+						padding: 3upx 18upx;
+						border: solid 1upx #f47925;
+					}
+				}
+			}
+
+			.length {
+				margin-top: 30upx;
+				border-top: solid 1upx #aaa;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding-top: 20upx;
+
+				.text {
+					font-size: 30upx;
+				}
+
+				.number {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					.input {
+						width: 80upx;
+						height: 60upx;
+						margin: 0 10upx;
+						background-color: #f3f3f3;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+
+						input {
+							width: 80upx;
+							height: 60upx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+							text-align: center;
+							font-size: 26upx;
+						}
+					}
+
+					.sub,
+					.add {
+						width: 60upx;
+						height: 60upx;
+						background-color: #f3f3f3;
+						border-radius: 5upx;
+
+						.icon {
+							font-size: 30upx;
+							width: 60upx;
+							height: 60upx;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	.share {
+		display: none;
+
+		&.show {
+			display: block;
+
+			.mask {
+				animation: showPopup 0.15s linear both;
+			}
+
+			.layer {
+				animation: showLayer 0.15s linear both;
+			}
+		}
+
+		&.hide {
+			display: block;
+
+			.mask {
+				animation: hidePopup 0.15s linear both;
+			}
+
+			.layer {
+				animation: hideLayer 0.15s linear both;
+			}
+		}
+
+		&.none {
+			display: none;
+		}
+
+		.mask {
+			background-color: rgba(0, 0, 0, .5);
+			position: fixed;
+			width: 100%;
+			height: 100%;
+			top: 0;
+			z-index: 11;
+		}
+
+		.layer {
+			width: 92%;
+			position: fixed;
+			z-index: 12;
+			padding: 0 4%;
+			top: 100%;
+			background-color: rgba(255, 255, 255, 0.9);
+
+			.list {
+				width: 100%;
+				display: flex;
+				padding: 10upx 0 30upx 0;
+
+				.box {
+					width: 25%;
+					display: flex;
+					justify-content: center;
+					flex-wrap: wrap;
+
+					image {
+						width: 13.8vw;
+						height: 13.8vw;
+					}
+
+					.title {
+						margin-top: 10upx;
+						display: flex;
+						justify-content: center;
+						width: 100%;
+						font-size: 26upx;
+					}
+				}
+			}
+
+			.btn {
+				width: 100%;
+				height: 100upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 28upx;
+				border-top: solid 1upx #666666;
+			}
+
+			.h1 {
+				width: 100%;
+				height: 80upx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 34upx;
+			}
+		}
+
+	}
+</style>
diff --git a/high-unionPay/subPages/preferred-goods/preferred-goods.vue b/high-unionPay/subPages/preferred-goods/preferred-goods.vue
new file mode 100644
index 0000000..34bf070
--- /dev/null
+++ b/high-unionPay/subPages/preferred-goods/preferred-goods.vue
@@ -0,0 +1,119 @@
+<template>
+	<view>
+		<image class="width94 mart20" mode="widthFix" :src="imagewxUrl+imgadres"></image>
+		<!-- 分割线 -->
+		<view class="title-split">
+			<view></view>
+			<text>商品分类</text>
+			<view></view>
+		</view>
+
+		<view v-if="listgoods == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres1"></image>
+		</view>
+		<!-- 分类-->
+		<view class="width94">
+			<view class="width50 flleft fotct mart5" v-for="(item,index) in listgoods" :key="item" @click="jumpbrand(item)">
+				<image :src="imageUrl+item.img" class="preimg"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getListGoodsType
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'preimg.png',
+				imgadres1: 'noorder.png',
+				listgoods: [],
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+			}
+		},
+		onLoad() {
+			this.getListGoodsType();
+		},
+		onReachBottom() {
+			this.getListGoodsType();
+		},
+		methods: {
+			//查询分类
+			getListGoodsType() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+				}
+				getListGoodsType(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.listgoods = this.listgoods.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.listgoods = [];
+					}
+				})
+			},
+			// 跳转品牌
+			jumpbrand(item) {
+				uni.navigateTo({
+					url: '../brand-classification/brand-classification?id='+item.id
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.title-split {
+		margin: 30rpx 0 28rpx 0;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+
+		text {
+			color: #161616;
+			font-weight: 500;
+			font-size: 30rpx;
+			padding: 0 24rpx;
+		}
+
+		view {
+			width: 140rpx;
+			height: 4rpx;
+			border-radius: 3rpx;
+
+			&:first-of-type {
+				background: linear-gradient(90deg, rgba(98, 98, 98, 0) 0%, #333333 100%);
+			}
+
+			&:last-of-type {
+				background: linear-gradient(90deg, #333333 0%, rgba(98, 98, 98, 0) 100%);
+			}
+		}
+	}
+
+	.preimg {
+		width: 120px;
+		height: 80px;
+	}
+</style>
diff --git a/high-unionPay/subPages/sotre-details-list/sotre-details-list.vue b/high-unionPay/subPages/sotre-details-list/sotre-details-list.vue
new file mode 100644
index 0000000..f51c212
--- /dev/null
+++ b/high-unionPay/subPages/sotre-details-list/sotre-details-list.vue
@@ -0,0 +1,95 @@
+<template>
+	<view>
+		<view class="width90 stoCont" v-for="(store,i) in storeList" :key="i">
+			<view class="width80p flleft mart10">
+				<view class="font16 fcor333 fontwig6 text1">{{store.storeName}}</view>
+				<view class="font13 fcor666 mart10 text1">{{store.address}}</view>
+			</view>
+			<view class="width20 flright mart10 fotrt" @click="seeloaction(store)">
+				<image mode="widthFix" style="width: 25px;height: 25px;" :src="imagewxUrl+imgadres1">
+				</image>
+				<view class="mart5 fcor999 font13">{{store.distance}}km</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getStoreListByCoupon
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				storeList: [],
+				couDesId: '',
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres1: 'dhl.png',
+				pageNum: 1,
+				pageSize: 15,
+				isNoMoreData: false
+			}
+		},
+		onLoad(options) {
+			this.couDesId = options.id;
+			this.getStoreListByCoupon();
+		},
+		onReachBottom() {
+			this.getStoreListByCoupon();
+		},
+		methods: {
+			/**
+			 * 查询门店列表
+			 */
+			getStoreListByCoupon() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					couponId: this.couDesId,
+					longitude: app.globalData.longitude,
+					latitude: app.globalData.latitude,
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getStoreListByCoupon(params).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						uni.hideLoading();
+						this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
+						this.storeList = this.storeList.concat(res.return_data.list);
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.storeList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//导航
+			seeloaction(e) {
+				uni.openLocation({
+					latitude: Number(e.latitude), //目的地的定位
+					longitude: Number(e.longitude), //目的地的定位
+					name: e.storeName,
+					address: e.address
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.stoCont {
+		border-bottom: 1px solid #f6f6f6;
+		height: 140rpx;
+	}
+</style>
diff --git a/high-unionPay/subPages/static/coupsucces.png b/high-unionPay/subPages/static/coupsucces.png
new file mode 100644
index 0000000..81cc999
Binary files /dev/null and b/high-unionPay/subPages/static/coupsucces.png differ
diff --git a/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue b/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
index 87e25e9..aec9d4f 100644
--- a/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
+++ b/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
@@ -34,11 +34,11 @@
 							</view>
 						</view>
 						<view class="width30 flright fotrt fcor666 font15 fotrt">
-							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType == 1 || row.payType == 3">
-								￥{{row.payPrice}}
+							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType == 2">
+								￥{{row.payPrice * 100}}
 							</view>
 							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
-								￥{{row.payPrice*100}}
+								￥{{row.payPrice}}
 							</view>
 							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.status]}}</view>
 						</view>
diff --git a/high-unionPay/uni.scss b/high-unionPay/uni.scss
index 17ff0de..b862600 100644
--- a/high-unionPay/uni.scss
+++ b/high-unionPay/uni.scss
@@ -649,7 +649,11 @@ $uni-font-size-paragraph:30upx;
 	align-items: center;
 	display: flex;
 }
-
+.alijusend{
+	justify-content: flex-end;
+	align-items: center;
+	display: flex;
+}
 .alijun{
 	justify-content: flex-end;
 	display: flex;