From 34187dc1b0ffa83511a55e35e14f2e10afee6bf7 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期一, 15 八月 2022 10:04:53 +0800
Subject: [PATCH] test

---
 pages/modal/classAttr.vue |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index d5b01a5..6338c80 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -688,12 +688,6 @@
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
 						var ar = attr[j];
-						if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
-						// if(ar.notEmpty=='1'){
-							uni.hideLoading();
-							uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
-							return;
-						}
 						if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
 						if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
 							if(ar.Value=='璇�) ar.Value='';
@@ -703,6 +697,14 @@
 							req.push({ name: ar.Name, value: ar.Value?'1':'0'});
 						else
 							req.push({ name: ar.Name, value: ar.Value ?ar.Value :''});
+							
+						if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
+						// if(ar.notEmpty=='1'){
+							uni.hideLoading();
+							// uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
+							uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
+							return;
+						}
 					}
 				}
 				var enviroment = {
@@ -729,13 +731,12 @@
 						var action = JSON.parse(success.data.Action);
 						if(action.ret=='0'){
 							if(action.result_type=='0'){
-								uni.showModal({title:"鎻愮ず",content:action.result,showCancel:false,confirmText:"鍙栨秷"});
+								uni.showToast({title:action.result,icon:"success",duration:3000});
 							}
 							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
 						}
 						this.class_attr_init();
 					}else{
-						uni.hideLoading();
 						uni.showModal({title:"閿欒",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
 					}
 				}).catch(ex=>{

--
Gitblit v1.9.1