Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp into master

src/components/AdvLayer/index.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react'
 import request, { apis } from '@/utils/request'
-import Taro from '@tarojs/taro'
 import { Text } from '@tarojs/components'
 import { useModel } from '@/store'
+import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -27,15 +27,7 @@ export default function AdvLayer () {
 
   const AdvClick = () => {
     setShowIndexAdv(false)
-    if (AdvDetail.contentType === 'news') {
-      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${AdvDetail.targetId}` })
-    } else if (AdvDetail.contentType === 'tpNews') {
-      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${AdvDetail.targetId}` })
-    } else if (AdvDetail.contentType === 'notice') {
-      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${AdvDetail.targetId}` })
-    } else if (AdvDetail.contentType === 'activity') {
-      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${AdvDetail.targetId}` })
-    }
+    nav2detail({type: AdvDetail.contentType, id: AdvDetail.targetId})
   }
 
   return (

src/pages/ShouYe/index.jsx

@@ -8,6 +8,7 @@ import { useModel } from '@/store'
 import useUserMounted from '@/utils/hooks/useUserMounted'
 import Taro from '@tarojs/taro'
 import Page from '@/layouts'
+import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -59,7 +60,7 @@ export default function Index (props) {
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
     setBannerList([])
-    request({ ...apis.getBanner, params: { contentType: `activity`, pageNum: 1, pageSize: 5 } }).then((res) => {
+    request({ ...apis.getBanner, params: { showType: 'banner', showPosition: 'index', pageNum: 1, pageSize: 5 } }).then((res) => {
       setBannerList([...(res || [])])
       done()
     }).catch(() => {
@@ -153,7 +154,7 @@ export default function Index (props) {
                           {
                             BannerList.map((item, index) => (
                               <SwiperItem className='SwiperItem' key={`Banner-${index}`}>
-                                <view className='BannerItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${item.targetId}` }) }}>
+                                <view className='BannerItem' onClick={() => nav2detail({type: item.contentType, id: item.targetId})}>
                                   <image mode='aspectFill' src={item.image}></image>
                                 </view>
                               </SwiperItem>

src/pages/WoDe/YeZhuRenZheng/index.jsx

@@ -65,6 +65,7 @@ export default function YeZhuRenZheng () {
       clearTimeout(CodeTimer)
       setCodeTimerNum(60)
     }
+  
     return () => {
       if (CodeTimer) {
         clearTimeout(CodeTimer)

src/utils/nav2detail.js

@@ -0,0 +1,20 @@
+import Taro from '@tarojs/taro'
+
+export default function ({ type, id }) {
+  switch (type) {
+    case 'notice':
+      Taro.navigateTo({ url: `/pages/WuYe/GongGaoDetail/index?id=${id}` })
+      return
+    case 'tpNews':
+      Taro.navigateTo({ url: `/pages/WuYe/FuWuDetail/index?id=${id}` })
+      return
+    case 'activity':
+      Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${id}` })
+      return
+    case 'news':
+      Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${id}` })
+      return
+    default:
+      break
+  }
+}