张延森 4 年 前
コミット
631cb9cdc7
共有3 個のファイルを変更した25 個の追加12 個の削除を含む
  1. 2
    10
      src/components/AdvLayer/index.jsx
  2. 3
    2
      src/pages/ShouYe/index.jsx
  3. 20
    0
      src/utils/nav2detail.js

+ 2
- 10
src/components/AdvLayer/index.jsx ファイルの表示

1
 import React, { useState, useEffect } from 'react'
1
 import React, { useState, useEffect } from 'react'
2
 import request, { apis } from '@/utils/request'
2
 import request, { apis } from '@/utils/request'
3
-import Taro from '@tarojs/taro'
4
 import { Text } from '@tarojs/components'
3
 import { Text } from '@tarojs/components'
5
 import { useModel } from '@/store'
4
 import { useModel } from '@/store'
5
+import nav2detail from '@/utils/nav2detail'
6
 import '@/assets/css/reset.less'
6
 import '@/assets/css/reset.less'
7
 import '@/assets/css/iconfont.less'
7
 import '@/assets/css/iconfont.less'
8
 import './index.less'
8
 import './index.less'
27
 
27
 
28
   const AdvClick = () => {
28
   const AdvClick = () => {
29
     setShowIndexAdv(false)
29
     setShowIndexAdv(false)
30
-    if (AdvDetail.contentType === 'news') {
31
-      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${AdvDetail.targetId}` })
32
-    } else if (AdvDetail.contentType === 'tpNews') {
33
-      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${AdvDetail.targetId}` })
34
-    } else if (AdvDetail.contentType === 'notice') {
35
-      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${AdvDetail.targetId}` })
36
-    } else if (AdvDetail.contentType === 'activity') {
37
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${AdvDetail.targetId}` })
38
-    }
30
+    nav2detail({type: AdvDetail.contentType, id: AdvDetail.targetId})
39
   }
31
   }
40
 
32
 
41
   return (
33
   return (

+ 3
- 2
src/pages/ShouYe/index.jsx ファイルの表示

7
 import useUserMounted from '@/utils/hooks/useUserMounted'
7
 import useUserMounted from '@/utils/hooks/useUserMounted'
8
 import Taro from '@tarojs/taro'
8
 import Taro from '@tarojs/taro'
9
 import Page from '@/layouts'
9
 import Page from '@/layouts'
10
+import nav2detail from '@/utils/nav2detail'
10
 import '@/assets/css/reset.less'
11
 import '@/assets/css/reset.less'
11
 import '@/assets/css/iconfont.less'
12
 import '@/assets/css/iconfont.less'
12
 import './index.less'
13
 import './index.less'
58
 
59
 
59
   const GetBanner = (done = () => { }) => { // 获取轮播图
60
   const GetBanner = (done = () => { }) => { // 获取轮播图
60
     setBannerList([])
61
     setBannerList([])
61
-    request({ ...apis.getBanner, params: { contentType: `activity`, pageNum: 1, pageSize: 5 } }).then((res) => {
62
+    request({ ...apis.getBanner, params: { showType: 'banner', showPosition: 'index', pageNum: 1, pageSize: 5 } }).then((res) => {
62
       setBannerList([...(res || [])])
63
       setBannerList([...(res || [])])
63
       done()
64
       done()
64
     }).catch(() => {
65
     }).catch(() => {
151
                           {
152
                           {
152
                             BannerList.map((item, index) => (
153
                             BannerList.map((item, index) => (
153
                               <SwiperItem className='SwiperItem' key={`Banner-${index}`}>
154
                               <SwiperItem className='SwiperItem' key={`Banner-${index}`}>
154
-                                <view className='BannerItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${item.targetId}` }) }}>
155
+                                <view className='BannerItem' onClick={() => nav2detail({type: item.contentType, id: item.targetId})}>
155
                                   <image mode='aspectFill' src={item.image}></image>
156
                                   <image mode='aspectFill' src={item.image}></image>
156
                                 </view>
157
                                 </view>
157
                               </SwiperItem>
158
                               </SwiperItem>

+ 20
- 0
src/utils/nav2detail.js ファイルの表示

1
+import Taro from '@tarojs/taro'
2
+
3
+export default function ({ type, id }) {
4
+  switch (type) {
5
+    case 'notice':
6
+      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${id}` })
7
+      return
8
+    case 'tpNews':
9
+      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${id}` })
10
+      return
11
+    case 'activity':
12
+      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${id}` })
13
+      return
14
+    case 'news':
15
+      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${id}` })
16
+      return
17
+    default:
18
+      break
19
+  }
20
+}