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/3018.vue | 95 +++++++++++++++++++++++++----------------------
1 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/pages/modal/3018.vue b/pages/modal/3018.vue
index b910323..358b80c 100644
--- a/pages/modal/3018.vue
+++ b/pages/modal/3018.vue
@@ -257,7 +257,7 @@
</view>
- <view class="v-bottom"><button type="primary" @tap="ok" class="btn_add">{{title}}</button>
+ <view class="v-bottom"><button type="default" @tap="ok" class="btn_add">{{title}}</button>
<button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button>
</view>
@@ -266,8 +266,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'}">
@@ -382,7 +383,7 @@
title: this.translateSys('tip'),
content: this.translate('function_not_edit_dlg'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
@@ -394,7 +395,7 @@
title: this.translateSys('tip'),
content: this.translate('function_not_edit_dlg'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
uni.navigateBack({
delta: 1, //杩斿洖灞傛暟锛�鍒欎笂涓婇〉
@@ -463,7 +464,7 @@
title: this.translateSys('error') + " 1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -487,7 +488,7 @@
title: this.translateSys('error') + " 1.3",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return []
}
@@ -518,7 +519,7 @@
title: this.translateSys('error') + " 1.4",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -664,7 +665,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -814,7 +815,7 @@
title: this.translateSys('tip'),
content: this.translate('no_find_attr_diaplay'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
} catch (ex) {
@@ -826,7 +827,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -862,7 +863,7 @@
title: this.translateSys('tip'),
content: this.translate("icon_click_event_empty"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -871,7 +872,7 @@
title: this.translateSys('tip'),
content: this.translate("icon_click_event_empty"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -990,7 +991,7 @@
title: this.translateSys('tip'),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1312,7 +1313,7 @@
title: this.translateSys('tip'),
content: this.translateSys('unrealized'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
// 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;
@@ -1514,7 +1515,7 @@
.translateSys('quotation_mark_right') + this.translate(
"cannot_empty"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1563,14 +1564,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 {
@@ -1582,7 +1583,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
uni.showToast({
title: this.translate('create_success'),
@@ -1613,7 +1614,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
} catch (ex) {
@@ -1625,7 +1626,7 @@
title: this.translateSys('error') + " 4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -1691,14 +1692,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 {
@@ -1710,7 +1711,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (data.action) {
@@ -1735,7 +1736,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
// else if (action_type == 'tip_dlg') {
@@ -1756,7 +1757,7 @@
title: this.translateSys('error') + " 2.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -1837,14 +1838,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 {
@@ -1856,7 +1857,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1914,7 +1915,7 @@
title: this.translateSys('error') + " 3.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -2006,14 +2007,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 {
@@ -2025,7 +2026,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var result = data.result;
@@ -2059,7 +2060,7 @@
title: this.translateSys('error') + " 4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
} catch (ex) {
@@ -2071,7 +2072,7 @@
title: this.translateSys('error') + " 4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -2168,14 +2169,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 {
@@ -2187,7 +2188,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (data != "") {
@@ -2378,7 +2379,7 @@
title: this.translateSys('tip') + "5.2",
content: this.translate("execute_script_return_empty"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -2392,7 +2393,7 @@
title: this.translateSys('tip') + "5.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -2658,8 +2659,10 @@
margin-top: 50rpx;
padding: 20rpx;
line-height: 1.5;
+ // background: #fff;
+ // border: 1px solid #dcdee2;
+ // color: #000;
background: #fff;
- border: none;
color: #000;
font-size: 38rpx;
font-weight: bold;
@@ -2732,7 +2735,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -2756,9 +2759,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; */
--
Gitblit v1.9.1