Merge branch 'master' of http://git.lcpcp.cc/root/wh-new-xcx

.env.js

@@ -7,7 +7,6 @@ if (__wxConfig.envVersion === 'release') {
     ENV_CONFIG = require('.env.prod.js');
     ENV_CONFIG.isCanvas2d = true
 }  else {
-
     //开发环境
     ENV_CONFIG = require('.env.prod.js');
     ENV_CONFIG.isCanvas2d = false

pages/index/module/index_column.vue

@@ -140,7 +140,7 @@
 		},
 		data() {
 			return {
-				enteringType: 0,
+				enteringType: 1,
 				moneyData: {
           out_money: 0,
 					out_num: 0,

pages/login/index.vue

@@ -144,7 +144,11 @@
 									});
 								}, 1500)
 							} else if (res.code === 1) {
-								tools.setLoginData(res.data, true)
+                if (res.data.status * 1 === 0){
+                  tools.error('信息正在审核...')
+                }else {
+                  tools.setLoginData(res.data, true)
+                }
 							} else {
 								tools.error(res.msg)
 							}

service/router.js

@@ -42,17 +42,19 @@ router.beforeEach(async (to, from, next) => {
 
     if(whiteList.indexOf(to.path)<0 && !userToken){
         console.log('----------------------')
-       await tools.weiXinLogin().then(isLogin=>{
-           console.log('-----------isLogin-----------')
-           if(isLogin){
-               next();
-               // next('/pages/login/index');
-           }else {
-               next('/pages/login/index');
-           }
-       }).catch(e=>{
-           next('/pages/login/index');
-       })
+       // await tools.weiXinLogin().then(isLogin=>{
+       //     console.log('-----------isLogin-----------')
+       //     if(isLogin===-1){
+       //         next('/pages/login/register');
+       //     }else if(isLogin){
+       //         next();
+       //     }else {
+       //         next('/pages/login/index');
+       //     }
+       // }).catch(e=>{
+       //     next('/pages/login/index');
+       // })
+        next('/pages/login/index');
 
         // next();
     }else {

service/tools.js

@@ -233,7 +233,7 @@ tools.setLoginData = function(data, type) {
 			if (data.status * 1 === 0) {
 				//审核状态跳转至待审核页面
 				uni.reLaunch({
-					url: '/pages/login/module/await-audit'
+					url: '/pages/login/await-audit'
 				});
 			} else {
 				let excelPath = uni.getStorageSync('excelPath');
@@ -519,16 +519,15 @@ tools.weiXinLogin=async function () {
 				}).then((res) => {
 					if (res.code === 403) {
 						tools.error('当前用户未注册')
-						uni.setStorageSync('openid', res.data.openid)
-						setTimeout(() => {
-							//跳转至注册页面
-							uni.navigateTo({
-								url: '/pages/login/register'
-							});
-						}, 1500)
+						resolve( -1)
 					} else if (res.code === 1) {
-						tools.setLoginData(res.data, false)
-						resolve( true)
+						if(res.data.status===0){
+							tools.setLoginData(res.data, false)
+							resolve( true)
+						}else {
+							tools.error('信息正在审核...')
+							resolve( false)
+						}
 					} else {
 						resolve( false)
 					}