1. 轮播图上传图片功能优化

2. 活动列表增加开启/关闭功能按钮

src/views/activityManage/activityList.vue

@@ -27,7 +27,7 @@
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="开始日期" prop="startTime"/>
             <el-table-column align="center" min-width="150px" label="结束日期" prop="endTime"/>
-           
+
             <el-table-column align="center" min-width="80px" label="创建人" prop="creater">
             </el-table-column>
             <el-table-column align="center" min-width="150px" label="创建时间" prop="createTime">
@@ -37,10 +37,10 @@
             <el-table-column align="center" label="操作" width="240px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button type="primary" size="small" @click="handleUpdate(scope.row)">编辑</el-button>
-                    <el-button v-if="scope.row.status == 0" type="success" size="small"
-                        @click="changeState(scope.row.actId, 1)">开启</el-button>
-                    <el-button v-if="scope.row.status == 1" type="warning" size="small"
-                        @click="changeState(scope.row.actId, 0)">关闭</el-button>
+                    <el-button v-if="scope.row.status == 3" type="success" size="small"
+                        @click="changeState(scope.row.actId, 2)">开启</el-button>
+                    <el-button v-if="scope.row.status == 2" type="warning" size="small"
+                        @click="changeState(scope.row.actId, 3)">关闭</el-button>
                     <el-button type="danger" size="small" @click="handleDelete(scope.row.actId, -1)">删除</el-button>
                 </template>
             </el-table-column>
@@ -139,12 +139,12 @@
                 </el-input>
                 </el-form-item>
                 <el-form-item v-if="dataForm.relationCoupon=='1' || dataForm.type=='3' || dataForm.type=='5'" label="兑换截至时间" prop="couponEndTime">
-                    <el-date-picker 
+                    <el-date-picker
                     :disabled="dialogStatus == 'update'?true:false"
                     format="yyyy-MM-dd HH:mm:ss"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    type="datetime" v-model="dataForm.couponEndTime" 
-                    placeholder="请选择兑换截至时间" 
+                    type="datetime" v-model="dataForm.couponEndTime"
+                    placeholder="请选择兑换截至时间"
                     style="width: 350px">
                     </el-date-picker>
                 </el-form-item>
@@ -178,7 +178,7 @@
         </el-dialog>
     </div>
 </template>
-  
+
 <style>
 .demo-table-expand {
     font-size: 0;
@@ -194,7 +194,7 @@
     margin-bottom: 0;
 }
 </style>
-  
+
 <script>
 import { createItem, updateItem, activityList, activityState } from "@/api/activityManage";
 import Crontab from '@/components/Crontab'
@@ -302,7 +302,7 @@ export default {
                 activityUrl: [
                     { required: true, message: "请填写活动连接", trigger: "blur" }
                 ],
-                
+
             },
             fileImgUrl: this.upLoadUrl,
             typeList:[],
@@ -311,12 +311,12 @@ export default {
     created() {
         this.getCouponsList();
         this.getTypeList();
-        this.getAllUserList(); 
+        this.getAllUserList();
         this.getList();
     },
     methods: {
         clickType(){
-            this.dataForm.title = undefined; 
+            this.dataForm.title = undefined;
             this.dataForm.imgUrl = undefined;
             this.dataForm.activityUrl = undefined;
             this.dataForm.winningTimeCron = undefined;
@@ -592,7 +592,7 @@ export default {
                 this.listLoading = false
             }).catch(() => {})
         },
-       
+
 
         handleFilter() {
             this.listQuery.page = 1
@@ -607,7 +607,7 @@ export default {
             this.getList()
         },
 
-        
+
     }
 }
 </script>
@@ -637,4 +637,3 @@ export default {
     display: block;
 }
 </style>
-  

src/views/dictManage/dictDataList.vue

@@ -73,7 +73,7 @@
               <el-input style="width: 300px" v-model="dataForm.dictLabel"></el-input>
             </el-form-item>
             <el-form-item  label="字典键值" prop="dictValue">
-               <el-upload  v-if="dataForm.dictType === 'index_lbt'"
+               <el-upload  v-if="['index_lbt', 'publicize_banner', 'activity_banner'].includes(dataForm.dictType)"
                             :limit="1" :action="fileImgUrl"
                             list-type="picture-card"
                             :file-list="dataForm.images"