Merge branch '5月27日-一键加油分支' into dev

pages/tabBar/home/home.vue

@@ -265,7 +265,7 @@
 		methods: {
 			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';
 			},
 			//获取首页功能
 			getCmsContentcmsContent() {
@@ -424,15 +424,15 @@
 						app.globalData.cityName = res.return_data.result.addressComponent
 							.province;
 						app.globalData.cityId = res.return_data.result.addressComponent.adcode;
-						app.globalData.cityId = '500103';
-						// if (res.return_data.result.addressComponent.adcode) {
+						// app.globalData.cityId = '500103';
+						if (res.return_data.result.addressComponent.adcode) {
 							that.getCouponListArea();
 							that.getCouponListgold();
 							that.getCmsContent();
 							that.getCmsAactibity();
 							that.getCmsContentcmshome();
 							that.getCmsContentcmsContent();
-						// }
+						}
 						uni.getStorage({
 							key: 'accountType',
 							success(e) {