From 20fd59898b0c88e858d537d31eb3c70011d1ba00 Mon Sep 17 00:00:00 2001 From: Lee <342694918@qq.com> Date: Mon, 16 Jan 2023 15:10:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E6=88=90-0116?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsFile/tools.js | 20 -- pages/director/enter/enter.vue | 5 +- pages/director/expenditure/expenditure.vue | 15 +- pages/director/overtime/overtime.vue | 5 +- pages/director/sign/sign.vue | 5 +- pages/login/login.vue | 13 +- pages/pagehome/pagehome.vue | 8 +- pages/worker/my/my.vue | 2 +- pages/worker/sign/sign.vue | 67 +++--- pagesA/information/information.vue | 26 +-- pagesA/signRecord/signRecord.vue | 5 +- pagesB/enterDetail/enterDetail.vue | 32 ++- pagesB/workerDetail/workerDetail.vue | 27 +-- .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../components/nothing/nothing-page.js.map | 2 +- .../sign-calendar/sign-calendar.js.map | 2 +- .../components/status-nav/status-nav.js.map | 2 +- .../components/sub-nav/sub-nav.js.map | 2 +- .../mp-weixin/components/tabbar/tabbar.js.map | 2 +- .../pages/director/enter/enter.js.map | 2 +- .../director/expenditure/expenditure.js.map | 2 +- .../pages/director/overtime/overtime.js.map | 2 +- .../mp-weixin/pages/director/sign/sign.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../mp-weixin/pages/pageHome/pageHome.js.map | 2 +- .../mp-weixin/pages/worker/my/my.js.map | 2 +- .../mp-weixin/pages/worker/sign/sign.js.map | 2 +- .../pagesA/information/information.js.map | 2 +- .../pagesA/signRecord/signRecord.js.map | 2 +- .../pagesB/enterDetail/enterDetail.js.map | 2 +- .../pagesB/workerDetail/workerDetail.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 19 -- .../mp-weixin/pages/director/enter/enter.js | 3 +- .../pages/director/expenditure/expenditure.js | 3 +- .../director/expenditure/expenditure.wxml | 2 +- .../pages/director/overtime/overtime.js | 3 +- .../dev/mp-weixin/pages/director/sign/sign.js | 3 +- .../dist/dev/mp-weixin/pages/login/login.js | 10 +- .../dist/dev/mp-weixin/pages/login/login.wxml | 2 +- .../dev/mp-weixin/pages/pagehome/pagehome.js | 4 +- .../mp-weixin/pages/pagehome/pagehome.wxml | 2 +- .../dist/dev/mp-weixin/pages/worker/my/my.js | 2 +- .../dev/mp-weixin/pages/worker/sign/sign.js | 192 +++++++++--------- .../dev/mp-weixin/pages/worker/sign/sign.wxml | 2 +- .../pagesA/information/information.js | 13 +- .../pagesA/information/information.wxml | 2 +- .../mp-weixin/pagesA/signRecord/signRecord.js | 5 +- .../pagesB/enterDetail/enterDetail.js | 12 +- .../pagesB/enterDetail/enterDetail.wxml | 2 +- .../pagesB/workerDetail/workerDetail.js | 13 +- .../pagesB/workerDetail/workerDetail.wxml | 2 +- 52 files changed, 240 insertions(+), 324 deletions(-) diff --git a/jsFile/tools.js b/jsFile/tools.js index c1251be..79e3bce 100644 --- a/jsFile/tools.js +++ b/jsFile/tools.js @@ -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 手机号中间四位用"****"带替 */ diff --git a/pages/director/enter/enter.vue b/pages/director/enter/enter.vue index e9e9f16..6367e62 100644 --- a/pages/director/enter/enter.vue +++ b/pages/director/enter/enter.vue @@ -57,10 +57,11 @@ if(op.userType){ this.userType = op.userType; } + // 获取录入列表 + this.getEnterList(); }, onShow() { - // 获取录入列表 - this.getEnterList(); + }, onReachBottom() { if(this.enterList.length 工资总金额 - 合计:{{payInfo.amount?payInfo.amount:0}}元 + 合计:{{payInfo.amount>0?payInfo.amount:0}}元 基本工资 - {{payInfo.base_amount?payInfo.base_amount:0}}元 + {{payInfo.base_amount>0?payInfo.base_amount:0}}元 加班工资 - {{payInfo.overtime_amount?payInfo.overtime_amount:0}}元 + {{payInfo.overtime_amount>0?payInfo.overtime_amount:0}}元 待发工资 - {{payInfo.not_amount?payInfo.not_amount:0}}元 + {{payInfo.not_amount>0?payInfo.not_amount:0}}元 已发工资 - {{payInfo.done_amount?payInfo.done_amount:0}}元 + {{payInfo.done_amount>0?payInfo.done_amount:0}}元 @@ -110,10 +110,11 @@ if(op.userType){ this.userType = op.userType; } - }, - onShow() { // 获取工资列表 this.getPayList(); + }, + onShow() { + }, onReachBottom() { if(this.payList.length头像 @@ -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(); }) diff --git a/pages/pagehome/pagehome.vue b/pages/pagehome/pagehome.vue index 8dcd166..a4c3dfb 100644 --- a/pages/pagehome/pagehome.vue +++ b/pages/pagehome/pagehome.vue @@ -1,7 +1,5 @@ -