From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 admin/src/components/business/OperaGoodsCategoryEditWindow.vue |   23 +++++++++++++++--------
 1 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/admin/src/components/business/OperaGoodsCategoryEditWindow.vue b/admin/src/components/business/OperaGoodsCategoryEditWindow.vue
index 6736820..b25549b 100644
--- a/admin/src/components/business/OperaGoodsCategoryEditWindow.vue
+++ b/admin/src/components/business/OperaGoodsCategoryEditWindow.vue
@@ -37,7 +37,7 @@
           <el-radio label="1">鏄�</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="鍥炬爣" prop="iconFull" v-if="form.type === 4">
+      <el-form-item label="鍥炬爣" prop="icon" v-if="form.type === 4">
         <UploadImages
           :fileList="form.iconFull ? [{ url: form.iconFull }] : []"
           :uploadData="{ folder: 'category' }"
@@ -56,11 +56,17 @@
       </el-form-item>
       <el-form-item label="鎵�闇�鍙告満璇勭骇" prop="detail" v-if="form.type === 3">
         <el-select v-model="form.detail" placeholder="璇烽�夋嫨鍙告満璇勭骇">
-          <el-option label="S" :value="5"></el-option>
-          <el-option label="A" :value="4"></el-option>
-          <el-option label="B" :value="3"></el-option>
-          <el-option label="C" :value="2"></el-option>
-          <el-option label="D" :value="1"></el-option>
+          <el-option label="S" value="5"></el-option>
+          <el-option label="A" value="4"></el-option>
+          <el-option label="B" value="3"></el-option>
+          <el-option label="C" value="2"></el-option>
+          <el-option label="D" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鏄惁璐甸噸鐗╁搧" prop="otherField" v-if="form.type === 3">
+        <el-select v-model="form.otherField" placeholder="璇烽�夋嫨鏄惁璐甸噸鐗╁搧">
+          <el-option label="鍚�" value="0"></el-option>
+          <el-option label="鏄�" value="1"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="瀵勫瓨璇存槑" prop="detail" v-if="form.type === 2">
@@ -70,7 +76,7 @@
         <el-input v-model="form.remark" type="textarea" :rows="3" placeholder="璇疯緭鍏ュ娉ㄨ鏄�"></el-input>
       </el-form-item>
       <el-form-item label="鎺掑簭" prop="sortnum">
-        <el-input v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴�"></el-input>
+        <el-input type="number" v-model="form.sortnum" placeholder="璇疯緭鍏ユ帓搴�"></el-input>
       </el-form-item>
       <el-form-item label="鐘舵��" prop="status">
         <div style="display: flex; align-items: center;">
@@ -183,7 +189,8 @@
       } else if (this.form.type === 3) {
         this.rules = {
           name: [{ required: true, message: '璇疯緭鍏ョ瓑绾у悕绉�', trigger: 'blur' }],
-          detail: [{ required: true, message: '璇烽�夋嫨鍙告満璇勭骇', trigger: 'blur' }]
+          detail: [{ required: true, message: '璇烽�夋嫨鍙告満璇勭骇', trigger: 'blur' }],
+          otherField: [{ required: true, message: '璇烽�夋嫨鏄惁璐甸噸鐗╁搧', trigger: 'blur' }]
         }
       } else if (this.form.type === 4) {
         this.rules = {

--
Gitblit v1.9.3