1.上线新版小程序2.0

pages/qianZhuPay/union-pay/union-pay.vue

@@ -127,7 +127,7 @@
 			jumpMp() {
 				if (!app.globalData.openId) {
 					location.href =
-						'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2F%23%2Fpages%2Fgoods%2FexternalCoupon%2FexternalCoupon&response_type=code&scope=snsapi_base#wechat_redirect';
+						'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FH5%2F%23%2Fpages%2Fgoods%2FexternalCoupon%2FexternalCoupon&response_type=code&scope=snsapi_base#wechat_redirect';
 				} else {
 					uni.reLaunch({
 						url: '../../goods/externalCoupon/externalCoupon'

pages/tabBar/home/home.vue

@@ -377,7 +377,7 @@
 					categoryCode: 'CMS_HOME_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.showPopup();
 						this.imgadres3 = res.return_data.childCategory[0].imgData;

pages/userLogin/userLogin.vue

@@ -1,16 +1,6 @@
 <template>
 	<view class="container">
-		<!-- <view v-if="type == 1">
-			<image mode="widthFix" class="width90 mart20" v-if="user && user.infoCompleteStatus == 1"
-				:src="imagewxUrl+imgadres"></image>
-			<image mode="widthFix" class="width90 mart20" v-if="!user" :src="imagewxUrl+imgadres1"></image>
-			<view class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet"
-				v-if="user && user.infoCompleteStatus == 1" @click="getuserinfo">
-				授权并登录</view>
-			<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16 fontlet" v-if="!user"
-				open-type="getPhoneNumber" @getphonenumber="loginByPhone">授权手机号</button>
-			<view class="mart20 width90 font15 fcor666 fotct" @click="updateStu(2)">手机短信登录</view>
-		</view> -->
+		
 		<view v-if="type == 2">
 			<view class="logo">
 				<!-- <view class="img">
@@ -93,8 +83,6 @@
 			return {
 				user: '',
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres: 'login.png',
-				imgadres1: 'loginphone.png',
 				phoneNumber: "",
 				code: '',
 				getCodeText: '获取验证码',

pages/welcome/welcome.vue

@@ -137,7 +137,7 @@
 			},
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
 			},
 		}
 	}

subPages/recharge/recharge.vue

@@ -55,7 +55,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();

subPages/unionComfirmation/unionComfirmation.vue

@@ -130,7 +130,6 @@
 				</view>
 			</view>
 		</view>
-		<!-- <image :src="imagewxUrl+imgadres1" class="width100 mart20 marb30" mode="widthFix"></image> -->
 		<view class="width100 height110"></view>
 		<view class="footer">
 			<view class="settlement">
@@ -213,7 +212,6 @@
 			return {
 				imageUrl: app.globalData.imgUrl,
 				imagewxUrl: app.globalData.imageWxImg,
-				imgadres1: 'arrive_time_img.jpeg',
 				deductionPrice: '0.00',
 				paytheprice: '',
 				radioStatus: true,