From 8b47a6acff1683df5764c5df1b2460110255f544 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com.cn>
Date: 星期一, 29 四月 2024 17:16:33 +0800
Subject: [PATCH] 登录时将获取的mac地址例如：78b8d67511ca 作为client_info传进api/user/ace/VerifyPassword接口里
---
pages/modal/5602.vue | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/pages/modal/5602.vue b/pages/modal/5602.vue
index 2f9152d..639ab96 100644
--- a/pages/modal/5602.vue
+++ b/pages/modal/5602.vue
@@ -73,6 +73,9 @@
display: inline-block;
text-align: left;
}
+.dv-panel-input .dv-input{
+ margin-bottom: 2rpx;
+}
.dv-panel .txt_title{
font-size: 34rpx;
text-align: right;
@@ -236,14 +239,24 @@
<!-- 琛ㄥご鏍峰紡 -->
<view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" >
<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <view class="input-wrapper">
+ <!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
+ <uni-data-select id="dv_select" v-if="item.name=='Select'"
+ :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]"
@click="onEnterChange(item)"></text>
<input
class="uni-input"
- :type="item.name=='Input'?'text':'text'"
+ :class="item.disabled?'input-disabled':''"
+ :type="item.name=='Input'?'text':'number'"
v-model="item.value"
:disabled="item.disabled"
:placeholder="item.placeholder"
@@ -286,9 +299,9 @@
:id="'tabpanel'+style.form.htmlobjId"
:class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
<div class="dv-panel-input">
- <div v-for="(item,index) in style.form.items">
+ <div class="dv-input" v-for="(item,index) in style.form.items">
<!-- 鏅�甯冨眬 -->
- <view v-if="item.name=='Input'">
+ <view v-if="item.name!='Layout'">
<text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
<span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
<input
@@ -460,11 +473,11 @@
$this.$data.head_styledef = ret.result.style_def? JSON.parse(styledef): {};
// this.form = this.head_styledef.form.model;
// console.log($this.$data.head_styledef);
- // $this.head_styledef.form.items.forEach(async (ele,index) => {
- // if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- // await this.DictGetInfo(ele.bind.dict,index,'mast');
- // }
- // });
+ $this.head_styledef.form.items.forEach(async (ele,index) => {
+ if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict,index,'mast');
+ }
+ });
}else{
uni.showModal({title:"閿欒1",content:ret.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
@@ -497,11 +510,11 @@
// var aa = JSON.stringify(this.detail1_styledef);
// $this.$data.detail1StyleDefList.push(JSON.parse(aa));
// console.log($this.$data.detail1StyleDefList);
- // $this.detail1_styledef.form.items.forEach(async (ele,index) => {
- // if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
- // await this.DictGetInfo(ele.bind.dict,index,'sub');
- // }
- // });
+ $this.detail1_styledef.form.items.forEach(async (ele,index) => {
+ if(ele.useDict==true){ //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
+ await this.DictGetInfo(ele.bind.dict,index,'sub');
+ }
+ });
}else{
uni.showModal({title:"閿欒2",content:ret.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
@@ -569,6 +582,9 @@
$this.head_styledef.form.model[attr] = itemName;
}
$this.head_styledef.form.items[index].dict=list;
+ var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
+ $this.head_styledef=[];
+ $this.head_styledef = head_styledef;
// console.log($this.$data.detail1StyleDefList);
}
else{
@@ -578,21 +594,23 @@
$this.detail1_styledef.form.model[attr] = itemName;
}
$this.detail1_styledef.form.items[index].dict=list;
- console.log($this.$data.detail1_styledef);
+ var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
+ $this.detail1_styledef=[];
+ $this.detail1_styledef = detail1_styledef;
+ // console.log($this.$data.detail1_styledef);
}
}else{
- uni.showModal({title:"閿欒1.2",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"閿欒9.1",content:success.err_msg,showCancel:false,confirmText:"鍙栨秷"});
}
}).catch(ex=>{
// console.log(ex);
- uni.showModal({title:"閿欒1.3",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"閿欒9",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
},
ontap(item){ //鎵爜鍔熻兘
// var $ele = e;
- //console.log(e.target)
getApp().onScan((result)=>{
console.log(result.decodedata);
item.value = result.decodedata;
@@ -618,7 +636,7 @@
// $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
setTimeout(function(){
uni.hideKeyboard();
- },100);
+ },1000);
// },500);
}
// if(onSuffixClickCallbackEvent.id){ //鍚庡浘鏍囩偣鍑讳簨浠�
--
Gitblit v1.9.1