From 2bae866b15807e8e0ba3242cc13a85d25a1b5248 Mon Sep 17 00:00:00 2001
From: mx <1289317512@qq.com>
Date: Fri, 27 Dec 2024 13:47:01 +0800
Subject: [PATCH] 1

---
 api/employee/task.js              |  8 ++++
 api/login.js                      |  8 ++++
 pages.json                        |  2 +-
 pages/components/employeeTask.vue | 63 +++++++++++++++++++++----------
 pages/components/employeeXc.vue   |  7 +++-
 pages/components/merchantTask.vue | 18 ++++++++-
 pages/employee/wxlogin.vue        |  4 +-
 pages/wxlogin.vue                 |  4 +-
 8 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/api/employee/task.js b/api/employee/task.js
index 2f7d40f..2a1a167 100644
--- a/api/employee/task.js
+++ b/api/employee/task.js
@@ -8,6 +8,14 @@ export function getTaskList(param) {
     params: param
   })
 }
+export function getSelfTaskList(param) {
+  return request({
+    url: '/employee/task/selfList',
+    method: 'get',
+    params: param
+  })
+}
+
 
 export function getTaskDetails(param) {
   return request({
diff --git a/api/login.js b/api/login.js
index 9b8bab1..3e16203 100644
--- a/api/login.js
+++ b/api/login.js
@@ -75,3 +75,11 @@ export function getCodeImg() {
     timeout: 20000
   })
 }
+export function verifyToken() {
+  console.log("verifyToken")
+  return request({
+    url: '/merchant/user/verifyToken',
+    'method': 'get'
+  })
+}
+
diff --git a/pages.json b/pages.json
index 5747cf5..b68672a 100644
--- a/pages.json
+++ b/pages.json
@@ -17,7 +17,7 @@
     {
       "path": "pages/wxlogin",
       "style": {
-        "navigationBarTitleText": "微信授权登录"
+        "navigationBarTitleText": "手机号快捷登录"
       }
     },
     {
diff --git a/pages/components/employeeTask.vue b/pages/components/employeeTask.vue
index 8d1e824..76aa788 100644
--- a/pages/components/employeeTask.vue
+++ b/pages/components/employeeTask.vue
@@ -206,7 +206,7 @@
 </template>
 
 <script>
-	import { getTaskList, cancelBaoming } from "@/api/employee/task";
+	import { getTaskList, getSelfTaskList, cancelBaoming } from "@/api/employee/task";
 	// import { getCodeImg } from '@/api/employee/login'
   export default {
   	props: {
@@ -247,6 +247,8 @@
 		};
 	  },
     created: function() {
+		console.log("dddddddddddddd")
+
 		this.realName = this.$store.state.user.nickName
 		this.getList();
     },
@@ -339,26 +341,49 @@
 			if (this.showNoMore && this.queryParams.pageNum > 1){
 				return
 			}
-			 var that = this;
-			 getTaskList(this.queryParams).then(response => {
-			 	if (that.queryParams.pageNum > 1){
-					that.taskList = that.taskList.concat(response.rows);
-				}else{
-					that.taskList = response.rows;
-				}
+			var that = this;
+			if (this.nowTab == 1) {
+				getTaskList(this.queryParams).then(response => {
+					if (that.queryParams.pageNum > 1) {
+						that.taskList = that.taskList.concat(response.rows);
+					} else {
+						that.taskList = response.rows;
+					}
 
-				that.queryParams.pageNum++;
-			 	if (response.rows.length < this.queryParams.pageSize){
-			 		that.showNoMore = true;
-				}else{
-					that.showNoMore = false;
-				}
-				 that.showLoading = false;
-				 that.triggered = false;
-				 that.total = response.total;
+					that.queryParams.pageNum++;
+					if (response.rows.length < this.queryParams.pageSize) {
+						that.showNoMore = true;
+					} else {
+						that.showNoMore = false;
+					}
+					that.showLoading = false;
+					that.triggered = false;
+					that.total = response.total;
+
+					console.log(response)
+				});
+			}else{
+				getSelfTaskList(this.queryParams).then(response => {
+					if (that.queryParams.pageNum > 1){
+						that.taskList = that.taskList.concat(response.rows);
+					}else{
+						that.taskList = response.rows;
+					}
+
+					that.queryParams.pageNum++;
+					if (response.rows.length < this.queryParams.pageSize){
+						that.showNoMore = true;
+					}else{
+						that.showNoMore = false;
+					}
+					that.showLoading = false;
+					that.triggered = false;
+					that.total = response.total;
+
+					console.log(response)
+				});
+			}
 
-				 console.log(response)
-			 });
 		 },
 
 		 goDetails(task){
diff --git a/pages/components/employeeXc.vue b/pages/components/employeeXc.vue
index d122b3a..d54b400 100644
--- a/pages/components/employeeXc.vue
+++ b/pages/components/employeeXc.vue
@@ -56,7 +56,7 @@
 </template>
 
 <script>
-  import { getTaskList } from "@/api/employee/task";
+  import { getSelfTaskList } from "@/api/employee/task";
   export default {
     props: {
       titleTop: {type: Number},
@@ -154,7 +154,7 @@
         }
         var that = this;
         this.queryParams.self = true;
-        getTaskList(this.queryParams).then(response => {
+        getSelfTaskList(this.queryParams).then(response => {
           if (that.queryParams.pageNum > 1){
             that.taskList = that.taskList.concat(response.rows);
           }else{
@@ -193,6 +193,9 @@
         this.nowTab = tab;
       },
       getPayStatus(sign){
+        if (sign == null){
+          return {"text": "未发放", "status": 0};
+        }
         if (sign.stEmployeeFundRecord == null || sign.stEmployeeFundRecord.payStatus == 0){
           return {"text": "未发放", "status": 0};
         }
diff --git a/pages/components/merchantTask.vue b/pages/components/merchantTask.vue
index d63b3a0..9a0e7f3 100644
--- a/pages/components/merchantTask.vue
+++ b/pages/components/merchantTask.vue
@@ -143,7 +143,9 @@
 <script>
 	import { getTaskList } from "@/api/task";
 	// import { getCodeImg } from '@/api/login'
-  export default {
+	import { verifyToken } from '@/api/login'
+
+	export default {
 	props: {
 		  titleTop: {type: Number},
 		  nowTab1: {type: Number},
@@ -174,12 +176,24 @@
 	  },
 	  created: function() {
 		this.realName = this.$store.state.user.nickName
-		this.getList();
+		  verifyToken().then(response => {
+			  if (response.code == 401){
+				  this.$store.state.user.roleType = 1;//跳转到无状态的劳动者任务列表页
+				  uni.reLaunch({
+					  url: '/pages/index'
+				  });
+			  }else{
+				  this.getList();
+			  }
+		  })
+
+
 	  },
 	 methods:{
 		 reload(){
 			 this.refresh();
 		 },
+
 		  openSelect(){
 			  // 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
 			  this.$refs.popup.open('bottom')
diff --git a/pages/employee/wxlogin.vue b/pages/employee/wxlogin.vue
index d7e86c7..e902b64 100644
--- a/pages/employee/wxlogin.vue
+++ b/pages/employee/wxlogin.vue
@@ -16,8 +16,8 @@
 
 
       <view class="action-btn">
-        <button v-if="radio" class="login-btn cu-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信授权登录</button>
-        <button v-else="radio" class="login-btn cu-btn block bg-blue lg round" @click="checkgetPhoneNumber">微信授权登录</button>
+        <button v-if="radio" class="login-btn cu-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">手机号快捷登录</button>
+        <button v-else="radio" class="login-btn cu-btn block bg-blue lg round" @click="checkgetPhoneNumber">手机号快捷登录</button>
       </view>
 
 
diff --git a/pages/wxlogin.vue b/pages/wxlogin.vue
index 2a35bd3..161410c 100644
--- a/pages/wxlogin.vue
+++ b/pages/wxlogin.vue
@@ -26,8 +26,8 @@
 
 
       <view class="action-btn">
-        <button v-if="radio" class="login-btn cu-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">微信授权登录</button>
-        <button v-else="radio" class="login-btn cu-btn block bg-blue lg round" @click="checkgetPhoneNumber">微信授权登录</button>
+        <button v-if="radio" class="login-btn cu-btn block bg-blue lg round" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">手机号快捷登录</button>
+        <button v-else="radio" class="login-btn cu-btn block bg-blue lg round" @click="checkgetPhoneNumber">手机号快捷登录</button>
       </view>