Browse Source

iconparams

xujing 5 years ago
parent
commit
480a6acbe8
4 changed files with 14 additions and 6 deletions
  1. 3
    3
      config/dev.js
  2. 1
    1
      config/prod.js
  3. 5
    0
      src/pages/project/NavIcons/icons.js
  4. 5
    2
      src/pages/project/NavIcons/index.js

+ 3
- 3
config/dev.js View File

11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
12
     // HOST: '"https://lt.pawoma.cn"',
12
     // HOST: '"https://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
14
-    // HOST: '"http://192.168.2.51:8080"',
15
-    // WSS_HOST: '"ws://192.168.2.51:8080"',
14
+    // HOST: '"http://192.168.2.52:8080"',
15
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
16
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
17
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
18
-    Version: 'V3.5.15'
18
+    Version: 'V3.5.17'
19
   },
19
   },
20
   weapp: {},
20
   weapp: {},
21
   h5: {}
21
   h5: {}

+ 1
- 1
config/prod.js View File

11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
12
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
13
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
13
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
14
-    Version: 'V3.5.15'
14
+    Version: 'V3.5.17'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},
17
   h5: {}
17
   h5: {}

+ 5
- 0
src/pages/project/NavIcons/icons.js View File

108
     iconName: '意见反馈',
108
     iconName: '意见反馈',
109
     page: '/useless/pages/person/feedback/index',
109
     page: '/useless/pages/person/feedback/index',
110
   },
110
   },
111
+  {
112
+    iconCode: 'BuildingDetail',
113
+    iconName: '项目详情',
114
+    page: '/pages/project/detail/index',
115
+  },
111
 ]
116
 ]

+ 5
- 2
src/pages/project/NavIcons/index.js View File

31
   }).filter(Boolean)
31
   }).filter(Boolean)
32
 
32
 
33
   const naviTo = (icon) => {
33
   const naviTo = (icon) => {
34
-    const { page, tab } = icon || {}
34
+
35
+
36
+    const { page, tab, params } = icon || {}
37
+    const urlParams = params && params.indexOf('?') === -1 ? '?' + params : '&' + params
35
 
38
 
36
     if (tab) {
39
     if (tab) {
37
       Taro.switchTab({ url: tab })
40
       Taro.switchTab({ url: tab })
38
     } else {
41
     } else {
39
-      Taro.navigateTo({ url: page })
42
+      Taro.navigateTo({ url: params ? page + urlParams : page })
40
     }
43
     }
41
   }
44
   }
42
 
45