diff --git a/pages/committee/committee.wxss b/pages/committee/committee.wxss
index e78ee55..ffc36a6 100644
--- a/pages/committee/committee.wxss
+++ b/pages/committee/committee.wxss
@@ -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;
diff --git a/pages/committeeDetail/committeeDetail.wxss b/pages/committeeDetail/committeeDetail.wxss
index 5159e1d..4a1e8ef 100644
--- a/pages/committeeDetail/committeeDetail.wxss
+++ b/pages/committeeDetail/committeeDetail.wxss
@@ -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%;
diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index 3196323..21dce39 100644
--- a/pages/forgetPassword/forgetPassword.js
+++ b/pages/forgetPassword/forgetPassword.js
@@ -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
diff --git a/pages/login/login.js b/pages/login/login.js
index faea60a..d85115b 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -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'
+          })
         }
       })
     })
diff --git a/pages/login/login.json b/pages/login/login.json
index 8835af0..e301e43 100644
--- a/pages/login/login.json
+++ b/pages/login/login.json
@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "登录",
   "usingComponents": {}
 }
\ No newline at end of file
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index b244027..62bd907 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -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">
diff --git a/pages/phonePassword/phonePassword.js b/pages/phonePassword/phonePassword.js
index 62500b8..eaeae13 100644
--- a/pages/phonePassword/phonePassword.js
+++ b/pages/phonePassword/phonePassword.js
@@ -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()
diff --git a/pages/phonePassword/phonePassword.json b/pages/phonePassword/phonePassword.json
index 8e70e9e..e301e43 100644
--- a/pages/phonePassword/phonePassword.json
+++ b/pages/phonePassword/phonePassword.json
@@ -1,4 +1,4 @@
 {
-  "navigationBarTitleText": "修改密码",
+  "navigationBarTitleText": "登录",
   "usingComponents": {}
 }
\ No newline at end of file
diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js
index 7d84e91..4bed3cd 100644
--- a/pages/projectDetail/projectDetail.js
+++ b/pages/projectDetail/projectDetail.js
@@ -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'
+      })
+    }
+  },
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/pages/projectDetail/projectDetail.wxss b/pages/projectDetail/projectDetail.wxss
index 5159e1d..558cf32 100644
--- a/pages/projectDetail/projectDetail.wxss
+++ b/pages/projectDetail/projectDetail.wxss
@@ -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%;
diff --git a/pages/setPassword/setPassword.js b/pages/setPassword/setPassword.js
index d973ecb..4396728 100644
--- a/pages/setPassword/setPassword.js
+++ b/pages/setPassword/setPassword.js
@@ -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
diff --git a/pages/setPassword/setPassword.wxml b/pages/setPassword/setPassword.wxml
index f80932f..3355739 100644
--- a/pages/setPassword/setPassword.wxml
+++ b/pages/setPassword/setPassword.wxml
@@ -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">
diff --git a/pages/upDateInfo/upDateInfo.js b/pages/upDateInfo/upDateInfo.js
index af7838b..935adb2 100644
--- a/pages/upDateInfo/upDateInfo.js
+++ b/pages/upDateInfo/upDateInfo.js
@@ -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