diff --git a/.eslintrc.js b/.eslintrc.js index 7c0584a24..178abb26d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -3,7 +3,8 @@ module.exports = { rules: { "no-unused-vars": ["error", { varsIgnorePattern: "Taro" }], // "space-before-function-paren": [1, "always"], - "import/no-named-as-default": 0 + "import/no-named-as-default": 0, + "react/react-in-jsx-scope": 0 }, parser: "babel-eslint", globals: { diff --git a/src/hooks/useLogin.js b/src/hooks/useLogin.js index 88ea42de8..d33893e03 100644 --- a/src/hooks/useLogin.js +++ b/src/hooks/useLogin.js @@ -56,14 +56,15 @@ export default (props = {}) => { const setToken = async (token) => { const { redirect_url } = $instance.router.params S.setAuthToken(token) + setIsLogin(true) + await getUserInfo() // 导购UV统计 entryLaunch.postGuideUV() - setIsLogin(true) - getUserInfo() + entryLaunch.postGuideTask($instance.router) dispatch(fetchUserFavs()) dispatch(updateCount({ shop_type: 'distributor' })) // 获取购物车商品数量 console.log('useLogin setToken redirect_url:', redirect_url, decodeURIComponent(redirect_url)) - if(redirect_url) { + if (redirect_url) { Taro.redirectTo({ url: decodeURIComponent(redirect_url) }) } } diff --git a/src/utils/entryLaunch.js b/src/utils/entryLaunch.js index cb8560493..841ad36a3 100644 --- a/src/utils/entryLaunch.js +++ b/src/utils/entryLaunch.js @@ -379,7 +379,7 @@ class EntryLaunch { return } const { gu, subtask_id, item_id, dtid } = await this.getRouteParams() - if (gu) { + if (gu && S.getAuthToken()) { const [employee_number, shop_code] = gu.split('_') const _params = { employee_number, @@ -391,18 +391,15 @@ class EntryLaunch { } api.wx.taskReportData(_params) - // 关系延续埋点 - if (S.getAuthToken() && employee_number) { - const { userInfo } = store.getState().user - const { user_id } = userInfo - api.wx.interactiveReportData({ - event_id: employee_number, - user_type: 'wechat', - user_id, - event_type: routePath[path], - store_bn: shop_code - }) - } + const { userInfo } = store.getState().user + const { user_id } = userInfo + api.wx.interactiveReportData({ + event_id: employee_number, + user_type: 'wechat', + user_id, + event_type: routePath[path], + store_bn: shop_code + }) } } }