From 7e76feff545d290e8399f024bdce43c903074cd0 Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Wed, 21 Sep 2022 10:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bxg/shop/storeBrand/index.vue | 22 +++++++++++++++-----
 src/views/bxg/yxStoreExpert/index.vue   | 27 ++++++++++++++++++++++---
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/views/bxg/shop/storeBrand/index.vue b/src/views/bxg/shop/storeBrand/index.vue
index 645aa52..4b6a218 100644
--- a/src/views/bxg/shop/storeBrand/index.vue
+++ b/src/views/bxg/shop/storeBrand/index.vue
@@ -27,8 +27,11 @@
           <el-form-item label="图标">
             <MaterialList v-model="picArr" type="image" :num="1" :width="150" :height="150" />
           </el-form-item>
-          <el-form-item label="是否推荐">
-            <el-input v-model="form.isShow" style="width: 370px;" />
+          <el-form-item label="状态">
+            <el-radio-group v-model="form.isShow" style="width: 178px">
+              <el-radio :label="1">显示</el-radio>
+              <el-radio :label="0">隐藏</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -39,12 +42,19 @@
       <!--表格渲染-->
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
-        <el-table-column v-if="columns.visible('id')" prop="id" label="品牌ID" />
+        <el-table-column v-if="columns.visible('id')" prop="id" label="品牌ID" width="150" />
         <el-table-column v-if="columns.visible('brandName')" prop="brandName" label="品牌名称" />
         <el-table-column v-if="columns.visible('brandDescription')" prop="brandDescription" label="品牌描述" />
-        <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序" />
+        <el-table-column v-if="columns.visible('sort')" prop="sort" label="排序" width="55" />
 <!--        <el-table-column v-if="columns.visible('pic')" prop="pic" label="图标" />-->
-        <el-table-column v-if="columns.visible('isShow')" prop="isShow" label="是否推荐" />
+        <el-table-column v-if="columns.visible('isShow')" label="状态" align="center" prop="isShow">
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="scope.row.isShow === 1" :type="''">显示</el-tag>
+              <el-tag v-else :type=" 'info' ">隐藏</el-tag>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column v-if="columns.visible('createTime')" prop="createTime" label="添加时间">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -113,6 +123,8 @@ export default {
     }, // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       this.picArr = []
+      this
+
       if (form.pic && form.id) {
         this.picArr = form.pic.split(',')
       }
diff --git a/src/views/bxg/yxStoreExpert/index.vue b/src/views/bxg/yxStoreExpert/index.vue
index 5419187..bfb91b1 100644
--- a/src/views/bxg/yxStoreExpert/index.vue
+++ b/src/views/bxg/yxStoreExpert/index.vue
@@ -36,6 +36,18 @@
           <el-form-item label="所属单位" prop="expertUnit">
             <el-input v-model="form.expertUnit" style="width: 370px;" />
           </el-form-item>
+<!--          <el-form-item label="是否显示">-->
+<!--            <el-input v-model="form.isShow" style="width: 370px;" />-->
+<!--          </el-form-item>-->
+          <el-form-item label="状态">
+            <el-radio-group v-model="form.isShow" style="width: 178px">
+              <el-radio :label="1">显示</el-radio>
+              <el-radio :label="0">隐藏</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="排序">
+            <el-input v-model="form.sort" style="width: 370px;" />
+          </el-form-item>
 <!--          <el-form-item label="添加时间">-->
 <!--            <el-input v-model="form.createTime" style="width: 370px;" />-->
 <!--          </el-form-item>-->
@@ -71,7 +83,16 @@
             <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-if="columns.visible('isDel')" prop="isDel" label="是否删除" />
+<!--        <el-table-column v-if="columns.visible('isDel')" prop="isDel" label="是否删除" />-->
+<!--        <el-table-column v-if="columns.visible('isShow')" prop="isDel" label="是否显示" />-->
+        <el-table-column v-if="columns.visible('isShow')" label="状态" align="center" prop="isShow">
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="scope.row.isShow === 1" :type="''">显示</el-tag>
+              <el-tag v-else :type=" 'info' ">隐藏</el-tag>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column v-permission="['admin','yxStoreExpert:edit','yxStoreExpert:del']" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
@@ -142,8 +163,8 @@ export default {
     }, // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
       this.picArr = []
-      if (form.pic && form.id) {
-        this.picArr = form.pic.split(',')
+      if (form.image && form.id) {
+        this.picArr = form.image.split(',')
       }
     },
   }