bug修复

admin/src/views/content/article/edit.vue

@@ -8,8 +8,14 @@
         <el-input v-model="pram.author" placeholder="作者" maxlength="20"/>
       </el-form-item>
       <el-form-item label="文章分类">
-        <!--          prop="cid" :rules="[{required:true, message:'请选择文章分类', trigger:['blur','change']}]"-->
-        <el-cascader v-model="pram.cid" :options="categoryTreeData" :props="categoryProps" style="width:100%;" />
+        <el-select v-model="pram.cid" placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in categoryTreeData"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="图文封面" prop="imageInput" :rules="[{ required: true, message: '请上传图文封面', trigger: 'change' }]">
         <div class="upLoadPicBox" @click="modalPicTap('1')">
@@ -94,7 +100,7 @@ export default {
       },
       pram: {
         author: null,
-        cid: 0,
+        cid: null,
         content: null,
         imageInput: '',
         isBanner: false,
@@ -163,9 +169,9 @@ export default {
       // this.pram.mediaId = mediaId
     },
     handlerGetCategoryTreeData() {
-      const _pram = { type: constants.categoryType[2].value, status: 1 }
+      const _pram = { type: constants.categoryType[2].value, status: 1, pid: 0 }
       categoryApi.treeCategroy(_pram).then(data => {
-        this.categoryTreeData = selfUtil.addTreeListLabelForCasCard(data)
+        this.categoryTreeData = data
       })
     },
     handerSubmit(form) {

admin/src/views/store/storeComment/index.vue

@@ -22,7 +22,6 @@
               </el-input>
             </el-form-item>
             <el-form-item label="用户名称：">
-              {{uids}}
               <el-select v-model="uids" style="width: 500px" reserve-keyword multiple remote filterable
                          :remote-method="remoteMethod" :loading="loading" placeholder="请输入用户名称" clearable @change="seachList">
                 <el-option

admin/src/views/systemSetting/administratorAuthority/adminList/index.vue

@@ -57,7 +57,7 @@
         </el-table-column>
         <el-table-column label="最后登录时间" prop="lastTime">
           <template slot-scope="scope">
-            <span>{{ scope.row.lastTime | filterEmpty }}</span>
+            <span>{{ scope.row.updateTime | filterEmpty }}</span>
           </template>
         </el-table-column>
         <el-table-column label="最后登录IP" prop="lastIp">

admin/src/views/systemSetting/logistics/cityList/index.vue

@@ -35,20 +35,20 @@
             <el-link :underline="false" @click="cityDetail(scope.row)">{{ scope.row.name }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column
-          label="状态"
-          min-width="100"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.isShow"
-              class="demo"
-              active-text="开启"
-              inactive-text="关闭"
-              @change="cityStatus(scope.row)"
-            />
-          </template>
-        </el-table-column>
+        <!--<el-table-column-->
+          <!--label="状态"-->
+          <!--min-width="100"-->
+        <!--&gt;-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-switch-->
+              <!--v-model="scope.row.isShow"-->
+              <!--class="demo"-->
+              <!--active-text="开启"-->
+              <!--inactive-text="关闭"-->
+              <!--@change="cityStatus(scope.row)"-->
+            <!--/>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
         <el-table-column
           fixed="right"
           min-width="80"
@@ -128,7 +128,8 @@ export default {
     // 状态
     cityStatus(e) {
       logistics.updateStatus({
-        id: e.cityId,
+        id: e.id,
+        cityId: e.cityId,
         status: e.isShow
       }).then(res => {
         this.$message.success('操作成功')

admin/src/views/user/list/edit.vue

@@ -27,19 +27,16 @@
       </el-form-item>
       <el-form-item label="用户等级：">
         <el-select v-model="ruleForm.level" placeholder="请选择"  class="selWidth" clearable filterable>
-          <el-option value="" label="全部"></el-option>
           <el-option :value="item.id" v-for="(item, index) in levelList" :key="index" :label="item.name"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="用户分组：">
         <el-select v-model="ruleForm.groupId" placeholder="请选择"  class="selWidth" clearable filterable>
-          <el-option value="" label="全部"></el-option>
           <el-option :value="item.id" v-for="(item, index) in groupList" :key="index" :label="item.groupName"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="用户标签：">
         <el-select v-model="labelData" placeholder="请选择"  class="selWidth" clearable filterable multiple >
-          <el-option value="" label="全部"></el-option>
           <el-option :value="item.id" v-for="(item, index) in labelLists" :key="index" :label="item.name"></el-option>
         </el-select>
       </el-form-item>
@@ -138,7 +135,7 @@
       },
       // 等级列表
       levelLists () {
-        levelListApi({ page: 1, limit: 9999}).then(async res => {
+        levelListApi({ page: 1, limit: 9999, isShow: 1, isDel: 0}).then(async res => {
           this.levelList = res.list
         })
       },