Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/personalCenter/registration.vue

src/views/passengerTransport/index.vue

@@ -103,7 +103,7 @@ border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1re
               {{ this.dispatchTitle.endStation }}
             </div>
           </div>
-          <div class="rectangle" v-show="vehicleTime">数据更新时间:{{dispatchList[0].createTime}}</div>
+          <div v-if="dispatchList.length>0" class="rectangle" v-show="vehicleTime">数据更新时间:{{dispatchList[0].createTime}}</div>
         </div>
         <el-table
           :data="dispatchList"

src/views/personalCenter/login.vue

@@ -22,7 +22,7 @@
           </el-form-item>
           <el-form-item prop="password">
             <el-input
-              v-model="loginPwdForm.password"
+              v-model.trim="loginPwdForm.password"
               type="password"
               auto-complete="off"
               placeholder="密码"

src/views/personalCenter/registration.vue

 <template>
   <div class="resetPwdList">
-    <nav-list />
-    <!--    <com-layout-wrapper class="resetPwd">-->
+    <nav-list></nav-list>
+<!--    <com-layout-wrapper class="resetPwd">-->
 
     <div class="tab-container">
-      <img style="width: 600px; margin: 0px 180px 0px 0px" src="@/assets/loginImage/loginBiaoyu.png">
+      <img style="width: 600px; margin: 0px 180px 0px 0px" src="@/assets/loginImage/loginBiaoyu.png" />
       <el-form
-        ref="resetPasswordForm"
-        style="background-color:#ffffff; border: 1px solid #c8c9cc; padding: 20px 20px 20px 20px; width: 400px; border-radius: 5px"
-        class="resetPasswordForm"
-        :model="resetPasswordForm"
-        :rules="resetPasswordFormRules"
-        label-width="100px"
+          style="background-color:#ffffff; border: 1px solid #c8c9cc; padding: 20px 20px 20px 20px; width: 400px; border-radius: 5px"
+          ref="resetPasswordForm"
+          class="resetPasswordForm"
+          :model="resetPasswordForm"
+          :rules="resetPasswordFormRules"
+          label-width="100px"
       >
         <h3 style="text-align: center; font-size: 20px">个人用户注册</h3>
         <el-form-item label="登录名" prop="userName">
           <el-input
-            v-model="resetPasswordForm.userName"
-            type="text"
-            placeholder="请输入登录名"
+              v-model="resetPasswordForm.userName"
+              type="text"
+              placeholder="请输入登录名"
           />
         </el-form-item>
         <el-form-item label="密码" prop="password">
           <el-input
-            v-model="resetPasswordForm.password"
-            type="password"
-            placeholder="请输入您的密码"
+              v-model.trim="resetPasswordForm.password"
+              type="password"
+              placeholder="请输入您的密码"
           />
         </el-form-item>
         <el-form-item label="重复密码" prop="confirmedPassword">
           <el-input
-            v-model="resetPasswordForm.confirmedPassword"
-            type="password"
-            placeholder="请再次输入您的密码"
+              v-model.trim="resetPasswordForm.confirmedPassword"
+              type="password"
+              placeholder="请再次输入您的密码"
           />
         </el-form-item>
         <el-form-item label="联系电话" prop="phonenumber">
           <el-input
-            v-model="resetPasswordForm.phonenumber"
-            onkeyup="value=value.replace(/[^\d]/g, '')"
-            maxlength="11"
-            type="text"
-            placeholder="请输入联系电话"
+              onkeyup="value=value.replace(/[^\d]/g, '')"
+              v-model="resetPasswordForm.phonenumber"
+              maxlength="11"
+              type="text"
+              placeholder="请输入联系电话"
           />
         </el-form-item>
         <el-form-item label="邮箱地址" prop="email">
           <el-input
-            v-model="resetPasswordForm.email"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入您的邮箱地址"
+              v-model="resetPasswordForm.email"
+              maxlength="50"
+              show-word-limit
+              placeholder="请输入您的邮箱地址"
           />
         </el-form-item>
         <div>
@@ -63,7 +63,7 @@
       </el-form>
     </div>
 
-    <!--    </com-layout-wrapper>-->
+<!--    </com-layout-wrapper>-->
   </div>
 </template>
 

src/views/personalCenter/resetPwd.vue

@@ -37,14 +37,14 @@
 
         <el-form-item label="新密码" prop="newPassword">
           <el-input
-            v-model="resetPasswordForm.newPassword"
+            v-model.trim="resetPasswordForm.newPassword"
             type="password"
             placeholder="请输入您的新密码"
           />
         </el-form-item>
         <el-form-item label="重复密码" prop="repeatPassword">
           <el-input
-            v-model="resetPasswordForm.repeatPassword"
+            v-model.trim="resetPasswordForm.repeatPassword"
             type="password"
             placeholder="请再次输入您的新密码"
           />

src/views/publicService/info/index.vue

@@ -12,7 +12,7 @@
       </div>
       <div style="display: flex;align-items: center;justify-content: center;">
         <router-link
-          to="/Home"
+          to="/homePage"
           style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem"
         >返回首页

src/views/routerCondition/index.vue

@@ -10,7 +10,7 @@
         <i class="el-icon-arrow-right"></i>
         <span style="color:#419E83">出行服务</span></div>
       <div style="display: flex;align-items: center;justify-content: center;">
-        <router-link to="/Home" style="background: #FFFFFF;
+        <router-link to="/homePage" style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem">返回首页
         </router-link>
       </div>

src/views/touristAttraction/index.vue

@@ -9,7 +9,7 @@
       <span>首页</span>
       <i class="el-icon-arrow-right"></i>
       <span style="color:#419E83">旅游景点</span></div>  <div style="display: flex;align-items: center;justify-content: center;">
-      <router-link  to="/Home"  style="background: #FFFFFF;
+      <router-link  to="/homePage"  style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem">返回首页
       </router-link>
     </div>

src/views/trafficInformation/detail.vue

@@ -15,7 +15,7 @@
         <router-link to="/trafficInformation/index" style="background: #FFFFFF;margin-right: 1rem;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem">返回资讯页
         </router-link>
-        <router-link to="/Home" style="background: #FFFFFF;
+        <router-link to="/homePage" style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem">返回首页
         </router-link>
       </div>

src/views/trafficInformation/index.vue

@@ -14,7 +14,7 @@
       </div>
       <div style="display: flex;align-items: center;justify-content: center;">
         <router-link
-          to="/Home"
+          to="/homePage"
           style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem"
         >返回首页

src/views/weatherCondition/index.vue

@@ -10,7 +10,7 @@
         <i class="el-icon-arrow-right"></i>
         <span style="color:#419E83">天气服务</span></div>
       <div style="display: flex;align-items: center;justify-content: center;">
-        <router-link to="/Home" style="background: #FFFFFF;
+        <router-link to="/homePage" style="background: #FFFFFF;
 border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1rem">返回首页
         </router-link>
       </div>