From b2a1d5e84ec68f711b80eca3b2baee300c64d9b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B5=85=E5=BF=B5?= <email@sample.com>
Date: Tue, 17 Jun 2025 16:46:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=A0=E8=BD=BD=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/main.js                 |   9 +-
 page/table/newcarlistedit.html | 149 ++++++++++++++++++---------------
 2 files changed, 90 insertions(+), 68 deletions(-)

diff --git a/assets/main.js b/assets/main.js
index 6a931a3..bb12baa 100755
--- a/assets/main.js
+++ b/assets/main.js
@@ -95,8 +95,12 @@ function getI18N(code) {
 var res=''
 
 
-
 ajax = function(options){
+	
+	// 显示加载动画
+	var loadIndex = layer.load(2, {
+		shade: [0.2, '#000']
+	});
 	var ret = null,token=[];
 	if(isAjaxLock){
 		queue.push(options);
@@ -130,8 +134,10 @@ ajax = function(options){
 					options.failCallBack(result);
 				}
 				ret = result;
+				layer.close(loadIndex);
 			},
 			error: function(XMLHttpRequest, textStatus, errorThrown){
+				layer.close(loadIndex);
 				if(XMLHttpRequest.status == 401){
 					layer.msg('验证失败！用户名或者密码错误', {icon: 5,time: 1000});
 					window.setTimeout(function(){
@@ -151,6 +157,7 @@ ajax = function(options){
 				}
 			},
 			complete: function(XMLHttpRequest, textStatus){
+				layer.close(loadIndex);
 				isAjaxLock = false;
 				if(queue.length >= 1){
 					var options = queue.shift();
diff --git a/page/table/newcarlistedit.html b/page/table/newcarlistedit.html
index 4d17392..1128cc1 100755
--- a/page/table/newcarlistedit.html
+++ b/page/table/newcarlistedit.html
@@ -249,13 +249,28 @@
             t = layui.tinymce,
 			upload = layui.upload,
             $ = layui.$;
-		brandpresetfn(form,true)
-		energypresetfn(form)
-		typespresetfn(form)
+		
+		// 创建一个函数来加载所有下拉框数据
+		function loadAllDropdowns(callback) {
+			// 加载品牌数据
+			brandpresetfn(form, true);
+			// 加载能源类型数据
+			energypresetfn(form);
+			// 加载车辆类型数据
+			typespresetfn(form);
+			
+			// 使用setTimeout确保DOM更新完成
+			setTimeout(function() {
+				form.render();
+				if (callback) callback();
+			}, 100);
+		}
+
 		form.on('select(brandSelect)', function(data){
 		    var selectedValue = data.value;
-		    modelpresetfn(form,true,selectedValue)
+		    modelpresetfn(form, true, selectedValue);
 		});
+
 		//监听提交
 		form.render();
 		$("#idedt").val(getQueryString('id'))
@@ -274,70 +289,70 @@
 				closeBtn: 1, // 显示关闭按钮
 			});
 		});
-		self.vehiclenewdetail({
-			type:'get',
-			data:{id:getQueryString('id')},
-			successCallBack: function(result){
-				if (result.code == 0) {
-					$(".img-3").attr("src",result.data.cover_full)
-					var datas = result.data
-					$("#cover").val(result.data.cover)
-					modelpresetfn(form,true,datas.brand)
-					form.val('edit', datas)
-					console.log(datas)
-					
-					// 回显图册
-					if(result.data.album && result.data.album.length > 0) {
-						result.data.album.forEach(function(item) {
-							var imgId = 'img_' + new Date().getTime() + '_' + Math.random();
-							$('#albumList').append(`
-								<div class="upload-itemm" style="display: inline-block; margin: 10px;">
-									<img src="${item.pic_full}" alt="${item.alt || ''}" id="${imgId}" class="img-3" style="cursor: pointer;">
-									<input type="hidden" name="pic[]" value="${item.pic}">
-									<input type="hidden" name="idimg[]" value="${item.id}" />
-									<input type="text" class="layui-input" data-i18n-placeholder="brand.image_desc"  
-										style="margin: 5px 0px;height: 30px;" name="alt[]" value="${item.alt || ''}">
-									<button type="button" class="layui-btn layui-btn-danger layui-btn-xs delete-img">
-										<i class="layui-icon">&#xe640;</i><span data-i18n="btn.delete"></span>
-									</button>
-								</div>
-							`);
-						});
+
+		// 先加载所有下拉框数据，然后再获取详情数据
+		loadAllDropdowns(function() {
+			self.vehiclenewdetail({
+				type:'get',
+				data:{id:getQueryString('id')},
+				successCallBack: function(result){
+					if (result.code == 0) {
+						$(".img-3").attr("src",result.data.cover_full)
+						var datas = result.data
+						$("#cover").val(result.data.cover)
+						
+						// 加载model数据并设置表单值
+						modelpresetfn(form, true, datas.brand);
+						// 使用setTimeout确保model数据加载完成
+						setTimeout(function() {
+							form.val('edit', datas)
+							console.log(datas)
+							
+							// 回显图册
+							if(result.data.album && result.data.album.length > 0) {
+								result.data.album.forEach(function(item) {
+									var imgId = 'img_' + new Date().getTime() + '_' + Math.random();
+									$('#albumList').append(`
+										<div class="upload-itemm" style="display: inline-block; margin: 10px;">
+											<img src="${item.pic_full}" alt="${item.alt || ''}" id="${imgId}" class="img-3" style="cursor: pointer;">
+											<input type="hidden" name="pic[]" value="${item.pic}">
+											<input type="hidden" name="idimg[]" value="${item.id}" />
+											<input type="text" class="layui-input" data-i18n-placeholder="brand.image_desc"  
+												style="margin: 5px 0px;height: 30px;" name="alt[]" value="${item.alt || ''}">
+											<button type="button" class="layui-btn layui-btn-danger layui-btn-xs delete-img">
+												<i class="layui-icon">&#xe640;</i><span data-i18n="btn.delete"></span>
+											</button>
+										</div>
+									`);
+								});
+							}
+							// 回显介绍
+							if(result.data.content && result.data.content.length > 0) {
+								result.data.content.forEach(function(item) {
+									addIntro('introList',form,'请填写介绍内容', item.content,item.id)
+								});
+							}
+							// 回显特点
+							if(result.data.trait && result.data.trait.length > 0) {
+								result.data.trait.forEach(function(item) {
+									addFeature('featureList',form,'名称','描述', item.title, item.content,item.id)
+								});
+							}
+							// 回显问题
+							if(result.data.asked && result.data.asked.length > 0) {
+								result.data.asked.forEach(function(item) {
+									addFeature1('problem',form,'问题','回答',item.title, item.content,item.id)
+								});
+							}
+							form.render();
+						}, 100);
 					}
-					// 回显介绍
-					if(result.data.content && result.data.content.length > 0) {
-					    result.data.content.forEach(function(item) {
-							addIntro('introList',form,'请填写介绍内容', item.content,item.id)
-					    });
-					} else {
-					    // 如果没有添加一个空的
-						// addIntro('introList',form,'请填写介绍内容')
-					}
-					// 回显特点
-					if(result.data.trait && result.data.trait.length > 0) {
-					    result.data.trait.forEach(function(item) {
-							addFeature('featureList',form,'名称','描述', item.title, item.content,item.id)
-					    });
-					} else {
-					    // 如果没有添加一个空的
-						// addFeature('featureList',form,'名称','描述','','')
-					}
-					// 回显问题
-					if(result.data.asked && result.data.asked.length > 0) {
-					    result.data.asked.forEach(function(item) {
-							addFeature1('problem',form,'问题','回答',item.title, item.content,item.id)
-					    });
-					} else {
-					    // 如果没有添加一个空的
-						// addFeature1('problem',form,'问题','回答','','')
-					}
-					form.render();
-				};
-			},
-			failCallBack: function(result){
-				alert(result.message);
-			}
-		})
+				},
+				failCallBack: function(result){
+					alert(result.message);
+				}
+			});
+		});
 		$('.layui-btnup').each(function(index, item){
 			var $item = $(item).closest('.upload-item');
 			upload.render({