LK/income_payments_applet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改bug

Browse Source
This commit is contained in:
姚亚男
2021-10-20 12:02:08 +08:00
parent 1a6ef13392
commit 9e707240f9
13 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pages/committee/committee.wxss
+3
View File
@@ -15,6 +15,9 @@ page{
color: #333;
font-size: 14px;
margin-bottom: 10px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.item:last-child{
margin-bottom: 0;
pages/committeeDetail/committeeDetail.wxss
+3
View File
@@ -143,9 +143,12 @@ page{
overflow: hidden;
}
.info-file text{
display: block;
width: 100%;
overflow:hidden;
text-overflow: ellipsis;
white-space: nowrap;
margin: 0 !important;
}
.meeting-info{
width: 100%;
pages/forgetPassword/forgetPassword.js
+2 -2
View File
@@ -116,7 +116,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.password)){
wx.showToast({
title: '新密码由8位数字、大小写字母和特殊符号组成!!',
title: '新密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
@@ -136,7 +136,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.verifyPassword)){
wx.showToast({
title: '确认新密码由8位数字、大小写字母和特殊符号组成!!',
title: '确认新密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
pages/login/login.js
+5 -1
View File
@@ -14,6 +14,7 @@ Page({
},
bindInputPhone(e) {
this.data.phone = e.detail.value
this.setData({
phone: e.detail.value
})
@@ -103,7 +104,10 @@ Page({
url: '../home/home',
})
}else{ // 首次登录不能直接用微信快捷登录
wx.showToast({
title: '暂无授权手机号',
icon: 'none'
})
}
})
})
pages/login/login.json
+1
View File
@@ -1,3 +1,4 @@
{
"navigationBarTitleText": "登录",
"usingComponents": {}
}
pages/login/login.wxml
+1 -1
View File
@@ -3,7 +3,7 @@
<view class="form-item">
<view class="text-label">手机号</view>
<view class="text-value">
<input name="phone" bindinput="bindInputPhone" value="{{phone}}" placeholder="请输入手机号" />
<input name="phone" bindinput="bindInputPhone" placeholder="请输入手机号" />
</view>
</view>
<view class="form-item">
pages/phonePassword/phonePassword.js
+2 -1
View File
@@ -77,7 +77,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.password)){
wx.showToast({
title: '密码由8位数字、大小写字母和特殊符号组成!!',
title: '密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
@@ -129,6 +129,7 @@ Page({
}else{
wx.showToast({
title: res.message,
icon: 'none',
duration: 2000
})
this.handleChangeCheckCode()
pages/phonePassword/phonePassword.json
+1 -1
View File
@@ -1,4 +1,4 @@
{
"navigationBarTitleText": "修改密码",
"navigationBarTitleText": "登录",
"usingComponents": {}
}
pages/projectDetail/projectDetail.js
+14
View File
@@ -36,6 +36,20 @@ Page({
url: `../meetingDetailSigned/meetingDetailSigned?meetingInfo=${meetingInfo}`,
})
},
// 跳转合同详情
contractDetail(){
console.log(this.data.form)
if(this.data.form.contractId) { // 关联了合同才能去合同详情
wx.navigateTo({
url: `../contractDetail/contractDetail?id=${this.data.form.contractId}`,
})
}else{
wx.showToast({
title: '未关联合同',
icon: 'none'
})
}
},
/**
* 生命周期函数--监听页面加载
*/
pages/projectDetail/projectDetail.wxss
+4
View File
@@ -146,6 +146,10 @@ page{
overflow:hidden;
text-overflow: ellipsis;
white-space: nowrap;
display: block;
width: 100%;
margin: 0 !important;
text-align: right;
}
.meeting-info{
width: 100%;
pages/setPassword/setPassword.js
+2 -2
View File
@@ -30,7 +30,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.newPassword)){
wx.showToast({
title: '密码由8位数字、大小写字母和特殊符号组成!!',
title: '密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
@@ -50,7 +50,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.verifyPassword)){
wx.showToast({
title: '密码由8位数字、大小写字母和特殊符号组成!!',
title: '密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
pages/setPassword/setPassword.wxml
+2 -2
View File
@@ -5,13 +5,13 @@
<view class="form-item">
<view class="text-label">密码</view>
<view class="text-value">
<input name="newPassword" bindblur="bindBlurInput" value="{{newPassword}}" placeholder="请输入密码" />
<input name="newPassword" bindblur="bindBlurInput" value="{{newPassword}}" type="password" placeholder="请输入密码" />
</view>
</view>
<view class="form-item">
<view class="text-label">确认密码</view>
<view class="text-value">
<input name="verifyPassword" bindblur="bindBlurInput" value="{{verifyPassword}}" placeholder="请确认密码" />
<input name="verifyPassword" bindblur="bindBlurInput" value="{{verifyPassword}}" type="password" placeholder="请确认密码" />
</view>
</view>
<view class="btn-area">
pages/upDateInfo/upDateInfo.js
+3 -3
View File
@@ -79,7 +79,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.oldpassword)){
wx.showToast({
title: '旧密码由8位数字、大小写字母和特殊符号组成!!',
title: '旧密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
@@ -99,7 +99,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.password)){
wx.showToast({
title: '新密码由8位数字、大小写字母和特殊符号组成!!',
title: '新密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false
@@ -119,7 +119,7 @@ Page({
let pattern = /^(?=.*[a-zA-Z])(?=.*\d)(?=.*[~!@#$%^&*()_+`\-={}:";'<>?,.\/]).{8,}$/
if(!pattern.test(e.detail.value.confirmpassword)){
wx.showToast({
title: '密码由8位数字、大小写字母和特殊符号组成!!',
title: '密码由8位数字、大小写字母和特殊符号组成！',
icon: 'none'
})
this.data.flag = false