From 06e4cd516e648ca854f9d9c72920b9ec0c5dcf90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Sat, 22 Feb 2025 21:30:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B4=E6=92=AD=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/circle/list/index.vue               | 65 ++++++++++++-------
 .../list/components/batchCreate.vue           | 18 ++++-
 .../liveBroadcast/list/components/create.vue  | 29 +++++++--
 3 files changed, 82 insertions(+), 30 deletions(-)

diff --git a/src/views/circle/list/index.vue b/src/views/circle/list/index.vue
index 4937c09..63142ac 100644
--- a/src/views/circle/list/index.vue
+++ b/src/views/circle/list/index.vue
@@ -22,11 +22,9 @@
         <el-option v-if="yunyin" :value="6" label="已删除" />
       </el-select>
       <el-button type="primary" @click="getLists(1)">查询</el-button>
-      <el-button
-        v-if="zhujiao || tougu"
-        type="success"
-        @click="addTag()"
-      >新增圈子</el-button>
+      <el-button v-if="zhujiao || tougu" type="success" @click="addTag()"
+        >新增圈子</el-button
+      >
     </div>
 
     <el-table
@@ -50,12 +48,12 @@
       <el-table-column prop="coverImage" label="封面图" width="100">
         <template #default="scope">
           <el-popover placement="right" :width="400" trigger="hover">
-            <img :src="scope.row.coverImage" width="375" height="300">
+            <img :src="scope.row.coverImage" width="375" height="300" />
             <template #reference>
               <img
                 :src="scope.row.coverImage"
                 style="max-height: 60px; max-width: 60px"
-              >
+              />
             </template>
           </el-popover>
         </template>
@@ -86,18 +84,21 @@
             type="text"
             size="mini"
             @click="addTag(scope.row, 2)"
-          >审核</el-button>
+            >审核</el-button
+          >
           <el-button
             v-if="tougu || yunyin || zhujiao || yinxiao"
             type="text"
             size="mini"
             @click="addTag(scope.row, 0)"
-          >查看</el-button>
+            >查看</el-button
+          >
           <el-button
             type="text"
             size="mini"
             @click="$router.push(`/circle/data?id=${scope.row.id}`)"
-          >数据</el-button>
+            >数据</el-button
+          >
           <el-button
             v-if="
               (tougu || zhujiao || yunyin) &&
@@ -107,43 +108,50 @@
             type="text"
             size="mini"
             @click="addTag(scope.row, 0)"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             v-if="(tougu || zhujiao) && scope.row.status === 1"
             type="text"
             size="mini"
             @click="update(scope.row, 101)"
-          >申请上架</el-button>
+            >申请上架</el-button
+          >
           <el-button
             v-if="(tougu || zhujiao) && scope.row.status === 2"
             type="text"
             size="mini"
             @click="update(scope.row, 102)"
-          >撤回</el-button>
+            >撤回</el-button
+          >
           <!-- <el-button v-if="yinxiao" type="text" size="mini" @click="update(scope.row)">数据</el-button> -->
           <el-button
             v-if="(tougu || yinxiao || zhujiao) && scope.row.status === 3"
             type="text"
             size="mini"
             @click="copyUrl($event, scope.row)"
-          >复制圈子链接</el-button>
+            >复制圈子链接</el-button
+          >
           <el-button
             v-if="yunyin && scope.row.status === 5"
             type="text"
             size="mini"
             @click="update(scope.row, 105)"
-          >上架</el-button>
+            >上架</el-button
+          >
           <el-button
             v-if="yunyin && scope.row.status === 3"
             type="text"
             size="mini"
             @click="update(scope.row, 106)"
-          >下架</el-button>
+            >下架</el-button
+          >
           <el-button
             v-if="yunyin && [5].includes(scope.row.status)"
             type="text"
             @click="update(scope.row, 107)"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -247,7 +255,7 @@
                 v-if="form.coverImage"
                 :src="form.coverImage"
                 class="avatar"
-              >
+              />
               <el-button v-else size="mini" type="primary">上传图片</el-button>
             </el-upload>
           </el-form-item>
@@ -342,7 +350,7 @@
           <el-form-item v-if="isAdjust" label="审核结果">
             <el-radio-group v-model="adjustForm.event">
               <el-radio :label="103">通过</el-radio>
-              <br>
+              <br />
               <el-radio :label="104">驳回</el-radio>
               <el-input
                 v-model="adjustForm.reason"
@@ -361,7 +369,8 @@
             :loading="editLoading"
             type="primary"
             @click="submit()"
-          >确认</el-button>
+            >确认</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -425,6 +434,17 @@ export default {
     }
   },
   data() {
+    const validateAuthorityId = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输权限号"));
+      } else {
+        var reg = /^(\d+,?)+$/;
+        if (!reg.test(value)) {
+          callback(new Error("权限号为纯数字，多个权限号以逗号隔开！"));
+        }
+        callback();
+      }
+    };
     return {
       dialog: false,
       dialogTitle: "",
@@ -484,7 +504,8 @@ export default {
           { required: true, message: "请上传封面图", trigger: "blur" }
         ],
         authorityId: [
-          { required: true, message: "请输入权限号", trigger: "blur" }
+          { required: true, message: "请输入权限号", trigger: "blur" },
+          { validator: validateAuthorityId, trigger: "blur" }
         ],
         originalPrice: [
           { required: true, message: "请输入价格", trigger: "blur" }
@@ -698,7 +719,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       })
-        .then(async() => {
+        .then(async () => {
           const params = {
             id: item.id,
             event,
diff --git a/src/views/liveBroadcast/list/components/batchCreate.vue b/src/views/liveBroadcast/list/components/batchCreate.vue
index e629d92..c11cde6 100644
--- a/src/views/liveBroadcast/list/components/batchCreate.vue
+++ b/src/views/liveBroadcast/list/components/batchCreate.vue
@@ -427,6 +427,15 @@
             show-word-limit
           ></el-input>
         </el-form-item>
+        <el-form-item label="产品Id" prop="productId">
+          <el-input
+            v-model="dialogForm.productId"
+            placeholder="请输入产品ID"
+            autocomplete="off"
+            clearable
+            show-word-limit
+          ></el-input>
+        </el-form-item>
         <el-form-item label="产品介绍" prop="productDesc">
           <el-input
             v-model="dialogForm.productDesc"
@@ -459,14 +468,14 @@
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item label="产品链接" prop="url">
+        <!-- <el-form-item label="产品链接" prop="url">
           <el-input
             v-model="dialogForm.url"
             autocomplete="off"
             placeholder="请输入产品链接"
             clearable
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel()">取 消</el-button>
@@ -542,7 +551,7 @@ export default {
       dialogForm: {
         productName: "",
         productDesc: "",
-        productType: 111,
+        productType: 21,
         url: "",
         coverImgUrl: ""
       },
@@ -592,6 +601,9 @@ export default {
           { required: true, message: "请输入产品名称", trigger: "blur" },
           { min: 1, max: 50, message: "长度在 1 到 20 个字符", trigger: "blur" }
         ],
+        productId: [
+          { required: true, message: "请输入产品ID", trigger: "blur" }
+        ],
         productDesc: [
           { required: true, message: "请输入产品介绍", trigger: "blur" },
           {
diff --git a/src/views/liveBroadcast/list/components/create.vue b/src/views/liveBroadcast/list/components/create.vue
index 9d1d233..dd0d4d3 100644
--- a/src/views/liveBroadcast/list/components/create.vue
+++ b/src/views/liveBroadcast/list/components/create.vue
@@ -308,6 +308,8 @@
           <el-table :data="ruleForm.cartList" size="mini" style="width: 100%">
             <el-table-column label="产品名称" prop="productName" width="100">
             </el-table-column>
+            <el-table-column prop="productId" label="产品id" width="180">
+            </el-table-column>
             <el-table-column prop="productDesc" label="产品介绍" width="180">
             </el-table-column>
             <el-table-column prop="" label="封面图">
@@ -482,6 +484,15 @@
             show-word-limit
           ></el-input>
         </el-form-item>
+        <el-form-item label="产品Id" prop="productId">
+          <el-input
+            v-model="dialogForm.productId"
+            placeholder="请输入产品ID"
+            autocomplete="off"
+            clearable
+            show-word-limit
+          ></el-input>
+        </el-form-item>
         <el-form-item label="产品介绍" prop="productDesc">
           <el-input
             v-model="dialogForm.productDesc"
@@ -514,14 +525,14 @@
             </div>
           </el-upload>
         </el-form-item>
-        <el-form-item label="产品链接" prop="url">
+        <!-- <el-form-item label="产品链接" prop="url">
           <el-input
             v-model="dialogForm.url"
             autocomplete="off"
             placeholder="请输入产品链接"
             clearable
           ></el-input>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel()">取 消</el-button>
@@ -659,8 +670,9 @@ export default {
       },
       dialogForm: {
         productName: "",
+        productId: "",
         productDesc: "",
-        productType: 111,
+        productType: 21,
         url: "",
         coverImgUrl: ""
       },
@@ -720,6 +732,9 @@ export default {
           { required: true, message: "请输入产品名称", trigger: "blur" },
           { min: 1, max: 50, message: "长度在 1 到 20 个字符", trigger: "blur" }
         ],
+        productId: [
+          { required: true, message: "请输入产品ID", trigger: "blur" }
+        ],
         productDesc: [
           { required: true, message: "请输入产品介绍", trigger: "blur" },
           {
@@ -1310,7 +1325,7 @@ export default {
       this.dialogForm = {
         productName: "",
         productDesc: "",
-        productType: 111,
+        productType: 21,
         url: "",
         coverImgUrl: ""
       };
@@ -1335,7 +1350,11 @@ export default {
     },
     validateTitles(rule, value, callback) {
       if (!value || !value.length) {
-        callback(new Error("请输入权限号"));
+        return callback(new Error("请输入权限号"));
+      }
+      var reg = /^(\d+,?)+$/;
+      if (!reg.test(value)) {
+        return callback(new Error("权限号为纯数字，多个权限号以逗号隔开！"));
       }
       const titles = value.split(",").map(t => t.trim());
       if (titles.length > 4) {