From e8b665122cf256caae4993534c696d029883f0d5 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期三, 05 三月 2025 10:52:03 +0800
Subject: [PATCH] showmodal cancal 改成 close
---
pages/modal/3200_view.vue | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 48 insertions(+), 53 deletions(-)
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index da83c89..67413ef 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -16,28 +16,26 @@
<!-- 鏅�甯冨眬 -->
<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.value2?'#'+item.value+'#'+item.value2:item.value}}</span>
<!-- 鏂囨湰妗�鏁板瓧妗�-->
- <view class="dv_input"
- v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled">
+ <view class="dv_input" v-if="(item.name=='Input' || item.name=='InputNumber') ">
<text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]"
@change="onChange(item)"></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="focusMateria" @focus="ontap(item)" @blur="onevent(item)" />
+ :focus="focusMateria" @focus="ontap(item)" @blur="onevent(item)"
+ :maxlength="-1" />
<text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]"
@click="onChange(item)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled"
+ <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=='Textarea' && !item.disabled">
+ <view class="input-wrapper" v-if="item.name=='Textarea'">
<textarea class="uni-input" :value="item.value"
:class="item.disabled?'input-disabled':''" :placeholder="item.placeholder"
@blur="onModelValue(item)" style="height:60px;" :style="{'width':'96%'}"
@@ -45,18 +43,17 @@
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
- :class="item.disabled?'input-disabled':''" @change="onModelValue(item)"
- :data-ischeck="item.value" :disabled="item.disabled"
- :style="{'margin-left':'10rpx'}">
- <label>
- <checkbox :value="item.value" :checked="item.value" />
- <text>{{item.label}}</text>
+ :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" :style="{'margin-left':'10rpx'}"
- @change="onModelValue(item)">
+ :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(item)">
<label v-for="(item2) in item.selections" :key="item2.value">
<radio :value="item2.value" :checked="item2.value === item.value" />
<text>{{item2.label}}</text>
@@ -68,7 +65,7 @@
:style="{'margin-left':'10rpx'}" />
<!-- 鏃ユ湡鏃堕棿 -->
<view class="input-wrapper"
- v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled">
+ 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>
@@ -82,10 +79,7 @@
<view v-if="cols!=null">
<text class="txt_title"
:style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text>
- <span class="form-item-span"
- v-if="cols.disabled">{{cols.value2?'#'+cols.value+'#'+cols.value2:cols.value}}</span>
- <view class="dv_input"
- v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled">
+ <view class="dv_input" v-if="(cols.name=='Input' || cols.name=='InputNumber') ">
<text v-if="cols.setting.prefix" class="uni-icon"
:class="[cols.setting.prefix]" @change="onChange(cols)"></text>
<input class="uni-input" :class="cols.disabled?'input-disabled':''"
@@ -93,17 +87,18 @@
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="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)" />
+ :focus="focusMateria" @focus="ontap(cols)" @blur="onevent(cols)"
+ :maxlength="-1" />
<text v-if="cols.setting.suffix" class="uni-icon"
:class="[cols.setting.suffix]" @click="onChange(cols)"></text>
</view>
<!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections-->
- <uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled"
+ <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' && !cols.disabled">
+ <view class="input-wrapper" v-if="cols.name=='Textarea' ">
<textarea class="uni-input" :value="cols.value"
:class="cols.disabled?'input-disabled':''"
:placeholder="cols.placeholder" @blur="onModelValue(cols)"
@@ -112,18 +107,18 @@
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'"
- :class="cols.disabled?'input-disabled':''" :disabled="item.disabled"
- @change="onModelValue(cols)" :data-ischeck="cols.value"
- :style="{'margin-left':'10rpx'}">
- <label>
- <checkbox :value="cols.value" :checked="cols.value" />
- <text>{{cols.label}}</text>
+ :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" :style="{'margin-left':'10rpx'}"
- @change="onModelValue(cols)">
+ :class="cols.disabled?'input-disabled':''" :disabled="cols.disabled"
+ :style="{'margin-left':'10rpx'}" @change="onModelValue(cols)">
<label v-for="(cols2) in cols.selections" :key="cols2.value">
<radio :value="cols2.value" :checked="cols2.value === cols.value" />
<text>{{cols2.label}}</text>
@@ -269,7 +264,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -348,7 +343,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -397,7 +392,7 @@
title: this.translateSys("error") + "6.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -442,7 +437,7 @@
title: this.translateSys("error") + "5.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -490,14 +485,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') + ':' + result
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false;
} else {
@@ -507,7 +502,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (result.result_type == 0 && result.action) {
@@ -534,7 +529,7 @@
title: this.translateSys("tip"),
content: result.info,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -547,7 +542,7 @@
title: this.translateSys("error") + "8.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
}
@@ -559,7 +554,7 @@
"comma") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
@@ -632,7 +627,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
} catch (ex) {
@@ -642,7 +637,7 @@
title: this.translateSys("error") + "2",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -674,7 +669,7 @@
title: this.translateSys("error") + "3",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -691,13 +686,13 @@
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') + ':' + result.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false;
} else {
@@ -707,7 +702,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (result.result_type == 0 && result.action) {
@@ -744,7 +739,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -757,7 +752,7 @@
"comma") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
@@ -1129,7 +1124,7 @@
margin-top: 25rpx;
padding: 20rpx;
line-height: 1.5;
- background: #4D6AF4;
+ background: #27A6E1;
border: none;
color: #fff;
font-size: 38rpx;
@@ -1149,9 +1144,9 @@
margin-top: 25rpx;
padding: 20rpx;
line-height: 1.5;
- background: #fff;
- border: none;
- color: #000;
+ // background: #fff;
+ // border: none;
+ // color: #000;
font-size: 38rpx;
font-weight: bold;
float: left;
--
Gitblit v1.9.1