v1.7.4版本上测试

.env.development

@@ -5,12 +5,12 @@ ENV = 'development'
 
 # 测试地址 API接口
 VUE_APP_BASE_API = 'https://zplma-b.caimei365.com'
-# VUE_APP_BASE_API = 'http://192.168.2.92:8012'
+# VUE_APP_BASE_API = 'http://192.168.2.200:8012'
 # VUE_APP_BASE_API = 'http://192.168.2.67:8012'
 
 # 文件上传 API接口地址
 VUE_APP_UPLOAD_API='https://zplma-b.caimei365.com'
-# VUE_APP_UPLOAD_API='http://192.168.2.92:8012'
+# VUE_APP_UPLOAD_API='http://192.168.2.200:8012'
 # VUE_APP_UPLOAD_API='http://192.168.2.67:8012'
 
 # 二维码生成链接location

src/views/common/login/index.vue

@@ -111,6 +111,7 @@ export default {
         this.loading = true
         this.$store.dispatch('user/login', this.loginForm).then(res => {
           // 保存token及用户信息
+          if (!res.data) return
           setToken(res.data.token)
           setUserInfo(res.data)
           this.$store.commit('tagsView/CLEAR_ALL_VIEW')

src/views/normal/audit/club/components/club-list.vue

@@ -35,7 +35,7 @@
       <el-table-column label="手机号" width="120px" align="center" prop="mobile" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <audit-status :status="row.shopAuditStatus" :reason="row.invalidReason" />
+          <audit-status :status="row.shopAuditStatus" :reason="row.shopInvalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center" width="200px">

src/views/normal/audit/club/components/device-list.vue

@@ -31,7 +31,7 @@
       <el-table-column prop="snCode" label="设备SN码" align="center" />
       <el-table-column label="审核状态" width="120px" align="center">
         <template slot-scope="{ row }">
-          <audit-status :status="row.shopAuditStatus" :reason="row.invalidReason" />
+          <audit-status :status="row.shopAuditStatus" :reason="row.shopInvalidReason" />
         </template>
       </el-table-column>
       <el-table-column label="审核人" align="center">

src/views/normal/club/index.vue

@@ -105,7 +105,14 @@
         <template slot-scope="{ row }">
           <div class="star-sort">
             <el-checkbox v-model="row.starFlag" :true-label="1" :false-label="0" @change="onStarChange(row, $event)" />
-            <el-input v-model="row.starNum" placeholder="排序" size="mini" @blur="onStarChange(row, row.starFlag)" />
+            <el-input
+              v-model="row.starNum"
+              placeholder="排序"
+              size="mini"
+              maxlength="20"
+              @blur="onStarChange(row, row.starFlag)"
+              @input="filterNotNumber(row)"
+            />
           </div>
         </template>
       </el-table-column>
@@ -260,6 +267,15 @@ export default {
       }
     },
 
+    filterNotNumber(row) {
+      let val = row.starNum.trim()
+      val = val.replaceAll(/\D/gi, '')
+      if (val) {
+        val = parseInt(val)
+      }
+      row.starNum = val.toString()
+    },
+
     // 机构二维码
     createClubQrcode(item) {
       this.clubInfo = item