diff --git a/App.vue b/App.vue index 0ccd0fa..f79cf69 100644 --- a/App.vue +++ b/App.vue @@ -72,17 +72,17 @@ // #ifdef MP let accountInfo = uni.getAccountInfoSync(); - if (accountInfo.miniProgram.envVersion == 'develop' || accountInfo.miniProgram.envVersion == 'trial') { - this.globalData.url = 'https://hsgcs.dctpay.com/crest'; - this.globalData.v1url = 'https://hsgcs.dctpay.com/v1'; - this.globalData.orderurl = 'https://hsgcs.dctpay.com/order'; - this.globalData.userurl = 'https://hsgcs.dctpay.com/user'; - this.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest'; - this.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/'; - this.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/'; - this.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/'; - } - if (accountInfo.miniProgram.envVersion == 'release') { + // if (accountInfo.miniProgram.envVersion == 'develop' || accountInfo.miniProgram.envVersion == 'trial') { + // this.globalData.url = 'https://hsgcs.dctpay.com/crest'; + // this.globalData.v1url = 'https://hsgcs.dctpay.com/v1'; + // this.globalData.orderurl = 'https://hsgcs.dctpay.com/order'; + // this.globalData.userurl = 'https://hsgcs.dctpay.com/user'; + // this.globalData.brestUrl = 'https://hsgcs.dctpay.com/brest'; + // this.globalData.imgUrl = 'https://hsgcs.dctpay.com/filesystem/'; + // this.globalData.imageWxImg = 'https://hsgcs.dctpay.com/filesystem/wxApplets/'; + // this.globalData.imageqrImg = 'https://hsgcs.dctpay.com/filesystem/temporary/'; + // } + if (accountInfo.miniProgram.envVersion == 'develop') { this.globalData.url = 'https://hsg.dctpay.com/crest'; this.globalData.v1url = 'https://hsg.dctpay.com/v1'; this.globalData.orderurl = 'https://hsg.dctpay.com/order'; diff --git a/pages/goods/goods-list/goods-list.vue b/pages/goods/goods-list/goods-list.vue index 82d6dba..2ffa6ab 100644 --- a/pages/goods/goods-list/goods-list.vue +++ b/pages/goods/goods-list/goods-list.vue @@ -9,7 +9,7 @@ - + @@ -288,6 +288,15 @@ uni.navigateTo({ url: '../../goods/goods?id=' + e }); + }, + //跳转内容 + jumpCont(item) { + if (item.jumpUrl) { + uni.navigateTo({ + url: item.jumpUrl + }) + } + }, } diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 5c243f7..d1303ce 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -381,7 +381,7 @@ //弹窗首页广告 this.showPopup(); this.imgadres3 = res.return_data.childCategory[0].imgData; - this.webUrl = res.return_data.childCategory[0].ext1; + this.webUrl = res.return_data.childCategory[0].jumpUrl; this.jumpType = res.return_data.childCategory[0].jumpType; } }); @@ -705,9 +705,9 @@ }, //轮播跳转活动 jumplottery(item) { - if (item.ext1) { + if (item.jumpUrl) { uni.navigateTo({ - url: item.ext1 + url: item.jumpUrl }) } diff --git a/subPages/recharge-centre/recharge-centre.vue b/subPages/recharge-centre/recharge-centre.vue index 9f3ebd1..ed9f35d 100644 --- a/subPages/recharge-centre/recharge-centre.vue +++ b/subPages/recharge-centre/recharge-centre.vue @@ -40,9 +40,9 @@ - +