Merge commit '522b4ae7' into develop

main.js

@@ -20,6 +20,49 @@ Vue.prototype.$wechat = wechat;
 // #endif
 
 Vue.config.productionTip = false;
+const {
+	origin
+} = window.location;
+let url = '';
+// 测试环境
+if (origin.indexOf('local') > -1 || origin.indexOf('test') > -1) {
+	if (origin.indexOf('test') > -1) {
+		url = origin + '/mobile/index.php?';
+	} else {
+		url = 'https://test.pet-dbc.cn/mobile/index.php?';
+	}
+} else if (origin.indexOf('jingxiang') > -1) {
+	url = 'https://jingxiang.pet-dbc.cn/mobile/index.php?';
+} else {
+	url = 'https://shop.pet-dbc.cn/mobile/index.php?';
+}
+var search = window.location.href.split('?');
+if (search[1]) {
+	var arr = search[1].split('&');
+	arr.every((item, index) => {
+		var kv = item.split('=');
+		if (kv[0] === 'openId') {
+			localStorage.openId = kv[1];
+			var exp = new Date();
+		    exp.setTime(exp.getTime() + 3650*24*60*60*1000);
+		    document.cookie = 'openId='+kv[1]+';expires='+exp.toGMTString();
+			$.ajax({
+				url: url + 'app=weixin&act=autoLogin',
+				type: 'get',
+				data: {
+					openid: kv[1]
+				},
+				dataType: 'json',
+				success: function(res) {
+					alert(JSON.stringify(res))
+				}
+			})
+		}
+		if (kv[0] === 'inionid') {
+			localStorage.unionid = kv[1];
+		}
+	});
+}
 
 // 加入购物车
 function addCart(spec_id, quantity, isLogin) {
@@ -86,10 +129,10 @@ function backup() {
 // 跳转外部链接,使用webview
 function jump(url, type) {
 	// #ifdef H5
-	if(type === 1){
+	if (type === 1) {
 		// 重定向到指定地址，防止回退
 		window.location.replace(url);
-	} else if (type === 2){
+	} else if (type === 2) {
 		uni.navigateTo({
 			url: url
 		})

pages/wxpay/wxpay.vue

@@ -86,6 +86,11 @@
 					},2000);
 					return;
 				}
+				jWeixin.miniProgram.getEnv(function (result) {
+					if(result.miniprogram){
+						var path = '/pages/pay/index?payParam='+encodeURIComponent(JSON.stringify(res))+'&type=uni';
+						jWeixin.miniProgram.navigateTo({url: path});
+					} else {
 						WeixinJSBridge.invoke(
 							'getBrandWCPayRequest', {
 								"appId": res.app_id,     //公众号名称，由商户传入
@@ -146,6 +151,8 @@
 								}
 							}
 						);
+					}
+				})
 			},
 			goBack(){
 				this.$backup();