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

src/components/ActivityListItem/index.jsx

@@ -32,7 +32,7 @@ export default function ActivityListItem (props) {
   return (
     <view className='ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${Data.dynamicId}` }) }}>
       <view className='Img'>
-        <image mode='aspectFill' src={Data.imgUrl} className='centerLabel'></image>
+        <image mode='aspectFill' src={Data.listImgUrl} className='centerLabel'></image>
       </view>
       <view className='Info flex-h'>
         <view className='flex-item'>

src/components/WuYeBaoXiu/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import request, { apis } from '@/utils/request'
+import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -43,7 +44,7 @@ export default function WuYeBaoXiu () {
         <view className='BigImg'>
           {
             BannerList.length > 0 &&
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
           }
         </view>
 

src/components/WuYeFuWu/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import WuYeFuWuItem from '@/components/WuYeFuWuItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import request, { apis } from '@/utils/request'
+import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -42,7 +43,7 @@ export default function WuYeFuWu () {
         <view className='BigImg'>
           {
             BannerList.length > 0 &&
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
           }
         </view>
 

src/components/WuYeGongGao/index.jsx

@@ -4,6 +4,7 @@ import Taro from '@tarojs/taro'
 import WuYeGongGaoItem from '@/components/WuYeGongGaoItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import request, { apis } from '@/utils/request'
+import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
@@ -43,7 +44,7 @@ export default function WuYeGongGao () {
         <view className='BigImg'>
           {
             BannerList.length > 0 &&
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
           }
         </view>
 

src/components/WuYeJiaoFei/index.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react'
 import WuYeJiaoFeiItem from '@/components/WuYeJiaoFeiItem/index'
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
 import request, { apis } from '@/utils/request'
+import nav2detail from '@/utils/nav2detail'
 import Taro from '@tarojs/taro'
 import { Checkbox, CheckboxGroup } from '@tarojs/components'
 import '@/assets/css/reset.less'
@@ -130,7 +131,7 @@ export default function WuYeJiaoFei () {
             <view className='BigImg'>
               {
                 BannerList.length > 0 &&
-                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
+                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
               }
             </view>
 

src/pages/HuoDong/HuoDongDetail/index.jsx

@@ -161,7 +161,7 @@ export default function HuoDongDetail () {
 
             <view className='Desc'>
               <text>活动介绍</text>
-              <RichText nodes={ActivityDetail.desc}></RichText>
+              <RichText nodes={`${ActivityDetail.desc.replace(/font-size\:\s(\d+)px/ig, 'font-size: $1rpx')}`}></RichText>
             </view>
 
             {