修复上线编辑会所地址选择，修改密码校验问题，浏览器网页tilte名称修改

src/layout/components/Navbar.vue

@@ -7,7 +7,7 @@
     <div class="right-menu">
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <!-- <img src="@/assets/avatar.gif" class="user-avatar"> -->
+          <img src="@/assets/avatar1.gif" class="user-avatar">
           <span class="admin-name">{{ adminName }}</span>
           <i class="el-icon-caret-bottom" />
         </div>

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '后台管理系统',
+  title: '医美机构商城管理系统',
 
   /**
    * @type {boolean} true | false

src/views/club/editForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style=" width: 700px;margin: 0 auto;">
+  <div class="app-container clearfix" style=" width: 700px;margin: 0 auto;">
     <el-form ref="dataForm" :rules="rules" :model="form" label-position="left" label-width="130px">
       <el-form-item label="会所名称:" prop="name" style="width: 500px;text-align: right;">
         <el-input v-model="form.name" placeholder="请与营业执照的注册名称保持一致" maxlength="50" />
@@ -11,19 +11,19 @@
         <el-input v-model="form.contractMobile" placeholder="请填写你的常用号码" maxlength="11" />
       </el-form-item>
       <City v-if="isRequest" :address-data="addList" @addlist="handleCity" />
-      <el-form-item label="" prop="address" style="width: 500px; text-align: right;">
+      <el-form-item label="" prop="address" style="width: 500px; text-align: right;float:left;">
         <el-input v-model="form.address" placeholder="请填写会所详细的地址" />
       </el-form-item>
-      <el-form-item label="会所类型:" style="width: 270px;text-align: right;">
+      <el-form-item label="会所类型:" style="width: 270px; text-align: right;float:left;">
         <el-radio-group v-model="form.firstClubType">
           <el-radio :label="1">医美</el-radio>
           <el-radio :label="2">生美</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="营业执照编号:" prop="socialCreditCode" style="width: 500px; text-align: right;">
+      <el-form-item label="营业执照编号:" prop="socialCreditCode" style="width: 500px; text-align: right;float:left;">
         <el-input v-model="form.socialCreditCode" placeholder="请填写统一社会信用代码" maxlength="18" />
       </el-form-item>
-      <el-form-item label="营业执照:" prop="businessLicenseImage" style="width:400px;text-align: right;">
+      <el-form-item label="营业执照:" prop="businessLicenseImage" style="width:450px;text-align: right;float:left;">
         <div class="form-el-upload">
           <el-upload
             class="avatar-uploader"
@@ -39,7 +39,7 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="门头照:" prop="headpic" style="width:400px; text-align: right;">
+      <el-form-item label="门头照:" prop="headpic" style="width:450px; text-align: right;float:left;">
         <div class="form-el-upload">
           <el-upload
             class="avatar-uploader"
@@ -55,14 +55,14 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="是否上线:" style="width: 240px;text-align: right;">
+      <el-form-item label="是否上线:" style="width: 240px;text-align: right;float:left;">
         <el-radio-group v-model="form.status">
           <el-radio :label="90">是</el-radio>
           <el-radio :label="91">否</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:40px 0 80px 0;">
+    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;">
       <router-link :to="'/club/list/'">
         <el-button>返回</el-button>
       </router-link>
@@ -238,10 +238,19 @@ export default {
   color: red;
   text-align: left;
   position: absolute;
-  right: -55%;
+  right: -30%;
   bottom: 0;
 }
 .address .el-form-item__content{
   margin-left: 0 !important;
 }
+/*清除浮动*/
+.clearfix:before,.clearfix:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+.clearfix {
+  zoom: 1;
+}
 </style>

src/views/club/form.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style=" width: 700px;margin: 0 auto;">
+  <div class="app-container clearfix" style=" width: 700px;margin: 0 auto;">
     <el-form ref="dataForm" :rules="rules" :model="form" label-position="left" label-width="130px">
       <el-form-item label="会所名称:" prop="name" style="width: 500px;text-align: right;">
         <el-input v-model="form.name" placeholder="请与营业执照的注册名称保持一致" maxlength="50" />
@@ -14,16 +14,16 @@
       <el-form-item label="" prop="address" style="width: 500px; text-align: right;float:left;">
         <el-input v-model="form.address" placeholder="请填写会所详细的地址" />
       </el-form-item>
-      <el-form-item label="会所类型:" style="width: 270px; text-align: right;">
+      <el-form-item label="会所类型:" style="width: 270px; text-align: right;float:left;">
         <el-radio-group v-model="form.firstClubType">
           <el-radio :label="1">医美</el-radio>
           <el-radio :label="2">生美</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="营业执照编号:" prop="socialCreditCode" style="width: 500px; text-align: right;">
+      <el-form-item label="营业执照编号:" prop="socialCreditCode" style="width: 500px; text-align: right;float:left;">
         <el-input v-model="form.socialCreditCode" placeholder="请填写统一社会信用代码" maxlength="18" />
       </el-form-item>
-      <el-form-item label="营业执照:" prop="businessLicenseImage" style="width:400px;text-align: right;">
+      <el-form-item label="营业执照:" prop="businessLicenseImage" style="width:450px;text-align: right;float:left;">
         <div class="form-el-upload">
           <el-upload
             class="avatar-uploader"
@@ -39,7 +39,7 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="门头照:" prop="headpic" style="width:400px; text-align: right;">
+      <el-form-item label="门头照:" prop="headpic" style="width:450px; text-align: right;float:left;">
         <div class="form-el-upload">
           <el-upload
             class="avatar-uploader"
@@ -55,14 +55,14 @@
           </el-upload>
         </div>
       </el-form-item>
-      <el-form-item label="是否上线:" style="width: 240px;text-align: right;">
+      <el-form-item label="是否上线:" style="width: 240px;text-align: right;float:left;">
         <el-radio-group v-model="form.status">
           <el-radio :label="90">是</el-radio>
           <el-radio :label="91">否</el-radio>
         </el-radio-group>
       </el-form-item>
     </el-form>
-    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:40px 0 80px 0;">
+    <div slot="footer" class="dialog-footer" style="width:200px;margin:0 auto;padding:80px 0;float:right;">
       <router-link :to="'/club/list/'">
         <el-button>返回</el-button>
       </router-link>
@@ -207,10 +207,19 @@ export default {
   color: red;
   text-align: left;
   position: absolute;
-  right: -55%;
+  right: -30%;
   bottom: 0;
 }
 .address .el-form-item__content{
   margin-left: 0 !important;
 }
+/*清除浮动*/
+.clearfix:before,.clearfix:after {
+  content: "";
+  display: block;
+  clear: both;
+}
+.clearfix {
+  zoom: 1;
+}
 </style>

src/views/goods/category-create.vue

@@ -102,6 +102,9 @@ export default {
               type: response.code * 1 === 1 ? 'success' : 'error',
               duration: 2000
             })
+            setTimeout(() => {
+              this.$router.push({ path: '/goods/category' })
+            }, 2000)
           })
         }
       })

src/views/goods/category-edit.vue

@@ -113,6 +113,9 @@ export default {
               type: response.code * 1 === 1 ? 'success' : 'error',
               duration: 2000
             })
+            setTimeout(() => {
+              this.$router.push({ path: '/goods/category' })
+            }, 2000)
           })
         }
       })

src/views/other/password.vue

@@ -5,10 +5,10 @@
         <el-input v-model="from.oldPassword" placeholder="请输入旧密码" maxlength="50" />
       </el-form-item>
       <el-form-item label="新密码:" prop="password" style="width: 380px; text-align: right;">
-        <el-input v-model="from.password" placeholder="请输入8-16位数字和字母的组合" maxlength="10" />
+        <el-input v-model="from.password" placeholder="请输入8-16位数字和字母的组合" maxlength="16" />
       </el-form-item>
       <el-form-item label="确认新密码:" prop="checkPassword" style="width: 380px; text-align: right;">
-        <el-input v-model="from.checkPassword" placeholder="请输入8-16位数字和字母的组合" maxlength="11" />
+        <el-input v-model="from.checkPassword" placeholder="请输入8-16位数字和字母的组合" maxlength="16" />
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer" style="width:1px;margin:0 auto;padding:40px 0 80px 0;">
@@ -31,7 +31,16 @@ export default {
       },
       rules: {
         oldPassword: [{ required: true, message: '请输入旧密码', trigger: 'blur' }],
-        password: [{ required: true, message: '请输入新的密码', trigger: 'blur' }],
+        password: [
+          { required: true, message: '请输入新的密码', trigger: 'blur' },
+          { min: 8, max: 16, message: '密码长度在8到16个字符', trigger: 'blur' },
+          {
+            required: true,
+            pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/,
+            message: '密码组合应为8-16位数字和字母组合',
+            trigger: 'blur'
+          }
+        ],
         checkPassword: [{ required: true, message: '请确认新的密码', trigger: 'blur' }]
       }
     }
@@ -47,15 +56,17 @@ export default {
         if (valid) {
           if (this.from.password === this.simplePwd) {
             this.$message({
-              message: '警告，密码太过简单哦！',
-              type: 'warning'
+              message: '提示：密码太过简单哦！',
+              type: 'warning',
+              duration: 3000
             })
             return
           }
           if (this.from.checkPassword !== this.from.password) {
             this.$message({
-              message: '警告，新密码输入不一致哦！',
-              type: 'warning'
+              message: '提示：新密码输入不一致哦,请重新确认新密码！',
+              type: 'warning',
+              duration: 3000
             })
             return
           }