diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index aa7f45e..b7d35ca 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -171,7 +171,19 @@ export const getGasStoreList = params => {
 export const getGasDetailByStoreKey = params => {
 	return POST('GET', `${base}/highGas/getGasDetailByStoreKey`, params).then(res => res.data);
 }
+//团油距离限制
+export const getDictionaryByCodeTypeOl = params => {
+	return POST('GET', `${base}/common/getDictionaryByCodeTypeOl`, params).then(res => res.data);
+}
+//团油计算价格
+export const oilPriceCompute = params => {
+	return POST('GET', `${base}/highGas/oilPriceCompute`, params).then(res => res.data);
+}
 
+//查询卡数据字典
+export const getDictionaryByCodeType = params => {
+	return POST('GET', `${base}/common/getDictionaryByCodeType`, params).then(res => res.data);
+}
 //获取已开通的省份
 export const getDredgeProvince = params => {
 	return POST('GET', `${base}/common/getDredgeProvince`, params).then(res => res.data);
@@ -181,10 +193,15 @@ export const getCmsContent = params => {
 	return POST('GET', `${base}/cmsContent/getCmsContent`, params).then(res => res.data);
 }
 
+//油卡支付
+export const oilCardPay = params => {
+	return POST('POST', `${base}/order/oilCardPay`, params).then(res => res.data);
+}
 //提交订单
 export const addOrderPay = params => {
 	return POST('POST', `${base}/outRechargeOrder/addOrder`, params).then(res => res.data);
 }
+
 //话费充值查询
 export const getListOutRechargePrice = params => {
 	return POST('GET', `${base}/outRechargePrice/getListOutRechargePrice`, params).then(res => res.data);
@@ -233,6 +250,10 @@ export const getDiscountPackageDetail = params => {
 export const getHuiLianTongCardByCardNo = params => {
 	return POST('GET', `${base}/highUserCard/getHuiLianTongCardByCardNo`, params).then(res => res.data);
 }
+//查询油卡详情
+export const getDetailByCardNo = params => {
+	return POST('GET', `${base}/oilCard/getDetailByCardNo`, params).then(res => res.data);
+}
 // 获取用户卡号列表
 export const getUserCardList = params => {
 	return POST('GET', `${base}/highUserCard/getUserCardList`, params).then(res => res.data);
@@ -241,6 +262,10 @@ export const getUserCardList = params => {
 export const getHuiLianTongCardByPhone = params => {
 	return POST('GET', `${base}/highUserCard/getHuiLianTongCardByPhone`, params).then(res => res.data);
 }
+//查询油卡消费
+export const getOilCardRecordList = params => {
+	return POST('GET', `${base}/oilCard/getOilCardRecordList`, params).then(res => res.data);
+}
 // 删除用户卡号
 export const delUserCard = params => {
 	return POST('POST', `${base}/highUserCard/delUserCard`, params).then(res => res.data);
@@ -257,8 +282,9 @@ export const getHuiLianTongCardConsume = params => {
 export const hltUnionCardPay = params => {
 	return POST('POST', `${base}/order/hltUnionCardPay`, params).then(res => res.data);
 }
-export const bindHuiLianTongCard = params => {
-	return POST('POST', `${base}/highUserCard/bindHuiLianTongCard`, params).then(res => res.data);
+//绑定卡包
+export const bindHuiLianTongCard = params => {
+	return POST('POST', `${base}/highUserCard/bindCard`, params).then(res => res.data);
 }
 /**
  * 工会卡
@@ -319,8 +345,8 @@ export const getH5UserInfo = params => {
 	return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
 }
 //获取验证码
-export const sendSmsCode = params => {
-	return POST('GET', `${base}/sms/sendSmsCode`, params).then(res => res.data);
+export const sendSmsCodeByHw = params => {
+	return POST('GET', `${base}/SendSms/sendSmsCodeByHw`, params).then(res => res.data);
 }
 //绑定手机号
 export const bindUserPhone = params => {
diff --git a/high-unionPay/Utils/js/date.js b/high-unionPay/Utils/js/date.js
new file mode 100644
index 0000000..b13cba8
--- /dev/null
+++ b/high-unionPay/Utils/js/date.js
@@ -0,0 +1,55 @@
+const isNullOrEmpty = function(val) {
+    if (val == null || val == "" || typeof(val) == undefined) {
+        return true;
+    } else {
+        return false;
+    }
+}
+ 
+const timeFormat = (value, format) => {
+    let date = new Date(value);
+    let y = date.getFullYear();
+    let m = date.getMonth() + 1;
+    let d = date.getDate();
+    let h = date.getHours();
+    let min = date.getMinutes();
+    let s = date.getSeconds();
+    let result = "";
+    if (format == undefined) {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} ${
+        h < 10 ? "0" + h : h
+      }:${min < 10 ? "0" + min : min}:${s < 10 ? "0" + s : s}`;
+    }
+	if (format == "yyyy-mm-dd hh:mm") {
+	    result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d} `;
+	}
+    if (format == "yyyy-mm-dd") {
+        result = `${y}-${m < 10 ? "0" + m : m}-${d < 10 ? "0" + d : d}`;
+    }
+    if (format == "yyyy-mm") {
+        result = `${y}-${m < 10 ? "0" + m : m}`;
+    }
+    if (format == "mm-dd") {
+        result = ` ${mm < 10 ? "0" + mm : mm}:${ddmin < 10 ? "0" + dd : dd}`;
+    }
+    if (format == "hh:mm") {
+        result = ` ${h < 10 ? "0" + h : h}:${min < 10 ? "0" + min : min}`;
+    }
+    if (format == "yyyy") {
+        result = `${y}`;
+    }
+    return result;
+};
+
+
+// {{date|isNullOrEmpty}}
+// {{date|timeFormat('yyyy-mm-dd')}} 
+// {{date|timeFormat('yyyy-mm')}}
+// {{date|timeFormat('hh:mm')}}
+// {{date|timeFormat('yyyy')}} 
+// {{date|timeFormat}}
+
+export {
+    isNullOrEmpty,
+    timeFormat
+}
diff --git a/high-unionPay/main.js b/high-unionPay/main.js
index a1dbaf5..1c28d95 100644
--- a/high-unionPay/main.js
+++ b/high-unionPay/main.js
@@ -2,6 +2,11 @@ import Vue from 'vue'
 import App from './App'
 import {VueJsonp} from 'vue-jsonp'
 import share from 'common/share.js'
+import * as filters from './Utils/js/date.js'
+
+Object.keys(filters).forEach(key => {
+	Vue.filter(key, filters[key])
+})
 
 import vueCupUi from "components/vue-cup-ui/lib/vue-cup-ui.common.js"
 Vue.use(vueCupUi)
diff --git a/high-unionPay/manifest.json b/high-unionPay/manifest.json
index 8cfd75a..de0e5a5 100644
--- a/high-unionPay/manifest.json
+++ b/high-unionPay/manifest.json
@@ -80,7 +80,7 @@
                 }
             }
         },
-        "title" : "嗨加油",
+        "title" : "嗨森逛",
         "router" : {
             "mode" : "hash",
             "base" : "/unionPay"
diff --git a/high-unionPay/pages.json b/high-unionPay/pages.json
index dcd62e5..eab6709 100644
--- a/high-unionPay/pages.json
+++ b/high-unionPay/pages.json
@@ -4,7 +4,7 @@
 			"path": "pages/tabBar/home/home",
 			"style": {
 				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "嗨加油",
+				"navigationBarTitleText": "嗨森逛",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"onReachBottomDistance": 50,
@@ -21,21 +21,27 @@
 		}, {
 			"path": "pages/unionPay/unionPay-entrance/unionPay-entrance",
 			"style": {
-				"navigationBarTitleText": "嗨加油",
+				"navigationBarTitleText": "嗨森逛",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/unionPay/unionPay",
 			"style": {
-				"navigationBarTitleText": "嗨加油",
+				"navigationBarTitleText": "嗨森逛",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -45,7 +51,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -55,6 +64,7 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
 					"bounce": "none", //关闭窗口回弹效果
 					"softinputNavBar": "none"
 				}
@@ -67,7 +77,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -77,7 +90,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -86,7 +102,10 @@
 				"navigationBarTitleText": "订单详情",
 				"navigationBarBackgroundColor": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -97,7 +116,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -107,7 +129,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		},
@@ -118,7 +143,8 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
-					"bounce": "none"
+					"bounce": "none",
+					"titleNView": false //禁用原生导航栏
 				}
 			}
 		},
@@ -129,7 +155,11 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "门店列表",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+
 			}
 
 		},
@@ -140,7 +170,6 @@
 				"navigationBarTitleText": "分类",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"titleNView": false, //禁用原生导航栏
 					"bounce": "none"
@@ -176,14 +205,14 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
-					"softinputNavBar": "none"
+					"softinputNavBar": "none",
+					"titleNView": false //禁用原生导航栏
 				}
 			}
 		},
 		{
 			"path": "pages/goods/goods",
 			"style": {
-				"navigationBarTitleText": "",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTitleText": "详情",
@@ -207,6 +236,7 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
 					"bounce": "none", //关闭窗口回弹效果
 					"softinputNavBar": "none"
 				}
@@ -221,7 +251,8 @@
 				"navigationBarTextStyle": "white",
 				"app-plus": {
 					"bounce": "none", //关闭窗口回弹效果
-					"softinputNavBar": "none"
+					"softinputNavBar": "none",
+					"titleNView": false //禁用原生导航栏
 				}
 			}
 		}, {
@@ -231,7 +262,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"softinputNavBar": "none"
+				"softinputNavBar": "none",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "pages/user/coupon/coupon",
@@ -241,6 +275,7 @@
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
 				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
 					"bounce": "none"
 				}
 			}
@@ -252,7 +287,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "pages/pay/payment/payment",
@@ -262,7 +300,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "pages/pay/success/success",
@@ -272,7 +313,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		},
 		{
@@ -282,7 +326,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		},
@@ -294,14 +341,20 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/business/business",
 			"style": {
 				"navigationBarTitleText": "门店",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -310,47 +363,68 @@
 				"navigationBarTitleText": "我的订单",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"backgroundColorBottom": "#ffffff"
+				"backgroundColorBottom": "#ffffff",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "pages/goods/recording/recording",
 			"style": {
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/mineCoupons/mineCoupons",
 			"style": {
 				"navigationBarTitleText": "我的卡券",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/goods/coupons-info-details/coupons-info-details",
 			"style": {
 				"navigationBarTitleText": "卡券详情",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/mineCouponsDestails/mineCouponsDestails",
 			"style": {
 				"navigationBarTitleText": "优惠券详情",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/goods/externalCoupon/externalCoupon",
 			"style": {
 				"navigationBarTitleText": "扫码领取优惠券",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/agentCoupons/agentCoupons",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -360,7 +434,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		},
 		{
@@ -371,7 +448,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -380,35 +460,50 @@
 				"navigationBarBackgroundColor": "#ffffff",
 				"navigationBarTitleText": "充值",
 				"backgroundColorTop": "#ffffff",
-				"backgroundColorBottom": "#ffffff"
+				"backgroundColorBottom": "#ffffff",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/positioning/positioning",
 			"style": {
 				"navigationBarTitleText": "地区选择",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/tabBar/order/order",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/qianZhuPay/qianZhuPay",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/tabBar/order/webUrl/webUrl",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -419,7 +514,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "pages/login/updatePas/resetPas",
@@ -429,7 +527,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -440,7 +541,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -450,7 +554,10 @@
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
 				"navigationBarTextStyle": "white",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -461,29 +568,38 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/userLogin/userLogin",
 			"style": {
-				"navigationBarTitleText": "嗨加油",
+				"navigationBarTitleText": "嗨森逛",
 				"enablePullDownRefresh": false,
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
 			"path": "pages/user/cardDes/cardDes",
 			"style": {
 				"enablePullDownRefresh": false,
-				"navigationBarTitleText": "绑定卡号",
+				"navigationBarTitleText": "卡包",
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -493,7 +609,10 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}
@@ -505,7 +624,10 @@
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}
@@ -514,27 +636,27 @@
 			"path": "pages/unionPay/unionorder-des/unionorder-des",
 			"style": {
 				"navigationBarTitleText": "充值详情",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
+		}, {
+			"path": "pages/tabBar/order/stagesUrl/stagesUrl",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
 		}
-	    ,{
-            "path" : "pages/tabBar/order/stagesUrl/stagesUrl",
-            "style" :                                                                                    
-            {
-               "navigationBarTextStyle": "white",
-               "navigationBarTitleText": "",
-               "navigationBarBackgroundColor": "#0083f5",
-               "backgroundColorTop": "#0083f5",
-               "onReachBottomDistance": 50,
-               "app-plus": {
-               	"titleNView": false, //禁用原生导航栏
-               	"softinputNavBar": "none"
-               }
-            }
-            
-        }
-    ],
+	],
 	"subpackages": [{
 		"root": "subPages",
 		"pages": [{
@@ -545,7 +667,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -556,7 +681,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#e62601",
 				"backgroundColorTop": "#e62601",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -567,7 +695,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -577,7 +708,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -587,7 +721,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "coupon-packge-details/coupon-packge-details",
@@ -596,7 +733,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 		}, {
 			"path": "coupon-comfirmation/coupon-comfirmation",
@@ -605,7 +745,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -616,7 +759,10 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}, {
@@ -627,7 +773,38 @@
 				"backgroundTextStyle": "light",
 				"navigationBarBackgroundColor": "#0083f5",
 				"backgroundColorTop": "#0083f5",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+			}
+
+		}, {
+			"path": "cardsList/cardsList",
+			"style": {
+				"navigationBarTitleText": "卡包",
+				"enablePullDownRefresh": false,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
+			}
+
+		}, {
+			"path": "cardsDetails/cardsDetails",
+			"style": {
+				"navigationBarTitleText": "卡详情",
+				"enablePullDownRefresh": false,
+				"backgroundTextStyle": "light",
+				"navigationBarBackgroundColor": "#0083f5",
+				"backgroundColorTop": "#0083f5",
+				"navigationBarTextStyle": "white",
+				"app-plus": {
+					"titleNView": false //禁用原生导航栏
+				}
 			}
 
 		}]
@@ -649,7 +826,7 @@
 				"pagePath": "pages/tabBar/home/home",
 				"iconPath": "static/img/tabBar/home.png",
 				"selectedIconPath": "static/img/tabBar/home-on.png",
-				"text": "嗨加油"
+				"text": "嗨森逛"
 			},
 			// {
 			// 	"pagePath": "pages/tabBar/category/category",
diff --git a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
index 192cbd4..49475f5 100644
--- a/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/high-unionPay/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -1,313 +1,399 @@
-<template>
-	<view>
-		<!-- 头部 -->
-		<view class="width100 height120 backcorfff">
-			<image :src="orderList.goodsImg" class="flleft conImg mart10 margle10"></image>
-			<view class="conCont paddtop15">
-				<view class="font20 fontwig6 fcor333 text1 paddtright10">{{orderList.goodsName}}</view>
-				<view class="font14 fcor999 text2 paddtop5 paddtright10">{{refulAdress}}</view>
-				<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{orderList.gasPriceVip}}
-					<text class="margle10 slogan font14">￥{{orderList.gasPriceGun}}</text>
-				</view>
-			</view>
-		</view>
-		<!-- //订单详情 -->
-		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
-		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
-			<view class="flleft width50">
-				油号\油枪
-			</view>
-			<view class="flright width40 fotct">
-				{{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
-			</view>
-		</view>
-		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
-			<view class="flleft width50">
-				加油金额
-			</view>
-			<view class="flright width40 fotct">
-				{{orderList.totalPrice}}
-			</view>
-		</view>
-
-		<!-- //支付方式 -->
-		<!-- <view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
-		<view class="line1"></view>
-		<view class="width100 backcorfff">
-			<view class="line1"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
-				<view class="width60 flleft fontwig6">
-					银联支付
-				</view>
-				<view class="flright width30 fotct">
-					<radio :checked="paytype=='weixin'" color="#0083f5" />
-				</view>
-			</view>
-
-			<view class="line1"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
-				<view class="width60 flleft fontwig6">
-					积分<text class="font14 fcor666 margle">(积分:{{user.gold}})</text>
-				</view>
-				<view class="flright width30 fotct">
-					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
-				</view>
-			</view>
-		</view> -->
-
-		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
-		<view class="width95 paddleft10 font14 fcor999	 mart5">1.<text
-				class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款。</view>
-		<view class="width95 paddleft10 font14 fcor999  mart5">
-			2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。</view>
-		<view class="height80 width100"></view>
-		<!-- 底部按钮 -->
-		<view class="footer">
-			<view class="width50 flleft fcoreb5 padleft15 font15">
-				合计: ￥<text class="font24">{{payprice}}</text>
-			</view>
-			<button class="reBtn flright" @click="unionPay">去支付</button>
-		</view>
-		
-		<ssPaymentPassword  ref="paymentPassword" :mode="1" @submit="submitHandle"/>
-	</view>
-</template>
-
-<script>
-	import {
-		getOrderById,
-		orderToPay,
-		unionPay,
-		orderToGoldPay,
-		hltUnionCardPay
-	} from '../../../Utils/Api.js';
-	import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
-	let app = getApp();
-	export default {
-		components: {
-			ssPaymentPassword
-		},
-		data() {
-			return {
-				orderNo: '',
-				couponId: '',
-				payprice: '',
-				orderList: '',
-				refulAdress: '',
-				tongCardPrice: 0,
-				user: '',
-				paytype: '',
-				PaymentPassword: '',
-			}
-		},
-		onLoad(e) {
-			this.payprice = e.payprice;
-			this.orderNo = e.orderId;
-			this.couponId = e.couponId;
-			this.refulAdress = e.adres;
-			this.getOrderById();
-		},
-		onShow() {
-			let that = this;
-			that.paytype = '';
-			that.user = app.globalData.userInfo;
-		},
-		methods: {
-			//密码支付完成
-			submitHandle(e) {
-				this.PaymentPassword = e.value;
-				if(this.PaymentPassword == ''){
-					uni.showToast({
-						title: '请勿手动关闭弹窗',
-						icon: 'none',
-						duration: 2000
-					})
-					return;
-				}
-				uni.showLoading({
-					title: '支付中...'
-				})
-				let params = {
-					"orderId": this.orderNo,
-					"password": this.PaymentPassword
-				}
-				orderToGoldPay(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						uni.showToast({
-							title: '支付成功'
-						})
-						uni.reLaunch({
-							url: '/pages/goods/refuel-succes/refuel-succes?id=' +this.orderNo
-						});
-						return;
-					}
-					if (res.return_code == '102130') {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					uni.showToast({
-						title: res.return_msg,
-						icon: 'none'
-					})
-				})
-			
-			
-			},
-			//获取选择支付方式
-			changeRiado() {
-				if (!this.user.isSetHltCard) {
-					uni.showToast({
-						icon: 'none',
-						title: '当前账号还未绑定,前往绑定',
-						duration: 2000,
-						success() {
-							setTimeout(() => {
-								uni.navigateTo({
-									url: '../../user/bindingCard/bindingCard'
-								})
-							}, 1000)
-						}
-					});
-					return;
-				}
-			},
-			getOrderById() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					orderId: this.orderNo,
-				}
-				getOrderById(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						this.orderList = res.return_data.highChildOrderList[0];
-					}
-				})
-			},
-		
-			//获取订单数据
-			orderToPay() {
-				let that = this;
-				if (that.paytype == '') {
-					uni.showToast({
-						title: '请选择支付方式',
-						icon: 'none',
-						duration: 2000
-					})
-					return;
-				}
-				if (that.paytype == 'weixin') {
-					that.unionPay();
-					return;
-				}
-				if(that.paytype == 'gonghuika'){
-					if (!that.user.isSetPayPwd) {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
-						})
-						return;
-					}
-					that.$refs.paymentPassword.modalFun('show');
-				}
-				
-			},
-			//银联获取信息
-			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: '/pages/goods/refuel-succes/refuel-succes?id=' +that.orderNo
-						});
-						},
-						fail: function(err) {
-							uni.showToast({
-								title: err.msg,
-								icon: 'none',
-								duration: 2000
-							})
-							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
-						}
-					});
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="less">
-	page {
-		background-color: #f7f7f7;
-	}
-
-	.conImg {
-		width: 100px;
-		height: 100px;
-		border-radius: 8px;
-	}
-
-	.conCont {
-		margin-left: 115px;
-	}
-
-	.slogan {
-		color: #807c87;
-		text-decoration: line-through;
-	}
-
-	.footer {
-		position: fixed;
-		bottom: 0upx;
-		width: 100%;
-		height: 100rpx;
-		color: #FFFFFF;
-		border-top: solid 1upx #eee;
-		background-color: #FFFFFF;
-		z-index: 2;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		.reBtn {
-			width: 120px;
-			background-color: #089bf5;
-			color: #FFFFFF;
-			text-align: center;
-			padding: 0;
-			font-size: 16px;
-			border-radius: 0px;
-			height: 50px;
-			line-height: 50px;
-			position: absolute;
-			right: 0px;
-		}
-	}
+<template>
+	<view>
+		<!-- 头部 -->
+		<view class="width100 height120 backcorfff">
+			<image :src="orderList.goodsImg" class="flleft conImg mart10 margle10"></image>
+			<view class="conCont paddtop15">
+				<view class="font20 fontwig6 fcor333 text1 paddtright10">{{orderList.goodsName}}</view>
+				<view class="font14 fcor999 text2 paddtop5 paddtright10">{{refulAdress}}</view>
+				<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{orderList.gasPriceVip}}
+					<text class="margle10 slogan font14">￥{{orderList.gasPriceGun}}</text>
+				</view>
+			</view>
+		</view>
+		<!-- //订单详情 -->
+		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
+		<view class="line1"></view>
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+			<view class="flleft width50">
+				油号\油枪
+			</view>
+			<view class="flright width40 fotct">
+				{{orderList.gasOilNo}}#/{{orderList.gasGunNo}}号
+			</view>
+		</view>
+		<view class="line1"></view>
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+			<view class="flleft width50">
+				加油金额
+			</view>
+			<view class="flright width40 fotct">
+				{{orderList.totalPrice}}
+			</view>
+		</view>
+
+		<!-- //支付方式 -->
+		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
+		<view class="line1"></view>
+		<view class="width100 backcorfff">
+			<view class="line1"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
+				<view class="width60 flleft fontwig6">
+					银联支付
+				</view>
+				<view class="flright width30 fotct">
+					<radio :checked="paytype=='weixin'" color="#0083f5" />
+				</view>
+			</view>
+
+			<view class="line1"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='oilcard'">
+				<view class="width60 flleft fontwig6">
+					油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
+				</view>
+				<view class="flright width30 fotct">
+					<radio :checked="paytype=='oilcard'" @click="changeRiado()" color="#0083f5" />
+				</view>
+			</view>
+			<!-- <view class="line1"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='gonghuika'">
+				<view class="width60 flleft fontwig6">
+					积分<text class="font14 fcor666 margle">(积分:{{user.gold}})</text>
+				</view>
+				<view class="flright width30 fotct">
+					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
+				</view>
+			</view> -->
+		</view>
+
+		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
+		<view class="width95 paddleft10 font14 fcor999	 mart5">1.<text
+				class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,抢号后再付款。</view>
+		<view class="width95 paddleft10 font14 fcor999  mart5">
+			2.请勿先付款后加油,若您已下单付款。请于24小时内到加油站完成加油;若您48小时内未完成加油,请及时发起退单;逾期退单可能会退单失败。</view>
+		<view class="height80 width100"></view>
+		<!-- 底部按钮 -->
+		<view class="footer">
+			<view class="width50 flleft fcoreb5 padleft15 font15">
+				合计: ￥<text class="font24">{{payprice}}</text>
+			</view>
+			<button class="reBtn flright" @click="orderToPay">去支付</button>
+		</view>
+
+		<ssPaymentPassword ref="paymentPassword" :mode="1" @submit="submitHandle" />
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderById,
+		orderToPay,
+		unionPay,
+		orderToGoldPay,
+		hltUnionCardPay,
+		findUser,
+		oilCardPay
+	} from '../../../Utils/Api.js';
+	import ssPaymentPassword from '../../../components/sanshui-payment-password/index.vue';
+	let app = getApp();
+	export default {
+		components: {
+			ssPaymentPassword
+		},
+		data() {
+			return {
+				orderNo: '',
+				couponId: '',
+				payprice: '',
+				orderList: '',
+				refulAdress: '',
+				tongCardPrice: 0,
+				oilPirce: 0, //油卡余额
+				user: '',
+				paytype: '',
+				PaymentPassword: '',
+			}
+		},
+		onLoad(e) {
+			this.payprice = e.payprice;
+			this.orderNo = e.orderId;
+			this.couponId = e.couponId;
+			this.refulAdress = e.adres;
+			this.getOrderById();
+		},
+		onShow() {
+			let that = this;
+			that.paytype = '';
+			that.findUser();
+			// that.user = app.globalData.userInfo;
+		},
+		methods: {
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						if (res.return_data.oilCard) {
+							this.oilPirce = res.return_data.oilCard.amount;
+						}
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
+			//密码支付完成
+			submitHandle(e) {
+				this.PaymentPassword = e.value;
+				if (this.PaymentPassword == '') {
+					uni.showToast({
+						title: '请勿手动关闭弹窗',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				uni.showLoading({
+					title: '支付中...'
+				})
+				if (this.paytype == 'jifen') {
+					let params = {
+						"orderId": this.orderNo,
+						"password": this.PaymentPassword
+					}
+					orderToGoldPay(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
+							});
+							return;
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../login/updatePas/updatePas'
+							})
+							return;
+						}
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
+				if (this.paytype == 'oilcard') {
+					let params = {
+						"orderId": this.orderNo,
+						"cardNo": this.user.oilCard.cardNo,
+						"password": this.PaymentPassword
+					}
+					oilCardPay(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url: '/pages/goods/refuel-succes/refuel-succes?id=' + this.orderNo
+							});
+							return;
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../login/updatePas/updatePas'
+							})
+							return;
+						}
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
+
+			},
+			//获取选择支付方式
+			changeRiado() {
+				if (!this.user.isSetHltCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../../user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			getOrderById() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderId: this.orderNo,
+				}
+				getOrderById(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.orderList = res.return_data.highChildOrderList[0];
+					}
+				})
+			},
+
+			//获取订单数据
+			orderToPay() {
+				let that = this;
+				if (that.paytype == '') {
+					uni.showToast({
+						title: '请选择支付方式',
+						icon: 'none',
+						duration: 2000
+					})
+					return;
+				}
+				if (that.paytype == 'weixin') {
+					that.unionPay();
+					return;
+				}
+				if (that.paytype == 'gonghuika') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				}
+				if (that.paytype == 'oilcard') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					if (!that.user.isSetHltCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
+				}
+
+			},
+			//银联获取信息
+			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: '/pages/goods/refuel-succes/refuel-succes?id=' + that
+									.orderNo
+							});
+						},
+						fail: function(err) {
+							uni.showToast({
+								title: err.msg,
+								icon: 'none',
+								duration: 2000
+							})
+							// 支付失败, err.msg 是失败原因描述, 比如TN号不合法, 或者用户取消了交易 等等。
+						}
+					});
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+	page {
+		background-color: #f7f7f7;
+	}
+
+	.conImg {
+		width: 100px;
+		height: 100px;
+		border-radius: 8px;
+	}
+
+	.conCont {
+		margin-left: 115px;
+	}
+
+	.slogan {
+		color: #807c87;
+		text-decoration: line-through;
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0upx;
+		width: 100%;
+		height: 100rpx;
+		color: #FFFFFF;
+		border-top: solid 1upx #eee;
+		background-color: #FFFFFF;
+		z-index: 2;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.reBtn {
+			width: 120px;
+			background-color: #089bf5;
+			color: #FFFFFF;
+			text-align: center;
+			padding: 0;
+			font-size: 16px;
+			border-radius: 0px;
+			height: 50px;
+			line-height: 50px;
+			position: absolute;
+			right: 0px;
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/goods/refuel-details/refuel-details.vue b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
index 5d010e3..219adef 100644
--- a/high-unionPay/pages/goods/refuel-details/refuel-details.vue
+++ b/high-unionPay/pages/goods/refuel-details/refuel-details.vue
@@ -1,489 +1,625 @@
-<template>
-	<view>
-		<image mode="widthFix" class="width100" :src="storeList.gasLogoSmall"></image>
-		<view class="height100p titlecon backcorfff">
-			<view class="height60 paddtop25 width90">
-				<view class="flleft width80p">
-					<view class="width100 text1 font18 fontwig6 fcor333">{{storeList.gasName}}</view>
-					<view class="width100 font14 fcor666 mart5">{{storeList.gasAddress}}</view>
-				</view>
-				<view class="flright reimg fotct width20" @click="seeloaction">
-					<image mode="widthFix" :src="imagewxUrl+imgadres"></image>
-					<view class="fcor089">{{storeList.distance}}km</view>
-				</view>
-			</view>
-			<view class="fcor999 font14 width90 mart0">
-				营业时间 : 00:00-23:59
-			</view>
-		</view>
-		<!-- 标价 -->
-		<view class="width90 relbj">
-			<view class="height60">
-				<view class="flleft mart10 bjcss font16 fontwig6" @click="showPopup(1)">
-					{{oilNo}}
-					<image mode="widthFix" :src="imagewxUrl+imgadres2"></image>
-				</view>
-				<view class="margle20 font15 fcoreb5 flleft mart20  borRit">
-					<view class="fontspec fotct ">平台价</view>
-					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceVip}}</view>
-				</view>
-				<view class="margle20 font15 fcor666 flleft mart20  borRit">
-					<view class="fontspec fotct ">油站价</view>
-					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceGun}}</view>
-				</view>
-				<view class="margle20 font15 fcor666 flleft mart20 ">
-					<view class="fontspec fotct ">国标价</view>
-					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceOfficial}}</view>
-				</view>
-			</view>
-		</view>
-		<view class="line10 mart15"></view>
-		<!-- 我要加油 -->
-		<view class="width90 mart15 font16 fcor666">我要加油</view>
-		<view class="width90 relbj mart15">
-			<view class="width50 flleft fotct" @click="showPopup(1)">
-				<view class="width100 fcor999 font14 mart10">选择油号</view>
-				<view class="width100 mart10">
-					<image mode="widthFix" style="width: 20px;" :src="imagewxUrl+imgadres1"></image>
-					<text class="font20 fcor333 fontwig6 margle">{{oilNo}}</text>
-					<image mode="widthFix" class="margle" style="width: 10px; " :src="imagewxUrl+imgadres2">
-					</image>
-				</view>
-			</view>
-			<view class="width50 flright fotct" @click="showPopup(2)">
-				<view class="width100 fcor999 font14 mart10">选择油枪</view>
-				<view class="width100 mart10 ">
-					<image mode="widthFix" style="width: 20px;" :src="imagewxUrl+imgadres3"></image>
-					<text class="font20 fcor333 fontwig6 margle">{{gunNo}}号</text>
-					<image mode="widthFix" class="margle" style="width: 10px; " :src="imagewxUrl+imgadres2">
-					</image>
-				</view>
-			</view>
-		</view>
-		<view class="line10 mart15"></view>
-		<!--加油金额-->
-		<view class="width90 mart15 font16 fcor666">加油金额</view>
-		<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
-			<view class="width8 flleft">￥</view>
-			<input type="digit" class="font16 width60 flleft height40" placeholder="请输入金额" v-model="inputMoney"
-				@blur="Listeningfocus" maxlength="6" />
-			<view class="width30 height40 flright font14 fcor999 fotct"
-				style="border-left: 1px solid #f2f2f2;line-height: 40px;">
-				约{{litre}}L
-			</view>
-		</view>
-		<!-- <view class="list width90">
-			<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
-				:class="{'on':amount.price == inputMoney}">
-				<view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}元</view>
-			</view>
-		</view> -->
-		<view class="height60 width100"></view>
-		<!-- 底部按钮 -->
-		<view class="footer">
-			<view class="flleft padleft15 font15 fcoreb5">
-				合计: ￥<text class="font24">{{totalPrice}}</text><text
-					class="font12 fcor666" v-if="priceVip != priceOfficial">优惠约:￥{{discountPrice}}</text>
-			</view>
-
-			<!-- #ifdef MP -->
-			<button class="reBtn flright"  v-if="user.phone == null" @click="jumpPhone">去支付</button>
-			<button class="reBtn flright" v-else @click="toPay">去支付</button>
-			<!-- #endif -->
-			<!-- #ifdef H5 -->
-			<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
-			<button class="reBtn flright" v-else @click="toPay">去支付</button>
-			<!-- #endif -->
-
-		</view>
-		<!-- 底部弹窗 -->
-		<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view>
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">选择油枪</view>
-			<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 1">汽油油号</view>
-			<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 2">汽油油枪</view>
-			<view v-if="typeId == 1">
-				<view :class="swiper.oilNoName ==  oilNo?'activeRefuel':'refuel'" v-for="(swiper,index) in detailList"
-					:key="index" @click="changeValue(swiper)">
-					{{swiper.oilNoName}}
-				</view>
-			</view>
-
-			<view v-if="typeId == 2">
-				<view :class="item.gunNo ==  gunNo?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
-					:key="index" @click="changeValue2(item)">
-					{{item.gunNo}}
-				</view>
-			</view>
-		</wybPopup>
-		<view class="height30"></view>
-	</view>
-</template>
-
-<script>
-	import {
-		getGasDetailByStoreKey,
-		addOrder
-	} from '../../../Utils/Api.js';
-	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
-	let app = getApp();
-	export default {
-		components: {
-			wybPopup
-		},
-		data() {
-			return {
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'dhl.png',
-				imgadres2: 'xiala.png',
-				imgadres1: 'yhl.png',
-				imgadres3: 'yql.png',
-				detailList: [],
-				gunnumber: [],
-				user: '',
-				amountList: [{
-						id: '1',
-						price: '200'
-					},
-					{
-						id: '2',
-						price: '300'
-					},
-					{
-						id: '3',
-						price: '400'
-					},
-					{
-						id: '4',
-						price: '500'
-					}
-				],
-				inputAmount: '',
-				store_key: '',
-				storeList: '',
-				oilNo: '',
-				priceVip: '',
-				priceOfficial: '',
-				priceGun: '',
-				gunNo: '',
-				typeId: '',
-				counId: '',
-				inputMoney: '',
-				gasOilNo: '',
-				litre: '',
-				totalPrice: '0.00',
-				discountPrice: '0.00',
-				gasGunList: [],
-				oilType: ''
-			}
-		},
-		onLoad(options) {
-			this.store_key = options.id;
-			this.counId = options.desId;
-			this.getGasDetailByStoreKey();
-		},
-		onShow() {
-			this.user = app.globalData.userInfo;
-		},
-		methods: {
-			//前往导航
-			seeloaction() {
-				uni.openLocation({
-					latitude: Number(this.storeList.gasAddressLatitude), //目的地的定位
-					longitude: Number(this.storeList.gasAddressLongitude), //目的地的定位
-					name: this.storeList.gasName,
-					address: this.storeList.gasAddress
-				})
-			},
-			//显示弹出
-			showPopup(item) {
-				this.typeId = item;
-				this.$refs.popup.show();
-			},
-			//查询详情
-			getGasDetailByStoreKey() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					storeKey: this.store_key,
-					// latitude: '30.83876',
-					// longitude: '106.129505',
-					latitude: app.globalData.latitude,
-					longitude: app.globalData.longitude
-				}
-				getGasDetailByStoreKey(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						this.storeList = res.return_data;
-						this.oilNo = res.return_data.oilPriceList[0].oilNoName;
-						this.priceVip = res.return_data.oilPriceList[0].priceVip;
-						this.priceGun = res.return_data.oilPriceList[0].priceGun;
-						this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
-						this.detailList = res.return_data.oilPriceList;
-						this.oilType = res.return_data.oilPriceList[0].oilType;
-						this.gasGunList = res.return_data.gasGunList;
-						for (var i = 0; i < res.return_data.gasGunList.length; i++) {
-							if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
-								this.gunnumber.push(res.return_data.gasGunList[i])
-								this.gunNo = res.return_data.gasGunList[i].gunNo;
-								this.gasOilNo = res.return_data.gasGunList[i].oilNo;
-							}
-						}
-
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: "none",
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateBack({})
-								}, 2000)
-							}
-						});
-					}
-				})
-			},
-
-			//选择油号
-			changeValue(item) {
-				this.gunnumber = [];
-				this.oilNo = item.oilNoName;
-				for (var i = 0; i < this.gasGunList.length; i++) {
-					if (this.oilNo == this.gasGunList[i].oilNoName) {
-						this.gunnumber.push(this.gasGunList[i])
-						this.gunNo = this.gasGunList[i].gunNo;
-						this.gasOilNo = this.gasGunList[i].oilNo;
-					}
-				}
-				this.oilType = item.oilType;
-				this.gasOilNo = item.oilNo;
-				this.priceVip = item.priceVip;
-				this.priceOfficial = item.priceOfficial;
+<template>
+	<view>
+		<image mode="widthFix" class="width100" :src="storeList.gasLogoSmall"></image>
+		<view class="height100p titlecon backcorfff">
+			<view class="height75 paddtop25 width90">
+				<view class="flleft width80p">
+					<view class="width100 text1 font18 fontwig6 fcor333">{{storeList.gasName}}</view>
+					<view class="width100 font14 fcor666 mart5">{{storeList.gasAddress}}</view>
+				</view>
+				<view class="flright reimg fotct width20" @click="seeloaction">
+					<image mode="widthFix" :src="imagewxUrl+imgadres"></image>
+					<view class="fcor089">{{storeList.distance}}km</view>
+				</view>
+			</view>
+			<view class="fcor999 font14 width90 mart0">
+				营业时间 : 00:00-23:59
+			</view>
+		</view>
+		<!-- 标价 -->
+		<view class="width90 relbj">
+			<view class="height60">
+				<view class="flleft mart10 bjcss font16 fontwig6" @click="showPopup(1)">
+					{{oilNo}}
+					<image mode="widthFix" :src="imagewxUrl+imgadres2"></image>
+				</view>
+				<view class="margle20 font15 fcoreb5 flleft mart20  borRit">
+					<view class="fontspec fotct ">平台价</view>
+					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceVip}}</view>
+				</view>
+				<view class="margle20 font15 fcor666 flleft mart20  borRit">
+					<view class="fontspec fotct ">油站价</view>
+					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceGun}}</view>
+				</view>
+				<view class="margle20 font15 fcor666 flleft mart20 ">
+					<view class="fontspec fotct ">国标价</view>
+					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceOfficial}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="line10 mart15"></view>
+		<!-- 我要加油 -->
+		<view class="width90 mart15 font16 fcor666">我要加油</view>
+		<view class="width90 relbj mart15">
+			<view class="width50 flleft fotct" @click="showPopup(1)">
+				<view class="width100 fcor999 font14 mart10">选择油号</view>
+				<view class="width100 mart10">
+					<image mode="widthFix" style="width: 20px;" :src="imagewxUrl+imgadres1"></image>
+					<text class="font20 fcor333 fontwig6 margle">{{oilNo}}</text>
+					<image mode="widthFix" class="margle" style="width: 10px; " :src="imagewxUrl+imgadres2">
+					</image>
+				</view>
+			</view>
+			<view class="width50 flright fotct" @click="showPopup(2)">
+				<view class="width100 fcor999 font14 mart10">选择油枪</view>
+				<view class="width100 mart10 ">
+					<image mode="widthFix" style="width: 20px;" :src="imagewxUrl+imgadres3"></image>
+					<text class="font20 fcor333 fontwig6 margle">{{gunNo}}号</text>
+					<image mode="widthFix" class="margle" style="width: 10px; " :src="imagewxUrl+imgadres2">
+					</image>
+				</view>
+			</view>
+		</view>
+		<view class="line10 mart15"></view>
+		<!--加油金额-->
+		<view class="width90 mart15 font16 fcor666">加油金额</view>
+		<view class="width90 height40 mart10" style="border: 1px solid #f2f2f2;">
+			<view class="width8 flleft">￥</view>
+			<input type="digit" class="font16 width60 flleft height40" placeholder="输入金额(保留2位小数)" v-model="inputMoney"
+				@blur="Listeningfocus" />
+			<view class="width30 height40 flright font14 fcor999 fotct"
+				style="border-left: 1px solid #f2f2f2;line-height: 40px;">
+				约{{litre}}L
+			</view>
+		</view>
+		<!-- <view class="list width90">
+			<view class="box" v-for="(amount,index) in amountList" :key="index" @click="select(amount)"
+				:class="{'on':amount.price == inputMoney}">
+				<view class="heTitle fcor333" :class="{'fcor089':amount.id == inputAmount}">{{amount.price}}元</view>
+			</view>
+		</view> -->
+		<view class="height60 width100"></view>
+		<!-- 底部按钮 -->
+		<view class="footer">
+			<view class="flleft padleft15 font15 fcoreb5">
+				合计: ￥<text class="font24">{{totalPrice}}</text><text class="font12 fcor666"
+					v-if="priceVip != priceOfficial">优惠约:￥{{discountPrice}}</text>
+			</view>
+
+			<!-- #ifdef MP -->
+			<button class="reBtn flright" v-if="user.phone == null" @click="jumpPhone">去支付</button>
+			<button class="reBtn flright" v-else @click="postionIng">去支付</button>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<button class="reBtn flright" v-if="user.phone == null" @click="jumpH5Bding">去支付</button>
+			<button class="reBtn flright" v-else @click="postionIng">去支付</button>
+			<!-- #endif -->
+
+		</view>
+		<!-- 底部弹窗 -->
+		<wybPopup ref="popup" type="bottom" height="600" width="500" radius="6" :showCloseIcon="true">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 1">选择油号</view>
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId == 2">选择油枪</view>
+			<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 1">汽油油号</view>
+			<view class="font15 fcor666 width90 mart10 height22" v-if="typeId == 2">汽油油枪</view>
+			<view v-if="typeId == 1">
+				<view :class="swiper.oilNoName ==  oilNo?'activeRefuel':'refuel'" v-for="(swiper,index) in detailList"
+					:key="index" @click="changeValue(swiper)">
+					{{swiper.oilNoName}}
+				</view>
+			</view>
+
+			<view v-if="typeId == 2">
+				<view :class="item.gunNo ==  gunNo?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
+					:key="index" @click="changeValue2(item)">
+					{{item.gunNo}}
+				</view>
+			</view>
+		</wybPopup>
+		<view class="height30"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		getGasDetailByStoreKey,
+		addOrder,
+		getDictionaryByCodeTypeOl,
+		oilPriceCompute
+	} from '../../../Utils/Api.js';
+	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
+	let app = getApp();
+	export default {
+		components: {
+			wybPopup
+		},
+		data() {
+			return {
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'dhl.png',
+				imgadres2: 'xiala.png',
+				imgadres1: 'yhl.png',
+				imgadres3: 'yql.png',
+				detailList: [],
+				gunnumber: [],
+				user: '',
+				amountList: [{
+						id: '1',
+						price: '200'
+					},
+					{
+						id: '2',
+						price: '300'
+					},
+					{
+						id: '3',
+						price: '400'
+					},
+					{
+						id: '4',
+						price: '500'
+					}
+				],
+				inputAmount: '',
+				store_key: '',
+				storeList: '',
+				oilNo: '',
+				priceVip: '',
+				priceOfficial: '',
+				priceGun: '',
+				gunNo: '',
+				typeId: '',
+				counId: '',
+				inputMoney: '',
+				gasOilNo: '',
+				litre: '',
+				totalPrice: '0.00',
+				discountPrice: '0.00',
+				gasGunList: [],
+				oilType: '',
+				distance: 9999, //距离限制
+				xzMoney: '300', //金额限制
+			}
+		},
+		onLoad(options) {
+			this.store_key = options.id;
+			this.counId = options.desId;
+			this.getGasDetailByStoreKey();
+			this.getDictionaryByCodeTypeOl();
+			this.getDictionaryByCodeTypeMoney();
+		},
+		onShow() {
+			this.user = app.globalData.userInfo;
+		},
+		methods: {
+			//前往导航
+			seeloaction() {
+				uni.openLocation({
+					latitude: Number(this.storeList.gasAddressLatitude), //目的地的定位
+					longitude: Number(this.storeList.gasAddressLongitude), //目的地的定位
+					name: this.storeList.gasName,
+					address: this.storeList.gasAddress
+				})
+			},
+			//显示弹出
+			showPopup(item) {
+				this.typeId = item;
+				this.$refs.popup.show();
+			},
+			//查询详情
+			getGasDetailByStoreKey() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					storeKey: this.store_key,
+					latitude: app.globalData.latitude,
+					longitude: app.globalData.longitude
+				}
+				getGasDetailByStoreKey(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.storeList = res.return_data;
+						if (!this.oilNo) {
+							this.oilNo = res.return_data.oilPriceList[0].oilNoName;
+							this.priceVip = res.return_data.oilPriceList[0].priceVip;
+							this.priceGun = res.return_data.oilPriceList[0].priceGun;
+							this.priceOfficial = res.return_data.oilPriceList[0].priceOfficial;
+							this.detailList = res.return_data.oilPriceList;
+							this.oilType = res.return_data.oilPriceList[0].oilType;
+							this.gasGunList = res.return_data.gasGunList;
+							for (var i = 0; i < res.return_data.gasGunList.length; i++) {
+								if (this.oilNo == res.return_data.gasGunList[i].oilNoName) {
+									this.gunnumber.push(res.return_data.gasGunList[i])
+									this.gunNo = res.return_data.gasGunList[i].gunNo;
+									this.gasOilNo = res.return_data.gasGunList[i].oilNo;
+								}
+							}
+						}
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none",
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateBack({})
+								}, 2000)
+							}
+						});
+					}
+				})
+			},
+			//距离限制
+			getDictionaryByCodeTypeOl() {
+				let datas = {
+					codeType: 'MILEAGE_LIMIT'
+				}
+				getDictionaryByCodeTypeOl(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.distance = res.return_data.codeValue;
+					}
+				})
+			},
+			//加油金额限制
+			getDictionaryByCodeTypeMoney() {
+				let datas = {
+					codeType: 'TY_PRICE_LIMIT'
+				}
+				getDictionaryByCodeTypeOl(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.xzMoney = res.return_data.codeValue;
+					}
+				})
+			},
+			//选择油号
+			changeValue(item) {
+				this.gunnumber = [];
+				this.oilNo = item.oilNoName;
+				for (var i = 0; i < this.gasGunList.length; i++) {
+					if (this.oilNo == this.gasGunList[i].oilNoName) {
+						this.gunnumber.push(this.gasGunList[i])
+						this.gunNo = this.gasGunList[i].gunNo;
+						this.gasOilNo = this.gasGunList[i].oilNo;
+					}
+				}
+				this.oilType = item.oilType;
+				this.gasOilNo = item.oilNo;
+				this.priceVip = item.priceVip;
+				this.priceOfficial = item.priceOfficial;
 				this.priceGun = item.priceGun;
-				this.$refs.popup.hide();
-			},
-			//选择油枪
-			changeValue2(item) {
-				this.gunNo = item.gunNo;
-				this.$refs.popup.hide();
-			},
-			select(amount) {
-				this.inputMoney = amount.price;
-				this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
-				this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
-				if (this.priceVip != this.priceGun) {
-					let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
-					this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
-				}
-			},
-			// H5获取手机号
-			jumpH5Bding() {
-				uni.navigateTo({
-					url: '/pages/login/register?id=2'
-				})
-			},
-			//失去焦点算价格和油升
-			Listeningfocus() {
-				this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
-				this.totalPrice = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(2);
-				if (this.priceVip != this.priceOfficial) {
-					let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
-					this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
-				}
-			},
-			//跳转手机授权
-			jumpPhone(){
-				uni.navigateTo({
-					url:'../../userLogin/userLogin'
-				})
-			},
-			//去支付
-			toPay() {
-				if (this.inputMoney == '' || this.inputMoney < 1) {
-					uni.showToast({
-						title: '请输入正确金额',
-						icon: "none"
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: '提交订单中...'
-				})
-				let goods = {
-					"identificationCode":app.globalData.identificationCode,
-					"highChildOrderList": [{
-						"goodsType": 3,
-						"goodsId": this.counId,
-						"saleCount": 1,
-						"goodsPrice": this.inputMoney,
-						"gasGunNo": this.gunNo,
-						"gasOilNo": this.gasOilNo,
-						"gasOilType": this.oilType,
-						"gasPriceGun": this.priceOfficial,
-						"gasPriceVip": this.priceVip
-						
-					}]
-				}
-				addOrder(goods).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000') {
-						uni.redirectTo({
-							url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data
-								.payPrice + '&orderId=' + res.return_data.id + '&couponId=' + this.counId +
-								'&adres=' + this.storeList.gasAddress
-						})
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-
-			},
-		}
-	}
-</script>
-
-<style lang="less">
-	.titlecon {
-		border-radius: 10px 10px 0 0;
-		position: relative;
-		top: -30px;
-	}
-
-	.refuel {
-		padding: 6px 15px;
-		border-radius: 5px;
-		background-color: #f6f6f6;
-		color: #666666;
-		margin-right: 10px;
-		margin-left: 15px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 16px;
-		width: 10%;
-		text-align: center;
-	}
-
-	.activeRefuel {
-		padding: 6px 15px;
-		border-radius: 5px;
-		border: 1px solid #089bf5;
-		color: #089bf5;
-		margin-right: 10px;
-		margin-left: 15px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 16px;
-		width: 10%;
-		text-align: center;
-	}
-
-	.reimg {
-		image {
-			width: 20px;
-		}
-	}
-
-	.relab {
-		padding: 5px;
-		border-radius: 5px;
-		margin-left: 10px;
-		color: #089bf5;
-		background-color: #e5f2fe;
-	}
-
-	.relbj {
-		height: 80px;
-		box-shadow: 0 0 8px 2px #f6f6f6;
-		border-radius: 5px;
-
-	}
-
-	.bjcss {
-		line-height: 60px;
-		margin-left: 10px;
-
-		image {
-			width: 10px;
-			margin-left: 10px;
-		}
-	}
-
-	.borRit {
-		padding-right: 10px;
-		border-right: 1px solid #f4f4f4;
-	}
-
-	.list {
-		display: flow-root;
-		justify-content: space-between;
-		padding: 20upx 0;
-
-		.box {
-			width: 30%;
-			margin-right: 2%;
-			margin-top: 20upx;
-			float: left;
-			height: 120upx;
-			line-height: 120upx;
-			// display: flex;
-			justify-content: center;
-			align-items: center;
-			text-align: center;
-			border-radius: 10upx;
-			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05);
-			font-size: 36upx;
-			color: #666666;
-			border: 1px solid #f2f2f2;
-
-			&.on {
-				// background-color: #089bf5;
-				border: 1px solid #089bf5;
-			}
-		}
-
-		.heTitle {
-			width: 100%;
-			font-size: 16px;
-		}
-
-		.mitext {
-			margin-top: 10upx;
-			width: 100%;
-			font-size: 12px;
-		}
-	}
-
-	.footer {
-		position: fixed;
-		bottom: 0upx;
-		width: 100%;
-		height: 100rpx;
-		color: #FFFFFF;
-		border-top: solid 1upx #eee;
-		background-color: #FFFFFF;
-		z-index: 2;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-
-		.reBtn {
-			width: 120px;
-			background-color: #089bf5;
-			color: #FFFFFF;
-			text-align: center;
-			padding: 0;
-			font-size: 16px;
-			border-radius: 0px;
-			height: 50px;
-			line-height: 50px;
-			position: absolute;
-			right: 0px;
-		}
-	}
+				this.totalPrice = '0.00';
+				this.discountPrice = '0.00';
+				this.inputMoney = '';
+				this.$refs.popup.hide();
+			},
+			//选择油枪
+			changeValue2(item) {
+				this.gunNo = item.gunNo;
+				this.$refs.popup.hide();
+			},
+			// select(amount) {
+			// 	this.inputMoney = amount.price;
+			// 	this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
+			// 	this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
+			// 	if (this.priceVip != this.priceGun) {
+			// 		let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
+			// 		this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+			// 	}
+			// },
+			// H5获取手机号
+			jumpH5Bding() {
+				uni.navigateTo({
+					url: '/pages/login/register?id=2'
+				})
+			},
+			//失去焦点算价格和油升
+			Listeningfocus() {
+				var a = /^[0-9]+(\.[0-9]{1})?$/;
+				var b = /^[0-9]+(.[0-9]{1})?$/;
+				var c = /^([1-9][0-9]*)+(\.[0-9]{1,2})?$/;
+				if (this.inputMoney == '' || this.inputMoney < 10 || !(c.test(this.inputMoney))) {
+					uni.showToast({
+						title: '请输入正确加油金额',
+						icon: "none",
+						duration: 2000
+					});
+					this.totalPrice = '0.00';
+					this.discountPrice = '0.00';
+					this.litre = '';
+					this.inputMoney = '';
+					return;
+				}
+
+				// let inputs = this.inputMoney.split('.');
+				// if (inputs[1] != undefined && inputs[1].length > 1) {
+				// 	uni.showToast({
+				// 		title: '加油金额精确到小数点1位',
+				// 		icon: "none",
+				// 		duration:2000
+				// 	});
+				// 	return;
+				// }
+				if (parseInt(this.inputMoney) > parseInt(this.xzMoney)) {
+					uni.showToast({
+						title: '加油金额不能超过' + this.xzMoney + '元',
+						icon: "none",
+						duration: 2000
+					});
+					this.inputMoney = this.xzMoney;
+
+				}
+
+				//原来计算方式
+				this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
+				// var arr1 = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(4);
+				// this.totalPrice = this.numFilter(arr1);
+				this.oilPriceCompute();
+				//目前计算方式
+				// this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
+				// this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
+				// if (this.priceVip != this.priceGun) {
+				// 	let gbprice = parseFloat(this.litre * this.priceGun).toFixed(2);
+				// 	this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
+				// }
+			},
+			//计算价格
+			oilPriceCompute() {
+				let datas = {
+					"price": this.inputMoney,
+					"goodsId": this.counId,
+					"oilNo": this.gasOilNo,
+					}
+				oilPriceCompute(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.totalPrice = res.return_data;
+						if (this.priceVip != this.priceOfficial) {
+							// let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
+							// this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(2);
+							this.discountPrice = parseFloat(this.inputMoney - this.totalPrice).toFixed(2);
+						}
+					}
+				})
+			},
+			//跳转手机授权
+			jumpPhone() {
+				uni.navigateTo({
+					url: '../../userLogin/userLogin'
+				})
+			},
+			// 保留小数点后两位的，不会四舍五入
+			numFilter(tempVal) {
+				// 截取当前数据到小数点后三位
+				// let tempVal = parseFloat(value).toFixed(3)
+				let realVal = tempVal.substring(0, tempVal.length - 2)
+				return realVal
+			},
+			/**
+			 * 定位
+			 */
+			postionIng() {
+				let that = this;
+				if (that.inputMoney == '' || that.inputMoney < 10) {
+					uni.showToast({
+						title: '请输入正确金额',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						app.globalData.latitude = res.latitude;
+						app.globalData.longitude = res.longitude;
+						that.getGasDetailByStoreKey();
+						setTimeout(() => {
+							that.toPay();
+						}, 500);
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '请打开设置里面的位置信息',
+							icon: "none",
+							duration: 2000
+						});
+					}
+				})
+			},
+			//去支付
+			toPay() {
+				if (this.storeList.distance > this.distance) {
+					uni.showToast({
+						title: '请在' + this.distance + '公里内进行下单',
+						icon: "none",
+						duration: 3000
+					});
+					return;
+				}
+				if (this.inputMoney == '' || this.inputMoney < 10) {
+					uni.showToast({
+						title: '请输入正确金额',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				uni.showLoading({
+					title: '提交订单中...'
+				})
+				let goods = {
+					"identificationCode": app.globalData.identificationCode,
+					"highChildOrderList": [{
+						"goodsType": 3,
+						"goodsId": this.counId,
+						"saleCount": 1,
+						"goodsPrice": this.inputMoney,
+						"gasGunNo": this.gunNo,
+						"gasOilNo": this.gasOilNo,
+						"gasOilType": this.oilType,
+						"gasPriceGun": this.priceOfficial,
+						"gasPriceVip": this.priceVip
+
+					}]
+				}
+				addOrder(goods).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						uni.redirectTo({
+							url: '/pages/goods/refuel-confirm/refuel-confirm?payprice=' + res.return_data
+								.payPrice + '&orderId=' + res.return_data.id + '&couponId=' + this.counId +
+								'&adres=' + this.storeList.gasAddress
+						})
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="less">
+	.titlecon {
+		border-radius: 10px 10px 0 0;
+		position: relative;
+		top: -30px;
+	}
+
+	.refuel {
+		padding: 6px 15px;
+		border-radius: 5px;
+		background-color: #f6f6f6;
+		color: #666666;
+		margin-right: 10px;
+		margin-left: 15px;
+		margin-top: 15px;
+		display: inline-block;
+		font-size: 16px;
+		width: 10%;
+		text-align: center;
+	}
+
+	.activeRefuel {
+		padding: 6px 15px;
+		border-radius: 5px;
+		border: 1px solid #089bf5;
+		color: #089bf5;
+		margin-right: 10px;
+		margin-left: 15px;
+		margin-top: 15px;
+		display: inline-block;
+		font-size: 16px;
+		width: 10%;
+		text-align: center;
+	}
+
+	.reimg {
+		image {
+			width: 20px;
+		}
+	}
+
+	.relab {
+		padding: 5px;
+		border-radius: 5px;
+		margin-left: 10px;
+		color: #089bf5;
+		background-color: #e5f2fe;
+	}
+
+	.relbj {
+		height: 80px;
+		box-shadow: 0 0 8px 2px #f6f6f6;
+		border-radius: 5px;
+
+	}
+
+	.bjcss {
+		line-height: 60px;
+		margin-left: 10px;
+
+		image {
+			width: 10px;
+			margin-left: 10px;
+		}
+	}
+
+	.borRit {
+		padding-right: 10px;
+		border-right: 1px solid #f4f4f4;
+	}
+
+	.list {
+		display: flow-root;
+		justify-content: space-between;
+		padding: 20upx 0;
+
+		.box {
+			width: 30%;
+			margin-right: 2%;
+			margin-top: 20upx;
+			float: left;
+			height: 120upx;
+			line-height: 120upx;
+			// display: flex;
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			border-radius: 10upx;
+			box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.05);
+			font-size: 36upx;
+			color: #666666;
+			border: 1px solid #f2f2f2;
+
+			&.on {
+				// background-color: #089bf5;
+				border: 1px solid #089bf5;
+			}
+		}
+
+		.heTitle {
+			width: 100%;
+			font-size: 16px;
+		}
+
+		.mitext {
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 12px;
+		}
+	}
+
+	.footer {
+		position: fixed;
+		bottom: 0upx;
+		width: 100%;
+		height: 100rpx;
+		color: #FFFFFF;
+		border-top: solid 1upx #eee;
+		background-color: #FFFFFF;
+		z-index: 2;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.reBtn {
+			width: 120px;
+			background-color: #089bf5;
+			color: #FFFFFF;
+			text-align: center;
+			padding: 0;
+			font-size: 16px;
+			border-radius: 0px;
+			height: 50px;
+			line-height: 50px;
+			position: absolute;
+			right: 0px;
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/goods/refuel/refuel.vue b/high-unionPay/pages/goods/refuel/refuel.vue
index 9361f73..c3d2b4e 100644
--- a/high-unionPay/pages/goods/refuel/refuel.vue
+++ b/high-unionPay/pages/goods/refuel/refuel.vue
@@ -1,488 +1,359 @@
-<template>
-	<view>
-		<view class="width100 backcorfff">
-			<image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image>
-			<uSearchBar @confirm="search" @input="input"></uSearchBar>
-		</view>
-		<!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList"
-			@result="result"></slFilter> -->
-		<view class="width100 height40 backcorfff">
-				<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
-					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
-				</view>
-				<view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
-					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
-				</view>
-				<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
-					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
-				</view>
-		</view>
-
-		<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
-		<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
-		</view>
-		<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
-			<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
-				style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
-			</image>
-			<view class="recontright">
-				<view class="text1 width100 font18 fontwig6  paddtop10" @click="goDetails(item.store_key,item.id)">
-					{{item.store_name}}</view>
-				<view class="width100 mart5 height22">
-					<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
-						{{item.address}}
-					</view>
-					<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
-						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
-						{{item.distance}}km
-					</view>
-				</view>
-				<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
-					<text class="font18 fontwig6">{{item.price_vip}}</text>起<text
-						class="fcor999 margle">油站价￥{{item.price_gun}}</text>
-				</view>
-			</view>
-		</view>
-
-		<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 1">筛选距离</view>
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 2">优先条件</view>
-			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 3">油号选择</view>
-			<view class="mart15" v-if="typeId  == 1">
-				<view :class="item.name ==  distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
-					:key="index" @click="changeValue(item)">
-					{{item.name}}
-				</view>
-			</view>
-
-			<view class="mart15" v-if="typeId  == 2">
-				<view :class="item.name ==  distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
-					:key="index" @click="changeValue1(item)">
-					{{item.name}}
-				</view>
-			</view>
-			<view class="mart15" v-if="typeId  == 3">
-				<view v-for="(item,index) in oilList" :key="index">
-					<view class="font15 fcor666 width90 mart10 height22">{{item.name}}</view>
-					<view :class="items.name ==  onilName?'activeRefuel':'refuel'"
-						v-for="(items,indexs) in item.nillist" :key="indexs" @click="changeValue2(items)">
-						{{items.name}}
-					</view>
-				</view>
-			</view>
-		</wybPopup>
-		<!-- <authorize></authorize> -->
-	</view>
-</template>
-
-<script>
-	import {
-		getGasStoreList
-	} from '../../../Utils/Api.js';
-	import slFilter from '@/components/sl-filter/sl-filter.vue';
-	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
-	import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
-	// import authorize from '../../../components/Authorize.vue'
-	let app = getApp();
-	export default {
-		components: {
-			slFilter,
-			// authorize,
-			uSearchBar,
-			wybPopup
-		},
-		data() {
-			return {
-				themeColor: '#089bf5',
-				titleColor: '#666666',
-				filterResult: '',
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres:'btjy.png',
-				imgadres1:'dh.png',
-				imgadres2:'xiala.png',
-				imgadres3:'noorder.png',
-				menuList: [
-					{
-						'title': '油号',
-						'key': 'single2',
-						'isMutiple': false,
-						'detailTitle': '',
-						'reflexTitle': true,
-						'defaultSelectedIndex': 0,
-						'detailList': [{
-							'title': '90#',
-							'value': ''
-						}, {
-							'title': '92#',
-							'value': '92#'
-						}, {
-							'title': '95#',
-							'value': '95#'
-						}, {
-							'title': '98#',
-							'value': '98#'
-						}, {
-							'title': '101#',
-							'value': '101#'
-						}, ]
-					},
-					{
-						'title': '距离',
-						'key': 'single3',
-						'isMutiple': false,
-						'detailTitle': '',
-						'reflexTitle': true,
-						'defaultSelectedIndex': 0,
-						'detailList': [{
-								'title': '6km内',
-								'value': ''
-							},
-							{
-								'title': '10km内',
-								'value': '10km内'
-							},
-							{
-								'title': '15km内',
-								'value': '15km内'
-							},
-							{
-								'title': '20km内',
-								'value': '20km内'
-							},
-							{
-								'title': '50km内',
-								'value': '50km内'
-							}, {
-								'title': '2000km内',
-								'value': '2000'
-							}
-						]
-					}, {
-						'title': '距离',
-						'key': 'single1',
-						'isMutiple': false,
-						'detailTitle': '',
-						'reflexTitle': true,
-						'defaultSelectedIndex': 0,
-						'detailList': [{
-							'title': '距离最近',
-							'value': ''
-						}]
-
-					}
-				],
-				refuelList: [],
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				searname: '',
-				gunnumber: [{
-						id: 1,
-						name: '6km内',
-						value: 6
-					},
-					{
-						id: 2,
-						name: '10km内',
-						value: 10
-					},
-					{
-						id: 3,
-						name: '15km内',
-						value: 15
-					},
-					{
-						id: 4,
-						name: '20km内',
-						value: 20
-					},
-					{
-						id: 5,
-						name: '50km内',
-						value: 50
-					}, {
-						id: 6,
-						name: '2000km内',
-						value: 2000
-					}
-				],
-				distance: '50km内',
-				distanceNum: '50',
-				distanceName: '距离最近',
-				detailList: [{
-					id: 1,
-					name: '距离最近'
-				}],
-				typeId: '',
-				oilList: [{
-						id: 1,
-						name: '汽油',
-						nillist: [{
-								id: 1,
-								name: '90#'
-							},
-							{
-								id: 2,
-								name: '92#'
-							},
-							{
-								id: 3,
-								name: '95#'
-							},
-							{
-								id: 4,
-								name: '98#'
-							},
-							{
-								id: 5,
-								name: '101#'
-							},
-							{
-								id: 6,
-								name: '95(甲醇)#'
-							},
-							{
-								id: 7,
-								name: '92(甲醇)#'
-							}
-						]
-					},
-					{
-						id: 2,
-						name: '柴油',
-						nillist: [{
-								id: 1,
-								name: '-40#'
-							},
-							{
-								id: 2,
-								name: '-35#'
-							},
-							{
-								id: 3,
-								name: '-30#'
-							},
-							{
-								id: 4,
-								name: '-20#'
-							},
-							{
-								id: 5,
-								name: '-10#'
-							},
-							{
-								id: 6,
-								name: '车队0#'
-							},
-							{
-								id: 7,
-								name: '0#'
-							},
-							{
-								id: 8,
-								name: '柴油#'
-							},
-						]
-					},
-					{
-						id: 3,
-						name: '天然气',
-						nillist: [{
-								id: 1,
-								name: 'CNG'
-							},
-							{
-								id: 2,
-								name: 'LNG'
-							},
-							{
-								id: 3,
-								name: 'LPG'
-							}
-						]
-					}
-				],
-				onilName: '92#'
-			}
-		},
-		onLoad() {
-		this.getGasStoreList();
-		},
-		onReachBottom() {
-			this.getGasStoreList();
-		},
-		methods: {
-			//筛选距离
-			changeValue(item) {
-				this.distance = item.name;
-				this.distanceNum = item.value;
-				this.pageNum = 1;
-				this.isNoMoreData = false;
-				this.refuelList = [];
-				this.getGasStoreList();
-				this.$refs.popup.hide();
-			},
-
-			seeloaction(item) {
-				uni.openLocation({
-					latitude: Number(item.latitude), //目的地的定位
-					longitude: Number(item.longitude), //目的地的定位
-					name: item.store_name,
-					address: item.address
-				})
-			},
-			changeValue1(item) {
-				this.distanceName = item.name;
-				this.pageNum = 1;
-				this.isNoMoreData = false;
-				this.refuelList = [];
-				this.getGasStoreList();
-				this.$refs.popup.hide();
-			},
-
-			changeValue2(item) {
-				this.onilName = item.name;
-				this.pageNum = 1;
-				this.isNoMoreData = false;
-				this.refuelList = [];
-				this.getGasStoreList();
-				this.$refs.popup.hide();
-			},
-			//显示弹出
-			showPopup(item) {
-				this.typeId = item;
-				this.$refs.popup.show();
-			},
-			search(res) {
-				uni.showToast({
-					title: '搜索：' + res.value,
-					icon: 'none'
-				})
-			},
-			input(res) {
-				this.searname = res;
-				this.pageNum = 1;
-				this.isNoMoreData = false;
-				this.refuelList = [];
-				this.getGasStoreList();
-			},
-			//查询列表
-			getGasStoreList() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					return false;
-				}
-				let pagenum = this.pageNum;
-				let params = {
-					storeName: this.searname,
-					distance: this.distanceNum,
-					regionId: app.globalData.cityId,
-					// regionId: '510000',
-					oilNoName: this.onilName,
-					latitude: app.globalData.latitude,
-					longitude: app.globalData.longitude,
-					// latitude: '30.83876',
-					// longitude: '106.129505',
-					pageNum: pagenum,
-					pageSize: this.pageSize
-				}
-				getGasStoreList(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;
-						}
-						this.refuelList = this.refuelList.concat(res.return_data.list);
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.refuelList = [];
-						uni.hideLoading()
-					}
-				})
-			},
-			//跳转详情
-			goDetails(items, itemId) {
-				uni.navigateTo({
-					url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
-				})
-			},
-			result(val) {
-				console.log('filter_result:' + JSON.stringify(val));
-				this.filterResult = JSON.stringify(val, null, 2)
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f1f3f5;
-	}
-
-	.refuel {
-		padding: 6px 5px;
-		border-radius: 5px;
-		background-color: #f6f6f6;
-		color: #666666;
-		margin-left: 10px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 13px;
-		width: 18%;
-		text-align: center;
-	}
-
-	.activeRefuel {
-		padding: 6px 5px;
-		border-radius: 5px;
-		border: 1px solid #089bf5;
-		color: #089bf5;
-		margin-left: 10px;
-		margin-top: 15px;
-		display: inline-block;
-		font-size: 13px;
-		width: 18%;
-		text-align: center;
-	}
-
-	.stuMenu {
-		width: 33%;
-		height: 30px;
-		line-height: 30px;
-		font-size: 14px;
-		color: #333333;
-
-		.stuimg {
-			width: 10px;
-			vertical-align: middle;
-		}
-	}
-
-	.sear {
-		margin-left: 10px;
-		width: 50px;
-	}
-
-	.searImg {
-		margin-left: 55px;
-	}
-
-	.recontleft {
-		width: 80px;
-		margin-left: 10px;
-	}
-
-	.recontright {
-		margin-left: 95px;
-	}
-
-	.text {
-		margin-top: 50px;
-		margin-left: 20px;
-		width: 100%;
-	}
+<template>
+	<view>
+		<view class="width100 backcorfff">
+			<image mode="widthFix" class=" flleft sear mart15" :src="imagewxUrl+imgadres"></image>
+			<uSearchBar @confirm="search" @input="input"></uSearchBar>
+		</view>
+		<!-- <slFilter :independence="true" :color="titleColor" :themeColor="themeColor" :menuList.sync="menuList"
+			@result="result"></slFilter> -->
+		<view class="width100 height40 backcorfff">
+			<view class="width90">
+				<view class="stuMenu flleft fotct" @click="showPopup(3)">{{onilName}}
+					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
+				</view>
+				<view class="stuMenu flleft fotct" @click="showPopup(1)">{{distance}}
+					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
+				</view>
+				<!-- <view class="stuMenu flleft fotct" @click="showPopup(2)">{{distanceName}}
+					<image mode="widthFix" class="stuimg margle" :src="imagewxUrl+imgadres2"></image>
+				</view> -->
+
+			</view>
+		</view>
+
+		<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
+		</view>
+		<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
+			<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
+				style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
+			</image>
+			<view class="recontright">
+				<view class="text1 width100 font18 fontwig6  paddtop10" @click="goDetails(item.store_key,item.id)">
+					{{item.store_name}}
+				</view>
+				<view class="width100 mart5 height22">
+					<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
+						{{item.address}}
+					</view>
+					<view class="width30 flright font13 fcor666 fotct" @click="seeloaction(item)">
+						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;"></image>
+						{{item.distance}}km
+					</view>
+				</view>
+				<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
+					<text class="font18 fontwig6">{{item.price_vip}}</text>起<text
+						class="fcor999 margle">油站价￥{{item.price_gun}}</text>
+				</view>
+			</view>
+		</view>
+
+		<wybPopup ref="popup" type="bottom" height="800" width="500" radius="6" :showCloseIcon="false">
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 1">筛选距离</view>
+			<!-- <view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 2">优先条件</view> -->
+			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 3">油号选择</view>
+			<view class="mart15" v-if="typeId  == 1">
+				<view :class="item.name ==  distance?'activeRefuel':'refuel'" v-for="(item,index) in gunnumber"
+					:key="index" @click="changeValue(item)">
+					{{item.name}}
+				</view>
+			</view>
+
+			<!-- 	<view class="mart15" v-if="typeId  == 2">
+				<view :class="item.name ==  distanceName?'activeRefuel':'refuel'" v-for="(item,index) in detailList"
+					:key="index" @click="changeValue1(item)">
+					{{item.name}}
+				</view>
+			</view> -->
+			<view class="mart15" v-if="typeId  == 3">
+				<view class="font15 fcor666 width90 mart10 height22">油品</view>
+				<view :class="items.codeName ==  onilName?'activeRefuel':'refuel'" v-for="(items,indexs) in oilList"
+					:key="indexs" @click="changeValue2(items)">
+					{{items.codeName}}
+				</view>
+			</view>
+		</wybPopup>
+		<!-- <authorize></authorize> -->
+
+	</view>
+</template>
+
+<script>
+	import {
+		getGasStoreList,
+		getDictionaryByCodeType
+	} from '../../../Utils/Api.js';
+	import slFilter from '@/components/sl-filter/sl-filter.vue';
+	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
+	import uSearchBar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
+	// import authorize from '../../../components/Authorize.vue'
+	let app = getApp();
+	export default {
+		components: {
+			slFilter,
+			// authorize,
+			uSearchBar,
+			wybPopup
+		},
+		data() {
+			return {
+				themeColor: '#089bf5',
+				titleColor: '#666666',
+				filterResult: '',
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'btjy.png',
+				imgadres1: 'dh.png',
+				imgadres2: 'xiala.png',
+				imgadres3: 'noorder.png',
+				refuelList: [],
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				searname: '',
+				gunnumber: [{
+						id: 1,
+						name: '6km内',
+						value: 6
+					},
+					{
+						id: 2,
+						name: '10km内',
+						value: 10
+					},
+					{
+						id: 3,
+						name: '15km内',
+						value: 15
+					},
+					{
+						id: 4,
+						name: '20km内',
+						value: 20
+					},
+					{
+						id: 5,
+						name: '50km内',
+						value: 50
+					}, {
+						id: 6,
+						name: '2000km内',
+						value: 2000
+					}
+				],
+				distance: '50km内',
+				distanceNum: '50',
+				distanceName: '距离最近',
+				detailList: [{
+					id: 1,
+					name: '距离最近'
+				}],
+				typeId: '',
+				oilList: [],
+				onilName: '0#',
+				latitudeful: '',
+				longitudeful: '',
+				isTyAgent: false //是否是代理商
+			}
+		},
+		onLoad() {
+			let that = this;
+			that.getDictionaryByCodeType();
+			if (app.globalData.accountId) {
+				that.isTyAgent = true;
+			}
+			uni.getLocation({
+				type: 'wgs84',
+				success: function(res) {
+					that.latitudeful = res.latitude;
+					that.longitudeful = res.longitude;
+					that.getGasStoreList();
+				}
+			})
+		},
+		onReachBottom() {
+			this.getGasStoreList();
+		},
+		methods: {
+			//查询油品
+			getDictionaryByCodeType() {
+				let datas = {
+					codeType: 'GAS_OIL_TYPE'
+				}
+				getDictionaryByCodeType(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.oilList = res.return_data;
+					}
+				})
+			},
+			//筛选距离
+			changeValue(item) {
+				this.distance = item.name;
+				this.distanceNum = item.value;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.refuelList = [];
+				this.getGasStoreList();
+				this.$refs.popup.hide();
+			},
+
+			seeloaction(item) {
+				uni.openLocation({
+					latitude: Number(item.latitude), //目的地的定位
+					longitude: Number(item.longitude), //目的地的定位
+					name: item.store_name,
+					address: item.address
+				})
+			},
+			changeValue1(item) {
+				this.distanceName = item.name;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.refuelList = [];
+				this.getGasStoreList();
+				this.$refs.popup.hide();
+			},
+
+			changeValue2(item) {
+				this.onilName = item.codeName;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.refuelList = [];
+				this.getGasStoreList();
+				this.$refs.popup.hide();
+			},
+			//显示弹出
+			showPopup(item) {
+				this.typeId = item;
+				this.$refs.popup.show();
+			},
+			search(res) {
+				uni.showToast({
+					title: '搜索：' + res.value,
+					icon: 'none'
+				})
+			},
+			input(res) {
+				this.searname = res;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.refuelList = [];
+				this.getGasStoreList();
+			},
+			//查询列表
+			getGasStoreList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let params = {
+					storeName: this.searname,
+					distance: this.distanceNum,
+					regionId: app.globalData.cityId,
+					oilNoName: this.onilName,
+					latitude: this.latitudeful,
+					longitude: this.longitudeful,
+					pageNum: pagenum,
+					pageSize: this.pageSize,
+					isTyAgent: this.isTyAgent
+				}
+				getGasStoreList(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;
+						}
+						this.refuelList = this.refuelList.concat(res.return_data.list);
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.refuelList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//跳转详情
+			goDetails(items, itemId) {
+				uni.navigateTo({
+					url: '../refuel-details/refuel-details?id=' + items + '&desId=' + itemId
+				})
+			},
+			result(val) {
+				console.log('filter_result:' + JSON.stringify(val));
+				this.filterResult = JSON.stringify(val, null, 2)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f1f3f5;
+	}
+
+	.refuel {
+		padding: 6px 5px;
+		border-radius: 5px;
+		background-color: #f6f6f6;
+		color: #666666;
+		margin-left: 10px;
+		margin-top: 15px;
+		display: inline-block;
+		font-size: 13px;
+		width: 18%;
+		text-align: center;
+	}
+
+	.activeRefuel {
+		padding: 6px 5px;
+		border-radius: 5px;
+		border: 1px solid #089bf5;
+		color: #089bf5;
+		margin-left: 10px;
+		margin-top: 15px;
+		display: inline-block;
+		font-size: 13px;
+		width: 18%;
+		text-align: center;
+	}
+
+	.stuMenu {
+		width: 33.3%;
+		height: 30px;
+		line-height: 30px;
+		font-size: 14px;
+		color: #333333;
+
+		.stuimg {
+			width: 10px;
+			vertical-align: middle;
+		}
+	}
+
+	.sear {
+		margin-left: 10px;
+		width: 50px;
+	}
+
+	.searImg {
+		margin-left: 55px;
+	}
+
+	.recontleft {
+		width: 80px;
+		margin-left: 10px;
+	}
+
+	.recontright {
+		margin-left: 95px;
+	}
+
+	.text {
+		margin-top: 50px;
+		margin-left: 20px;
+		width: 100%;
+	}
 </style>
diff --git a/high-unionPay/pages/login/register.vue b/high-unionPay/pages/login/register.vue
index 6d32fc6..75d2623 100644
--- a/high-unionPay/pages/login/register.vue
+++ b/high-unionPay/pages/login/register.vue
@@ -33,7 +33,7 @@
 <script>
 	import md5 from "@/common/SDK/md5.min.js";
 	import {
-		sendSmsCode,
+		sendSmsCodeByHw,
 		bindUserPhone,
 		H5login
 	} from "../../Utils/Api.js";
@@ -73,9 +73,10 @@
 					title: '发送中...'
 				})
 				let params = {
-					phone: this.phoneNumber
+					phone: this.phoneNumber,
+					HWMSG:3
 				}
-				sendSmsCode(params).then(res => {
+				sendSmsCodeByHw(params).then(res => {
 					if (res.return_code == '000000') {
 						this.getCodeisWaiting = true;
 						this.getCodeBtnColor = "rgba(255,255,255,0.5)"
diff --git a/high-unionPay/pages/pay/payment/payment.vue b/high-unionPay/pages/pay/payment/payment.vue
index 85a02e7..6075cb8 100644
--- a/high-unionPay/pages/pay/payment/payment.vue
+++ b/high-unionPay/pages/pay/payment/payment.vue
@@ -18,7 +18,7 @@
 			</view>
 			<view class="content">
 				<view class="pay-list">
-						<view class="row" @tap="paytype='jinbi'">
+					<view class="row" @tap="paytype='jinbi'">
 						<view class="left">
 							<image src="../../../static/img/jfx.png"></image>
 						</view>
@@ -40,7 +40,18 @@
 						<view class="right">
 							<radio :checked="paytype=='gonghuika'" color="#0083f5" />
 						</view>
-					</view>
+					</view>
+					<view class="row" @tap="paytype='oilcard'" v-if="goodsType == 3">
+						<view class="left">
+							<image :src="imagewxUrl+imgadres1"></image>
+						</view>
+						<view class="center">
+							油卡支付(余额:{{oilPirce}}元)
+						</view>
+						<view class="right">
+							<radio :checked="paytype=='oilcard'" @click="changeRiado1()" color="#0083f5" />
+						</view>
+					</view>
 					<!-- <view class="width100 line1 mart5 marb5"></view>
 					<view class="row" @tap="paytype='unionPaystags'">
 						<view class="left">
@@ -74,7 +85,9 @@
 		orderToPay,
 		orderToGoldPay,
 		hltUnionCardPay,
-		unionPay
+		unionPay,
+		oilCardPay,
+		findUser
 	} from '../../../Utils/Api.js'
 	import ssPaymentPassword from '../../../components/sanshui-payment-password'
 	let app = getApp();
@@ -87,6 +100,7 @@
 				amount: 0,
 				imagewxUrl: app.globalData.imageWxImg,
 				imgadres: 'wxpay.png',
+				imgadres1: 'oilcard.png',
 				pryType: '',
 				paytype: '', //支付类型
 				orderNo: '',
@@ -94,7 +108,9 @@
 				couponId: '',
 				jumpType: '',
 				PaymentPassword: '',
-				tongCardPrice: 0
+				tongCardPrice: 0,
+				oilPirce: 0, //油卡金额
+				goodsType: ''
 			};
 		},
 		onLoad(e) {
@@ -102,21 +118,61 @@
 			this.orderNo = e.orderId;
 			this.couponId = e.couponId;
 			this.jumpType = e.typeaout;
+			this.goodsType = e.goodsType;
 			if (this.pryType == 1) {
 				this.paytype = 'wxpay';
 			} else if (this.pryType == 2) {
 				this.paytype = 'jinbi'
 			} else {
 				this.paytype = ''
+			}
+			if (!app.globalData.userInfo) {
+				this.findUser()
 			}
 			this.amount = parseFloat(e.amount).toFixed(2);
 		},
 		onShow() {
 			let that = this;
-			that.user = app.globalData.userInfo;
+			that.user = app.globalData.userInfo;
+			if (app.globalData.userInfo) {
+				this.findUser();
+			}
 		},
 		methods: {
-
+			//油卡支付
+			changeRiado1() {
+				if (!this.user.isSetOilCard) {
+					uni.showToast({
+						icon: 'none',
+						title: '当前账号还未绑定,前往绑定',
+						duration: 2000,
+						success() {
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '../../user/bindingCard/bindingCard'
+								})
+							}, 1000)
+						}
+					});
+					return;
+				}
+			},
+			findUser() {
+				let params;
+				findUser(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data;
+						this.user = res.return_data;
+						if (res.return_data.oilCard) {
+							this.oilPirce = res.return_data.oilCard.amount;
+						}
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+						})
+					}
+				});
+			},
 			//获取订单数据
 			orderToPay() {
 				let that = this;
@@ -134,6 +190,29 @@
 					uni.navigateTo({
 						url: '../../tabBar/order/stagesUrl/stagesUrl?orderid=' + that.orderNo
 					})
+				} else if (that.paytype == 'oilcard') {
+					if (!that.user.isSetPayPwd) {
+						uni.navigateTo({
+							url: '../../login/updatePas/updatePas'
+						})
+						return;
+					}
+					if (!that.user.isSetOilCard) {
+						uni.showToast({
+							icon: 'none',
+							title: '当前账号还未绑定,前往绑定',
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateTo({
+										url: '../../user/bindingCard/bindingCard'
+									})
+								}, 1000)
+							}
+						});
+						return;
+					}
+					that.$refs.paymentPassword.modalFun('show');
 				} else {
 					uni.showToast({
 						title: '请选择支付方式',
@@ -225,33 +304,66 @@
 					})
 					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 (this.paytype == 'gonghuika') {
+					let params = {
+						"orderId": this.orderNo,
+						"cardNo": this.user.hltCardNo.cardNo,
+						"password": this.PaymentPassword
 					}
-					if (res.return_code == '102130') {
-						uni.navigateTo({
-							url: '../../login/updatePas/updatePas'
+					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'
 						})
-						return;
-					}
-					uni.showToast({
-						title: res.return_msg,
-						icon: 'none'
 					})
-				})
+					return;
+				}
+				if (this.paytype == 'oilcard') {
+					let params = {
+						"orderId": this.orderNo,
+						"cardNo": this.user.oilCard.cardNo,
+						"password": this.PaymentPassword
+					}
+					oilCardPay(params).then(res => {
+						uni.hideLoading();
+						if (res.return_code == '000000') {
+							uni.showToast({
+								title: '支付成功'
+							})
+							uni.reLaunch({
+								url:'../../goods/refuel-succes/refuel-succes?id=' + this.orderNo
+							});
+							return;
+						}
+						if (res.return_code == '102130') {
+							uni.navigateTo({
+								url: '../../login/updatePas/updatePas'
+							})
+							return;
+						}
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none'
+						})
+					})
+					return;
+				}
 			}
 		}
 	}
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 998e939..e754d91 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -37,8 +37,10 @@
 					<image class="img" :src="imageUrl+pro.couponImg" mode="aspectFit">
 					</image>
 					<view class="fotlt fcor333 font14 text1 mart10">{{pro.couponName}}</view>
-					<view class="subject fotct mart5"><image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
-						</image>{{pro.discountPrice *100}}</view>
+					<view class="subject fotct mart5">
+						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+						</image>{{pro.discountPrice *100}}
+					</view>
 				</view>
 			</swiper-item>
 		</swiper>
@@ -49,6 +51,7 @@
 		<wybPopup ref="popup" type="center" height="850" width="600" radius="6" bgColor="" :showCloseIcon="true">
 			<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
 		</wybPopup>
+		<image :src="imagewxUrl+imgadres4" mode="widthFix" class="h5xfimg" @click="playPhone"></image>
 		<view class="height60"></view>
 	</view>
 </template>
@@ -88,6 +91,7 @@
 				imgadres1: 'jbhed.png',
 				imgadres2: 'jt.png',
 				imgadres3: '',
+				imgadres4: 'cusservice.png',
 				webUrl: '',
 				// 轮播图片
 				swiperList: [{
@@ -146,25 +150,20 @@
 						key: 'token',
 						success(e) {
 							app.globalData.token = e.data;
-						},
-						fail() {
-							uni.navigateTo({
-								url: '../../userLogin/userLogin'
-							})
 						}
+						// fail() {
+						// 	uni.navigateTo({
+						// 		url: '../../userLogin/userLogin'
+						// 	})
+						// }
 					})
-					if (!app.globalData.userInfo.phone) {
-						uni.navigateTo({
-							url: '../../userLogin/userLogin'
-						})
-						return;
-					}
+					// if (!app.globalData.userInfo.phone) {
+					// 	uni.navigateTo({
+					// 		url: '../../userLogin/userLogin'
+					// 	})
+					// 	return;
+					// }
 					that.getCacheParam();
-				},
-				fail: res => {
-					uni.navigateTo({
-						url: '../../userLogin/userLogin'
-					})
 				}
 			})
 			// if (app.globalData.cityName != '') {
@@ -391,6 +390,27 @@
 					}
 				})
 			},
+			//拨打客服电话
+			playPhone() {
+				uni.showModal({
+					title: '客服',
+					content: '4006780738',
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '4006780738', //电话号码
+								success: function(e) {
+									console.log(e);
+								},
+								fail: function(e) {
+									console.log(e);
+
+								}
+							})
+						}
+					}
+				})
+			},
 			//轮播图指示器
 			swiperChange(event) {
 				this.currentSwiper = event.detail.current;
@@ -437,12 +457,12 @@
 						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/preferred-goods/preferred-goods'
+					})
+					return;
 				}
 				if (item.title == '优惠券包') {
 					uni.navigateTo({
@@ -468,6 +488,13 @@
 		background-color: #F5F5F5;
 	}
 
+	.h5xfimg {
+		width: 80rpx;
+		bottom: 140rpx;
+		position: fixed;
+		right: 40rpx;
+	}
+
 	.popImg {
 		width: 300px;
 		height: 440px;
@@ -940,7 +967,7 @@
 	.orange-content .swiper-item {
 		height: 180rpx;
 		margin-left: 14rpx;
-		margin-top: 14rpx;
+		margin-top: 14rpx;
 		float: left;
 	}
 
diff --git a/high-unionPay/pages/tabBar/user/user.vue b/high-unionPay/pages/tabBar/user/user.vue
index e44b770..3f6da61 100644
--- a/high-unionPay/pages/tabBar/user/user.vue
+++ b/high-unionPay/pages/tabBar/user/user.vue
@@ -75,13 +75,13 @@
 						<uni-badge  text="1" type="error" />
 					</view> -->
 
-					<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
-						:text="textnum" type="error" size="normal"></uni-badge>
-					<uni-badge style="width: 20px;position: absolute; right: 7%;"
-						v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
-					<view class="img">
-						<image :src="imagewxUrl+row.img"></image>
-					</view>
+					<uni-badge style="width: 20px;position: absolute; right: 30%;" v-if="row.text == '我的卡券' && textnum "
+						:text="textnum" type="error" size="normal"></uni-badge>
+					<uni-badge style="width: 20px;position: absolute; right: 7%;"
+						v-if="row.text == '我的优惠券' && textSend " :text="textSend" type="error" size="normal"></uni-badge>
+					<view class="img">
+						<image :src="imagewxUrl+row.img"></image>
+					</view>
 					<view class="text">{{row.text}}</view>
 				</view>
 			</view>
@@ -189,8 +189,7 @@
 					}
 				],
 				// 工具栏列表
-				mytoolbarList: [
-					{
+				mytoolbarList: [{
 						url: '/pages/goods/recording/recording?id=1',
 						text: '充值记录',
 						img: 'user/mingxi.png'
@@ -211,31 +210,6 @@
 						img: 'user/momey.png'
 					}
 				],
-				// 推广列表
-				mytgbarList: [{
-						url: '',
-						text: '客服',
-						img: 'user/kefu.png'
-					}
-					// ,
-					// {
-					// 	url: '../../login/login?id=1',
-					// 	text: '商户入口',
-					// 	img: 'user/point.png'
-					// },
-					// {
-					// 	url: '../../login/login?id=2',
-					// 	text: '我的推广',
-					// 	img: 'user/renw.png'
-					// }
-
-					// ,
-					// {
-					// 	url: '/pages/user/Charge/Charge',
-					// 	text: '充话费',
-					// 	img: 'user/bank.png'
-					// }
-				],
 				//操作列表
 				czList: '',
 			}
@@ -272,9 +246,13 @@
 			if (app.globalData.userInfo) {
 				this.findUser();
 			}
-
 			if (!app.globalData.userInfo.isSetPayPwd) {
 				this.czList = [{
+						url: '../../../subPages/cardsList/cardsList',
+						text: '卡包',
+						img: '../../../static/img/ghkpay.png',
+						type: 2
+					}, {
 						url: '',
 						text: '客服',
 						img: 'user/kefu.png',
@@ -291,6 +269,11 @@
 			}
 			// '../../user/unionCard/unionCard'
 			this.czList = [{
+					url: '../../../subPages/cardsList/cardsList',
+					text: '卡包',
+					img: '../../../static/img/ghkpay.png',
+					type: 2
+				}, {
 					url: '',
 					text: '客服',
 					img: 'user/kefu.png',
@@ -341,12 +324,12 @@
 						this.toDeposit();
 					}
 				});
-			},
-			//跳转登录
-			jumplogin() {
-				uni.navigateTo({
-					url: '../../userLogin/userLogin'
-				})
+			},
+			//跳转登录
+			jumplogin() {
+				uni.navigateTo({
+					url: '../../userLogin/userLogin'
+				})
 			},
 			// H5获取手机号
 			jumpH5Bding() {
@@ -420,12 +403,34 @@
 						url: url
 					})
 				} else {
-					uni.showModal({
-						title: '客服',
-						content: '4006780738'
-					})
+					// uni.showModal({
+					// 	title: '客服',
+					// 	content: '4006780738'
+					// })
+					this.playPhone();
 				}
 
+			},
+			//拨打客服电话
+			playPhone() {
+				uni.showModal({
+					title: '客服',
+					content: '4006780738',
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '4006780738', //电话号码
+								success: function(e) {
+									console.log(e);
+								},
+								fail: function(e) {
+									console.log(e);
+			
+								}
+							})
+						}
+					}
+				})
 			}
 		}
 	}
diff --git a/high-unionPay/pages/user/bindingCard/bindingCard.vue b/high-unionPay/pages/user/bindingCard/bindingCard.vue
index c766a5f..1ad4197 100644
--- a/high-unionPay/pages/user/bindingCard/bindingCard.vue
+++ b/high-unionPay/pages/user/bindingCard/bindingCard.vue
@@ -1,246 +1,323 @@
-<template>
-	<view>
-		<view class="form re" style="top: 100rpx;">
-			<view class="username paddtop10" v-if="UserCard">
-				<picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo"
-					@change="bindUserCard">
-					<view class="date text1">{{cardNoNumber}}</view>
-				</picker>
-				<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
-			</view>
-			<view class="username" v-if="!UserCard">
-				<input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入工会卡号" v-model="cardNoNumber"
-					placeholder-style="color: #333333;"/>
-			</view>
-			<view class="username" v-if="phoneNumber">
-				<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
-				<input disabled="true" v-model="phoneNumber" placeholder-style="color: #333333;" />
-			</view>
-			<view class="code" v-if="phoneNumber">
-				<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #333333;" />
-			</view>
-			<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
-			<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view>
-		</view>
-		<view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 390px;">
-			<view class="fontlet  font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">【温馨提示】</view>
-			<view class="fontlet  font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import md5 from "@/common/SDK/md5.min.js";
+<template>
+	<view>
+		<view class="form re" style="top: 100rpx;">
+
+			<view class="username paddtop10">
+				<picker mode="selector" style="width: 90%;" :range="cardList" range-key="codeName"
+					@change="changeUserCard">
+					<view class="date text1" style="padding: 0 25rpx;">{{typeName}}</view>
+				</picker>
+				<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
+			</view>
+
+			<!-- 	<view class="username paddtop10" v-if="UserCard && type == 2">
+				<picker mode="selector" style="width: 90%;" :range="UserCard" range-key="cardNo" @change="bindUserCard">
+					<view class="date text1">{{cardNoNumber}}</view>
+				</picker>
+				<image class="flright" style="width: 15px;height: 15px;" src="../../../static/img/downj.png"></image>
+			</view> -->
+
+
+			<view class="username">
+				<input style="width: 100%;" :disabled="disStute" maxlength="19" placeholder="请输入卡号"
+					v-model="cardNoNumber" placeholder-style="color: #333333;" />
+			</view>
+			<view class="username" v-if="phoneNumber">
+				<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
+				<input disabled="true" v-model="phoneNumber" placeholder-style="color: #333333;" />
+			</view>
+			<view class="code" v-if="phoneNumber">
+				<input placeholder="请输入验证码" v-model="code" placeholder-style="color: #333333;" />
+			</view>
+			<view class="btn mart50" @tap="bindHuiLianTongCard" v-if="phoneNumber">绑定卡号</view>
+			<view class="btn mart50" @tap="doCardNonum" v-else>获取预留手机号</view>
+		</view>
+		<view class="width90 mart20 height120 backcorfff fotct" style="position: absolute;top: 70%;" v-if="type == 1">
+			<view class="fontlet  font20 fcor666 fontwig6 height45l " style="border-bottom: 1px solid #F4F4F4;">【温馨提示】
+			</view>
+			<view class="fontlet  font20 fcor666 fontwig6 height45l paddtop10">1元可抵扣100积分</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import md5 from "@/common/SDK/md5.min.js";
 	import {
-		sendSmsCode,
-		getHuiLianTongCardByCardNo,
-		bindHuiLianTongCard,
-		getUserCardList,
-		getHuiLianTongCardByPhone
-	} from '../../../Utils/Api.js';
-	let app = getApp();
-	export default {
-		data() {
-			return {
-				cardNoNumber: "",
-				phoneNumber: "",
-				code: '',
-				getCodeText: '获取验证码',
-				getCodeBtnColor: "#0083f5",
-				getCodeisWaiting: false,
-				disStute: false,
-				UserCard:''
-			}
-		},
-		onLoad(options) {
-			this.user = app.globalData.userInfo;
-			this.getHuiLianTongCardByPhone();
-		},
-		
-		methods: {
-			Timer() {},
-			//查询我的卡号列表
-			getHuiLianTongCardByPhone() {
-				let params = {
-					phone : this.user.phone
-				}
-				uni.showLoading();
-				getHuiLianTongCardByPhone(params).then(res => {
-					uni.hideLoading();
-					if (res.return_code == '000000' && res.return_data !='') {
-						this.UserCard = res.return_data;
-						this.cardNoNumber = res.return_data[0].cardNo;
-						return;
-					}
-					this.UserCard = '';
-				});
-			},
-			//选择卡号
-			bindUserCard(e) {
-				this.cardNoNumber = this.UserCard[e.target.value].cardNo;
-			},
-			getCode() {
-				uni.hideKeyboard()
-				if (this.getCodeisWaiting) {
-					return;
-				}
-				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
-					uni.showToast({
-						title: '请填写正确手机号码',
-						icon: "none"
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: '发送中...'
-				})
-				let params = {
-					phone: this.phoneNumber
-				}
-				sendSmsCode(params).then(res => {
-					if (res.return_code == '000000') {
-						this.getCodeisWaiting = true;
-						this.getCodeBtnColor = "#999999"
-						uni.showToast({
-							title: '验证码已发送',
-							icon: "none"
-						});
-						this.setTimer();
-					} else {
-						uni.hideLoading()
-					}
-				})
-			},
-			setTimer() {
-				let holdTime = 60;
-				this.getCodeText = "重新获取(60)"
-				this.Timer = setInterval(() => {
-					if (holdTime <= 0) {
-						this.getCodeisWaiting = false;
-						this.getCodeBtnColor = "#333333";
-						this.getCodeText = "获取验证码"
-						clearInterval(this.Timer);
-						return;
-					}
-					this.getCodeText = "重新获取(" + holdTime + ")"
-					holdTime--;
-
-				}, 1000)
-			},
-			//获取预留手机号
-			doCardNonum() {
-				if (!this.cardNoNumber) {
-					uni.showToast({
-						title: '请填写卡号',
-						icon: "none"
-					});
-					return false;
-				}
-				if (this.cardNoNumber.length != 19) {
-					uni.showToast({
-						title: '请填写正确的19位卡号',
-						icon: "none"
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: '查询中...'
-				})
-				let params = {
-					cardNo: this.cardNoNumber
-				}
-				getHuiLianTongCardByCardNo(params).then(res => {
-					uni.hideLoading()
-					if (res.return_code == '000000') {
-						this.phoneNumber = res.return_data.userMobile;
-						// this.phoneNumber = 15583658692;
-						this.disStute = true
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: "none"
-						});
-					}
-				})
-			},
-			//绑定卡号
-			bindHuiLianTongCard() {
-				uni.hideKeyboard()
-				//模板示例部分验证规则
-				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
-					uni.showToast({
-						title: '请填写正确手机号码',
-						icon: "none"
-					});
-					return false;
-				}
-				if (!this.code) {
-					uni.showToast({
-						title: '请填写验证码',
-						icon: "none"
-					});
-					return false;
-				}
-				uni.showLoading({
-					title: '提交中...'
-				})
-				let params = {
-					cardNo: this.cardNoNumber,
+		sendSmsCodeByHw,
+		getHuiLianTongCardByCardNo,
+		getDetailByCardNo,
+		bindHuiLianTongCard,
+		getUserCardList,
+		getHuiLianTongCardByPhone,
+		getDictionaryByCodeType
+	} from '../../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				cardNoNumber: "",
+				phoneNumber: "",
+				code: '',
+				getCodeText: '获取验证码',
+				getCodeBtnColor: "#0083f5",
+				getCodeisWaiting: false,
+				disStute: false,
+				UserCard: '',
+				cardList: [], // 卡列表
+				typeName: '', // 卡名称
+				type: '' //区分类型
+			}
+		},
+		onLoad(options) {
+			this.user = app.globalData.userInfo;
+			// this.getHuiLianTongCardByPhone();
+			this.getDictionaryByCodeType();
+		},
+
+		methods: {
+			Timer() {},
+			getDictionaryByCodeType() {
+				let datas = {
+					codeType: 'USER_CARD_TYPE'
+				}
+				getDictionaryByCodeType(datas).then(res => {
+					if (res.return_code == '000000') {
+						this.cardList = res.return_data;
+						this.type = res.return_data[0].codeValue;
+						this.typeName = res.return_data[0].codeName;
+					}
+				})
+			},
+			//查询我的卡号列表
+			getHuiLianTongCardByPhone() {
+				let params = {
+					phone: this.user.phone
+				}
+				uni.showLoading();
+				getHuiLianTongCardByPhone(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data != '') {
+						this.UserCard = res.return_data;
+						this.cardNoNumber = res.return_data[0].cardNo;
+						return;
+					}
+					this.UserCard = '';
+				});
+			},
+			//选择卡类型
+			changeUserCard(e) {
+				this.type = this.cardList[e.target.value].codeValue;
+				this.typeName = this.cardList[e.target.value].codeName;
+				this.cardNoNumber = '';
+				this.phoneNumber = '';
+				this.disStute = false;
+			},
+			//选择卡号
+			bindUserCard(e) {
+				this.cardNoNumber = this.UserCard[e.target.value].cardNo;
+			},
+			getCode() {
+				uni.hideKeyboard()
+				if (this.getCodeisWaiting) {
+					return;
+				}
+				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
+					uni.showToast({
+						title: '请填写正确手机号码',
+						icon: "none"
+					});
+					return false;
+				}
+				uni.showLoading({
+					title: '发送中...'
+				})
+				let params = {
 					phone: this.phoneNumber,
-					smsCode: this.code
-				}
-				bindHuiLianTongCard(params).then(res => {
-					uni.hideLoading()
-					if (res.return_code == '000000') {
-						app.globalData.userInfo = res.return_data
-							.object
-							.highUser;
-						app.globalData.token = res.return_data.uniqueCode;
-						uni.setStorage({
-							key: "user",
-							data: res.return_data
-								.object
-								.highUser
-						})
-						uni.showToast({
-							title: '绑定成功',
-							icon: "success",
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 2
-									})
-								}, 1000)
-							}
-						});
-					} else {
-						uni.showToast({
-							title: res.return_msg,
-							icon: "none"
-						});
-					}
-				})
-
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	@import "../../../static/css/login.scss";
-	.wximg {
-		width: 50px;
-		height: 50px;
-		margin-left: 40%;
-		margin-top: 250upx;
-	}
-	.flex1 {
-		flex: 1;
-		text-align: right;
-		width: 70%;
-		padding-right: 25rpx;
-		color: #999999;
-		font-size: 32rpx;
-	}
+					HWMSG:1
+				}
+				sendSmsCodeByHw(params).then(res => {
+					if (res.return_code == '000000') {
+						this.getCodeisWaiting = true;
+						this.getCodeBtnColor = "#999999"
+						uni.showToast({
+							title: '验证码已发送',
+							icon: "none"
+						});
+						this.setTimer();
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			setTimer() {
+				let holdTime = 60;
+				this.getCodeText = "重新获取(60)"
+				this.Timer = setInterval(() => {
+					if (holdTime <= 0) {
+						this.getCodeisWaiting = false;
+						this.getCodeBtnColor = "#333333";
+						this.getCodeText = "获取验证码"
+						clearInterval(this.Timer);
+						return;
+					}
+					this.getCodeText = "重新获取(" + holdTime + ")"
+					holdTime--;
+
+				}, 1000)
+			},
+			//获取预留手机号
+			doCardNonum() {
+				if (!this.cardNoNumber) {
+					uni.showToast({
+						title: '请填写卡号',
+						icon: "none"
+					});
+					return;
+				}
+				if (this.cardNoNumber.length != 19 && this.type == 1) {
+					uni.showToast({
+						title: '请填写正确的19位工会卡号',
+						icon: "none"
+					});
+					return;
+				}
+				if (this.cardNoNumber.length != 16 && this.type == 2) {
+					uni.showToast({
+						title: '请填写正确的16位油卡号',
+						icon: "none"
+					});
+					return;
+				}
+
+				let params = {
+					cardNo: this.cardNoNumber
+				}
+				if (this.type == 1) {
+					this.getHuiLianTongCardByCardNo(params);
+				}
+				if (this.type == 2) {
+					this.getDetailByCardNo(params);
+				}
+
+			},
+			//查询工会卡
+			getHuiLianTongCardByCardNo(items) {
+				uni.showLoading({
+					title: '查询中...'
+				})
+				getHuiLianTongCardByCardNo(items).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000') {
+						this.phoneNumber = res.return_data.userMobile;
+						// this.phoneNumber = 15583658692;
+						this.disStute = true
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
+			},
+			//查询油卡
+			getDetailByCardNo(items) {
+				uni.showLoading({
+					title: '查询中...'
+				})
+				getDetailByCardNo(items).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000') {
+						this.phoneNumber = res.return_data.contactPhone;
+						// this.phoneNumber = 15583658692;
+						this.disStute = true
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
+			},
+			//绑定卡号
+			bindHuiLianTongCard() {
+				uni.hideKeyboard()
+				//模板示例部分验证规则
+				if (!(/^1(3|4|5|6|7|8|9)\d{9}$/.test(this.phoneNumber))) {
+					uni.showToast({
+						title: '请填写正确手机号码',
+						icon: "none"
+					});
+					return false;
+				}
+				if (!this.code) {
+					uni.showToast({
+						title: '请填写验证码',
+						icon: "none"
+					});
+					return false;
+				}
+				uni.showLoading({
+					title: '提交中...'
+				})
+				let params = {
+					type: this.type,
+					cardNo: this.cardNoNumber,
+					phone: this.phoneNumber,
+					smsCode: this.code
+				}
+				bindHuiLianTongCard(params).then(res => {
+					uni.hideLoading()
+					if (res.return_code == '000000') {
+						app.globalData.userInfo = res.return_data
+							.object
+							.highUser;
+						app.globalData.token = res.return_data.uniqueCode;
+						uni.setStorage({
+							key: "user",
+							data: res.return_data
+								.object
+								.highUser
+						})
+						uni.showToast({
+							title: '绑定成功',
+							icon: "success",
+							duration: 2000,
+							success() {
+								setTimeout(() => {
+									uni.navigateBack({
+									})
+								}, 1000)
+							}
+						});
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../../static/css/login.scss";
+
+	.wximg {
+		width: 50px;
+		height: 50px;
+		margin-left: 40%;
+		margin-top: 250upx;
+	}
+
+	.flex1 {
+		flex: 1;
+		text-align: right;
+		width: 70%;
+		padding-right: 25rpx;
+		color: #999999;
+		font-size: 32rpx;
+	}
 </style>
diff --git a/high-unionPay/pages/user/order_details/order_details.vue b/high-unionPay/pages/user/order_details/order_details.vue
index 7ccc4f7..f1a3999 100644
--- a/high-unionPay/pages/user/order_details/order_details.vue
+++ b/high-unionPay/pages/user/order_details/order_details.vue
@@ -1,710 +1,708 @@
-<template>
-	<view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 1">待支付</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 2">已支付</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 3">已完成</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 4">已退款</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 5">已取消</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 6">退款中</view>
-		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 7">退款失败</view>
-		<!-- 购买商品列表 -->
-		<view class="buy-list" v-for="rec in recinfo.highChildOrderList" :key="rec.id"
-			@click="toGoods(rec.goodsId,rec.goodsType)">
-			<!-- v-for="(row,index) in buylist" :key="index" -->
-			<view class="row">
-				<view class="goods-info">
-					<view class="img">
-						<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 && rec.goodsType != 7"></image>
-					</view>
-					<view class="info">
-						<view class="title">{{rec.goodsName}}</view>
-						<view class="spec">规格: {{rec.goodsSpecName}}</view>
-						<view class="zspec" v-if="rec.giveawayType">赠品</view>
-						<view class="price-number">
-							<view class="price" v-if="recinfo.payType != 3">￥{{rec.goodsActualPrice}} <text
-									class="padleft15 font13 fcor999">数量:{{rec.saleCount}}</text></view>
-							<view class="price" v-else>
-								<image style="width: 15px;height: 15px;vertical-align: sub;"
-									src="../../../static/img/jfx.png">
-								</image>{{rec.goodsPrice*100}}
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 提示-备注 -->
-		<view class="order">
-			<view class="row" v-if="recinfo.orderNo">
-				<view class="left">
-					订单流水号 :
-				</view>
-				<view class="right">
-					{{recinfo.orderNo}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.highChildOrderList[0].gasOrderNo !=null">
-				<view class="left">
-					加油单号 :
-				</view>
-				<view class="right">
-					{{recinfo.highChildOrderList[0].gasOrderNo}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.paySerialNo">
-				<view class="left">
-					支付流水号 :
-				</view>
-				<view class="right">
-					{{recinfo.paySerialNo}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.totalPrice">
-				<view class="left">
-					订单总额 :
-				</view>
-				<view class="right" v-if="recinfo.payType != 3">
-					￥{{recinfo.totalPrice}}
-				</view>
-				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
-					</image>{{recinfo.totalPrice*100}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.payPrice">
-				<view class="left">
-					应付金额 :
-				</view>
-				<view class="right" v-if="recinfo.payType != 3">
-					￥{{recinfo.payPrice}}
-				</view>
-				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payPrice*100}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.payRealPrice">
-				<view class="left">
-					实付金额 :
-				</view>
-				<view class="right" v-if="recinfo.payType != 3">
-					￥{{recinfo.payRealPrice}}
-				</view>
-				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payRealPrice*100}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.deductionPrice">
-				<view class="left">
-					优惠金额 :
-				</view>
-				<view class="right" v-if="recinfo.payType != 3">
-					￥{{recinfo.deductionPrice}}
-				</view>
-				<view class="right" v-else>
-					<image style="width: 15px;height: 15px;vertical-align: sub;"
-						src="../../../static/img/jfx.png">
-					</image>{{recinfo.deductionPrice*100}}
-				</view>
-			</view>
-			<view class="row">
-				<view class="left">
-					下单时间 :
-				</view>
-				<view class="right">
-					{{recinfo.createTime | formatDate('-')}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.payTime">
-				<view class="left">
-					支付时间 :
-				</view>
-				<view class="right">
-					{{recinfo.payTime | formatDate('-')}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.cancelTime">
-				<view class="left">
-					取消时间 :
-				</view>
-				<view class="right">
-					{{recinfo.cancelTime | formatDate('-')}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.refusalRefundContent != null">
-				<view class="left">
-					退款失败原因 :
-				</view>
-				<view class="right">
-					{{recinfo.refusalRefundContent}}
-				</view>
-			</view>
-			<view class="row" v-if="recinfo.finishTime">
-				<view class="left">
-					完成时间 :
-				</view>
-				<view class="right">
-					{{recinfo.finishTime | formatDate('-')}}
-				</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">
-				<view class="sum">合计:
-					<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
-					<view class="money" v-else>
-						<image style="width: 15px;height: 15px;vertical-align: sub;"
-							src="../../../static/img/jfx.png">
-						</image>{{recinfo.payPrice*100}}
-					</view>
-				</view>
-				<view class="btn" @tap="cancelOrder" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view>
-				<view class="btn" @tap="toPay" style="background-color: #0083f5;color: #fff;">去支付</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import {
-		getOrderById,
-		cancelOrder,
-		getPreByOrderIdId,
-		orderComplete
-	} from '../../../Utils/Api.js';
-	let app = getApp()
-	export default {
-		data() {
-			return {
-				buylist: [], //订单列表
-				goodsPrice: 0.0, //商品合计价格
-				sumPrice: 0.0, //用户付款价格
-				freight: 12.00, //运费
-				note: '', //备注
-				int: 1200, //抵扣积分
-				deduction: 0, //抵扣价格
-				recinfo: [],
-				orderId: '',
-				imageUrl: app.globalData.imgUrl,
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres1: 'dhf.png',
-				preByOrderInfo:''
-			};
-		},
-		onShow() {
-			//页面显示时，加载订单信息
-			this.getOrderById();
-		},
-		onHide() {
-
-		},
-		onLoad(option) {
-			this.orderId = option.id
-		},
-		onBackPress() {
-			//页面后退时候，清除订单信息
-			this.clearOrder();
-		},
-		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: {
-			toGoods(e, item) {
-				if (item != 2 && item != 3 && item != 4 && item != 5 && item != 6) {
-					uni.navigateTo({
-						url: '../../goods/goods?id=' + e
-					});
-				}
-
-			},
-			getOrderById() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				let params = {
-					orderId: this.orderId,
-				}
-				getOrderById(params).then(res => {
-					if (res.return_code == '000000') {
-						uni.hideLoading();
-						this.recinfo = res.return_data;
-					} else {
-						uni.hideLoading()
-					}
-				})
-			},
-			//查询预约商品详情
-			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({
-					title: '取消订单',
-					content: '确定取消此订单？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: '加载中...'
-							})
-							let params = {
-								orderId: this.recinfo.id
-							}
-							cancelOrder(params).then(res => {
-								if (res.return_code == '000000') {
-									uni.hideLoading();
-									uni.showToast({
-										title: res.return_data,
-										icon: 'none',
-										duration: 2000
-									})
-									let pages = getCurrentPages() //页面栈
-									let prePage = pages[pages.length - 2] //上一页
-									prePage.$vm.reFresh = Math.random() //触发上一页监听器
-									uni.navigateBack() //返回上一页
-								} else {
-									uni.showToast({
-										title: res.return_msg,
-										icon: 'none',
-										duration: 2000
-									})
-									uni.hideLoading()
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			clearOrder() {
-				uni.removeStorage({
-					key: 'buylist',
-					success: (res) => {
-						this.buylist = [];
-						console.log('remove buylist success');
-					}
-				});
-			},
-			toPay() {
-				let payTypes;
-				if (this.recinfo.payType == 1 || this.recinfo.payType == null) {
-					payTypes = 3;
-				} else if (this.recinfo.payType == 2) {
-					payTypes = 1;
-				} else {
-					payTypes = 2;
-				}
-				uni.redirectTo({
-					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
-						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
-						.highChildOrderList[0].goodsId + '&typeaout='+ this.recinfo.highChildOrderList[0].ext1
-				})
-			},
-		}
-	}
-</script>
-
-<style lang="scss">
-	.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;
-		}
-	}
-
-	.buy-list {
-		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: 20rpx 0;
-
-			.goods-info {
-				width: 100%;
-				display: flex;
-
-				.img {
-					width: 80px;
-					max-height: 80px;
-					border-radius: 10upx;
-					overflow: hidden;
-					flex-shrink: 0;
-					margin-right: 10upx;
-
-					image {
-						width: 80px;
-						max-height: 80px;
-					}
-				}
-
-				.info {
-					width: 100%;
-					height: 22vw;
-					overflow: hidden;
-					display: flex;
-					flex-wrap: wrap;
-					position: relative;
-
-					.title {
-						width: 100%;
-						font-size: 32upx;
-						display: -webkit-box;
-						-webkit-box-orient: vertical;
-						-webkit-line-clamp: 2;
-						// text-align: justify;
-						overflow: hidden;
-						max-height: 40px;
-					}
-
-					.spec {
-						font-size: 22upx;
-						color: #a7a7a7;
-						height: 40upx;
-						display: flex;
-						align-items: center;
-						padding: 0 15upx;
-						border-radius: 20upx;
-						margin-bottom: 10px;
-					}
-
-					.zspec {
-						font-size: 22upx;
-						background-color: red;
-						color: #FFFFFF;
-						height: 40upx;
-						line-height: 40rpx;
-						display: flex;
-						align-items: center;
-						padding: 0 15upx;
-						border-radius: 20upx;
-						margin-bottom: 10px;
-						margin-left: 10px;
-					}
-
-					.price-number {
-						position: absolute;
-						width: 100%;
-						bottom: 0upx;
-						display: flex;
-						justify-content: space-between;
-						align-items: flex-end;
-						font-size: 28upx;
-						height: 40upx;
-
-						.price {
-							color: #fe4343;
-						}
-
-						.number {
-							display: flex;
-							justify-content: center;
-							align-items: center;
-
-						}
-					}
-				}
-			}
-		}
-	}
-
-	.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: 80rpx;
-			line-height: 80rpx;
-			border-bottom: 1px solid #f4f4f4;
-			display: flex;
-
-			.left {
-				font-size: 28upx;
-			}
-
-			.right {
-				margin-left: 40upx;
-				font-size: 26upx;
-				color: #999;
-
-				input {
-					font-size: 26upx;
-					color: #999;
-				}
-			}
-		}
-	}
-
-	.blck {
-		width: 100%;
-		height: 100upx;
-	}
-
-	.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 {
-				color: #FE1A1A;
-				width: 50%;
-				font-size: 28upx;
-				margin-right: 10upx;
-				display: flex;
-				height: 26px;
-				line-height: 26px;
-				justify-content: flex-start;
-
-				.money {
-					font-size: 20px;
-					font-weight: 600;
-					display: flex;
-					    align-items: center;
-				}
-			}
-
-			.btn {
-				padding: 0 20upx;
-				height: 70rpx;
-				width: 25%;
-				margin-left: 10px;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 30upx;
-				border-radius: 40upx;
-			}
-		}
-	}
-
-	.detail {
-		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 {
-			height: 60upx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.nominal {
-				font-size: 28upx;
-			}
-
-			.content {
-				font-size: 26upx;
-				color: #0083f5;
-			}
-		}
-	}
+<template>
+	<view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 1">待支付</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 2">已支付</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 3">已完成</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 4">已退款</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 5">已取消</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 6">退款中</view>
+		<view class="width100 font18 fcorfff fotct height40 backcorf06" v-if="recinfo.orderStatus == 7">退款失败</view>
+		<!-- 购买商品列表 -->
+		<view class="buy-list" v-for="rec in recinfo.highChildOrderList" :key="rec.id"
+			@click="toGoods(rec.goodsId,rec.goodsType)">
+			<!-- v-for="(row,index) in buylist" :key="index" -->
+			<view class="row">
+				<view class="goods-info">
+					<view class="img">
+						<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 && rec.goodsType != 7"></image>
+					</view>
+					<view class="info">
+						<view class="title">{{rec.goodsName}}</view>
+						<view class="spec">规格: {{rec.goodsSpecName}}</view>
+						<view class="zspec" v-if="rec.giveawayType">赠品</view>
+						<view class="price-number">
+							<view class="price" v-if="recinfo.payType != 3">￥{{rec.goodsActualPrice}} <text
+									class="padleft15 font13 fcor999">数量:{{rec.saleCount}}</text></view>
+							<view class="price" v-else>
+								<image style="width: 15px;height: 15px;vertical-align: sub;"
+									src="../../../static/img/jfx.png">
+								</image>{{rec.goodsPrice*100}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 提示-备注 -->
+		<view class="order">
+			<view class="row" v-if="recinfo.orderNo">
+				<view class="left">
+					订单流水号 :
+				</view>
+				<view class="right">
+					{{recinfo.orderNo}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.highChildOrderList[0].gasOrderNo !=null">
+				<view class="left">
+					加油单号 :
+				</view>
+				<view class="right">
+					{{recinfo.highChildOrderList[0].gasOrderNo}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.paySerialNo">
+				<view class="left">
+					支付流水号 :
+				</view>
+				<view class="right">
+					{{recinfo.paySerialNo}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.totalPrice">
+				<view class="left">
+					订单总额 :
+				</view>
+				<view class="right" v-if="recinfo.payType != 3">
+					￥{{recinfo.totalPrice}}
+				</view>
+				<view class="right" v-else>
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+					</image>{{recinfo.totalPrice*100}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.payPrice">
+				<view class="left">
+					应付金额 :
+				</view>
+				<view class="right" v-if="recinfo.payType != 3">
+					￥{{recinfo.payPrice}}
+				</view>
+				<view class="right" v-else>
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+					</image>{{recinfo.payPrice*100}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.payRealPrice">
+				<view class="left">
+					实付金额 :
+				</view>
+				<view class="right" v-if="recinfo.payType != 3">
+					￥{{recinfo.payRealPrice}}
+				</view>
+				<view class="right" v-else>
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+					</image>{{recinfo.payRealPrice*100}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.deductionPrice">
+				<view class="left">
+					优惠金额 :
+				</view>
+				<view class="right" v-if="recinfo.payType != 3">
+					￥{{recinfo.deductionPrice}}
+				</view>
+				<view class="right" v-else>
+					<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+					</image>{{recinfo.deductionPrice*100}}
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">
+					下单时间 :
+				</view>
+				<view class="right">
+					{{recinfo.createTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.payTime">
+				<view class="left">
+					支付时间 :
+				</view>
+				<view class="right">
+					{{recinfo.payTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.cancelTime">
+				<view class="left">
+					取消时间 :
+				</view>
+				<view class="right">
+					{{recinfo.cancelTime | formatDate('-')}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.refusalRefundContent != null">
+				<view class="left">
+					退款失败原因 :
+				</view>
+				<view class="right">
+					{{recinfo.refusalRefundContent}}
+				</view>
+			</view>
+			<view class="row" v-if="recinfo.finishTime">
+				<view class="left">
+					完成时间 :
+				</view>
+				<view class="right">
+					{{recinfo.finishTime | formatDate('-')}}
+				</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">
+				<view class="sum">合计:
+					<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
+					<view class="money" v-else>
+						<image style="width: 15px;height: 15px;vertical-align: sub;" src="../../../static/img/jfx.png">
+						</image>{{recinfo.payPrice*100}}
+					</view>
+				</view>
+				<view class="btn" @tap="cancelOrder" style="border: 1px solid #0083f5;color: #0083f5;">取消订单</view>
+				<view class="btn" @tap="toPay" style="background-color: #0083f5;color: #fff;">去支付</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderById,
+		cancelOrder,
+		getPreByOrderIdId,
+		orderComplete
+	} from '../../../Utils/Api.js';
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				buylist: [], //订单列表
+				goodsPrice: 0.0, //商品合计价格
+				sumPrice: 0.0, //用户付款价格
+				freight: 12.00, //运费
+				note: '', //备注
+				int: 1200, //抵扣积分
+				deduction: 0, //抵扣价格
+				recinfo: [],
+				orderId: '',
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres1: 'dhf.png',
+				preByOrderInfo: ''
+			};
+		},
+		onShow() {
+			//页面显示时，加载订单信息
+			this.getOrderById();
+		},
+		onHide() {
+
+		},
+		onLoad(option) {
+			this.orderId = option.id
+		},
+		onBackPress() {
+			//页面后退时候，清除订单信息
+			this.clearOrder();
+		},
+		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: {
+			toGoods(e, item) {
+				if (item != 2 && item != 3 && item != 4 && item != 5 && item != 6) {
+					uni.navigateTo({
+						url: '../../goods/goods?id=' + e
+					});
+				}
+
+			},
+			getOrderById() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let params = {
+					orderId: this.orderId,
+				}
+				getOrderById(params).then(res => {
+					if (res.return_code == '000000') {
+						uni.hideLoading();
+						this.recinfo = res.return_data;
+					} else {
+						uni.hideLoading()
+					}
+				})
+			},
+			//查询预约商品详情
+			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({
+					title: '取消订单',
+					content: '确定取消此订单？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								orderId: this.recinfo.id
+							}
+							cancelOrder(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									let pages = getCurrentPages() //页面栈
+									let prePage = pages[pages.length - 2] //上一页
+									prePage.$vm.reFresh = Math.random() //触发上一页监听器
+									uni.navigateBack() //返回上一页
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			clearOrder() {
+				uni.removeStorage({
+					key: 'buylist',
+					success: (res) => {
+						this.buylist = [];
+						console.log('remove buylist success');
+					}
+				});
+			},
+			toPay() {
+				let payTypes;
+				if (this.recinfo.payType == 1 || this.recinfo.payType == null) {
+					payTypes = 3;
+				} else if (this.recinfo.payType == 2) {
+					payTypes = 1;
+				} else {
+					payTypes = 2;
+				}
+				uni.redirectTo({
+					url: "/pages/pay/payment/payment?amount=" + this.recinfo.payPrice +
+						'&paytype=' + payTypes + '&orderId=' + this.recinfo.id + '&couponId=' + this.recinfo
+						.highChildOrderList[0].goodsId + '&typeaout=' + this.recinfo.highChildOrderList[0].ext1 +
+						'&goodsType=' + this.recinfo.highChildOrderList[0].goodsType
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.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;
+		}
+	}
+
+	.buy-list {
+		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: 20rpx 0;
+
+			.goods-info {
+				width: 100%;
+				display: flex;
+
+				.img {
+					width: 80px;
+					max-height: 80px;
+					border-radius: 10upx;
+					overflow: hidden;
+					flex-shrink: 0;
+					margin-right: 10upx;
+
+					image {
+						width: 80px;
+						max-height: 80px;
+					}
+				}
+
+				.info {
+					width: 100%;
+					height: 22vw;
+					overflow: hidden;
+					display: flex;
+					flex-wrap: wrap;
+					position: relative;
+
+					.title {
+						width: 100%;
+						font-size: 32upx;
+						display: -webkit-box;
+						-webkit-box-orient: vertical;
+						-webkit-line-clamp: 2;
+						// text-align: justify;
+						overflow: hidden;
+						max-height: 40px;
+					}
+
+					.spec {
+						font-size: 22upx;
+						color: #a7a7a7;
+						height: 40upx;
+						display: flex;
+						align-items: center;
+						padding: 0 15upx;
+						border-radius: 20upx;
+						margin-bottom: 10px;
+					}
+
+					.zspec {
+						font-size: 22upx;
+						background-color: red;
+						color: #FFFFFF;
+						height: 40upx;
+						line-height: 40rpx;
+						display: flex;
+						align-items: center;
+						padding: 0 15upx;
+						border-radius: 20upx;
+						margin-bottom: 10px;
+						margin-left: 10px;
+					}
+
+					.price-number {
+						position: absolute;
+						width: 100%;
+						bottom: 0upx;
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						font-size: 28upx;
+						height: 40upx;
+
+						.price {
+							color: #fe4343;
+						}
+
+						.number {
+							display: flex;
+							justify-content: center;
+							align-items: center;
+
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.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: 80rpx;
+			line-height: 80rpx;
+			border-bottom: 1px solid #f4f4f4;
+			display: flex;
+
+			.left {
+				font-size: 28upx;
+			}
+
+			.right {
+				margin-left: 40upx;
+				font-size: 26upx;
+				color: #999;
+
+				input {
+					font-size: 26upx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.blck {
+		width: 100%;
+		height: 100upx;
+	}
+
+	.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 {
+				color: #FE1A1A;
+				width: 50%;
+				font-size: 28upx;
+				margin-right: 10upx;
+				display: flex;
+				height: 26px;
+				line-height: 26px;
+				justify-content: flex-start;
+
+				.money {
+					font-size: 20px;
+					font-weight: 600;
+					display: flex;
+					align-items: center;
+				}
+			}
+
+			.btn {
+				padding: 0 20upx;
+				height: 70rpx;
+				width: 25%;
+				margin-left: 10px;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 30upx;
+				border-radius: 40upx;
+			}
+		}
+	}
+
+	.detail {
+		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 {
+			height: 60upx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.nominal {
+				font-size: 28upx;
+			}
+
+			.content {
+				font-size: 26upx;
+				color: #0083f5;
+			}
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/user/order_list/order_list.vue b/high-unionPay/pages/user/order_list/order_list.vue
index 3f7bdc4..c42cd1b 100644
--- a/high-unionPay/pages/user/order_list/order_list.vue
+++ b/high-unionPay/pages/user/order_list/order_list.vue
@@ -1,528 +1,547 @@
-<template>
-	<view>
-		<!-- 顶部导航 -->
-		<view class="topTabBar" :style="{position:headerPosition,top:headerTop}">
-			<view class="grid" v-for="(grid,tbIndex) in orderType" :key="tbIndex" @tap="showType(tbIndex)">
-				<view class="text" :class="[tbIndex==tabbarIndex?'on':'']">{{grid}}</view>
-			</view>
-		</view>
-		<!-- 考虑非APP端长列表和复杂的DOM使用scroll-view会卡顿，所以漂浮顶部选项卡使用page本身的滑动 -->
-		<view class="order-list">
-			<view class="list">
-				<view class="onorder" v-if="orderList.length==0">
-					<image :src="imagewxUrl+imgadres"></image>
-				</view>
-				<view class="row" v-for="(row,index) in orderList" :key="index">
-					<view class="width96 height40" @click="jumpDetails(row.id)">
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 1 || row.highChildOrderList[0].goodsType == 2">
-							<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>
-							团油订单
-						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 5">
-							<image src="../../../static/img/order5.png" style="width: 50rpx;height: 50rpx;"></image>
-							电影票
-						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 4">
-							<image src="../../../static/img/order3.png" style="width: 50rpx;height: 50rpx;"></image>
-							KFC
-						</view>
-						<view class="width50 flleft aliitem fotlt font16" v-if="row.highChildOrderList[0].goodsType == 6">
-							<image src="../../../static/img/order1.png" style="width: 50rpx;height: 50rpx;"></image>
-							话费充值
-						</view>
-						<view class="width50 flright fotrt fcor666 font15">
-							{{row.createTime | formatDate('-')}}
-						</view>
-					</view>
-					<view class="width96 line1 mart10"></view>
-
-					<view class="width96 height60 mart10" @click="jumpDetails(row.id)">
-						<view class="width70 flleft fotlt ">
-							<view class="font16 fontwig6 text1 fcor333">
-								{{row.highChildOrderList[0].goodsName}}
-							</view>
-							<view class="font15 text1 fcor999 mart5">
-								数量 : {{row.highChildOrderList[0].saleCount}}
-							</view>
-						</view>
-						<view class="width30 flright fotrt fcor666 font15 fotrt">
-							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3">
-								￥{{row.payPrice}}
-							</view>
-							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;" v-else>
-								<image style="width: 15px;height: 15px;"
-									src="../../../static/img/jfx.png">
-								</image>{{row.payPrice*100}}
-							</view>
-							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
-						</view>
-					</view>
-					<view class="width96 line1 mart10 marb5" v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)"></view>
-					<view class="btns"
-						v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
-						<block>
-							<view class="default" @tap="cancelOrder(row.id)">取消订单</view>
-							<view class="pay" @tap="toPayment(row)">付款</view>
-						</block>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	import {
-		getUserOrderList,
-		cancelOrder
-	} from '../../../Utils/Api.js';
-	let app = getApp()
-	export default {
-		data() {
-			return {
-				headerPosition: "fixed",
-				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'noorder.png',
-				imgadres1: 'dhf.png',
-				headerTop: "0px",
-				typeText: {
-					1: '等待付款',
-					2: '订单已支付',
-					3: '订单已完成',
-					4: '订单已退款',
-					5: '订单已取消',
-					6: '订单退款中',
-					7: '订单退款失败'
-				},
-				// 退换货
-				orderType: ['全部', '待支付', '已支付', '已完成', '已退款', '已取消'],
-				//订单列表 演示数据
-				orderList: [],
-				list: [],
-				tabbarIndex: 0,
-				pageNum: 1,
-				pageSize: 10,
-				isNoMoreData: false,
-				loadingText: '',
-				typeId: '',
-				imageUrl: app.globalData.imgUrl,
-				reFresh: ""
-			}
-		},
-
-		onLoad(option) {
-			// #ifdef H5
-			this.headerTop = '44px';
-			// #endif
-			let tbIndex = parseInt(option.tbIndex) + 1;
-			this.list = this.orderList[tbIndex];
-			this.tabbarIndex = tbIndex;
-			this.typeId = tbIndex;
-			this.getUserOrderList();
-		},
-		onPageScroll(e) {
-			return;
-			//兼容iOS端下拉时顶部漂移
-			this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
-		},
-		onReachBottom() {
-			this.getUserOrderList();
-		},
-		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}`;
-			}
-		},
-		watch: {
-			//监听reFresh,如果有修改就执行监听器
-			reFresh: function() {
-				this.tabbarIndex = 0;
-				this.typeId = '';
-				this.pageNum = 1;
-				this.orderList = []
-				this.isNoMoreData = false;
-				this.getUserOrderList();
-			}
-		},
-		methods: {
-			//查询订单列表
-			getUserOrderList() {
-				uni.showLoading({
-					title: '加载中...'
-				})
-				if (this.isNoMoreData) {
-					uni.hideLoading()
-					return false;
-				}
-				let statusId;
-				if (this.typeId == 2) {
-					statusId = '2,6,7';
-				} else {
-					statusId = this.typeId;
-				}
-
-				let pagenum = this.pageNum;
-				let params = {
-					status: statusId,
-					pageNum: this.pageNum,
-					pageSize: this.pageSize
-				}
-
-				getUserOrderList(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;
-						if (res.return_data.total == (this.pageNum * this.pageSize)) {
-							this.isNoMoreData = true;
-						}
-						this.orderList = this.orderList.concat(res.return_data.list);
-						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
-					} else {
-						this.orderList = [];
-						uni.hideLoading()
-					}
-				})
-
-
-			},
-			//跳转详情
-			jumpDetails(e) {
-				uni.navigateTo({
-					url: '../order_details/order_details?id=' + e
-				})
-			},
-			showType(tbIndex) {
-				this.tabbarIndex = tbIndex;
-				this.pageNum = 1;
-				this.orderList = []
-				this.isNoMoreData = false;
-				if (tbIndex == 0) {
-					this.typeId = '';
-				} else {
-					this.typeId = tbIndex;
-				}
-				this.getUserOrderList();
-			},
-			showLogistics(row) {
-
-			},
-			remindDeliver(row) {
-				uni.showToast({
-					title: '已提醒商家发货'
-				})
-			},
-			cancelOrder(row) {
-				let that = this;
-				uni.showModal({
-					title: '取消订单',
-					content: '确定取消此订单？',
-					success: (res) => {
-						if (res.confirm) {
-							uni.showLoading({
-								title: '加载中...'
-							})
-							let params = {
-								orderId: row,
-							}
-							cancelOrder(params).then(res => {
-								if (res.return_code == '000000') {
-									uni.hideLoading();
-									uni.showToast({
-										title: res.return_data,
-										icon: 'none',
-										duration: 2000
-									})
-									this.pageNum = 1;
-									this.orderList = []
-									this.isNoMoreData = false;
-									that.getUserOrderList();
-								} else {
-									uni.showToast({
-										title: res.return_msg,
-										icon: 'none',
-										duration: 2000
-									})
-									uni.hideLoading()
-								}
-							})
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
-			doCancelOrder(ordersn) {
-				let typeNum = this.orderList.length;
-				for (let i = 0; i < typeNum; i++) {
-					let list = this.orderList[i];
-					let orderNum = list.length;
-					if (orderNum > 0 && list[0].type == 'unpaid') {
-						for (let j = 0; j < orderNum; j++) {
-							if (this.orderList[i][j].ordersn == ordersn) {
-								this.orderList[i][j].type = 'cancelled';
-								break;
-							}
-						}
-					}
-
-				}
-			},
-			toPayment(row) {
-				let payTypes;
-				if (row.payType == 1 || row.payType == null) {
-					payTypes = 3;
-				} else if (row.payType == 2) {
-					payTypes = 1;
-				} else {
-					payTypes = 2;
-				}
-				uni.redirectTo({
-					url: "/pages/pay/payment/payment?amount=" + row.payPrice +
-						'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
-						.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
-						.ext1
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #f3f3f3;
-	}
-
-	.zspec {
-		font-size: 22rpx;
-		background-color: #0083f5;
-		color: #FFFFFF;
-		height: 40rpx;
-		display: -webkit-box;
-		display: -webkit-flex;
-		display: flex;
-		width: 44px;
-		-webkit-box-align: center;
-		-webkit-align-items: center;
-		align-items: center;
-		padding: 0 15rpx;
-		border-radius: 4px;
-		margin-bottom: 10px;
-		margin-left: 5px;
-	}
-
-
-	.loading-text {
-		width: 100%;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		height: 60upx;
-		color: #979797;
-		font-size: 24upx;
-	}
-
-	.topTabBar {
-		width: 100%;
-		position: fixed;
-		top: 0;
-		z-index: 10;
-		background-color: #f8f8f8;
-		height: 80upx;
-		display: flex;
-		justify-content: space-around;
-
-		.grid {
-			width: 20%;
-			height: 80upx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			color: #444;
-			font-size: 28upx;
-
-			.text {
-				height: 76upx;
-				display: flex;
-				align-items: center;
-
-				&.on {
-					color: #0083f5;
-					border-bottom: solid 4upx #0083f5;
-				}
-			}
-
-		}
-	}
-
-	.order-list {
-		margin-top: 80upx;
-		padding-top: 20upx;
-		width: 100%;
-
-		.list {
-			width: 94%;
-			margin: 0 auto;
-
-			.onorder {
-				width: 100%;
-				height: 50vw;
-				display: flex;
-				justify-content: center;
-				align-content: center;
-				flex-wrap: wrap;
-
-				image {
-					width: 70vw;
-					margin-top: 150px;
-				}
-
-				.text {
-					width: 100%;
-					height: 60upx;
-					font-size: 28upx;
-					color: #444;
-					display: flex;
-					justify-content: center;
-					align-items: center;
-				}
-			}
-
-			.row {
-				width: calc(100% - 40upx);
-				padding: 10upx 20upx;
-				border-radius: 10upx;
-				background-color: #fff;
-				margin-bottom: 20upx;
-
-				.type {
-					font-size: 26upx;
-					color: #0083f5;
-					height: 50upx;
-					display: flex;
-					align-items: center;
-				}
-
-				.order-info {
-					width: 100%;
-					display: flex;
-
-					.left {
-						flex-shrink: 0;
-						width: 25vw;
-						height: 25vw;
-
-						image {
-							width: 25vw;
-							height: 25vw;
-							border-radius: 10upx;
-						}
-					}
-
-					.right {
-						width: 100%;
-						margin-left: 10upx;
-						position: relative;
-
-						.name {
-							width: 100%;
-							font-size: 18px;
-							display: -webkit-box;
-							-webkit-box-orient: vertical;
-							-webkit-line-clamp: 2;
-							overflow: hidden;
-						}
-
-						.spec {
-							color: #a7a7a7;
-							font-size: 14px;
-						}
-
-						.price-number {
-							width: 100%;
-							font-size: 15px;
-							display: flex;
-
-							.price {
-								font-size: 14px;
-								margin-right: 5upx;
-							}
-
-						}
-					}
-				}
-
-				.detail {
-					display: flex;
-					justify-content: flex-end;
-					align-items: flex-end;
-					height: 60upx;
-					font-size: 26upx;
-
-					.sum {
-						padding: 0 8upx;
-						display: flex;
-						align-items: flex-end;
-
-						.price {
-							font-size: 30upx;
-						}
-					}
-
-				}
-
-				.btns {
-					height: 80upx;
-					display: flex;
-					align-items: center;
-					justify-content: flex-end;
-
-					view {
-						min-width: 120upx;
-						height: 70rpx;
-						padding: 0 20upx;
-						border-radius: 50upx;
-						display: flex;
-						justify-content: center;
-						align-items: center;
-						font-size: 28upx;
-						margin-left: 20upx;
-					}
-
-					.default {
-						border: solid 1upx #ccc;
-						color: #666;
-					}
-
-					.pay {
-						background-color: #0083f5;
-						color: #FFFFFF;
-					}
-				}
-			}
-		}
-	}
+<template>
+	<view>
+		<!-- 顶部导航 -->
+		<view class="topTabBar" :style="{position:headerPosition,top:headerTop}">
+			<view class="grid" v-for="(grid,tbIndex) in orderType" :key="tbIndex" @tap="showType(tbIndex)">
+				<view class="text" :class="[tbIndex==tabbarIndex?'on':'']">{{grid}}</view>
+			</view>
+		</view>
+		<!-- 考虑非APP端长列表和复杂的DOM使用scroll-view会卡顿，所以漂浮顶部选项卡使用page本身的滑动 -->
+		<view class="order-list">
+			<view class="list">
+				<view class="onorder" v-if="orderList.length==0">
+					<image :src="imagewxUrl+imgadres"></image>
+				</view>
+				<view class="row" v-for="(row,index) in orderList" :key="index">
+					<view class="width96 height40" @click="jumpDetails(row.id)">
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 1">
+							<image src="../../../static/img/order2.png" class="marglerig"
+								style="width: 50rpx;height: 50rpx;"></image>
+							卡券订单
+						</view>
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 2">
+							<image src="../../../static/img/order2.png" class="marglerig"
+								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" class="marglerig"
+								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" class="marglerig"
+								style="width: 50rpx;height: 50rpx;"></image>
+							团油订单
+						</view>
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 5">
+							<image src="../../../static/img/order5.png" class="marglerig"
+								style="width: 50rpx;height: 50rpx;"></image>
+							电影票
+						</view>
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 4">
+							<image src="../../../static/img/order3.png" class="marglerig"
+								style="width: 50rpx;height: 50rpx;"></image>
+							KFC
+						</view>
+						<view class="width50 flleft aliitem fotlt font16"
+							v-if="row.highChildOrderList[0].goodsType == 8">
+							<image src="../../../static/img/ghkpay.png" class="marglerig"
+								style="width: 50rpx;height: 50rpx;"></image>
+							工会卡充值
+						</view>
+						<view class="width50 flright fotrt fcor666 font15">
+							{{row.createTime | formatDate('-')}}
+						</view>
+					</view>
+					<view class="width96 line1 mart10"></view>
+
+					<view class="width96 height60 mart10" @click="jumpDetails(row.id)">
+						<view class="width70 flleft fotlt ">
+							<view class="font16 fontwig6 text1 fcor333">
+								{{row.highChildOrderList[0].goodsName}}
+							</view>
+							<view class="font15 text1 fcor999 mart5">
+								数量 : {{row.highChildOrderList[0].saleCount}}
+							</view>
+						</view>
+						<view class="width30 flright fotrt fcor666 font15 fotrt">
+							<view class="font16 fontwig6 text1 fcor333" v-if="row.payType != 3">
+								￥{{row.payPrice}}
+							</view>
+							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
+								v-else>
+								<image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
+								</image>{{row.payPrice * 10 * 10}}
+							</view>
+							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
+						</view>
+					</view>
+					<view class="width96 line1 mart10 marb5"
+						v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
+					</view>
+					<view class="btns"
+						v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
+						<block>
+							<view class="default" @tap="cancelOrder(row.id)">取消订单</view>
+							<view class="pay" @tap="toPayment(row)">付款</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		getUserOrderList,
+		cancelOrder
+	} from '../../../Utils/Api.js';
+	let app = getApp()
+	export default {
+		data() {
+			return {
+				headerPosition: "fixed",
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres: 'noorder.png',
+				imgadres1: 'dhf.png',
+				headerTop: "0px",
+				typeText: {
+					1: '等待付款',
+					2: '订单已支付',
+					3: '订单已完成',
+					4: '订单已退款',
+					5: '订单已取消',
+					6: '订单退款中',
+					7: '订单退款失败'
+				},
+				// 退换货
+				orderType: ['全部', '待支付', '已支付', '已完成', '已退款', '已取消'],
+				//订单列表 演示数据
+				orderList: [],
+				list: [],
+				tabbarIndex: 0,
+				pageNum: 1,
+				pageSize: 10,
+				isNoMoreData: false,
+				loadingText: '',
+				typeId: '',
+				imageUrl: app.globalData.imgUrl,
+				reFresh: ""
+			}
+		},
+
+		onLoad(option) {
+			// #ifdef H5
+			this.headerTop = '0px';
+			// #endif
+			let tbIndex = parseInt(option.tbIndex) + 1;
+			this.list = this.orderList[tbIndex];
+			this.tabbarIndex = tbIndex;
+			this.typeId = tbIndex;
+			this.getUserOrderList();
+		},
+		onPageScroll(e) {
+			return;
+			//兼容iOS端下拉时顶部漂移
+			this.headerPosition = e.scrollTop >= 0 ? "fixed" : "absolute";
+		},
+		onReachBottom() {
+			this.getUserOrderList();
+		},
+		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}`;
+			}
+		},
+		watch: {
+			//监听reFresh,如果有修改就执行监听器
+			reFresh: function() {
+				this.tabbarIndex = 0;
+				this.typeId = '';
+				this.pageNum = 1;
+				this.orderList = []
+				this.isNoMoreData = false;
+				this.getUserOrderList();
+			}
+		},
+		methods: {
+			//查询订单列表
+			getUserOrderList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return false;
+				}
+				let statusId;
+				if (this.typeId == 2) {
+					statusId = '2,6,7';
+				} else {
+					statusId = this.typeId;
+				}
+
+				let pagenum = this.pageNum;
+				let params = {
+					status: statusId,
+					pageNum: this.pageNum,
+					pageSize: this.pageSize
+				}
+
+				getUserOrderList(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;
+						if (res.return_data.total == (this.pageNum * this.pageSize)) {
+							this.isNoMoreData = true;
+						}
+						this.orderList = this.orderList.concat(res.return_data.list);
+						this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.orderList = [];
+						uni.hideLoading()
+					}
+				})
+
+
+			},
+			//跳转详情
+			jumpDetails(e) {
+				uni.navigateTo({
+					url: '../order_details/order_details?id=' + e
+				})
+			},
+			showType(tbIndex) {
+				this.tabbarIndex = tbIndex;
+				this.pageNum = 1;
+				this.orderList = []
+				this.isNoMoreData = false;
+				if (tbIndex == 0) {
+					this.typeId = '';
+				} else {
+					this.typeId = tbIndex;
+				}
+				this.getUserOrderList();
+			},
+			showLogistics(row) {
+
+			},
+			remindDeliver(row) {
+				uni.showToast({
+					title: '已提醒商家发货'
+				})
+			},
+			cancelOrder(row) {
+				let that = this;
+				uni.showModal({
+					title: '取消订单',
+					content: '确定取消此订单？',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '加载中...'
+							})
+							let params = {
+								orderId: row,
+							}
+							cancelOrder(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.hideLoading();
+									uni.showToast({
+										title: res.return_data,
+										icon: 'none',
+										duration: 2000
+									})
+									this.pageNum = 1;
+									this.orderList = []
+									this.isNoMoreData = false;
+									that.getUserOrderList();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+									uni.hideLoading()
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			doCancelOrder(ordersn) {
+				let typeNum = this.orderList.length;
+				for (let i = 0; i < typeNum; i++) {
+					let list = this.orderList[i];
+					let orderNum = list.length;
+					if (orderNum > 0 && list[0].type == 'unpaid') {
+						for (let j = 0; j < orderNum; j++) {
+							if (this.orderList[i][j].ordersn == ordersn) {
+								this.orderList[i][j].type = 'cancelled';
+								break;
+							}
+						}
+					}
+
+				}
+			},
+			toPayment(row) {
+				let payTypes;
+				if (row.payType == 1 || row.payType == null) {
+					payTypes = 3;
+				} else if (row.payType == 2) {
+					payTypes = 1;
+				} else {
+					payTypes = 2;
+				}
+				uni.redirectTo({
+					url: "/pages/pay/payment/payment?amount=" + row.payPrice +
+						'&paytype=' + payTypes + '&orderId=' + row.id + '&couponId=' + this.orderList[0]
+						.highChildOrderList[0].goodsId + '&typeaout=' + this.orderList[0].highChildOrderList[0]
+						.ext1 + '&goodsType=' + row.highChildOrderList[0].goodsType
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f3f3f3;
+	}
+
+	.zspec {
+		font-size: 22rpx;
+		background-color: #0083f5;
+		color: #FFFFFF;
+		height: 40rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		width: 44px;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		align-items: center;
+		padding: 0 15rpx;
+		border-radius: 4px;
+		margin-bottom: 10px;
+		margin-left: 5px;
+	}
+
+
+	.loading-text {
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 60upx;
+		color: #979797;
+		font-size: 24upx;
+	}
+
+	.topTabBar {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		z-index: 10;
+		background-color: #f8f8f8;
+		height: 80upx;
+		display: flex;
+		justify-content: space-around;
+
+		.grid {
+			width: 20%;
+			height: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #444;
+			font-size: 28upx;
+
+			.text {
+				height: 76upx;
+				display: flex;
+				align-items: center;
+
+				&.on {
+					color: #0083f5;
+					border-bottom: solid 4upx #0083f5;
+				}
+			}
+
+		}
+	}
+
+	.order-list {
+		margin-top: 80upx;
+		padding-top: 20upx;
+		width: 100%;
+
+		.list {
+			width: 94%;
+			margin: 0 auto;
+
+			.onorder {
+				width: 100%;
+				height: 50vw;
+				display: flex;
+				justify-content: center;
+				align-content: center;
+				flex-wrap: wrap;
+
+				image {
+					width: 70vw;
+					margin-top: 150px;
+				}
+
+				.text {
+					width: 100%;
+					height: 60upx;
+					font-size: 28upx;
+					color: #444;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+
+			.row {
+				width: calc(100% - 40upx);
+				padding: 10upx 20upx;
+				border-radius: 10upx;
+				background-color: #fff;
+				margin-bottom: 20upx;
+
+				.type {
+					font-size: 26upx;
+					color: #0083f5;
+					height: 50upx;
+					display: flex;
+					align-items: center;
+				}
+
+				.order-info {
+					width: 100%;
+					display: flex;
+
+					.left {
+						flex-shrink: 0;
+						width: 25vw;
+						height: 25vw;
+
+						image {
+							width: 25vw;
+							height: 25vw;
+							border-radius: 10upx;
+						}
+					}
+
+					.right {
+						width: 100%;
+						margin-left: 10upx;
+						position: relative;
+
+						.name {
+							width: 100%;
+							font-size: 18px;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+						}
+
+						.spec {
+							color: #a7a7a7;
+							font-size: 14px;
+						}
+
+						.price-number {
+							width: 100%;
+							font-size: 15px;
+							display: flex;
+
+							.price {
+								font-size: 14px;
+								margin-right: 5upx;
+							}
+
+						}
+					}
+				}
+
+				.detail {
+					display: flex;
+					justify-content: flex-end;
+					align-items: flex-end;
+					height: 60upx;
+					font-size: 26upx;
+
+					.sum {
+						padding: 0 8upx;
+						display: flex;
+						align-items: flex-end;
+
+						.price {
+							font-size: 30upx;
+						}
+					}
+
+				}
+
+				.btns {
+					height: 80upx;
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+
+					view {
+						min-width: 120upx;
+						height: 70rpx;
+						padding: 0 20upx;
+						border-radius: 50upx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						font-size: 28upx;
+						margin-left: 20upx;
+					}
+
+					.default {
+						border: solid 1upx #ccc;
+						color: #666;
+					}
+
+					.pay {
+						background-color: #0083f5;
+						color: #FFFFFF;
+					}
+				}
+			}
+		}
+	}
 </style>
diff --git a/high-unionPay/pages/userLogin/userLogin.vue b/high-unionPay/pages/userLogin/userLogin.vue
index 7037b26..9c2e5a0 100644
--- a/high-unionPay/pages/userLogin/userLogin.vue
+++ b/high-unionPay/pages/userLogin/userLogin.vue
@@ -18,7 +18,6 @@
 <script>
 	const app = getApp();
 	import {
-		getUserInfo,
 		GetPhoneNumber,
 		unionPhoneLogin
 	} from "../../Utils/Api.js"
@@ -44,53 +43,6 @@
 					this.unionPhoneLogin(result.code)
 				}
 			},
-			getuserinfo() {
-				let that = this;
-				uni.getUserProfile({
-					desc: '登录中...',
-					success: function(res) {
-						let params = {
-							openId: app.globalData.openId,
-							iv: res.iv,
-							encryptedData: res.encryptedData
-						}
-						getUserInfo(params).then(res => {
-							if (res.return_code == '000000') {
-								app.globalData.userInfo = res.return_data
-									.object
-									.highUser;
-								that.user = res.return_data.object.highUser;
-								app.globalData.token = res.return_data.uniqueCode;
-								that.isShowAuth = false
-								uni.setStorage({
-									key: "user",
-									data: res.return_data
-										.object
-										.highUser
-								})
-								uni.setStorage({
-									key: "token",
-									data: res.return_data.uniqueCode
-								})
-								if (res.return_data.object.highUser.phone) {
-									uni.navigateBack({})
-								}
-							} else {
-								uni.showToast({
-									title: res.return_msg
-								})
-							}
-						});
-					},
-					fail: res => {
-						uni.showToast({
-							title: "微信登录授权失败",
-							icon: "none"
-						});
-					}
-				})
-				that.isShowAuth = false
-			},
 			// 微信获取手机号
 			unionPhoneLogin(item) {
 				let params = {
diff --git a/high-unionPay/static/css/login.scss b/high-unionPay/static/css/login.scss
index 6db107f..f56c1f2 100644
--- a/high-unionPay/static/css/login.scss
+++ b/high-unionPay/static/css/login.scss
@@ -57,7 +57,7 @@ page {
 		background-color: #0083f5;
 		width: 90%;
 		margin-left: 5%;
-		margin-top: 100rpx;
+		margin-top: 80rpx;
 		margin-bottom: 50rpx;
 		height: 90rpx;
 	    display: flex;
diff --git a/high-unionPay/static/img/ghkpay.png b/high-unionPay/static/img/ghkpay.png
index 76f4606..7455380 100644
Binary files a/high-unionPay/static/img/ghkpay.png and b/high-unionPay/static/img/ghkpay.png differ
diff --git a/high-unionPay/subPages/cardsDetails/cardsDetails.vue b/high-unionPay/subPages/cardsDetails/cardsDetails.vue
new file mode 100644
index 0000000..8650ba3
--- /dev/null
+++ b/high-unionPay/subPages/cardsDetails/cardsDetails.vue
@@ -0,0 +1,407 @@
+<template>
+	<view>
+		<view class="backcorf06 height220 width100 fotct">
+			<image src="../static/unioncard.png" v-if="types == 1" mode="widthFix" style="width: 120rpx;"></image>
+			<image src="../static/oilcard.png" v-if="types == 2" mode="widthFix" style="width: 120rpx;"></image>
+			<view class="mart10 font18 fontwig6 fcorfff" v-if="types == 1">工会卡</view>
+			<view class="mart10 font18 fontwig6 fcorfff" v-if="types == 2">油卡
+				<text class="fcor41c font14 margle" v-if="cardList.status == 1">(正常)</text>
+				<text class="fcorred font14 margle" v-if="cardList.status == 2">(禁用)</text>
+			</view>
+			<view class="mart5 font18 fontwig6 fcorfff fontspec">余额: {{tongCardPrice}}</view>
+			<view class="mart5 font18 fontwig6 fcorfff fontspec">{{cardNo}}</view>
+			<view class="width40w height30 font16 fontlet fcorfff mart10 fotct border-r"
+				style="background-color: #b2b2b2;" @click="delUserCard()">解绑</view>
+		</view>
+		<!-- <view class="width90 mart20 fcor666 font12">
+			支付限额
+		</view>
+		<view class="width90 mart20 fcor666 font14 height25">
+			<view class="width50 font14 fcor333 flleft">单笔限额</view>
+			<view class="width50 font14 fcor666 flright fotrt">¥20000</view>
+		</view>
+		<view class="width90 mart20 fcor666 font14 mart5 height25">
+			<view class="width50 font14 fcor333 flleft">每日限额</view>
+			<view class="width50 font14 fcor666 flright fotrt">¥50000</view>
+		</view> -->
+
+		<view class="leave_cont">
+			<view class="ul">
+				<view class="li" v-if="types == 1">
+					<text class="font15 fcor333">业务类型</text>
+					<view class="flex1">
+						<picker mode="selector" :range="title_list" range-key="name" @change="bindtitleList">
+							<view class="date text1 margle10">{{titleName}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="li">
+					<text class="font15 fcor333">开始时间</text>
+					<view class="flex1">
+						<picker mode="date" :value="start_date" :start="startDate" :end="endDate"
+							@change="bindDateChange">
+							<view class="date">{{start_date}}</view>
+						</picker>
+					</view>
+				</view>
+				<view class="li">
+					<text class="font15 fcor333">结束时间</text>
+					<view class="flex1">
+						<picker mode="date" :value="end_date" :start="startDate" :end="endDate"
+							@change="bindDateChange2">
+							<view class="date">{{end_date}}</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="width90 mart30 fcor666 font12">
+			订单列表
+		</view>
+		<view class="width90 mart20 alijusstart fcor666 font12">
+			<view class="width40">订单号</view>
+			<view class="width10 fotct">类型</view>
+			<view class="width20 fotct">金额</view>
+			<view class="width30">时间</view>
+		</view>
+		<view class="width100" v-if="types == 1">
+			<view class="width90 mart5 alijusstart fcor666 font12" v-for="(item,index) in orderList" :key="index"
+				@click="popupOrderNo(item.orderNo)">
+				<view class="width40 fcor333 text1">{{item.orderNo}}</view>
+				<view class="width10 fotct">支出</view>
+				<view class="width20 fotct">¥{{item.tranAmount}}</view>
+				<view class="width30">{{item.tranTime}}</view>
+				<!-- {{phoneorderdes.createTimed | timeFormat('yyyy-mm-dd')}} {{phoneorderdes.createTimed | timeFormat('hh:mm')}} -->
+			</view>
+		</view>
+
+		<view class="width100" v-if="types == 2">
+			<view class="width90 mart5 alijusstart fcor666 font12" v-for="(item,index) in orderList" :key="index"
+				@click="popupOrderNo(item.sourceOrderNo)">
+				<view class="width40 fcor333 text1">{{item.sourceOrderNo}}</view>
+				<view class="width10 fotct fcor41c" v-if="item.type == 1">收入</view>
+				<view class="width10 fotct fcoreb5" v-if="item.type == 2">支出</view>
+				<view class="width20 fotct fcor41c" v-if="item.type == 1">+{{item.amount}}</view>
+				<view class="width20 fotct fcoreb5" v-if="item.type == 2">-{{item.amount}}</view>
+				<view class="width30">
+					<view class="width100">{{item.createTime | timeFormat('yyyy-mm-dd')}}</view>
+					<view class="width100">{{item.createTime | timeFormat('hh:mm')}}</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		delUserCard,
+		getDetailByCardNo,
+		getHuiLianTongCardBalance,
+		getOilCardRecordList,
+		getHuiLianTongCardConsume
+	} from '../../Utils/Api.js';
+	export default {
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				types: '', //卡类型
+				orderList: [], //消费列表
+				cardNo: '', //卡号
+				tongCardPrice: 0, //账户余额 
+				start_date: currentDate, //开始时间
+				end_date: currentDate, //结束时间
+				pageNum: 1,
+				pageSize: 10,
+				titleValue: 'sinopec_oil_code', //工会卡
+				titleName: '中石化加油券',
+				title_list: [{
+						name: '中石化加油券',
+						value: 'sinopec_oil_code'
+					},
+					{
+						name: '其他商品或服务',
+						value: 'hisen_consume'
+					}
+				],
+				isNoMoreData: false,
+				cardList: ''
+			}
+		},
+
+		onLoad(options) {
+			let that = this;
+			that.cardNo = options.cardNo;
+			that.types = options.des;
+			if (options.des == 1) {
+				that.getHuiLianTongCardBalance();
+				that.getHuiLianTongCardConsume();
+			}
+			if (options.des == 2) {
+				that.getDetailByCardNo();
+				that.getOilCardRecordList();
+			}
+		},
+		//上滑刷新
+		onReachBottom() {
+			if (this.types == 1) {
+				this.getHuiLianTongCardConsume();
+			}
+			if (this.types == 2) {
+				this.getOilCardRecordList();
+			}
+		},
+		computed: {
+			startDate() {
+				return this.getDate('start');
+			},
+			endDate() {
+				return this.getDate('end');
+			}
+		},
+		methods: {
+			// 获取当前时间
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+			//弹出二维码
+			popupOrderNo(item) {
+				uni.showToast({
+					title: item,
+					icon: 'none',
+					duration: 2000
+				})
+			},
+			// 选择日期
+			bindDateChange: function(e) {
+				this.start_date = e.target.value;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.orderList = [];
+				if (this.types == 1) {
+					this.getHuiLianTongCardConsume();
+				}
+				if (this.types == 2) {
+					this.getOilCardRecordList();
+				}
+			},
+			bindDateChange2: function(e) {
+				this.end_date = e.target.value;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.orderList = [];
+				if (this.types == 1) {
+					this.getHuiLianTongCardConsume();
+				}
+				if (this.types == 2) {
+					this.getOilCardRecordList();
+				}
+			},
+			//选择类型
+			bindtitleList(e) {
+				this.titleName = this.title_list[e.target.value].name;
+				this.titleValue = this.title_list[e.target.value].value;
+				this.pageNum = 1;
+				this.isNoMoreData = false;
+				this.orderList = [];
+				this.getHuiLianTongCardConsume();
+			},
+			//解除绑定我的卡号列表
+			delUserCard() {
+				let that = this;
+				uni.showModal({
+					content: '是否确定解除当前绑定卡号?',
+					success: (res) => {
+						if (res.confirm) {
+							let params = {
+								cardNo: that.cardNo
+							}
+							delUserCard(params).then(res => {
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '解除成功',
+										duration: 2000,
+										icon: 'success',
+										success() {
+											setTimeout(() => {
+												uni.navigateBack({})
+											}, 1000)
+										}
+									})
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										duration: 2000,
+										icon: 'none'
+									})
+								}
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//查询油卡
+			getDetailByCardNo() {
+				uni.showLoading({
+					title: '查询中...'
+				})
+				let params = {
+					cardNo: this.cardNo
+				}
+				getDetailByCardNo(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.tongCardPrice = res.return_data.amount;
+						this.cardList = res.return_data;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				})
+			},
+			//查询详情
+			getHuiLianTongCardBalance() {
+				uni.showLoading({
+					title: '查询中...'
+				})
+				let params = {
+					cardNo: this.cardNo
+				}
+				getHuiLianTongCardBalance(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.tongCardPrice = res.return_data.balance;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							icon: "none"
+						});
+					}
+				});
+			},
+			//查询油卡列表
+			getOilCardRecordList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					uni.hideLoading()
+					return;
+				}
+				let pagenum = this.pageNum;
+				let Time1 = new Date(this.start_date.split('-').join('/'));
+				let timestemp1 = Time1.getTime();
+				let Time2 = new Date(this.end_date.split('-').join('/'));
+				let timestemp2 = Time2.getTime() + 86399000;
+				let params = {
+					pageNum: pagenum,
+					createTimeS: timestemp1,
+					createTimeE: timestemp2,
+					cardNo: this.cardNo,
+					pageSize: this.pageSize
+				}
+				getOilCardRecordList(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.orderList = this.orderList.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.orderList = [];
+						uni.hideLoading()
+					}
+				})
+			},
+			//查询消费记录
+			getHuiLianTongCardConsume() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				if (this.isNoMoreData) {
+					return false;
+				}
+				let pagenum = this.pageNum;
+				let Time1 = new Date(this.start_date.split('-').join('/'));
+				let timestemp1 = Time1.getTime();
+				let Time2 = new Date(this.end_date.split('-').join('/'));
+				let timestemp2 = Time2.getTime() + 86399000;
+				let params = {
+					businessType: this.titleValue,
+					sdate: timestemp1,
+					edate: timestemp2,
+					cardNo: this.cardNo,
+					pageNum: pagenum,
+					pageSize: this.pageSize
+				}
+				getHuiLianTongCardConsume(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data.records != '') {
+						this.isNoMoreData = res.return_data.records.length == this.pageSize ? false : true;
+						this.orderList = this.orderList.concat(res.return_data.records);
+						this.pageNum = res.return_data.records.length == this.pageSize ? ++pagenum : pagenum;
+					} else {
+						this.orderList = [];
+						uni.hideLoading();
+						uni.showToast({
+							title: res.return_msg,
+							icon: 'none',
+							duration: 2000
+						})
+						this.isNoMoreData = true;
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.leave_cont {
+		background: #FFFFFF;
+	}
+
+	.leave_cont .ul {
+		width: 90%;
+		margin-left: 5%;
+	}
+
+	.leave_cont .ul .li {
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #efefef;
+	}
+
+	.leave_cont .ul .li text {
+		padding: 40rpx 0;
+	}
+
+	.leave_cont .ul .li .flex1 {
+		flex: 1;
+		text-align: right;
+		width: 70%;
+		padding-right: 25rpx;
+		color: #999999;
+		font-size: 32rpx;
+	}
+</style>
diff --git a/high-unionPay/subPages/cardsList/cardsList.vue b/high-unionPay/subPages/cardsList/cardsList.vue
new file mode 100644
index 0000000..1242ee0
--- /dev/null
+++ b/high-unionPay/subPages/cardsList/cardsList.vue
@@ -0,0 +1,100 @@
+<template>
+	<view>
+		<view class="width100 mart20" v-for="(item,index) in cardList" :key="index">
+			<view class="width90 conts backcolorb9" v-if="item.type == 1">
+				<view class="width90 alijusstart">
+					<image src="../static/unioncard.png" mode="widthFix" style="width: 80rpx;"></image>
+					<text class="font18 fontwig6 fcorfff">工会卡</text>
+				</view>
+				<view class="width90 font18 fontwig6 fcorfff">
+					卡号:<text class="margle">{{item.cardNo}}</text>
+				</view>
+				<!-- <view class="width90 font18 fontwig6 fcorfff">
+					余额:<text class="margle">122</text>
+				</view> -->
+				<view class="width90 mart10 alijusstart font14">
+					<view class="width30 height30 backcorfff colorb9  fotct border-r"
+						@click="jumpDetails(item.cardNo,item.type)">查看详情</view>
+				</view>
+			</view>
+			<view class="width90 conts backcolor32" v-if="item.type == 2">
+				<view class="width90 alijusstart">
+					<image src="../static/oilcard.png" mode="widthFix" style="width: 80rpx;"></image>
+					<text class="font18 fontwig6 fcorfff">油卡</text>
+				</view>
+				<view class="width90 font18 fontwig6 fcorfff">
+					卡号:<text class="margle">{{item.cardNo}}</text>
+				</view>
+				<!-- <view class="width90 font18 fontwig6 fcorfff">
+					余额:<text class="margle">122</text>
+				</view> -->
+				<view class="width90 mart10 alijusstart font14">
+					<view class="width30 height30 backcorfff color32 fotct border-r"
+						@click="jumpDetails(item.cardNo,item.type)">查看详情</view>
+				</view>
+			</view>
+		</view>
+		<view class="width90 height70w border-r mart20 alijusstart backcorfff" @click="jumpBindCard()">
+			<image src="../static/addcards.png" mode="widthFix" class="margle10" style="width: 40rpx;"></image>
+			<text class="margle font16 fcor333">添加新卡</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getUserCardList
+	} from '../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				cardList: [] //绑定卡列表
+			}
+		},
+		onLoad() {
+			this.user = app.globalData.userInfo;
+		},
+		onShow() {
+			this.getUserCardList();
+		},
+		methods: {
+			//查询卡列表
+			getUserCardList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				getUserCardList().then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.cardList = res.return_data;
+						return;
+					}
+				});
+			},
+			//跳转详情
+			jumpDetails(item, item1) {
+				uni.navigateTo({
+					url: '../cardsDetails/cardsDetails?cardNo=' + item + '&des=' + item1
+				})
+			},
+			//跳转绑定卡
+			jumpBindCard() {
+				uni.navigateTo({
+					url: '../../pages/user/bindingCard/bindingCard'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f8f8f8;
+	}
+
+	.conts {
+		border-radius: 12rpx;
+		padding: 12px 0;
+	}
+</style>
diff --git a/high-unionPay/subPages/static/addcards.png b/high-unionPay/subPages/static/addcards.png
new file mode 100644
index 0000000..3f06686
Binary files /dev/null and b/high-unionPay/subPages/static/addcards.png differ
diff --git a/high-unionPay/subPages/static/oilcard.png b/high-unionPay/subPages/static/oilcard.png
new file mode 100644
index 0000000..f2520a4
Binary files /dev/null and b/high-unionPay/subPages/static/oilcard.png differ
diff --git a/high-unionPay/subPages/static/unioncard.png b/high-unionPay/subPages/static/unioncard.png
new file mode 100644
index 0000000..cbcc5fd
Binary files /dev/null and b/high-unionPay/subPages/static/unioncard.png differ
diff --git a/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue b/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
index aec9d4f..382d55c 100644
--- a/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
+++ b/high-unionPay/subPages/unionPay-orderList/unionPay-orderList.vue
@@ -88,7 +88,7 @@
 
 		onLoad(option) {
 			// #ifdef H5
-			this.headerTop = '44px';
+			this.headerTop = '0px';
 			// #endif
 			let tbIndex = parseInt(option.tbIndex) + 1;
 			this.list = this.orderList[tbIndex];
diff --git a/high-unionPay/uni.scss b/high-unionPay/uni.scss
index 95267f2..15cafa3 100644
--- a/high-unionPay/uni.scss
+++ b/high-unionPay/uni.scss
@@ -225,11 +225,26 @@ $uni-font-size-paragraph:30upx;
 	color: #41cda2;
 }
 
+.colorb9 {
+	color: #b95859;
+}
+
+.color32 {
+	color: #32649d;
+}
+
 /* 背景颜色 */
 .backcor9 {
   background-color: #f6f6f6;
 }
 
+.backcolorb9 {
+	background-color: #b85958;
+}
+
+.backcolor32 {
+	background-color: #32649d;
+}
 //渐变
 .backcorlr{
 	background: linear-gradient(to right, #fe1a1a, #ff722e);
@@ -318,6 +333,11 @@ $uni-font-size-paragraph:30upx;
   margin-left: 20%;
 }
 
+.width40w {
+  width: 40%;
+  margin-left: 30%;
+}
+
 .width35 {
   width: 35%;
 }
@@ -372,6 +392,14 @@ $uni-font-size-paragraph:30upx;
   height: 100%;
 }
 
+.height70w {
+  height: 70px;
+  line-height: 70px;
+}
+
+.height220{
+	height: 220px;
+}
 
 .height10 {
   height: 10px;
@@ -659,6 +687,12 @@ $uni-font-size-paragraph:30upx;
 	display: flex;
 }
 
+.alijusstart{
+	justify-content: flex-start;
+	align-items: center;
+	display: flex;
+}
+
 .font12{
 	font-size: 12px;
 }