优化完成-0116

master
Lee 2023-01-16 15:10:35 +08:00
parent 3098b0bf6c
commit 20fd59898b
52 changed files with 240 additions and 324 deletions

View File

@ -75,26 +75,6 @@ const tools = {
return !reg_identity.test(identity);
},
/**
* @description 图片处理
*/
handleImg(url) {
let imgUrl = '';
if(url!==''){
if(url.indexOf('jpg')!==-1 || url.indexOf('jpge')!==-1 || url.indexOf('png')!==-1 || url.indexOf('gif')!==-1){
if(url.indexOf('https://')!==-1 || url.indexOf('http://')!==-1){
let baseUrl = url.substring(url.indexOf('//')+2, url.length);
imgUrl = `${getApp().globalData.hostapi}`+baseUrl.substring(baseUrl.indexOf('/'), baseUrl.length);
}else{
imgUrl = `${getApp().globalData.hostapi}`+url;
}
}else{
imgUrl = url;
}
}
return imgUrl;
},
/**
* @description 手机号中间四位用"****"带替
*/

View File

@ -57,10 +57,11 @@
if(op.userType){
this.userType = op.userType;
}
//
this.getEnterList();
},
onShow() {
//
this.getEnterList();
},
onReachBottom() {
if(this.enterList.length<this.total){

View File

@ -26,23 +26,23 @@
<view class="pay-info font26">
<view class="item font30">
<text>工资总金额</text>
<text>合计{{payInfo.amount?payInfo.amount:0}}</text>
<text>合计{{payInfo.amount>0?payInfo.amount:0}}</text>
</view>
<view class="item">
<text>基本工资</text>
<text>{{payInfo.base_amount?payInfo.base_amount:0}}</text>
<text>{{payInfo.base_amount>0?payInfo.base_amount:0}}</text>
</view>
<view class="item">
<text>加班工资</text>
<text>{{payInfo.overtime_amount?payInfo.overtime_amount:0}}</text>
<text>{{payInfo.overtime_amount>0?payInfo.overtime_amount:0}}</text>
</view>
<view class="item">
<text>待发工资</text>
<text>{{payInfo.not_amount?payInfo.not_amount:0}}</text>
<text>{{payInfo.not_amount>0?payInfo.not_amount:0}}</text>
</view>
<view class="item">
<text>已发工资</text>
<text>{{payInfo.done_amount?payInfo.done_amount:0}}</text>
<text>{{payInfo.done_amount>0?payInfo.done_amount:0}}</text>
</view>
</view>
<!-- 工资记录 -->
@ -110,10 +110,11 @@
if(op.userType){
this.userType = op.userType;
}
},
onShow() {
//
this.getPayList();
},
onShow() {
},
onReachBottom() {
if(this.payList.length<this.total){

View File

@ -70,10 +70,11 @@
if(op.userType){
this.userType = op.userType;
}
},
onShow() {
//
this.getOvertimeList();
},
onShow() {
},
onReachBottom() {
if(this.overtimeList.length<this.total){

View File

@ -68,10 +68,11 @@
if(op.userType){
this.userType = op.userType;
}
},
onShow() {
//
this.getSignList();
},
onShow() {
},
onReachBottom() {
if(this.signList.length<this.total){

View File

@ -27,7 +27,7 @@
<text>头像</text>
<button class="avatar" open-type="chooseAvatar" @chooseavatar="chooseAvatar">
<view class="img">
<image :src="userInfo.avatarUrl || logoAvatar" mode="aspectFit"></image>
<image :src="userInfo.avatarUrl!==''?baseHttps+userInfo.avatarUrl:logoAvatar" mode="aspectFit"></image>
</view>
</button>
</view>
@ -58,15 +58,16 @@
appletName:'工地打卡', //
isBindPhone: false, //
empowerShow:false, //
isActive:false, //
isActive:false, //
baseHttps:`${getApp().globalData.hostapi}`,
};
},
onLoad() {
//
this.getUserProfileEv('enter');
},
onShow() {
//
this.getUserProfileEv('enter');
},
methods: {
// logo
@ -122,7 +123,7 @@
});
this.$requst.upload('/api/v1/file/upload/image',{path:url}).then(res=>{
if(res.code==0) {
this.userInfo.avatarUrl = `${getApp().globalData.hostapi}`+res.data.src;
this.userInfo.avatarUrl = res.data.src;
}
uni.hideLoading();
})

View File

@ -1,7 +1,5 @@
<template>
<view>
</view>
<template>
</template>
<script>
export default {
@ -10,7 +8,7 @@
}
},
onShow() {
onLoad() {
//
this.getUserInfo();
},

View File

@ -157,7 +157,7 @@
this.showList = [0,1,2,3,4,5];
}
this.userInfo = res.data;
this.userInfo.headimgurl = this.$toolAll.tools.handleImg(res.data.headimgurl);
this.userInfo.headimgurl = res.data.headimgurl;
this.isLoding = true;
}
})

View File

@ -131,8 +131,8 @@
<view class="item item-other" style="align-items: flex-start;">
<view class="title" style="margin-top: 18rpx;">身份证正面</view>
<view class="upload-box">
<view class="img" v-if="registerObj.id_front!==''" @tap.stop="previewImage(registerObj.id_front)">
<image :src="registerObj.id_front" mode="widthFix"></image>
<view class="img" v-if="registerObj.id_front!==''" @tap.stop="previewImage(baseHttps+registerObj.id_front)">
<image :src="baseHttps+registerObj.id_front" mode="widthFix"></image>
<image class="del-btn" src="/static/icon/icon-del.png" mode="widthFix" @tap.stop="delImg(index,'positive')"></image>
</view>
<view class="upload-btn" @tap="changeImg('positive')" v-else>
@ -149,8 +149,8 @@
<view class="item item-other" style="align-items: flex-start;">
<view class="title" style="margin-top: 18rpx;">身份证反面</view>
<view class="upload-box">
<view class="img" v-if="registerObj.id_back!==''" @tap.stop="previewImage(registerObj.id_back)">
<image :src="registerObj.id_back" mode="widthFix"></image>
<view class="img" v-if="registerObj.id_back!==''" @tap.stop="previewImage(baseHttps+registerObj.id_back)">
<image :src="baseHttps+registerObj.id_back" mode="widthFix"></image>
<image class="del-btn" src="/static/icon/icon-del.png" mode="widthFix" @tap.stop="delImg(index,'back')"></image>
</view>
<view class="upload-btn" @tap="changeImg('back')" v-else>
@ -204,11 +204,11 @@
<view class="item item-other" style="align-items: flex-start;">
<view class="title" style="margin-top: 18rpx;">银行卡拍照</view>
<view class="upload-box">
<view class="img" v-if="registerObj.bank_card_img!==''" @tap.stop="previewImage(registerObj.bank_card_img)">
<image :src="registerObj.bank_card_img" mode="widthFix"></image>
<view class="img" v-if="registerObj.bank_card_img!==''" @tap.stop="previewImage(baseHttps+registerObj.bank_card_img)">
<image :src="baseHttps+registerObj.bank_card_img" mode="widthFix"></image>
<image class="del-btn" src="/static/icon/icon-del.png" mode="widthFix" @tap.stop="delImg(index,'bank')"></image>
</view>
<view class="upload-btn" @tap="changeImg('bank')" v-if="registerObj.bank_card_img==''">
<view class="upload-btn" @tap="changeImg('bank')" v-else>
<view class="bg">
<image src="/static/bank.jpg" mode="aspectFill"></image>
</view>
@ -312,6 +312,12 @@
city:'北京市', //
area:'东城区',//
}, //
//
bank_card_img:'',
id_front:'',
id_back:'',
positionList:[], //
positionIndex:0, //
flag:true, //
@ -326,6 +332,7 @@
stagingImg:'', //img
ifRegister:false, //
buttonColor:'',//
baseHttps:`${getApp().globalData.hostapi}`,
}
},
onPageScroll(object){
@ -354,33 +361,21 @@
}
//
this.changeStatusNav();
//
if(uni.getStorageSync('worker_role')!==0){
//
this.getLocationEv(0);
}else{
//
if(uni.getStorageSync('readSafeNotice')){
//
this.getNoticeInfo();
}else{
this.isRead = false;
//
this.getSafetyBulletin();
}
}
//
this.getLocationEv(0);
//
this.getPositionList();
setTimeout(()=>{
//
this.getUserInfo();
//
this.getSignInfo();
//
this.getSignList();
},200)
},
onShow() {
//
this.getUserInfo();
//
this.getSignInfo();
//
this.getSignList();
},
onPullDownRefresh() {
//
@ -422,6 +417,10 @@
this.userInfo = res.data;
if(this.userInfo.worksite_id==0){
this.registerObj = this.userInfo;
this.positionIndex = 0;
this.registerObj.province = this.registerObj.province!==''?this.registerObj.province:'北京市';
this.registerObj.city = this.registerObj.city!==''?this.registerObj.city:'北京市';
this.registerObj.area = this.registerObj.area!==''?this.registerObj.area:'东城区';
this.registerObj.pay = parseFloat(res.data.pay);
}
}
@ -575,7 +574,7 @@
this.$requst.get('/api/v1/index/worksite-notice',{worksite_id:this.registerObj.worksite_id}).then(res=>{
if(res.code==0){
console.log(res,'工地公告');
if(res.data.status==1){
if(res.data!==null&&res.data.status==1){
if(uni.getStorageSync('wsNoticeVersion')!==res.data.version){
this.ifWsNotice = true;
uni.setStorageSync('wsNoticeVersion',res.data.version);
@ -800,13 +799,13 @@
this.$requst.upload('/api/v1/file/upload/image',{path:this.stagingImg}).then(res=>{
if(res.code==0) {
if(type=='positive'){
this.registerObj.id_front = `${getApp().globalData.hostapi}`+res.data.src;
this.registerObj.id_front = res.data.src;
}
if(type=='back'){
this.registerObj.id_back = `${getApp().globalData.hostapi}`+res.data.src;
this.registerObj.id_back = res.data.src;
}
if(type=='bank'){
this.registerObj.bank_card_img = `${getApp().globalData.hostapi}`+res.data.src;
this.registerObj.bank_card_img = res.data.src;
}
}
uni.hideLoading();

View File

@ -60,9 +60,9 @@
<view class="item" v-if="userInfo.role==1">
<view class="title">身份证正面</view>
<view class="msg font24" @tap="changeImg('positive')">
<image :src="userInfo.id_front" mode="widthFix"></image>
<image :src="baseHttps+userInfo.id_front" mode="widthFix"></image>
<view class="director-arrow" v-if="userInfo.check_info.status==0 && userInfo.id_front!==userInfo.check_info.id_front">
<image :src="userInfo.check_info.id_front" mode="widthFix"></image>
<image :src="baseHttps+userInfo.check_info.id_front" mode="widthFix"></image>
</view>
</view>
<image src="/static/icon/icon-arrow-03.png" mode="aspectFit"></image>
@ -70,9 +70,9 @@
<view class="item" v-if="userInfo.role==1">
<view class="title">身份证反面</view>
<view class="msg font24" @tap="changeImg('positive')">
<image :src="userInfo.id_back" mode="widthFix"></image>
<image :src="baseHttps+userInfo.id_back" mode="widthFix"></image>
<view class="director-arrow" v-if="userInfo.check_info.status==0 && userInfo.id_back!==userInfo.check_info.id_back">
<image :src="userInfo.check_info.id_back" mode="widthFix"></image>
<image :src="baseHttps+userInfo.check_info.id_back" mode="widthFix"></image>
</view>
</view>
<image src="/static/icon/icon-arrow-03.png" mode="aspectFit"></image>
@ -105,9 +105,9 @@
<view class="item" v-if="userInfo.role==1">
<view class="title">银行卡照片</view>
<view class="msg font24" @tap="changeImg('bank')">
<image :src="userInfo.bank_card_img" mode="widthFix"></image>
<image :src="baseHttps+userInfo.bank_card_img" mode="widthFix"></image>
<view class="director-arrow" v-if="userInfo.check_info.status==0 && userInfo.bank_card_img!==userInfo.check_info.bank_card_img">
<image :src="userInfo.check_info.bank_card_img" mode="widthFix"></image>
<image :src="baseHttps+userInfo.check_info.bank_card_img" mode="widthFix"></image>
</view>
</view>
<image src="/static/icon/icon-arrow-03.png" mode="aspectFit"></image>
@ -179,7 +179,8 @@
positionList:[], //
positionIndex:0, //
ifShow:false, //
isLoding:false, //
isLoding:false, //
baseHttps:`${getApp().globalData.hostapi}`,
}
},
onLoad() {
@ -202,7 +203,7 @@
})
},2000)
}
this.userInfo = res.data;
this.userInfo = res.data;
this.isLoding = true;
this.positionIndex = this.positionList.findIndex(item=> item.id === res.data.position);
}
@ -318,25 +319,18 @@
});
this.$requst.upload('/api/v1/file/upload/image',{path:this.stagingImg}).then(res=>{
if(res.code==0) {
this.editMsg = res.data.src
if(type=='cover'){
this.userInfo.headimgurl = `${getApp().globalData.hostapi}`+res.data.src;
this.field = 'headimgurl';
this.editMsg = this.userInfo.headimgurl;
}
if(type=='positive'){
this.userInfo.id_front = `${getApp().globalData.hostapi}`+res.data.src;
this.field = 'id_front';
this.editMsg = this.userInfo.id_front;
}
if(type=='back'){
this.userInfo.id_back = `${getApp().globalData.hostapi}`+res.data.src;
this.field = 'id_back';
this.editMsg = this.userInfo.id_back;
}
if(type=='bank'){
this.userInfo.bank_card_img = `${getApp().globalData.hostapi}`+res.data.src;
this.field = 'bank_card_img';
this.editMsg = this.userInfo.bank_card_img;
}
setTimeout(()=>{
//

View File

@ -104,12 +104,13 @@
}
//
this.getWorksiteList();
},
onShow() {
setTimeout(()=>{
//
this.getSignList();
},200)
},
onShow() {
},
onReachBottom() {
if(this.signList.length<this.total){

View File

@ -39,18 +39,18 @@
<view class="item item-other">
<view class="title">身份证正面</view>
<view class="msg">
<image @tap="previewImageEv(centerDetail.account.id_front!==baseHttp?centerDetail.account.id_front:centerDetail.id_front)" :src="centerDetail.account.id_front!==baseHttp?centerDetail.account.id_front:centerDetail.id_front" mode="widthFix"></image>
<image @tap="previewImageEv(centerDetail.account.id_front!==''?baseHttps+centerDetail.account.id_front:baseHttps+centerDetail.id_front)" :src="centerDetail.account.id_front!==''?baseHttps+centerDetail.account.id_front:baseHttps+centerDetail.id_front" mode="widthFix"></image>
<view class="director-arrow" v-if="centerDetail.is_register!==1 && centerDetail.status==0 && centerDetail.id_front!==centerDetail.account.id_front">
<image @tap="previewImageEv(centerDetail.id_front)" :src="centerDetail.id_front" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+centerDetail.id_front)" :src="baseHttps+centerDetail.id_front" mode="widthFix"></image>
</view>
</view>
</view>
<view class="item item-other">
<view class="title">身份证反面</view>
<view class="msg">
<image @tap="previewImageEv(centerDetail.account.id_back!==baseHttp?centerDetail.account.id_back:centerDetail.id_back)" :src="centerDetail.account.id_back!==baseHttp?centerDetail.account.id_back:centerDetail.id_back" mode="widthFix"></image>
<image @tap="previewImageEv(centerDetail.account.id_back!==''?baseHttps+centerDetail.account.id_back:baseHttps+centerDetail.id_back)" :src="centerDetail.account.id_back!==''?baseHttps+centerDetail.account.id_back:baseHttps+centerDetail.id_back" mode="widthFix"></image>
<view class="director-arrow" v-if="centerDetail.is_register!==1 && centerDetail.status==0 && centerDetail.id_back!==centerDetail.account.id_back">
<image @tap="previewImageEv(centerDetail.id_back)" :src="centerDetail.id_back" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+centerDetail.id_back)" :src="baseHttps+centerDetail.id_back" mode="widthFix"></image>
</view>
</view>
</view>
@ -102,9 +102,9 @@
<view class="item item-other">
<view class="title">银行卡照片</view>
<view class="msg">
<image @tap="previewImageEv(centerDetail.account.bank_card_img!==baseHttp?centerDetail.account.bank_card_img:centerDetail.bank_card_img)" :src="centerDetail.account.bank_card_img!==baseHttp?centerDetail.account.bank_card_img:centerDetail.bank_card_img" mode="widthFix"></image>
<image @tap="previewImageEv(centerDetail.account.bank_card_img!==''?baseHttps+centerDetail.account.bank_card_img:baseHttps+centerDetail.bank_card_img)" :src="centerDetail.account.bank_card_img!==''?baseHttps+centerDetail.account.bank_card_img:baseHttps+centerDetail.bank_card_img" mode="widthFix"></image>
<view class="director-arrow" v-if="centerDetail.is_register!==1 && centerDetail.status==0 && centerDetail.bank_card_img!==centerDetail.account.bank_card_img">
<image @tap="previewImageEv(centerDetail.bank_card_img)" :src="centerDetail.bank_card_img" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+centerDetail.bank_card_img)" :src="baseHttps+centerDetail.bank_card_img" mode="widthFix"></image>
</view>
</view>
</view>
@ -120,7 +120,7 @@
<view class="item" v-if="centerDetail.certificate!==''">
<view class="title">证书名称</view>
<view class="msg font24">
{{centerDetail.certificate}}
{{centerDetail.account.certificate}}
</view>
</view>
<view class="item">
@ -135,13 +135,13 @@
<view class="item item-other">
<view class="title">工作经验</view>
<view class="msg font24">
{{centerDetail.work_experience}}
{{centerDetail.account.work_experience}}
</view>
</view>
<view class="item">
<view class="title">现住地址</view>
<view class="msg font24">
{{centerDetail.province+centerDetail.city+centerDetail.area+centerDetail.address_now}}
{{centerDetail.account.province+centerDetail.account.city+centerDetail.account.area+centerDetail.account.address_now}}
</view>
</view>
<view class="item">
@ -179,7 +179,7 @@
return {
statusHeight:uni.getSystemInfoSync().statusBarHeight, //
userType:'director', // worker director
baseHttp:`${getApp().globalData.hostapi}`,
baseHttps:`${getApp().globalData.hostapi}`,
centerDetail:{}, //
reasonMsg:'', //退
ifReason:false, //退
@ -193,10 +193,11 @@
if(op.userType){
this.userType = op.userType;
}
},
onShow() {
//
this.getEnterDetail();
},
onShow() {
},
methods: {
//
@ -205,12 +206,6 @@
if(res.code == 0){
console.log(res,'工人信息');
this.centerDetail = res.data;
this.centerDetail.id_front = this.$toolAll.tools.handleImg(res.data.id_front);
this.centerDetail.account.id_front = this.$toolAll.tools.handleImg(res.data.account.id_front);
this.centerDetail.id_back = this.$toolAll.tools.handleImg(res.data.id_back);
this.centerDetail.account.id_back = this.$toolAll.tools.handleImg(res.data.account.id_back);
this.centerDetail.bank_card_img = this.$toolAll.tools.handleImg(res.data.bank_card_img);
this.centerDetail.account.bank_card_img = this.$toolAll.tools.handleImg(res.data.account.bank_card_img);
}
})
},
@ -237,7 +232,6 @@
//
submitApi(params,type){
console.log(params,type,123)
this.$requst.post('/api/v1/manager/check-info',params).then(res=>{
if(res.code == 0){
if(type==0){

View File

@ -35,18 +35,18 @@
<view class="item item-other">
<view class="title">身份证正面</view>
<view class="msg">
<image @tap="previewImageEv(workerDtail.check_info!==baseHttp?workerDtail.check_info.id_front:workerDtail.id_front)" :src="workerDtail.check_info.id_front!==baseHttp?workerDtail.check_info.id_front:workerDtail.id_front" mode="widthFix"></image>
<image @tap="previewImageEv(workerDtail.check_info!==''?baseHttps+workerDtail.check_info.id_front:baseHttps+workerDtail.id_front)" :src="workerDtail.check_info.id_front!==''?baseHttps+workerDtail.check_info.id_front:baseHttps+workerDtail.id_front" mode="widthFix"></image>
<view class="director-arrow" v-if="workerDtail.is_register!==1 && workerDtail.status==0 && workerDtail.id_front!==workerDtail.check_info.id_front">
<image @tap="previewImageEv(workerDtail.id_front)" :src="workerDtail.id_front" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+workerDtail.id_front)" :src="baseHttps+workerDtail.id_front" mode="widthFix"></image>
</view>
</view>
</view>
<view class="item item-other">
<view class="title">身份证反面</view>
<view class="msg">
<image @tap="previewImageEv(workerDtail.check_info!==baseHttp?workerDtail.check_info.id_back:workerDtail.id_back)" :src="workerDtail.check_info.id_back!==baseHttp?workerDtail.check_info.id_back:workerDtail.id_back" mode="widthFix"></image>
<image @tap="previewImageEv(workerDtail.check_info!==''?baseHttps+workerDtail.check_info.id_back:baseHttps+workerDtail.id_back)" :src="workerDtail.check_info.id_back!==''?baseHttps+workerDtail.check_info.id_back:baseHttps+workerDtail.id_back" mode="widthFix"></image>
<view class="director-arrow" v-if="workerDtail.is_register!==1 && workerDtail.status==0 && workerDtail.id_back!==workerDtail.check_info.id_back">
<image @tap="previewImageEv(workerDtail.id_back)" :src="workerDtail.id_back" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+workerDtail.id_back)" :src="baseHttps+workerDtail.id_back" mode="widthFix"></image>
</view>
</view>
</view>
@ -98,9 +98,9 @@
<view class="item item-other">
<view class="title">银行卡照片</view>
<view class="msg">
<image @tap="previewImageEv(workerDtail.check_info.bank_card_img!==baseHttp?workerDtail.check_info.bank_card_img:workerDtail.bank_card_img)" :src="workerDtail.check_info.bank_card_img!==baseHttp?workerDtail.check_info.bank_card_img:workerDtail.bank_card_img" mode="widthFix"></image>
<image @tap="previewImageEv(workerDtail.check_info.bank_card_img!==''?baseHttps+workerDtail.check_info.bank_card_img:baseHttps+workerDtail.bank_card_img)" :src="workerDtail.check_info.bank_card_img!==''?baseHttps+workerDtail.check_info.bank_card_img:baseHttps+workerDtail.bank_card_img" mode="widthFix"></image>
<view class="director-arrow" v-if="workerDtail.is_register!==1 && workerDtail.status==0 && workerDtail.bank_card_img!==workerDtail.check_info.bank_card_img">
<image @tap="previewImageEv(workerDtail.bank_card_img)" :src="workerDtail.bank_card_img" mode="widthFix"></image>
<image @tap="previewImageEv(baseHttps+workerDtail.bank_card_img)" :src="baseHttps+workerDtail.bank_card_img" mode="widthFix"></image>
</view>
</view>
</view>
@ -175,7 +175,7 @@
return {
statusHeight:uni.getSystemInfoSync().statusBarHeight, //
userType:'director', // worker director
baseHttp:`${getApp().globalData.hostapi}`,
baseHttps:`${getApp().globalData.hostapi}`,
workerDtail:{}, //
reasonMsg:'', //退
ifReason:false, //退
@ -189,10 +189,11 @@
if(op.userType){
this.userType = op.userType;
}
},
onShow() {
//
this.getWorkerDetail();
},
onShow() {
},
methods: {
//
@ -201,14 +202,6 @@
if(res.code == 0){
console.log(res,'工人信息');
this.workerDtail = res.data;
this.workerDtail.id_front = this.$toolAll.tools.handleImg(res.data.id_front);
this.workerDtail.id_back = this.$toolAll.tools.handleImg(res.data.id_back);
this.workerDtail.bank_card_img = this.$toolAll.tools.handleImg(res.data.bank_card_img);
if(this.workerDtail.check_info!==''){
this.workerDtail.check_info.bank_card_img = this.$toolAll.tools.handleImg(res.data.check_info.bank_card_img);
this.workerDtail.check_info.id_back = this.$toolAll.tools.handleImg(res.data.check_info.id_back);
this.workerDtail.check_info.id_front = this.$toolAll.tools.handleImg(res.data.check_info.id_front);
}
}
})
},

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -11201,25 +11201,6 @@ var tools = {
var reg_identity = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
return !reg_identity.test(identity);
},
/**
* @description 图片处理
*/
handleImg: function handleImg(url) {
var imgUrl = '';
if (url !== '') {
if (url.indexOf('jpg') !== -1 || url.indexOf('jpge') !== -1 || url.indexOf('png') !== -1 || url.indexOf('gif') !== -1) {
if (url.indexOf('https://') !== -1 || url.indexOf('http://') !== -1) {
var baseUrl = url.substring(url.indexOf('//') + 2, url.length);
imgUrl = "".concat(getApp().globalData.hostapi) + baseUrl.substring(baseUrl.indexOf('/'), baseUrl.length);
} else {
imgUrl = "".concat(getApp().globalData.hostapi) + url;
}
} else {
imgUrl = url;
}
}
return imgUrl;
},
/**
* @description 手机号中间四位用"****"带替
*/

View File

@ -213,11 +213,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取录入列表
this.getEnterList();
},
onShow: function onShow() {},
onReachBottom: function onReachBottom() {
if (this.enterList.length < this.total) {
this.page++;

View File

@ -232,11 +232,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取工资列表
this.getPayList();
},
onShow: function onShow() {},
onReachBottom: function onReachBottom() {
if (this.payList.length < this.total) {
this.page++;

View File

@ -1 +1 @@
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计:"+(payInfo.amount?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{"姓名:"+item.name+"-"+item.date}}</text><text class="data-v-578c57e5">{{"月份:"+item.date}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-578c57e5">{{"部分发放:"+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计:<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>
<view class="pad-x120 data-v-578c57e5"><status-nav vue-id="cc01b47e-1" ifReturn="{{false}}" ifHome="{{true}}" navBarTitle="工地支出" class="data-v-578c57e5" bind:__l="__l"></status-nav><view class="content data-v-578c57e5" style="{{'padding-top:'+(statusHeight+50+'px')+';'}}"><view class="screen-box pay-screen-box data-v-578c57e5"><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="date" range="{{date}}" fields="month" start="{{startDate}}" end="{{endDate}}" data-event-opts="{{[['change',[['bindDateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['data-v-578c57e5',showDate==''?'color-99':'']}}">{{showDate!==''?$root.g0[0]+'年'+$root.g1[1]+'月':'请选择时间'}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view><view class="item data-v-578c57e5"><picker class="font24 data-v-578c57e5" mode="selector" range="{{cateList}}" value="{{cateIndex}}" data-event-opts="{{[['change',[['bindCateChange',['$event']]]]]}}" bindchange="__e"><view class="name data-v-578c57e5"><text class="{{['clips1','data-v-578c57e5',cateIndex==0?'color-99':'']}}">{{cateList[cateIndex]}}</text><image src="/static/icon/icon-arrow-02.png" mode="aspectFit" class="data-v-578c57e5"></image></view></picker></view></view><view class="pay-info font26 data-v-578c57e5"><view class="item font30 data-v-578c57e5"><text class="data-v-578c57e5">工资总金额</text><text class="data-v-578c57e5">{{"合计:"+(payInfo.amount>0?payInfo.amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">基本工资</text><text class="data-v-578c57e5">{{(payInfo.base_amount>0?payInfo.base_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">加班工资</text><text class="data-v-578c57e5">{{(payInfo.overtime_amount>0?payInfo.overtime_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">待发工资</text><text class="data-v-578c57e5">{{(payInfo.not_amount>0?payInfo.not_amount:0)+"元"}}</text></view><view class="item data-v-578c57e5"><text class="data-v-578c57e5">已发工资</text><text class="data-v-578c57e5">{{(payInfo.done_amount>0?payInfo.done_amount:0)+"元"}}</text></view></view><view class="sign-record sign-record-other bg-white data-v-578c57e5"><block wx:for="{{payList}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item font26 data-v-578c57e5"><view class="info info-other data-v-578c57e5"><text class="data-v-578c57e5">{{"姓名:"+item.name+"-"+item.date}}</text><text class="data-v-578c57e5">{{"月份:"+item.date}}</text><block wx:if="{{item.status==2}}"><text class="color-66 data-v-578c57e5">{{"部分发放:"+item.paid_amount+"元"}}</text></block><block wx:else><text class="{{['data-v-578c57e5',item.status==0?'color-blue':'color-66']}}">{{item.status==0?'待发放':'已发放'}}</text></block></view><view class="wages-info data-v-578c57e5"><view class="text data-v-578c57e5">{{"基本工资:"+item.base_amount+"元"}}</view><view class="text data-v-578c57e5">{{"加班工资:"+item.overtime_amount+"元"}}</view><view class="text data-v-578c57e5">合计:<text class="font32 data-v-578c57e5">{{item.amount}}</text>元</view></view></view></block></view><view class="more-tips font24 data-v-578c57e5">{{$root.g2==total?'没有更多数据了':'下滑获取更多'}}</view></view><tabbar vue-id="cc01b47e-2" userType="{{userType}}" current="1" class="data-v-578c57e5" bind:__l="__l"></tabbar></view>

View File

@ -215,11 +215,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取加班列表
this.getOvertimeList();
},
onShow: function onShow() {},
onReachBottom: function onReachBottom() {
if (this.overtimeList.length < this.total) {
this.page++;

View File

@ -215,11 +215,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取打卡列表
this.getSignList();
},
onShow: function onShow() {},
onReachBottom: function onReachBottom() {
if (this.signList.length < this.total) {
this.page++;

View File

@ -209,14 +209,16 @@ var _default = {
//是否绑定手机号
empowerShow: false,
//是否显示授权弹窗
isActive: false //是否已授权
isActive: false,
//是否已授权
baseHttps: "".concat(getApp().globalData.hostapi)
};
},
onLoad: function onLoad() {},
onShow: function onShow() {
onLoad: function onLoad() {
// 进入登录
this.getUserProfileEv('enter');
},
onShow: function onShow() {},
methods: {
// 设置logo图
setLogo: function setLogo() {
@ -281,7 +283,7 @@ var _default = {
path: url
}).then(function (res) {
if (res.code == 0) {
_this3.userInfo.avatarUrl = "".concat(getApp().globalData.hostapi) + res.data.src;
_this3.userInfo.avatarUrl = res.data.src;
}
uni.hideLoading();
});

View File

@ -1 +1 @@
<view class="data-v-b237504c"><view class="login-header data-v-b237504c"><image class="infoImg data-v-b237504c" mode="aspectFill" src="{{imgSrc}}"></image><view class="logo-name font34 color-00 data-v-b237504c">{{appletName}}</view></view><view class="login-footer data-v-b237504c"><block wx:if="{{!isActive}}"><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">微信授权</view></block><block wx:else><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" bindtap="__e">微信授权</view></block><view class="agreement-box color-33 font28 data-v-b237504c">点击授权登录,表示您已阅读<text data-event-opts="{{[['tap',[['toSafeNotice',['$event']]]]]}}" class="agreement color-blue data-v-b237504c" bindtap="__e">《安全告知》</text></view></view><block wx:if="{{empowerShow}}"><view class="pop-up-bg data-v-b237504c"><view class="user-info-box bg-white data-v-b237504c"><view class="info data-v-b237504c"><view class="cover data-v-b237504c"><image src="{{imgSrc}}" mode="aspectFit" class="data-v-b237504c"></image></view><view class="name color-99 font24 data-v-b237504c">{{appletName}}</view><view class="tips data-v-b237504c"><view class="font26 data-v-b237504c">邀请您补全个人信息</view><view class="font24 color-blue data-v-b237504c">(昵称、头像)</view></view></view><view class="msg data-v-b237504c"><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">头像</text><button class="avatar data-v-b237504c" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['chooseAvatar',['$event']]]]]}}" bindchooseavatar="__e"><view class="img data-v-b237504c"><image src="{{userInfo.avatarUrl||logoAvatar}}" mode="aspectFit" class="data-v-b237504c"></image></view></button></view><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">昵称</text><input class="nick-name data-v-b237504c" type="nickname" placeholder="请输入昵称" placeholder-style="color:#999" data-event-opts="{{[['blur',[['nickNameInput',['$event']]]],['input',[['__set_model',['$0','nickName','$event',[]],['userInfo']]]]]}}" value="{{userInfo.nickName}}" bindblur="__e" bindinput="__e"/></view></view><view class="empower-btns font30 data-v-b237504c"><view data-event-opts="{{[['tap',[['refuseEv',['$event']]]]]}}" class="btn color-99 data-v-b237504c" bindtap="__e">拒绝</view><view data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" class="btn color-blue data-v-b237504c" bindtap="__e">允许</view></view></view></view></block></view>
<view class="data-v-b237504c"><view class="login-header data-v-b237504c"><image class="infoImg data-v-b237504c" mode="aspectFill" src="{{imgSrc}}"></image><view class="logo-name font34 color-00 data-v-b237504c">{{appletName}}</view></view><view class="login-footer data-v-b237504c"><block wx:if="{{!isActive}}"><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" bindtap="__e">微信授权</view></block><block wx:else><view class="login-btn color-white font34 bg-blue data-v-b237504c" type="primary" data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" bindtap="__e">微信授权</view></block><view class="agreement-box color-33 font28 data-v-b237504c">点击授权登录,表示您已阅读<text data-event-opts="{{[['tap',[['toSafeNotice',['$event']]]]]}}" class="agreement color-blue data-v-b237504c" bindtap="__e">《安全告知》</text></view></view><block wx:if="{{empowerShow}}"><view class="pop-up-bg data-v-b237504c"><view class="user-info-box bg-white data-v-b237504c"><view class="info data-v-b237504c"><view class="cover data-v-b237504c"><image src="{{imgSrc}}" mode="aspectFit" class="data-v-b237504c"></image></view><view class="name color-99 font24 data-v-b237504c">{{appletName}}</view><view class="tips data-v-b237504c"><view class="font26 data-v-b237504c">邀请您补全个人信息</view><view class="font24 color-blue data-v-b237504c">(昵称、头像)</view></view></view><view class="msg data-v-b237504c"><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">头像</text><button class="avatar data-v-b237504c" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['chooseAvatar',['$event']]]]]}}" bindchooseavatar="__e"><view class="img data-v-b237504c"><image src="{{userInfo.avatarUrl!==''?baseHttps+userInfo.avatarUrl:logoAvatar}}" mode="aspectFit" class="data-v-b237504c"></image></view></button></view><view class="item font26 data-v-b237504c"><text class="data-v-b237504c">昵称</text><input class="nick-name data-v-b237504c" type="nickname" placeholder="请输入昵称" placeholder-style="color:#999" data-event-opts="{{[['blur',[['nickNameInput',['$event']]]],['input',[['__set_model',['$0','nickName','$event',[]],['userInfo']]]]]}}" value="{{userInfo.nickName}}" bindblur="__e" bindinput="__e"/></view></view><view class="empower-btns font30 data-v-b237504c"><view data-event-opts="{{[['tap',[['refuseEv',['$event']]]]]}}" class="btn color-99 data-v-b237504c" bindtap="__e">拒绝</view><view data-event-opts="{{[['tap',[['getUserProfileEv',['other']]]]]}}" class="btn color-blue data-v-b237504c" bindtap="__e">允许</view></view></view></view></block></view>

View File

@ -142,13 +142,11 @@ exports.default = void 0;
//
//
//
//
//
var _default = {
data: function data() {
return {};
},
onShow: function onShow() {
onLoad: function onLoad() {
// 获取用户信息
this.getUserInfo();
},

View File

@ -1 +1 @@
<view></view>
<view class="_div"></view>

View File

@ -376,7 +376,7 @@ var _default = {
_this.showList = [0, 1, 2, 3, 4, 5];
}
_this.userInfo = res.data;
_this.userInfo.headimgurl = _this.$toolAll.tools.handleImg(res.data.headimgurl);
_this.userInfo.headimgurl = res.data.headimgurl;
_this.isLoding = true;
}
});

View File

@ -283,6 +283,11 @@ var _default = {
},
//工人注册信息
//显示图片
bank_card_img: '',
id_front: '',
id_back: '',
positionList: [],
//技术岗位
positionIndex: 0,
@ -309,7 +314,9 @@ var _default = {
//暂存img
ifRegister: false,
//是否显示注册表
buttonColor: '' //打卡按钮颜色
buttonColor: '',
//打卡按钮颜色
baseHttps: "".concat(getApp().globalData.hostapi)
};
},
onPageScroll: function onPageScroll(object) {
@ -329,6 +336,7 @@ var _default = {
}
},
onLoad: function onLoad(op) {
var _this = this;
if (op.userType) {
this.userType = op.userType;
}
@ -338,34 +346,20 @@ var _default = {
}
// 改变状态栏
this.changeStatusNav();
// 判断用户类型
if (uni.getStorageSync('worker_role') !== 0) {
// 获取位置信息
this.getLocationEv(0);
} else {
// 判断是否查看安全公告
if (uni.getStorageSync('readSafeNotice')) {
// 查询是否有通知
this.getNoticeInfo();
} else {
this.isRead = false;
// 获取安全告知
this.getSafetyBulletin();
}
}
// 获取位置信息
this.getLocationEv(0);
// 获取工作岗位
this.getPositionList();
setTimeout(function () {
// 获取用户信息
_this.getUserInfo();
// 获取打卡信息
_this.getSignInfo();
// 获取打卡记录
_this.getSignList();
}, 200);
},
onShow: function onShow() {
// 获取用户信息
this.getUserInfo();
// 获取打卡信息
this.getSignInfo();
// 获取打卡记录
this.getSignList();
},
onShow: function onShow() {},
onPullDownRefresh: function onPullDownRefresh() {
// 获取工资列表
this.getSignList();
@ -391,22 +385,26 @@ var _default = {
},
// 获取用户信息
getUserInfo: function getUserInfo() {
var _this = this;
var _this2 = this;
this.$requst.post('/api/v1/user/info').then(function (res) {
if (res.code == 0) {
console.log(res, '用户信息');
if (res.data.role !== uni.getStorageSync('worker_role')) {
_this.$toolAll.tools.showToast('身份已变更,正在切换');
_this2.$toolAll.tools.showToast('身份已变更,正在切换');
setTimeout(function () {
uni.reLaunch({
url: '/pages/pagehome/pagehome'
});
}, 2000);
}
_this.userInfo = res.data;
if (_this.userInfo.worksite_id == 0) {
_this.registerObj = _this.userInfo;
_this.registerObj.pay = parseFloat(res.data.pay);
_this2.userInfo = res.data;
if (_this2.userInfo.worksite_id == 0) {
_this2.registerObj = _this2.userInfo;
_this2.positionIndex = 0;
_this2.registerObj.province = _this2.registerObj.province !== '' ? _this2.registerObj.province : '北京市';
_this2.registerObj.city = _this2.registerObj.city !== '' ? _this2.registerObj.city : '北京市';
_this2.registerObj.area = _this2.registerObj.area !== '' ? _this2.registerObj.area : '东城区';
_this2.registerObj.pay = parseFloat(res.data.pay);
}
}
});
@ -419,34 +417,34 @@ var _default = {
},
// 授权位置信息
getLocationEv: function getLocationEv(type) {
var _this2 = this;
var _this3 = this;
uni.getLocation({
type: 'gcj02',
isHighAccuracy: 'true',
success: function success(res) {
console.log(res, '位置信息');
if (type == '1') {
_this2.$toolAll.tools.showToast('重新定位成功');
_this3.$toolAll.tools.showToast('重新定位成功');
}
//获取工地列表
_this2.getSiteEv(res.longitude, res.latitude);
_this3.getSiteEv(res.longitude, res.latitude);
},
complete: function complete() {
// 判断是否查看安全公告
if (uni.getStorageSync('readSafeNotice')) {
// 查询是否有通知
_this2.getNoticeInfo();
_this3.getNoticeInfo();
} else {
_this2.isRead = false;
_this3.isRead = false;
// 获取安全告知
_this2.getSafetyBulletin();
_this3.getSafetyBulletin();
}
}
});
},
//获取工地列表
getSiteEv: function getSiteEv(lng, lat) {
var _this3 = this;
var _this4 = this;
this.$requst.get('/api/v1/common/get-current-worksite', {
lng: lng,
lat: lat
@ -455,24 +453,24 @@ var _default = {
console.log(res, '定位工地信息');
// 缓存工地id
uni.setStorageSync('worksite_id', res.data.id);
_this3.siteInfo = res.data;
_this3.registerObj.worksite_id = res.data.id;
_this3.isLoding = true;
_this4.siteInfo = res.data;
_this4.registerObj.worksite_id = res.data.id;
_this4.isLoding = true;
// 获取打卡记录
_this3.getSignList();
_this4.getSignList();
// 获取状态列表
_this3.$refs.signCalendar.getStatusObj();
_this4.$refs.signCalendar.getStatusObj();
}
});
},
// 获取安全告知
getSafetyBulletin: function getSafetyBulletin() {
var _this4 = this;
var _this5 = this;
if (!this.readSafeNotice) {
this.$requst.get('/api/v1/index/safe-notice').then(function (res) {
if (res.code == 0) {
console.log(res, '安全告知');
_this4.safetyBulletin = res.data.content;
_this5.safetyBulletin = res.data.content;
}
});
} else {
@ -490,16 +488,16 @@ var _default = {
},
// 查询是否有通知
getNoticeInfo: function getNoticeInfo() {
var _this5 = this;
var _this6 = this;
this.$requst.get('/api/v1/common/notice').then(function (res) {
if (res.code == 0) {
console.log(res, '通知消息');
if (res.data.notice == 1) {
_this5.isNotice = true;
_this5.noticeInfo = res.data;
_this6.isNotice = true;
_this6.noticeInfo = res.data;
} else {
// 获取公告
_this5.getNotice();
_this6.getNotice();
}
}
});
@ -520,22 +518,22 @@ var _default = {
},
// 获取公告
getNotice: function getNotice() {
var _this6 = this;
var _this7 = this;
this.$requst.get('/api/v1/index/notice').then(function (res) {
if (res.code == 0) {
console.log(res, '公告');
if (res.data.status == 1) {
if (uni.getStorageSync('noticeVersion') !== res.data.version) {
_this6.ifNotice = true;
_this7.ifNotice = true;
uni.setStorageSync('noticeVersion', res.data.version);
_this6.notice = res.data.content;
_this7.notice = res.data.content;
} else {
// 获取工地公告
_this6.getWorksiteNotice();
_this7.getWorksiteNotice();
}
} else {
// 获取工地公告
_this6.getWorksiteNotice();
_this7.getWorksiteNotice();
}
}
});
@ -552,17 +550,17 @@ var _default = {
},
// 获取工地公告
getWorksiteNotice: function getWorksiteNotice() {
var _this7 = this;
var _this8 = this;
this.$requst.get('/api/v1/index/worksite-notice', {
worksite_id: this.registerObj.worksite_id
}).then(function (res) {
if (res.code == 0) {
console.log(res, '工地公告');
if (res.data.status == 1) {
if (res.data !== null && res.data.status == 1) {
if (uni.getStorageSync('wsNoticeVersion') !== res.data.version) {
_this7.ifWsNotice = true;
_this8.ifWsNotice = true;
uni.setStorageSync('wsNoticeVersion', res.data.version);
_this7.wsNotice = res.data.content;
_this8.wsNotice = res.data.content;
}
}
}
@ -570,31 +568,31 @@ var _default = {
},
// 查询审核资料
getCheckDetail: function getCheckDetail() {
var _this8 = this;
var _this9 = this;
this.$requst.get('/api/v1/worker/check-detail', {
id: this.noticeInfo.id
}).then(function (res) {
if (res.code == 0) {
console.log(res, '审核资料');
_this8.registerObj = res.data;
_this8.positionIndex = _this8.positionList.findIndex(function (item) {
_this9.registerObj = res.data;
_this9.positionIndex = _this9.positionList.findIndex(function (item) {
return item.id === res.data.position;
});
_this8.registerObj.pay = parseFloat(res.data.pay);
_this9.registerObj.pay = parseFloat(res.data.pay);
}
});
},
// 获取技术岗位
getPositionList: function getPositionList() {
var _this9 = this;
var _this10 = this;
this.$requst.get('/api/v1/common/position-list').then(function (res) {
if (res.code == 0) {
console.log(res, '技术岗位');
_this9.positionList = res.data.list;
_this9.registerObj.position = res.data.list[_this9.positionIndex].id;
if (_this9.noticeInfo.notice == 1) {
_this10.positionList = res.data.list;
_this10.registerObj.position = res.data.list[_this10.positionIndex].id;
if (_this10.noticeInfo.notice == 1) {
// 查询审核资料
_this9.getCheckDetail();
_this10.getCheckDetail();
}
}
});
@ -606,22 +604,22 @@ var _default = {
},
// 提交注册信息
submitRegister: function submitRegister() {
var _this10 = this;
var _this11 = this;
if (this.checkEmpty() && this.flag) {
this.flag = false;
var params = this.registerObj;
this.$requst.post('/api/v1/worker/register', params).then(function (res) {
if (res.code == 0) {
_this10.$toolAll.tools.showToast('提交成功');
_this11.$toolAll.tools.showToast('提交成功');
// 隐藏注册表
_this10.ifRegister = false;
_this11.ifRegister = false;
setTimeout(function () {
_this10.flag = true;
_this11.flag = true;
}, 2000);
} else {
_this10.$toolAll.tools.showToast(res.msg);
_this11.$toolAll.tools.showToast(res.msg);
setTimeout(function () {
_this10.flag = true;
_this11.flag = true;
}, 2000);
}
});
@ -652,29 +650,29 @@ var _default = {
},
// 获取打卡信息
getSignInfo: function getSignInfo() {
var _this11 = this;
var _this12 = this;
this.$requst.get('/api/v1/user/sign-info').then(function (res) {
if (res.code == 0) {
console.log(res, '打卡信息');
// 获取日期
_this11.currentDate = res.data.info.today;
_this12.currentDate = res.data.info.today;
// 获取星期几
_this11.currentWeek = res.data.info.week;
_this12.currentWeek = res.data.info.week;
// 获取当前时间
_this11.currenTime = res.data.info.now;
_this12.currenTime = res.data.info.now;
// 服务端时间处理
_this11.setIntervalEv();
_this12.setIntervalEv();
}
});
},
// 服务端时间处理
setIntervalEv: function setIntervalEv() {
var _this12 = this;
var _this13 = this;
// 改变计时器状态
this.timer = true;
if (this.timer) {
setInterval(function () {
var nowArr = _this12.currenTime.split(':');
var nowArr = _this13.currenTime.split(':');
var hour = parseInt(nowArr[0]);
var minute = parseInt(nowArr[1]);
var second = parseInt(nowArr[2]);
@ -693,13 +691,13 @@ var _default = {
}
}
}
_this12.currenTime = "".concat(hour < 10 ? '0' + hour : hour, ":").concat(minute < 10 ? '0' + minute : minute, ":").concat(second < 10 ? '0' + second : second);
_this13.currenTime = "".concat(hour < 10 ? '0' + hour : hour, ":").concat(minute < 10 ? '0' + minute : minute, ":").concat(second < 10 ? '0' + second : second);
}, 1000);
}
},
// 获取打卡记录
getSignList: function getSignList() {
var _this13 = this;
var _this14 = this;
var params = {};
if (uni.getStorageSync('worksite_id')) {
params = {
@ -710,9 +708,9 @@ var _default = {
if (res.code == 0) {
console.log(res, '打卡记录');
// 获取打卡状态
_this13.buttonColor = res.data.buttonColor;
_this14.buttonColor = res.data.buttonColor;
// 获取打卡记录列表
_this13.signList = res.data.list;
_this14.signList = res.data.list;
}
});
},
@ -742,7 +740,7 @@ var _default = {
},
// 打卡
signEv: function signEv() {
var _this14 = this;
var _this15 = this;
var params = {
type: this.radioList[this.radioIndex].type,
lat: this.siteInfo.lat,
@ -751,34 +749,34 @@ var _default = {
};
this.$requst.post('/api/v1/user/sign', params).then(function (res) {
if (res.code == 0) {
_this14.showRadio = false;
_this15.showRadio = false;
// 获取打卡记录
_this14.getSignList();
_this15.getSignList();
// 获取状态列表
_this14.$refs.signCalendar.getStatusObj();
_this15.$refs.signCalendar.getStatusObj();
} else {
_this14.$toolAll.tools.showToast(res.msg);
_this15.$toolAll.tools.showToast(res.msg);
}
});
},
// 选择图片
changeImg: function changeImg(type) {
var _this15 = this;
var _this16 = this;
uni.chooseImage({
count: 1,
//默认9
sourceType: ['album', 'camera'],
//从相册选择
success: function success(res) {
_this15.stagingImg = res.tempFilePaths[0];
_this16.stagingImg = res.tempFilePaths[0];
// 上传图片
_this15.uploadImg(type);
_this16.uploadImg(type);
}
});
},
// 上传图片
uploadImg: function uploadImg(type) {
var _this16 = this;
var _this17 = this;
uni.showLoading({
title: '上传中'
});
@ -787,13 +785,13 @@ var _default = {
}).then(function (res) {
if (res.code == 0) {
if (type == 'positive') {
_this16.registerObj.id_front = "".concat(getApp().globalData.hostapi) + res.data.src;
_this17.registerObj.id_front = res.data.src;
}
if (type == 'back') {
_this16.registerObj.id_back = "".concat(getApp().globalData.hostapi) + res.data.src;
_this17.registerObj.id_back = res.data.src;
}
if (type == 'bank') {
_this16.registerObj.bank_card_img = "".concat(getApp().globalData.hostapi) + res.data.src;
_this17.registerObj.bank_card_img = res.data.src;
}
}
uni.hideLoading();

File diff suppressed because one or more lines are too long

View File

@ -194,7 +194,9 @@ var _default = {
//当前选择
ifShow: false,
//是否展示弹窗
isLoding: false //是否记载完成
isLoding: false,
//是否记载完成
baseHttps: "".concat(getApp().globalData.hostapi)
};
},
onLoad: function onLoad() {
@ -338,25 +340,18 @@ var _default = {
path: this.stagingImg
}).then(function (res) {
if (res.code == 0) {
_this5.editMsg = res.data.src;
if (type == 'cover') {
_this5.userInfo.headimgurl = "".concat(getApp().globalData.hostapi) + res.data.src;
_this5.field = 'headimgurl';
_this5.editMsg = _this5.userInfo.headimgurl;
}
if (type == 'positive') {
_this5.userInfo.id_front = "".concat(getApp().globalData.hostapi) + res.data.src;
_this5.field = 'id_front';
_this5.editMsg = _this5.userInfo.id_front;
}
if (type == 'back') {
_this5.userInfo.id_back = "".concat(getApp().globalData.hostapi) + res.data.src;
_this5.field = 'id_back';
_this5.editMsg = _this5.userInfo.id_back;
}
if (type == 'bank') {
_this5.userInfo.bank_card_img = "".concat(getApp().globalData.hostapi) + res.data.src;
_this5.field = 'bank_card_img';
_this5.editMsg = _this5.userInfo.bank_card_img;
}
setTimeout(function () {
// 提交修改

File diff suppressed because one or more lines are too long

View File

@ -235,6 +235,7 @@ var _default = {
};
},
onLoad: function onLoad(op) {
var _this = this;
if (op.userType) {
this.userType = op.userType;
}
@ -249,14 +250,12 @@ var _default = {
}
// 获取工地列表
this.getWorksiteList();
},
onShow: function onShow() {
var _this = this;
setTimeout(function () {
// 获取打卡列表
_this.getSignList();
}, 200);
},
onShow: function onShow() {},
onReachBottom: function onReachBottom() {
if (this.signList.length < this.total) {
this.page++;

View File

@ -185,7 +185,7 @@ var _default = {
//状态栏高度
userType: 'director',
//账户类型 工人worker 负责人director
baseHttp: "".concat(getApp().globalData.hostapi),
baseHttps: "".concat(getApp().globalData.hostapi),
centerDetail: {},
//工人信息
reasonMsg: '',
@ -202,11 +202,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取工人信息
this.getEnterDetail();
},
onShow: function onShow() {},
methods: {
// 获取工人信息
getEnterDetail: function getEnterDetail() {
@ -217,12 +216,6 @@ var _default = {
if (res.code == 0) {
console.log(res, '工人信息');
_this.centerDetail = res.data;
_this.centerDetail.id_front = _this.$toolAll.tools.handleImg(res.data.id_front);
_this.centerDetail.account.id_front = _this.$toolAll.tools.handleImg(res.data.account.id_front);
_this.centerDetail.id_back = _this.$toolAll.tools.handleImg(res.data.id_back);
_this.centerDetail.account.id_back = _this.$toolAll.tools.handleImg(res.data.account.id_back);
_this.centerDetail.bank_card_img = _this.$toolAll.tools.handleImg(res.data.bank_card_img);
_this.centerDetail.account.bank_card_img = _this.$toolAll.tools.handleImg(res.data.account.bank_card_img);
}
});
},
@ -248,7 +241,6 @@ var _default = {
// 提交
submitApi: function submitApi(params, type) {
var _this2 = this;
console.log(params, type, 123);
this.$requst.post('/api/v1/manager/check-info', params).then(function (res) {
if (res.code == 0) {
if (type == 0) {

File diff suppressed because one or more lines are too long

View File

@ -185,7 +185,7 @@ var _default = {
//状态栏高度
userType: 'director',
//账户类型 工人worker 负责人director
baseHttp: "".concat(getApp().globalData.hostapi),
baseHttps: "".concat(getApp().globalData.hostapi),
workerDtail: {},
//工人信息
reasonMsg: '',
@ -202,11 +202,10 @@ var _default = {
if (op.userType) {
this.userType = op.userType;
}
},
onShow: function onShow() {
// 获取工人信息
this.getWorkerDetail();
},
onShow: function onShow() {},
methods: {
// 获取工人信息
getWorkerDetail: function getWorkerDetail() {
@ -217,14 +216,6 @@ var _default = {
if (res.code == 0) {
console.log(res, '工人信息');
_this.workerDtail = res.data;
_this.workerDtail.id_front = _this.$toolAll.tools.handleImg(res.data.id_front);
_this.workerDtail.id_back = _this.$toolAll.tools.handleImg(res.data.id_back);
_this.workerDtail.bank_card_img = _this.$toolAll.tools.handleImg(res.data.bank_card_img);
if (_this.workerDtail.check_info !== '') {
_this.workerDtail.check_info.bank_card_img = _this.$toolAll.tools.handleImg(res.data.check_info.bank_card_img);
_this.workerDtail.check_info.id_back = _this.$toolAll.tools.handleImg(res.data.check_info.id_back);
_this.workerDtail.check_info.id_front = _this.$toolAll.tools.handleImg(res.data.check_info.id_front);
}
}
});
},

File diff suppressed because one or more lines are too long