diff --git a/App.vue b/App.vue index 418f9dd3923a69330e0a738caed154943b05187e..b05199d1d8ff4c8ff45b7b1468cd9f3c90ab9948 100644 --- a/App.vue +++ b/App.vue @@ -1,5 +1,5 @@ + + diff --git a/components/uni-load-state/uni-load-state.vue b/components/uni-load-state/uni-load-state.vue index 796ed32a800b7200d3011479213f9a13a4c2755f..744471e0d38cce340f0717e2512cc7a64ffd632a 100644 --- a/components/uni-load-state/uni-load-state.vue +++ b/components/uni-load-state/uni-load-state.vue @@ -1,70 +1,79 @@ - - diff --git a/components/uni-quick-login/uni-quick-login.vue b/components/uni-quick-login/uni-quick-login.vue index 2ea2970f982f7443e7aeeabee931a40cba5d8c93..bfc75b2b0ca91b90f39a196d0b064b7daa04a398 100644 --- a/components/uni-quick-login/uni-quick-login.vue +++ b/components/uni-quick-login/uni-quick-login.vue @@ -76,7 +76,7 @@ univerifyStyle: { //一键登录弹出窗的样式配置参数 "fullScreen": true, // 是否全屏显示，true表示全屏模式，false表示非全屏模式，默认值为false。 "backgroundColor": "#ffffff", // 授权页面背景颜色，默认值：#ffffff - "buttons": { // 自定义登陆按钮 + "buttons": { // 自定义登录按钮 "iconWidth": "45px", // 图标宽度（高度等比例缩放） 默认值：45px "list": [] }, @@ -106,12 +106,12 @@ }, async created() { let servicesList = this.servicesList - //去掉配置中不存在的 注意，在/common/appInit.js中已清除有配置但设备环境不支持的登陆项 + //去掉配置中不存在的 注意，在/common/appInit.js中已清除有配置但设备环境不支持的登录项 servicesList = servicesList.filter(item => this.loginConfig.includes(item.id)) //处理一键登录 if (this.loginConfig.includes('univerify')) { this.univerifyStyle.privacyTerms.privacyItems = this.agreements - //设置一键登录功能底下的快捷登陆按钮 + //设置一键登录功能底下的快捷登录按钮 servicesList.forEach(({ id, logo @@ -125,7 +125,7 @@ }) } console.log(servicesList); - //如果当前页面为默认登陆界面。当前第一优先级的“微信和苹果登陆”要隐藏，因为他已经被渲染在默认登陆界面顶部 + //如果当前页面为默认登录界面。当前第一优先级的“微信和苹果登录”要隐藏，因为他已经被渲染在默认登录界面顶部 if ( this.getRoute(1) == '/pages/ucenter/login-page/index/index' && ['weixin', 'apple'].includes(this .loginConfig[0]) @@ -265,9 +265,9 @@ title: this.$t('uniQuickLogin').chooseOtherLogin, icon: 'none' }); - console.log('点击了第三方登陆，provider：', err.provider); + console.log('点击了第三方登录，provider：', err.provider); - //同步一键登陆弹出层隐私协议框是否打勾 + //同步一键登录弹出层隐私协议框是否打勾 let agree = (await uni.getCheckBoxState())[1].state console.log('agree',agree); uni.$emit('setAgreementsAgree',agree) diff --git a/lang/en.js b/lang/en.js index 11c57b9b5750af8d5f459fb38f815cf30f750b58..a5d1f52f1358d7ec742fc54da97114735399f7cd 100644 --- a/lang/en.js +++ b/lang/en.js @@ -1,5 +1,5 @@ export default { - tabbar:'List,Grid,Mine', + tabbar:'List,Grid,contacts,Mine', agreementsTitle:'User service agreement,Privacy policy', common: { wechatFriends: "friends", diff --git a/lang/i18n.js b/lang/i18n.js index d98956a7716394715128632c602399380f89549b..934dfa73ac651f5baadc514771d9a05614987646 100644 --- a/lang/i18n.js +++ b/lang/i18n.js @@ -12,7 +12,7 @@ if(i18nEnable){ }else{ currentLang = "zh-Hans" } -console.log(uni.getStorageSync('CURRENT_LANG'),currentLang); +// console.log(uni.getStorageSync('CURRENT_LANG'),currentLang); if (!currentLang) { if (uni.getLocale) { console.log('获取应用语言:', uni.getLocale()); @@ -69,17 +69,20 @@ console.log(` `); let initLanguageAfter = () => { function $i18n(e){ + // #ifdef VUE3 + return i18n.global.messages[i18n.global.locale][e] + // #endif return i18n.messages[i18n.locale][e] } setTimeout(function(){ //底部tabbar更新 $i18n('tabbar').split(',').forEach((text, index) => { - console.log(text); + // console.log(text); uni.setTabBarItem({ index, text, complete: e => { - console.log("e: " + JSON.stringify(e)); + // console.log("e: " + JSON.stringify(e)); } }) }) diff --git a/lang/zh-Hans.js b/lang/zh-Hans.js index 77c2733bedb301238eadc37a766833ac42c514f7..7cbcb56a1cd76d0ea354f6f19f5b133b925b9c3c 100644 --- a/lang/zh-Hans.js +++ b/lang/zh-Hans.js @@ -1,200 +1,200 @@ export default { - tabbar:'列表,宫格,我的', - agreementsTitle:'用户服务协议,隐私政策', + tabbar:'列表,宫格,通讯录,我的', + agreementsTitle:'用户服务协议,隐私政策', common:{ - wechatFriends: "微信好友", - wechatBbs: "微信朋友圈", - weibo:"微博", + wechatFriends: "微信好友", + wechatBbs: "微信朋友圈", + weibo:"微博", more: "更多", - agree:"同意", - copy: "复制", - wechatApplet: "微信小程序", - cancelShare: "取消分享", - updateSucceeded: "更新成功", - phonePlaceholder: "请输入手机号", - verifyCodePlaceholder: "请输入验证码", - newPasswordPlaceholder: "请输入新密码", - confirmNewPasswordPlaceholder: "请确认新密码", - confirmPassword: "请确认密码", - verifyCodeSend: "验证码已通过短信发送至", - passwordDigits: "密码为6 - 20位", - getVerifyCode: "获取验证码", - noAgree: "你未同意隐私政策协议", - gotIt: "知道了", - login: "登录", - error: "错误", - complete: "完成", - submit: "提交", - formatErr:"手机号码格式不正确", - sixDigitCode:"请输入6位验证码", - resetNavTitle:"重置密码" - - }, - list: { - inputPlaceholder: "请输入搜索内容", - }, - search:{ - cancelText: '取消', - searchHistory: "搜索历史", - searchDiscovery: "搜索发现", - deleteAll: "全部删除", - delete: "删除", - deleteTip: "确认清空搜索历史吗？", - complete: "完成", - searchHiddenTip: "当前搜索发现已隐藏", - }, - grid:{ - grid: "宫格组件", - visibleToAll: "所有人可见", - invisibleToTourists: "游客不可见", - adminVisible: "管理员可见", - clickTip: "点击第", - clickTipGrid: "个宫格", - }, - mine:{ - showText: "文字", - signIn: "签到有奖", - toEvaluate: "去评分", - readArticles: "阅读过的文章", - myScore: "我的积分", - invite: "分销推荐", - guestBook: "留言板示例", - feedback: "问题与反馈", - settings: "设置", - checkUpdate: "检查更新", - about: "关于", - clicked: "你点击了", - checkScore: "请登录后查看积分", - currentScore: "当前积分为", - noScore: "当前无积分", - notLogged: "未登录", - }, - userinfo:{ - navigationBarTitle:"个人资料", - ProfilePhoto: "头像", - nickname: "昵称", - notSet: "未设置", - phoneNumber: "手机号", - notSpecified: "未绑定", - setNickname: "设置昵称", - setNicknamePlaceholder: "请输入要设置的昵称", - bindPhoneNumber: "本机号码一键绑定", - bindOtherLogin: "其他号码绑定", - noChange: "没有变化", - uploading: "正在上传", - requestFail: "请求服务失败", - setting: "设置中", - deleteSucceeded: "删除成功", - setSucceeded: "设置成功", - }, - smsCode:{ - resendVerifyCode: "重新发送", - phoneErrTip: "手机号格式错误", - sendSuccessTip: "短信验证码发送成功", - }, - loadMore:{ - noData: "暂无数据", - noNetwork: "网络异常", - toSet: "前往设置", - error: "错误", - }, - guestbook:{ - navigationBarTitle:"留言板", - msgContent: "发表留言内容", - notAvailable: "未登陆游客不可用", - send: "发送", - addSucceeded: "新增成功", - noPermission: "你没有该操作权限", - }, - uniFeedback:{ - navigationBarTitle:"问题与反馈", - msgTitle: "留言内容", - imgTitle: "图片列表", - contacts: "联系人", - phone: "联系电话", - submit: "提交", - }, - settings:{ - navigationBarTitle:"设置", - userInfo: "个人资料", - changePassword: "修改密码", - clearTmp: "清理缓存", - pushServer: "推送功能", - fingerPrint: "指纹解锁", - facial: "人脸解锁", - deactivate: "注销账号", - logOut: "退出登录", - login: "登录", - failTip: "认证失败请重试", - authFailed: "认证失败", - changeLanguage: "切换语言", - please: "请用", - successText: "成功", - deviceNoOpen: "设备未开启", - fail: "失败", - tips: "提示", - exitLogin: "是否退出登录?", - clearing: "清除中", - clearedSuccessed: "清除成功", - confirmText: "确定", - cancelText: '取消', - }, - deactivate:{ - cancelText: '取消', - nextStep: "下一步", - navigationBarTitle:"注销提示" - }, - about:{ - sacnQR: "扫描二维码，您的朋友也可以下载", - client: "客户端", - and: "和", - about: "关于", - }, - invite:{ - download: "下载", - }, - login:{ - phoneLogin: "登录后即可展示自己", - phoneLoginTip: "未注册的手机号验证通过后将自动注册", - getVerifyCode: "获取验证码", - }, - uniQuickLogin:{ - accountLogin: "账号登录", - SMSLogin: "短信验证码", - wechatLogin: "微信登录", - appleLogin: "苹果登录", - oneClickLogin: "一键登录", - QQLogin: "QQ登录", - xiaomiLogin: "小米登录", - getProviderFail: "获取服务供应商失败", - loginErr: "登录服务初始化错误", - chooseOtherLogin: "点击了第三方登陆", - }, - pwdLogin:{ - pwdLogin: "用户名密码登录", - placeholder: "请输入手机号/用户名", - passwordPlaceholder: "请输入密码", - verifyCodePlaceholder: "请输入验证码", - login: "登录", - forgetPassword: "忘记密码", - register: "注册账号", - }, - register:{ - navigationBarTitle:"注册", - usernamePlaceholder: "请输入用户名", - nicknamePlaceholder: "请输入用户昵称", - registerAndLogin: "注册并登录", - passwordDigitsPlaceholder: "请输入6-20位密码", - passwordAgain: "再次输入密码", - }, - listDetail:{ - follow: "点击关注", - newsErr: "出错了，新闻ID为空", - }, - newsLog:{ - navigationBarTitle:"阅读记录" + agree:"同意", + copy: "复制", + wechatApplet: "微信小程序", + cancelShare: "取消分享", + updateSucceeded: "更新成功", + phonePlaceholder: "请输入手机号", + verifyCodePlaceholder: "请输入验证码", + newPasswordPlaceholder: "请输入新密码", + confirmNewPasswordPlaceholder: "请确认新密码", + confirmPassword: "请确认密码", + verifyCodeSend: "验证码已通过短信发送至", + passwordDigits: "密码为6 - 20位", + getVerifyCode: "获取验证码", + noAgree: "你未同意隐私政策协议", + gotIt: "知道了", + login: "登录", + error: "错误", + complete: "完成", + submit: "提交", + formatErr:"手机号码格式不正确", + sixDigitCode:"请输入6位验证码", + resetNavTitle:"重置密码" + + }, + list: { + inputPlaceholder: "请输入搜索内容", + }, + search:{ + cancelText: '取消', + searchHistory: "搜索历史", + searchDiscovery: "搜索发现", + deleteAll: "全部删除", + delete: "删除", + deleteTip: "确认清空搜索历史吗？", + complete: "完成", + searchHiddenTip: "当前搜索发现已隐藏", + }, + grid:{ + grid: "宫格组件", + visibleToAll: "所有人可见", + invisibleToTourists: "游客不可见", + adminVisible: "管理员可见", + clickTip: "点击第", + clickTipGrid: "个宫格", + }, + mine:{ + showText: "文字", + signIn: "签到有奖", + toEvaluate: "去评分", + readArticles: "阅读过的文章", + myScore: "我的积分", + invite: "分销推荐", + guestBook: "留言板示例", + feedback: "问题与反馈", + settings: "设置", + checkUpdate: "检查更新", + about: "关于", + clicked: "你点击了", + checkScore: "请登录后查看积分", + currentScore: "当前积分为", + noScore: "当前无积分", + notLogged: "未登录", + }, + userinfo:{ + navigationBarTitle:"个人资料", + ProfilePhoto: "头像", + nickname: "昵称", + notSet: "未设置", + phoneNumber: "手机号", + notSpecified: "未绑定", + setNickname: "设置昵称", + setNicknamePlaceholder: "请输入要设置的昵称", + bindPhoneNumber: "本机号码一键绑定", + bindOtherLogin: "其他号码绑定", + noChange: "没有变化", + uploading: "正在上传", + requestFail: "请求服务失败", + setting: "设置中", + deleteSucceeded: "删除成功", + setSucceeded: "设置成功", + }, + smsCode:{ + resendVerifyCode: "重新发送", + phoneErrTip: "手机号格式错误", + sendSuccessTip: "短信验证码发送成功", + }, + loadMore:{ + noData: "暂无数据", + noNetwork: "网络异常", + toSet: "前往设置", + error: "错误", + }, + guestbook:{ + navigationBarTitle:"留言板", + msgContent: "发表留言内容", + notAvailable: "未登录游客不可用", + send: "发送", + addSucceeded: "新增成功", + noPermission: "你没有该操作权限", + }, + uniFeedback:{ + navigationBarTitle:"问题与反馈", + msgTitle: "留言内容", + imgTitle: "图片列表", + contacts: "联系人", + phone: "联系电话", + submit: "提交", + }, + settings:{ + navigationBarTitle:"设置", + userInfo: "个人资料", + changePassword: "修改密码", + clearTmp: "清理缓存", + pushServer: "推送功能", + fingerPrint: "指纹解锁", + facial: "人脸解锁", + deactivate: "注销账号", + logOut: "退出登录", + login: "登录", + failTip: "认证失败请重试", + authFailed: "认证失败", + changeLanguage: "切换语言", + please: "请用", + successText: "成功", + deviceNoOpen: "设备未开启", + fail: "失败", + tips: "提示", + exitLogin: "是否退出登录?", + clearing: "清除中", + clearedSuccessed: "清除成功", + confirmText: "确定", + cancelText: '取消', + }, + deactivate:{ + cancelText: '取消', + nextStep: "下一步", + navigationBarTitle:"注销提示" + }, + about:{ + sacnQR: "扫描二维码，您的朋友也可以下载", + client: "客户端", + and: "和", + about: "关于", + }, + invite:{ + download: "下载", + }, + login:{ + phoneLogin: "登录后即可展示自己", + phoneLoginTip: "未注册的手机号验证通过后将自动注册", + getVerifyCode: "获取验证码", + }, + uniQuickLogin:{ + accountLogin: "账号登录", + SMSLogin: "短信验证码", + wechatLogin: "微信登录", + appleLogin: "苹果登录", + oneClickLogin: "一键登录", + QQLogin: "QQ登录", + xiaomiLogin: "小米登录", + getProviderFail: "获取服务供应商失败", + loginErr: "登录服务初始化错误", + chooseOtherLogin: "点击了第三方登录", + }, + pwdLogin:{ + pwdLogin: "用户名密码登录", + placeholder: "请输入手机号/用户名", + passwordPlaceholder: "请输入密码", + verifyCodePlaceholder: "请输入验证码", + login: "登录", + forgetPassword: "忘记密码", + register: "注册账号", + }, + register:{ + navigationBarTitle:"注册", + usernamePlaceholder: "请输入用户名", + nicknamePlaceholder: "请输入用户昵称", + registerAndLogin: "注册并登录", + passwordDigitsPlaceholder: "请输入6-20位密码", + passwordAgain: "再次输入密码", + }, + listDetail:{ + follow: "点击关注", + newsErr: "出错了，新闻ID为空", + }, + newsLog:{ + navigationBarTitle:"阅读记录" }, bindMobile:{ navigationBarTitle:"绑定手机号码" - } + } } diff --git a/package.json b/package.json index 14b9d56237429c41203c89a8af79a3e049344f11..71d1a062b8d5d7578db241def30bda5f35a38a5d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.1.18", + "version": "1.1.21", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/pages.json b/pages.json index 1e0e7184e24f252e585e125c327d62911c2c2849..c937903cf0736725c5bf176ee4f9be712ea98105 100644 --- a/pages.json +++ b/pages.json @@ -1,9 +1,11 @@ { "pages": [{ "path": "pages/list/list", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": true + "style": { + // #ifndef APP-PLUS + "enablePullDownRefresh": true, + // #endif + "navigationStyle": "custom" } }, { @@ -187,7 +189,7 @@ } } } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "uni-starter", @@ -227,7 +229,8 @@ "iconPath": "static/tabbar/grid.png", "selectedIconPath": "static/tabbar/grid_active.png", "text": "宫格" - }, { + } + , { "pagePath": "pages/ucenter/ucenter", "iconPath": "static/tabbar/me.png", "selectedIconPath": "static/tabbar/me_active.png", diff --git a/pages/list/list.nvue b/pages/list/list.nvue index 22e9692d9d706a8903d8c60ecf6ec9f99492b415..6fca16e0a225897439bc4c288d44049fb3f86eb2 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -3,17 +3,27 @@ + - - + + + + + - + + + + + + + + @@ -32,9 +42,12 @@ + + @@ -70,13 +83,14 @@ refreshState: 0, listHight: 0, dataList:[] + showRefresh: false, } }, watch: { keyword(keyword, oldValue) { let where = '"article_status" == 1 ' if (keyword) { - this.where = where + `& /${keyword}/.test(title)`; + this.where = where + `&& /${keyword}/.test(title)`; } else { this.where = where; } @@ -84,13 +98,14 @@ }, async onReady() { // #ifdef APP-NVUE - this.listHight = uni.getSystemInfoSync().windowHeight - 96 + 'px' + /* 可用窗口高度 - 搜索框高 - 状态栏高 */ + this.listHight = uni.getSystemInfoSync().windowHeight - uni.getSystemInfoSync().statusBarHeight - 50 + + 'px'; // #endif // #ifndef APP-NVUE this.listHight = 'auto' // #endif cdbRef = this.$refs.udb - }, async onShow() { this.keyword = getApp().globalData.searchText @@ -128,27 +143,39 @@ this.refresh() }, refresh() { - console.log('----platform----'); - console.log(JSON.stringify(process.env.VUE_APP_PLATFORM)); cdbRef.loadData({ clear: true }, () => { uni.stopPullDownRefresh() + // #ifdef APP-NVUE + this.showRefresh = false + // #endif + console.log('end'); }) console.log('refresh'); }, + loadMore() { + cdbRef.loadMore() + }, onqueryerror(e) { console.error(e); + }, + onpullingdown(e) { + console.log(e); + this.showRefresh = true + if(e.pullingDistance>100){ + this.refresh() + } } }, + // #ifndef APP-NVUE onPullDownRefresh() { this.refresh() }, onReachBottom() { - cdbRef.loadMore({ - clear: true - }) + this.loadMore() } + // #endif } @@ -159,7 +186,6 @@ box-sizing: border-box; flex-direction: column; } - /* #endif */ .pages { background-color: #FFFFFF; @@ -191,21 +217,10 @@ color: #999999; } - .refresh-tip { - color: #67c23a; - font-size: 14px; - line-height: 40px; - text-align: center; - background-color: #f0f9eb; - height: 0; - opacity: 0; - transform: translateY(-100%); - transition: height 0.3s; - } - .uni-search-box { background-color: #FFFFFF; position: sticky; + height: 50px; top: 0; left: 0; /* #ifndef APP-PLUS */ @@ -215,37 +230,6 @@ width: 580rpx; /* #endif */ } - - .show-refresh-tip { - transform: translateY(0); - height: 40px; - opacity: 1; - } - - .get-data-state { - width: 750rpx; - align-items: center; - } - - .get-data-state-img { - width: 500rpx; - } - - .get-data-state-text { - width: 32rpx; - color: #999999; - line-height: 50rpx; - height: 50rpx; - width: 750rpx; - text-align: center; - } - - .uni-list {} - - .f1 { - flex: 1; - } - .cover-search-bar { height: 50px; position: relative; diff --git a/pages/ucenter/about/about.vue b/pages/ucenter/about/about.vue index 7c719a4d4c3e9f8503ae1cf14f70c75cb3d44417..23e6c506fdbe8221d77382874232867701f80f11 100644 --- a/pages/ucenter/about/about.vue +++ b/pages/ucenter/about/about.vue @@ -145,7 +145,7 @@ } .box { - margin-top: 100px; + margin-top: 60px; flex-direction: column; justify-content: center; align-items: center; diff --git a/static/tabbar/im-contacts.png b/static/tabbar/im-contacts.png new file mode 100644 index 0000000000000000000000000000000000000000..17bb78fb08cdda17fe1acd7c6c758c33a88f7fa1 Binary files /dev/null and b/static/tabbar/im-contacts.png differ diff --git a/static/tabbar/im-contacts_active.png b/static/tabbar/im-contacts_active.png new file mode 100644 index 0000000000000000000000000000000000000000..b86a8c19b70d11255ff39e3ba3056b5dd621dfbf Binary files /dev/null and b/static/tabbar/im-contacts_active.png differ diff --git a/uni-starter.config.js b/uni-starter.config.js index c29676986977fd7f0d32b35a0eeb1b6ed25a50b1..482fc5cde5f11b9d7a0cfb3781cdef9cfaa2c624 100644 --- a/uni-starter.config.js +++ b/uni-starter.config.js @@ -3,14 +3,14 @@ export default { "h5": { "url": "https://uni-starter.dcloud.net.cn", // 前端网页托管的域名 // 在h5端全局悬浮引导用户下载app的功能 更多自定义要求在/common/openApp.js中修改 - "openApp": { //如不需要本功能直接移除本节点即可 - //点击悬浮下载栏后打开的网页链接 - "openUrl": '/#/pages/ucenter/invite/invite', - //左侧显示的应用名称 - "appname": 'uni-starter', - //应用的图标 - "logo": './static/logo.png', - } + // "openApp": { //如不需要本功能直接移除本节点即可 + // //点击悬浮下载栏后打开的网页链接 + // "openUrl": '/#/pages/ucenter/invite/invite', + // //左侧显示的应用名称 + // "appname": 'uni-starter', + // //应用的图标 + // "logo": './static/logo.png', + // } }, "mp": { "weixin": { @@ -20,9 +20,9 @@ export default { }, "router": { /* - 名词解释：“强制登陆页” - 在打开定义的需强制登陆的页面之前会自动检查（前端校验）uni_id_token的值是否有效, - 如果无效会自动跳转到登陆页面 + 名词解释：“强制登录页” + 在打开定义的需强制登录的页面之前会自动检查（前端校验）uni_id_token的值是否有效, + 如果无效会自动跳转到登录页面 两种模式： 1.needLogin：黑名单模式。枚举游客不可访问的页面。 2.visitor：白名单模式。枚举游客可访问的页面。 @@ -46,7 +46,7 @@ export default { // ], /* - login:配置登陆类型与优先级 + login:配置登录类型与优先级 未列举到的，或设备环境不支持的选项，将被隐藏。如果你需要在不同平台有不同的配置，直接用条件编译即可 根据数组的第0项，决定登录方式的第一优先级。 */ @@ -89,6 +89,6 @@ export default { }, //配置多语言国际化。i18n为英文单词 internationalization的首末字符i和n，18为中间的字符数 是“国际化”的简称 "i18n":{ - "enable":true //默认启用，国际化。如果你不想使用国际化相关功能，请改为false + "enable":false //默认关闭，国际化。如果你想使用国际化相关功能，请改为true } -} +} \ No newline at end of file diff --git a/uni_modules/uni-badge/changelog.md b/uni_modules/uni-badge/changelog.md index 90bde25beb93655b1dad220794757f41de51e935..4ca8c5b477a3f996a515460a986c96c6bf63d4ef 100644 --- a/uni_modules/uni-badge/changelog.md +++ b/uni_modules/uni-badge/changelog.md @@ -1,20 +1,22 @@ +## 1.1.6（2021-09-22） +- 修复 在字节小程序上样式不生效的 bug ## 1.1.5（2021-07-30） - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) -## 1.1.4 -- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) -## 1.1.3（2021-06-24） -- 优化 示例项目 -## 1.1.1（2021-05-12） -- 新增 组件示例地址 -## 1.1.0（2021-05-12） -- 新增 uni-badge 的 absolute 属性，支持定位 -- 新增 uni-badge 的 offset 属性，支持定位偏移 -- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点 -- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+ -- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式 -## 1.0.7（2021-05-07） -- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug -- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug -- 新增 uni-badge 属性 custom-style， 支持自定义样式 -## 1.0.6（2021-02-04） -- 调整为uni_modules目录规范 +## 1.1.4（2021-07-29） +- 修复 去掉 nvue 不支持css 的 align-self 属性，nvue 下不暂支持 absolute 属性 +## 1.1.3（2021-06-24） +- 优化 示例项目 +## 1.1.1（2021-05-12） +- 新增 组件示例地址 +## 1.1.0（2021-05-12） +- 新增 uni-badge 的 absolute 属性，支持定位 +- 新增 uni-badge 的 offset 属性，支持定位偏移 +- 新增 uni-badge 的 is-dot 属性，支持仅显示有一个小点 +- 新增 uni-badge 的 max-num 属性，支持自定义封顶的数字值，超过 99 显示99+ +- 优化 uni-badge 属性 custom-style， 支持以对象形式自定义样式 +## 1.0.7（2021-05-07） +- 修复 uni-badge 在 App 端，数字小于10时不是圆形的bug +- 修复 uni-badge 在父元素不是 flex 布局时，宽度缩小的bug +- 新增 uni-badge 属性 custom-style， 支持自定义样式 +## 1.0.6（2021-02-04） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue index 1be7c9d6fad2911c1a47451fcc7953afff7e2033..cbd8548cb7c1180702e32855e6a9e7fbf9ec150c 100644 --- a/uni_modules/uni-badge/components/uni-badge/uni-badge.vue +++ b/uni_modules/uni-badge/components/uni-badge/uni-badge.vue @@ -90,7 +90,7 @@ 'uni-badge--' + type, 'uni-badge--' + size, absolute ? 'uni-badge--absolute' : '' - ] + ].join(' ') }, positionStyle() { if (!this.absolute) return {} diff --git a/uni_modules/uni-badge/package.json b/uni_modules/uni-badge/package.json index 29a4edca6211f458429f00e29dbd3ff2a2ecca36..4efafd509b3489e15a5081e838f51456acfbb9a4 100644 --- a/uni_modules/uni-badge/package.json +++ b/uni_modules/uni-badge/package.json @@ -1,84 +1,88 @@ -{ - "id": "uni-badge", - "displayName": "uni-badge 数字角标", - "version": "1.1.5", - "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。", - "keywords": [ - "", - "badge", - "uni-ui", - "uniui", - "数字角标", - "徽章" -], - "repository": "https://github.com/dcloudio/uni-ui", - "engines": { - "HBuilderX": "" - }, - "directories": { - "example": "../../temps/example_temps" - }, - "dcloudext": { - "category": [ - "前端组件", - "通用组件" - ], - "sale": { - "regular": { - "price": "0.00" - }, - "sourcecode": { - "price": "0.00" - } - }, - "contact": { - "qq": "" - }, - "declaration": { - "ads": "无", - "data": "无", - "permissions": "无" - }, - "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" - }, - "uni_modules": { - "dependencies": [], - "encrypt": [], - "platforms": { - "cloud": { - "tcb": "y", - "aliyun": "y" - }, - "client": { - "App": { - "app-vue": "y", - "app-nvue": "y" - }, - "H5-mobile": { - "Safari": "y", - "Android Browser": "y", - "微信浏览器(Android)": "y", - "QQ浏览器(Android)": "y" - }, - "H5-pc": { - "Chrome": "y", - "IE": "y", - "Edge": "y", - "Firefox": "y", - "Safari": "y" - }, - "小程序": { - "微信": "y", - "阿里": "y", - "百度": "y", - "字节跳动": "y", - "QQ": "y" - }, - "快应用": { - "华为": "y", - "联盟": "y" - } - } - } - } +{ + "id": "uni-badge", + "displayName": "uni-badge 数字角标", + "version": "1.1.6", + "description": "数字角标（徽章）组件，在元素周围展示消息提醒，一般用于列表、九宫格、按钮等地方。", + "keywords": [ + "", + "badge", + "uni-ui", + "uniui", + "数字角标", + "徽章" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ], + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui" + }, + "uni_modules": { + "dependencies": [], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "y", + "联盟": "y" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } } \ No newline at end of file diff --git a/uni_modules/uni-captcha/readme.md b/uni_modules/uni-captcha/readme.md index 295d852f7646fb801eefa88dfdb4dddac6b14cbe..b23de182a8d172171104510b5d09bdf280536730 100644 --- a/uni_modules/uni-captcha/readme.md +++ b/uni_modules/uni-captcha/readme.md @@ -2,7 +2,7 @@ > 用途：主要使用在登录、需要人机校验或其他限制调用的场景 -> 验证码生成、校验都在服务端。页面使用返回的 base64 显示。[云端一体登陆模板](https://ext.dcloud.net.cn/plugin?id=13)已集成，可下载体验。 +> 验证码生成、校验都在服务端。页面使用返回的 base64 显示。[云端一体登录模板](https://ext.dcloud.net.cn/plugin?id=13)已集成，可下载体验。 > 数据表使用[opendb-verify-codes](https://gitee.com/dcloud/opendb/blob/master/collection/opendb-verify-codes/collection.json) diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md index d466748dd7cafef81a9e8fdfe49c5bef4b761965..4cde217bb78c757e8520ad23ae736a5c6432a431 100644 --- a/uni_modules/uni-icons/changelog.md +++ b/uni_modules/uni-icons/changelog.md @@ -1,6 +1,8 @@ +## 1.2.1（2021-09-17） +- 新增 支持使用 css 图标库扩展组件（仅 vue 支持） ## 1.2.0（2021-07-30） - 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) -## 1.1.5（2021-05-12） -- 新增 组件示例地址 -## 1.1.4（2021-02-05） -- 调整为uni_modules目录规范 +## 1.1.5（2021-05-12） +- 新增 组件示例地址 +## 1.1.4（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue index 401011de58a4fcd935d24eee50a9f776c8124598..edd5f087ba5ed43d2f0668a142276d2ecd9575d8 100644 --- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue +++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue @@ -1,5 +1,5 @@ diff --git a/uni_modules/uni-list/components/uni-list/uni-list.vue b/uni_modules/uni-list/components/uni-list/uni-list.vue index fc611ef9e1be021ce07d2ccf67acd93f76067901..389178b2b09e45e936e20b7f3aea68b35f6ca5f9 100644 --- a/uni_modules/uni-list/components/uni-list/uni-list.vue +++ b/uni_modules/uni-list/components/uni-list/uni-list.vue @@ -54,7 +54,7 @@ export default { } }; -