diff --git a/assets/images/scanSvg.txt b/assets/images/scanSvg.txt new file mode 100644 index 0000000..468883f --- /dev/null +++ b/assets/images/scanSvg.txt @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index/user.js b/index/user.js index 9247488..43ccf0c 100644 --- a/index/user.js +++ b/index/user.js @@ -109,7 +109,7 @@ Page({ }).then(res => { return }).catch(err => { - wx.setStorageSync('ifSetUserInfo', 1) + wx.setStorageSync('ifSetUserInfo', 1) //手机号未授权 wx.navigateTo({ url: `/pages/getphoneInfo/index?mineFlag=mine`, }) @@ -242,8 +242,9 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { - const ifSetUserInfo = wx.getStorageSync('ifSetUserInfo') || 0 - if (ifSetUserInfo) { + const ifSetUserInfo = wx.getStorageSync('ifSetUserInfo') || 2 + // 手机号未授权 + if (ifSetUserInfo == 1) { wx.showModal({ title: '完善个人信息', content: '完善个人信息后可获得积分哦', @@ -258,7 +259,7 @@ Page({ } if (res.confirm) { - wx.setStorageSync('ifSetUserInfo', 0) + wx.setStorageSync('ifSetUserInfo', 2) // 已完成手机号授权 wx.navigateTo({ url: '/pages3/setUserInfo/index', }) diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 30fe36f..ed43fa6 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -247,7 +247,8 @@ Page({ url: '/pages3/setUserInfo/index', }) } else { - if (options.mineFlag == "mine") { + const ifSetUserInfo = wx.getStorageSync('ifSetUserInfo') || 0 + if (ifSetUserInfo) { wx.switchTab({ url: '/index/user' }); diff --git a/pages/getphoneInfo/index.wxss b/pages/getphoneInfo/index.wxss index 8493d60..2442b8f 100755 --- a/pages/getphoneInfo/index.wxss +++ b/pages/getphoneInfo/index.wxss @@ -1,6 +1,7 @@ -page{ +page { background: #fbfbfb; } + .login-body { padding-top: 200rpx; display: flex; @@ -8,9 +9,11 @@ page{ align-items: center; justify-content: center; } -.backHome{ - margin-top: 20rpx!important; + +.backHome { + margin-top: 20rpx !important; } + .login-logo { width: 320rpx; /* height: 320rpx; */ @@ -27,7 +30,8 @@ page{ padding-top: 120rpx; width: 600rpx; } -.active{ + +.active { opacity: .6; } @@ -43,18 +47,22 @@ page{ letter-spacing: 0.75rpx !important; text-align: center; } -.title{ + +.title { margin-top: 30rpx; } -.title text{ + +.title text { display: block; text-align: center; } -.title text:nth-of-type(1){ + +.title text:nth-of-type(1) { font-size: 38rpx; font-weight: bold; } -.title text:nth-of-type(2){ + +.title text:nth-of-type(2) { font-size: 30rpx; margin-top: 25rpx; } \ No newline at end of file