吃个甘蔗嚼一年 3 years ago
parent
commit
9417342218

+ 2
- 1
config/dev.js View File

3
     NODE_ENV: '"development"'
3
     NODE_ENV: '"development"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"http://192.168.89.147:8080"',
6
+    // HOST: '"http://192.168.89.147:8080"',
7
+    HOST: '"https://sgl-v2.njyunzhi.com"',
7
   },
8
   },
8
   mini: {},
9
   mini: {},
9
   h5: {}
10
   h5: {}

+ 1
- 1
config/prod.js View File

3
     NODE_ENV: '"production"'
3
     NODE_ENV: '"production"'
4
   },
4
   },
5
   defineConstants: {
5
   defineConstants: {
6
-    HOST: '"http://192.168.89.147:8080"',
6
+    HOST: '"https://sgl-v2.njyunzhi.com"',
7
   },
7
   },
8
   mini: {},
8
   mini: {},
9
   h5: {
9
   h5: {

+ 1
- 1
src/app.config.js View File

16
     'scope.userLocation': {
16
     'scope.userLocation': {
17
       desc: '您的位置信息将方便您更好的小程序体验'
17
       desc: '您的位置信息将方便您更好的小程序体验'
18
     }
18
     }
19
-  }
19
+  },
20
 }
20
 }

+ 2
- 2
src/components/AuthPage/index.jsx View File

1
 import React, { useState } from 'react'
1
 import React, { useState } from 'react'
2
 import Taro from '@tarojs/taro'
2
 import Taro from '@tarojs/taro'
3
 import { useModel } from '@/store'
3
 import { useModel } from '@/store'
4
-import { Label, RadioGroup } from '@tarojs/components'
4
+import { Label, RadioGroup, Radio } from '@tarojs/components'
5
 import index from '@/assets/icons/login/LOGO.png'
5
 import index from '@/assets/icons/login/LOGO.png'
6
 import './login.less'
6
 import './login.less'
7
 
7
 
40
       <view className='buttom'>
40
       <view className='buttom'>
41
         <Label>
41
         <Label>
42
           <RadioGroup onChange={handleChange}>
42
           <RadioGroup onChange={handleChange}>
43
-            <radio checked={checked} />
43
+            <Radio checked={checked} />
44
           </RadioGroup>
44
           </RadioGroup>
45
           <view>
45
           <view>
46
             我已阅读知晓并同意 <text>《平台用户服务协议》</text>
46
             我已阅读知晓并同意 <text>《平台用户服务协议》</text>

+ 7
- 1
src/components/CustomNav/index.jsx View File

64
     }
64
     }
65
   }
65
   }
66
 
66
 
67
+  const goHome = () => {
68
+    Taro.navigateTo({
69
+      url: '/pages/index/index'
70
+    })
71
+  }
72
+
67
   useEffect(() => {
73
   useEffect(() => {
68
     Taro.setNavigationBarTitle(title)
74
     Taro.setNavigationBarTitle(title)
69
   }, [title])
75
   }, [title])
81
                 <view className='custom-nav-bar-action-part' onClick={handleAction}>
87
                 <view className='custom-nav-bar-action-part' onClick={handleAction}>
82
                   <image src={bgImg ? gobackWhite : gobackBlack} mode='aspectFit' />
88
                   <image src={bgImg ? gobackWhite : gobackBlack} mode='aspectFit' />
83
                 </view>
89
                 </view>
84
-                <view className='custom-nav-bar-action-part'>
90
+                <view className='custom-nav-bar-action-part' onClick={goHome}>
85
                   <image src={bgImg ? homeWhite : homeBlack} mode='aspectFit' />
91
                   <image src={bgImg ? homeWhite : homeBlack} mode='aspectFit' />
86
                 </view>
92
                 </view>
87
               </view>
93
               </view>

+ 1
- 1
src/components/toggleRole/ToggleRole.jsx View File

26
     getRole('shop')
26
     getRole('shop')
27
   }
27
   }
28
   const onClose2 = () => {
28
   const onClose2 = () => {
29
-    console.log('2222222222222222222')
29
+    // console.log('2222222222222222222')
30
   }
30
   }
31
   return (
31
   return (
32
     <Popup show={showCutover} onClose={onClose2}>
32
     <Popup show={showCutover} onClose={onClose2}>

+ 0
- 1
src/pages/index/index.config.js View File

4
   styleIsolation: 'shared',
4
   styleIsolation: 'shared',
5
   usingComponents: {
5
   usingComponents: {
6
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
6
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
7
-    "mp-tabs": "../../../components/tabs/index",
8
     "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
7
     "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
9
     "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
8
     "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
10
     "mp-cells": "weui-miniprogram/cells/cells",
9
     "mp-cells": "weui-miniprogram/cells/cells",

+ 3
- 2
src/pages/index/tabs/Mine.jsx View File

16
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
16
 import DefaultImage from '@/assets/icons/UserCenter/DefaultImage.png'
17
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
17
 import cutoverUser from '@/assets/icons/UserCenter/cutoverUser.png'
18
 import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
18
 import { PaysOrder, getMineOrder } from '@/services/payOrder' //创建订单
19
+import ToggleRole from '@/components/toggleRole/ToggleRole'
19
 
20
 
20
 import { useModel } from '@/store'
21
 import { useModel } from '@/store'
21
 import './MineCss/style.less'
22
 import './MineCss/style.less'
22
-import ToggleRole from '@/components/toggleRole/ToggleRole'
23
 
23
 
24
 
24
 
25
 
25
 
31
   const hasAvatar = !!person.avatar
31
   const hasAvatar = !!person.avatar
32
   const [orderNum, setOrderNum] = useState([])
32
   const [orderNum, setOrderNum] = useState([])
33
 
33
 
34
+  console.log('--------DefaultImage-----', DefaultImage)
34
 
35
 
35
   const ShowMoldeOn = () => {
36
   const ShowMoldeOn = () => {
36
     setShowCutover(true)
37
     setShowCutover(true)
117
         <ToggleRole showCutover={showCutover} onClose={onClose} role='normal' />
118
         <ToggleRole showCutover={showCutover} onClose={onClose} role='normal' />
118
         <view className='User-info'>
119
         <view className='User-info'>
119
           <view className='User-photos-box'>
120
           <view className='User-photos-box'>
120
-            <image src={person.avatar || { DefaultImage }} className='User-photos' />
121
+            <image src={person.avatar || DefaultImage} className='User-photos' />
121
           </view>
122
           </view>
122
           <view className='User-info-all'>
123
           <view className='User-info-all'>
123
             <view onClick={handleGetUserProfile} className='User-name'>{hasAvatar ? person.nickName : '点击授权头像'}</view>
124
             <view onClick={handleGetUserProfile} className='User-name'>{hasAvatar ? person.nickName : '点击授权头像'}</view>