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 ++--
pages/modal/3200_view.vue | 44 +-
pages/selpsn/index.vue | 4
pages/modal/5601.vue | 173 +++++----
pages/modal/3037_2.vue | 105 ++---
pages/modal/ms_classAttr.vue | 9
locale/zh-Hans.json | 1
pages/index/index.vue | 6
pages/modal/form/index.vue | 91 ++--
api/index.js | 148 ++++---
pages/modal/3201.vue | 24
pages/modal/3018.vue | 95 ++--
pages/selPrj/index.vue | 6
pages/modal/3037.vue | 125 +++---
pages/modal/3200.vue | 84 ++--
manifest.json | 4
pages/login/index.vue | 14
pages/modal/classAttr.vue | 14
18 files changed, 539 insertions(+), 502 deletions(-)
diff --git a/api/index.js b/api/index.js
index c4321c7..1f064d6 100644
--- a/api/index.js
+++ b/api/index.js
@@ -149,70 +149,80 @@
*/
export const login = (server, id, pwd) => {
- if (!server) {
- reject({
- "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
- });
- }
- if (!id || id.length < 2) {
- reject({
- "errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�'
- });
- }
- if (!pwd || pwd.length < 1) {
- reject({
- "errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�'
- });
- }
- const app = getApp()
- var openinfo = "http://" + server + "/";
- if (server.includes("://")) {
- openinfo = server + "/"
- }
- var ser = server.toLowerCase().split('/');
- isMobox3Web(server)
- if (app.globalData.isMobox3) { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
- const mobox3Ports = utils.session.getValue('mobox3_port');
- const orgsport = mobox3Ports.org || 5101
- const moboxsport = mobox3Ports.mobox || 5102
- const datasport = mobox3Ports.data || 5103
-
- var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
- var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
- var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+ return new Promise(async (resolve, reject) => {
+ if (!server) {
+ reject({
+ "errMsg": '鏈嶅姟鍣ㄥ湴鍧�笉鑳戒负绌�'
+ });
+ }
+ if (!id || id.length < 2) {
+ reject({
+ "errMsg": '璐﹀彿鏈�煭涓�2 涓瓧绗�'
+ });
+ }
+ if (!pwd || pwd.length < 1) {
+ reject({
+ "errMsg": '瀵嗙爜鏈�煭涓�1涓瓧绗�'
+ });
+ }
+ const app = getApp()
+ var openinfo = "http://" + server + "/";
if (server.includes("://")) {
- orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
- mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
- dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ openinfo = server + "/"
}
- app.globalData.mobox3ApiUrl = {
- org: orgSApi,
- data: dataSApi,
- mobox: mobxoSApi,
- }
- return loginOrg(id, pwd)
- } else {
- var header = {
- 'content-type': 'application/x-www-form-urlencoded'
- };
- var url = openinfo + "PDA/SignIn";
+ var ser = server.toLowerCase().split('/');
+ isMobox3Web(server)
+ if (app.globalData.isMobox3) { //鍒ゆ柇鍦板潃鏄惁鏄疢obox3
+ const mobox3Ports = utils.session.getValue('mobox3_port');
+ const orgsport = mobox3Ports.org || 5101
+ const moboxsport = mobox3Ports.mobox || 5102
+ const datasport = mobox3Ports.data || 5103
- var data = {}
- app.globalData.mobox2ApiUrl = openinfo
- data = {
- uname: id || "",
- pwd: pwd || "",
- cname: app.globalData.cname|| "",
- type: "0"
- }
- return http.request2({
- method: "POST",
- url,
- header,
- data,
- })
- }
+ var orgSApi = "http://" + ser[0].split(':')[0] + ":" + orgsport + "/";
+ var mobxoSApi = "http://" + ser[0].split(':')[0] + ":" + moboxsport + "/";
+ var dataSApi = "http://" + ser[0].split(':')[0] + ":" + datasport + "/";
+ if (server.includes("://")) {
+ orgSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + orgsport + "/";
+ mobxoSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + moboxsport + "/";
+ dataSApi = ser[0] + "//" + ser[2].split(':')[0] + ":" + datasport + "/";
+ }
+ app.globalData.mobox3ApiUrl = {
+ org: orgSApi,
+ data: dataSApi,
+ mobox: mobxoSApi,
+ }
+ loginOrg(id, pwd).then((res)=>{
+ resolve(res)
+ }).catch((rej)=>{
+ reject(rej)
+ })
+
+ } else {
+ var header = {
+ 'content-type': 'application/x-www-form-urlencoded'
+ };
+ var url = openinfo + "PDA/SignIn";
+ var data = {}
+ app.globalData.mobox2ApiUrl = openinfo
+ data = {
+ uname: id || "",
+ pwd: pwd || "",
+ cname: app.globalData.cname || "",
+ type: "0"
+ }
+ http.request2({
+ method: "POST",
+ url,
+ header,
+ data,
+ }).then((res)=>{
+ resolve(res)
+ }).catch((rej)=>{
+ reject(rej)
+ })
+ }
+ })
}
/**
@@ -235,7 +245,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
var data = {
@@ -274,7 +284,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -312,7 +322,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -347,7 +357,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -381,7 +391,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -414,7 +424,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -452,7 +462,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -486,7 +496,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
@@ -521,7 +531,7 @@
let loginInfo = {
uname: app.globalData.loginUser.id || "",
pwd: app.globalData.loginUser.pwd || "",
- cname: app.globalData.cname|| "",
+ cname: app.globalData.cname || "",
type: "0",
}
diff --git a/locale/zh-Hans.json b/locale/zh-Hans.json
index 331d2c4..b8508f8 100644
--- a/locale/zh-Hans.json
+++ b/locale/zh-Hans.json
@@ -6,7 +6,6 @@
"sys.colon": "锛�,
"sys.quotation_mark_left": "鈥�,
"sys.quotation_mark_right": "鈥�,
- "sys.confirm": "纰鸿獚",
"sys.confirm": "纭",
"sys.close": "鍏抽棴",
"sys.ok": "纭畾",
diff --git a/manifest.json b/manifest.json
index 55f1a16..66cfb8b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "MoboxPDA",
"appid" : "__UNI__56D451E",
"description" : "",
- "versionName" : "1.1.44",
- "versionCode" : 1144,
+ "versionName" : "1.1.45",
+ "versionCode" : 1145,
"transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
"app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 382eb2d..6cb2d26 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -114,7 +114,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -143,7 +143,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return undefined
}
@@ -168,7 +168,7 @@
title: this.translateSys("tip"),
content: this.translate('tip_no_app_param'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index de15e2d..bba6b7e 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -148,7 +148,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_web_server"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -174,7 +174,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -343,7 +343,7 @@
title: this.translateSys('tip'),
content: this.translate('tip_no_web_server'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -352,7 +352,7 @@
title: this.translateSys('tip'),
content: this.translate('tip_no_user_account'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -361,7 +361,7 @@
title: this.translateSys('tip'),
content: this.translate('tip_no_user_password'),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -398,7 +398,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -427,7 +427,7 @@
title: "鍙傛暟",
content: tip,
showCancel: false,
- confirmText:"cancel"
+ confirmText:'close'
});
var url = utils.session.getValue('server');
var username = utils.session.getValue('account');
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; */
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; */
diff --git a/pages/modal/3037.vue b/pages/modal/3037.vue
index 0022d13..151f653 100644
--- a/pages/modal/3037.vue
+++ b/pages/modal/3037.vue
@@ -622,8 +622,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'}">
@@ -705,7 +706,7 @@
title: this.translateSys('tip') + "",
content: "璇ュ姛鑳界偣鏈厤缃晫闈㈢獥鍙ｏ紝璇烽噸鏂伴厤缃紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -714,7 +715,7 @@
title: this.translateSys('tip') + "",
content: "璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -777,7 +778,7 @@
title: this.translateSys('error') + " 1.2",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return []
}
@@ -811,7 +812,7 @@
title: this.translateSys("error") + " 1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return []
};
@@ -841,7 +842,7 @@
title: this.translateSys("error") + " 1.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return {}
};
@@ -1116,7 +1117,7 @@
title: this.translateSys('tip') + "",
content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -1271,7 +1272,7 @@
title: this.translateSys('tip') + "",
content: "鏈壘鍒板彲鏄剧ず鐨勭殑灞炴�",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -1283,7 +1284,7 @@
title: this.translateSys('tip') + "",
content: "閫夋嫨鍓嶄簨浠朵负绌猴紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1298,7 +1299,7 @@
title: this.translateSys('tip') + "",
content: ar.DispName + "鏈�鎷╂暟鎹紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1350,7 +1351,7 @@
title: this.translateSys('tip') + "",
content: ar.DispName + '涓嶈兘涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1428,7 +1429,7 @@
title: this.translateSys('tip') + "",
content: "閫夋嫨鍚庝簨浠朵负绌猴紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1451,7 +1452,7 @@
title: this.translateSys('tip') + "",
content: "鏈�鎷╂暟鎹紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1466,7 +1467,7 @@
title: this.translateSys('tip') + "",
content: ar.DispName + "鏈�鎷╂暟鎹紒",
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1528,7 +1529,7 @@
title: this.translateSys('tip') + "",
content: "鍒犻櫎鎴愬姛锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}).catch(ex => {
@@ -1538,7 +1539,7 @@
title: this.translateSys('tip') + "9.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
}
@@ -2209,7 +2210,7 @@
title: this.translateSys('tip') + "",
content: "before_click_button-event_id涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2218,7 +2219,7 @@
title: this.translateSys('tip') + "",
content: "button_callback-event_id涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2300,7 +2301,7 @@
title: this.translateSys('tip') + "",
content: "姝ゅ姛鑳借繕鏈疄鐜帮紒",
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;
@@ -2437,7 +2438,7 @@
.DispName +
'涓嶈兘涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2535,7 +2536,7 @@
title: this.translateSys('tip') + "",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -2616,7 +2617,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -2625,7 +2626,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -2640,7 +2641,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (data.action) {
@@ -2828,7 +2829,7 @@
title: this.translateSys('error') + " 2.2",
content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -2842,7 +2843,7 @@
title: this.translateSys('error') + " 2.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -2941,7 +2942,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -2950,7 +2951,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -2965,7 +2966,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var actionlist = data
@@ -3308,7 +3309,7 @@
title: this.translateSys('error') + " 3.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -3428,7 +3429,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -3437,7 +3438,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -3452,7 +3453,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var result = data
@@ -3522,7 +3523,7 @@
title: this.translateSys('error') + " 4.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -3647,7 +3648,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -3656,7 +3657,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -3671,7 +3672,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
if (data != "") {
@@ -3970,7 +3971,7 @@
content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' +
eventid,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -3981,7 +3982,7 @@
title: this.translateSys('tip') + "5.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -4061,7 +4062,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -4070,7 +4071,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -4085,7 +4086,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var actionlist = data
@@ -4270,7 +4271,7 @@
title: this.translateSys('error') + " 6.2",
content: "open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -4283,7 +4284,7 @@
title: this.translateSys('error') + " 6.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -4373,7 +4374,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -4382,7 +4383,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -4397,7 +4398,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var actionlist = data
@@ -5128,7 +5129,7 @@
title: this.translateSys('error') + " 7.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -5179,7 +5180,7 @@
.DispName +
'涓嶈兘涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -5236,7 +5237,7 @@
.DispName +
'涓嶈兘涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return;
}
@@ -5315,7 +5316,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
else uni.showModal({
title: this.translateSys('tip'),
@@ -5324,7 +5325,7 @@
data
.ret,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -5339,7 +5340,7 @@
title: this.translateSys('tip'),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
var result = data
@@ -5378,7 +5379,7 @@
title: this.translateSys('error') + " 8.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
},
@@ -5608,9 +5609,11 @@
margin-top: 50rpx;
padding: 20rpx;
line-height: 1.5;
- background: #27A6E1;
+ /* background: #27A6E1;
border: none;
- color: #fff;
+ color: #fff; */
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
float: left;
@@ -5748,7 +5751,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -5772,9 +5775,11 @@
margin-top: 50rpx;
padding: 15rpx;
line-height: 1.5;
- background: #27A6E1;
+ /* background: #27A6E1;
border: none;
- color: #fff;
+ color: #fff; */
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
/* float: right; */
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index caa6560..15f5ff0 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -129,8 +129,8 @@
</view>
<!-- 澶嶉�妗�-->
<checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'"
- :class="item.disabled?'input-disabled':''" :disabled="item.disabled" @change="onCheckBoxValue"
- :data-attr="item.fieldId">
+ :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>
@@ -252,8 +252,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':'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'}">
+ :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'}">
@@ -446,7 +447,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -505,7 +506,7 @@
title: this.translateSys("error") + "2.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -555,7 +556,7 @@
title: this.translateSys("error") + "1.3",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -587,13 +588,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') + ':' + data.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -603,7 +604,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -748,7 +749,7 @@
"quotation_mark_right") + this
.translate('tip_action_unprocessed'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -763,7 +764,7 @@
this.translateSys("full_stop") +
this.translate('reason') + this.translateSys("colon") + ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -998,7 +999,7 @@
}
}
},
-
+
onCheckBoxValue(e) { //缁戝畾Model鍊� let values = e.detail.value || []
let attr = e.currentTarget?.dataset?.attr || ""
@@ -1041,7 +1042,7 @@
title: this.translateSys("tip"),
content: this.translate("delete_success"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}).catch(ex => {
@@ -1051,7 +1052,7 @@
title: this.translateSys('tip') + "9.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
}
@@ -1064,7 +1065,7 @@
title: this.translateSys("tip"),
content: this.translate("before_select_event_empty"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1164,7 +1165,7 @@
title: this.translateSys("tip"),
content: this.translate("after_select_event_empty"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1187,7 +1188,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1304,13 +1305,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') + ':' + data.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -1320,7 +1321,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1500,7 +1501,7 @@
title: this.translateSys("error") + "3.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1580,14 +1581,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('comma') + this.translate('result') + this
.translateSys('colon') + data.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
} else {
@@ -1597,7 +1598,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1754,7 +1755,7 @@
"quotation_mark_right") + this.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -1827,7 +1828,7 @@
title: this.translateSys("error") + "7.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1933,13 +1934,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') + ':' + data.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
this.saving = false
return false
@@ -1950,7 +1951,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var result = data.result;
@@ -1974,7 +1975,7 @@
title: this.translateSys("error") + "8.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -2146,30 +2147,6 @@
/* border: 1rpx solid red; */
}
- button.btn_cancel {
- width: 49.5%;
- margin-top: 50rpx;
- padding: 20rpx;
- line-height: 1.5;
- border: none;
- font-size: 38rpx;
- font-weight: bold;
- float: left;
- display: inline-block;
- }
-
- button.btn_add {
- width: 49.5%;
- margin-top: 50rpx;
- padding: 20rpx;
- line-height: 1.5;
- border: none;
- font-size: 38rpx;
- font-weight: bold;
- float: right;
- display: inline-block;
- }
-
#dv_select {
display: inline-block;
width: 66%;
@@ -2245,9 +2222,11 @@
margin-top: 50rpx;
padding: 20rpx;
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: left;
@@ -2394,7 +2373,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -2418,9 +2397,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; */
diff --git a/pages/modal/3200.vue b/pages/modal/3200.vue
index ea41501..eb4082f 100644
--- a/pages/modal/3200.vue
+++ b/pages/modal/3200.vue
@@ -516,7 +516,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -547,7 +547,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -582,7 +582,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -623,7 +623,7 @@
title: this.translateSys("error") + "3",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -654,14 +654,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 {
@@ -671,7 +671,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (result.result_type == 0 && result.action) {
@@ -694,7 +694,7 @@
title: this.translateSys("tip"),
content: result.info,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -708,7 +708,7 @@
"comma") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -872,7 +872,7 @@
title: this.translateSys("error") + "5.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
} catch (ex) {
@@ -881,7 +881,7 @@
title: this.translateSys("error") + "5.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -937,7 +937,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
}
}
@@ -1013,7 +1013,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
} else if (btn.FunCode == "Delete") {
@@ -1033,7 +1033,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
} catch (ex) {
@@ -1042,7 +1042,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -1108,7 +1108,7 @@
"delete_success"),
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
}).catch(ex => {
// console.log(ex);
@@ -1118,7 +1118,7 @@
content: ex.errMsg,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
});
} else if (res.cancel) {
@@ -1181,7 +1181,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
} else uni.showModal({
title: this.translateSys("tip"),
@@ -1190,7 +1190,7 @@
result
.ret,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false;
} else {
@@ -1202,7 +1202,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -1212,7 +1212,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
this.showError(ex);
}
@@ -1261,7 +1261,7 @@
'tip_no_app_param'),
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return;
}
@@ -1286,7 +1286,7 @@
content: this.translate(
"function_not_exist"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -1295,7 +1295,7 @@
title: this.translateSys("error"),
content: this.translate("cannot_related_function"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -1309,7 +1309,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return undefined
}
@@ -1332,7 +1332,7 @@
title: this.translateSys("error") + "7",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -1474,7 +1474,7 @@
content: tip,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
} else uni.showModal({
title: this.translateSys(
@@ -1486,7 +1486,7 @@
.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -1500,7 +1500,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result
@@ -1545,7 +1545,7 @@
showCancel: false,
confirmText: this
.translateSys(
- "cancel")
+ 'close')
});
}
}
@@ -1560,7 +1560,7 @@
content: ex.errMsg,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
});
}
@@ -1575,7 +1575,7 @@
this.translate('reason') + this.translateSys(
"colon") + tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -1618,7 +1618,7 @@
content: tip,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
} else uni.showModal({
title: this.translateSys(
@@ -1629,7 +1629,7 @@
result.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -1643,7 +1643,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result
@@ -1719,7 +1719,7 @@
showCancel: false,
confirmText: this
.translateSys(
- "cancel"
+ 'close'
)
});
}
@@ -1734,7 +1734,7 @@
showCancel: false,
confirmText: this
.translateSys(
- "cancel")
+ 'close')
});
}
}
@@ -1749,7 +1749,7 @@
content: ex.errMsg,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
});
} catch (ex) {
@@ -1762,7 +1762,7 @@
this.translate('reason') + this.translateSys(
"colon") + tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -2241,7 +2241,7 @@
margin-top: 25rpx;
padding: 20rpx;
line-height: 1.5;
- background: #4D6AF4;
+ background: #27A6E1;
border: none;
color: #fff;
font-size: 38rpx;
@@ -2256,8 +2256,8 @@
padding: 20rpx;
line-height: 1.5;
background: #fff;
- border: none;
- color: #000;
+ // border: none;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
float: left;
diff --git a/pages/modal/3200_view.vue b/pages/modal/3200_view.vue
index ab5432a..67413ef 100644
--- a/pages/modal/3200_view.vue
+++ b/pages/modal/3200_view.vue
@@ -264,7 +264,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -343,7 +343,7 @@
title: this.translateSys("error") + "1.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -392,7 +392,7 @@
title: this.translateSys("error") + "6.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -437,7 +437,7 @@
title: this.translateSys("error") + "5.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -485,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 {
@@ -502,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) {
@@ -529,7 +529,7 @@
title: this.translateSys("tip"),
content: result.info,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -542,7 +542,7 @@
title: this.translateSys("error") + "8.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
});
}
@@ -554,7 +554,7 @@
"comma") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
@@ -627,7 +627,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
} catch (ex) {
@@ -637,7 +637,7 @@
title: this.translateSys("error") + "2",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -669,7 +669,7 @@
title: this.translateSys("error") + "3",
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
},
@@ -686,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 {
@@ -702,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) {
@@ -739,7 +739,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
}
@@ -752,7 +752,7 @@
"comma") +
this.translate('reason') + this.translateSys("colon") + tip,
showCancel: false,
- confirmText: this.translateSys('cancel')
+ confirmText: this.translateSys('close')
});
}
@@ -1124,7 +1124,7 @@
margin-top: 25rpx;
padding: 20rpx;
line-height: 1.5;
- background: #4D6AF4;
+ background: #27A6E1;
border: none;
color: #fff;
font-size: 38rpx;
@@ -1144,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;
diff --git a/pages/modal/3201.vue b/pages/modal/3201.vue
index 8981d41..0cd45ef 100644
--- a/pages/modal/3201.vue
+++ b/pages/modal/3201.vue
@@ -166,7 +166,7 @@
.translateSys("quotation_mark_right") + this.translate(
"tip_no_app_param"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -186,7 +186,7 @@
title: this.translateSys("tip"),
content: this.translate("function_not_exist"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
} catch (ex) {
@@ -199,7 +199,7 @@
title: this.translateSys("error"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return undefined
}
@@ -226,14 +226,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 {
@@ -243,7 +243,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
if (result.result_type == 0 && result.action) {
@@ -264,7 +264,7 @@
title: this.translateSys("tip"),
content: result.info,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -277,7 +277,7 @@
title: this.translateSys("error") + "1.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
}
@@ -288,7 +288,7 @@
content: this.translate("execute_query_event_failed") + this.translateSys("comma") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -327,7 +327,7 @@
title: this.translateSys("error") + "2.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
} catch (ex) {
@@ -336,7 +336,7 @@
title: this.translateSys("error") + "2.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -348,7 +348,7 @@
title: this.translateSys("tip"),
content: this.translate("not_associated_function_point"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 9657433..a09008a 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -7,8 +7,9 @@
<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.useDict ? item.dict : item.selections" @change="onEnterChange(item)"
- :readonly="item.disabled" :clear-icon="false" :popup-title="item.label"></uni-data-picker>
+ 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]"
@click="classAttr_extButton(item)"></text>
@@ -48,10 +49,12 @@
<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 v-if="col!=null" :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.useDict ? col.dict : col.selections" @change="onEnterChange(col)"
- :readonly="col.disabled" :clear-icon="false" :popup-title="col.label"></uni-data-picker>
+ 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]"
@click="classAttr_extButton(col)"></text>
@@ -152,7 +155,8 @@
<!-- <text></text> -->
<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
<button size="mini" v-for="(btn,btnIndex) in pageData.Row_Button"
- :key="btnIndex" :type="btn.FunCode == 'Delete' ? 'warn' : 'primary'"
+ :key="btnIndex" type="default"
+ :class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'"
@click="onRowBtnClick(btn, pageData,ii)">
<Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'"
class="Img" />
@@ -163,13 +167,14 @@
</checkbox-group>
</view>
<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'"
+ <button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default"
: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)}"
+ 'btn-primary':(btn.FunCode != 'Cancel'),
+ 'btn-cancel':(btn.FunCode == 'Cancel'),
+ '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" />
@@ -201,7 +206,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'}">
@@ -288,7 +294,7 @@
title: this.translateSys("error"),
content: this.translate("tip_no_master_class"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -536,7 +542,7 @@
styledefHead.form
.model[ele.fieldId] = itemName;
}
-
+
ele.selections = selections.map((a) => {
return {
value: a.value,
@@ -608,7 +614,7 @@
title: this.translateSys("error") + "1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return {}
}
@@ -645,14 +651,12 @@
await this.DictGetInfo(ele.bind.dict,
detailstyledef.form
.model, ele);
- }
- else
- {
+ } else {
if (ele?.name === "Select") {
- ele.selections =[]
+ ele.selections = []
}
}
-
+
} else {
for (let j in ele.setting.colList) {
const col = ele.setting.colList[j]
@@ -661,11 +665,9 @@
.bind.dict,
detailstyledef.form
.model, col);
- }
- else
- {
+ } else {
if (col?.name === "Select") {
- col.selections =[]
+ col.selections = []
}
}
}
@@ -681,7 +683,7 @@
title: this.translateSys("error") + "2",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return {}
}
@@ -720,7 +722,7 @@
title: this.translateSys("error") + "3",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -902,7 +904,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_callback_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -911,7 +913,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_event_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -925,7 +927,7 @@
getDetailAttrList(pageData) {
const detailAttrList = [];
- console.log(pageData)
+ console.log(pageData)
if (pageData.DefList) {
pageData.DefList.forEach(style => {
var detail_attr = {};
@@ -968,7 +970,7 @@
});
});
}
- console.log(detailAttrList)
+ console.log(detailAttrList)
const jsonlist = [];
detailAttrList.forEach(attr => {
jsonlist.push({
@@ -1000,7 +1002,7 @@
});
var obj_attr = this.head_styledef.form.model;
// console.log(obj_attr);
-
+
var input_param = Base64.encode(
JSON.stringify(
Object.keys(head_attr).map((a) => ({
@@ -1023,7 +1025,7 @@
const data_json = Base64.encode(
JSON.stringify(jsonList)
);
- console.log(jsonList)
+ console.log(jsonList)
var dataInfo = {
ed_type: 0,
start_transaction: true,
@@ -1062,7 +1064,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -1072,7 +1074,7 @@
.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -1084,7 +1086,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result.action) {
@@ -1359,7 +1361,7 @@
content: result.info,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
}
}
@@ -1373,7 +1375,7 @@
title: this.translateSys("error") + "4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
}
@@ -1388,7 +1390,7 @@
this.translate('reason') + this.translateSys("colon") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -1748,7 +1750,7 @@
value: val
});
});
-
+
head_styledef.form.items.forEach(async (attr_item, index) => {
if (attr_item.name != "Layout") {
if (attr_item.fieldId == attr.attr) {
@@ -1883,7 +1885,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1939,7 +1941,7 @@
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1948,7 +1950,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2044,14 +2046,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 {
@@ -2063,7 +2065,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -2126,7 +2128,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -2203,7 +2205,7 @@
title: this.translateSys("error") + "3.1",
content: exStr,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -2296,14 +2298,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 {
@@ -2315,7 +2317,7 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
if (data != "") {
@@ -2494,7 +2496,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -2507,7 +2509,7 @@
"quotation_mark_right") + $this.translateSys(
"comma") + 'event_id' + eventid,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -2522,7 +2524,7 @@
title: $this.translateSys('tip') + "5.1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
});
},
@@ -2627,7 +2629,7 @@
title: this.translateSys("tip"),
content: this.translateSys("unrealized"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -2709,7 +2711,8 @@
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`
+ 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,
@@ -2770,7 +2773,7 @@
this.translate(
"tip_no_data_last"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false;
}
@@ -2861,7 +2864,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -2922,7 +2925,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -2931,7 +2934,7 @@
result.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -2943,7 +2946,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0) {
if (result.action) {
@@ -2996,7 +2999,7 @@
showCancel: false,
confirmText: this
.translateSys(
- "cancel"
+ 'close'
)
});
} else if (item.action_type ==
@@ -3219,7 +3222,7 @@
content: result.info,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
}
}
@@ -3237,7 +3240,7 @@
"comma") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -3261,7 +3264,7 @@
<style>
.popup-content {
@include flex;
-
+
}
.popup-height {
@@ -3352,6 +3355,7 @@
flex-direction: column !important;
}
+
.view-bottom {
display: flex;
flex-direction: row;
@@ -3359,24 +3363,25 @@
padding: 10rpx 15rpx 30rpx 15rpx;
.btn-disabled {
- background-color: #ddd;
- color: #888;
+ background-color: #ddd !important;
+ color: #888 !important;
}
+
+
.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;
@@ -3388,7 +3393,6 @@
.btn-right {
padding: 20rpx;
line-height: 1.5;
- border: none;
font-size: 38rpx;
font-weight: bold;
float: right;
@@ -3408,6 +3412,23 @@
width: 30%;
margin-left: 1%;
}
+ }
+
+ .btn-warn {
+ background: #ff2d1e;
+ border: none;
+ color: #fff;
+ }
+
+ .btn-cancel {
+ background: #fff;
+ color: #000;
+ }
+
+ .btn-primary {
+ background: #27A6E1;
+ border: none;
+ color: #fff;
}
[nvue] uni-view {
@@ -3617,7 +3638,7 @@
border-radius: 5px;
}
- .view-popup {
+ .view-popup {
position: relative;
}
@@ -3654,7 +3675,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom:10rpx;
right: 20rpx;
}
@@ -3678,9 +3699,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; */
diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index c61f7b0..d2042d1 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -2032,9 +2032,11 @@
margin-top: 50rpx;
padding: 20rpx;
line-height: 1.5;
- background: #27A6E1;
+ /* background: #27A6E1;
border: none;
- color: #fff;
+ color: #fff; */
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
float: left;
@@ -2118,7 +2120,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
@@ -2142,9 +2144,11 @@
margin-top: 50rpx;
padding: 15rpx;
line-height: 1.5;
- background: #27A6E1;
+ /* background: #27A6E1;
border: none;
- color: #fff;
+ color: #fff; */
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
/* float: right; */
diff --git a/pages/modal/form/index.vue b/pages/modal/form/index.vue
index d2c24d3..72ffda4 100644
--- a/pages/modal/form/index.vue
+++ b/pages/modal/form/index.vue
@@ -104,8 +104,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'}">
@@ -117,7 +118,7 @@
</view>
</view>
<view class="popup-footer">
- <button type="default" @tap="popup_sava" class="btn_popup_add">{{translateSys('ok')}}</button>
+ <button type="primary" @tap="popup_sava" class="btn_popup_add">{{translateSys('ok')}}</button>
<button type="default" @tap="popup_cancel"
class="btn_popup_cancel">{{translateSys('cancel')}}</button>
</view>
@@ -244,7 +245,7 @@
title: this.translateSys("error"),
content: this.translate("tip_no_master_class"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -394,7 +395,7 @@
title: $this.translateSys('tip') + "1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
@@ -432,7 +433,7 @@
title: this.translateSys("error") + "3",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
@@ -518,7 +519,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -528,7 +529,7 @@
.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -540,7 +541,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result.action) {
@@ -584,7 +585,7 @@
content: result.info,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
}
}
@@ -601,7 +602,7 @@
title: $this.translateSys('tip') + "2",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
},
@@ -782,7 +783,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_callback_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -791,7 +792,7 @@
title: this.translateSys("tip"),
content: this.translate('icon_click_event_empty'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -872,7 +873,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
} else uni.showModal({
title: this.translateSys('tip'),
@@ -882,7 +883,7 @@
.ret,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
return false;
} else {
@@ -894,7 +895,7 @@
content: tip,
showCancel: false,
confirmText: this.translateSys(
- "cancel")
+ 'close')
});
if (result.result_type == 0 && result.action) {
@@ -938,7 +939,7 @@
content: result.info,
showCancel: false,
confirmText: this
- .translateSys("cancel")
+ .translateSys('close')
});
}
}
@@ -952,7 +953,7 @@
title: this.translateSys("error") + "4.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
}
@@ -967,7 +968,7 @@
this.translate('reason') + this.translateSys("colon") +
tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
},
@@ -1080,7 +1081,7 @@
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1089,7 +1090,7 @@
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return;
}
@@ -1188,14 +1189,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 {
@@ -1207,7 +1208,7 @@
title: this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
var actionlist = data.action;
@@ -1270,7 +1271,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
}
}
@@ -1347,7 +1348,7 @@
title: this.translateSys("error") + "3.1",
content: exStr,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
});
},
@@ -1435,14 +1436,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 {
@@ -1454,7 +1455,7 @@
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
if (data != "") {
@@ -1628,7 +1629,7 @@
.translate(
"tip_action_unprocessed"),
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1641,7 +1642,7 @@
"quotation_mark_right") + $this.translateSys(
"comma") + 'event_id' + eventid,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
}
}
@@ -1656,7 +1657,7 @@
title: $this.translateSys('tip') + "5.1",
content: exStr,
showCancel: false,
- confirmText: $this.translateSys("cancel")
+ confirmText: $this.translateSys('close')
});
});
},
@@ -1769,7 +1770,7 @@
title: this.translateSys('tip') + "7.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -1796,7 +1797,7 @@
title: this.translateSys("tip") + "6.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -1823,7 +1824,7 @@
title: this.translateSys("tip") + "6.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -1874,7 +1875,7 @@
title: this.translateSys('tip') + "7.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -1943,7 +1944,7 @@
title: this.translateSys("tip") + "8.1",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -1991,7 +1992,7 @@
title: this.translateSys("tip") + "8.2",
content: tip,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys('close')
});
return false
}
@@ -2095,8 +2096,10 @@
.btn_cancel {
width: 45%;
margin: 0 10rpx;
+ // background: #fff;
+ // border: none;
+ // color: #000;
background: #fff;
- border: none;
color: #000;
font-size: 38rpx;
float: right;
@@ -2154,7 +2157,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom:10rpx;
right: 20rpx;
}
@@ -2178,9 +2181,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; */
diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index ce3a18b..0745715 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -3809,9 +3809,10 @@
margin-top: 50rpx;
padding: 20rpx;
line-height: 1.5;
- background: #27A6E1;
- border: none;
- color: #fff;
+ /* background: #27A6E1; */
+ /* border: none; */
+ background: #fff;
+ color: #000;
font-size: 38rpx;
font-weight: bold;
float: left;
@@ -3963,7 +3964,7 @@
.popup-footer {
float: right;
position: absolute;
- bottom: 0;
+ bottom: 10rpx;
right: 20rpx;
}
diff --git a/pages/selPrj/index.vue b/pages/selPrj/index.vue
index 7b43fab..619f235 100644
--- a/pages/selPrj/index.vue
+++ b/pages/selPrj/index.vue
@@ -82,7 +82,7 @@
title: this.translateSys("error") + "1.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
});
},
@@ -140,7 +140,7 @@
title: this.translateSys("error") + "2.1",
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
});
@@ -169,7 +169,7 @@
title: this.translateSys("tip"),
content: this.translate('tip_no_select_project'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
return;
}
diff --git a/pages/selpsn/index.vue b/pages/selpsn/index.vue
index 4099cc1..2c9ec66 100644
--- a/pages/selpsn/index.vue
+++ b/pages/selpsn/index.vue
@@ -107,7 +107,7 @@
title: this.translateSys("error"),
content: ex.errMsg,
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
});
} else
@@ -138,7 +138,7 @@
title: this.translateSys("tip"),
content: this.translate('tip_no_select_user'),
showCancel: false,
- confirmText: this.translateSys("cancel")
+ confirmText: this.translateSys("close")
});
return;
}
--
Gitblit v1.9.1