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
+
+
+
+
+ {{about.appName}}
+ Version {{version}}
+
+
+ 扫描二维码,您的朋友也可以下载{{about.appName}}客户端
+
+
+
+ 《{{agreement.title}}》
+ 和
+
+ Copyright © {{year}}
+ {{about.company}}
+
+
+
+
+
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}}
+
-
+
@@ -37,8 +38,8 @@
onLoad({phoneNumber,phoneArea}) {
this.phone = phoneNumber;
},
- onReady() {
- this.$refs.sendSmsCode.start();
+ onReady() {
+ this.$refs.sendSmsCode.start();
},
methods: {
submit(){ //完成并提交
diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index 5dc8f52868d4011460748e095844da904cb3cac4..c5c5022321fc96befcb228db11f22d18c5594d24 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -240,7 +240,6 @@
border: none;
border-radius: 0;
}
-
/* #endif */
.content {
/* #ifndef APP-NVUE */
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index affc5adafc9e007e4fba28cf75e857288e27f7e2..f6114a7ed6894c88c6e8c386b14d95e73ed29a2a 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -1,7 +1,7 @@
-
+
@@ -60,8 +60,7 @@
}
],
ucenterList: [
- [
- {
+ [{
"title": '签到有奖',
"event": 'signIn',
"icon": "compose"
@@ -85,7 +84,7 @@
"icon": "paperplane"
}
// #ifdef APP-PLUS
- ,{
+ , {
"title": '分销推荐',
"event": 'share',
"icon": "redo"
@@ -155,7 +154,7 @@
url: "/pages/ucenter/settings/settings"
})
},
- signIn(){ //签到
+ signIn() { //签到
this.$refs.signIn.open()
},
/**
@@ -233,7 +232,9 @@
})
},
async share() {
- let {result} = await uniCloud.callFunction({
+ let {
+ result
+ } = await uniCloud.callFunction({
name: 'uni-id-cf',
data: {
action: 'getUserInviteCode'
@@ -256,7 +257,8 @@
`/#/pages/ucenter/invite/invite?code=uniInvitationCode:${myInviteCode}`,
title: appName,
summary: slogan,
- imageUrl: logo + '?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决,在ios端分享图过大导致的图片失效问题
+ imageUrl: logo +
+ '?x-oss-process=image/resize,m_fill,h_100,w_100' //压缩图片解决,在ios端分享图过大导致的图片失效问题
},
menus: [{
"img": "/static/app-plus/sharemenu/wechatfriend.png",
@@ -310,8 +312,13 @@
+
diff --git a/pages/ucenter/userinfo/userinfo.vue b/pages/ucenter/userinfo/userinfo.vue
index 2f1f2fbe45561a5436c5e86d97bc5c6b1900db6c..ee1684aa5952a406734d4bce580c5c076ec92123 100644
--- a/pages/ucenter/userinfo/userinfo.vue
+++ b/pages/ucenter/userinfo/userinfo.vue
@@ -1,13 +1,13 @@
-
-
-
- 头像
-
-
+
+
+
+ 头像
+
+
@@ -266,7 +266,13 @@
}
+
\ No newline at end of file
diff --git a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
index 71cac440d63dfaa4ab95fb2574d53592f9f8a397..e7636c2f4aa4f2abda473b09973b40d39714bcaa 100644
--- a/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
+++ b/uni_modules/uni-id-cf/uniCloud/cloudfunctions/uni-id-cf/index.js
@@ -248,11 +248,11 @@ exports.main = async (event, context) => {
break;
case 'sendSmsCode':
/* -开始- 测试期间,为节约资源。统一虚拟短信验证码为: 123456;开启以下代码块即可 */
- // return uniID.setVerifyCode({
- // mobile: params.mobile,
- // code: '123456',
- // type: params.type
- // })
+ return uniID.setVerifyCode({
+ mobile: params.mobile,
+ code: '123456',
+ type: params.type
+ })
/* -结束- */
// 简单限制一下客户端调用频率
diff --git a/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue b/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
index 9e739c2980a39e004af3c2fde3a11b43888d0a53..19f9c3b93b7f0f2d832525fcb74f5eab05261826 100644
--- a/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
+++ b/uni_modules/uni-sign-in/components/uni-sign-in/uni-sign-in.vue
@@ -188,7 +188,7 @@
border-radius: 100px;
height: 50rpx;
line-height: 50rpx;
- justify-content: center;
+ text-align: center;
width: 50rpx;
margin-bottom: 6rpx;
}
diff --git a/uni_modules_tools/config.js b/uni_modules_tools/config.js
index cb5d3f98c0797a39d15fa6e812fb12876e0451db..4f1203ef35d587c53490d47fa26daf538f57275d 100644
--- a/uni_modules_tools/config.js
+++ b/uni_modules_tools/config.js
@@ -4,7 +4,9 @@
"appid": "请点击重新获取" ,//清空appid
"mp-weixin" : {
"appid" : ""
- }
+ },
+ "_spaceID" : "",
+ "vueVersion" : "2"
},
"/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json": {
"tokenExpiresIn": 7200,
diff --git a/uni_modules_tools/copy/manifest.json b/uni_modules_tools/copy/manifest.json
index 690f7a60b53ddf243711c1002f7a25903ef6edda..a3af0d3e16a7a6f354c5b6a5f32713f6be7cfba8 100644
--- a/uni_modules_tools/copy/manifest.json
+++ b/uni_modules_tools/copy/manifest.json
@@ -115,5 +115,6 @@
"h5" : {
"template" : ""
},
- "_spaceID" : "76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e"
+ "_spaceID" : "76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e",
+ "vueVersion" : "2"
}
diff --git a/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
index 2b057edab623675f149d89b32631392dab546572..1d308ea6f8a860fd5629f104e78464e860fd456c 100644
--- a/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
+++ b/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
@@ -44,9 +44,9 @@
"smsSecret": "短信密钥secret,开通短信服务处可以看到"
},
"univerify": {
- "appid": "__UNI__03B096E",
- "apiKey": "3fc28519d90d74173bcecf2daf4ffcc4",
- "apiSecret": "dd793e5bc4b372ce932f35bbb4c5d61b"
+ "appid": "当前应用的appid,使用云函数URL化,此项必须配置",
+ "apiKey": "apiKey 和 apiSecret 在开发者中心获取,开发者中心:https://dev.dcloud.net.cn/uniLogin/index?type=0,文档:https://ask.dcloud.net.cn/article/37965",
+ "apiSecret": ""
}
}
}