From a94f1b73dce878f7102081aae0d796c233a4699f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期二, 20 五月 2025 16:04:49 +0800
Subject: [PATCH] 绑定班次

---
 pages/modal/classAttr.vue | 1208 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 622 insertions(+), 586 deletions(-)

diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index 20f42dc..ecd1e62 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -24,14 +24,17 @@
 							</div>
 							<input
 								:type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁� || attr.Type=='int' || attr.Type=='float'?'number':'text'"
-								:value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'"
+								:value="attr.Value" :focus="focusField == `${index}-${iindex}`" @focus="ontap"
+								@click="onClick(index,iindex)" @blur="onevent" v-if="attr.Height=='1'"
 								:data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
 								:disabled="attr.edit?false:true">
 							<!-- =='flase'?true:false -->
-							<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'"
+							<textarea :value="attr.Value" :focus="focusField == `${index}-${iindex}`" @focus="ontap"
+								@click="onClick(index,iindex)" @blur="onevent" v-else-if="attr.Height=='2'"
 								:data-index="index" :data-iindex="iindex" style="height:60px;"
 								:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
-							<textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='3'"
+							<textarea :value="attr.Value" :focus="focusField == `${index}-${iindex}`" @focus="ontap"
+								@click="onClick(index,iindex)" @blur="onevent" v-else-if="attr.Height=='3'"
 								:data-index="index" :data-iindex="iindex" style="height:90px;"
 								:style="{'width':attr.Width}" :disabled="attr.edit?false:true"></textarea>
 							<!-- 鎵爜鍚庝簨浠惰繑鍥�-->
@@ -47,16 +50,19 @@
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input
 								:type="attr.Type=='鏁存暟' || attr.Type=='娴偣鏁� || attr.Type=='int' || attr.Type=='float' ?'number':'text'"
-								class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
-								v-if="attr.Height=='1'" :data-index="index" :data-iindex="iindex"
+								class="attr_field" :value="attr.Value" :focus="focusField == `${index}-${iindex}`"
+								@focus="ontap" @blur="onevent" @click="onClick(index,iindex)" v-if="attr.Height=='1'"
+								:data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
 								:disabled="attr.edit?false:true">
-							<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
+							<textarea class="attr_field" :value="attr.Value" :focus="focusField == `${index}-${iindex}`"
+								@focus="ontap" @blur="onevent" @click="onClick(index,iindex)"
 								v-else-if="attr.Height=='2'" :data-index="index" :data-iindex="iindex"
 								style="height:60px;"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
 								:disabled="attr.edit?false:true"></textarea>
-							<textarea class="attr_field" :value="attr.Value" @focus="ontap" @blur="onevent"
+							<textarea class="attr_field" :value="attr.Value" :focus="focusField ==`${index}-${iindex}`"
+								@focus="ontap" @blur="onevent" @click="onClick(index,iindex)"
 								v-else-if="attr.Height=='3'" :data-index="index" :data-iindex="iindex"
 								style="height:90px;"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - (attr.ext_button==true?9:0) +'%'}"
@@ -150,13 +156,13 @@
 								<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								disabled="true">
+								disabled="true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
-								disabled="true">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'|| attr.Type=='obj-ref'">
 								<a @tap="classAttr_AddRef" :data-classid="attr.RelCls.split('|')[0]"
 									:data-classname="attr.RelCls.split('|')[1]"><i
@@ -181,13 +187,14 @@
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true">
+							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input type="text" class="attr_field" :value="attr.Value"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
-								disabled="true">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2">
 								<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
@@ -204,13 +211,14 @@
 								<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
 							</div>
-							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true">
+							<input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
+								:maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input type="text" class="attr_field" :value="attr.Value"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) - 9 +'%'}"
-								disabled="true">
+								disabled="true" :maxlength="-1">
 							<div class="text-right2">
 								<a class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
 										class="ace-icon fa fa-plus-circle"></i></a>
@@ -224,13 +232,13 @@
 							<text class="tx_title">{{attr.DispName}}:<i class="i_tishi"
 									v-if="attr.notempty==true">*</i></text>
 							<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
-								:disabled="attr.edit?false:true">
+								:disabled="attr.edit?false:true" :maxlength="-1">
 						</view>
 						<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
 							<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
 							<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
 								:style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"
-								:disabled="attr.edit?false:true">
+								:disabled="attr.edit?false:true" :maxlength="-1">
 							<i class="i_tishi" v-if="attr.notempty==true">*</i>
 						</view>
 					</view>
@@ -290,6 +298,13 @@
 <script>
 	import pickerAddress from '../../js/pickerAddress/pickerAddress.vue'
 	import utils from "@/js/utils.js"
+	import {
+		classAttrList,
+		classGridStyleInfo,
+		dataObjAdd,
+		dataObjRunCustomEvent
+	} from "@/api/index.js"
+
 	export default {
 		components: {
 			pickerAddress
@@ -298,6 +313,8 @@
 			return {
 				title: '鏂板',
 				param: {},
+				focusField: "",
+				focusOldField: "",
 				classAttrList: [],
 				classGridStyle: [],
 				edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
@@ -332,7 +349,7 @@
 				url: '../modal/classAttr?param=' + JSON.stringify(this.param) +
 					"&titlename=" + this.title
 			});
-		
+
 		},
 		onLoad(options) {
 			// console.log(options);
@@ -340,7 +357,7 @@
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
 			var param = JSON.parse(options.param);
-			this.$data.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
+			this.title = param.Add_BtnName ? param.Add_BtnName : options.titlename; //璁剧疆鎸夐挳鏂囧瓧
 			// console.log(param);
 			if (!param.EditDlgMode) {
 				uni.showModal({
@@ -360,64 +377,77 @@
 				});
 				return;
 			}
-			this.$data.param = param;
+			this.param = param;
 
 			this.loadData()
 		},
 		methods: {
-			loadData() {
-				var $this = this;
-				var edit_dlg = {
-					Model: $this.param.EditDlgMode,
-					Name: $this.param.Edit_dlg.Name
-				}
-				var dataInfo = {
-					class_id: $this.param.clsid
-				};
-				$this.$store.state.thisareaFuncID = $this.param.clsid;
-				// console.log($this.$store.getters.getclassAttrList);
-				//鑾峰彇
-				if ($this.$store.getters.getclassAttrList) {
-					$this.$data.classAttrList = $this.$store.getters.getclassAttrList.data;
-					$this.classGridStyleInfo();
-				} else {
-					$this.$store.dispatch('classAttrList', dataInfo).then(success => {
-						// console.log(success);
-						if (success.code == '00000') {
-							$this.$data.classAttrList = success.data;
+			setData(obj) {
+				let that = this;
+				let keys = [];
+				let val, data;
 
-							$this.classGridStyleInfo();
+				Object.keys(obj).forEach(function(key) {
+					keys = key.split(".");
+					val = obj[key];
+					data = that.$data;
+					keys.forEach(function(key2, index) {
+						if (index + 1 == keys.length) {
+							that.$set(data, key2, val);
 						} else {
-							uni.showModal({
-								title: "閿欒1",
-								content: success.msg,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
+							if (!data[key2]) {
+								that.$set(data, key2, {});
+							}
 						}
-					}).catch(ex => {
-						// console.log(ex);
-						uni.showModal({
-							title: "閿欒1.1",
-							content: ex.errMsg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
+						data = data[key2];
+					});
+				});
+			},
+
+			async loadData() {
+				try {
+					var edit_dlg = {
+						Model: this.param.EditDlgMode,
+						Name: this.param.Edit_dlg.Name
+					}
+					var dataInfo = {
+						class_id: this.param.clsid
+					};
+					this.classAttrList = await classAttrList(dataInfo) || []
+
+					var gridstyleInfo = {
+						class_id: this.param.clsid,
+						name: this.param.Edit_dlg.Name,
+						type: '2'
+					};
+
+					const res = await classGridStyleInfo(gridstyleInfo)
+					res.StyleDef = JSON.parse(res.StyleDef);
+					this.classGridStyle = res;
+					// console.log($this.classGridStyle);
+					this.class_attr_init();
+
+				} catch (ex) {
+					uni.showModal({
+						title: "閿欒1",
+						content: ex.errMsg,
+						showCancel: false,
+						confirmText: "鍙栨秷"
 					});
 				}
 			},
 			classAttr_extButton(index, iindex) { //寮规灞傛樉绀�type:top bottom center left right
 				var $this = this;
-				$this.$data.popupType = 'right'
+				$this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				$this.$refs.popup.open($this.popupType);
-				var data_attr = $this.$data.classAttrList[index].Attr[iindex];
+				var data_attr = $this.classAttrList[index].Attr[iindex];
 				// var value = action.value;
 				// var action ={"action_type":"open_common_dlg","value":{"common_dlg_id":"check_list","config":{"title":"鐢熶骇宸ュ崟","appear_style":"sideslip","width":250,"multiple_choice":"1","items":[{"id":"133D50D7-D798-4D2E-A15F-308365092DF5","name":"5100691673", "check":false},{"id":"22992021-7D3B-4959-86B7-EF184B596AC6","name":"5100691674", "check":false},{"id":"48FBBE8E-594D-45D5-8C24-385C661C4A1C","name":"5100691675", "check":false},{"id":"4E429C60-325A-42ED-BEA3-B3397C07CCA1","name":"5100691668", "check":false}]}}}
 				// if (action.action_type == 'open_common_dlg') {
 				// 	var value = action.value;
 				// 	if(value.common_dlg_id == 'check_list'){
-				// 	   $this.$data.check_list= value.config;
+				// 	   $this.check_list= value.config;
 				// 	}
 				// }
 				// var popupParam={
@@ -427,10 +457,10 @@
 				// 	req:"",
 				// 	data_attr:data_attr
 				// }
-				// $this.$data.popupParam= popupParam;
+				// $this.popupParam= popupParam;
 				// return;
-				var before_click_button = $this.$data.classAttrList[index].Attr[iindex].before_click_button;
-				var button_callback = $this.$data.classAttrList[index].Attr[iindex].button_callback;
+				var before_click_button = $this.classAttrList[index].Attr[iindex].before_click_button;
+				var button_callback = $this.classAttrList[index].Attr[iindex].button_callback;
 				if (!before_click_button) {
 					uni.showModal({
 						title: "鎻愮ず",
@@ -458,15 +488,15 @@
 				// console.log(e.target.dataset);
 				var index = e.target.dataset.index;
 				var ischeck = e.target.dataset.ischeck;
-				var data = this.$data.check_list.items;
-				// this.$data.check_list.items=[];
-				if (this.$data.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+				var data = this.check_list.items;
+				// this.check_list.items=[];
+				if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫� 					for (var i in data) {
 						data[i].check = false;
 					}
 				}
 				data[index].check = ischeck ? false : true;
-				this.$data.check_list.items = data;
+				this.check_list.items = data;
 
 			},
 			popup_cancel(e) { //寮规鍙栨秷
@@ -474,7 +504,7 @@
 			},
 			popup_sava(e) { //寮规纭畾
 				var $this = this;
-				var items = $this.$data.check_list.items;
+				var items = $this.check_list.items;
 				var data = [];
 				var name = "";
 				for (var i = 0; i < items.length; i++) {
@@ -488,7 +518,7 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: "鎻愮ず",
 						content: "popupParam涓虹┖锛�,
@@ -497,9 +527,9 @@
 					});
 					return;
 				}
-				$this.$data.classAttrList[$this.$data.popupParam.index].Attr[$this.$data.popupParam.iindex].Value = name;
+				$this.classAttrList[$this.popupParam.index].Attr[$this.popupParam.iindex].Value = name;
 				console.log(data);
-				var callback_eventid = $this.$data.popupParam.button_callback.trim();
+				var callback_eventid = $this.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
 					edtype: "0",
@@ -507,12 +537,12 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.param.clsid,
+					clsid: $this.param.clsid,
 					objid: "",
-					attr: $this.$data.popupParam.req,
+					attr: $this.popupParam.req,
 					dataJson: data
 				}
-				$this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
+				$this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
 				this.$refs.popup.close();
 			},
 			cancel(e) {
@@ -520,87 +550,120 @@
 					delta: 1 //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
 				});
 			},
-			async classGridStyleInfo() {
-				var $this = this;
-				var gridstyleInfo = {
-					class_id: $this.$data.param.clsid,
-					name: $this.$data.param.Edit_dlg.Name,
-					type: '2'
-				};
-				$this.$store.state.thisEditName = $this.$data.param.Edit_dlg.Name
-				// console.log($this.$store.getters.getclassGridStyleInfo);
-				//鑾峰彇
-				if ($this.$store.getters.getclassGridStyleInfo) {
-					$this.$data.classGridStyle = $this.$store.getters.getclassGridStyleInfo.data;
-					$this.class_attr_init();
-				} else {
-					//console.log(gridstyleInfo);
-					$this.$store.dispatch('classGridStyleInfo', gridstyleInfo).then(success => {
-						// console.log(success);
-
-						if (success.code == '00000') {
-
-							success.data.StyleDef = JSON.parse(success.data.StyleDef);
-							$this.$data.classGridStyle = success.data;
-							// console.log($this.$data.classGridStyle);
-
-							$this.class_attr_init();
-
-						} else {
-							uni.showModal({
-								title: "閿欒1.2",
-								content: success.msg,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
-						}
-					}).catch(ex => {
-						console.log(ex);
-						uni.showModal({
-							title: "閿欒1.3",
-							content: ex.errMsg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
-					});
-				}
+			onClick(index, iindex) {
+				this.focusField = `${index}-${iindex}`
 			},
+
 			ontap(e) { //鎵爜鍔熻兘
 				var $ele = e;
 				//console.log(e.target)
+				this.focusOldField = `${e.target.dataset['index']}-${e.target.dataset['iindex']}`
 				getApp().onScan((result) => {
 					//console.log(result.decodedata);
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
 						result.decodedata;
 					uni.hideKeyboard();
 					this.onevent($ele, result.decodedata);
+					if (result.decodedata) { //绗竴涓緭鍏ユ涓嶄负绌�+						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+						const attrs = this.classAttrList[e.target.dataset['index']].Attr || []
+						var findd = false
+						for (let i = e.target.dataset['iindex'] + 1; i < attrs.length; i++) {
+							const ele = attrs[i]
+
+							if (ele.hidden != true) {
+								if (utils.classUtils.attrTypeIsString(ele.Type) || utils.classUtils
+											.attrTypeIsInt(ele.Type)) {
+									const field = `${e.target.dataset['index']}-${i}`
+									if (this
+										.focusOldField ==
+										field) {
+										this.setData({
+											focusField: ""
+										})
+									} else {
+										this.setData({
+											focusField: this
+												.focusOldField
+										})
+									}
+									this.$nextTick(() => {
+										this.setData({
+											focusField: field
+										})
+									});
+									findd = true
+									break
+								}
+							}
+
+
+						}
+						if (findd) {
+							return
+						}
+						for (let i = e.target.dataset['index'] + 1; i < this.classAttrList.length; i++) {
+							const attrs2 = this.classAttrList[i].Attr || []
+							for (let ii in attrs2) {
+								const ele = attrs2[ii]
+								if (ele.hidden != true) {
+									if (utils.classUtils.attrTypeIsString(ele.Type) || utils.classUtils
+										.attrTypeIsInt(ele.Type)) {
+										const field = `${i}-${ii}`
+										if (this
+											.focusOldField ==
+											field) {
+											this.setData({
+												focusField: ""
+											})
+										} else {
+											this.setData({
+												focusField: this
+													.focusOldField
+											})
+										}
+										this.$nextTick(() => {
+											this.setData({
+												focusField: field
+											})
+										});
+										break
+									}
+								}
+							}
+							if (findd) {
+								break
+							}
+						}
+
+					}
+
 				})
 			},
 			onarrow(index, open) {
 				// console.log(index+'--'+open);
-				this.$data.classAttrList[index].Open = open == true ? false : true;
+				this.classAttrList[index].Open = open == true ? false : true;
 			},
 			ondateTime(e) {
 				//console.log(e.target)
-				this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.target
+				this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.target
 					.value;
 			},
 			onchange(e) {
 				// console.log(e.target);
-				var value = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e
-					.target.value];
-				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
-				console.log(data_attr);
+				var value = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e
+					.detail.value];
+				var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
 				if (value.Name != data_attr.Value) {
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = value
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = value
 						.Name;
-					// console.log(this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
-					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
+					// console.log(this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
+					var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
 						.action;
 					if (eventid) {
 						// self.event_no_sub = 1;
 						var req = [];
-						var attrlist = this.$data.classAttrList;
+						var attrlist = this.classAttrList;
 						for (var i = 0; i < attrlist.length; i++) {
 							var attr = attrlist[i].Attr;
 							for (var j = 0; j < attr.length; j++) {
@@ -615,7 +678,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: []
@@ -632,10 +695,10 @@
 				//涓虹┖鏃讹紝娓呯┖灞炴�value
 				if (item.length == 0) {
 					var index, iindex, dindex = 0;
-					for (var i in this.$data.classAttrList) {
-						for (var j in this.$data.classAttrList[i].Attr) {
-							if (delvalue[0].attr == this.$data.classAttrList[i].Attr[j].Name) {
-								this.$data.classAttrList[i].Attr[j].Value = "";
+					for (var i in this.classAttrList) {
+						for (var j in this.classAttrList[i].Attr) {
+							if (delvalue[0].attr == this.classAttrList[i].Attr[j].Name) {
+								this.classAttrList[i].Attr[j].Value = "";
 							}
 						}
 					}
@@ -643,26 +706,26 @@
 
 				for (var v in item) {
 					var index, iindex, dindex = 0;
-					for (var i in this.$data.classAttrList) {
-						for (var j in this.$data.classAttrList[i].Attr) {
-							if (item[v].attr == this.$data.classAttrList[i].Attr[j].Name) {
+					for (var i in this.classAttrList) {
+						for (var j in this.classAttrList[i].Attr) {
+							if (item[v].attr == this.classAttrList[i].Attr[j].Name) {
 								index = i;
 								iindex = j;
 							}
 						}
 					}
 					var itemvalue = item[v];
-					var data_attr = this.$data.classAttrList[index].Attr[iindex];
+					var data_attr = this.classAttrList[index].Attr[iindex];
 
 					console.log(data_attr);
 					if (itemvalue.Name != data_attr.Value) {
-						this.$data.classAttrList[index].Attr[iindex].Value = value;
-						// console.log(this.$data.classAttrList[index].Attr[iindex].Value);
-						var eventid = this.$data.classAttrList[index].Attr[iindex].action;
+						this.classAttrList[index].Attr[iindex].Value = value;
+						// console.log(this.classAttrList[index].Attr[iindex].Value);
+						var eventid = this.classAttrList[index].Attr[iindex].action;
 						if (eventid) {
 							// self.event_no_sub = 1;
 							var req = [];
-							var attrlist = this.$data.classAttrList;
+							var attrlist = this.classAttrList;
 							for (var i = 0; i < attrlist.length; i++) {
 								var attr = attrlist[i].Attr;
 								for (var j = 0; j < attr.length; j++) {
@@ -683,7 +746,7 @@
 								rclsid: '',
 								robjid: '',
 								userlogin: '',
-								clsid: this.$data.param.clsid,
+								clsid: this.param.clsid,
 								objid: "",
 								attr: req,
 								dataJson: [],
@@ -697,17 +760,17 @@
 			},
 			onevent(e, decodedata) {
 				// console.log(e.target);
-				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
+				var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
 				// console.log(decodedata);
-				if (e.target.value != data_attr.Value) {
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
-						decodedata ? decodedata : e.target.value;
-					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
+				if (e.detail.value != data_attr.Value) {
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value =
+						decodedata ? decodedata : e.detail.value;
+					var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
 						.action;
 					if (eventid) {
 						// self.event_no_sub = 1;
 						var req = [];
-						var attrlist = this.$data.classAttrList;
+						var attrlist = this.classAttrList;
 						for (var i = 0; i < attrlist.length; i++) {
 							var attr = attrlist[i].Attr;
 							for (var j = 0; j < attr.length; j++) {
@@ -715,6 +778,7 @@
 								req.push(this.formatAttr(ar))
 							}
 						}
+
 						var info = {
 							eventid: eventid,
 							edtype: "0",
@@ -722,7 +786,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: [],
@@ -735,16 +799,16 @@
 			oncheck(e) {
 				// console.log(e.target);
 				var ischecked = e.target.dataset.ischeck ? false : true;
-				var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
+				var data_attr = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
 				// console.log(data_attr);
 				if (ischecked != data_attr.Value) {
-					this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = ischecked;
-					var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
+					this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = ischecked;
+					var eventid = this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']]
 						.action;
 					if (eventid) {
 						// self.event_no_sub = 1;
 						var req = [];
-						var attrlist = this.$data.classAttrList;
+						var attrlist = this.classAttrList;
 						for (var i = 0; i < attrlist.length; i++) {
 							var attr = attrlist[i].Attr;
 							for (var j = 0; j < attr.length; j++) {
@@ -760,7 +824,7 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 							dataJson: [],
@@ -772,13 +836,13 @@
 			},
 			inputValListIsDel(index) {
 				// console.log(index);
-				this.$data.inputValList.splice(index, 1); //鍒犻櫎tabPagejson鐨勫唴瀹�-				// console.log(this.$data.inputValList);
+				this.inputValList.splice(index, 1); //鍒犻櫎tabPagejson鐨勫唴瀹�+				// console.log(this.inputValList);
 			},
 			addresschange(e) {
 				// console.log(e.target);
 				console.log(e.data.join(';'))
-				this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.data.join(
+				this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value = e.data.join(
 					';');
 			},
 			classAttr_AddPer(index, iindex) {
@@ -793,11 +857,11 @@
 						AddPer(data, param) {
 							// console.log(param);
 							console.log(data);
-							$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
-							$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0].Login + ';' +
+							$this.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
+							$this.classAttrList[param.index].Attr[param.iindex].ValID = data[0].Login + ';' +
 								data[0].Name;
 
-							var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
+							var eventid = $this.classAttrList[param.index].Attr[param.iindex].action;
 							if (eventid) {
 								eventid = eventid.trim();
 								if (eventid) {
@@ -808,13 +872,13 @@
 										rclsid: "",
 										robjid: "",
 										userlogin: data[0].Login,
-										clsid: $this.$data.param.clsid,
+										clsid: $this.param.clsid,
 										objid: "",
 										attr: [],
 										dataJson: [],
 									}
 
-									// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
+									// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
 									$this.DataObjRunCustomEvent(info);
 								}
 							}
@@ -830,8 +894,8 @@
 					showCancel: false,
 					confirmText: "鍙栨秷"
 				});
-				// var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.target.value];
-				// this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
+				// var value=this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].RelCls[e.detail.value];
+				// this.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value;
 			},
 			classAttr_AddPrj(index, iindex) {
 				var param = {
@@ -845,11 +909,11 @@
 						AddPer(data, param) {
 							// console.log(param);
 							// console.log(data);
-							$this.$data.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
-							$this.$data.classAttrList[param.index].Attr[param.iindex].ValID = data[0].ID + ';' +
+							$this.classAttrList[param.index].Attr[param.iindex].Value = data[0].Name;
+							$this.classAttrList[param.index].Attr[param.iindex].ValID = data[0].ID + ';' +
 								data[0].Name;
 
-							var eventid = $this.$data.classAttrList[param.index].Attr[param.iindex].action;
+							var eventid = $this.classAttrList[param.index].Attr[param.iindex].action;
 							if (eventid) {
 								eventid = eventid.trim();
 								if (eventid) {
@@ -860,13 +924,13 @@
 										rclsid: "",
 										robjid: "",
 										userlogin: "",
-										clsid: $this.$data.param.clsid,
+										clsid: $this.param.clsid,
 										objid: "",
 										attr: [],
 										dataJson: [],
 									}
 
-									// var data_attr = $this.$data.classAttrList[param.index].Attr[param.iindex];
+									// var data_attr = $this.classAttrList[param.index].Attr[param.iindex];
 									$this.DataObjRunCustomEvent(info);
 								}
 							}
@@ -875,7 +939,7 @@
 				});
 			},
 			sava() {
-				if (this.$data.edit_ok_event)
+				if (this.edit_ok_event)
 					this.OKDataObjRunCustomEvent();
 				else
 					this.add();
@@ -886,7 +950,7 @@
 					mask: true
 				});
 				var req = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -933,16 +997,16 @@
 				}
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param.clsid,
+						cls_id: this.param.clsid,
 					}
 				};
 
 				var dataInfo = {
-					class_id: this.$data.param.clsid,
+					class_id: this.param.clsid,
 					data_obj_id: '',
 					masterclsid: '',
 					req: JSON.stringify(req),
@@ -956,58 +1020,54 @@
 
 				console.log(dataInfo);
 				// return
-				this.$store.dispatch('addclassattr', dataInfo).then(success => {
-					console.log(success);
+				dataObjAdd(dataInfo).then(data => {
+					console.log(data);
 					uni.hideLoading();
-					if (success.code == '00000') {
-						if (success.data.Action) {
-							var action = JSON.parse(success.data.Action);
-							console.log(action);
-							if (action.ret == '0') {
-								if (action.ret != 0) {
-									uni.showModal({
-										title: "鎻愮ず",
-										content: '鎵ц鑴氭湰澶辫触锛� + action.result,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-									return;
-								}
-								if (action.info) {
-									uni.showModal({
-										title: "鎻愮ず",
-										content: '鎵ц鑴氭湰澶辫触锛� + action.info,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-									return;
-								}
-								if (action.result_type == '0') {
-									uni.showToast({
-										title: action.result,
-										icon: "success",
-										duration: 3000
-									});
-								}
-
-								// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+					if (data.Action) {
+						var action = JSON.parse(data.Action);
+						console.log(action);
+						if (action.ret == '0') {
+							if (action.ret != 0) {
+								uni.showModal({
+									title: "鎻愮ず",
+									content: '鎵ц鑴氭湰澶辫触锛� + action.result,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+								return;
 							}
-						} else
-							uni.showToast({
-								title: "鍒涘缓鎴愬姛锛�,
-								icon: "success",
-								duration: 3000
-							});
+							if (action.info) {
+								uni.showModal({
+									title: "鎻愮ず",
+									content: '鎵ц鑴氭湰澶辫触锛� + action.info,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
+								return;
+							}
+							if (action.result_type == '0') {
+								uni.showToast({
+									title: action.result,
+									icon: "success",
+									duration: 3000
+								});
+							}
 
-						// this.class_attr_init();
-					} else {
-						uni.showModal({
-							title: "閿欒",
-							content: success.msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
+							// "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+						}
+					} else
+						uni.showToast({
+							title: "鍒涘缓鎴愬姛锛�,
+							icon: "success",
+							duration: 3000
 						});
-					}
+					//鍒锋柊
+					uni.redirectTo({
+						url: '../modal/classAttr?param=' + JSON.stringify(this.param) +
+							"&titlename=" + this.title
+					});
+					//this.class_attr_init();
+
 				}).catch(ex => {
 					console.log(ex);
 					uni.hideLoading();
@@ -1020,15 +1080,15 @@
 				});
 			},
 			class_attr_init() {
-				const attrlist = this.$data.classGridStyle.StyleDef?.show_style || []
+				const attrlist = this.classGridStyle.StyleDef?.show_style || []
 				var newattrlist = [];
-				if (this.$data.classAttrList.length > 0) {
+				if (this.classAttrList.length > 0) {
 					for (var i = 0; i < attrlist.length; i++) {
 						var open = attrlist[i].open;
 						var name = attrlist[i].attrgroup_name;
 						var attrs = attrlist[i].attrs;
-						for (var s = 0; s < this.$data.classAttrList.length; s++) {
-							var clsattr = this.$data.classAttrList[s];
+						for (var s = 0; s < this.classAttrList.length; s++) {
+							var clsattr = this.classAttrList[s];
 							if (name == clsattr.Name) {
 								var attr = [];
 								for (var j = 0; j < attrs.length; j++) {
@@ -1087,6 +1147,16 @@
 												ca.Value = '璇烽�鎷�;
 											if (utils.classUtils.attrTypeIsBool(ca.Type))
 												ca.Value = false;
+											if (ca.hidden != true) {
+												if (utils.classUtils.attrTypeIsString(ca.Type) || utils.classUtils
+													.attrTypeIsInt(ca.Type) || utils.classUtils.attrTypeIsFloat(ca.Type)) {
+													if (this.focusField == "") {
+														this.setData({
+															focusField: `${newattrlist.length}-${attr.length}`
+														})
+													}
+												}
+											}
 
 											attr.push(ca);
 										}
@@ -1100,14 +1170,14 @@
 									Order: clsattr.Order,
 									Open: open,
 									Attr: attr,
-									control_style: this.$data.classGridStyle.StyleDef.control_style,
-									title_p_wdith: this.$data.classGridStyle.StyleDef.title_p_wdith
+									control_style: this.classGridStyle.StyleDef.control_style,
+									title_p_wdith: this.classGridStyle.StyleDef.title_p_wdith
 								})
 							}
 						}
 					}
 					if (newattrlist.length > 0) {
-						this.$data.classAttrList = newattrlist;
+						this.classAttrList = newattrlist;
 					}
 					var req = [];
 
@@ -1118,29 +1188,29 @@
 							var ar = attr[j];
 							req.push({
 								attr: ar.attr,
-								val: ar.value ? ar.value : ''
+								value: ar.value ? ar.value : ''
 							});
 						}
 					}
-					var eventlist = this.$data.classGridStyle.StyleDef.event;
+					var eventlist = this.classGridStyle.StyleDef.event;
 
 					if (eventlist) {
 						if (eventlist.length > 0) {
 							for (var i = 0; i < eventlist.length; i++) {
 								if (eventlist[i].event_id == 'before_ok') {
-									this.$data.edit_ok_event = eventlist[i];
+									this.edit_ok_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'initial') {
-									this.$data.edit_inital_event = eventlist[i];
+									this.edit_inital_event = eventlist[i];
 								} else if (eventlist[i].event_id == 'before_select_compose') {
-									this.$data.edit_select_compose_event = eventlist[i].scrip_id;
-									this.$data.edit_compose_cls_id = eventlist[i].compose_cls_id;
+									this.edit_select_compose_event = eventlist[i].scrip_id;
+									this.edit_compose_cls_id = eventlist[i].compose_cls_id;
 								}
 							}
 						}
 					}
 					console.log(req);
-					if (this.$data.edit_inital_event) {
-						var eventid = this.$data.edit_inital_event.scrip_id;
+					if (this.edit_inital_event) {
+						var eventid = this.edit_inital_event.scrip_id;
 						var info = {
 							eventid: eventid,
 							edtype: "0",
@@ -1148,15 +1218,15 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.clsid,
+							clsid: this.param.clsid,
 							objid: "",
 							attr: req,
 						}
 						this.ini_DataObjRunCustomEvent(info);
 					}
 
-					console.log(this.$data.classGridStyle);
-					console.log(this.$data.classAttrList);
+					console.log(this.classGridStyle);
+					console.log(this.classAttrList);
 
 				} else {
 					uni.showModal({
@@ -1169,16 +1239,16 @@
 			},
 			ini_DataObjRunCustomEvent(info) {
 				var param = {
-					EditStyle: this.$data.param.Edit_dlg.Name,
-					ViewStyle: this.$data.param.Edit_dlg.Name,
+					EditStyle: this.param.Edit_dlg.Name,
+					ViewStyle: this.param.Edit_dlg.Name,
 					NotTriggerSysEvent: 0,
 					enviroment: {
 						'function': '3000', // 鍔熻兘鐐圭紪鍙�-						cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+						cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 						'button': 'top', // top/bottom
 						button_name: '鏂板',
 						master: {
-							cls_id: this.$data.param.clsid, // button=bottom鏃�master鐨刢ls_id
+							cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 							//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 						}
 					}
@@ -1201,84 +1271,73 @@
 					global_attr: global_attr
 				}
 				console.log(dataInfo);
-				this.$store.dispatch('DataObjRunCustomEventInfo', dataInfo).then(success => {
-					console.log(success);
-					if (success.code == '00000') {
-						var data = JSON.parse(success.data);
-						var actionlist = data.action;
-						if (actionlist) {
-							for (var j = 0; j < actionlist.length; j++) {
-								var action = actionlist[j];
-								var action_type = action.action_type;
-								var value = action.value;
-								if (action_type == 'set_dlg_attr') {
-									if (value) {
-										console.log(value);
-										for (var i = 0; i < value.length; i++) {
-											for (var a = 0; a < this.$data.classAttrList.length; a++) {
-												for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
-													var ca = this.$data.classAttrList[a].Attr[l];
-													if (value[i].attr == ca.Name) {
-														if (utils.classUtils.attrTypeIsDict(ca.Type)) {
-															var dictItemList = [];
-															for (var d in value[i].choice_list) {
-																var list_val = value[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": list_val,
-																	"Name": list_val,
-																	"label": list_val,
-																	"value": list_val
-																});
+				dataObjRunCustomEvent(dataInfo).then(data => {
+					data = JSON.parse(data);
+					var actionlist = data.action;
+					if (actionlist) {
+						for (var j = 0; j < actionlist.length; j++) {
+							var action = actionlist[j];
+							var action_type = action.action_type;
+							var value = action.value;
+							if (action_type == 'set_dlg_attr') {
+								if (value) {
+									console.log(value);
+									for (var i = 0; i < value.length; i++) {
+										for (var a = 0; a < this.classAttrList.length; a++) {
+											for (var l = 0; l < this.classAttrList[a].Attr.length; l++) {
+												var ca = this.classAttrList[a].Attr[l];
+												if (value[i].attr == ca.Name) {
+													if (utils.classUtils.attrTypeIsDict(ca.Type)) {
+														var dictItemList = [];
+														for (var d in value[i].choice_list) {
+															var list_val = value[i].choice_list[d];
+															dictItemList.push({
+																"CN_S_NAME": list_val,
+																"Name": list_val,
+																"label": list_val,
+																"value": list_val
+															});
 
-															}
-															ca.dictitem = dictItemList;
-															// attr[j].dictitem = val[i].choice_list;
-														} else {
-															ca.Value = value[i].value;
 														}
+														ca.dictitem = dictItemList;
+														// attr[j].dictitem = val[i].choice_list;
+													} else {
+														ca.Value = value[i].value;
 													}
 												}
 											}
+										}
 
-											var length = 0;
-											if (!this.$data.refdatastore.filter(function(s) {
-													return value[i].attr == s.attr
-												}).length) {
-												length = 1;
-												this.$data.refdatastore.push(value[i]);
-											}
-											if (length == 0) {
-												for (var j = 0; j < this.$data.refdatastore.length; j++) {
-													if (this.$data.refdatastore[j].attr == value[i].attr) {
-														this.$data.refdatastore[j].value = value[i].value;
-													}
+										var length = 0;
+										if (!this.refdatastore.filter(function(s) {
+												return value[i].attr == s.attr
+											}).length) {
+											length = 1;
+											this.refdatastore.push(value[i]);
+										}
+										if (length == 0) {
+											for (var j = 0; j < this.refdatastore.length; j++) {
+												if (this.refdatastore[j].attr == value[i].attr) {
+													this.refdatastore[j].value = value[i].value;
 												}
 											}
 										}
 									}
 								}
-								if (action_type == 'open_select_userdlg') {
-									uni.showModal({
-										title: "閿欒2.2",
-										content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
-										showCancel: false,
-										confirmText: "鍙栨秷"
-									});
-								}
-								// else if (action_type == 'tip_dlg') {
-
-								// }
+							} else if (action_type == 'open_select_userdlg') {
+								uni.showModal({
+									title: "閿欒2.2",
+									content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
+									showCancel: false,
+									confirmText: "鍙栨秷"
+								});
 							}
-						}
+							// else if (action_type == 'tip_dlg') {
 
-					} else {
-						uni.showModal({
-							title: "閿欒2",
-							content: success.msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
+							// }
+						}
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -1293,18 +1352,18 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param.clsid, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				if (data_attr) {
 					enviroment.edit_dlg = {
 						type: 'small', //灏忕獥鍙�-						class_id: this.$data.param.clsid, //褰撳墠鏁版嵁绫籭d
+						class_id: this.param.clsid, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1330,112 +1389,104 @@
 					attr: JSON.stringify(info.attr),
 					extinfo: JSON.stringify(enviroment),
 					inputparameter: "",
-					global_attr: JSON.stringify(this.$data.global_attr),
+					global_attr: JSON.stringify(this.global_attr),
 					dataJson: JSON.stringify(info.dataJson)
 				}
 				console.log(dataInfo);
-				this.$store.dispatch('DataObjRunCustomEventInfo', dataInfo).then(success => {
-					console.log(success);
-					if (success.code == '00000') {
-						var data = JSON.parse(success.data);
-						var actionlist = data.action;
 
-						if (actionlist) {
-							console.log(actionlist);
-							for (var i = 0; i < actionlist.length; i++) {
-								var action = actionlist[i];
-								if (action.action_type == 'set_dlg_attr') {
-									var result = action.value;
-									for (var i = 0; i < result.length; i++) {
-										if (result[i].choice_list) {
-											for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-												var attr = $this.$data.classAttrList[c].Attr;
-												for (var j = 0; j < attr.length; j++) {
-													if (attr[j].Name == result[i].attr) {
-														if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
-															var dictItemList = [];
-															for (var d in result[i].choice_list) {
-																var val = result[i].choice_list[d];
-																dictItemList.push({
-																	"CN_S_NAME": val,
-																	"Name": val,
-																	"label": val,
-																	"value": val
-																});
-															}
-															attr[j].dictitem = dictItemList;
-															// attr[j].dictitem = result[i].choice_list;
+				dataObjRunCustomEvent(dataInfo).then(data => {
+					data = JSON.parse(data);
+					var actionlist = data.action;
+
+					if (actionlist) {
+						console.log(actionlist);
+						for (var i = 0; i < actionlist.length; i++) {
+							var action = actionlist[i];
+							if (action.action_type == 'set_dlg_attr') {
+								var result = action.value;
+								for (var i = 0; i < result.length; i++) {
+									if (result[i].choice_list) {
+										for (var c = 0; c < $this.classAttrList.length; c++) {
+											var attr = $this.classAttrList[c].Attr;
+											for (var j = 0; j < attr.length; j++) {
+												if (attr[j].Name == result[i].attr) {
+													if (utils.classUtils.attrTypeIsDict(attr[j].Type)) {
+														var dictItemList = [];
+														for (var d in result[i].choice_list) {
+															var val = result[i].choice_list[d];
+															dictItemList.push({
+																"CN_S_NAME": val,
+																"Name": val,
+																"label": val,
+																"value": val
+															});
 														}
+														attr[j].dictitem = dictItemList;
+														// attr[j].dictitem = result[i].choice_list;
 													}
 												}
 											}
 										}
-										for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-											var attr = $this.$data.classAttrList[c].Attr;
-											for (var j = 0; j < attr.length; j++) {
-												console.log(attr[j].Name + '==' + result[i].attr);
-												if (attr[j].Name == result[i].attr) {
-													attr[j].Value = result[i].value;
-												}
-											}
-										}
-										var length = 0;
-										if (!$this.$data.refdatastore.filter(function(s) {
-												return result[i].attr == s.attr
-											}).length) {
-											length = 1;
-											$this.$data.refdatastore.push(result[i]);
-										}
-										if (length == 0) {
-											for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-												if ($this.$data.refdatastore[j].attr == result[i].attr) {
-													$this.$data.refdatastore[j].value = result[i].value;
-												}
+									}
+									for (var c = 0; c < $this.classAttrList.length; c++) {
+										var attr = $this.classAttrList[c].Attr;
+										for (var j = 0; j < attr.length; j++) {
+											console.log(attr[j].Name + '==' + result[i].attr);
+											if (attr[j].Name == result[i].attr) {
+												attr[j].Value = result[i].value;
 											}
 										}
 									}
-								} else if (data.action[i].action_type == 'set_global_attr') {
-									$this.$data.global_attr = data.action[i].value || [];
-								}
-							}
-						}
-
-						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.classAttrList.length; c++) {
-									var attr = $this.$data.classAttrList[c].Attr;
-									for (var j = 0; j < attr.length; j++) {
-										if (attr[j].Name == result[i].attr) {
-											attr[j].Value = result[i].value;
+									var length = 0;
+									if (!$this.refdatastore.filter(function(s) {
+											return result[i].attr == s.attr
+										}).length) {
+										length = 1;
+										$this.refdatastore.push(result[i]);
+									}
+									if (length == 0) {
+										for (var j = 0; j < $this.refdatastore.length; j++) {
+											if ($this.refdatastore[j].attr == result[i].attr) {
+												$this.refdatastore[j].value = result[i].value;
+											}
 										}
 									}
 								}
-
-								var length = 0;
-								if (!$this.$data.refdatastore.filter(function(s) {
-										return result[i].attr == s.attr
-									}).length) {
-									length = 1;
-									$this.$data.refdatastore.push(result[i]);
-								}
-								if (length == 0) {
-									for (var j = 0; j < $this.$data.refdatastore.length; j++) {
-										if ($this.$data.refdatastore[j].attr == result[i].attr) {
-											$this.$data.refdatastore[j].value = result[i].value;
-										}
-									}
-								}
+							} else if (data.action[i].action_type == 'set_global_attr') {
+								$this.global_attr = data.action[i].value || [];
 							}
 						}
-					} else {
-						uni.showModal({
-							title: "閿欒3",
-							content: success.msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
 					}
+
+					if (data.result) {
+						var result = data.result;
+						for (var i = 0; i < result.length; i++) {
+							for (var c = 0; c < $this.classAttrList.length; c++) {
+								var attr = $this.classAttrList[c].Attr;
+								for (var j = 0; j < attr.length; j++) {
+									if (attr[j].Name == result[i].attr) {
+										attr[j].Value = result[i].value;
+									}
+								}
+							}
+
+							var length = 0;
+							if (!$this.refdatastore.filter(function(s) {
+									return result[i].attr == s.attr
+								}).length) {
+								length = 1;
+								$this.refdatastore.push(result[i]);
+							}
+							if (length == 0) {
+								for (var j = 0; j < $this.refdatastore.length; j++) {
+									if ($this.refdatastore[j].attr == result[i].attr) {
+										$this.refdatastore[j].value = result[i].value;
+									}
+								}
+							}
+						}
+					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -1449,18 +1500,18 @@
 			OKDataObjRunCustomEvent() {
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param.clsid, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 
 					}
 				};
 
-				var eventid = this.$data.edit_ok_event.scrip_id;
+				var eventid = this.edit_ok_event.scrip_id;
 				var req = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -1470,15 +1521,15 @@
 					}
 				}
 
-				if (this.$data.refdatastore.length > 0) {
-					for (var i = 0; i < this.$data.refdatastore.length; i++) {
+				if (this.refdatastore.length > 0) {
+					for (var i = 0; i < this.refdatastore.length; i++) {
 						if (!req.filter(function(s) {
-								return this.$data.refdatastore[i].attr == s.name
+								return this.refdatastore[i].attr == s.name
 							}).length) {
 							length = 1;
 							req.push({
-								'attr': this.$data.refdatastore[i].attr,
-								'val': this.$data.refdatastore[i].value
+								'attr': this.refdatastore[i].attr,
+								'value': this.refdatastore[i].value
 							});
 						}
 					}
@@ -1490,7 +1541,7 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: this.$data.param.clsid,
+					clsid: this.param.clsid,
 					objid: "",
 					attr: req,
 				}
@@ -1505,41 +1556,31 @@
 					objid: info.objid,
 					attr: JSON.stringify(info.attr),
 					extinfo: JSON.stringify(enviroment),
-					global_attr: JSON.stringify(this.$data.global_attr)
+					global_attr: JSON.stringify(this.global_attr)
 				}
 				console.log(dataInfo);
-				this.$store.dispatch('DataObjRunCustomEventInfo', dataInfo).then(success => {
-					console.log(success);
-					if (success.code == '00000') {
-						var data = JSON.parse(success.data);
-						var result = data.result;
-						for (var i = 0; i < result.length; i++) {
-							// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
-							var length = 0;
-							if (!this.$data.refdatastore.filter(function(s) {
-									return result[i].attr == s.attr
-								}).length) {
-								length = 1;
-								this.$data.refdatastore.push(result[i]);
-							}
-							if (length == 0) {
-								for (var j = 0; j < this.$data.refdatastore.length; j++) {
-									if (this.$data.refdatastore[j].attr == result[i].attr) {
-										this.$data.refdatastore[j].value = result[i].value;
-									}
+				dataObjRunCustomEvent(dataInfo).then(data => {
+					data = JSON.parse(data);
+					var result = data.result;
+					for (var i = 0; i < result.length; i++) {
+						// self.class_attr_ele.find('.attr_field[data-field="' + result[i].attr + '"]').val(result[i].value).data('val', result[i].value);
+						var length = 0;
+						if (!this.refdatastore.filter(function(s) {
+								return result[i].attr == s.attr
+							}).length) {
+							length = 1;
+							this.refdatastore.push(result[i]);
+						}
+						if (length == 0) {
+							for (var j = 0; j < this.refdatastore.length; j++) {
+								if (this.refdatastore[j].attr == result[i].attr) {
+									this.refdatastore[j].value = result[i].value;
 								}
 							}
 						}
-
-						this.add();
-					} else {
-						uni.showModal({
-							title: "閿欒4",
-							content: success.msg,
-							showCancel: false,
-							confirmText: "鍙栨秷"
-						});
 					}
+
+					this.add();
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -1554,16 +1595,16 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.clsid, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: '鏂板',
 					master: {
-						cls_id: this.$data.param.clsid, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.clsid, // button=bottom鏃�master鐨刢ls_id
 						//obj_id: ''  // button=bottom鏃�master鐨刼bj_id
 					}
 				};
 				var req = [];
-				var attrlist = this.$data.classAttrList;
+				var attrlist = this.classAttrList;
 				for (var i = 0; i < attrlist.length; i++) {
 					var attr = attrlist[i].Attr;
 					for (var j = 0; j < attr.length; j++) {
@@ -1571,20 +1612,20 @@
 						req.push(this.formatAttr(ar))
 					}
 				}
-				// if (this.$data.refdatastore.length > 0) {
-				//     for (var i = 0; i < this.$data.refdatastore.length; i++) {
+				// if (this.refdatastore.length > 0) {
+				//     for (var i = 0; i < this.refdatastore.length; i++) {
 				//         if (!req.filter(function (s) {
-				//             return $this.$data.refdatastore[i].attr == s.name
+				//             return $this.refdatastore[i].attr == s.name
 				//         }).length) {
 				//             length = 1;
-				//             req.push({ 'attr': this.$data.refdatastore[i].attr, 'val': this.$data.refdatastore[i].value });
+				//             req.push({ 'attr': this.refdatastore[i].attr, 'val': this.refdatastore[i].value });
 				//         }
 				//     }
 				// }
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
 					type: 'small', //灏忕獥鍙�-					class_id: this.$data.param.clsid, //褰撳墠鏁版嵁绫籭d
+					class_id: this.param.clsid, //褰撳墠鏁版嵁绫籭d
 				}
 				if (data_attr) {
 					extinfo.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1604,174 +1645,165 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: this.$data.param.clsid,
+					clsid: this.param.clsid,
 					objid: '',
 					attr: JSON.stringify(req),
 					extinfo: JSON.stringify(extinfo),
-					global_attr: JSON.stringify(this.$data.global_attr)
+					global_attr: JSON.stringify(this.global_attr)
 				}
 				console.log(dataInfo);
-				this.$store.dispatch('DataObjRunCustomEventInfo', dataInfo).then(success => {
-					console.log(success);
-					if (success.code == '00000') {
-						var data = JSON.parse(success.data);
-						if (data != "") {
+				dataObjRunCustomEvent(dataInfo).then(data => {
+					data = JSON.parse(data)
+					console.log(data);
+					if (data != "") {
+						var actions = data.action;
+						console.log(actions);
+						if (actions) {
+							for (var i = 0; i < actions.length; i++) {
+								var action = actions[i];
+								var val = action.value;
+								var enviroment = JSON.stringify(enviroment);
 
-							var actions = data.action;
-							console.log(actions);
-							if (actions) {
-								for (var i = 0; i < actions.length; i++) {
-									var action = actions[i];
-									var val = action.value;
-									var enviroment = JSON.stringify(enviroment);
-
-									if (action.action_type == 'open_panel') {
-										var d = dialog({
-											title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
-											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-										});
-										d.show();
-									} else if (action.action_type == 'open_select_userdlg') {
-										var style = val.style;
-										// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
-										var $this = this;
-										var param = {
+								if (action.action_type == 'open_panel') {
+									var d = dialog({
+										title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
+										content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+									});
+									d.show();
+								} else if (action.action_type == 'open_select_userdlg') {
+									var style = val.style;
+									// style == 'user' ? '閫夋嫨浜哄憳' : style == 'department' ? '閫夋嫨閮ㄩ棬' : style == 'role' ? '閫夋嫨瑙掕壊' : ''
+									var $this = this;
+									var param = {
+										index: index,
+										iindex: iindex,
+										button_callback: button_callback,
+										req: req,
+										data_attr: data_attr
+									}
+									uni.navigateTo({
+										url: '../selpsn/index?mulit=false&param=' + JSON.stringify(
+											param),
+										events: {
+											AddPer(data, param) {
+												// console.log(param);
+												console.log(data);
+												var callback_eventid = param.button_callback.trim();
+												var info = {
+													eventid: callback_eventid,
+													edtype: "0",
+													projectid: '',
+													rclsid: '',
+													robjid: '',
+													userlogin: '',
+													clsid: $this.param.clsid,
+													objid: "",
+													attr: param.req,
+													inputparameter: data,
+													dataJson: [],
+												}
+												$this.DataObjRunCustomEvent(info, param.data_attr);
+											}
+										}
+									});
+								} else if (action.action_type == 'open_data_query_dlg') {
+									var d = dialog({
+										title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
+										content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+									});
+									d.show();
+								} else if (action.action_type == 'open_common_dlg') {
+									var $this = this;
+									if (val.common_dlg_id == 'check_list') {
+										$this.check_list = val.config;
+										if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+											$this.popupType = 'right';
+										else
+											$this.popupType = 'center'
+										// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+										$this.$refs.popup.open($this.popupType);
+										var popupParam = {
 											index: index,
 											iindex: iindex,
 											button_callback: button_callback,
 											req: req,
 											data_attr: data_attr
 										}
-										uni.navigateTo({
-											url: '../selpsn/index?mulit=false&param=' + JSON.stringify(
-												param),
-											events: {
-												AddPer(data, param) {
-													// console.log(param);
-													console.log(data);
-													var callback_eventid = param.button_callback.trim();
+										$this.popupParam = popupParam;
+									}
+								} else if (action.action_type == 'open_project_query_dlg') {
+									//console.log(action.value.select_range);
+									//console.log(action.value.mulit_select);
+									var priRel = '-1';
+									if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
+										priRel = '0';
+									else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
+										priRel = '1';
+									else if (action.value.select_range == '鎴戝垱寤虹殑')
+										priRel = '2';
+									else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value
+										.select_range == '鎴戝弬鍔犵殑')
+										priRel = '3';
+									else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
+										priRel = '4';
+									else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
+										priRel = '5';
+
+									var $this = this;
+									var param_ = {
+										index: index,
+										iindex: iindex,
+										button_callback: button_callback,
+										req: req
+									}
+									uni.navigateTo({
+										url: '../selPrj/index?relation=' + priRel + '&param=' + JSON
+											.stringify(param_),
+										events: {
+											AddPer(data, param) {
+												$this.classAttrList[param.index].Attr[param
+													.iindex].Value = data[0].Name;
+												$this.classAttrList[param.index].Attr[param
+														.iindex].ValID = data[0].ID + ';' + data[0]
+													.Name;
+												var callback_eventid = param.button_callback.trim();
+												if (callback_eventid) {
 													var info = {
 														eventid: callback_eventid,
-														edtype: "0",
-														projectid: '',
-														rclsid: '',
-														robjid: '',
-														userlogin: '',
-														clsid: $this.$data.param.clsid,
+														edtype: "2",
+														projectid: data[0].ID,
+														rclsid: "",
+														robjid: "",
+														userlogin: "",
+														clsid: $this.param.clsid,
 														objid: "",
 														attr: param.req,
-														inputparameter: data,
 														dataJson: [],
 													}
-													$this.DataObjRunCustomEvent(info, param.data_attr);
+
+													$this.DataObjRunCustomEvent(info);
 												}
 											}
-										});
-									} else if (action.action_type == 'open_data_query_dlg') {
-										var d = dialog({
-											title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
-											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-										});
-										d.show();
-									} else if (action.action_type == 'open_common_dlg') {
-										var $this = this;
-										if (val.common_dlg_id == 'check_list') {
-											$this.$data.check_list = val.config;
-											if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�-												$this.$data.popupType = 'right';
-											else
-												$this.$data.popupType = 'center'
-											// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
-											$this.$refs.popup.open($this.$data.popupType);
-											var popupParam = {
-												index: index,
-												iindex: iindex,
-												button_callback: button_callback,
-												req: req,
-												data_attr: data_attr
-											}
-											$this.$data.popupParam = popupParam;
 										}
-									} else if (action.action_type == 'open_project_query_dlg') {
-										//console.log(action.value.select_range);
-										//console.log(action.value.mulit_select);
-										var priRel = '-1';
-										if (action.value.select_range == '鍏ㄩ儴鐩稿叧')
-											priRel = '0';
-										else if (action.value.select_range == '鎴戣礋璐g殑椤圭洰')
-											priRel = '1';
-										else if (action.value.select_range == '鎴戝垱寤虹殑')
-											priRel = '2';
-										else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value
-											.select_range == '鎴戝弬鍔犵殑')
-											priRel = '3';
-										else if (action.value.select_range == '鎴戝叧娉ㄧ殑')
-											priRel = '4';
-										else if (action.value.select_range == '鎴戜笅灞炵殑椤圭洰')
-											priRel = '5';
-
-										var $this = this;
-										var param_ = {
-											index: index,
-											iindex: iindex,
-											button_callback: button_callback,
-											req: req
-										}
-										uni.navigateTo({
-											url: '../selPrj/index?relation=' + priRel + '&param=' + JSON
-												.stringify(param_),
-											events: {
-												AddPer(data, param) {
-													$this.$data.classAttrList[param.index].Attr[param
-														.iindex].Value = data[0].Name;
-													$this.$data.classAttrList[param.index].Attr[param
-															.iindex].ValID = data[0].ID + ';' + data[0]
-														.Name;
-													var callback_eventid = param.button_callback.trim();
-													if (callback_eventid) {
-														var info = {
-															eventid: callback_eventid,
-															edtype: "2",
-															projectid: data[0].ID,
-															rclsid: "",
-															robjid: "",
-															userlogin: "",
-															clsid: $this.$data.param.clsid,
-															objid: "",
-															attr: param.req,
-															dataJson: [],
-														}
-
-														$this.DataObjRunCustomEvent(info);
-													}
-												}
-											}
-										});
-									} else {
-										var d = dialog({
-											title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
-											content: action.action_type + '姝ction灏氭湭澶勭悊锛�
-										});
-										d.show();
-									}
+									});
+								} else {
+									var d = dialog({
+										title: '<i class="ace-icon fa fa-info-circle"></i> ' + '鎻愮ず',
+										content: action.action_type + '姝ction灏氭湭澶勭悊锛�
+									});
+									d.show();
 								}
 							}
-						} else {
-							uni.showModal({
-								title: "鎻愮ず5.2",
-								content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
-								showCancel: false,
-								confirmText: "鍙栨秷"
-							});
 						}
 					} else {
 						uni.showModal({
-							title: "閿欒5",
-							content: success.msg,
+							title: "鎻愮ず5.2",
+							content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,
 							showCancel: false,
 							confirmText: "鍙栨秷"
 						});
 					}
+
 				}).catch(ex => {
 					// console.log(ex);
 					uni.showModal({
@@ -2000,9 +2032,11 @@
 		margin-top: 50rpx;
 		padding: 20rpx;
 		line-height: 1.5;
-		background: #27A6E1;
+		/* background: #27A6E1;
 		border: none;
-		color: #fff;
+		color: #fff; */
+		background: #fff;
+		color: #000;
 		font-size: 38rpx;
 		font-weight: bold;
 		float: left;
@@ -2086,7 +2120,7 @@
 	.popup-footer {
 		float: right;
 		position: absolute;
-		bottom: 0;
+		bottom: 10rpx;
 		right: 20rpx;
 	}
 
@@ -2110,9 +2144,11 @@
 		margin-top: 50rpx;
 		padding: 15rpx;
 		line-height: 1.5;
-		background: #27A6E1;
+	/* 	background: #27A6E1;
 		border: none;
-		color: #fff;
+		color: #fff; */
+		background: #fff;
+		color: #000;
 		font-size: 38rpx;
 		font-weight: bold;
 		/* float: right; */

--
Gitblit v1.9.1