Merge branch 'huipay-h5' into huipay-app-dev

# Conflicts:
#	pages/welcome/welcome.vue
解决冲突

pages/index/merchant-incoming-parts/merchant-incoming-parts.vue

@@ -1601,7 +1601,7 @@
 								let rateDatas = [];
 								for (var i = 0; i < res.return_data.merSettleAcct.merRateList
 									.length; i++) {
-									if (res.return_data.merSettleAcct.merRateList[i].ratePct) {
+									// if (res.return_data.merSettleAcct.merRateList[i].ratePct) {
 										let datas = {
 											codeName: res.return_data.merSettleAcct.merRateList[i]
 												.rateTypeName,
@@ -1611,7 +1611,7 @@
 												.ratePct
 										}
 										rateDatas.push(datas);
-									}
+									// }
 								}
 								this.rateCodeList = rateDatas;
 							} else {

pages/welcome/welcome.vue

@@ -71,7 +71,7 @@
 			},
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
 			},
 		}
 	}