diff --git a/changelog.md b/changelog.md index 00d8412251aa2e48df4fd565c1d54facf9888a12..9056ff7b188cc619931a1d28a45d4e759a978b3e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +## 1.0.41(2021-07-27) +1. 支持vue3.0 +2. 去掉App.vue全局样式,避免与非flex布局的页面样式冲突 ## 1.0.40(2021-07-22) 1. 调整使用正则表达式配置强制登陆功能的写法,解决在小程序端的兼容问题。 2. 新增签到功能(培养用户习惯,提升用户粘性)。支持:每日签到奖励、周期性连续7日签到,奖励翻倍。 diff --git a/common/all-flex.css b/common/all-flex.css deleted file mode 100644 index 59a8df21aa9c3ebed9a23111e91ebe86f5524187..0000000000000000000000000000000000000000 --- a/common/all-flex.css +++ /dev/null @@ -1,15 +0,0 @@ -view, -scroll-view, -text, -image, -switch, -navigator, -icons { - display: flex !important; - box-sizing: border-box; - flex-direction: column; -} - -scroll-view { - -webkit-overflow-scrolling: touch; -} diff --git a/common/appInit.js b/common/appInit.js index da0ae8b0ca4f6778bea041ff482f927b920efb94..cbd76ca869297c61fca8dbc72d3e6ebf24c175df 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -115,7 +115,7 @@ export default async function() { //拦截器封装callFunction let callFunctionOption; uniCloud.addInterceptor('callFunction', { - async invoke(option) { + async invoke(option) { // #ifdef APP-PLUS // 判断如果是执行登陆(无论是哪种登陆方式),就记录用户的相关设备id if (option.name == 'uni-id-cf' && (option.data.action == 'register' || option.data.action.slice(0, 5) == 'login')) { @@ -303,7 +303,6 @@ export default async function() { list.forEach(item => { //用遍历的方式分别为,uni.navigateTo,uni.redirectTo,uni.reLaunch,uni.switchTab这4个路由方法添加拦截器 uni.addInterceptor(item, { invoke(e) { // 调用前拦截 - // console.log(e); //获取用户的token const token = uni.getStorageSync('uni_id_token'), //token是否已失效 diff --git a/components/uni-agreements/uni-agreements.vue b/components/uni-agreements/uni-agreements.vue index e222237fae8b2cfbfaed630014190fabe4e3131d..941fefecf5a303ef5b8106a15ee7669e87b3b689 100644 --- a/components/uni-agreements/uni-agreements.vue +++ b/components/uni-agreements/uni-agreements.vue @@ -44,8 +44,14 @@ } - + diff --git a/components/uni-send-sms-code/uni-send-sms-code.vue b/components/uni-send-sms-code/uni-send-sms-code.vue index ed0028e1a8c5596a8e36dfcb04ee819d8fe90d82..ac40d523c46f58109eab6573c93dc511c7bda654 100644 --- a/components/uni-send-sms-code/uni-send-sms-code.vue +++ b/components/uni-send-sms-code/uni-send-sms-code.vue @@ -74,33 +74,33 @@ title: '手机号格式错误', icon: 'none' }); - uniCloud.callFunction({ - name:'uni-id-cf', - data:{ - action:'sendSmsCode', - params:{ - "mobile": this.phone, - "type": this.codeType - }, - }, - success: ({result}) => { - console.log(result); + uniCloud.callFunction({ + name:'uni-id-cf', + data:{ + action:'sendSmsCode', + params:{ + "mobile": this.phone, + "type": this.codeType + }, + }, + success: ({result}) => { + console.log(result); if(result.code===0){ - uni.showToast({ - title: "短信验证码发送成功", - icon: 'none' - }); - this.reverseNumber = Number(this.count); - this.getCode(); + uni.showToast({ + title: "短信验证码发送成功", + icon: 'none' + }); + this.reverseNumber = Number(this.count); + this.getCode(); this.$emit('getCode'); }else{ uni.showModal({ content: result.msg, showCancel: false }); - } - } - }) + } + } + }) }, getCode() { if (this.reverseNumber == 0) { @@ -118,7 +118,13 @@ \ No newline at end of file + + + diff --git a/pages/ucenter/login-page/common/login-page.css b/pages/ucenter/login-page/common/login-page.css index ae2371294eb551c061b93f07f6b2d1d63151b0f3..d30c21c562bcdadbc2ace0e5b49b361135e8f0bb 100644 --- a/pages/ucenter/login-page/common/login-page.css +++ b/pages/ucenter/login-page/common/login-page.css @@ -1,54 +1,61 @@ -@import '@/common/all-flex.css'; - - .content { - padding: 0 50rpx; - width: 750rpx; - flex: 1; - } - - .input-box { - padding: 0 15px; - margin-bottom: 10px; - background-color: #F8F8F8; - border-radius: 6px; - font-size: 28rpx; - } - - .get-code { - margin: 0; - margin-top: 15px; - background-color: #007aff; - color: #FFFFFF; - } - - .input-box, - .get-code { - height: 45px; - line-height: 45px; - } - - .title { - text-align: center; - padding-bottom: 5px; - } - - .tip { - color: #666666; - font-size: 26rpx; - margin: 6px 0; - } - - .easyinput { - background-color: #F8F8F8; - border-radius: 6rpx; - } - - .send-btn { - width: 100%; - margin-top: 15px; - border-radius: 6rpx; - } - - .link { - color: #04498c; - } +/* #ifndef APP-NVUE */ +view { + display: flex; + box-sizing: border-box; + flex-direction: column; +} + +/* #endif */ + +.content { + padding: 0 50rpx; + width: 750rpx; + flex: 1; +} + +.input-box { + padding: 0 15px; + margin-bottom: 10px; + background-color: #F8F8F8; + border-radius: 6px; + font-size: 28rpx; +} + +.get-code { + margin: 0; + margin-top: 15px; + background-color: #007aff; + color: #FFFFFF; +} + +.input-box, +.get-code { + height: 45px; + line-height: 45px; +} + +.title { + text-align: center; + padding-bottom: 5px; +} + +.tip { + color: #666666; + font-size: 26rpx; + margin: 6px 0; +} + +.easyinput { + background-color: #F8F8F8; + border-radius: 6rpx; +} + +.send-btn { + width: 100%; + margin-top: 15px; + border-radius: 6rpx; +} + +.link { + color: #04498c; +} diff --git a/pages/ucenter/login-page/index/index.vue b/pages/ucenter/login-page/index/index.vue index e2d30b61c074688049128c0906977c803ed510c1..cdc2fee4c6e5c7ddcc51e983ec73b4652845c481 100644 --- a/pages/ucenter/login-page/index/index.vue +++ b/pages/ucenter/login-page/index/index.vue @@ -109,7 +109,13 @@ + diff --git a/pages/ucenter/login-page/phone-code/phone-code.vue b/pages/ucenter/login-page/phone-code/phone-code.vue index 731e37f8864e0f8626450ef8db3bc39e1aa1cf67..2bb28e1c39ac883240695f89271ed108fca27a8e 100644 --- a/pages/ucenter/login-page/phone-code/phone-code.vue +++ b/pages/ucenter/login-page/phone-code/phone-code.vue @@ -2,11 +2,12 @@ 请输入验证码 - {{tipText}} + {{tipText}} + -