Merge branch 'master' of https://git.dayouqiantu.cn/develop/yshop-uniapp

utils/index.js

@@ -217,7 +217,7 @@ export const login = () => {
 							redirect = redirect.split('/pages')[1]
 							if(!redirect){
                                 redirect="/Loading/index";
-                            }    
+                            }
 							reLaunch({
 								path: '/pages' + redirect,
 							});
@@ -619,13 +619,13 @@ export function routerPermissions(url, type) {
 			})
 			cookie.set('redirect', path)
 		})
-		// } else if (Vue.prototype.$deviceType == 'weixin') {
+	} else if (Vue.prototype.$deviceType == 'weixin') {
-		// wechat().then(() => oAuth());
+		wechat().then(() => oAuth());
-		// if (!type) {
+		if (!type) {
-		// 	push({
+			push({
-		// 		path: url,
+				path: url,
-		// 	})
+			})
-		// }
+		}
 	} else {
 		console.log(path)
 		// 如果不是小程序跳转到登录页