吃个甘蔗嚼一年 3 年前
父节点
当前提交
3a89232840
共有 2 个文件被更改,包括 38 次插入9 次删除
  1. 19
    6
      src/components/BossCard/index.jsx
  2. 19
    3
      src/components/CollectList/MyCollect/index.jsx

+ 19
- 6
src/components/BossCard/index.jsx 查看文件

11
 import food from '@/assets/icons/ProCard/food.png'
11
 import food from '@/assets/icons/ProCard/food.png'
12
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
12
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
13
 
13
 
14
-import { getQueryString} from '@/utils/index'
14
+import { getQueryString } from '@/utils/index'
15
 //入住指引--老板推荐
15
 //入住指引--老板推荐
16
 
16
 
17
 
17
 
19
 import './style.less'
19
 import './style.less'
20
 
20
 
21
 export default (props) => {
21
 export default (props) => {
22
-  const { item, cardNavigateTo,taRoomContent,trackClick } = props
22
+  const { item, cardNavigateTo, taRoomContent, trackClick } = props
23
   const { shopId, packageId } = props.item
23
   const { shopId, packageId } = props.item
24
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
24
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
25
   const [city, setCity] = useState({})
25
   const [city, setCity] = useState({})
26
   const [detail, setDetail] = useState({})
26
   const [detail, setDetail] = useState({})
27
 
27
 
28
-    
28
+  const [handelareaName, setHandelareaName] = useState()
29
+
30
+  const lareaName = () => {
31
+    if (city.areaPName == null) {
32
+      setHandelareaName(city.areaPName / city.areaName)
33
+    } else {
34
+      setHandelareaName(city.areaName)
35
+    }
36
+  }
37
+
38
+
39
+
40
+
29
 
41
 
30
-  
31
   const goFood = () => {
42
   const goFood = () => {
32
-     trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId:taRoomContent.hotelId,shopId:shopId,packageId:packageId})  })
43
+    trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId: taRoomContent.hotelId, shopId: shopId, packageId: packageId }) })
33
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
44
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
34
   }
45
   }
35
 
46
 
36
   useEffect(() => {
47
   useEffect(() => {
48
+    lareaName()
49
+
37
     getShopDetail(item.shopId).then((res) => {
50
     getShopDetail(item.shopId).then((res) => {
38
       setDetail(res)
51
       setDetail(res)
39
       getShopcity(res.cityId).then((x) => {
52
       getShopcity(res.cityId).then((x) => {
66
             <text className='title-money' >¥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
79
             <text className='title-money' >¥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
67
             <view className='title-position-on'>
80
             <view className='title-position-on'>
68
               <image className='title-position' src={position} />
81
               <image className='title-position' src={position} />
69
-              <text className='title-position-image'>{city.areaPName}/{city.areaName}</text>
82
+              <text className='title-position-image'>{city.areaPName}/ {city.areaName}</text>
70
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
83
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
71
 
84
 
72
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />
85
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />

+ 19
- 3
src/components/CollectList/MyCollect/index.jsx 查看文件

50
                 <text className='title-money' >¥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
50
                 <text className='title-money' >¥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
51
                 <view className='title-position-on'>
51
                 <view className='title-position-on'>
52
                   <image className='title-position' src={position} />
52
                   <image className='title-position' src={position} />
53
-                  <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
53
+                  <text className='title-position-image'>
54
+                    {
55
+                      targetType === "shop_package" && (
56
+                        item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
57
+                      )
58
+                    }
59
+                  </text>
54
                 </view>
60
                 </view>
55
               </view>
61
               </view>
56
             </view>
62
             </view>
57
             <view class='right-complete-two'>
63
             <view class='right-complete-two'>
58
               <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
64
               <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
59
-                {/* <view className='right-number'>×1</view> */}
60
                 <image className='right-image' src={SeeDetails} />
65
                 <image className='right-image' src={SeeDetails} />
61
                 <view className='right-title'>查看详情</view>
66
                 <view className='right-title'>查看详情</view>
62
               </view>
67
               </view>
84
                   </view>
89
                   </view>
85
                   <view className='title-position-on'>
90
                   <view className='title-position-on'>
86
                     <image className='title-position' src={position} />
91
                     <image className='title-position' src={position} />
87
-                    <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
92
+                    <text className='title-position-image'>
93
+                      {
94
+                        targetType === "tourist" && (
95
+                          item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
96
+                        )
97
+                      }
98
+                      {
99
+                        targetType === "shop" && (
100
+                          item.areaPName === null ? item.areaName : item.areaPName / item.areaName
101
+                        )
102
+                      }</text>
88
                   </view>
103
                   </view>
89
                 </view>
104
                 </view>
90
               </view>
105
               </view>
98
             </view>
113
             </view>
99
           )
114
           )
100
         }
115
         }
116
+
101
       </View>
117
       </View>
102
     </View>
118
     </View>
103
 
119