diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js
index d84af82..82095a5 100644
--- a/high-unionPay/Utils/Api.js
+++ b/high-unionPay/Utils/Api.js
@@ -14,6 +14,10 @@ export const HandleCode = params => {
export const GetPhoneNumber = params => {
return POST('GET', `${base}/wechat/getPhoneNumber`, params).then(res => res.data);
};
+//银联手机号登录
+export const unionPhoneLogin = params => {
+ return POST('GET', `${base}/user/unionPhoneLogin`, params).then(res => res.data);
+};
//获取用户授权信息
export const getUserInfo = params => {
return POST('GET', `${base}/wechat/getUserInfo`, params).then(res => res.data);
@@ -181,7 +185,10 @@ export const orderToUnionPayphone = params => {
export const paygetOrderById = params => {
return POST('GET', `${base}/outRechargeOrder/getOrderById`, params).then(res => res.data);
}
-
+//获取设置用户参数
+export const getUserParam = params => {
+ return POST('GET', `${base}/highUser/getUserParam`, params).then(res => res.data);
+}
/**
* 工会卡
*/
diff --git a/high-unionPay/pages/goods/coupon-details/coupon-details.vue b/high-unionPay/pages/goods/coupon-details/coupon-details.vue
index 0085a7f..b4bb224 100644
--- a/high-unionPay/pages/goods/coupon-details/coupon-details.vue
+++ b/high-unionPay/pages/goods/coupon-details/coupon-details.vue
@@ -49,9 +49,15 @@
-->
+ v-if="couponDesInfo.couponInfo.reserveStatus && couponDesInfo.highUserCoupon.status != 0">
+ 预约订单已成功 门店会在24小时内联系您
+
请出示核销码(商户扫客户)
-
+
+ 请告知加油员用码商支付
+
{{couponDesInfo.couponCodeInfo.codeKey}}
diff --git a/high-unionPay/pages/goods/externalCoupon/externalCoupon.vue b/high-unionPay/pages/goods/externalCoupon/externalCoupon.vue
index 1fab82c..01b1913 100644
--- a/high-unionPay/pages/goods/externalCoupon/externalCoupon.vue
+++ b/high-unionPay/pages/goods/externalCoupon/externalCoupon.vue
@@ -14,7 +14,7 @@
-
去使用
@@ -62,7 +62,8 @@
getDiscountByQrCode,
receiveDiscount,
HandleCode,
- getUserInfo
+ getUserInfo,
+ loginByPhone
} from '../../../Utils/Api.js';
// import authorize from '../../../components/Authorize';
let app = getApp();
@@ -124,9 +125,9 @@
})
}
})
- var arr1 = decodeURIComponent(options.q);
- var arr2 = arr1.split('=');
- this.codes = arr2[2];
+ // var arr1 = decodeURIComponent(options.q);
+ // var arr2 = arr1.split('=');
+ this.codes = options.id;
this.getDiscountByQrCode();
},
@@ -249,6 +250,47 @@
// })
},
+ // 微信获取手机号
+ loginByPhone(PhoneNumber) {
+ if(PhoneNumber.detail.iv == undefined){
+ uni.showToast({
+ title: "用户取消授权",
+ icon: "none"
+ });
+ return;
+ }
+ let params = {
+ openId: app.globalData.openId,
+ iv: PhoneNumber.detail.iv,
+ encryptedData: PhoneNumber.detail.encryptedData
+ }
+ loginByPhone(params).then(res => {
+ if (res.return_code == '000000') {
+ uni.showToast({
+ title: '手机号授权成功',
+ icon: 'none',
+ duration: 2000
+ })
+ this.user = res.return_data.object.highUser;
+ app.globalData.token = res.return_data.uniqueCode;
+ app.globalData.userInfo = res.return_data
+ .object
+ .highUser;
+ uni.setStorage({
+ key: "user",
+ data: res.return_data
+ .object
+ .highUser
+ })
+ uni.setStorage({
+ key: "token",
+ data: res.return_data.uniqueCode
+ })
+ this.receiveDiscount();
+ this.userInfo = 2;
+ }
+ });
+ },
//商品跳转
toGoods(e) {
if (app.globalData.userInfo) {
diff --git a/high-unionPay/pages/pay/success/success.vue b/high-unionPay/pages/pay/success/success.vue
index cca6639..08de13e 100644
--- a/high-unionPay/pages/pay/success/success.vue
+++ b/high-unionPay/pages/pay/success/success.vue
@@ -37,8 +37,15 @@
- 请出示核销码(商户扫客户)
- 请告知加油员用码商支付
+
+ 预约订单已成功 门店会在24小时内联系您
+
+ 请出示核销码(商户扫客户)
+
+ 请告知加油员用码商支付
diff --git a/high-unionPay/pages/unionPay/unionPay-entrance/unionPay-entrance.vue b/high-unionPay/pages/unionPay/unionPay-entrance/unionPay-entrance.vue
index a78f57b..b6999fd 100644
--- a/high-unionPay/pages/unionPay/unionPay-entrance/unionPay-entrance.vue
+++ b/high-unionPay/pages/unionPay/unionPay-entrance/unionPay-entrance.vue
@@ -12,24 +12,25 @@