张延森 4 년 전
부모
커밋
3121723a98

+ 1
- 1
src/components/ActivityListItem/index.jsx 파일 보기

32
   return (
32
   return (
33
     <view className='ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${Data.dynamicId}` }) }}>
33
     <view className='ActivityListItem' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/HuoDongDetail/index?id=${Data.dynamicId}` }) }}>
34
       <view className='Img'>
34
       <view className='Img'>
35
-        <image mode='aspectFill' src={Data.imgUrl} className='centerLabel'></image>
35
+        <image mode='aspectFill' src={Data.listImgUrl} className='centerLabel'></image>
36
       </view>
36
       </view>
37
       <view className='Info flex-h'>
37
       <view className='Info flex-h'>
38
         <view className='flex-item'>
38
         <view className='flex-item'>

+ 2
- 1
src/components/WuYeBaoXiu/index.jsx 파일 보기

4
 import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem/index'
4
 import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
6
 import request, { apis } from '@/utils/request'
6
 import request, { apis } from '@/utils/request'
7
+import nav2detail from '@/utils/nav2detail'
7
 import '@/assets/css/reset.less'
8
 import '@/assets/css/reset.less'
8
 import '@/assets/css/iconfont.less'
9
 import '@/assets/css/iconfont.less'
9
 import './index.less'
10
 import './index.less'
43
         <view className='BigImg'>
44
         <view className='BigImg'>
44
           {
45
           {
45
             BannerList.length > 0 &&
46
             BannerList.length > 0 &&
46
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
47
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
47
           }
48
           }
48
         </view>
49
         </view>
49
 
50
 

+ 2
- 1
src/components/WuYeFuWu/index.jsx 파일 보기

4
 import WuYeFuWuItem from '@/components/WuYeFuWuItem/index'
4
 import WuYeFuWuItem from '@/components/WuYeFuWuItem/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
6
 import request, { apis } from '@/utils/request'
6
 import request, { apis } from '@/utils/request'
7
+import nav2detail from '@/utils/nav2detail'
7
 import '@/assets/css/reset.less'
8
 import '@/assets/css/reset.less'
8
 import '@/assets/css/iconfont.less'
9
 import '@/assets/css/iconfont.less'
9
 import './index.less'
10
 import './index.less'
42
         <view className='BigImg'>
43
         <view className='BigImg'>
43
           {
44
           {
44
             BannerList.length > 0 &&
45
             BannerList.length > 0 &&
45
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
46
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
46
           }
47
           }
47
         </view>
48
         </view>
48
 
49
 

+ 2
- 1
src/components/WuYeGongGao/index.jsx 파일 보기

4
 import WuYeGongGaoItem from '@/components/WuYeGongGaoItem/index'
4
 import WuYeGongGaoItem from '@/components/WuYeGongGaoItem/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
5
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
6
 import request, { apis } from '@/utils/request'
6
 import request, { apis } from '@/utils/request'
7
+import nav2detail from '@/utils/nav2detail'
7
 import '@/assets/css/reset.less'
8
 import '@/assets/css/reset.less'
8
 import '@/assets/css/iconfont.less'
9
 import '@/assets/css/iconfont.less'
9
 import './index.less'
10
 import './index.less'
43
         <view className='BigImg'>
44
         <view className='BigImg'>
44
           {
45
           {
45
             BannerList.length > 0 &&
46
             BannerList.length > 0 &&
46
-            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
47
+            <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
47
           }
48
           }
48
         </view>
49
         </view>
49
 
50
 

+ 2
- 1
src/components/WuYeJiaoFei/index.jsx 파일 보기

2
 import WuYeJiaoFeiItem from '@/components/WuYeJiaoFeiItem/index'
2
 import WuYeJiaoFeiItem from '@/components/WuYeJiaoFeiItem/index'
3
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
3
 import ScrollPageRefresh from '@/components/ScrollPageRefresh/index'
4
 import request, { apis } from '@/utils/request'
4
 import request, { apis } from '@/utils/request'
5
+import nav2detail from '@/utils/nav2detail'
5
 import Taro from '@tarojs/taro'
6
 import Taro from '@tarojs/taro'
6
 import { Checkbox, CheckboxGroup } from '@tarojs/components'
7
 import { Checkbox, CheckboxGroup } from '@tarojs/components'
7
 import '@/assets/css/reset.less'
8
 import '@/assets/css/reset.less'
130
             <view className='BigImg'>
131
             <view className='BigImg'>
131
               {
132
               {
132
                 BannerList.length > 0 &&
133
                 BannerList.length > 0 &&
133
-                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => { Taro.navigateTo({ url: `/pages/HuoDong/ZiXunDetail/index?id=${BannerList[0].targetId}` }) }}></image>
134
+                <image mode='aspectFill' src={BannerList[0].image} className='centerLabel' onClick={() => nav2detail({type: BannerList[0].contentType, id: BannerList[0].targetId})}></image>
134
               }
135
               }
135
             </view>
136
             </view>
136
 
137
 

+ 1
- 1
src/pages/HuoDong/HuoDongDetail/index.jsx 파일 보기

161
 
161
 
162
             <view className='Desc'>
162
             <view className='Desc'>
163
               <text>活动介绍</text>
163
               <text>活动介绍</text>
164
-              <RichText nodes={ActivityDetail.desc}></RichText>
164
+              <RichText nodes={`${ActivityDetail.desc.replace(/font-size\:\s(\d+)px/ig, 'font-size: $1rpx')}`}></RichText>
165
             </view>
165
             </view>
166
 
166
 
167
             {
167
             {