From 1a56534d28b1599a06d4be63807fb4b91ff9e1ea Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Mon, 20 Jan 2025 18:12:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/WITHDRAWAL_SETTING.vue            | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
index e7276589..e5996cc9 100644
--- a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="layout">
 
-    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
       <FormItem label="提现审核是否开启">
         <i-switch v-model="formValidate.apply" style="margin-top:7px;"><span slot="open">开</span>
           <span slot="close">关</span>
@@ -36,12 +36,8 @@ export default {
   data() {
     return {
       result:"",
-      formValidate: { // 表单数据
-        apply: true,
-        minPrice: "",
-        type: "",
-        wechatAppId: "",
-      },
+      ruleValidate: {}, // 验证规则
+      formValidate: {},// 表单数据
 
       switchTitle: "提现审核是否开启", // 切换title
     };
@@ -72,7 +68,29 @@ export default {
     // 实例化数据
     init() {
       this.result = JSON.parse(this.res);
+      Object.keys(this.result).map((item) => {
+        this.result[item] += "";
+      });
       this.$set(this, "formValidate", { ...this.result });
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value < 0) {
+                callback(new Error("不能输入负数！"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ];
+      });
     },
   },
 };

From 9a7aee7e97d31c4d8b3476069dc131b346b173ca Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 20 Jan 2025 18:43:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/goods-seller/goodsOperationSec.vue  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 0965954f..347f3bb8 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -203,6 +203,7 @@
 
 
                                   <AutoComplete ref="input" v-model="val.value"
+                                                :disabled="containsSameSkuItem"
                                                 :filter-method="filterMethod"
                                                 :maxlength="30" placeholder="请输入规格值" style="width: 180px"
                                                 @on-focus="changeSkuVals(val, item.name)"
@@ -257,6 +258,7 @@
 
                               <FormItem v-if="item.spec_values.length < 10 && item.spec_values.length >= 1 && item.spec_values[0].value !== ''" class="sku-item-content-val flex" label="" style="line-height: 32px;">
                                 <AutoComplete ref="input" v-model="newSkuValues[$index]"
+                                              :disabled="containsSameSkuItem"
                                               :filter-method="filterMethod"
                                               :maxlength="30" placeholder="自定义规格值" style="width: 180px"
                                               @on-blur="addSpec($index, item)"
@@ -630,6 +632,10 @@ export default {
       skuTableColumn: [],
       /** 表格数据 */
       skuTableData: [],
+      // 持久化的sku数据
+      skuTableDataCopy: [],
+      // 持久化的sku数据
+      skuInfoCopy: [],
       /** 默认的规格参数 */
       skuData: [],
       /** 默认的规格值 */
@@ -671,6 +677,9 @@ export default {
       shopCategory: [],
       /** 商品单位列表 */
       goodsUnitList: [],
+      containsSameSkuItem: false,
+      containsSameSkuValue: false,
+      containsSameSkuNewValue: false,
       // 展示商品视频
       showGoodsVideo: false,
       ignoreColumn: [
@@ -1246,6 +1255,14 @@ export default {
     },
     /** 添加规格项 */
     addSkuItem() {
+      if (this.containsSameSkuItem) {
+        this.$Message.error("存在重复规格项！");
+        return;
+      }
+      if (this.containsSameSkuValue) {
+        this.$Message.error("存在重复规格值！");
+        return;
+      }
       if (this.skuInfo.length >= 5) {
         this.$Message.error("规格项不能大于5个！");
         return;
@@ -1269,8 +1286,10 @@ export default {
     editSkuItem(val, index, item) {
       if (this.skuTableData.find((i) => i[val])) {
         this.$Message.error("已存在相同规格项！");
+        this.containsSameSkuItem = true;
         return;
       }
+      this.containsSameSkuItem = false;
       if (this.zz(0, val) > 20) {
         this.$Message.error("规格值最多十个字符长度！");
         // val = val.toString().slice(0, 4);
@@ -1322,8 +1341,13 @@ export default {
     skuValueChange(val, index, item, $index) {
       if (this.skuTableData.find((i) => i[val.name] === val.value)) {
         this.$Message.error("已存在相同规格值！");
+
+        this.skuInfo = cloneObj(this.skuInfoCopy);
+        this.skuTableData = cloneObj(this.skuTableDataCopy);
         return;
       }
+
+      this.containsSameSkuValue = false;
       if (val.value === '') {
         return;
       }
@@ -1343,6 +1367,8 @@ export default {
         return e;
       });
       this.currentSkuVal = val.value;
+      this.skuTableDataCopy = cloneObj(this.skuTableData);
+      this.skuInfoCopy = cloneObj(this.skuInfo);
       this.renderTableData(this.skuTableData);
     },
     // 获取焦点时，取得规格名对应的规格值
@@ -1366,6 +1392,12 @@ export default {
           (e) => e[spec.name] !== this.lastEditSkuValue
         );
       }
+
+      // 判断是否存在重复规格值
+      if(!this.skuTableData.find((i) => i[val.name] === val.value)) {
+        this.skuTableDataCopy = cloneObj(this.skuTableData);
+        this.skuInfoCopy = cloneObj(this.skuInfo);
+      }
     },
     /** 移除当前规格项 进行数据变化*/
     handleCloseSkuItem($index, item) {
@@ -1456,6 +1488,21 @@ export default {
         this.$Message.error("请输入规格值");
         return;
       }
+
+      if (this.containsSameSkuItem) {
+        this.$Message.error("存在重复规格项！");
+        return;
+      }
+
+      if (item.spec_values.find((i) => i.value === this.newSkuValues[$index])) {
+        this.newSkuValues[$index] = "";
+        this.skuInfo = cloneObj(this.skuInfoCopy);
+        this.skuTableData = cloneObj(this.skuTableDataCopy);
+        this.$Message.error("存在重复规格值！");
+        this.containsSameSkuNewValue = true;
+        return;
+      }
+
       if (this.validateEmpty(item.spec_values)) {
         if (item.spec_values.length >= 10) {
           this.$Message.error("规格值不能大于10个！");
@@ -1514,6 +1561,9 @@ export default {
         }
         this.baseInfoForm.regeneratorSkuFlag = true;
         this.newSkuValues[$index] = "";
+
+        this.skuTableDataCopy = cloneObj(this.skuTableData);
+        this.skuInfoCopy = cloneObj(this.skuInfo);
       }
     },
     handleClearSku() {
@@ -1780,6 +1830,14 @@ export default {
     },
     /**  添加商品 **/
     save() {
+      if (this.containsSameSkuItem) {
+        this.$Message.error("存在重复规格项！");
+        return;
+      }
+      if (this.containsSameSkuValue) {
+        this.$Message.error("存在重复规格值！");
+        return;
+      }
       this.submitLoading = true;
       this.$refs["baseInfoForm"].validate((valid) => {
         if (valid) {

From 37384ebadd4f62724df56eef0abbb50ab5faede5 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Tue, 21 Jan 2025 13:53:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../goods/goods-seller/goodsOperationSec.vue   | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 347f3bb8..1fbb0041 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -738,17 +738,6 @@ export default {
         desc: "视频大小不能超过10MB",
       });
     },
-    onAddSku(index) {
-      if (!this.newSkuValues[index]) {
-        this.$Message.error('请输入规格值')
-        return
-      }
-      this.skuInfo[index].spec_values.push({
-        name: this.newSkuValues[index].name,
-        value: this.newSkuValues[index],
-        images: this.openImage ? [] : this.baseInfoForm.goodsGalleryFiles
-      })
-    },
     // 图片选择后回调
     callbackSelected(val) {
       this.picModelFlag = false;
@@ -1302,6 +1291,11 @@ export default {
         delete e[this.currentSkuItem];
         return e;
       });
+
+      this.skuInfo[index].name = val;
+      this.skuInfo[index].spec_values.forEach((e) => {
+        e.name = val;
+      });
       this.currentSkuItem = val;
       this.renderTableData(this.skuTableData);
     },
@@ -1394,7 +1388,7 @@ export default {
       }
 
       // 判断是否存在重复规格值
-      if(!this.skuTableData.find((i) => i[val.name] === val.value)) {
+      if (!this.skuTableData.find((i) => i[val.name] === val.value)) {
         this.skuTableDataCopy = cloneObj(this.skuTableData);
         this.skuInfoCopy = cloneObj(this.skuInfo);
       }

From efc778acbcb0e96965220be77226562ad3e7e299 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Tue, 11 Feb 2025 15:43:09 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=85=AC=E9=92=A5=E8=BF=98=E6=98=AF=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/setting-manage/pay/WECHAT_PAYMENT.vue      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
index f0a30889..392db0cf 100644
--- a/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
+++ b/manager/src/views/sys/setting-manage/pay/WECHAT_PAYMENT.vue
@@ -34,10 +34,18 @@
       <FormItem class="form-item-view-el" label="apiclient_key" prop="apiclient_key">
         <Input v-model="formValidate.apiclientKey" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
       </FormItem>
-      <FormItem label="公钥证书ID" prop="公钥证书ID">
+      <FormItem label="加签方式" prop="publicType">
+        <RadioGroup type="button" button-style="solid" v-model="formValidate.publicType" @change="handlePublicTypeChange">
+          <Radio label="CERT">平台证书</Radio>
+          <Radio label="KEY">微信支付公钥</Radio>
+        </RadioGroup>
+        <span class="desc">商户接收APIv3的请求应答、回调时验签使用，以下两种方式只能使用一种</span>
+      </FormItem>
+      <!-- 当加签方式选择“KEY”时展示 -->
+      <FormItem v-if="formValidate.publicType === 'KEY'" label="公钥证书ID" prop="publicId">
         <Input maxlength="300" v-model="formValidate.publicId" />
       </FormItem>
-      <FormItem class="form-item-view-el" label="公钥证书" prop="publicKey">
+      <FormItem v-if="formValidate.publicType === 'KEY'" class="form-item-view-el" label="公钥证书" prop="publicKey">
         <Input v-model="formValidate.publicKey" :rows="6" maxlength="2500" show-word-limit type="textarea" placeholder="Enter something..." />
       </FormItem>
       <FormItem label="支付回调域名" prop="callbackUrl">
@@ -97,7 +105,7 @@ export default {
           ];
         }
       });
-    },
+    }
   },
 };
 </script>