Merge remote-tracking branch 'origin/master'

src/utils/request.js

@@ -72,7 +72,7 @@ service.interceptors.response.use(
   error => {
     console.log('err' + error) // for debug
     Message({
-      message: error.message,
+      message: '网络连接超时，请稍后重试',
       type: 'error',
       duration: 5 * 1000
     })

src/views/club/list.vue

@@ -17,18 +17,22 @@
             <el-option label="已下线" value="91" />
           </el-select>
         </el-form-item>
-        <el-form-item label="创建时间:" style="width:550px;float: left;">
+        <el-form-item label="创建时间:" style="width:410px;float: left;">
           <el-date-picker
             v-model="listQuery.startTime"
-            type="datetime"
-            placeholder="选择日期时间"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 150px;"
             @change="handleFilter"
           />
           至
           <el-date-picker
             v-model="listQuery.endTime"
-            type="datetime"
-            placeholder="选择日期时间"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 150px;"
             @change="handleFilter"
           />
         </el-form-item>
@@ -57,7 +61,7 @@
         </template>
       </el-table-column>
       <el-table-column label="账号" width="150" align="center" prop="account" />
-      <el-table-column label="会所名称" width="200" align="center" prop="name" />
+      <el-table-column label="会所名称" align="center" prop="name" />
       <el-table-column label="联系人" width="100" align="center" prop="linkMan" />
       <el-table-column label="手机号" width="110" align="center" prop="bindMobile" />
       <el-table-column class-name="status-col" label="上线状态" width="150" align="center" prop="status">

src/views/club/operateList.vue

@@ -15,18 +15,22 @@
             <el-option label="未绑定" value="1" />
           </el-select>
         </el-form-item>
-        <el-form-item label="添加时间:" style="width:550px;float: left;">
+        <el-form-item label="添加时间:" style="width:410px;float: left;">
           <el-date-picker
-            v-model="listQuery.startTime"
-            type="datetime"
-            placeholder="选择日期时间"
+            v-model="listQuery.beginAddTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 150px;"
             @change="handleFilter"
           />
           至
           <el-date-picker
-            v-model="listQuery.endTime"
-            type="datetime"
-            placeholder="选择日期时间"
+            v-model="listQuery.endAddTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 150px;"
             @change="handleFilter"
           />
         </el-form-item>
@@ -162,8 +166,8 @@ export default {
         linkName: '',
         mobile: '',
         status: '',
-        startTime: '',
-        endTime: ''
+        beginAddTime: '',
+        endAddTime: ''
       },
       editTemp: {
         userOrganizeID: this.organizeID,

src/views/login/index.vue

@@ -14,7 +14,7 @@
         <el-input
           ref="account"
           v-model="loginForm.account"
-          placeholder="account"
+          placeholder="登录名"
           name="account"
           type="text"
           tabindex="1"
@@ -31,7 +31,7 @@
           ref="password"
           v-model="loginForm.password"
           :type="passwordType"
-          placeholder="Password"
+          placeholder="密码"
           name="password"
           tabindex="2"
           auto-complete="on"
@@ -57,14 +57,14 @@ export default {
   data() {
     const validateUsername = (rule, value, callback) => {
       if (!validUsername(value)) {
-        callback(new Error('Please enter the correct user name'))
+        callback(new Error('请输入正确的登录名'))
       } else {
         callback()
       }
     }
     const validatePassword = (rule, value, callback) => {
       if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
+        callback(new Error('密码不能少于6位'))
       } else {
         callback()
       }