ff

src/components/BossCard/index.jsx

@@ -11,7 +11,7 @@ import starOff from '@/assets/icons/housemantj/景点爆赞.png'
 import food from '@/assets/icons/ProCard/food.png'
 import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
 
-import { getQueryString} from '@/utils/index'
+import { getQueryString } from '@/utils/index'
 //入住指引--老板推荐
 
 
@@ -19,21 +19,34 @@ import { getQueryString} from '@/utils/index'
 import './style.less'
 
 export default (props) => {
-  const { item, cardNavigateTo,taRoomContent,trackClick } = props
+  const { item, cardNavigateTo, taRoomContent, trackClick } = props
   const { shopId, packageId } = props.item
   const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.packageId)
   const [city, setCity] = useState({})
   const [detail, setDetail] = useState({})
 
-    
+  const [handelareaName, setHandelareaName] = useState()
+
+  const lareaName = () => {
+    if (city.areaPName == null) {
+      setHandelareaName(city.areaPName / city.areaName)
+    } else {
+      setHandelareaName(city.areaName)
+    }
+  }
+
+
+
+
 
-  
   const goFood = () => {
-     trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId:taRoomContent.hotelId,shopId:shopId,packageId:packageId})  })
+    trackClick({ eventType: 'hotel_recommend_package', eventParams: getQueryString({ hotelId: taRoomContent.hotelId, shopId: shopId, packageId: packageId }) })
     Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
   }
 
   useEffect(() => {
+    lareaName()
+
     getShopDetail(item.shopId).then((res) => {
       setDetail(res)
       getShopcity(res.cityId).then((x) => {
@@ -66,7 +79,7 @@ export default (props) => {
             <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
             <view className='title-position-on'>
               <image className='title-position' src={position} />
-              <text className='title-position-image'>{city.areaPName}/{city.areaName}</text>
+              <text className='title-position-image'>{city.areaPName}/ {city.areaName}</text>
               <view style={{ display: 'inline-block' }} onClick={toggleSave}>
 
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />

src/components/CollectList/MyCollect/index.jsx

@@ -50,13 +50,18 @@ export default (props) => {
                 <text className='title-money' >￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
                 <view className='title-position-on'>
                   <image className='title-position' src={position} />
-                  <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
+                  <text className='title-position-image'>
+                    {
+                      targetType === "shop_package" && (
+                        item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
+                      )
+                    }
+                  </text>
                 </view>
               </view>
             </view>
             <view class='right-complete-two'>
               <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }); }}>
-                {/* <view className='right-number'>×1</view> */}
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
               </view>
@@ -84,7 +89,17 @@ export default (props) => {
                   </view>
                   <view className='title-position-on'>
                     <image className='title-position' src={position} />
-                    <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
+                    <text className='title-position-image'>
+                      {
+                        targetType === "tourist" && (
+                          item.areaPName == '' ? item.areaPName / item.areaName : item.areaName
+                        )
+                      }
+                      {
+                        targetType === "shop" && (
+                          item.areaPName === null ? item.areaName : item.areaPName / item.areaName
+                        )
+                      }</text>
                   </view>
                 </view>
               </view>
@@ -98,6 +113,7 @@ export default (props) => {
             </view>
           )
         }
+
       </View>
     </View>