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_2.vue | 94 ++++++++++++++++++++++++----------------------
1 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue
index f4f46f6..56d6ed0 100644
--- a/pages/modal/3018_2.vue
+++ b/pages/modal/3018_2.vue
@@ -152,7 +152,8 @@
<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':'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="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'}">
@@ -487,7 +488,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -527,7 +528,7 @@
title: this.translateSys("error") + "1.3",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
@@ -559,14 +560,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 +579,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -629,7 +630,7 @@
"quotation_mark_right") + this
.translate('tip_action_unprocessed'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -647,7 +648,7 @@
this.translateSys("full_stop") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -894,7 +895,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_callback_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -903,7 +904,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_event_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -956,7 +957,7 @@
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -965,7 +966,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1068,14 +1069,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 {
@@ -1087,7 +1088,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1136,7 +1137,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -1217,7 +1218,7 @@
title: this.translateSys("error") + "3.1",
content: exStr,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1309,14 +1310,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 {
@@ -1328,7 +1329,7 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
if (data != "") {
@@ -1411,7 +1412,7 @@
} else if (action.action_type == 'open_common_dlg') {
if (val.common_dlg_id == 'check_list') {
-
+
$this.setData({
check_list: val.config
})
@@ -1507,7 +1508,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1520,7 +1521,7 @@
"quotation_mark_right") + $this.translateSys(
"comma") + 'event_id' + eventid,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1535,7 +1536,7 @@
title: $this.translateSys('tip') + "5.1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
});
},
@@ -1613,14 +1614,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
@@ -1633,7 +1634,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
else {
@@ -1705,7 +1706,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1915,14 +1916,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
@@ -1935,7 +1936,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (!this.$data.param.After_Btn_Not_Refresh) {
//鍒锋柊
@@ -1995,7 +1996,7 @@
title: this.translateSys('tip') + "7.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -2033,7 +2034,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
} else if (btn.FunCode == "TriggerEvent") {
@@ -2088,14 +2089,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 {
@@ -2107,7 +2108,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (!this.$data.param.After_Btn_Not_Refresh) {
//鍒锋柊
@@ -2165,7 +2166,7 @@
title: this.translateSys('tip') + "7.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
});
@@ -2220,7 +2221,7 @@
<style>
.popup-content {
@include flex;
-
+
}
.popup-height {
@@ -2333,9 +2334,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;
}
@@ -2350,7 +2352,7 @@
margin: 0 10rpx;
background: #fff;
border: none;
- color: #000;
+ //color: #000;
font-size: 38rpx;
float: right;
display: inline-block;
@@ -2360,7 +2362,7 @@
width: 90%;
margin: 0 10rpx;
background: #fff;
- border: none;
+ // border: none;
color: #000;
font-size: 38rpx;
float: right;
@@ -2424,7 +2426,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -2448,9 +2450,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