From f17c85757447cbdc172ca0707e2416829feb78a8 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Wed, 16 Mar 2022 10:59:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BD=AE=E5=8D=9A=E5=9B=BE?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 high-unionPay/App.vue                            | 16 ++++++++--------
 high-unionPay/pages/goods/goods.vue              |  2 +-
 high-unionPay/pages/tabBar/home/home.vue         |  3 ++-
 .../unionPay/recharge-centre/recharge-centre.vue |  3 ++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/high-unionPay/App.vue b/high-unionPay/App.vue
index 6eb9eb9..2a07c1c 100644
--- a/high-unionPay/App.vue
+++ b/high-unionPay/App.vue
@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			url: 'https://hsg.dctpay.com/crest',
-			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			brestUrl : 'https://hsg.dctpay.com/brest',
-			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsg.dctpay.com/crest',
+			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			// brestUrl : 'https://hsg.dctpay.com/brest',
+			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			// url: 'https://hsgcs.dctpay.com/crest',
-			// brestUrl : 'https://hsgcs.dctpay.com/brest',
-			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsgcs.dctpay.com/crest',
+			brestUrl : 'https://hsgcs.dctpay.com/brest',
+			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',
diff --git a/high-unionPay/pages/goods/goods.vue b/high-unionPay/pages/goods/goods.vue
index 7000676..645c404 100644
--- a/high-unionPay/pages/goods/goods.vue
+++ b/high-unionPay/pages/goods/goods.vue
@@ -22,7 +22,7 @@
 		</view>
 		<!-- 商品主图轮播 -->
 		<view class="swiper-box">
-			<swiper circular="true" autoplay="true" @change="swiperChange">
+			<swiper circular="true" autoplay="true" style="height: 188px;" @change="swiperChange">
 				<swiper-item v-for="(swiper,index) in swiperList" :key="index">
 					<image mode="widthFix" :src="imageUrl+swiper" @click="perImage(swiper)"></image>
 				</swiper-item>
diff --git a/high-unionPay/pages/tabBar/home/home.vue b/high-unionPay/pages/tabBar/home/home.vue
index 3bb870f..998e939 100644
--- a/high-unionPay/pages/tabBar/home/home.vue
+++ b/high-unionPay/pages/tabBar/home/home.vue
@@ -940,7 +940,8 @@
 	.orange-content .swiper-item {
 		height: 180rpx;
 		margin-left: 14rpx;
-		margin-top: 14rpx;
+		margin-top: 14rpx;
+		float: left;
 	}
 
 	.orange-content .swiper-item .img {
diff --git a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
index 7dd3907..b145467 100644
--- a/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
+++ b/high-unionPay/pages/unionPay/recharge-centre/recharge-centre.vue
@@ -19,7 +19,8 @@
 		<view class="list">
 			<view class="box" :class="{'on':item.realPrice == inputAmount}" v-for="(item,index) in amountList"
 				:key="index" @click="select(item)">
-				<view class="heTitle">{{item.price}}元</view>
+				<view class="heTitle">{{item.price}}元</view>
+				<view class="font13 fcor999" v-if="item.status != 2 && item.discount != 100">{{item.discount}} 折</view>
 				<view class="font13 fcor999" v-if="item.status == 2">已售空</view>
 			</view>
 		</view>