Merge remote-tracking branch 'origin/ysy_company' into ysy_company

src/views/qw/sopUserLogsInfo/sendMsgOpenTool.vue

@@ -165,7 +165,7 @@
                             <el-option v-for="dict in packetList" :key="dict.id" :label="dict.name" :value="dict.id" />
                           </el-select>
                         </el-form-item>
-                        <el-form-item label="福袋状态">
+                        <el-form-item label="红包状态">
                           <el-tag :disabled="formType == 3" :type="item.status == 1 ? 'success' : 'danger'">
                             {{ item.status == 1 ? '启用' : '禁用' }}
                           </el-tag>

src/views/qw/sopUserLogsInfo/sendMsgSopOpenTool.vue

@@ -204,6 +204,22 @@
                         </el-card>
                       </div>
 
+                      <div v-if="item.contentType == 14">
+                      <el-card class="box-card">
+                        <el-form-item label="红包名称">
+                          <el-select :disabled="formType == 3" v-model="item.redPacketId" placeholder="请选择红包"
+                            size="mini" @change="getRedPacketStatus(item)">
+                            <el-option v-for="dict in packetList" :key="dict.id" :label="dict.name" :value="dict.id" />
+                          </el-select>
+                        </el-form-item>
+                        <el-form-item label="红包状态">
+                          <el-tag :disabled="formType == 3" :type="item.status == 1 ? 'success' : 'danger'">
+                            {{ item.status == 1 ? '启用' : '禁用' }}
+                          </el-tag>
+                        </el-form-item>
+                      </el-card>
+                    </div>
+
                     </el-form-item>
 
                     <el-form-item label="添加短链" v-if="item.contentType == 1 "  >
@@ -274,6 +290,7 @@ import { sendMsg,} from "../../../api/qw/sopUserLogsInfo";
 import ImageUpload from "@/views/qw/sop/ImageUpload.vue";
 import {courseList, videoList} from "@/api/qw/sop";
 import userVideo from "@/views/qw/userVideo/userVideo";
+import { listPacket } from "@/api/qw/packet";
 
 
 export default {
@@ -281,6 +298,12 @@ export default {
   components: {ImageUpload,userVideo},
   data() {
     return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 100,
+      },
+      packetList:[],
       videoNumOptions: {
         title: '选择视频号',
         open: false,
@@ -376,6 +399,7 @@ export default {
   },
 
   created() {
+    this.getRedPacketList();
     this.getDicts("sys_qwSopAi_contentType").then(response => {
       this.sysQwSopAiContentType = response.data;
     });
@@ -388,6 +412,21 @@ export default {
     });
   },
   methods: {
+    getRedPacketStatus(content){
+      const selectedRedPacket = this.packetList.find(item => item.id === content.redPacketId);
+      if (selectedRedPacket) {
+        content.status = selectedRedPacket.status; // 自动填充标题
+      } else {
+        // 若未找到对应直播间，清空标题和封面（可选）
+        content.status = null;
+      }
+    },
+    /** 查询授权手机号红包配置列表 */
+    getRedPacketList() {
+      listPacket(this.queryParams).then(response => {
+        this.packetList = response.rows;
+      });
+    },
 
     qwUserVideoResult(val) {
 

src/views/qw/sopUserLogsInfo/sopUserLogsInfoDetails.vue

@@ -432,7 +432,7 @@
                             <el-option v-for="dict in packetList" :key="dict.id" :label="dict.name" :value="dict.id" />
                           </el-select>
                         </el-form-item>
-                        <el-form-item label="福袋状态">
+                        <el-form-item label="红包状态">
                           <el-tag :disabled="formType == 3" :type="item.status == 1 ? 'success' : 'danger'">
                             {{ item.status == 1 ? '启用' : '禁用' }}
                           </el-tag>