From f80deebb51f3c0f312b46718b75c02f69b3eb2cf Mon Sep 17 00:00:00 2001
From: chenrx <zhufeng@nuzanyun.com>
Date: Fri, 14 Jun 2024 15:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .../activity/components/activity-edit.vue     | 65 ++++++++++++++-----
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/.env.development b/.env.development
index 3754cdd..2ae4acf 100644
--- a/.env.development
+++ b/.env.development
@@ -1,2 +1,2 @@
-VUE_APP_API_BASE_URL=http://market.dev.liche.cn/api
+VUE_APP_API_BASE_URL=http://market.lc.haodian.cn/api
 #npm run serve 加载环境
diff --git a/src/views/sylive/activity/components/activity-edit.vue b/src/views/sylive/activity/components/activity-edit.vue
index aa163ef..6ea6942 100644
--- a/src/views/sylive/activity/components/activity-edit.vue
+++ b/src/views/sylive/activity/components/activity-edit.vue
@@ -150,13 +150,6 @@
           <el-radio :label="1">是</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="按扭文案:">
-        <el-input
-          clearable
-          v-model="form.button.title"
-          placeholder="请输入按扭文案"
-        />
-      </el-form-item>
       <el-form-item label="弹幕颜色:">
         <el-radio-group v-model="form.barrage.color">
           <el-radio :label="0">黑</el-radio>
@@ -168,13 +161,36 @@
           placeholder="请输入弹幕文案"
         />
       </el-form-item>
-      <el-form-item label="报名预约:">
+      <el-form-item label="按扭文案:">
+        <el-input
+          clearable
+          v-model="form.button.title"
+          placeholder="请输入按扭文案"
+        />
+      </el-form-item>
+      <el-form-item label="按钮类型:">
         <el-radio-group v-model="form.signBespeak.status">
-          <el-radio :label="0">否</el-radio>
-          <el-radio :label="1">是</el-radio>
+          <el-radio :label="0">商品</el-radio>
+          <el-radio :label="1">报名</el-radio>
         </el-radio-group>
+      </el-form-item>
+      <el-form-item label="支付商品:">
+        <el-select
+          v-model="form.signBespeak.payItemId"
+          placeholder="请选择关联商品"
+          clearable
+          class="ele-fluid"
+        >
+          <el-option
+            v-for="item in payGoodsLists"
+            :key="item.itemId"
+            :value="item.itemId"
+            :label="item.title"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="报名配置:">
         <el-select
-          v-if="form.signBespeak.status"
           v-model="form.signBespeak.itemId"
           placeholder="请选择关联商品"
           clearable
@@ -188,16 +204,12 @@
           />
         </el-select>
         <el-input
-          v-if="form.signBespeak.status"
           v-model="form.signBespeak.title"
           style="padding-top: 10px"
           clearable
           placeholder="请输入弹窗标题"
         />
-        <div
-          style="padding-top: 10px"
-          v-if="form.signBespeak.status && editVersion"
-        >
+        <div style="padding-top: 10px">
           <tinymce-editor
             :init="editoption"
             v-model="form.signBespeak.content"
@@ -217,6 +229,7 @@
               <el-select v-model="row.urlType" class="ele-fluid">
                 <el-option label="链接" value="link" />
                 <el-option label="小程序" value="miniProgram" />
+                <el-option label="报名" value="enroll" />
               </el-select>
             </template>
           </el-table-column>
@@ -362,11 +375,18 @@
         bottoms: [],
         blacklist: 0,
         button: { title: '' },
-        signBespeak: { status: 0, title: '', content: '', itemId: 0 },
+        signBespeak: {
+          status: 0,
+          title: '',
+          content: '',
+          itemId: 0,
+          payItemId: ''
+        },
         barrage: { color: 0, title: '' }
       };
       return {
         goodsList: [],
+        payGoodsLists: [],
         editVersion: false,
         editoption: {
           height: 300,
@@ -448,6 +468,17 @@
           .catch((e) => {
             this.$message.error(e.message);
           });
+        listGoods({
+          activityId: this.form.activityId,
+          price: 0,
+          price_type: 'gt'
+        })
+          .then((list) => {
+            this.payGoodsLists = list;
+          })
+          .catch((e) => {
+            this.$message.error(e.message);
+          });
       },
       /* 添加海报描述 */
       addShareTitle() {