From 2f3221b7c90d5663fdb312653a2d188bc4628370 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 09 二月 2026 10:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/components/business/OperaCategoryWindow.vue |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/admin/src/components/business/OperaCategoryWindow.vue b/admin/src/components/business/OperaCategoryWindow.vue
index c897b92..ee05c59 100644
--- a/admin/src/components/business/OperaCategoryWindow.vue
+++ b/admin/src/components/business/OperaCategoryWindow.vue
@@ -6,7 +6,16 @@
     @confirm="confirm"
   >
     <el-form :model="form" ref="form" :rules="rules">
-      <el-form-item label="鍚嶇О" prop="name">
+      <el-form-item label="鍟嗕笟鍖栫被鍨�" prop="name" v-if="form.type == 1">
+        <el-input   v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
+      </el-form-item>
+      <el-form-item label="鎿呴暱棰嗗煙" prop="name" v-else-if="form.type == 2">
+        <el-input   v-model="form.name" placeholder="璇疯緭鍏ユ搮闀块鍩�" v-trim/>
+      </el-form-item>
+      <el-form-item label="鑰佸笀绛夌骇" prop="name" v-else-if="form.type == 3">
+        <el-input   v-model="form.name" placeholder="璇疯緭鍏ユ搮闀块鍩�" v-trim/>
+      </el-form-item>
+      <el-form-item label="鍚嶇О" prop="name" v-else>
         <el-input   v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/>
       </el-form-item>
       <el-form-item label="鎴樺尯缂栫爜" prop="detail"  v-if="form.type ==0" >
@@ -23,14 +32,18 @@
         <UploadImage
             :fileList="tempfileList"
             :uploadData="uploadData"
+            :size="5"
             @beginUpload="isUploading=true"
             @endUpload="isUploading=false"/>
         <p class="tip-warn">
           寤鸿灏哄锛�750px X 750px锛屼笂闄�6寮�
-          鏀寔png銆乯pg銆乯peg鏍煎紡锛屽ぇ灏忎笉瓒呰繃2M锛屼笂浼犲浘鐗囦笉鍏佽娑夊強鏀挎不鏁忔劅涓庤壊鎯�,
+          鏀寔png銆乯pg銆乯peg鏍煎紡锛屽ぇ灏忎笉瓒呰繃5M锛屼笂浼犲浘鐗囦笉鍏佽娑夊強鏀挎不鏁忔劅涓庤壊鎯�,
         </p>
       </el-form-item>
-      <el-form-item label="鎺掑簭鐮�" prop="sortnum">
+      <el-form-item label="绛夌骇椤哄簭" prop="sortnum" v-if="form.type == 3">
+        <el-input v-model="form.sortnum" type="" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
+      </el-form-item>
+      <el-form-item label="鎺掑簭鐮�" prop="sortnum" v-else>
         <el-input v-model="form.sortnum" type="" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/>
       </el-form-item>
       <el-form-item label="鎻忚堪" prop="remark">
@@ -72,7 +85,8 @@
       tempfileList: [],
       // 楠岃瘉瑙勫垯
       rules: {
-        name: [{ required: true, message: '璇疯緭鍏ュ悕绉�' }]
+        name: [{ required: true, message: '璇疯緭鍏ュ悕绉�' }],
+        detail: [{ required: true, message: '璇疯緭鍏ユ垬鍖虹紪鐮�' }]
       }
     }
   },

--
Gitblit v1.9.3