feats

config/dev.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://81.69.196.8:8822"',
+    HOST: '"https://sgl-v2.njyunzhi.com"',
   },
   mini: {},
   h5: {}

config/prod.js

@@ -3,6 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
+    HOST: '"https://sgl-v2.njyunzhi.com"',
   },
   mini: {},
   h5: {

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "./dist",
   "projectname": "miniapp",
   "description": "十公里",
-  "appid": "wxe44244d1a5ea3364",
+  "appid": "wx06a7372d48d56843",
   "setting": {
     "urlCheck": true,
     "es6": false,

src/app.js

@@ -1,26 +1,33 @@
 import { Component } from 'react'
 import Taro from '@tarojs/taro'
+import preFetchData from '@/utils/preFetchData'
 import store, { StoreRoot } from './store'
 import './app.less'
 
 class App extends Component {
 
   onLaunch(options) {
-    // 预拉取数据
-    Taro.getBackgroundFetchData({
-      fetchType: 'pre',
-      success(res) {
-        console.log(res.fetchedData)
-      }
-    })
+    const [,, setPerson, login] = store.getModel('person').getState()
 
+    // 预拉取数据
+    preFetchData().then((fetchData) => {
+      setPerson({
+        personId: fetchData.personId,
+        openid: fetchData.openid,
+      })
 
-    Taro.login({
-      success: (res) => {
-        const { code } = res;
-        const [_, login] = store.getModel('person').getState()
-        login({ code })
-      }
+      // 登录获取人员信息
+      Taro.login({
+        success: (res) => {
+          const { code } = res;
+          login({ code })
+        }
+      })
+    }).catch(() => {
+      Taro.showToast({
+        title: '网络异常, 请退出重试',
+        icon: 'none',
+      })
     })
   }
 

src/services/person.js

@@ -1,3 +1,3 @@
 import request from '@/utils/request'
 
-export const login = (params) => request('/login', { params })
+export const login = (params) => request('/login', { params, method: 'post' })

src/store/models/person.js

@@ -1,15 +1,19 @@
 import { useState } from "react"
+import Taro from '@tarojs/taro'
 import { login } from '@/services/person'
 
 export default () => {
-  const [person, setPerson] = useState({ personId: 123 })
+  const [person, setPerson] = useState()
+  const [peronRoles, setPersonRoles] = useState([])
 
   const personLogin = (params) => {
-    console.log('-------personLogin---->', params)
     login(params).then((res) => {
-      setPerson(res)
+      const { person : taPerson, personRoleList, sessionKey } = res;
+      setPerson(taPerson);
+      setPersonRoles(personRoleList);
+      Taro.setStorage({ key: 'sessionKey', data: sessionKey })
     })
   }
 
-  return [person, personLogin]
+  return [person, peronRoles, setPerson, personLogin]
 }

src/utils/hooks/useRouter.js

@@ -0,0 +1,20 @@
+import Taro, { useRouter } from '@tarojs/taro'
+import { parseQueryString } from '@/utils'
+
+export default () => {
+  const router = useRouter()
+
+  // 扫码进入的
+  if (router?.params?.scene) {
+    const qrCodeStr = Taro.getStorageSync('qrcode')
+    if (qrCodeStr && qrCodeStr !== 'undefined') {
+      const qrParams = parseQueryString(qrCodeStr) || {}
+      router.params = {
+        ...router.params || {},
+        ...qrParams,
+      }
+    }
+  }
+
+  return router
+}

src/utils/index.js

@@ -0,0 +1,22 @@
+
+export function parseQueryString(queryStr) {
+  if (!queryStr) {
+    return;
+  }
+
+  const params = queryStr.split('&').reduce((acc, str) => {
+    if (!str) return acc;
+
+    const kv = str.split('=')
+    if (kv.length !== 2) return acc;
+
+    const key = decodeURIComponent(kv[0])
+    const val = decodeURIComponent(kv[1])
+
+    return {
+      ...acc,
+      [key]: val,
+    }
+  }, {});
+  return params;
+}

src/utils/preFetchData.js

@@ -0,0 +1,28 @@
+import Taro from '@tarojs/taro'
+
+export default () => {
+  return new Promise((resolve, reject) => {
+    Taro.getBackgroundFetchData({
+      fetchType: 'pre',
+      success(res) {
+        const { code, message, data } = JSON.parse(res.fetchedData) || {}
+        if (code === 1000) {
+          const { token, sessionKey, qrcode, ...otherData } = data
+
+          Taro.setStorage({ key: 'token', data: token })
+          Taro.setStorage({ key: 'sessionKey', data: sessionKey })
+          Taro.setStorage({ key: 'qrcode', data: qrcode })
+
+          resolve(otherData)
+        } else {
+          console.error(message)
+          reject(message)
+        }
+      },
+      fail: (e) => {
+        console.error(e)
+        reject(e.errMsg || e.message)
+      }
+    })
+  })
+}

src/utils/request.js

@@ -22,8 +22,8 @@ export default (url, options) => {
   const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
   const nwUrl = `${HOST}/api/wx${urlWithParams}`
 
-  const token = Taro.getStorageSync('token')
-  const tokenHeader = token ? { 'X-Authorization-JWT': token } : {}
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
   const nwHeader = {
     ...(header || {}),
     ...tokenHeader,