feats

config/prod.js

@@ -10,7 +10,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.28-20210808"'
+    Version: '"V0.0.30-20210808"'
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "miniapp",
 	"description": "",
-	"appid": "wxe44244d1a5ea3364",
+	"appid": "wxc96058d57e77f373",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/components/Auth/AuthPage/index.jsx

@@ -9,32 +9,26 @@ import './index.scss'
 export default (props) => {
 
   const [loading, setLoading] = useState(false)
-  const { updateUserInfo } = useAuth()
+  const { updatePhoneNumber } = useAuth()
   
-  const handleGetUserInfo = () => {
-    Taro.getUserProfile({
-      lang: 'zh_CN',
-      desc: '用于完成平台注册',
-      success: (res) => {
-        const { errMsg, ...data } = res || {}
-        if (errMsg === 'getUserProfile:ok') {
-          setLoading(true)
-          updateUserInfo(data).then(() => {
-            setLoading(false)
-          }).catch((err) => {
-            console.error(err)
-            setLoading(false)
-          })
-        } else {
-          console.error(errMsg);
-          Taro.showToast({
-            title: '授权头像失败',
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      }
-    })
+  const handlePhoneNumber = (detail) => {
+    const { errMsg, ...data } = detail || {}
+    if (errMsg === 'getPhoneNumber:ok') {
+      setLoading(true)
+      updatePhoneNumber(data).then(() => {
+        setLoading(false)
+      }).catch((err) => {
+        console.error(err)
+        setLoading(false)
+      })
+    } else {
+      console.error(errMsg);
+      Taro.showToast({
+        title: '授权手机失败',
+        icon: 'none',
+        duration: 2000
+      })
+    }
   }
 
   return (
@@ -43,7 +37,7 @@ export default (props) => {
         <Image mode='aspectFit' className='centerLabel' src={require('@/assets/logo.png')} />
       </View>
       <View className='LoginBtn'>
-        <button loading={loading} onClick={handleGetUserInfo}>微信登录</button>
+        <button loading={loading} openType='getPhoneNumber' onGetPhoneNumber={handlePhoneNumber}>微信登录</button>
       </View>
       <View className='flex-item'></View>
       <View className='Bottom'>

src/layout/useAuth.js

@@ -27,7 +27,7 @@ export default function useAuth(person, page) {
 
       // 如果需要授权头像
       if (page.auth.indexOf('page') > -1) {
-        if (person.inited && (!person.avatarurl || person.avatarurl.indexOf('default_avatar') > -1)) {
+        if (person.inited && !person.phone) {
           setAuthPage(true)
         } else {
           setAuthPage(false)

src/routes.js

@@ -171,7 +171,7 @@ const routes = [
     page: 'pages/index/activityList/index',
     pkg: 'main',
     type: 'activity',
-    auth: ['phone', 'avatar'],
+    // auth: ['phone', 'avatar'],
   },
   {
     name: '活动详情',
@@ -256,7 +256,7 @@ const routes = [
     page: 'pages/mine/myRecommendCode/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '房贷计算器',
@@ -276,14 +276,14 @@ const routes = [
     page: 'pages/mine/toBeManager/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '成为经纪人',
     page: 'pages/mine/toBeAgent/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '我的分享',
@@ -296,7 +296,7 @@ const routes = [
     page: 'pages/mine/myCourse/index',
     pkg: 'main',
     type: 'curriculum',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '我的活动',
@@ -309,14 +309,14 @@ const routes = [
     page: 'pages/mine/myCustomer/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '客户详情',
     page: 'pages/mine/myCustomerDetail/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '我的收藏',
@@ -329,63 +329,63 @@ const routes = [
     page: 'pages/channel/partnerChannel/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '添加客户',
     page: 'pages/mine/addCustomer/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '驻场管理',
     page: 'pages/marketing/residentManager/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '确认到访',
     page: 'pages/marketing/sureVisit/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '变更交易节点',
     page: 'pages/marketing/changeVisit/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '盘客工具',
     page: 'pages/consultant/statCustomer/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '客户信息',
     page: 'pages/mine/customerDetail/index',
     pkg: 'main',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '客户分析',
     page: 'pages/consultant/customerAnalyse/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '个人主页',
     page: 'pages/consultant/myHomepage/index',
     pkg: 'subpackages',
     type: 'mine',
-    auth: ['phone'],
+    // auth: ['phone'],
   },
   {
     name: '意见反馈',