From 0ecc402885f332b21923bb12183dc072306f2b39 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 18:36:15 +0800
Subject: [PATCH] vue3

---
 pages/modal/3018_2.vue |  680 +++++++++++++++++--------------------------------------
 1 files changed, 213 insertions(+), 467 deletions(-)

diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index ab196d0..c1815f8 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -2,141 +2,16 @@
 	<view class="uni-page-modal-3018-2">
 		<view class="view-content">
 			<!-- 琛ㄥご鏍峰紡 -->
-			<uni-forms ref="baseForm" label-align="right">
-				<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
-					<!-- 鏅�甯冨眬 -->
-					<uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label ? item.label +'锛�:'' "
-						:label-width="item.labelWidth+'px'">
-						<!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> -->
-						<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
-						<uni-data-select id="dv_select" v-if="item.name=='Select'"
-							:style="'width: calc(100% - '+item.labelWidth-10+'px);'"
-							:class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict"
-							@change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select>
-						<!-- 鏂囨湰妗�鏁板瓧妗�-->
-						<view class="input-wrapper" v-if="(item.name=='Input' || item.name=='InputNumber')">
-							<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
-								@change="classAttr_extButton(item)">&#xe568;</text>
-							<input class="uni-input" :class="item.disabled?'input-disabled':''"
-								:type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'"
-								v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder"
-								:style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}"
-								:focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)"
-								@blur="onevent(item)" :maxlength="-1" />
-							<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
-								@click="classAttr_extButton(item)">&#xe568;</text>
-						</view>
-						<!-- 澶氳鏂囨湰 -->
-						<view class="input-wrapper" v-if="item.name=='Textarea' ">
-							<textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value"
-								:focus="focusFieldId == item.fieldId" :placeholder="item.placeholder"
-								@blur="onModelValue(item)" @click="onClick(item)" :data-index="index"
-								style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea>
+			<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
+				@on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+				@on-click-suffix="classAttr_extButton"></OIForm>
 
-						</view>
-						<!-- 澶嶉�妗�-->
-						<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
-							@change="onCheckBoxValue" :data-attr="item.fieldId">
-							<label v-for="(item2) in item.selections" :key="item2.value">
-								<checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
-								<text>{{item2.label}}</text>
-							</label>
-						</checkbox-group>
-						<!-- 鍗曢�妗�-->
-						<radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled"
-							@change="onRadioBoxValue" :data-attr="item.fieldId">
-							<label v-for="(item2) in item.selections" :key="item2.value">
-								<radio :value="item2.value" :checked="item2.value === item.value" />
-								<text>{{item2.label}}</text>
-							</label>
-						</radio-group>
-						<!-- Switch寮�叧 -->
-						<switch class="input-switch" v-if="item.name=='Switch'"
-							:class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value"
-							@change="onModelValue(item)" />
-						<!-- 鏃ユ湡鏃堕棿 -->
-						<view class="input-wrapper" v-if="(item.name=='TimePicker' || item.name=='DatePicker')">
-							<picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''"
-								:disabled="item.disabled" :value="item.value" @change="onModelValue(item)">
-								<view class="picker">{{item.value}}</view>
-							</picker>
-						</view>
-					</uni-forms-item>
-					<!-- 鏍呮牸甯冨眬 -->
-					<uni-row class="demo-uni-row" v-if="item.name=='Layout'">
-						<uni-col v-for="(cols,key) in item.setting.colList"
-							:span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col">
-							<uni-forms-item v-if="cols!=null  && cols.show==true" :label="cols.label? cols.label +'锛�:''"
-								:label-width="cols.labelWidth+'px'">
-								<view class="input-wrapper" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
-									<text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]"
-										@change="onchange(cols)">&#xe568;</text>
-									<input class="uni-input" :class="cols.disabled?'input-disabled':''"
-										:type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'"
-										v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder"
-										:style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}"
-										:focus="focusFieldId == cols.fieldId" @focus="ontap(cols)"
-										@click="onClick(cols)" @blur="onevent(cols)" :maxlength="-1" />
-									<text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]"
-										@click="onchange(cols)">&#xe568;</text>
-								</view>
-								<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
-								<uni-data-select id="dv_select" v-if="cols.name=='Select' "
-									:class="cols.disabled?'input-disabled':''" v-model="cols.value"
-									:localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled"
-									:clear="false"></uni-data-select>
-								<!-- 澶氳鏂囨湰 -->
-								<view class="input-wrapper" v-if="cols.name=='Textarea' ">
-									<textarea class="uni-input" :value="cols.value"
-										:class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder"
-										:focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)"
-										@click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}"
-										:disabled="cols.disabled"></textarea>
-								</view>
-								<!-- 澶嶉�妗�-->
-								<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onCheckBoxValue" :data-attr="cols.fieldId">
-									<label v-for="(cols2) in cols.selections" :key="cols2.value">
-										<checkbox :value="cols2.value" :checked="cols.value.includes(cols2.value)" />
-										<text>{{cols2.label}}</text>
-									</label>
-								</checkbox-group>
-								<!-- 鍗曢�妗�-->
-								<radio-group class="check_rememberPwd" v-if="cols.name=='Radio'"
-									:class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
-									@change="onRadioBoxValue" :data-attr="cols.fieldId">
-									<label v-for="(cols2) in cols.selections" :key="cols2.value">
-										<radio :value="cols2.value" :checked="cols2.value === cols.value" />
-										<text>{{cols2.label}}</text>
-									</label>
-								</radio-group>
-								<!-- Switch寮�叧 -->
-								<switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''"
-									:disabled="cols.disabled" v-model="cols.value" @change="onModelValue(cols)"
-									:style="{'margin-left':'10rpx'}" />
-								<!-- 鏃ユ湡鏃堕棿 -->
-								<view class="input-wrapper"
-									v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled">
-									<picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''"
-										:disabled="cols.disabled" :value="cols.value" @change="onModelValue(cols)">
-										<view class="picker">{{cols.value}}</view>
-									</picker>
-								</view>
-
-							</uni-forms-item>
-						</uni-col>
-					</uni-row>
-				</view>
-			</uni-forms>
 		</view>
 		<view class="view-bottom">
 			<view class="uni-padding-wrap" v-if="dropdownBtns.length>0">
 				<view class="uni-btn-v">
 					<a @tap="clickDropdownBtns">
-						<Icon class="mobox-normal-more" />
+						<text class="mobox-normal-more" />
 					</a>
 				</view>
 			</view>
@@ -151,8 +26,9 @@
 			<uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange">
 				<view class="popup-header">{{check_list.title}}</view>
 				<view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }"
-					:style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}">
-					<view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}">
+					:style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}">
+					<view class="popup-cont"
+						:style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}">
 						<view class="view_popup_CheckList" v-for="(item,index) in check_list.items">
 							<checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check"
 								:data-index="index" :style="{'margin-left': '10rpx'}">
@@ -175,8 +51,12 @@
 </template>
 
 <script>
-	import Base64 from '../../components/js-base64/base64.js'
+	import {
+		Base64
+	} from  '@/js/Base64.js';
 	import utils from "@/js/utils.js"
+	import dayjs from "dayjs";
+	import OIForm from '@/components/oi-form/index.vue'
 	import {
 		appGetInfo,
 		dictGetInfo
@@ -186,10 +66,12 @@
 		runCustomEvent,
 		dataObjCreate
 	} from "@/api/data.js"
-
+	import buttonClickMixin from '@/mixins/button-click.js';
+	
 	export default {
-		modules: {
-			Base64,
+	mixins: [buttonClickMixin],
+		components: {
+			OIForm,
 		},
 		data() {
 			return {
@@ -201,7 +83,6 @@
 				edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 				edit_compose_cls_id: "",
 				global_attr: [],
-				refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 				scanCodeVal: "",
 				popupType: "center",
 				check_list: {},
@@ -268,7 +149,6 @@
 					edit_select_compose_event: "", //閫夋嫨缁勬垚瀵硅薄鏃惰皟鐢� 					edit_compose_cls_id: "",
 					global_attr: [],
-					refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
 					scanCodeVal: "",
 					popupType: "center",
 					check_list: {},
@@ -294,10 +174,10 @@
 			uni.setNavigationBarTitle({
 				title: options.titlename
 			}); //璁剧疆椤堕儴鏍囬 
-			this.$data.param = JSON.parse(options.param);
-			this.$data.title = this.$data.param.Add_BtnName ? this.$data.param.Add_BtnName : options
+			this.param = JSON.parse(options.param);
+			this.title = this.param.Add_BtnName ? this.param.Add_BtnName : options
 				.titlename; //璁剧疆鎸夐挳鏂囧瓧
-			this.$data.btnName = this.$data.param.Add_BtnName || ""
+			this.btnName = this.param.Add_BtnName || ""
 			this.loadData(options.paramValue)
 		},
 		computed: {
@@ -337,7 +217,7 @@
 				//浼犲叆鍙傛暟鍊� 				if (paramValue) {
 					const attrs = paramValue.attrs || [];
-					(this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+					(this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
 						if (ele.name != "Layout") {
 							attrs.forEach(async (ele2, index2) => {
 								if (ele.fieldId == ele2.name) {
@@ -393,8 +273,7 @@
 										//鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ�
 										let itemName = ele.value || "";
 										if (itemName) {
-											styledefHead.form
-												.model[ele.fieldId] = itemName;
+											styledefHead.form.model[ele.fieldId] = itemName;
 										}
 										ele.dict = selections.map((a) => {
 											return {
@@ -402,9 +281,7 @@
 												text: a.label
 											}
 										})
-
 									}
-
 								}
 								if ($this.focusFieldId == "") {
 									if (ele.name == 'Input' || ele.name ==
@@ -440,10 +317,7 @@
 														text: a.label
 													}
 												})
-
-
 											}
-
 										}
 										if ($this.focusFieldId == "") {
 											if (col.name == 'Input' || col
@@ -487,7 +361,7 @@
 						title: this.translateSys("error") + "1.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -527,7 +401,7 @@
 						title: this.translateSys("error") + "1.3",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 
 
@@ -559,14 +433,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -578,7 +452,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 						var actionlist = data.action;
@@ -592,7 +466,7 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
@@ -629,7 +503,7 @@
 												"quotation_mark_right") + this
 											.translate('tip_action_unprocessed'),
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -647,7 +521,7 @@
 							this.translateSys("full_stop") +
 							this.translate('reason') + this.translateSys("colon") + tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				}
 			},
@@ -703,11 +577,15 @@
 			onScanValue(item, value) {
 				const $this = this;
 				//console.log("onScanValue", item);
-				if (item.oldvalue != value) {
-					item.oldvalue = value;
-					item.value = value;
+				item.value = value
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+				}
+				if (newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					$this.head_styledef.form.model[attr] = value;
+					$this.head_styledef.form.model[attr] = newVal;
 					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠� 					if (eventid) {
 						var obj_attr = this.head_styledef.form.model;
@@ -724,70 +602,67 @@
 							rclsid: '',
 							robjid: '',
 							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
+							clsid: this.param.DataCls.id,
 							objid: "",
 							attr: req,
 							dataJson: [],
 						}
 						this.DataObjRunCustomEvent(info, '');
 					}
-					if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�-						//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
-						var findd = false
-						for (let i in $this.head_styledef.form.items) {
-							const ele = $this.head_styledef.form.items[i]
+					//鍒濆鍖栵紝涓嬩釜杈撳叆妗唂ocus灞炴�
+					var findd = false
+					for (let i in $this.head_styledef.form.items) {
+						const ele = $this.head_styledef.form.items[i]
 
-							if (ele.name != "Layout") {
-								if (ele.name == 'Input' || ele.name == 'InputNumber') {
-									if (attr == ele.fieldId) {
-										findd = true
-									} else {
-										if (findd) {
-											$this.setData({
-												focusFieldId: ele.fieldId
-											})
-											break
-										}
-
-									}
-
-								}
-							} else {
-								if (findd) {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return (col.name == 'Input' || col.name == 'InputNumber');
-									})
-									if (curIndex > -1) {
+						if (ele.name != "Layout") {
+							if (ele.name == 'Input' || ele.name == 'InputNumber') {
+								if (attr == ele.fieldId) {
+									findd = true
+								} else {
+									if (findd) {
 										$this.setData({
-											focusFieldId: ele.setting.colList[curIndex]
-												.fieldId
+											focusFieldId: ele.fieldId
 										})
 										break
 									}
 
-								} else {
-									let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
-										return attr == col.fieldId;
-									})
-									if (curIndex > -1) {
-										findd = true
-										let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
-											return (col.name == 'Input' || col.name ==
-													'InputNumber') &&
-												index2 >
-												curIndex;
-										})
-										if (curIndex2 > -1) {
-											$this.setData({
-												focusFieldId: ele.setting.colList[curIndex]
-													.fieldId
-											})
-											break
-										}
-									}
 								}
 
 							}
+						} else {
+							if (findd) {
+								let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+									return (col.name == 'Input' || col.name == 'InputNumber');
+								})
+								if (curIndex > -1) {
+									$this.setData({
+										focusFieldId: ele.setting.colList[curIndex]
+											.fieldId
+									})
+									break
+								}
+
+							} else {
+								let curIndex = ele.setting.colList.findIndex((col, index2, arr) => {
+									return attr == col.fieldId;
+								})
+								if (curIndex > -1) {
+									findd = true
+									let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => {
+										return (col.name == 'Input' || col.name ==
+												'InputNumber') &&
+											index2 >
+											curIndex;
+									})
+									if (curIndex2 > -1) {
+										$this.setData({
+											focusFieldId: ele.setting.colList[curIndex].fieldId
+										})
+										break
+									}
+								}
+							}
+
 						}
 					}
 
@@ -797,85 +672,56 @@
 				// console.log("onClick",item);
 				this.focusFieldId = item.fieldId
 			},
-			onevent(item) {
-				// console.log("onevent",item);
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
+			onEnterChange(item) {
+				let newVal = item.value
+				if (typeof item.value == "string") {
+					newVal = item.value.trim()
+					if (!newVal) {
+						item.oldvalue = newVal;
+						var attr = item.fieldId;
+						this.head_styledef.form.model[attr] = newVal;
+						return
+					}
+				}
+				if (item.oldvalue != newVal) {
+					item.oldvalue = newVal;
 					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
-					//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�-					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�-					if (eventid) {
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var req = Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a] || "",
-						}));
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
-							objid: "",
-							attr: req,
-							dataJson: [],
-						}
-						this.DataObjRunCustomEvent(info, "");
+					this.head_styledef.form.model[attr] = newVal;
+					var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�+					if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�+						this.onChange(onChangeEvent);
 					}
 				}
 
 			},
-			onchange(item) {
-				console.log("onchange", item);
-				if (item.oldvalue != item.value && item.value.trim() != "") {
-					item.oldvalue = item.value;
-					var attr = item.fieldId;
-					this.head_styledef.form.model[attr] = item.value;
-					var eventid = item.bind.onChangeEvent.id; //鍐呭鍙樺寲鍚庝簨浠�-					if (eventid) {
-						// self.event_no_sub = 1;
-						var obj_attr = this.head_styledef.form.model;
-						// console.log(obj_attr);
-						var req = Object.keys(obj_attr).map((a) => ({
-							attr: a,
-							value: obj_attr[a] || "",
-						}));
-						var info = {
-							eventid: eventid,
-							edtype: "0",
-							projectid: '',
-							rclsid: '',
-							robjid: '',
-							userlogin: '',
-							clsid: this.$data.param.DataCls.id,
-							objid: "",
-							attr: req,
-							dataJson: []
-						}
-						this.DataObjRunCustomEvent(info);
+			// 鍐呭鍙樺寲鍚庝簨浠�+			async onChange(event) {
+				var eventid = event?.id; //鍐呭鍙樺寲鍚庝簨浠�+				if (eventid) {
+					// self.event_no_sub = 1;
+					var obj_attr = this.head_styledef.form.model;
+					// console.log(obj_attr);
+					var req = Object.keys(obj_attr).map((a) => ({
+						attr: a,
+						value: obj_attr[a] || "",
+					}));
+					var info = {
+						eventid: eventid,
+						edtype: "0",
+						projectid: '',
+						rclsid: '',
+						robjid: '',
+						userlogin: '',
+						clsid: this.param.DataCls.id,
+						objid: "",
+						attr: req,
+						dataJson: []
 					}
+					this.DataObjRunCustomEvent(info);
 				}
 
 			},
-			onModelValue(item) { //缁戝畾Model鍊�-				var attr = item.fieldId;
-				this.head_styledef.form.model[attr] = item.value;
-				console.log(item.value)
-			},
-			onCheckBoxValue(e) { //缁戝畾Model鍊�-				let values = e.detail.value || []
-				let attr = e.currentTarget?.dataset?.attr || ""
-				this.head_styledef.form.model[attr] = values;
-			},
-			onRadioBoxValue(e) { //缁戝畾Model鍊�-				let value = e.detail.value || ""
-				let attr = e.currentTarget?.dataset?.attr || ""
-				this.head_styledef.form.model[attr] = value;
-			},
+
 			classAttr_extButton(item) {
 				var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� 				var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -885,7 +731,7 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_callback_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -894,15 +740,15 @@
 						title: this.translateSys("tip"),
 						content: this.translate('icon_click_event_empty'),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				this.$data.popupType = 'right'
+				this.popupType = 'right'
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
 				this.$refs.popup.open(this.popupType);
 
-				this.dataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id,
+				this.dataObjRunCustomEvent_Return(onSuffixClickEvent.id, '', onSuffixClickCallbackEvent.id,
 					item);
 			},
 			popupChange(e) {
@@ -912,15 +758,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) { //寮规鍙栨秷
@@ -928,7 +774,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++) {
@@ -942,12 +788,12 @@
 						});
 					}
 				}
-				if (!$this.$data.popupParam) {
+				if (!$this.popupParam) {
 					uni.showModal({
 						title: this.translateSys("tip"),
 						content: "popupParam涓虹┖锛�,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
@@ -956,11 +802,11 @@
 						title: this.translateSys("tip"),
 						content: this.translate("tip_no_select_data"),
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 					return;
 				}
-				var callback_eventid = $this.$data.popupParam.button_callback.trim();
+				var callback_eventid = $this.popupParam.button_callback.trim();
 				var info = {
 					eventid: callback_eventid,
 					edtype: "0",
@@ -968,12 +814,12 @@
 					rclsid: '',
 					robjid: '',
 					userlogin: '',
-					clsid: $this.$data.param.DataCls.id,
+					clsid: $this.param.DataCls.id,
 					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();
 			},
 
@@ -981,18 +827,18 @@
 				var $this = this;
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id, // button=bottom鏃�master鐨刢ls_id
+						cls_id: this.param.DataCls.id, // 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.DataCls.id, //褰撳墠鏁版嵁绫籭d
+						class_id: this.param.DataCls.id, //褰撳墠鏁版嵁绫籭d
 					}
 					if (data_attr) {
 						enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1011,11 +857,11 @@
 				//     edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
 				//     rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
 				//     attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: "",
-				// 	global_attr: JSON.stringify(this.$data.global_attr), dataJson:JSON.stringify(info.dataJson)
+				// 	global_attr: JSON.stringify(this.global_attr), dataJson:JSON.stringify(info.dataJson)
 				// }
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
-				var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+				var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				if (info.dataJson)
 					info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 				var obj_attr = {};
@@ -1059,14 +905,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -1078,7 +924,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 
 						var actionlist = data.action;
@@ -1092,28 +938,24 @@
 								} else if (action.action_type == 'set_dlg_attr_show') {
 									var result = action.value;
 									$this.hideFormItems(result)
-									// console.log($this.$data.head_styledef);
+									// console.log($this.head_styledef);
 								} else if (action.action_type == 'set_global_attr') {
-									$this.$data.global_attr = action.value || [];
+									$this.global_attr = action.value || [];
 								} else if (action.action_type ==
 									"set_dlg_current_edit_attr"
 								) {
-									if ($this
-										.focusOldFieldId ==
-										action.value) {
+									if ($this.focusOldFieldId == action.value) {
 										$this.setData({
 											focusFieldId: ""
 										})
 									} else {
 										$this.setData({
-											focusFieldId: $this
-												.focusOldFieldId
+											focusFieldId: $this.focusOldFieldId
 										})
 									}
 									$this.$nextTick(() => {
 										$this.setData({
-											focusFieldId: action
-												.value
+											focusFieldId: action.value
 										})
 									});
 								} else {
@@ -1127,7 +969,7 @@
 											.translate(
 												"tip_action_unprocessed"),
 										showCancel: false,
-										confirmText: this.translateSys("cancel")
+										confirmText: this.translateSys('close')
 									});
 								}
 							}
@@ -1138,63 +980,7 @@
 						console.log($this.head_styledef);
 
 						if (data.result) {
-							var result = data.result;
-							for (var i = 0; i < result.length; i++) {
-								for (var c = 0; c < $this.$data.head_styledef.form.items
-									.length; c++) {
-									var attr = $this.$data.head_styledef.form.items[c];
-									//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�-									if ($this.head_styledef.form.model[result[i].attr] ==
-										undefined) {
-										$this.head_styledef.form.model[result[i].attr] =
-											result[i]
-											.value;
-									}
-									//鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�-									if (attr.name != 'Layout') {
-										if (attr.fieldId == result[i].attr) {
-											attr.value = '';
-											attr.oldvalue = '';
-											attr.value = result[i].value;
-											attr.oldvalue = result[i].value;
-											$this.head_styledef.form.model[attr.fieldId] =
-												result[i]
-												.value;
-										}
-									} else if (attr.name == 'Layout') {
-										attr.setting.colList.forEach(col => {
-											if (col) {
-												if (col.fieldId == result[i].attr) {
-													col.value = '';
-													col.oldvalue = '';
-													col.value = result[i].value;
-													col.oldvalue = result[i].value;
-													$this.head_styledef.form.model[col
-															.fieldId] =
-														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;
-										}
-									}
-								}
-							}
+							$this.setFormValues(data.result)
 						}
 					}
 
@@ -1208,7 +994,7 @@
 						title: this.translateSys("error") + "3.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1230,18 +1016,6 @@
 					attr: a,
 					value: obj_attr[a] || "",
 				}));
-				if ($this.refdatastore.length > 0) {
-					for (var i = 0; i < $this.refdatastore.length; i++) {
-						if (!req.filter(function(s) {
-								return $this.refdatastore[i].attr == s.name
-							}).length) {
-							req.push({
-								'attr': $this.refdatastore[i].attr,
-								'value': $this.refdatastore[i].value
-							});
-						}
-					}
-				}
 
 				var extinfo = enviroment;
 				extinfo.edit_dlg = {
@@ -1300,14 +1074,14 @@
 								title: $this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: $this.translateSys("cancel")
+								confirmText: $this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: $this.translateSys("tip"),
 							content: tip + ',' + $this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
 						return false
 					} else {
@@ -1319,7 +1093,7 @@
 							title: $this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: $this.translateSys("cancel")
+							confirmText: $this.translateSys('close')
 						});
 
 						if (data != "") {
@@ -1335,13 +1109,10 @@
 										var d = dialog({
 											title: '<i class="ace-icon fa fa-info-circle"></i> ' +
 												$this.translateSys("tip"),
-											content: $this.translateSys(
-													"quotation_mark_left") +
-												action
-												.action_type + $this.translateSys(
-													"quotation_mark_right") + $this
-												.translate(
-													"tip_action_unprocessed")
+											content: $this.translateSys("quotation_mark_left") +
+												action.action_type + $this.translateSys(
+													"quotation_mark_right") +
+												$this.translate("tip_action_unprocessed")
 										});
 										d.show();
 									} else if (action.action_type == 'open_select_userdlg') {
@@ -1372,7 +1143,7 @@
 														rclsid: '',
 														robjid: '',
 														userlogin: '',
-														clsid: $this.$data.param
+														clsid: $this.param
 															.DataCls
 															.id,
 														objid: "",
@@ -1402,6 +1173,7 @@
 									} else if (action.action_type == 'open_common_dlg') {
 
 										if (val.common_dlg_id == 'check_list') {
+
 											$this.setData({
 												check_list: val.config
 											})
@@ -1460,8 +1232,8 @@
 														data[0].ID +
 														';' + data[0].Name;
 
-													// $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;
+													// $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();
@@ -1497,7 +1269,7 @@
 												.translate(
 													"tip_action_unprocessed"),
 											showCancel: false,
-											confirmText: $this.translateSys("cancel")
+											confirmText: $this.translateSys('close')
 										});
 									}
 								}
@@ -1510,7 +1282,7 @@
 										"quotation_mark_right") + $this.translateSys(
 										"comma") + 'event_id' + eventid,
 								showCancel: false,
-								confirmText: $this.translateSys("cancel")
+								confirmText: $this.translateSys('close')
 							});
 						}
 					}
@@ -1525,7 +1297,7 @@
 						title: $this.translateSys('tip') + "5.1",
 						content: exStr,
 						showCancel: false,
-						confirmText: $this.translateSys("cancel")
+						confirmText: $this.translateSys('close')
 					});
 				});
 			},
@@ -1555,24 +1327,18 @@
 
 				var enviroment = {
 					'function': '3000', // 鍔熻兘鐐圭紪鍙�-					cls_id: this.$data.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+					cls_id: this.param.DataCls.id, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 					'button': 'top', // top/bottom
 					button_name: this.translateSys('add2'),
 					master: {
-						cls_id: this.$data.param.DataCls.id,
+						cls_id: this.param.DataCls.id,
 					}
 				};
 				enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
 
-				// console.log(obj_attr);
-				// var dataInfo={
-				//     class_id: this.$data.param.DataCls.id, data_obj_id: '', masterclsid: '',
-				//     req: JSON.stringify(req), upfile: JSON.stringify([]), post_data: JSON.stringify({}),
-				//     compose: JSON.stringify([]), refdatastore: JSON.stringify([]), extinfo: JSON.stringify(enviroment), 
-				// 	not_trigger_sys_event: ''
-				// };
+
 				var dataInfo = {
-					class_id: this.$data.param.DataCls.id,
+					class_id: this.param.DataCls.id,
 					class_name: '',
 					master_cls_id: '',
 					master_obj_id: '',
@@ -1603,14 +1369,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						this.saving = false
 						return false
@@ -1623,7 +1389,7 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						else {
 
@@ -1635,12 +1401,12 @@
 						}
 
 
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -1695,7 +1461,7 @@
 						title: this.translateSys("tip"),
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -1748,10 +1514,10 @@
 
 						}
 					}
-					for (var c = 0; c < $this.$data.head_styledef.form
+					for (var c = 0; c < $this.head_styledef.form
 						.items
 						.length; c++) {
-						var attr = $this.$data.head_styledef.form.items[c];
+						var attr = $this.head_styledef.form.items[c];
 						// console.log(attr[j].Name+'=='+data[i].attr);
 						//鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹� 						if ($this.head_styledef.form.model[data[i]
@@ -1796,32 +1562,13 @@
 							});
 						}
 					}
-					var length = 0;
-					if (!$this.$data.refdatastore.filter(function(s) {
-							return data[i].attr == s.attr
-						}).length) {
-						length = 1;
-						$this.$data.refdatastore.push(data[i]);
-					}
-					if (length == 0) {
-						for (var j = 0; j < $this.$data.refdatastore
-							.length; j++) {
-							if ($this.$data.refdatastore[j].attr == data[
-									i]
-								.attr) {
-								$this.$data.refdatastore[j].value = data[
-										i]
-									.value;
-							}
-						}
-					}
 				}
 
 			},
 			hideFormItems(data) {
 				const $this = this
 				data.forEach(async (attr, key) => {
-					$this.$data.head_styledef.form.items
+					$this.head_styledef.form.items
 						.forEach(
 							async (
 								ele, index) => {
@@ -1854,8 +1601,8 @@
 				});
 				var head_styledef = JSON.parse(JSON.stringify($this.$data
 					.head_styledef));
-				$this.$data.head_styledef = [];
-				$this.$data.head_styledef = head_styledef;
+				$this.head_styledef = [];
+				$this.head_styledef = head_styledef;
 			},
 			afterOK() {
 				this.saving = true
@@ -1873,7 +1620,7 @@
 				var dataInfo = {
 					ed_type: "0",
 					start_transaction: true,
-					class_id: this.$data.param.DataCls.id,
+					class_id: this.param.DataCls.id,
 					class_name: '',
 					event_id: this.after_ok.id,
 					event_name: '',
@@ -1905,14 +1652,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						this.saving = false
 						return false
@@ -1925,14 +1672,14 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -1985,7 +1732,7 @@
 						title: this.translateSys('tip') + "7.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys('close')
 					});
 				});
 			},
@@ -2023,7 +1770,7 @@
 							title: this.translateSys("tip"),
 							content: this.translateSys("unrealized"),
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 					}
 				} else if (btn.FunCode == "TriggerEvent") {
@@ -2078,14 +1825,14 @@
 								title: this.translateSys("tip"),
 								content: tip,
 								showCancel: false,
-								confirmText: this.translateSys("cancel")
+								confirmText: this.translateSys('close')
 							});
 						} else uni.showModal({
 							title: this.translateSys("tip"),
 							content: tip + ',' + this.translateSys('tip') + ':' + data
 								.ret,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
 						return false
 					} else {
@@ -2097,14 +1844,14 @@
 							title: this.translateSys("tip"),
 							content: tip,
 							showCancel: false,
-							confirmText: this.translateSys("cancel")
+							confirmText: this.translateSys('close')
 						});
-						if (!this.$data.param.After_Btn_Not_Refresh) {
+						if (!this.param.After_Btn_Not_Refresh) {
 							//鍒锋柊
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this.$data
 										.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 						} else {
 							var actionlist = data.action;
@@ -2155,7 +1902,7 @@
 						title: this.translateSys('tip') + "7.1",
 						content: tip,
 						showCancel: false,
-						confirmText: this.translateSys("cancel")
+						confirmText: this.translateSys("close")
 					});
 				});
 
@@ -2183,7 +1930,7 @@
 							uni.redirectTo({
 								url: '../modal/3018_2?param=' + JSON.stringify(this
 										.$data.param) +
-									"&titlename=" + this.$data.title
+									"&titlename=" + this.title
 							});
 
 						},
@@ -2263,7 +2010,7 @@
 			}
 
 			.uni-icon {
-				padding: 8rpx;
+				padding: 10rpx 5rpx;
 				font-size: 32rpx;
 				color: rgb(192, 196, 204);
 			}
@@ -2284,7 +2031,7 @@
 
 		.uni-icon {
 			/* border: 1px solid red; */
-			width: 8%;
+			width: 30rpx;
 			font-family: uniicons;
 			font-size: 40rpx;
 			font-weight: 400;
@@ -2323,9 +2070,10 @@
 				width: 45%;
 				margin: 0 10rpx;
 				// padding: 5rpx 10rpx;
-				background: #4D6AF4;
+				background: #27A6E1;
 				border: none;
 				color: #fff;
+				font-size: 38rpx;
 				float: left;
 				display: inline-block;
 			}
@@ -2340,7 +2088,7 @@
 				margin: 0 10rpx;
 				background: #fff;
 				border: none;
-				color: #000;
+				//color: #000;
 				font-size: 38rpx;
 				float: right;
 				display: inline-block;
@@ -2350,7 +2098,7 @@
 				width: 90%;
 				margin: 0 10rpx;
 				background: #fff;
-				border: none;
+				//	border: none;
 				color: #000;
 				font-size: 38rpx;
 				float: right;
@@ -2414,7 +2162,7 @@
 		.popup-footer {
 			float: right;
 			position: absolute;
-			bottom: 0;
+			bottom: 10rpx;
 			right: 20rpx;
 		}
 
@@ -2438,9 +2186,11 @@
 			margin-top: 50rpx;
 			padding: 15rpx;
 			line-height: 1.5;
-			background: #27A6E1;
-			border: none;
-			color: #fff;
+			// background: #27A6E1;
+			// border: none;
+			// color: #fff;
+			background: #fff;
+			color: #000;
 			font-size: 38rpx;
 			font-weight: bold;
 			/* float: right; */
@@ -2606,10 +2356,6 @@
 		.demo-uni-col {
 			height: 36px;
 			border-radius: 5px;
-		}
-
-		.demo-uni-row .uni-input {
-			width: calc(100% - 120px);
 		}
 
 		.text {

--
Gitblit v1.9.1