李志伟 3 years ago
parent
commit
2686769295

BIN
src/assets/icons/housemantj/未赞.png View File


BIN
src/assets/icons/housemantj/爆赞.png View File


+ 4
- 3
src/components/BossCard/index.jsx View File

@@ -5,8 +5,9 @@ import { useState, useEffect } from 'react'
5 5
 import Star from '@/components/Star/Star.jsx'
6 6
 import position from '@/assets/icons/GuideCheck/position_logo.png'
7 7
 import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
8
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
9
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
8
+
9
+import starOn from '@/assets/icons/housemantj/onlove.png'
10
+import starOff from '@/assets/icons/housemantj/景点爆赞.png'
10 11
 import food from '@/assets/icons/ProCard/food.png'
11 12
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
12 13
 
@@ -53,7 +54,7 @@ export default (props) => {
53 54
             <Star star={star} />
54 55
             <text className='card-star-text' >{star}</text>
55 56
           </view>
56
-          <view className='title-image'>
57
+          <view className='title-image'  onClick={() => { goFood() }}>
57 58
             <image className='image-1' mode='scaleToFill' src={item.poster}></image>
58 59
             <image className='image-2' src={food}></image>
59 60
           </view>

+ 4
- 4
src/components/foodCards/foodCards.jsx View File

@@ -6,8 +6,8 @@ import Star from '@/components/Star/Star.jsx'
6 6
 import pay from '@/assets/icons/housemantj/pay.png'
7 7
 import msTip from '@/assets/icons/housemantj/foodtip.png'
8 8
 import wz from '@/assets/icons/housemantj/location.png'
9
-import hongxin from '@/assets/icons/housemantj/已收藏.png'
10
-import baixin from '@/assets/icons/housemantj/收藏.png'
9
+import ax from '@/assets/icons/housemantj/onlove.png'
10
+import good from '@/assets/icons/housemantj/景点爆赞.png'
11 11
 import './style.less'
12 12
 
13 13
 
@@ -58,7 +58,7 @@ export default (props) => {
58 58
           <text className='storezf'>{star}</text>
59 59
         </view>
60 60
         <view>
61
-          <view className='contentImg'>
61
+          <view className='contentImg'  onClick={() => { goFood() }}>
62 62
             <image src={item.poster} className='img1'></image>
63 63
             <image src={msTip} className='mstip'></image>
64 64
           </view>
@@ -73,7 +73,7 @@ export default (props) => {
73 73
               <image className='dw' src={wz} />
74 74
               <text className='wz'>{city.areaPName}/{city.areaName}</text>
75 75
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
76
-                <image className='star' src={isSaved > 0 ? hongxin : baixin}></image>
76
+                <image className='star' src={isSaved > 0 ? ax : good}></image>
77 77
                 <text className='collection'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
78 78
               </view>
79 79
             </view>

+ 9
- 12
src/pages/details/foodDetails/foodDetails.jsx View File

@@ -2,10 +2,7 @@ import CustomNav from '@/components/CustomNav'
2 2
 import withLayout from '@/layouts'
3 3
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
4 4
 import { useState, useEffect, useRef } from 'react'
5
-
6 5
 import { Swiper, SwiperItem } from '@tarojs/components';
7
-import BossCard from '@/components/BossCard'
8
-
9 6
 import Star from '@/components/Star/Star.jsx'
10 7
 import Cards from '@/components/foodCards/foodCards.jsx'
11 8
 import ax from '@/assets/icons/housemantj/onlove.png'
@@ -14,15 +11,15 @@ import dw from '@/assets/icons/housemantj/地址.png'
14 11
 import zhuandao from '@/assets/icons/housemantj/backTop.png'
15 12
 import titlezs from '@/assets/icons/housemantj/标题装饰.png'
16 13
 import showMore from '@/assets/icons/housemantj/查看更多.png'
17
-import share from '../../../assets/icons/housemantj/景点分享.png'
18
-import good from '../../../assets/icons/housemantj/景点爆赞.png'
19
-import collection from '../../../assets/icons/housemantj/景点收藏.png'
20
-import hongxin from '../../../assets/icons/housemantj/已收藏.png'
21
-import './foodDetails.less'
14
+import share from '@/assets/icons/housemantj/景点分享.png'
15
+import good from '@/assets/icons/housemantj/景点爆赞.png'
16
+import baozan from '@/assets/icons/housemantj/爆赞.png'
17
+import weibaozan from '@/assets/icons/housemantj/未赞.png'
22 18
 import Taro from '@tarojs/taro'
23
-import Extend from '../components/Extend/extend'
24 19
 import useSave from "@/utils/hooks/useSave"
25 20
 import useLike from "@/utils/hooks/useLike"
21
+import Extend from '../components/Extend/extend'
22
+import './foodDetails.less'
26 23
 
27 24
 export default withLayout((props) => {
28 25
   const { router, person } = props
@@ -147,7 +144,7 @@ export default withLayout((props) => {
147 144
                   <text className='t1'>¥</text>
148 145
                   {detail.averagePrice / 100}/人
149 146
                   <view className='bzRight'>
150
-                    <image src={ax} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
147
+                    <image src={baozan} style={{ width: '15px', height: '15px', marginRight: '11rpx', marginBottom: '-2px' }} />
151 148
                     爆赞{detail.likeNum}</view>
152 149
                 </view>
153 150
               </view>
@@ -200,10 +197,10 @@ export default withLayout((props) => {
200 197
           <image className='share' src={share} />分享
201 198
         </view>
202 199
         <view className='tab' onClick={toggleLike}>
203
-          <image className='good' src={isLike > 0 ? ax : good} />{isLike > 0 ? '已爆赞' : '爆赞'}
200
+          <image className='good' src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
204 201
         </view>
205 202
         <view className='tab' onClick={toggleSave}>
206
-          <image className='collection' src={isSaved > 0 ? hongxin : collection} />{isSaved > 0 ? '已收藏' : '加入收藏'}
203
+          <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}
207 204
         </view>
208 205
       </view>
209 206
     </view>

+ 6
- 10
src/pages/details/mjDetails/sceneryDetails.jsx View File

@@ -1,17 +1,13 @@
1 1
 import CustomNav from '@/components/CustomNav'
2
-import BossCard from '@/components/BossCard'
3
-
4 2
 import ax from '../../../assets/icons/housemantj/onlove.png'
5
-import hongxin from '../../../assets/icons/housemantj/已收藏.png'
6
-import baixin from '../../../assets/icons/housemantj/收藏.png'
7 3
 import dw from '../../../assets/icons/housemantj/地址.png'
8 4
 import titlejd from '../../../assets/icons/housemantj/推荐景点.png'
9 5
 import titlems from '../../../assets/icons/housemantj/推荐美食.png'
10 6
 import showMore from '../../../assets/icons/housemantj/查看更多.png'
11 7
 import share from '../../../assets/icons/housemantj/景点分享.png'
12 8
 import good from '../../../assets/icons/housemantj/景点爆赞.png'
13
-import collection from '../../../assets/icons/housemantj/景点收藏.png'
14
-
9
+import baozan from '../../../assets/icons/housemantj/爆赞.png'
10
+import weibaozan from '../../../assets/icons/housemantj/未赞.png'
15 11
 import withLayout from '@/layouts'
16 12
 import { useState, useEffect, useRef } from 'react'
17 13
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
@@ -120,7 +116,7 @@ export default withLayout((props) => {
120 116
                 <text className='storeName'>{detail.touristName}</text>
121 117
               </view>
122 118
               <view className='bz'>
123
-                <image src={ax} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
119
+                <image src={baozan} style={{ width: '15px', height: '15px', marginRight: '10px', marginBottom: '-2px' }} />
124 120
                 <text className='bzRight'>爆赞{detail.likeNum}</text>
125 121
               </view>
126 122
               <view className='wz'>{detail.address}</view>
@@ -134,7 +130,7 @@ export default withLayout((props) => {
134 130
             <view>{detail.description}</view>
135 131
             <view className='line'></view>
136 132
             <view className='sc' onClick={toggleSave}>
137
-              <image className='scTip' src={isSaved > 0 ? hongxin : baixin} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
133
+              <image className='scTip' src={isSaved > 0 ? ax : good} /><text>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
138 134
             </view>
139 135
           </view>
140 136
           <view style={{ position: 'relative', display: extend == '' ? 'none' : '' }}>
@@ -161,10 +157,10 @@ export default withLayout((props) => {
161 157
           <image className='share' src={share} />分享
162 158
         </view>
163 159
         <view className='tab' onClick={toggleLike}>
164
-          <image className='good' src={isLike > 0 ? ax : good} />{isLike > 0 ? '已爆赞' : '爆赞'}
160
+          <image className='good' src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
165 161
         </view>
166 162
         <view className='tab' onClick={toggleSave}>
167
-          <image className='collection' src={isSaved > 0 ? hongxin : collection} />{isSaved > 0 ? '已收藏' : '加入收藏'}
163
+          <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}
168 164
         </view>
169 165
       </view>
170 166