张延森 3 years ago
parent
commit
f602e08258

+ 2
- 1
config/dev.js View File

@@ -3,7 +3,8 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 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 9
   mini: {},
9 10
   h5: {}

+ 1
- 1
config/prod.js View File

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

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

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

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

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

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

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

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

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

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

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