diff --git a/components/imageUpload/imageUpload.js b/components/imageUpload/imageUpload.js
index c3e8b15..e3948b8 100644
--- a/components/imageUpload/imageUpload.js
+++ b/components/imageUpload/imageUpload.js
@@ -124,12 +124,12 @@ Component({
                 success: function (res) {
                   imgids.push(JSON.parse(res.data).result.id)
                   count++;
-                  //如果是最后一张,则隐藏等待中  
+                  //如果是最后一张,则隐藏等待中
                   if (count == tempFilePaths.length) {
                     wx.hideToast();
                     that.triggerEvent("getIds",imgids)
                   }
-                  
+
                 },
                 fail: function (res) {
                   wx.hideToast();
@@ -144,7 +144,6 @@ Component({
             }
           }
         },
-
         fail(err) {
           console.log("失败", err);
         }
diff --git a/pages/committee/committee.js b/pages/committee/committee.js
index 6df0c2b..f530953 100644
--- a/pages/committee/committee.js
+++ b/pages/committee/committee.js
@@ -30,7 +30,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
@@ -53,4 +53,4 @@ Page({
     this.data.pageNo++
     this.loadData()
   }
-})
\ No newline at end of file
+})
diff --git a/pages/committeeDetail/committeeDetail.js b/pages/committeeDetail/committeeDetail.js
index cea0bb3..bba5934 100644
--- a/pages/committeeDetail/committeeDetail.js
+++ b/pages/committeeDetail/committeeDetail.js
@@ -47,7 +47,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
@@ -58,7 +58,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
@@ -68,6 +68,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
+
   }
 })
diff --git a/pages/forgetPassword/forgetPassword.js b/pages/forgetPassword/forgetPassword.js
index 1fcd60d..3196323 100644
--- a/pages/forgetPassword/forgetPassword.js
+++ b/pages/forgetPassword/forgetPassword.js
@@ -30,7 +30,7 @@ Page({
         if (res.success) {
           this.countDown()
           wx.showToast({
-            title: '发送成功',
+            title: '发送成功'+ res.result,
             icon: 'none',
             duration: 2000
           })
@@ -72,7 +72,7 @@ Page({
     }, 1000)
     // 倒计时 end
   },
-  
+
   // 确认
   formSubmit(e) {
     if(!e.detail.value.phone){
@@ -159,11 +159,15 @@ Page({
       phone: encrypt(this.data.rsaPublicKey,e.detail.value.phone), // 手机号加密
       password: encrypt(this.data.rsaPublicKey, e.detail.value.password), // 新密码加密
       verifyPassword: encrypt(this.data.rsaPublicKey, e.detail.value.verifyPassword), // 确认新密码加密
-      verifyCode: e.detail.value.verifyCode, 
+      verifyCode: e.detail.value.verifyCode,
       rsaPublicKey: this.data.rsaPublicKey
     }
     // 修改密码
     UserApi.updatePassword(params).then(res => {
+      wx.showToast({
+        title: '加载中...',
+        icon: 'loading'
+      })
       if (res.success) {
         // 跳转登录页
         wx.redirectTo({
@@ -209,7 +213,7 @@ Page({
       }
     })
   },
-  
+
   /**
    * 生命周期函数--监听页面显示
    */
diff --git a/pages/forgetPassword/forgetPassword.wxml b/pages/forgetPassword/forgetPassword.wxml
index 36bc3e3..04fcf2e 100644
--- a/pages/forgetPassword/forgetPassword.wxml
+++ b/pages/forgetPassword/forgetPassword.wxml
@@ -17,13 +17,13 @@
     <view class="form-item">
       <view class="text-label">新密码</view>
       <view class="text-value">
-        <input name="password" value="{{password}}" placeholder="请输入新密码" />
+        <input name="password" type="password" value="{{password}}" placeholder="请输入新密码" />
       </view>
     </view>
     <view class="form-item">
       <view class="text-label">确认密码</view>
       <view class="text-value">
-        <input name="verifyPassword" value="{{verifyPassword}}" placeholder="请输入确认密码" />
+        <input name="verifyPassword" type="password" value="{{verifyPassword}}" placeholder="请输入确认密码" />
       </view>
     </view>
     <view class="btn-area">
diff --git a/pages/home/home.js b/pages/home/home.js
index 8addc5c..cd1313c 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -51,9 +51,11 @@ Page({
           res.result.records.forEach(item=>{
             item.msgContent = item.msgContent.replace(reg,"")
             item.msgContent = item.msgContent.replace(reg1,"")
-            const startIndex = item.msgContent.indexOf("<")
-            const endIndex = item.msgContent.lastIndexOf(">")
-            item.msgContent = item.msgContent.substring(0, startIndex) + item.msgContent.slice(endIndex+1) + '点击报名'
+            const startIndex = item.msgContent.indexOf("<a")
+            const endIndex = item.msgContent.lastIndexOf("</a>")
+            if(startIndex > -1 && endIndex > -1 ){
+              item.msgContent = item.msgContent.substring(0, startIndex) + item.msgContent.slice(endIndex + 4) + '点击报名'
+            }
           })
           this.setData({
             list: [...this.data.list, ...res.result.records]
@@ -62,14 +64,14 @@ Page({
       }
     }).catch(err => {
       wx.showToast({
-        title: '加载失败',
-        icon: 'fail',
+        title: '登录后查看消息通知！',
+        icon: 'none',
         duration: 2000
       })
     })
   },
   // 点击首页的五个选项跳转页面
-  clickSelect(e){   
+  clickSelect(e){
     let index = e.currentTarget.dataset.index
     let url = ''
     if(index === 0) { // 来款项目
@@ -162,4 +164,4 @@ Page({
     this.data.searchParams.pageNo++
     this.loadData()
   }
-})
\ No newline at end of file
+})
diff --git a/pages/login/login.js b/pages/login/login.js
index 50dda4e..faea60a 100644
--- a/pages/login/login.js
+++ b/pages/login/login.js
@@ -30,7 +30,7 @@ Page({
         if (res.success) {
           this.countDown()
           wx.showToast({
-            title: '发送成功',
+            title: '发送成功'+ res.result,
             icon: 'none',
             duration: 2000
           })
@@ -41,6 +41,12 @@ Page({
             duration: 2000
           })
         }
+      }).catch(err => {
+        wx.showToast({
+          title: '获取失败',
+          icon: 'none',
+          duration: 2000
+        })
       })
     } else {
       wx.showToast({
@@ -97,7 +103,7 @@ Page({
             url: '../home/home',
           })
         }else{ // 首次登录不能直接用微信快捷登录
-          
+
         }
       })
     })
@@ -179,7 +185,7 @@ Page({
       UserApi.wxBind(params).then(res=>{})
     })
   },
-  
+
   /**
    * 生命周期函数--监听页面显示
    */
@@ -194,6 +200,12 @@ Page({
           data: res.result
         })
       }
+    }).catch(err => {
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+        duration: 2000
+      })
     })
   }
 })
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index bb1dea3..03d4708 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -122,7 +122,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
diff --git a/pages/mine/mine.js b/pages/mine/mine.js
index e0f5a2d..ec5539d 100644
--- a/pages/mine/mine.js
+++ b/pages/mine/mine.js
@@ -74,10 +74,10 @@ Page({
                 url: `../scanSign/scanSign?signed=1&meeting=${result}`,
               })
             } else {
-              // let result = JSON.stringify(res.result)
+              let result = JSON.stringify(res.result)
               // 未查到报名信息
               wx.navigateTo({ // 未报名
-                url: `../scanSign/scanSign?signed=0&meeting=${1}`,
+                url: `../scanSign/scanSign?signed=0&meeting=${result}`,
               })
             }
           })
@@ -91,7 +91,7 @@ Page({
       wx.navigateTo({
         url: '../mineData/mineData',
       })
-    }) 
+    })
   },
   // 我的合同
   mineContract() {
@@ -140,4 +140,4 @@ Page({
       })
     }
   }
-})
\ No newline at end of file
+})
diff --git a/pages/mineContract/mineContract.js b/pages/mineContract/mineContract.js
index 68199e7..b583e57 100644
--- a/pages/mineContract/mineContract.js
+++ b/pages/mineContract/mineContract.js
@@ -17,20 +17,29 @@ Page({
     })
   },
   loadData(){
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
     let params = {
       pageNo: this.data.pageNo,
       pageSize: this.data.pageSize
     }
     UserApi.contractList(params).then(res=>{
       if(res.success && res.result.records && res.result.records.length){
-        console.log(res.result.records)
         this.setData({
           list: [...this.data.list, ...res.result.records]
         })
       }
+    }).catch(err=>{
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+        duration: 2000
+      })
     })
   },
-  
+
   /**
    * 生命周期函数--监听页面显示
    */
@@ -46,4 +55,4 @@ Page({
     this.data.pageNo++
     this.loadData()
   }
-})
\ No newline at end of file
+})
diff --git a/pages/mineData/mineData.js b/pages/mineData/mineData.js
index 7276e74..70a7238 100644
--- a/pages/mineData/mineData.js
+++ b/pages/mineData/mineData.js
@@ -13,17 +13,26 @@ Page({
   },
 
   loadData(){
+    wx.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
     let params = {
       pageNo: this.data.pageNo,
       pageSize: this.data.pageSize
     }
     UserApi.dataList(params).then(res=>{
       if(res.success && res.result.records && res.result.records.length){
-        console.log(res.result.records)
         this.setData({
           list: [...this.data.list, ...res.result.records]
         })
       }
+    }).catch(err=>{
+      wx.showToast({
+        title: '加载失败',
+        icon: 'none',
+        duration: 2000
+      })
     })
   },
   // 预览
diff --git a/pages/phonePassword/phonePassword.wxml b/pages/phonePassword/phonePassword.wxml
index 59aee7f..8ec3929 100644
--- a/pages/phonePassword/phonePassword.wxml
+++ b/pages/phonePassword/phonePassword.wxml
@@ -18,7 +18,7 @@
       <view class="text-value">
         <input name="captcha" placeholder="请输入验证码" value="{{captcha}}" />
       </view>
-      <view class="captcha" wx:if="{{form.requestCodeSuccess}}">
+      <view class="captcha" wx:if="{{form.requestCodeSuccess}}" bindtap="handleChangeCheckCode">
         <image src="{{form.randCodeImage}}" mode="aspectFill"></image>
       </view>
       <view class="captcha count" wx:if="{{!form.requestCodeSuccess}}" bindtap="handleChangeCheckCode">重新获取</view>
diff --git a/pages/project/project.js b/pages/project/project.js
index d989121..fb9f50b 100644
--- a/pages/project/project.js
+++ b/pages/project/project.js
@@ -31,7 +31,7 @@ Page({
       })
     }
     this.loadData()
-  }, 
+  },
   // 打包改变
   bindPackChange(e){
     this.data.searchParams.pageNo = 1
@@ -112,7 +112,7 @@ Page({
       }).catch(err=>{
         wx.showToast({
           title: '加载失败',
-          icon: 'fail',
+          icon: 'none',
           duration: 2000
         })
       })
diff --git a/pages/projectDetail/projectDetail.js b/pages/projectDetail/projectDetail.js
index 34d4769..f2239dc 100644
--- a/pages/projectDetail/projectDetail.js
+++ b/pages/projectDetail/projectDetail.js
@@ -50,7 +50,7 @@ Page({
       }).catch(err => {
         wx.showToast({
           title: '加载失败',
-          icon: 'fail',
+          icon: 'none',
           duration: 2000
         })
       })
@@ -76,7 +76,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
@@ -93,7 +93,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
+
   },
 
   /**
diff --git a/pages/scanSign/scanSign.js b/pages/scanSign/scanSign.js
index da03c6c..ecfe435 100644
--- a/pages/scanSign/scanSign.js
+++ b/pages/scanSign/scanSign.js
@@ -49,7 +49,7 @@ Page({
     }).catch(err => {
       wx.showToast({
         title: '加载失败',
-        icon: 'fail',
+        icon: 'none',
         duration: 2000
       })
     })
@@ -92,6 +92,6 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
+
   }
 })
diff --git a/pages/scanSign/scanSign.wxml b/pages/scanSign/scanSign.wxml
index 9f4d224..fd816a4 100644
--- a/pages/scanSign/scanSign.wxml
+++ b/pages/scanSign/scanSign.wxml
@@ -30,7 +30,7 @@
     <text>{{form.checkIn ? '是' : '否'}}</text>
   </view>
   <!-- 未签到时，显示“手动签到” checkIn: 是否签到 -->
-  <view wx:if="{{!form.checkIn}}">
+  <view wx:if="{{!form.checkIn && isSigned == '1'}}">
     <text>手动签到</text>
     <text style="color: #069F99;" bindtap="scanSign">签到</text>
   </view>
diff --git a/pages/scanSign/scanSign.wxss b/pages/scanSign/scanSign.wxss
index a1a5323..dfc4caf 100644
--- a/pages/scanSign/scanSign.wxss
+++ b/pages/scanSign/scanSign.wxss
@@ -69,7 +69,7 @@
   height: 160px
 }
 .warning-text{
-  margin-bottom: 10px;
+  margin:50px 0 10px 0;
   display: flex;
   justify-content: center;
   align-items: center;