From 2f225fbeacd62fc29cee4be081ea1262677b5d1b Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Tue, 8 Jul 2025 17:20:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(paySet):=20=E6=94=AF=E4=BB=98=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/configManage/paySet/index.vue | 122 +++++++++++++++++-------
 vue.config.js                           |   2 +-
 2 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/src/views/configManage/paySet/index.vue b/src/views/configManage/paySet/index.vue
index c7f34a5..2bf5b43 100644
--- a/src/views/configManage/paySet/index.vue
+++ b/src/views/configManage/paySet/index.vue
@@ -7,37 +7,79 @@
 <template>
   <div class="page">
     <div class="topbox">
-      <div class="levelList_i"
-           :class="tabActive == item.id ? 'act' : ''"
-           v-for="(item, index) in topList"
-           :key="index"
-           @click.prevent="handleLink(item.id)">
+      <div
+        v-for="(item, index) in topList"
+        :key="index"
+        class="levelList_i"
+        :class="tabActive == item.id ? 'act' : ''"
+        @click.prevent="handleLink(item.id)"
+      >
         {{ item.name }}
       </div>
     </div>
     <div class="main">
       <div class="contain">
-        <div class="tit">{{'支付配置'}}</div>
-        <div class="xian"></div>
+        <div class="tit">{{ '支付配置' }}</div>
+        <div class="xian" />
         <div class="pod">
-
-          <el-checkbox v-model="formData.pay81"
-                       border>新汇付PC微信扫码支付</el-checkbox>
-          <el-checkbox v-model="formData.pay82"
-                       border>新汇付PC支付宝扫码支付</el-checkbox>
-          <el-checkbox v-model="formData.pay83"
-                       border>新汇付H5微信支付</el-checkbox>
-          <el-checkbox v-model="formData.pay84"
-                       border>新汇付H5支付宝支付</el-checkbox>
+          <!--          <el-checkbox v-model="formData.pay4"-->
+          <!--                       border>京东银行卡</el-checkbox>-->
+          <el-checkbox
+            v-model="formData.pay5"
+            border
+          >京东收银台（H5）</el-checkbox>
+          <el-checkbox
+            v-model="formData.pay6"
+            border
+          >京东收银台（PC）</el-checkbox>
+          <!--          <el-checkbox v-model="formData.pay11"-->
+          <!--                       border>宝付微信</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay12"-->
+          <!--                       border>宝付微信扫码</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay13"-->
+          <!--                       border>汇付微信</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay15"-->
+          <!--                       border>汇付银行卡</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay20"-->
+          <!--                       border>微信APP</el-checkbox>-->
+          <el-checkbox
+            v-model="formData.pay32"
+            border
+          >通联微信</el-checkbox>
+          <el-checkbox
+            v-model="formData.pay33"
+            border
+          >通联银行卡</el-checkbox>
+          <!--          <el-checkbox v-model="formData.pay71"-->
+          <!--                       border>快钱APP微信</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay72"-->
+          <!--                       border>快钱APP支付宝</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay73"-->
+          <!--                       border>快钱微信扫码</el-checkbox>-->
+          <!--          <el-checkbox v-model="formData.pay74"-->
+          <!--                       border>快钱支付宝扫码</el-checkbox>-->
+          <el-checkbox
+            v-model="formData.pay81"
+            border
+          >新汇付PC微信扫码</el-checkbox>
+          <el-checkbox
+            v-model="formData.pay82"
+            border
+          >新汇付PC支付宝扫码</el-checkbox>
 
         </div>
       </div>
       <div class="footer">
-        <el-button size="small"
-                   class="thebtn2"> {{ '取消' }}</el-button>
-        <el-button size="small"
-                   @click="submit()"
-                   class="thebtn1" style="background-color: #c8161d"> {{ '确认' }}</el-button>
+        <el-button
+          size="small"
+          class="thebtn2"
+        > {{ '取消' }}</el-button>
+        <el-button
+          size="small"
+          class="thebtn1"
+          style="background-color: #c8161d"
+          @click="submit()"
+        > {{ '确认' }}</el-button>
       </div>
     </div>
   </div>
@@ -46,23 +88,35 @@
 import * as api from '@/api/financialCase.js'
 
 export default {
-  name: 'jcsz',
+  name: 'Jcsz',
   data() {
     return {
       tabActive: 0,
       formData: {
+        // pay4: false,
+        pay5: false,
+        pay6: false,
+        // pay11: false,
+        // pay12: false,
+        // pay13: false,
+        // pay15: false,
+        pay20: false,
+        pay32: false,
+        pay33: false,
+        // pay71: false,
+        // pay72: false,
+        // pay73: false,
+        // pay74: false,
         pay81: false,
-        pay82: false,
-        pay83: false,
-        pay84: false
+        pay82: false
       },
       topList: [
         {
           name: '支付配置',
-          id: 0,
-        },
+          id: 0
+        }
       ],
-      checkboxGroup: [],
+      checkboxGroup: []
     }
   },
   mounted() {
@@ -90,12 +144,12 @@ export default {
         if (res.code == 200) {
           this.$message({
             message: res.msg,
-            type: 'success',
+            type: 'success'
           })
         }
       })
-    },
-  },
+    }
+  }
 }
 </script>
 <style scoped lang="scss">
@@ -182,7 +236,11 @@ export default {
   background: rgba(0, 0, 0, 0.1);
 }
 .pod {
-  padding: 20px;
+  // padding: 20px;
+  padding: 10px;
+  display: flex;
+  flex-wrap: wrap;
+  // gap: 20px;
 }
 .footer {
   height: 68px;
diff --git a/vue.config.js b/vue.config.js
index 55acbed..5204c5d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,7 +44,7 @@ module.exports = {
     },
     proxy: {
       '/prod-api': {
-        target: 'http://192.168.0.104:8080',
+        target: 'http://192.168.0.86:8080',
         changeOrigin: true,
         pathRewrite: { '^/prod-api': '' }
       }

From b1aef14cab2c79b60d2fffcf5a38210d4dbe1241 Mon Sep 17 00:00:00 2001
From: woody <woody@163>
Date: Wed, 9 Jul 2025 10:24:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(goods):=20=E5=95=86=E5=93=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E5=A4=8D=E8=B4=AD=E4=B8=93=E5=8C=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=AF=94=E7=8E=87=20=E4=B8=94=E5=BD=93=E5=88=86?=
 =?UTF-8?q?=E7=BA=A2=E6=96=B9=E5=BC=8F=E4=B8=BA=E6=AF=94=E7=8E=87=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=8C=BA=E5=9F=9F=E5=88=86=E7=BA=A2=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goodsManage/goodsList/goodsEdit/jcsz.vue | 7 +++++--
 src/views/goodsManage/goodsRelease/jcsz.vue        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
index 399df96..b09b98e 100644
--- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
+++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue
@@ -134,7 +134,7 @@
                     style="width: 100%"
                     :controls="false"
                     clearable
-                    :disabled="methods == 0"
+                    :disabled="methods == 0 || form.areaIncomeType == 1"
                     :placeholder="'请输入'"
                   >
                     <template v-if="form.areaIncomeType == 1" slot="append">
@@ -1152,6 +1152,8 @@ export default {
     handleAreaIncomeTypeChange(val) {
       if (val == 1) {
         this.form.areaIncome = 0.5
+      } else {
+        this.form.areaIncome = ''
       }
     },
     // getWaresSort() {
@@ -1447,7 +1449,8 @@ export default {
     },
     selSpecial(e) {
       if (e == 43) {
-        this.$set(this.form, 'areaIncomeType', 2)
+        this.$set(this.form, 'areaIncomeType', 1)
+        this.$set(this.form, 'areaIncome', 0.5)
       }
       this.get_hierarchy_list(e)
       console.log(
diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue
index 9f48612..4589f8b 100644
--- a/src/views/goodsManage/goodsRelease/jcsz.vue
+++ b/src/views/goodsManage/goodsRelease/jcsz.vue
@@ -128,7 +128,7 @@
                     style="width: 100%"
                     :controls="false"
                     clearable
-                    :disabled="methods == 0"
+                    :disabled="methods == 0 || form.areaIncomeType == 1"
                     :placeholder="'请输入'"
                   >
                     <template v-if="form.areaIncomeType == 1" slot="append">
@@ -1049,6 +1049,8 @@ export default {
     handleAreaIncomeTypeChange(val) {
       if (val == 1) {
         this.form.areaIncome = 0.5
+      } else {
+        this.form.areaIncome = ''
       }
     },
     // getWaresSort() {
@@ -1241,7 +1243,8 @@ export default {
     },
     selSpecial(e) {
       if (e == 43) {
-        this.$set(this.form, 'areaIncomeType', 2)
+        this.$set(this.form, 'areaIncomeType', 1)
+        this.$set(this.form, 'areaIncome', 0.5)
       }
       this.get_hierarchy_list(e)
       if (