diff --git a/components/vertify/vertify-login.vue b/components/vertify/vertify-login.vue
new file mode 100644
index 0000000..21fccc1
--- /dev/null
+++ b/components/vertify/vertify-login.vue
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ 需先授权微信登录才可正常使用功能,小程序将获取并使用以下信息:
+ 1.微信昵称
+ 2.微信头像
+
+
+ 拒绝授权
+
+ 确认授权
+
+
+
+
+
+
+
+
+
diff --git a/components/vertify/vertify-phone.vue b/components/vertify/vertify-phone.vue
new file mode 100644
index 0000000..3b24181
--- /dev/null
+++ b/components/vertify/vertify-phone.vue
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+ 授予小程序绑定微信手机号码的权限
+
+
+ 拒绝授权
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/main.js b/main.js
index 21c87c2..bc1cfa9 100644
--- a/main.js
+++ b/main.js
@@ -7,10 +7,14 @@ import Data from './common/js/data.js';
import globalFun from './common/js/glogalFun.js';
import validate from './common/js/validate.js';
import request from './common/js/request.js';
-import globalData from './common/js/globalData.js';
+import globalData from './common/js/globalData.js';
+import vertifyLogin from '@/components/vertify/vertify-login.vue';
+import vertifyPhone from '@/components/vertify/vertify-phone.vue';
Vue.component('cu-custom', CuCustom)
Vue.component('confirm-modal', ConfirmModal);
+Vue.component('vertify-login', vertifyLogin);
+Vue.component('vertify-phone', vertifyPhone);
const data = type => {
//模拟异步请求数据
diff --git a/pages/index/home.vue b/pages/index/home.vue
index bcd3eb5..0ceb7a5 100644
--- a/pages/index/home.vue
+++ b/pages/index/home.vue
@@ -79,38 +79,10 @@
-
-
-
-
-
- 需先授权微信登录才可正常使用功能,小程序将获取并使用以下信息:
- 1.微信昵称
- 2.微信头像
-
-
- 拒绝授权
-
- 确认授权
-
-
-
-
-
-
-
- 授予小程序绑定微信手机号码的权限
-
-
- 拒绝授权
-
-
-
-
-
-
-
+
+
+
+
@@ -133,8 +105,6 @@
hotGoods: [],
discountGoods: {},
InputBottom: 0,
- isAuthWxLoginModal: false,
- isAuthWxPhoneModal: false,
searchInfo: {},
areaList: [],
areaMultiIndex: [0, 0, 0],
@@ -155,17 +125,9 @@
mask: true,
title: '加载中'
})
- // 更新缓存中的userInfo
- let res = await this.$request.storageExistUser();
- // 获取缓存中的userInfo
- let curUserInfo = this.$request.getCurUserInfo();
- this.isAuthWxLoginModal = curUserInfo && curUserInfo.openId ? false : true;
- if (this.isAuthWxLoginModal) {
- return;
- }
- this.isAuthWxPhoneModal = !curUserInfo.phone ? true : false;
- if (this.isAuthWxPhoneModal) {
- return;
+ let loginRes = this.authLogin();
+ if (!loginRes) {
+ return;
}
uni.hideLoading();
@@ -187,6 +149,27 @@
this.moduleBarInfos = await this.$api.data('moduleBarInfos');
// this.hotGoods = await this.$api.data('hotGoods');
// this.discountGoods = await this.$api.data('discountGoods');
+ },
+ async authLogin() {
+ // 更新缓存中的userInfo
+ let res = await this.$request.storageExistUser();
+ // 获取缓存中的userInfo
+ let curUserInfo = this.$request.getCurUserInfo();
+ // 校验提示登录
+ if (!curUserInfo || !curUserInfo.openId) {
+ this.$refs.vertifyLogin.showModal();
+ return false;
+ } else {
+ this.$refs.vertifyLogin.hideModal();
+ }
+ // 校验提示获取手机号码
+ if (!curUserInfo.phone) {
+ this.$refs.vertifyPhone.showModal();
+ return false;
+ } else {
+ this.$refs.vertifyPhone.hideModal();
+ }
+ return true;
},
bindEvent() {
uni.$on('index_showProductDetail', this.showDetails);
@@ -306,20 +289,6 @@
uni.navigateTo({
url: '/pages/product/product-category'
})
- },
- authWxLogin() {
- this.$request.login().then(res => {
- if (res) {
- this.loadData();
- }
- })
- },
- getPhoneNumber(e) {
- this.$request.storagePhoneIntoUserInfo(e.detail.code).then(res => {
- if (res) {
- this.loadData();
- }
- })
}
}
}