From 033173c8a8b3a59fd210cd3dea3765b0b50a0f9a Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 7 Jul 2023 14:29:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=A1=E6=81=AF=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  4 ++--
 src/views/activity/component/addActivity.vue | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index ae62b32..82421b8 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
-#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+#VUE_APP_BASE_API = https://yybtest.ali251.langye.net/
+VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/views/activity/component/addActivity.vue b/src/views/activity/component/addActivity.vue
index 8d1a5c0..0053c14 100644
--- a/src/views/activity/component/addActivity.vue
+++ b/src/views/activity/component/addActivity.vue
@@ -130,13 +130,20 @@
           </div>
         </div>
       </template>
-      <template v-slot:slogan>
+      <template v-slot:active_tag>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            宣传标语：
+            活动信息位置：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.slogan" placeholder="请输入宣传标语" clearable style="width: 300px;"></el-input>
+            <el-select style="width: 300px;" v-model="form.active_tag" placeholder="请选择">
+                <el-option
+                  v-for="item in [{value:'上',label:'上'},{value:'下',label:'下'}]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
           </div>
         </div>
       </template>
@@ -357,6 +364,7 @@ companykeyword:"",
         sponsorAdvertise:"",
         recommend:"",
         //slogan:"",
+        active_tag:'',
         date:"",
         applyDate:[],
         address:'',
@@ -545,6 +553,7 @@ companykeyword:"",
         sponsorAdvertise:res.sponsor_advertise,
         recommend:res.recommend,
         //slogan:res.slogan,
+        active_tag:res?.active_tag,
         date:[`${res.start_date}/${res.start_time}`,`${res.end_date}/${res.end_time}`],
         address:res.address,
         relationName:res.relation_name,
@@ -597,6 +606,7 @@ companykeyword:"",
           sponsor_advertise:this.form.sponsorAdvertise,
           recommend:this.form.recommend,
           //slogan:this.form.slogan,
+          active_tag:this.form.active_tag,
           start_date:this.form.date[0]?.split('/')[0],
           start_time:this.form.date[0]?.split('/')[1],
           end_date:this.form.date[1]?.split('/')[0],
@@ -636,6 +646,7 @@ companykeyword:"",
           sponsor_advertise:this.form.sponsorAdvertise,
           recommend:this.form.recommend,
           //slogan:this.form.slogan,
+          active_tag:this.form.active_tag,
           start_date:this.form.date[0]?.split('/')[0],
           start_time:this.form.date[0]?.split('/')[1],
           end_date:this.form.date[1]?.split('/')[0],