From 15dcf7158d4c5d66d4b196e4e0b2030e1070d448 Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期一, 03 三月 2025 16:46:24 +0800 Subject: [PATCH] 5601 form --- pages/modal/5601.vue | 668 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 493 insertions(+), 175 deletions(-) diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue index d019952..a6024ec 100644 --- a/pages/modal/5601.vue +++ b/pages/modal/5601.vue @@ -7,7 +7,7 @@ <uni-forms-item v-if="item.name != 'Layout'" :label="item.label ?item.label +'锛�:'' " :label-width="item.labelWidth+'px'"> <uni-data-picker v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''" - v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" + v-model="item.value" :localdata="item.useDict ? item.dict : item.selections" @change="onEnterChange(item)" :readonly="item.disabled" :clear-icon="false" :popup-title="item.label"></uni-data-picker> <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]" @@ -48,9 +48,9 @@ <uni-col :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col" v-for="(col,key) in item.setting.colList"> - <uni-forms-item :label="col.label ? col.label +'锛�:''" :label-width="col.labelWidth+'px'"> + <uni-forms-item v-if="col!=null" :label="col.label ? col.label +'锛�:''" :label-width="col.labelWidth+'px'"> <uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''" - v-model="col.value" :localdata="col.dict" @change="onEnterChange(col)" + v-model="col.value" :localdata="col.useDict ? col.dict : col.selections" @change="onEnterChange(col)" :readonly="col.disabled" :clear-icon="false" :popup-title="col.label"></uni-data-picker> <view class="input-wrapper" v-if="col.name=='Input' || col.name=='InputNumber'"> <text v-if="col.setting.prefix" class="uni-icon" :class="[col.setting.prefix]" @@ -144,25 +144,42 @@ </uni-row> </div> </div> - <div class="dv-panel-button"> + <div class="dv-panel-button" + v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0"> <checkbox v-if="pageData.Select_Button==true" :model="ii" :checked="style.SelBut_Checked" /> <!-- <text></text> --> - <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> --> - <button type="warn" @tap="delItem(pageData,ii)" - v-if="pageData.Del_Button==true">{{translateSys('delete')}}</button> + <button size="mini" v-for="(btn,btnIndex) in pageData.Row_Button" + :key="btnIndex" :type="btn.FunCode == 'Delete' ? 'warn' : 'primary'" + @click="onRowBtnClick(btn, pageData,ii)"> + <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" + class="Img" /> + {{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}} + </button> </div> </div> </checkbox-group> </view> - <view class="view-bottom" v-if="pageData.OK_Button==true"> - <button type="default" @tap="cancel" - class="btn_cancel">{{translateSys('cancel')}}</button> - <button type="primary" @tap="ok(pageData)" class="btn_add" - :class="pageData.okLoading?'btn_disabled':''" - :disabled="pageData.okLoading? true:false">{{translateSys('ok')}}</button> + <view class="view-bottom" v-if="pageData.Button.length >0 "> + <button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" + :type="btn.FunCode == 'Cancel' ? 'default' : 'primary'" + :class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading), + 'btn-one':pageData.Button.length == 1, + 'btn-left':(btnIndex < pageData.Button.length - 1), + 'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 , + 'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" + :disabled="(btn.FunCode != 'Cancel' && pageData.okLoading)? true:false" + @click="onBtnClick(btn, pageData)"> + <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img" /> + {{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}} + </button> + <view class="btn-right" v-if="pageData.DropDownButton.length >0 "> + <a @click="clickDropdownBtns(pageData)"> + <Icon class="mobox-normal-more" /> + </a> + </view> </view> </view> </swiper-item> @@ -236,11 +253,7 @@ pageDetail: [], //{StyleDef{}:,DefList:[],ExtData:{}} // 鍒嗘鍣ㄦ暟鎹� current: 0, - Before_OK_Event: {}, After_OK_Event: {}, - Before_Del_Event: {}, - After_Del_Event: {}, - active_id: '', selectAttrObj: {}, @@ -261,14 +274,11 @@ }, }, onLoad(options) { - console.log(options.titlename, options); uni.setNavigationBarTitle({ title: options.titlename }); //璁剧疆椤堕儴鏍囬 this.title = options.titlename; this.param = JSON.parse(options.param); - - //鑾峰彇涓绘暟鎹被ID this.ClsID = this.param.master_cls?.id; if (this.ClsID) { @@ -308,7 +318,6 @@ }); }, async loadData(paramValue) { - //鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� await this.Head_UIStyleGetInfo(this.ClsID, this.param.Input_UI_Style.ID); //浼犲叆鍙傛暟鍊�@@ -351,6 +360,33 @@ this.ClsID, page.UI_Style.ID ); + const buttons = this.pageButtonList(page) + page.Button = buttons + page.DropDownButton = [] + if (buttons.length > 3) { + let cancelBtn = undefined + const btns = [] + buttons.forEach((btn) => { + if (btn.FunCode == "Cancel") { + cancelBtn = btn + } else { + btns.push(btn) + } + }) + if (cancelBtn) { + if (btns.length > 2) { + page.DropDownButton = btns.splice(2) + page.Button = btns + } + page.Button.push(cancelBtn) + } else { + if (btns.length > 3) { + page.DropDownButton = btns.splice(3) + page.Button = btns + } + } + } + page.Row_Button = this.rowButtonList(page) } this.setData({ @@ -365,6 +401,92 @@ current: index }) }, + pageButtonList(page) { + if (this.param?.ver == "2.0") { + return page?.Button || [] + + } else { + if (page?.OK_Button) { + let evt = {}; + if (page.Before_ok?.ID) { + evt = { + ID: page.Before_ok?.ID, + Name: page.Before_ok?.Name + }; + } else if (page.After_ok?.ID) { + evt = { + ID: page.After_ok?.ID, + Name: page.After_ok?.Name + }; + } + let btnCancel = { + Cls_Name: this.param?.master_cls?.name || "", + Cls_ID: this.param?.master_cls?.id || "", + FunCode: "Cancel", + ShowName: this.$t("sys.cancel"), + Style: "text", + Prompt: false, + }; + if (evt.ID) { + let btn = { + Cls_Name: this.param?.master_cls?.name || "", + Cls_ID: this.param?.master_cls?.id || "", + FunCode: "TriggerEvent", + ShowName: this.$t("sys.ok"), + Style: "text", + Prompt: false, + NotTriggerSYSEvent: false, + DataStateVerify: false, + AttrVerify: false, + Event: evt, + }; + if (page.After_ok?.ID) { + btn.After_Event = page.After_ok; + } + return [btn, btnCancel]; + } else return [btnCancel]; + } else { + return []; + } + } + }, + rowButtonList(page) { + if (this.param?.ver == "2.0") { + return page?.Row_Button || []; + } else { + if (page?.Del_Button) { + let evt = {}; + if (page.Before_Delete?.ID) { + evt = { + ID: page.Before_Delete?.ID, + Name: page.Before_Delete?.Name, + }; + } else if (page.After_Delete?.ID) { + evt = { + ID: page.After_Delete?.ID, + Name: page.After_Delete?.Name + }; + } + + if (evt.ID) { + return [{ + Cls_Name: this.param?.master_cls?.name || "", + Cls_ID: this.param?.master_cls?.id || "", + FunCode: "Delete", + ShowName: this.$t("sys.delete"), + Style: "text", + Prompt: false, + NotTriggerSYSEvent: false, + DataStateVerify: false, + AttrVerify: false, + AfterProcess_Event: evt, + }]; + } + } + return []; + } + }, + checkboxChange(e) { var items = this.pageDetail[this.current]?.DefList || [] @@ -414,7 +536,8 @@ styledefHead.form .model[ele.fieldId] = itemName; } - ele.dict = selections.map((a) => { + + ele.selections = selections.map((a) => { return { value: a.value, text: a.label @@ -451,7 +574,7 @@ styledefHead.form .model[col.fieldId] = itemName; } - col.dict = selections.map((a) => { + col.selections = selections.map((a) => { return { value: a.value, text: a.label @@ -477,6 +600,8 @@ this.setData({ head_styledef: styledefHead }) + console.log("Head_UIStyleGetInfo", this.head_styledef) + } catch (ex) { // console.log(ex); uni.showModal({ @@ -521,6 +646,13 @@ detailstyledef.form .model, ele); } + else + { + if (ele?.name === "Select") { + ele.selections =[] + } + } + } else { for (let j in ele.setting.colList) { const col = ele.setting.colList[j] @@ -529,6 +661,12 @@ .bind.dict, detailstyledef.form .model, col); + } + else + { + if (col?.name === "Select") { + col.selections =[] + } } } } @@ -609,7 +747,7 @@ .onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋� var isflag = false; - if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� $this.onChange(onChangeEvent); } if (item.value) { //绗竴涓緭鍏ユ涓嶄负绌�@@ -692,7 +830,7 @@ this.head_styledef.form.model[attr] = item.value; var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� - if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent); } @@ -708,7 +846,7 @@ let attr = col.fieldId; this.head_styledef.form.model[attr] = col.value; var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent); } return @@ -719,7 +857,7 @@ let attr = item.fieldId; this.head_styledef.form.model[attr] = item.value; var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent); } } @@ -736,7 +874,7 @@ let attr = col.fieldId; this.head_styledef.form.model[attr] = col.value; var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent); } return @@ -747,7 +885,7 @@ let attr = item.fieldId; this.head_styledef.form.model[attr] = item.value; var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent.id) { //鍐呭鍙樺寲鍚庝簨浠�+ if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent); } } @@ -781,7 +919,7 @@ // 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); }, @@ -905,7 +1043,6 @@ }; runCustomEvent(dataInfo).then(result => { console.log(result); - if (result.ret != 0) { var tip = result.err_info ? typeof result .err_info == 'string' ? result @@ -1594,130 +1731,80 @@ } }, - setFormValues(data) { + setFormValues(attrs) { const head_styledef = this.head_styledef - if (JSON.stringify(data) == '{}') { + if (JSON.stringify(attrs) == '{}') { return; } - head_styledef.form.items.forEach(async (ele, index) => { - if (ele.name != "Layout") { - let curIndex = data.findIndex((attr, index2, arr) => { - return attr.attr == ele.fieldId; - }) - if (curIndex > -1) { - const attr = data[curIndex] - if (ele.name == - 'Select' && - attr - .choice_list - ) { - const - dictItemList = []; - const - choiceList = - attr - .choice_list || []; - for (let d in - choiceList) { - const - val = - choiceList[ - d - ]; - dictItemList - .push({ - text: val, - value: val - }); + console.log(attrs) + attrs.forEach(async (attr, key) => { + if (attr.choice_list) { + var dictItemList = []; + attr.choice_list.forEach(async (val, index) => { + dictItemList.push({ + text: val, + value: val + }); + }); + + head_styledef.form.items.forEach(async (attr_item, index) => { + if (attr_item.name != "Layout") { + if (attr_item.fieldId == attr.attr) { + if (attr_item.useDict) { + attr_item.dict = dictItemList; + } else { + attr_item.selections = dictItemList; + } } - ele.dict = - dictItemList; - } - - ele.value = - attr - .value; - } - } else { - ele.setting - .colList - .forEach( - async ( - col - ) => { - if ( - col) { - let curIndex = data.findIndex(( - attr, index2, arr) => { - return attr.attr == col.fieldId; - }) - if (curIndex > -1) { - const attr = data[curIndex] - if (col.name == - 'Select' && - attr - .choice_list - ) { - const - dictItemList = []; - const - choiceList = - attr - .choice_list || []; - for (let d in - choiceList) { - const - val = - choiceList[ - d - ]; - dictItemList - .push({ - text: val, - value: val - }); - } - col.dict = - dictItemList; + } else if (attr_item.name == "Layout") { + attr_item.setting.colList.forEach((col) => { + if (col) { + if (col.fieldId == attr.attr) { + if (col.useDict) { + col.dict = dictItemList; + } else { + col.selections = dictItemList; } - - col.value = - attr - .value; } } - - }) - + }); + } + }); } - }) + if (!head_styledef.form.model[attr.attr]) { + head_styledef.form.model[attr.attr] = attr.value; + } + head_styledef.form.items.forEach(async (ele) => { + if (ele.name != "Layout") { + if (ele.fieldId == attr.attr) { + ele.value = attr.value; + ele.oldvalue = attr.value; + } + } else if (ele.name == "Layout") { + ele.setting.colList.forEach((col) => { + if (col) { + if (col.fieldId == attr.attr) { + col.value = attr.value; + col.oldvalue = attr.value; + } + } + }); + } + }) + //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�+ }) + console.log(head_styledef) this.setData({ head_styledef: head_styledef }) }, - onClickItem(e) { //閫夋嫨椤电 // console.log(e); this.current = e.currentIndex }, onDetail1EnterChange(item) { //鐮佺洏涓牱寮忓洖杞︿簨浠� console.log(item); - }, - delItem(pageData, index) { //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�- - //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�- this.Before_Del_Event = pageData.Before_Delete; - this.After_Del_Event = pageData.After_Delete; - const style = pageData.DefList[index]; - //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�- pageData.DefList.splice(index, 1); - if (this.Before_Del_Event?.ID) - //鏄惁鏈夊垹闄ゅ墠浜嬩欢 - this.del(pageData, style, this.Before_Del_Event); - else if (this.After_Del_Event?.ID) - //鏄惁鏈夊垹闄ゅ悗浜嬩欢 - this.del(pageData, style, this.After_Del_Event); }, async del(pageData, style, event) { //鑾峰彇琛ㄥご灞炴� @@ -2442,6 +2529,219 @@ // console.log(value); this.active_id = id; }, + //鐐瑰嚮鎸夐挳鍒楄〃 + clickDropdownBtns(pageData) { + const that = this + const itemlist = []; + const btnList = pageData.DropDownButton || [] + + for (let i in btnList) { + itemlist.push(btnList[i].ShowName || ""); + } + uni.showActionSheet({ + // title: '鎸夐挳鍒楄〃', + itemList: itemlist, + success: (e) => { + console.log(e.tapIndex); + var btn = btnList[e.tapIndex]; + that.onBtnClick(btn, pageData); + } + }) + }, + onBtnClick(btn, pageData) { + const $this = this + if (btn.Prompt) { + const sContent = btn.PromptContent || this.translate("confirm") + uni.showModal({ + title: this.translateSys("tip"), + content: btn.PromptContent || this.translate("confirm"), + success: function(res) { + if (res.confirm) { + $this.onButtonClicked(btn, pageData, -1); + } + + }, + }) + + } else { + this.onButtonClicked(btn, pageData, -1); + } + }, + onRowBtnClick(btn, pageData, index) { + const $this = this + if (btn.Prompt) { + const sContent = btn.PromptContent || this.translate("confirm") + uni.showModal({ + title: this.translateSys("tip"), + content: btn.PromptContent || this.translate("confirm"), + success: function(res) { + if (res.confirm) { + $this.onButtonClicked(btn, pageData, index); + } + + }, + }) + + } else { + this.onButtonClicked(btn, pageData, index); + } + }, + onButtonClicked(btn, pageData, index) { + this.After_OK_Event = {} + let enviroment = { + button: "top", + button_name: btn.ShowName, + cls_id: btn.Cls_ID, + function: "5601", + master: {}, + }; + if (btn.FunCode == "TriggerEvent") { + this.After_OK_Event = btn?.After_Event || {}; + this.sava(pageData, btn.Event); + } else if (btn.FunCode == "Cancel") { + this.cancel(); + } else if (btn.FunCode == "Delete") { + if (index > -1) { + const pageIndex = this.pageDetail.findIndex(( + page) => { + return pageData.Name == page.Name; + }) + const style = pageData.DefList[index]; + //鍒犻櫎鐮佺洏涓牱寮忛潰鏉�+ pageData.DefList.splice(index, 1); + this.del(pageData, style, btn.AfterProcess_Event); + this.$set(this.pageDetail, pageIndex, pageData) + } + } else if (btn.FunCode == "Modify") { + if (index > -1) { + const style = pageData.DefList[index]; + if (btn.Edit_dlg.Model == "small") { + this.showSmallDialog(btn, style, enviroment, pageData); + } else if (btn.Edit_dlg.Model == "form") { + this.showFormDialog(btn, style, enviroment, pageData); + } else { + uni.showModal({ + title: this.translateSys("tip"), + content: this.translateSys("unrealized"), + showCancel: false, + confirmText: this.translateSys("cancel") + }); + } + } + + } else { + this.$Message.warning(this.$t("sys.unrealized")); + } + }, + //淇敼灏忕獥鍙f暟鎹�+ showSmallDialog(btn, row, enviroment, pageData) { + var data = { + Add_BtnName: btn.ShowName, + EditDlgMode: btn.Edit_dlg.Model, + clsid: btn.Cls_ID, + objid: "", + cls_name: btn.Cls_Name, + Edit_dlg: btn.Edit_dlg + }; + const objAttr = {} + row.form.items.forEach(item => { + if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(cols => { + if (cols != null) objAttr[cols + .fieldId] = cols.value; + }); + } else + objAttr[item.fieldId] = item.value; + }); + const url = `../modal/3018?param=${JSON.stringify(data)}&titlename=${btn.Edit_dlg + .Name}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj` + + var $this = this; + uni.navigateTo({ + url: url, + events: { + // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁 + updateDataObj: function(formData) { + const pageIndex = $this.pageDetail.findIndex(( + page) => { + return pageData.Name == page.Name; + }) + if (pageIndex < 0) + return + Object.assign(row.form.model, formData); + row.form.items.forEach(async (ele, index) => { + if (ele.name != "Layout") { + let value = formData[ele.fieldId] + if (value) + ele.value = value + + } else { + ele.setting.colList.forEach(async (col) => { + if (col) { + let value = formData[col.fieldId] + if (value) + col.value = value + } + }); + } + }) + $this.$set($this.pageDetail, pageIndex, pageData) + + }, + + } + }); + }, + + //淇敼鑷畾涔夎〃鍗曟暟鎹�+ showFormDialog(btn, row, enviroment, pageData) { + const objAttr = {} + row.form.items.forEach(item => { + if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�+ item.setting.colList.forEach(cols => { + if (cols != null) objAttr[cols + .fieldId] = cols.value; + }); + } else + objAttr[item.fieldId] = item.value; + }); + + const url = `../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj` + var $this = this; + uni.navigateTo({ + url: url, + events: { + // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁 + updateDataObj: function(formData) { + const pageIndex = $this.pageDetail.findIndex(( + page) => { + return pageData.Name == page.Name; + }) + if (pageIndex < 0) + return + Object.assign(row.form.model, formData); + row.form.items.forEach(async (ele) => { + if (ele.name != "Layout") { + let value = formData[ele.fieldId] + if (value) + ele.value = value + + } else { + ele.setting.colList.forEach(async (col) => { + if (col) { + let value = formData[col.fieldId] + if (value) + col.value = value + } + }); + } + }) + $this.$set($this.pageDetail, pageIndex, pageData) + + }, + } + }); + }, //纭畾 ok(pageData) { this.Before_OK_Event = pageData.Before_ok; @@ -3044,10 +3344,58 @@ flex-direction: row; width: calc(100% - 30rpx); padding: 10rpx 15rpx 30rpx 15rpx; + + .btn-disabled { + background-color: #ddd; + color: #888; + } + + .btn-left { + padding: 20rpx; + line-height: 1.5; + border: none; + font-size: 38rpx; + font-weight: bold; + float: left; + display: inline-block; + } + + .btn-one { + padding: 20rpx; + line-height: 1.5; + border: none; + font-size: 38rpx; + font-weight: bold; + float: left; + display: inline-block; + width: 50%; + margin-left: 25%; + } + + .btn-right { + padding: 20rpx; + line-height: 1.5; + border: none; + font-size: 38rpx; + font-weight: bold; + float: right; + display: inline-block; + } + + .width-50 { + width: 49%; + } + + .width-32 { + width: 32%; + margin-left: 1%; + } + + .width-30 { + width: 30%; + margin-left: 1%; + } } - - - [nvue] uni-view { position: relative; @@ -3073,7 +3421,7 @@ .dv-panel { background-color: #efefef; - padding: 20rpx 20rpx 4rpx 0px; + padding: 20rpx 20rpx 10rpx 0px; border-radius: 12rpx; margin: 10rpx 0 20rpx 0; text-align: right; @@ -3118,7 +3466,8 @@ .dv-panel-button { width: 100%; text-align: left; - padding-bottom: 20rpx; + min-height: 30rpx; + padding-bottom: 10rpx; checkbox { padding-left: 20px; @@ -3127,44 +3476,13 @@ button { text-align: left; - line-height: 1.8; + line-height: 1.5; border: none; - font-size: 34rpx; - width: 180rpx; + font-size: 30rpx; + margin-right: 10rpx; display: inline-block; float: right; text-align: center; - - .btn_cancel { - width: 49.5%; - padding: 20rpx; - line-height: 1.5; - border: none; - font-size: 38rpx; - font-weight: bold; - float: left; - display: inline-block; - } - - .btn_add { - width: 49.5%; - - padding: 20rpx; - line-height: 1.5; - border: none; - font-size: 38rpx; - font-weight: bold; - float: right; - color: #fff; - display: inline-block; - } - - .btn_disabled { - background-color: #ddd; - color: #888; - } - - } } -- Gitblit v1.9.1