Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/followup/plan-manage/dialog/add-patient-time.vue

@@ -22,7 +22,7 @@
               type="date"
               placeholder="请选择随访开始时间"
               format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
+              value-format="timestamp"
               clearable>
             </el-date-picker>
           </el-form-item>

src/views/followup/plan-manage/dialog/change-plan.vue

@@ -40,7 +40,7 @@
             v-model="planChangeData.startDate"
             type="date"
             format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            value-format="timestamp"
             placeholder="选择随访开始时间">
           </el-date-picker>
         </el-form-item>

src/views/followup/reservation-manage/reservation-list.vue

@@ -425,6 +425,8 @@
       status(val) {
         this.getReservationList({
           status: val,
+          pageNo: 1,
+          pageSize: 10,
           ...this.setSearchData()
         })
       }

src/views/login.vue

@@ -30,7 +30,7 @@
             <div class="forget-password">
               <p @click="goToResetPassword">忘记密码？</p>
             </div>
-            <button>登 录</button>
+            <button @click="login">登 录</button>
           </div>
         </div>
 
@@ -67,7 +67,7 @@
             <!--<div class="forget-password">
               <p>忘记密码？</p>
             </div>-->
-            <button>登 录</button>
+            <button>重设密码</button>
             <div class="login-now">
               <p @click="goToLogin">立即登录</p>
             </div>
@@ -131,6 +131,16 @@
           }, 1000)
         }
       },
+      login() {
+        let params = {
+          mobile: $scope.mobile,
+          OS: localStorage.getItem("OS"),
+          browser: localStorage.getItem("browser"),
+          terminalType: localStorage.getItem("terminalType"),
+          ipAddress: localStorage.getItem("ipAddress"),
+          password: hex_md5($scope.password).toUpperCase()
+        }
+      }
     }
   }
 </script>
@@ -152,9 +162,11 @@
   }
   .open-eyes-icon {
     background: url("../assets/image/open-eyes.svg") no-repeat;
+    cursor: pointer;
   }
   .close-eyes-icon {
     background: url("../assets/image/close-eyes.svg") no-repeat;
+    cursor: pointer;
   }
   .login-other {
     display: flex;