From 201822fc56ef1e37d8d27cd185933fd2f1d6370c Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Mon, 6 Feb 2023 16:09:31 +0800 Subject: [PATCH] =?UTF-8?q?1,=E4=B8=8A=E7=BA=BF=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=202.0=20=E6=96=B0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- high-unionPay/App.vue | 32 +++++++++---------- .../pages/goods/goods-list/goods-list.vue | 3 +- high-unionPay/pages/tabBar/home/home.vue | 8 ++--- .../unionPay/recharge-pay/recharge-pay.vue | 25 ++++++++------- .../pages/unionPay/recharge/recharge.vue | 2 +- .../unionComfirmation/unionComfirmation.vue | 1 - 6 files changed, 36 insertions(+), 35 deletions(-) diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue index f3d7090..65c36aa 100644 --- a/high-unionPay/App.vue +++ b/high-unionPay/App.vue @@ -5,23 +5,23 @@ // brestUrl: 'http://192.168.3.4:9302/brest', // imgUrl: 'https://192.168.3.4:9301/filesystem/', //正式 - // url: 'https://hsg.dctpay.com/crest', - // v1url:'https://hsg.dctpay.com/v1', - // orderurl:' https://hsg.dctpay.com/order', - // userurl:'https://hsg.dctpay.com/user', - // imgUrl: 'https://hsg.dctpay.com/filesystem/', - // brestUrl: 'https://hsg.dctpay.com/brest', - // imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', - // imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/', + url: 'https://hsg.dctpay.com/crest', + v1url:'https://hsg.dctpay.com/v1', + orderurl:' https://hsg.dctpay.com/order', + userurl:'https://hsg.dctpay.com/user', + imgUrl: 'https://hsg.dctpay.com/filesystem/', + brestUrl: 'https://hsg.dctpay.com/brest', + imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/', + imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/', //测试 - url: 'https://hsgcs.dctpay.com/crest', - v1url: 'https://hsgcs.dctpay.com/v1', - orderurl:'https://hsgcs.dctpay.com/order', - userurl:'https://hsgcs.dctpay.com/user', - brestUrl: 'https://hsgcs.dctpay.com/brest', - imgUrl: 'https://hsgcs.dctpay.com/filesystem/', - imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', - imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/', + // url: 'https://hsgcs.dctpay.com/crest', + // v1url: 'https://hsgcs.dctpay.com/v1', + // orderurl:'https://hsgcs.dctpay.com/order', + // userurl:'https://hsgcs.dctpay.com/user', + // brestUrl: 'https://hsgcs.dctpay.com/brest', + // imgUrl: 'https://hsgcs.dctpay.com/filesystem/', + // imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/', + // imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/', userInfo: "", brestUserInfo: '', openId: '', diff --git a/high-unionPay/pages/goods/goods-list/goods-list.vue b/high-unionPay/pages/goods/goods-list/goods-list.vue index 600b223..11adbbb 100644 --- a/high-unionPay/pages/goods/goods-list/goods-list.vue +++ b/high-unionPay/pages/goods/goods-list/goods-list.vue @@ -171,7 +171,8 @@ //获取弹出或者弹窗 getCmsContent() { let params = { - regionId: app.globalData.cityId, + companyId: app.globalData.companyId, + platform: 3, categoryCode: 'CMS_WX_APPLETS_GOODS_LIST' } getCmsContent(params).then(res => { diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue index f75aefd..385cabc 100644 --- a/high-unionPay/pages/tabBar/home/home.vue +++ b/high-unionPay/pages/tabBar/home/home.vue @@ -324,12 +324,12 @@ } getCmsContent(params).then(res => { uni.hideLoading(); - if (res.return_code == '000000' && res.return_data != '') { + if (res.return_code == '000000' && res.return_data.childCategory.length != 0) { //弹窗首页广告 this.showPopup(); - this.imgadres3 = res.return_data[0].imgData; - this.webUrl = res.return_data[0].ext1; - this.jumpType = res.return_data[0].jumpType; + this.imgadres3 = res.return_data.childCategory[0].imgData; + this.webUrl = res.return_data.childCategory[0].ext1; + this.jumpType = res.return_data.childCategory[0].jumpType; } }); }, diff --git a/high-unionPay/pages/unionPay/recharge-pay/recharge-pay.vue b/high-unionPay/pages/unionPay/recharge-pay/recharge-pay.vue index f36bc6e..7b1009f 100644 --- a/high-unionPay/pages/unionPay/recharge-pay/recharge-pay.vue +++ b/high-unionPay/pages/unionPay/recharge-pay/recharge-pay.vue @@ -16,7 +16,18 @@ - + + + + + + + 银联支付 + + + + + @@ -28,17 +39,7 @@ - - - - - - 银联支付 - - - - - + diff --git a/high-unionPay/pages/unionPay/recharge/recharge.vue b/high-unionPay/pages/unionPay/recharge/recharge.vue index 48c0995..4db960f 100644 --- a/high-unionPay/pages/unionPay/recharge/recharge.vue +++ b/high-unionPay/pages/unionPay/recharge/recharge.vue @@ -47,7 +47,7 @@ categoryCode: 'CMS_RECHARGE_POPOVER' } getCmsContent(params).then(res => { - if (res.return_code == '000000' && res.return_data != '') { + if (res.return_code == '000000' && res.return_data.childCategory.length != 0) { //弹窗首页广告 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 317b268..3ba845e 100644 --- a/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue +++ b/high-unionPay/pages/unionPay/unionComfirmation/unionComfirmation.vue @@ -202,7 +202,6 @@ return { imageUrl: app.globalData.imgUrl, imagewxUrl: app.globalData.imageWxImg, - imgadres1: 'arrive_time_img.jpeg', deductionPrice: '0.00', paytheprice: '', radioStatus: true,