diff --git a/high-unionPay/Utils/Api.js b/high-unionPay/Utils/Api.js index 449a204..4098e6c 100644 --- a/high-unionPay/Utils/Api.js +++ b/high-unionPay/Utils/Api.js @@ -349,6 +349,11 @@ export const listByStoreCode = params => { return POST('GET', `${base}/highThirdParty/listByStoreCode`, params).then(res => res.data); } +//肯德基订单详情 +export const getThirdOrderByOrderNo = params => { + return POST('GET', `${base}/highThirdParty/getThirdOrderByOrderNo`, params).then(res => res.data); +} + //肯德基银联支付 export const qianzhuorderToUnionPay = params => { return POST('POST', `${base}/thirdOrder/orderToUnionPay`, params).then(res => res.data); diff --git a/high-unionPay/pages/goods/refuel-details/refuel-details.vue b/high-unionPay/pages/goods/refuel-details/refuel-details.vue index b269b4a..72a7933 100644 --- a/high-unionPay/pages/goods/refuel-details/refuel-details.vue +++ b/high-unionPay/pages/goods/refuel-details/refuel-details.vue @@ -544,7 +544,7 @@ "gasimg": this.storeList.gasLogoSmall, "gasname": this.storeList.gasName, "gasaddress": this.storeList.gasAddress, - "childOrderList": [{ + "highChildOrderList": [{ "goodsType": 3, "goodsId": this.counId, "saleCount": 1, diff --git a/high-unionPay/pages/unionPay/recharge/recharge.vue b/high-unionPay/pages/unionPay/recharge/recharge.vue index 6cde219..48c0995 100644 --- a/high-unionPay/pages/unionPay/recharge/recharge.vue +++ b/high-unionPay/pages/unionPay/recharge/recharge.vue @@ -49,7 +49,7 @@ getCmsContent(params).then(res => { if (res.return_code == '000000' && res.return_data != '') { //弹窗首页广告 - this.imgadres1 = res.return_data[0].imgData; + this.imgadres1 = res.return_data.childCategory[0].imgData; this.showPopup(); } }); diff --git a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue index 2f7c047..317b268 100644 --- a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue +++ b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue @@ -594,20 +594,20 @@ uni.hideLoading(); return; } - if (this.payPrice == 0) { + if (this.payPrice == 0) { let params = { "childOrderList": [{ - "goodsId": that.objectId, + "goodsId": this.objectId, "goodsType": 6, - "rechargeContent": that.rechargeContent, + "rechargeContent": this.rechargeContent, "saleCount": 1 }], - "payGold": that.priceValue[1], + "payGold": this.priceValue[1], "companyId": app.globalData.companyId, - "memDiscountId": that.memDiscountId, - "payPwd": "" + "memDiscountId": this.memDiscountId, + "payPwd": this.PaymentPassword } - create(params).then(res => { + create(params).then(res => { uni.hideLoading(); if (res.return_code == '000000') { this.orderId = res.return_data.orderNo; @@ -630,7 +630,7 @@ }); }) return; - } + } let params = { "orderNo": this.orderId, "cardNo": this.user.hltCardNo.cardNo,