新增微信隐藏登录

page_task/task_details/module/steps.vue

@@ -40,11 +40,11 @@
 		},
     watch:{
       'businessId':function () {
-        this.getStageList()
+        // this.getStageList()
       }
     },
     mounted() {
-      // this.getStageList()
+      this.getStageList()
     },
     methods: {
       getStageList() {

page_task/task_details/task_details.vue

@@ -226,18 +226,20 @@
 			}
 		},
 		onLoad(data) {
-			console.log(data)
+      console.log('-----------aaaaa-----------')
 			if (data.taskId !== undefined) {
 				this.businessId = data.taskId
-				this.getTaskDetail()
-				uni.$on('newTaskList', () => {
-					this.getTaskDetail()
-					this.$refs.stepsObj.getStageList()
-				})
 			} else {
 				tools.leftClick()
 			}
 		},
+    mounted() {
+      this.getTaskDetail()
+      uni.$on('newTaskList', () => {
+        this.getTaskDetail()
+        this.$refs.stepsObj.getStageList()
+      })
+    },
 		methods: {
       type,
       makingCall(phone){

service/router.js

@@ -17,7 +17,7 @@ const router = createRouter({
 //全局路由前置守卫
 const whiteList = ['/pages/login/index','/pages/login/register']
 
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
     // tools.showLoading()
     let userToken=''
     if (to.query.token ) {
@@ -29,8 +29,19 @@ router.beforeEach((to, from, next) => {
     console.log('userToken:'+userToken)
 
     if(whiteList.indexOf(to.path)<0 && !userToken){
-        // next('/pages/login/index');
-        next();
+        console.log('----------------------')
+       await tools.weiXinLogin().then(isLogin=>{
+           console.log('-----------isLogin-----------')
+           if(isLogin){
+               next();
+           }else {
+               next('/pages/login/index');
+           }
+       }).catch(e=>{
+           next('/pages/login/index');
+       })
+
+        // next();
     }else {
         next();
     }

service/tools.js

@@ -1,3 +1,5 @@
+import {wxLogin} from "@/api/login";
+
 let tools = {}
 /**
  * 大小判断
@@ -506,4 +508,34 @@ tools.topHeight = function() {
 	return navTop.height + navTop.top + 10
 }
 
+
+tools.weiXinLogin=async function () {
+	return new Promise((resolve, reject) => {
+		uni.login({
+			provider: "weixin",
+			success: (loginRes) => {
+				wxLogin({
+					'code': loginRes.code
+				}).then((res) => {
+					if (res.code === 403) {
+						tools.error('当前用户未注册')
+						uni.setStorageSync('openid', res.data.openid)
+						setTimeout(() => {
+							//跳转至注册页面
+							uni.navigateTo({
+								url: '/pages/login/register'
+							});
+						}, 1500)
+					} else if (res.code === 1) {
+						tools.setLoginData(res.data, false)
+						resolve( true)
+					} else {
+						resolve( false)
+					}
+				})
+			}
+		})
+	})
+}
+
 export default tools