new feats

src/app.js

@@ -164,6 +164,10 @@ class App extends Component {
         console.info('router2:', router)
         console.info('-----------')
         const { query: payload } = router
+
+        payload.path = router.path
+        payload.scene = router.scene
+
         // login
         login(payload, res => {
           // 获取未读消息
@@ -209,8 +213,8 @@ class App extends Component {
   componentDidMount() {
     console.info('app componentDidMount')
   }
-  componentWillMount() {
-    console.info('app componentWillMount')
+  componentWillMount(params) {
+    console.info('app componentWillMount', params)
   }
 
   getRouterParams() {

src/pages/card/index.js

@@ -8,6 +8,7 @@ import BackHomeBtn from '@components/BackHomeBtn'
 import getUserPhone from '@utils/getUserPhone'
 import AchievePhone from '@components/achievePhone'
 import ready from '@utils/ready'
+import { sceneInShare } from '@utils/tools'
 
 import { ROLE_CODE } from '@constants/user'
 import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
@@ -42,12 +43,27 @@ export default class Index extends Component {
 
   componentWillMount() {
     ready.queue(() => {
+
+      // 分享场景需要先授权手机, 再授权头像
+      const options = wx.getLaunchOptionsSync()
+      if (sceneInShare(options.scene)) {
+        const { person = {} } = this.props.userInfo || {}
+        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+          Taro.reLaunch({ url: '/pages/auth/index' })
+          return
+        }
+
+        this.setState({
+          grantPhoneVisible: true,
+        })
+      }
+
       this.initPageData()
     })
   }
   initPageData() {
     const router = Taro.getStorageSync('router')
-    const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
+    const id = this.$router.params.id || router.query.id
 
     if (router.query.id) {
       this.setState({
@@ -402,6 +418,17 @@ export default class Index extends Component {
       modalStatus: false
     })
   }
+  
+  handleAuthPhoneSuccess = () => {
+    const { person = {} } = this.props.userInfo || {}
+    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+      Taro.reLaunch({ url: '/pages/auth/index' })
+      return
+    }
+
+    this.initPageData()
+  }
+
   render() {
     const { makePosterStatus, posterData, modalStatus, grantPhoneVisible } = this.state
     const { userInfo, cardInfo, projectDetail } = this.props
@@ -423,7 +450,7 @@ export default class Index extends Component {
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
         {
           (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           visibleConfirmModal && (

src/pages/project/detail/index.js

@@ -21,7 +21,7 @@ import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 按需加载
 import ready from '@utils/ready'
 import Notice from '@components/Notice'
-import { getDownloadURL, getThumbnail } from '@utils/tools'
+import { getDownloadURL, getThumbnail, sceneInShare } from '@utils/tools'
 import { connect } from '@tarojs/redux'
 import { dispatchProjectDetail } from '@actions/project'
 import getUserPhone from '@utils/getUserPhone'
@@ -62,9 +62,22 @@ export default class Index extends Component {
   }
 
   componentWillMount() {
-    // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
-
     ready.queue(() => {
+    
+      // 分享场景需要先授权手机, 再授权头像
+      const options = wx.getLaunchOptionsSync()
+      if (sceneInShare(options.scene)) {
+        const { person = {} } = this.props.userInfo || {}
+        if ((person.tel || person.phone) && (person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+          Taro.reLaunch({ url: '/pages/auth/index' })
+          return
+        }
+
+        this.setState({
+          grantPhoneVisible: true,
+        })
+      }
+
       this.initPageData()
     })
   }
@@ -102,16 +115,6 @@ export default class Index extends Component {
       })
     })
   }
-  componentDidMount() {
-    const options = wx.getLaunchOptionsSync()
-    const sceneList = [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048]
-
-    if (sceneList.indexOf(options.scene) != -1) {
-      this.setState({
-        grantPhoneVisible: true,
-      })
-    }
-  }
 
   loadHelpGroupList() {
     const { buildingId } = this.state
@@ -488,6 +491,16 @@ export default class Index extends Component {
     })
   }
 
+  handleAuthPhoneSuccess = () => {
+    const { person = {} } = this.props.userInfo || {}
+    if ((person.avatarurl || '').indexOf('wx.qlogo.cn') === -1) {
+      Taro.reLaunch({ url: '/pages/auth/index' })
+      return
+    }
+
+    this.initPageData()
+  }
+
   renderBottomMenu() {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
@@ -1045,7 +1058,7 @@ export default class Index extends Component {
       <Block>
         {
           (grantPhoneVisible && userInfo.person.personId && !userInfo.person.phone) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.initPageData}></AchievePhone>
+          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
         }
         {
           loaded && (

src/utils/login.js

@@ -2,9 +2,12 @@ import Taro from '@tarojs/taro';
 import { getStore } from '@tarojs/redux'
 import { USER_INFO } from '@constants/user'
 import { wxLogin } from '@services/login'
+import { sceneInShare } from '@utils/tools'
 import ready from '@utils/ready'
 let loading = false
-export default function (params, callback) {
+export default function (payload, callback) {
+  const { path, scene, ...params } = payload
+
   if (loading) {
     return
   }
@@ -34,9 +37,19 @@ export default function (params, callback) {
           callback && callback(data)
 
         } else {
-          Taro.reLaunch({
-            url: '/pages/auth/index'
-          })
+
+          // 非扫码进入项目详情或者卡片主页, 跳转到授权头像
+          // 否则不跳
+          const noAuthPages = [
+            'pages/project/detail/index',
+            'pages/card/index',
+          ]
+
+          if (noAuthPages.indexOf(path) === -1 || !sceneInShare(scene)) {
+            Taro.reLaunch({
+              url: '/pages/auth/index'
+            })
+          }
         }
         ready.open()
 

src/utils/tools.js

@@ -1,5 +1,17 @@
 import Taro from '@tarojs/taro';
 
+/**
+ * 是否分享场景(含扫码)
+ * @param {*} scene 
+ */
+export function sceneInShare(scene) {
+  return [1011, 1012, 1013, 1031, 1032, 1036, 1047, 1048].indexOf(scene) > -1
+}
+
+/**
+ * 造空数组
+ * @param {int}} n 
+ */
 export function times(n) {
   return n > 0 ? '*'.repeat(n - 1).split('*') : []
 }