From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1

---
 admin/src/components/business/productConfiguration.vue |  100 +++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/admin/src/components/business/productConfiguration.vue b/admin/src/components/business/productConfiguration.vue
index 4d4ff85..a522003 100644
--- a/admin/src/components/business/productConfiguration.vue
+++ b/admin/src/components/business/productConfiguration.vue
@@ -7,25 +7,29 @@
     @confirm="confirm"
   >
     <el-form :model="form" ref="form" :rules="rules">
-      <el-form-item label="鍗″埜绫诲瀷" prop="createDate">
-        <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ崱鍒哥被鍨�" v-trim/>
+      <el-form-item label="鍗″埜绫诲瀷" prop="category">
+        <el-input v-model="form.category" placeholder="璇疯緭鍏ュ崱鍒哥被鍨�" disabled v-trim/>
       </el-form-item>
-      <el-form-item label="鍟嗗搧鍚嶇О" prop="creator">
-        <el-input v-model="form.creator" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" v-trim/>
+      <el-form-item label="鍟嗗搧鍚嶇О" prop="productName">
+        <el-input v-model="form.productName" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" disabled v-trim/>
       </el-form-item>
-      <el-form-item label="鍞崠浠锋牸" prop="editDate">
-        <el-input v-model="form.editDate" placeholder="璇疯緭鍏ュ敭鍗栦环鏍�" v-trim/>
+      <el-form-item label="鍞崠浠锋牸" prop="price">
+        <el-input v-model="form.price" placeholder="璇疯緭鍏ュ敭鍗栦环鏍�" disabled v-trim/>
       </el-form-item>
-      <el-form-item label="鍞崠鐘舵��" prop="editor">
-        <el-select v-model="form.editor" placeholder="璇烽�夋嫨鍞崠鐘舵��">
-          <el-option label="姝ｅ父" value="1"></el-option>
-          <el-option label="鍋滅敤" value="0"></el-option>
+      <el-form-item label="鍞崠鐘舵��" prop="onlineStatus">
+        <el-select v-model="form.onlineStatus" disabled placeholder="璇烽�夋嫨鍞崠鐘舵��">
+          <el-option label="鍞崠涓�" :value="1"></el-option>
+          <el-option label="宸蹭笅鏋�" :value="2"></el-option>
+          <el-option label="灏佺" :value="3"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鍏宠仈濂楅" prop="isdeleted">
-        <el-select v-model="form.editor" placeholder="璇烽�夋嫨鍞崠鐘舵��">
-          <el-option label="姝ｅ父" value="1"></el-option>
-          <el-option label="鍋滅敤" value="0"></el-option>
+      <el-form-item label="鍏宠仈濂楅" prop="outId">
+        <el-select v-model="form.outId" clearable placeholder="璇烽�夋嫨鍏宠仈濂楅">
+          <el-option
+            v-for="item in list"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"></el-option>
         </el-select>
       </el-form-item>
     </el-form>
@@ -35,6 +39,9 @@
 <script>
 import BaseOpera from '@/components/base/BaseOpera'
 import GlobalWindow from '@/components/common/GlobalWindow'
+import { comboListPost } from '@/api/business/combo.js'
+import { bindDiscount } from '@/api/business/douyinProduct.js'
+
 export default {
   name: 'ProductConfigurationWindow',
   extends: BaseOpera,
@@ -44,21 +51,72 @@
       // 琛ㄥ崟鏁版嵁
       form: {
         id: null,
-        createDate: '',
-        creator: '',
-        editDate: '',
-        editor: ''
+        productId: '',
+        category: '',
+        productName: '',
+        price: '',
+        onlineStatus: '',
+        outId: ''
       },
       // 楠岃瘉瑙勫垯
       rules: {
-      }
+      },
+      list: []
     }
   },
   created () {
     this.config({
-      api: '/business/goodsorder',
+      api: '/business/douyinProduct',
       'field.id': 'id'
     })
+  },
+  methods: {
+    open (title, target) {
+      this.title = title
+      this.getComboLists()
+      this.visible = true
+      // 鏂板缓
+      if (target == null) {
+        this.$nextTick(() => {
+          this.$refs.form.resetFields()
+          this.form[this.configData['field.id']] = null
+        })
+        return
+      }
+      // 缂栬緫
+      this.$nextTick(() => {
+        for (const key in this.form) {
+          this.form[key] = target[key]
+        }
+      })
+    },
+    getComboLists () {
+      comboListPost({
+        model: {},
+        capacity: 9999,
+        page: 1
+      }).then(res => {
+        this.list = res.records || []
+      })
+    },
+    confirm () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.isWorking = true
+          bindDiscount({ id: this.form.id, discountId: this.form.outId }).then(res => {
+            if (res.code === 200) {
+              this.visible = false
+              this.$tip.apiSuccess('閰嶇疆鎴愬姛')
+              this.$emit('success')
+            }
+          }).catch(e => {
+            this.$tip.apiFailed(e)
+          }).finally(() => {
+            this.isWorking = false
+          })
+        }
+      })
+    }
   }
 }
-</script>
+</script>
\ No newline at end of file

--
Gitblit v1.9.3