diff --git a/app.js b/app.js
index 33e814b..4671a20 100644
--- a/app.js
+++ b/app.js
@@ -1,27 +1,43 @@
// app.js
+import UserApi from 'assets/js/http/userApi'
+import { wxBind } from 'assets/js/common'
App({
onLaunch() {
// 展示本地存储能力
const logs = wx.getStorageSync('logs') || []
logs.unshift(Date.now())
wx.setStorageSync('logs', logs)
- // wx.getStorage({
- // key: 'X-Access-Token',
- // success: (res) =>{// 缓存中登录过，直接进小程序
- // wx.switchTab({
- // url: 'pages/home/home',
- // })
- // },
- // fail: function(){
- // // 缓存中没有登录过默认app.json的登录页
- // }
- // })
- // 登录
- wx.login({
- success: res => {
- // 发送 res.code 到后台换取 openId, sessionKey, unionId
+ // 长时间不操作导致token失效之后执行自动微信登录操作
+ wx.getStorage({
+ key: 'rsaPublicKey',
+ success(result){
+ wxBind((res)=>{
+ let params = {
+ openId: res.data.openid,
+ rsaPublicKey: result.rsaPublicKey
+ }
+ UserApi.wxLogin(params).then(res=>{
+ if(res.success) { // 已经用手机号登录过，此时用微信快捷登录时，把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
+ wx.setStorageSync('userInfo', res.result.userInfo)
+ wx.setStorage({
+ key: 'X-Access-Token',
+ data: res.result.token
+ })
+ wx.switchTab({
+ url: '../home/home',
+ })
+ }else{ // 首次登录不能直接用微信快捷登录
+ wx.showToast({
+ title: '暂无授权手机号, 请重新登录',
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ })
}
})
+
},
globalData: {
userInfo: null
diff --git a/pages/committee/committee.js b/pages/committee/committee.js
index df5fb62..1b2cdbd 100644
--- a/pages/committee/committee.js
+++ b/pages/committee/committee.js
@@ -41,7 +41,7 @@ Page({
// 分标委详情页
detail(e){
wx.navigateTo({
- url: `../committeeDetail/committeeDetail?id=${e.currentTarget.dataset.committee.id}`,
+ url: `../committeeDetail/committeeDetail?id=${e.currentTarget.dataset.committee.id}&name=${e.currentTarget.dataset.committee.name}`,
})
},
diff --git a/pages/committee/committee.json b/pages/committee/committee.json
index 61f9e0c..da8aab1 100644
--- a/pages/committee/committee.json
+++ b/pages/committee/committee.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "分标委",
+ "navigationBarTitleText": "项目",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/committeeDetail/committeeDetail.js b/pages/committeeDetail/committeeDetail.js
index 82d524e..f2d8e88 100644
--- a/pages/committeeDetail/committeeDetail.js
+++ b/pages/committeeDetail/committeeDetail.js
@@ -8,6 +8,7 @@ Page({
*/
data: {
form: {},
+ name: '',
id: '', // 在工作组id,项目id
projectFileList: [], // 项目资料文件
meetingList: [] // 会议文件
@@ -35,12 +36,15 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ this.setData({
+ name: options.name
+ })
wx.showToast({
title: '加载中...',
icon: 'loading'
})
this.data.id = options.id
- MeetingApi.meetingList({caseCommitteeId: this.data.id}).then(res=>{
+ MeetingApi.meetingList({caseCommitteeId: this.data.id, meetingSignUpType: 2, column: 'pm.createTime', order: 'desc'}).then(res=>{
if(res.success){
if(res.result.records && res.result.records.length <= 2){
this.setData({
diff --git a/pages/committeeDetail/committeeDetail.json b/pages/committeeDetail/committeeDetail.json
index 61f0f4a..ee57502 100644
--- a/pages/committeeDetail/committeeDetail.json
+++ b/pages/committeeDetail/committeeDetail.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "详情",
+ "navigationBarTitleText": "项目详情",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/committeeDetail/committeeDetail.wxml b/pages/committeeDetail/committeeDetail.wxml
index ba3aea0..c5f63b5 100644
--- a/pages/committeeDetail/committeeDetail.wxml
+++ b/pages/committeeDetail/committeeDetail.wxml
@@ -2,7 +2,7 @@
项目名称
- {{form.name}}
+ {{name}}
项目资料
@@ -26,4 +26,4 @@
暂无会议记录！
-
\ No newline at end of file
+
diff --git a/pages/committeeDetail/committeeDetail.wxss b/pages/committeeDetail/committeeDetail.wxss
index 4a1e8ef..0d3fcfb 100644
--- a/pages/committeeDetail/committeeDetail.wxss
+++ b/pages/committeeDetail/committeeDetail.wxss
@@ -41,6 +41,11 @@ page{
.meeting-name{
margin-bottom: 10px;
}
+.meeting-name text:nth-child(2){
+ text-overflow:ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+}
.meeting-files{
margin-top: 10px;
flex-direction: column;
@@ -145,6 +150,7 @@ page{
.info-file text{
display: block;
width: 100%;
+ text-align: right;
overflow:hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -267,4 +273,4 @@ page{
display: block;
text-align: center;
line-height: 40px;
-}
\ No newline at end of file
+}
diff --git a/pages/contractDetail/contractDetail.js b/pages/contractDetail/contractDetail.js
index 7f029b9..c3265c4 100644
--- a/pages/contractDetail/contractDetail.js
+++ b/pages/contractDetail/contractDetail.js
@@ -7,6 +7,12 @@ Page({
data: {
form: {}
},
+ // 跳转项目详情
+ projectDetail(e){
+ wx.navigateTo({
+ url: `../projectDetail/projectDetail?id=${e.currentTarget.dataset.file.id}`,
+ })
+ },
// 查看物流
track(e){
// 查看物流
diff --git a/pages/contractDetail/contractDetail.json b/pages/contractDetail/contractDetail.json
index 61f0f4a..bc67bc0 100644
--- a/pages/contractDetail/contractDetail.json
+++ b/pages/contractDetail/contractDetail.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "详情",
+ "navigationBarTitleText": "合同详情",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/contractDetail/contractDetail.wxml b/pages/contractDetail/contractDetail.wxml
index 9f8f1a1..11e97dd 100644
--- a/pages/contractDetail/contractDetail.wxml
+++ b/pages/contractDetail/contractDetail.wxml
@@ -17,12 +17,12 @@
合同金额
- {{form.contractAmount ? form.contractAmount + '元' : 0}}
+ {{form.contractAmount ? form.contractAmount + '元' : ''}}
关联项目
- {{item.chargeProject}}撒打算打sadsaasdsadas算阿江河湖海三打算
+ {{item.chargeProject}}
@@ -30,9 +30,10 @@
邮寄信息
-
- {{form.contractNum}}由{{form.payMailContract.createBy}}于{{form.payMailContract.createTime}}邮寄，快递号：{{form.payMailContract.postNo}}
+
+ {{form.contractNum}}由{{form.payMailContract.mailName}}于{{form.payMailContract.createTime}}邮寄，快递号：{{form.payMailContract.postNo}}
查看物流
+ 暂无邮寄记录！
diff --git a/pages/forgetPassword/forgetPassword.json b/pages/forgetPassword/forgetPassword.json
index 8835af0..494f81c 100644
--- a/pages/forgetPassword/forgetPassword.json
+++ b/pages/forgetPassword/forgetPassword.json
@@ -1,3 +1,4 @@
{
+ "navigationBarTitleText": "忘记密码",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/forgetPassword/forgetPassword.wxml b/pages/forgetPassword/forgetPassword.wxml
index 5956659..d69cfdf 100644
--- a/pages/forgetPassword/forgetPassword.wxml
+++ b/pages/forgetPassword/forgetPassword.wxml
@@ -16,7 +16,7 @@
新密码
-
+
@@ -24,7 +24,7 @@
确认密码
-
+
diff --git a/pages/forgetPassword/forgetPassword.wxss b/pages/forgetPassword/forgetPassword.wxss
index 57df52c..e6de5cf 100644
--- a/pages/forgetPassword/forgetPassword.wxss
+++ b/pages/forgetPassword/forgetPassword.wxss
@@ -9,6 +9,9 @@ page {
.text-value{
position: relative;
}
+.text-password input{
+ padding-right: 30px;
+}
.show{
width: 15px;
height: 15px;
@@ -16,4 +19,4 @@ page {
right: 10px;
top: 8px;
z-index: 9;
-}
\ No newline at end of file
+}
diff --git a/pages/home/home.js b/pages/home/home.js
index 20f8b70..fc89f4d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -11,7 +11,7 @@ Page({
date: '',
list: [], // 消息列表
selectArr: [
- { path: '../../assets/images/laikuan.png', text: '来款项目' },
+ { path: '../../assets/images/laikuan.png', text: '项目' },
{ path: '../../assets/images/gongzuozu.png', text: '工作组' },
{ path: '../../assets/images/fenbiaowei.png', text: '分标委' },
{ path: '../../assets/images/huiyi.png', text: '会议活动' },
@@ -98,6 +98,7 @@ Page({
const templateCode = e.currentTarget.dataset.message.templateCode
if(readFlag == 0) { // 标记已读
UserApi.messageStatus({anntId: e.currentTarget.dataset.message.anntId}).then(res=>{
+ this.loadData()
wx.showToast({
title: '已读成功',
icon: 'none'
diff --git a/pages/home/home.json b/pages/home/home.json
index 965b8e8..254d3e0 100644
--- a/pages/home/home.json
+++ b/pages/home/home.json
@@ -1,4 +1,5 @@
{
+ "navigationBarTitleText": "首页",
"usingComponents": {},
"navigationStyle": "custom"
-}
\ No newline at end of file
+}
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index c697b87..a3b4574 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -30,7 +30,7 @@
-
+
时间
{{searchParams.startTime}}
@@ -58,7 +58,7 @@
- 暂无数据
+ 暂无消息通知！
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 4d6871b..fb1208d 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -67,12 +67,14 @@ page{
border-radius: 10px;
}
.list-content .list-content-item{
- height: 60px;
+ min-height: 50px;
+ padding: 5px 0;
border-bottom: 0.5px solid #f5f5f5;
display: flex;
flex-direction: column;
justify-content: space-around;
position: relative;
+
}
.list-content-item:last-child{
border: 0;
@@ -104,9 +106,13 @@ page{
.content-bottom{
color: #555;
font-size: 13px;
- white-space: nowrap;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 3;
text-overflow: ellipsis;
overflow: hidden;
+ line-height: 20px;
+ margin-top: 5px;
}
.status{
position: absolute;
diff --git a/pages/login/login.js b/pages/login/login.js
index 9fecdbd..d98d2ee 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -9,8 +9,10 @@ Page({
captcha: '',
openId: '',
count: 60,
+ userInfoTemp: '',
rsaPublicKey: '',
- showGetCaptcha: true
+ showGetCaptcha: true,
+ authorize: false // 默认没有微信授权
},
bindInputPhone(e) {
@@ -87,33 +89,98 @@ Page({
},
// 微信登录
wxLogin(){
- wx.showToast({
- title: '登录中...',
- icon: 'loading'
- })
const that = this
- wxBind((res)=>{
- let params = {
- openId: res.data.openid,
- rsaPublicKey: that.data.rsaPublicKey
- }
- UserApi.wxLogin(params).then(res=>{
- if(res.success) {// 已经用手机号登录过，此时用微信快捷登录时，把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
- wx.setStorageSync('userInfo', res.result.userInfo)
- wx.setStorage({
- key: 'X-Access-Token',
- data: res.result.token
- })
- wx.switchTab({
- url: '../home/home',
- })
- }else{ // 首次登录不能直接用微信快捷登录
+ wx.getStorage({
+ key: 'authorize',
+ success(result){
+ // 做过查看微信用户信息
+ if(result.data){ // 做过用户信息获取
wx.showToast({
- title: '暂无授权手机号',
- icon: 'none'
+ title: '登录中...',
+ icon: 'loading'
})
+ wxBind((res)=>{
+ let params = {
+ openId: res.data.openid,
+ rsaPublicKey: that.data.rsaPublicKey
+ }
+ UserApi.wxLogin(params).then(res=>{
+ if(res.success) {// 已经用手机号登录过，此时用微信快捷登录时，把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
+ wx.setStorageSync('userInfo', res.result.userInfo)
+ wx.setStorage({
+ key: 'X-Access-Token',
+ data: res.result.token
+ })
+ wx.switchTab({
+ url: '../home/home',
+ })
+ wx.setStorageSync('authorize', true) // 设置有过微信授权
+ wx.setStorageSync('avatarUrl', that.data.userInfoTemp.avatarUrl)
+ }else{ // 首次登录不能直接用微信快捷登录
+ wx.showToast({
+ title: '暂无授权手机号',
+ icon: 'none'
+ })
+ }
+ })
+ })
+ }else{
+ that.getUserInfo()
}
- })
+ },
+ fail(err){
+ // 没有做过查看微信用户信息
+ that.getUserInfo()
+ }
+ })
+ },
+ // 获取用户信息，微信登录
+ getUserInfo(){
+ const that = this
+ wx.getUserProfile({
+ desc: '用于完善用户信息',
+ success(result){
+ let userInfoTemp = JSON.parse(result.rawData)
+ wx.setStorage({
+ key: 'userInfoTemp',
+ data: userInfoTemp
+ })
+ that.setData({
+ userInfoTemp
+ })
+ wx.showToast({
+ title: '登录中...',
+ icon: 'loading'
+ })
+ wxBind((res)=>{
+ let params = {
+ openId: res.data.openid,
+ rsaPublicKey: that.data.rsaPublicKey
+ }
+ UserApi.wxLogin(params).then(res=>{
+ if(res.success) {// 已经用手机号登录过，此时用微信快捷登录时，把微信的个人信息存进缓存(微信信息在缓存的userInfoTemp)
+ wx.setStorageSync('userInfo', res.result.userInfo)
+ wx.setStorage({
+ key: 'X-Access-Token',
+ data: res.result.token
+ })
+ wx.switchTab({
+ url: '../home/home',
+ })
+ wx.setStorageSync('authorize', true) // 设置有过微信授权
+ wx.setStorageSync('avatarUrl', that.data.userInfoTemp.avatarUrl)
+ }else{ // 首次登录不能直接用微信快捷登录
+ wx.showToast({
+ title: '暂无授权手机号',
+ icon: 'none'
+ })
+ }
+ })
+ })
+ },
+ fail(err){
+ wx.setStorageSync('authorize', false)
+ }
})
},
// 登录
@@ -201,7 +268,15 @@ Page({
})
},
onLoad(){
-
+ const that = this
+ wx.getStorage({
+ key: 'userInfoTemp',
+ success(res){
+ that.setData({
+ userInfoTemp: res.data
+ })
+ }
+ })
},
/**
* 生命周期函数--监听页面显示
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 4395bb6..816843e 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -15,7 +15,7 @@ Page({
meetingStartTime: '', // 开始时间
meetingEndTime: '', // 结束时间
// 创建时间倒叙排序
- column: 'createTime',
+ column: 'pm.createTime',
order: 'desc'
},
// 会议筛选参数
diff --git a/pages/meeting/meeting.wxml b/pages/meeting/meeting.wxml
index c135c34..f201b45 100644
--- a/pages/meeting/meeting.wxml
+++ b/pages/meeting/meeting.wxml
@@ -15,7 +15,7 @@
-
+
时间
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index ec5539d..3928f34 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -9,6 +9,7 @@ Page({
data: {
userId: '',
name: '',
+ avatarUrl: '', // 头像
phone: '未知手机号',
rsaPublicKey: '',
},
@@ -37,17 +38,12 @@ Page({
success(res) {
if (res.confirm) {
UserApi.wxUnbind().then(res => {
- if (res.success) {
- wx.clearStorage()
- wx.redirectTo({
- url: '../login/login',
- })
- } else {
- wx.clearStorage()
- wx.redirectTo({
- url: '../login/login',
- })
- }
+ wx.removeStorage({key:'userInfo'})
+ wx.removeStorage({key:'X-Access-Token'})
+ wx.removeStorage({key:'avatarUrl'})
+ wx.redirectTo({
+ url: '../login/login',
+ })
})
} else if (res.cancel) {}
}
@@ -115,7 +111,9 @@ Page({
success(res) {
if (res.confirm) {
UserApi.logout().then(res => {
- wx.clearStorage()
+ wx.removeStorage({key:'userInfo'})
+ wx.removeStorage({key:'X-Access-Token'})
+ wx.removeStorage({key:'avatarUrl'})
wx.redirectTo({
url: '../login/login',
})
@@ -124,6 +122,17 @@ Page({
}
})
},
+ onLoad(){
+ const that = this
+ wx.getStorage({
+ key: 'avatarUrl',
+ success(res){
+ that.setData({
+ avatarUrl: res.data
+ })
+ }
+ })
+ },
/**
* 生命周期函数--监听页面显示
*/
diff --git a/pages/mine/mine.json b/pages/mine/mine.json
index 965b8e8..e35f17f 100644
--- a/pages/mine/mine.json
+++ b/pages/mine/mine.json
@@ -1,4 +1,5 @@
{
+ "navigationBarTitleText": "我的",
"usingComponents": {},
"navigationStyle": "custom"
-}
\ No newline at end of file
+}
diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml
index 167a86e..42c2b09 100644
--- a/pages/mine/mine.wxml
+++ b/pages/mine/mine.wxml
@@ -5,7 +5,8 @@
-
+
+
未登录
{{name}}
diff --git a/pages/phonePassword/phonePassword.wxml b/pages/phonePassword/phonePassword.wxml
index 161c84e..3b97e84 100644
--- a/pages/phonePassword/phonePassword.wxml
+++ b/pages/phonePassword/phonePassword.wxml
@@ -9,7 +9,7 @@
密码
-
+
diff --git a/pages/phonePassword/phonePassword.wxss b/pages/phonePassword/phonePassword.wxss
index 7498aed..9c3871e 100644
--- a/pages/phonePassword/phonePassword.wxss
+++ b/pages/phonePassword/phonePassword.wxss
@@ -9,6 +9,9 @@
.text-value{
position: relative;
}
+.text-password input{
+ padding-right: 30px;
+}
.forget{
color: #999;
font-size: 14px;
@@ -38,4 +41,4 @@
right: 10px;
top: 8px;
z-index: 9;
-}
\ No newline at end of file
+}
diff --git a/pages/project/project.wxml b/pages/project/project.wxml
index 20915bf..dc33e91 100644
--- a/pages/project/project.wxml
+++ b/pages/project/project.wxml
@@ -18,7 +18,7 @@
-
+
时间
@@ -35,7 +35,7 @@
{{item.needInvoice === 0 ? '不需要发票' : '需要发票'}}
到账
开票
- 邮寄
+ 邮寄
@@ -43,4 +43,4 @@
暂无数据
-
\ No newline at end of file
+
diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js
index b3f806b..a40df97 100644
--- a/pages/projectDetail/projectDetail.js
+++ b/pages/projectDetail/projectDetail.js
@@ -105,7 +105,9 @@ Page({
showMeeting: true
})
MeetingApi.meetingList({
- workingGroupProjectId: this.data.id
+ workingGroupProjectId: this.data.id,
+ column: 'pm.createTime',
+ order: 'desc'
}).then(res => {
console.log(res)
if (res.success) {
@@ -204,4 +206,4 @@ Page({
onShareAppMessage: function () {
}
-})
\ No newline at end of file
+})
diff --git a/pages/projectDetail/projectDetail.json b/pages/projectDetail/projectDetail.json
index 61f0f4a..ee57502 100644
--- a/pages/projectDetail/projectDetail.json
+++ b/pages/projectDetail/projectDetail.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "详情",
+ "navigationBarTitleText": "项目详情",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/projectDetail/projectDetail.wxml b/pages/projectDetail/projectDetail.wxml
index 04b429b..7154ce3 100644
--- a/pages/projectDetail/projectDetail.wxml
+++ b/pages/projectDetail/projectDetail.wxml
@@ -11,7 +11,7 @@
运行年份
- {{form.year}}年
+ {{form.year ? form.year + '年' : ''}}
项目负责人
@@ -19,11 +19,11 @@
应付金额
- {{form.receivableAmount ? form.receivableAmount + '元' : '0'}}
+ {{form.receivableAmount ? form.receivableAmount + '元' : ''}}
实付金额
- {{form.paidAmount ? form.paidAmount + '元' : '0'}}
+ {{form.paidAmount ? form.paidAmount + '元' : ''}}
企业联系人
@@ -107,6 +107,7 @@
{{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}}
+ 项目名称：{{item.chargeCompanyName}}
票
@@ -121,7 +122,7 @@
邮
- 邮寄人：{{item.contactName}}
+ 邮寄人：{{item.mailName ? item.mailName : '无'}}
邮寄时间：{{item.sendDate ? item.sendDate : '无'}}
@@ -134,4 +135,4 @@
暂无邮寄记录！
-
\ No newline at end of file
+
diff --git a/pages/projectDetail/projectDetail.wxss b/pages/projectDetail/projectDetail.wxss
index 558cf32..f2eda7d 100644
--- a/pages/projectDetail/projectDetail.wxss
+++ b/pages/projectDetail/projectDetail.wxss
@@ -134,6 +134,16 @@ page{
padding: 0 !important;
height: auto !important;
}
+.project-name{
+ display: block !important;
+ width: 100%;
+ overflow: hidden !important;
+ text-overflow: ellipsis !important;
+ white-space: nowrap !important;
+ box-sizing: border-box;
+ height: 40px !important;
+ line-height: 40px;
+}
.info-file{
padding: 0 !important;
display: flex;
@@ -179,21 +189,32 @@ page{
height: 23px;
margin-right: 10px;
}
+.way-info{
+ display: flex;
+}
.way-info .way-left{
padding: 0;
display: flex;
justify-content: flex-start !important;
+ width: 70%;
}
.way-info .way-center{
display: flex;
- flex-direction: column;
- justify-content: space-between;
- align-items: flex-start;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: flex-start;
+ width: 100%;
+ overflow: hidden;
}
.way-info .way-center text:nth-child(1){
color: #333;
+ display: block;
+ width: 100%;
font-size: 14px;
flex-shrink: 0;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
.way-info .way-center text:nth-child(2){
color: #999;
@@ -202,29 +223,35 @@ page{
}
.way-info .green {
width: 20px;
- height: 20px;
- background: #069F99;
- color: #fff;
- font-size: 11px;
- text-align: center;
- line-height: 20px;
- border-radius: 5px;
+ height: 20px;
+ background: #069F99;
+ color: #fff;
+ font-size: 11px;
+ text-align: center;
+ line-height: 20px;
+ border-radius: 5px;
}
.way-info .blue {
width: 20px;
- height: 20px;
- background: #0A72F7;
- color: #fff;
- font-size: 11px;
- text-align: center;
- line-height: 20px;
- border-radius: 5px;
+ height: 20px;
+ background: #0A72F7;
+ color: #fff;
+ font-size: 11px;
+ text-align: center;
+ line-height: 20px;
+ border-radius: 5px;
}
.way-info .way-right{
- flex-shrink: 0;
+ width: 30%;
+ word-break: break-word;
padding: 0;
color: #666;
font-size: 12px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 3;
+ -webkit-box-orient: vertical;
}
.basic-info .look-progress{
padding: 0 15px;
@@ -268,4 +295,4 @@ page{
display: block;
text-align: center;
line-height: 40px;
-}
\ No newline at end of file
+}
diff --git a/pages/setPassword/setPassword.json b/pages/setPassword/setPassword.json
index 8835af0..7b32ff4 100644
--- a/pages/setPassword/setPassword.json
+++ b/pages/setPassword/setPassword.json
@@ -1,3 +1,4 @@
{
+ "navigationBarTitleText": "设置密码",
"usingComponents": {}
-}
\ No newline at end of file
+}
diff --git a/pages/setPassword/setPassword.wxml b/pages/setPassword/setPassword.wxml
index ad249d7..0bf413d 100644
--- a/pages/setPassword/setPassword.wxml
+++ b/pages/setPassword/setPassword.wxml
@@ -4,7 +4,7 @@
-
\ No newline at end of file
+
diff --git a/pages/setPassword/setPassword.wxss b/pages/setPassword/setPassword.wxss
index 9b476de..43e4115 100644
--- a/pages/setPassword/setPassword.wxss
+++ b/pages/setPassword/setPassword.wxss
@@ -10,6 +10,9 @@ page {
.text-value{
position: relative;
}
+.text-password input{
+ padding-right: 30px;
+}
.set-password{
display: block;
font-size: 16px;
diff --git a/pages/upDateInfo/upDateInfo.wxml b/pages/upDateInfo/upDateInfo.wxml
index 556715d..528ae15 100644
--- a/pages/upDateInfo/upDateInfo.wxml
+++ b/pages/upDateInfo/upDateInfo.wxml
@@ -3,7 +3,7 @@