mirror of
https://gitee.com/hhyykk/ipms-sjy.git
synced 2025-07-08 16:15:07 +08:00
uView版本升级到2.0.34
This commit is contained in:
@ -1,9 +1,9 @@
|
||||
// 此版本发布于2022-04-04
|
||||
const version = '2.0.30'
|
||||
// 此版本发布于2022-00-24
|
||||
const version = '2.0.34'
|
||||
|
||||
// 开发环境才提示,生产环境不会提示
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.log(`\n %c uView V${version} %c https://www.uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
|
||||
console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
|
||||
}
|
||||
|
||||
export default {
|
||||
|
@ -10,6 +10,7 @@
|
||||
export default {
|
||||
// codeInput 组件
|
||||
codeInput: {
|
||||
adjustPosition: true,
|
||||
maxlength: 6,
|
||||
dot: false,
|
||||
mode: 'box',
|
||||
|
@ -13,6 +13,7 @@ export default {
|
||||
label: '',
|
||||
prop: '',
|
||||
borderBottom: '',
|
||||
labelPosition: '',
|
||||
labelWidth: '',
|
||||
rightIcon: '',
|
||||
leftIcon: '',
|
||||
|
@ -17,6 +17,7 @@ export default {
|
||||
bgColor: '#ffffff',
|
||||
color: '#C8C8C8',
|
||||
fontSize: 19,
|
||||
iconSize: 28,
|
||||
loadingColor: '#C8C8C8'
|
||||
}
|
||||
}
|
||||
|
@ -14,6 +14,7 @@ export default {
|
||||
bgColor: 'transparent',
|
||||
icon: true,
|
||||
fontSize: 14,
|
||||
iconSize: 17,
|
||||
color: '#606266',
|
||||
loadingIcon: 'spinner',
|
||||
loadmoreText: '加载更多',
|
||||
@ -24,6 +25,8 @@ export default {
|
||||
marginTop: 10,
|
||||
marginBottom: 10,
|
||||
height: 'auto',
|
||||
line: false
|
||||
line: false,
|
||||
lineColor: '#E6E8EB',
|
||||
dashed: false,
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,6 @@ export default {
|
||||
confirmText: '确定',
|
||||
cancelColor: '#909193',
|
||||
confirmColor: '#3c9cff',
|
||||
singleIndex: 0,
|
||||
visibleItemCount: 5,
|
||||
keyName: 'text',
|
||||
closeOnClickOverlay: false,
|
||||
|
@ -15,7 +15,7 @@ export default {
|
||||
placeholderClass: 'textarea-placeholder',
|
||||
placeholderStyle: 'color: #c0c4cc',
|
||||
height: 70,
|
||||
confirmType: '',
|
||||
confirmType: 'done',
|
||||
disabled: false,
|
||||
count: false,
|
||||
focus: false,
|
||||
|
@ -292,15 +292,15 @@ if (!String.prototype.padStart) {
|
||||
else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
|
||||
date = new Date(Number(dateTime))
|
||||
}
|
||||
// 其他都认为符合 RFC 2822 规范
|
||||
else {
|
||||
// 处理平台性差异,在Safari/Webkit中,new Date仅支持/作为分割符的字符串时间
|
||||
date = new Date(
|
||||
typeof dateTime === 'string'
|
||||
? dateTime.replace(/-/g, '/')
|
||||
: dateTime
|
||||
)
|
||||
}
|
||||
// 处理平台性差异,在Safari/Webkit中,new Date仅支持/作为分割符的字符串时间
|
||||
// 处理 '2022-07-10 01:02:03',跳过 '2022-07-10T01:02:03'
|
||||
else if (typeof dateTime === 'string' && dateTime.includes('-') && !dateTime.includes('T')) {
|
||||
date = new Date(dateTime.replace(/-/g, '/'))
|
||||
}
|
||||
// 其他都认为符合 RFC 2822 规范
|
||||
else {
|
||||
date = new Date(dateTime)
|
||||
}
|
||||
|
||||
const timeSource = {
|
||||
'y': date.getFullYear().toString(), // 年
|
||||
|
@ -9,7 +9,7 @@ function email(value) {
|
||||
* 验证手机格式
|
||||
*/
|
||||
function mobile(value) {
|
||||
return /^1[23456789]\d{9}$/.test(value)
|
||||
return /^1([3589]\d|4[5-9]|6[1-2,4-7]|7[0-8])\d{8}$/.test(value)
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -77,7 +77,7 @@ module.exports = {
|
||||
}
|
||||
return Object.keys(classes)
|
||||
// 支付宝,头条小程序无法动态绑定一个数组类名,否则解析出来的结果会带有",",而导致失效
|
||||
// #ifdef MP-ALIPAY || MP-TOUTIAO
|
||||
// #ifdef MP-ALIPAY || MP-TOUTIAO || MP-LARK
|
||||
.join(' ')
|
||||
// #endif
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ class Router {
|
||||
mergeConfig.url = this.mixinParam(options, params)
|
||||
mergeConfig.type = 'navigateTo'
|
||||
} else {
|
||||
mergeConfig = uni.$u.deepClone(options, this.config)
|
||||
mergeConfig = uni.$u.deepMerge(options, this.config)
|
||||
// 否则正常使用mergeConfig中的url和params进行拼接
|
||||
mergeConfig.url = this.mixinParam(options.url, options.params)
|
||||
}
|
||||
|
Reference in New Issue
Block a user