chore: remove debug code and restore phone authorization as required
- Remove debug register page entry and console.log from login - Remove phone skip option, phone authorization is mandatory - Restore incomplete registration check (no phone → redirect to register)
这个提交包含在:
@@ -16,8 +16,7 @@ Page({
|
|||||||
|
|
||||||
app.doLogin().then(function (data) {
|
app.doLogin().then(function (data) {
|
||||||
self.setData({ loading: false })
|
self.setData({ loading: false })
|
||||||
console.log('[login] doLogin result:', JSON.stringify(data))
|
if (data && (data.is_new_user || !data.user_info || !data.user_info.phone)) {
|
||||||
if (data && data.is_new_user) {
|
|
||||||
wx.redirectTo({ url: '/pages/register/register' })
|
wx.redirectTo({ url: '/pages/register/register' })
|
||||||
} else {
|
} else {
|
||||||
wx.switchTab({ url: '/pages/index/index' })
|
wx.switchTab({ url: '/pages/index/index' })
|
||||||
@@ -30,9 +29,5 @@ Page({
|
|||||||
|
|
||||||
onAgreement: function () {
|
onAgreement: function () {
|
||||||
wx.showModal({ title: '提示', content: '用户协议和隐私政策内容建设中', showCancel: false })
|
wx.showModal({ title: '提示', content: '用户协议和隐私政策内容建设中', showCancel: false })
|
||||||
},
|
|
||||||
|
|
||||||
onDebugRegister: function () {
|
|
||||||
wx.navigateTo({ url: '/pages/register/register' })
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -17,8 +17,5 @@
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<view class="agreement" bindtap="onAgreement">登录即表示同意《用户协议》和《隐私政策》</view>
|
<view class="agreement" bindtap="onAgreement">登录即表示同意《用户协议》和《隐私政策》</view>
|
||||||
|
|
||||||
<!-- 临时调试入口,上线前删除 -->
|
|
||||||
<view class="debug-entry" bindtap="onDebugRegister">[ 调试 ] 进入注册页</view>
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -53,11 +53,3 @@
|
|||||||
color: #999999;
|
color: #999999;
|
||||||
margin-top: 32rpx;
|
margin-top: 32rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.debug-entry {
|
|
||||||
text-align: center;
|
|
||||||
font-size: 24rpx;
|
|
||||||
color: #E6508C;
|
|
||||||
margin-top: 40rpx;
|
|
||||||
padding: 16rpx;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -18,8 +18,7 @@ Page({
|
|||||||
loading: false,
|
loading: false,
|
||||||
avatarUrl: DEFAULT_AVATAR,
|
avatarUrl: DEFAULT_AVATAR,
|
||||||
nickname: '',
|
nickname: '',
|
||||||
phone: '',
|
phone: ''
|
||||||
phoneSkipped: false
|
|
||||||
},
|
},
|
||||||
|
|
||||||
onLoad: function () {
|
onLoad: function () {
|
||||||
@@ -48,26 +47,10 @@ Page({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onSkipPhone: function () {
|
|
||||||
var self = this
|
|
||||||
wx.showModal({
|
|
||||||
title: '跳过手机号',
|
|
||||||
content: '跳过后部分功能可能受限,确定跳过吗?',
|
|
||||||
success: function (res) {
|
|
||||||
if (res.confirm) {
|
|
||||||
self.setData({ phoneSkipped: true })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
onGetPhoneNumber: function (e) {
|
onGetPhoneNumber: function (e) {
|
||||||
var self = this
|
var self = this
|
||||||
console.log('[register] getPhoneNumber detail:', JSON.stringify(e.detail))
|
|
||||||
if (!e.detail || !e.detail.code) {
|
if (!e.detail || !e.detail.code) {
|
||||||
var errMsg = (e.detail && e.detail.errMsg) || ''
|
wx.showToast({ title: '需要授权手机号才能完成注册', icon: 'none' })
|
||||||
console.log('[register] getPhoneNumber failed:', errMsg)
|
|
||||||
wx.showToast({ title: '手机号授权未成功,可跳过此步骤', icon: 'none' })
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
self.setData({ loading: true })
|
self.setData({ loading: true })
|
||||||
@@ -113,8 +96,8 @@ Page({
|
|||||||
var nickname = (self.data.nickname || '').trim()
|
var nickname = (self.data.nickname || '').trim()
|
||||||
var avatarUrl = self.data.avatarUrl
|
var avatarUrl = self.data.avatarUrl
|
||||||
|
|
||||||
if (!self.data.phone && !self.data.phoneSkipped) {
|
if (!self.data.phone) {
|
||||||
wx.showToast({ title: '请先授权手机号,或点击跳过', icon: 'none' })
|
wx.showToast({ title: '请先授权手机号', icon: 'none' })
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,19 +26,11 @@
|
|||||||
<text class="phone-text">{{phone}}</text>
|
<text class="phone-text">{{phone}}</text>
|
||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
<block wx:elif="{{phoneSkipped}}">
|
|
||||||
<view class="phone-done phone-skipped">
|
|
||||||
<text class="phone-text">已跳过,可稍后在设置中授权</text>
|
|
||||||
</view>
|
|
||||||
</block>
|
|
||||||
<block wx:else>
|
<block wx:else>
|
||||||
<button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber" disabled="{{loading}}">
|
<button class="phone-btn" open-type="getPhoneNumber" bindgetphonenumber="onGetPhoneNumber" disabled="{{loading}}">
|
||||||
授权手机号
|
授权手机号
|
||||||
</button>
|
</button>
|
||||||
<view class="phone-actions">
|
<view class="phone-hint">手机号用于接收服务通知,必须授权</view>
|
||||||
<view class="phone-hint">手机号用于接收服务通知</view>
|
|
||||||
<view class="phone-skip" bindtap="onSkipPhone">跳过</view>
|
|
||||||
</view>
|
|
||||||
</block>
|
</block>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|||||||
@@ -84,27 +84,11 @@
|
|||||||
border: none;
|
border: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.phone-actions {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
margin-top: 12rpx;
|
|
||||||
padding: 0 8rpx;
|
|
||||||
}
|
|
||||||
|
|
||||||
.phone-hint {
|
.phone-hint {
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
}
|
text-align: center;
|
||||||
|
margin-top: 12rpx;
|
||||||
.phone-skip {
|
|
||||||
font-size: 24rpx;
|
|
||||||
color: #E6508C;
|
|
||||||
}
|
|
||||||
|
|
||||||
.phone-skipped {
|
|
||||||
background: #f5f5f5;
|
|
||||||
border-color: #d9d9d9;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.phone-done {
|
.phone-done {
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户