1,上线小程序 2.0 新版

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',
+			url: 'https://hsg.dctpay.com/crest',
-			// v1url:'https://hsg.dctpay.com/v1',
+			v1url:'https://hsg.dctpay.com/v1',
-			// orderurl:' https://hsg.dctpay.com/order',
+			orderurl:' https://hsg.dctpay.com/order',
-			// userurl:'https://hsg.dctpay.com/user',
+			userurl:'https://hsg.dctpay.com/user',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl: 'https://hsg.dctpay.com/brest',
+			brestUrl: 'https://hsg.dctpay.com/brest',
-			// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
+			imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
-			// imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
+			imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
+			// url: 'https://hsgcs.dctpay.com/crest',
-			v1url: 'https://hsgcs.dctpay.com/v1',
+			// v1url: 'https://hsgcs.dctpay.com/v1',
-			orderurl:'https://hsgcs.dctpay.com/order',
+			// orderurl:'https://hsgcs.dctpay.com/order',
-			userurl:'https://hsgcs.dctpay.com/user',
+			// userurl:'https://hsgcs.dctpay.com/user',
-			brestUrl: 'https://hsgcs.dctpay.com/brest',
+			// brestUrl: 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// imageWxImg: 'https://hsgcs.dctpay.com/filesystem/wxApplets/',
-			imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/',
+			// imageqrImg: 'https://hsgcs.dctpay.com/filesystem/temporary/',
 			userInfo: "",
 			brestUserInfo: '',
 			openId: '',

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 => {

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.imgadres3 = res.return_data.childCategory[0].imgData;
-						this.webUrl = res.return_data[0].ext1;
+						this.webUrl = res.return_data.childCategory[0].ext1;
-						this.jumpType = res.return_data[0].jumpType;
+						this.jumpType = res.return_data.childCategory[0].jumpType;
 					}
 				});
 			},

high-unionPay/pages/unionPay/recharge-pay/recharge-pay.vue

@@ -17,28 +17,29 @@
 			<view class="content">
 				<view class="pay-list">
 					<view class="width100" v-for="(item,index) in paytypeList" :key="index">
-						<view class="row" v-if="item == 3" @tap="paytype='3'">
+						<view class="row" v-if="item == 4" @tap="paytype='4'">
 							<view class="left">
-								<image style="border-radius: 50%;" src='../../../static/img/ghkpay.png'></image>
+								<image src="../../../static/img/unionpay.png"></image>
 							</view>
 							<view class="center">
-								汇联通工会卡(余额:{{tongCardPrice}}元)
+								银联支付
 							</view>
 							<view class="right">
-								<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
+								<radio :checked="paytype=='4'" color="#0083f5" />
 							</view>
 						</view>
-						<view class="row" v-if="item == 4" @tap="paytype='4'">
+						<view class="row" v-if="item == 3" @tap="paytype='3'">
 							<view class="left">
-								<image src="../../../static/img/unionpay.png"></image>
+								<image style="border-radius: 50%;" src='../../../static/img/ghkpay.png'></image>
 							</view>
 							<view class="center">
-								银联支付
+								汇联通工会卡(余额:{{tongCardPrice}}元)
 							</view>
 							<view class="right">
-								<radio :checked="paytype=='4'" color="#0083f5" />
+								<radio :checked="paytype=='3'" @click="changeRiado()" color="#0083f5" />
 							</view>
 						</view>
+						
 					</view>
 				</view>
 			</view>

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();

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,