From 9c7e827424b106d05c63736f5e50d81b4a738901 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 6 Mar 2023 09:29:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                      | 22 ++++++++++----------
 pages/goods/goods-list/goods-list.vue        | 11 +++++++++-
 pages/tabBar/home/home.vue                   |  6 +++---
 subPages/recharge-centre/recharge-centre.vue |  4 ++--
 4 files changed, 26 insertions(+), 17 deletions(-)

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 @@
 			<view class="swiper-box">
 				<swiper circular="true" autoplay="true" @change="swiperChange">
 					<swiper-item v-for="swiper in swiperList" :key="swiper.id">
-						<image :src="imageUrl+swiper.imgData"></image>
+						<image :src="imageUrl+swiper.imgData" @click="jumpCont(swiper)"></image>
 					</swiper-item>
 				</swiper>
 				<view class="indicator">
@@ -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 @@
 				<swiper class="swiper border-r" :style="{ height:mainHeight + 'px' }" :current="swiperTabIdx"
 					@change="SwiperChange">
 					<swiper-item class="swiperItem border-r" v-for="(item,index) in tabs" :key='index'>
-						<view class="width90 font14 fcor333 fontwig6 mart5">
+						<!-- <view class="width90 font14 fcor333 fontwig6 mart5">
 							话费特惠充值
-						</view>
+						</view> -->
 						<view v-if="amountList == ''" class="mart10 fotct font14 fcor666">
 							<image mode="widthFix" style="width: 40vw;" :src="imagewxUrl+imgadres"></image>
 						</view>