张延森 4 years ago
parent
commit
f98ec8c447
4 changed files with 6 additions and 5 deletions
  1. 2
    2
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 2
    2
      src/app.js
  4. 1
    0
      src/components/GetUserIcon/index.jsx

+ 2
- 2
config/dev.js View File

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://a.t.njyunzhi.com"'
7
-    // HOST: '"http://127.0.0.1:6060"'
6
+    // HOST: '"https://xs.ycjcjy.com"'
7
+    HOST: '"http://127.0.0.1:6060"'
8
   },
8
   },
9
   mini: {
9
   mini: {
10
     debugReact: true
10
     debugReact: true

+ 1
- 1
config/prod.js View File

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"https://a.t.njyunzhi.com"'
6
+    HOST: '"https://xs.ycjcjy.com"'
7
   },
7
   },
8
   mini: {},
8
   mini: {},
9
   h5: {
9
   h5: {

+ 2
- 2
src/app.js View File

38
     // 如果是分享或者扫码
38
     // 如果是分享或者扫码
39
     // scene 与其它参数时互斥的. 有 scene 说明时扫码进来的
39
     // scene 与其它参数时互斥的. 有 scene 说明时扫码进来的
40
     const params = router.params || {}
40
     const params = router.params || {}
41
-    const { from = '', recommender = '', scene = '' } = params
41
+    const { from = '', recommender = '', scene = '', mpOpenId = '' } = params
42
     setAppParams({...params})
42
     setAppParams({...params})
43
 
43
 
44
     // 登录
44
     // 登录
45
     Taro.login({
45
     Taro.login({
46
       success: res => {
46
       success: res => {
47
         if (res.errMsg === 'login:ok') {
47
         if (res.errMsg === 'login:ok') {
48
-          request({ ...apis.login, params: { code: res.code, from, recommender, scene } }).then(x => {
48
+          request({ ...apis.login, params: { code: res.code, from, recommender, scene, mpOpenId } }).then(x => {
49
             setUser({...x.person, ShowIndexAdv: false, FirstComing: true})
49
             setUser({...x.person, ShowIndexAdv: false, FirstComing: true})
50
             Taro.setStorage({ key: 'token', data: x.token })
50
             Taro.setStorage({ key: 'token', data: x.token })
51
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
51
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })

+ 1
- 0
src/components/GetUserIcon/index.jsx View File

12
   const { user, setUser } = useModel('user')
12
   const { user, setUser } = useModel('user')
13
 
13
 
14
   const ToGetUserIcon = (e) => { // 授权用户头像
14
   const ToGetUserIcon = (e) => { // 授权用户头像
15
+    console.log('------->', e)
15
     const { errMsg, ...data } = e.detail
16
     const { errMsg, ...data } = e.detail
16
     if (errMsg === 'getUserInfo:ok') {
17
     if (errMsg === 'getUserInfo:ok') {
17
       request({
18
       request({