From 53d7f4cb9711d54b10ad2d44b681e5703f22d4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Fri, 12 Jul 2024 11:00:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E4=BC=A0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/comPromotion/add.vue   | 15 ++++++++++-----
 .../workSys/promotionTab/AddpromotionTab.vue      |  3 +++
 src/views/modules/workSys/promotionTab/index.vue  | 12 +++++++++++-
 .../workSys/promotionTab/viewPromotionalTags.vue  |  3 +++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index f174a2f67..266fe891f 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -115,8 +115,8 @@ export default {
             coverPic: "",//封面图
             releaseTime: "",//发布时间
             sendMsg: false,//是否推送
-            top: false,//是否置顶
-            status: 0 //状态
+            top: 0,//是否置顶
+            status: 1 //状态
         },
           serviceList: [],
         //   gridList: [],
@@ -171,10 +171,13 @@ export default {
              
             }
             this.formType=typeid
-           
-            console.log(this.formData,"5164");
+           console.log(typeid);
+            console.log(this.formType,"5164");
             this.endLoading();
-            this.setDefaultReleaseTime()
+            if(typeid=="add"){
+              this.setDefaultReleaseTime()
+            }
+           
         },
     async advertisingTag () {
           const url = "/actual/base/advertisingTag/page"
@@ -275,6 +278,7 @@ export default {
               let url = '/actual/base/communityPublicity/update'
               this.formData.sendMsg= this.formData.sendMsg? 1:0
               this.formData.top= this.formData.top? 1:0
+              this.formData.status=0
               console.log(this.formData,"formData");
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
@@ -295,6 +299,7 @@ export default {
               console.log(this.formData,"formData");
               this.formData.sendMsg= this.formData.sendMsg? 1:0
               this.formData.top= this.formData.top? 1:0
+  
               const { data, code, msg } = await requestPost(url, this.formData)
               if (code === 0) {
                   this.$message({
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
index 1d04b7d2f..22f03e2da 100644
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -11,6 +11,9 @@
                 </el-input>
             </div>
           </el-form-item>
+                    <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="status" :active-value="1" :inactive-value="0"></el-switch>
+                </el-form-item>
         </el-form>
       </div>
   
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 53b534aa2..f3482934e 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -7,7 +7,12 @@
             <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
-
+          <el-form-item label="首页显示">
+            <el-select class="item_width_1" v-model.trim="status" size="small" placeholder="请选择" clearable>
+              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <div style="display: flex; justify-content: flex-end;">
             <el-button style="margin-left:10px" class="diy-button--blue" size="small"
               @click="handleSearch">查询</el-button>
@@ -29,6 +34,11 @@
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
         <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
         </el-table-column>
+        <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
+          <template slot-scope="scope">
+            <span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
         </el-table-column>
 
diff --git a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
index 0f862660d..88e2fe4d1 100644
--- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
+++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
@@ -8,6 +8,9 @@
                         <span>{{ tagName }}</span>
                     </div>
                 </el-form-item>
+                <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" disabled></el-switch>
+                </el-form-item>
             </el-form>
         </div>