diff --git a/assets/css/common.wxss b/assets/css/common.wxss index 8da6aa0..7d71eb7 100644 --- a/assets/css/common.wxss +++ b/assets/css/common.wxss @@ -826,7 +826,7 @@ color: #2A2A2A; width: 70px; margin-left: 10px; height: 30px; - background-color: #07c160; + background-color: #069F99; color: #fff; font-size: 12px; display: flex; diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js index 2d3d9c2..c2d1bf5 100644 --- a/pages/forgetPassword/forgetPassword.js +++ b/pages/forgetPassword/forgetPassword.js @@ -38,7 +38,7 @@ Page({ if (/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/.test(this.data.phone)) { UserApi.sendCode({ phone: this.data.phone, - codeType: 1 + codeType: 2 }).then(res => { // 获取成功,倒计时 start if (res.success) { diff --git a/pages/mine/mine.js b/pages/mine/mine.js index 0508309..d070854 100644 --- a/pages/mine/mine.js +++ b/pages/mine/mine.js @@ -65,9 +65,9 @@ Page({ onlyFromCamera: false, scanType: [], success: (result) => { - // if(result.result.indexOf("scanSign") > -1){ // 证明是签到二维码 - // let meetingId = result.result.split("=")[1] // 会议Id - let meetingId = result.result // 会议Id + if (result.result.indexOf("scanSign") > -1) { // 证明是签到二维码 + let meetingId = result.result.split("=")[1] // 会议Id + // let meetingId = result.result // 会议Id // 成功扫码的回调 UserApi.scanCode({ meetingId @@ -84,16 +84,15 @@ Page({ url: `../scanSign/scanSign?signed=0&meeting=${result}`, }) } - }).catch(err=>{ + }).catch(err => {}) + } else { + wx.showToast({ + title: '此二维码不是签到码', + icon: 'none', + duration: 2000 }) - // }else { - // wx.showToast({ - // title: '此二维码不是签到码', - // icon: 'none', - // duration: 2000 - // }) - // return - // } + return + } } }) }) @@ -142,6 +141,12 @@ Page({ }) }) } + }, + fail(err) { + wx.showToast({ + title: err.message, + icon: 'none' + }) } }) }, @@ -172,7 +177,7 @@ Page({ phone: userInfo.phone.substr(0, 3) + '-' + userInfo.phone.substr(3, 4) + '-' + userInfo.phone.substr(7, 4) }) } - if(userInfoTemp){ + if (userInfoTemp) { this.setData({ avatarUrl: userInfoTemp.avatarUrl }) diff --git a/pages/mineContract/mineContract.wxml b/pages/mineContract/mineContract.wxml index f77dc0c..5f04f5c 100644 --- a/pages/mineContract/mineContract.wxml +++ b/pages/mineContract/mineContract.wxml @@ -1,13 +1,23 @@ - - - - {{item.contractName}} - 合同金额:{{item.contractAmount ? item.contractAmount + '元' : '0'}} - - - 合同编号:{{item.contractNum}} - 负责人:{{item.principalName}} + + + + + 合同名称 + {{item.contractName}} + + + 合同金额 + {{item.contractAmount ? item.contractAmount + '元' : ''}} + + + 合同编号 + {{item.contractNum}} + + + 负责人 + {{item.principalName}} + diff --git a/pages/mineContract/mineContract.wxss b/pages/mineContract/mineContract.wxss index 54d12f0..3bdd8a6 100644 --- a/pages/mineContract/mineContract.wxss +++ b/pages/mineContract/mineContract.wxss @@ -1,27 +1,30 @@ /* pages/mineContract/mineContract.wxss */ page{ - background-color: #F5F5F5; + background-color: #f5f5f5; padding: 15px; width: 100%; box-sizing: border-box; } -.list-item{ +.basic-info .container{ display: flex; - padding: 15px; - height: 40px; - justify-content: space-between; flex-direction: column; - background-color: #fff; border-radius: 10px; - color: #333; } -.list-item:not(:first-child){ - margin-top: 10px; -} -.list-item .list-info{ - color: #333; +.basic-info .container view{ + background-color: #FFF; + padding: 15px; display: flex; justify-content: space-between; align-items: center; + color: #333; font-size: 14px; + border-bottom: 0.5px solid #f5f5f5; + position: relative; } +.basic-info view:last-child{ + border-bottom: 0; +} +.basic-info view text:nth-child(1){ + flex-shrink: 0; + margin-right: 10px; +} \ No newline at end of file diff --git a/pages/mineInfo/mineInfo.js b/pages/mineInfo/mineInfo.js index c3b261f..1c936f9 100644 --- a/pages/mineInfo/mineInfo.js +++ b/pages/mineInfo/mineInfo.js @@ -74,6 +74,19 @@ Page({ this.setData({ isDisabled: false }) + // 性别处理 + if (this.data.form.gender == '1') { + this.data.sexArr[0].checked = "true" + this.setData({ + sexArr: this.data.sexArr, + }) + } + if (this.data.form.gender == '2') { + this.data.sexArr[1].checked = "true" + this.setData({ + sexArr: this.data.sexArr, + }) + } }, // 提交 formSubmit(e) { @@ -193,13 +206,13 @@ Page({ form: res.result }) // 性别处理 - if (this.data.form.gender === '1') { + if (this.data.form.gender == '1') { this.data.sexArr[0].checked = "true" this.setData({ sexArr: this.data.sexArr, }) } - if (this.data.form.gender === '2') { + if (this.data.form.gender == '2') { this.data.sexArr[1].checked = "true" this.setData({ sexArr: this.data.sexArr, diff --git a/pages/mineInfo/mineInfo.wxml b/pages/mineInfo/mineInfo.wxml index f4f3b6d..899f5c1 100644 --- a/pages/mineInfo/mineInfo.wxml +++ b/pages/mineInfo/mineInfo.wxml @@ -32,7 +32,7 @@ diff --git a/pages/mineInfo/mineInfo.wxss b/pages/mineInfo/mineInfo.wxss index ec75104..2a67921 100644 --- a/pages/mineInfo/mineInfo.wxss +++ b/pages/mineInfo/mineInfo.wxss @@ -11,7 +11,7 @@ height: 40px; justify-content: flex-end; align-items: center; - color: #07c160; + color: #069F99; } .list{ padding: 15px; @@ -59,4 +59,7 @@ width: 11px; height: 11px; margin-right: 10px; +} +.btn-area button{ + background-color: #069F99 !important; } \ No newline at end of file diff --git a/pages/project/project.js b/pages/project/project.js index 9b19039..472d121 100644 --- a/pages/project/project.js +++ b/pages/project/project.js @@ -157,3 +157,4 @@ Page({ this.loadData() }, }) + \ No newline at end of file