mengxu/merchant-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
mx 2024-12-27 13:47:01 +08:00
parent ed0978dee9
commit 2bae866b15
8 changed files with 86 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/employee/task.js
View File

@ -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({

8
api/login.js
View File

@ -75,3 +75,11 @@ export function getCodeImg() {
timeout: 20000
})
}
export function verifyToken() {
console.log("verifyToken")
return request({
url: '/merchant/user/verifyToken',
'method': 'get'
})
}

2
pages.json
View File

@ -17,7 +17,7 @@
{
"path": "pages/wxlogin",
"style": {
"navigationBarTitleText": "微信授权登录"
"navigationBarTitleText": "手机号快捷登录"
}
},
{

63
pages/components/employeeTask.vue
View File

@ -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){

7
pages/components/employeeXc.vue
View File

@ -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};
}

18
pages/components/merchantTask.vue
View File

@ -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')

4
pages/employee/wxlogin.vue
View File

@ -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>

4
pages/wxlogin.vue
View File

@ -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>