From 9d6848ea3b085d66f515403d1991ed492d4bc395 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 09:04:48 +0800
Subject: [PATCH] bug修改

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html |   63 +++++++++++++++++++------------
 1 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
index 3a2b6fd..c9fd3c0 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html
@@ -45,6 +45,7 @@
             <input hidden id="role" value="${role}">
             <input hidden id="type" value="${item.type}">
 
+            @if(role=='1'){
             <div class="form-group">
                 <label class="col-sm-3 control-label">门店类型:</label>
                 <div class="col-sm-9">
@@ -52,23 +53,25 @@
                     <input type="radio" name="type" value="2" onclick="updateType(2)"> 运营商门店
                 </div>
             </div>
+            @}
             @if(role=='1'){
             <div class="form-group" id="yys" hidden >
                 <label class="col-sm-3 control-label">所属运营商:</label>
                 <div class="col-sm-9">
-                    <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange1(this)">
+                    <select class="form-control" id="account" name="account" onchange="TCarInfoDlg.oneChange3(this)">
                         @for(obj in yysList){
                         <option value="${obj.id}" ${obj.id == item.operatorId ? 'selected=selected' : ''}>${obj.name}</option>
                         @}
                     </select>
                 </div>
             </div>
+            @}
             <div class="form-group" id="provinceCode">
                 <label class="col-sm-3 control-label">所在省:</label>
                 <div class="col-sm-9">
-                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange2(this)">
+                    <select class="form-control" id="pCode" name="pCode" onchange="TCarInfoDlg.oneChange9(this)">
                         @for(obj in list){
-                        <option value="${obj.id}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
+                        <option value="${obj.code}" ${obj.code == item.provinceCode ? 'selected=selected' : ''}>${obj.name}</option>
                         @}
                     </select>
                 </div>
@@ -77,14 +80,12 @@
                 <label class="col-sm-3 control-label">所在市:</label>
                 <div class="col-sm-9">
                     <select class="form-control" id="cCode" name="cCode">
-                        <option value="">选择市</option>
                         @for(obj in list1){
-                        <option value="${obj.id}" ${item.cityCode == obj.code ? 'selected=selected' : ''}>${obj.name}</option>
+                        <option value="${obj.code}" ${item.cityCode == obj.code ? 'selected=selected' : ''}>${obj.name}</option>
                         @}
                     </select>
                 </div>
             </div>
-            @}
             <#input id="name" name="门店名称" type="text" value="${item.name}"/>
             <#input id="phone" name="联系电话" type="text" value="${item.phone}"/>
             <div hidden id="longitude" value="${item.lon}"></div>
@@ -124,7 +125,8 @@
                                     accept="."
                                     :file-list="imageUrl2"
                                     :on-success="handleAvatarSuccess"
-                                    :on-remove="handleRemove">
+                                    :on-remove="handleRemove"
+                                    :before-upload="beforeAvatarUpload">
                                 <i class="el-icon-plus"></i>
                             </el-upload>
                             <el-dialog :visible.sync="dialogVisible">
@@ -135,7 +137,7 @@
 
                 </div>
             </div>
-            <#input id="ids" name="添加入园闸机" type="text" value="${item.ids}"/>
+            <!--<#input id="ids" name="添加入园闸机" type="text" value="${item.ids}"/>-->
 
         </div>
         <div class="row btn-group-m-t">
@@ -210,24 +212,14 @@
         },
         methods: {
             handleAvatarSuccess(res, file) {
-                file.url =file.response
-                TCarInfoDlg.goodsPicArray.push(file);
-                console.log(TCarInfoDlg.goodsPicArray)
-            },
-            changeImg(){
-               var i = id.split(",")
-                for (let j = 0; j <i.length; j++) {
-                    let obj={
-                        fileName:i[j],
-                        uuid:i[j],
-                        url:i[j],
-                        response:i[j],
-                    }
-                    this.imageUrl2.push(obj)
-
+                // 确保文件对象有完整的结构
+                if (file && file.response) {
+                    file.url = file.response;
                 }
-                console.log( this.imageUrl2,111)
+                TCarInfoDlg.goodsPicArray.push(file.url);
+                console.log(TCarInfoDlg.goodsPicArray);
             },
+            // 添加 beforeUpload 钩子到 el-upload 组件
             beforeAvatarUpload(file) {
                 const isLt2M = file.size / 1024 / 1024 < 10;
                 if (!isLt2M) {
@@ -235,11 +227,32 @@
                 }
                 return isLt2M;
             },
+            // 修改 handleRemove 方法
             handleRemove(file, fileList) {
+                // 使用更安全的方式过滤
                 TCarInfoDlg.goodsPicArray = TCarInfoDlg.goodsPicArray.filter(item => {
-                    return item.uid != file.uid;
+                    // 如果是文件对象,比较 uid;如果是字符串,比较值
+                    if (typeof item === 'object' && item !== null) {
+                        return item.uid !== file.uid;
+                    } else {
+                        return item !== file.url;
+                    }
                 });
+            },
+            changeImg(){
+                if (!id) return; // 如果没有图片数据则返回
 
+                var i = id.split(",").filter(url => url.trim() !== ''); // 过滤空字符串
+                for (let j = 0; j < i.length; j++) {
+                    let obj = {
+                        uid: 'existing-' + j + '-' + Date.now(), // 确保 uid 是唯一的字符串
+                        name: 'image-' + j + '.jpg', // 添加 name 属性
+                        url: i[j],
+                        status: 'success' // 标记为已上传状态
+                    };
+                    this.imageUrl2.push(obj);
+                }
+                console.log(this.imageUrl2, 111);
             },
         },
         created() {

--
Gitblit v1.7.1