Merge branch 'master' of https://git.yuzhankeji.cn/zhangjing/douhuo-h5

router/index.js

@@ -30,20 +30,20 @@ router.beforeEach((to, from, next) => {
 		return
 	}
 	// 检查用户是否授权了微信
-	if(to.name != 'webWechatIndex' && openId === ''){
+	// if(to.name != 'webWechatIndex' && openId === ''){
-		authFollow({
+	// 	authFollow({
-			url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
+	// 		url: 'https://web.douhuotest.douhuofalv.com/webWechat/index'
-			// url: 'https://web.douhuofalv.com/webWechat/index'
+	// 		// url: 'https://web.douhuofalv.com/webWechat/index'
-		}).then(res => {
+	// 	}).then(res => {
-			window.location.href = res
+	// 		window.location.href = res
-		}).catch(err => {
+	// 	}).catch(err => {
-			uni.showToast({
+	// 		uni.showToast({
-				title: err.message,
+	// 			title: err.message,
-				icon: "none" 
+	// 			icon: "none" 
-			})
+	// 		})
-		})
+	// 	})
-		return
+	// 	return
-	}
+	// }
 	
 	// 检查是否需要登录
 	if(to.auth && token === ''){