flx

src/components/BossCard/index.jsx

@@ -54,7 +54,7 @@ export default (props) => {
             <Star star={star} />
             <text className='card-star-text' >{star}</text>
           </view>
-          <view className='title-image'  onClick={() => { goFood() }}>
+          <view className='title-image' onClick={() => { goFood() }}>
             <image className='image-1' mode='scaleToFill' src={item.poster}></image>
             <image className='image-2' src={food}></image>
           </view>
@@ -62,7 +62,7 @@ export default (props) => {
             <view className='Pro-title' onClick={() => { goFood() }} >
               <view className='title-text'>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</view>
             </view>
-            <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
+            <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>

src/components/CollectList/FoodCollect/index.jsx → src/components/CollectList/MyCollect/index.jsx

@@ -5,7 +5,7 @@ import useLike from "@/utils/hooks/useLike"
 import { getShopDetail, getShopcity } from '@/services/home'
 import { useState, useEffect } from 'react'
 import { View } from '@tarojs/components'
-
+import formatPrice from "@/utils/formatPrice";
 import Star from '@/components/Star/Star.jsx'
 import position from '@/assets/icons/GuideCheck/position_logo.png'
 import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
@@ -24,39 +24,11 @@ import './style.less'
 
 export default (props) => {
   const { item, cardNavigateTo } = props
-  const shopId = props.item
-  const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.targetId)
-  const [isLike, toggleLike] = useLike(item.isLike, 'shop', item.targetId)
+  // const [isSaved, toggleSave] = useSave(item.isSaved, 'shop_package', item.targetId)
+  const [isLike, toggleLike] = useLike(item.isLike, 'tourist', item.targetId)
 
-  const [city, setCity] = useState({})
-  const [detail, setDetail] = useState({})
-  const [hotStyle, setHotStyle] = useState('none')
   const targetType = item.targetType
-  // item.targetType !== 'shop_package'
-
-
-  const goFood = () => {
-    // Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${shopId}` })
-  }
-
-  // useEffect(() => {
-  //   if (shopId) {
-  //     getShopDetail(item.shopId).then((res) => {
-  //       setDetail(res)
-  //       getShopcity(res.cityId).then((x) => {
-  //         setCity(x)
-  //       })
-  //     })
-  //   }
-
-  // }, [shopId, targetType])
 
-  // useEffect(() => {
-  //   if (item.targetType !== 'shop_package') {
-  //     console.log(item.targetType);
-  //   }
-
-  // }, [item.targetType])
 
 
 
@@ -69,22 +41,22 @@ export default (props) => {
             <view class='left-complete-one'   >
               <image className='left-image-1' src={ProCard_hot} style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} ></image>
               <view className='left-viewText'  >
-                返现￥{(item.cashback / 100).toFixed(2)}
+                返现￥{formatPrice(item.cashback)}
               </view>
               {/* 评分 */}
               <view className='card-box-star' style={{ display: item.targetType === 'shop_package' ? '' : 'none' }} >
                 <Star star={star} />
                 <text className='card-star-text' >{star}</text>
               </view>
-              <view className='title-image' onClick={() => { goFood() }}>
+              <view className='title-image' >
                 <image className='image-1' mode='scaleToFill' src={item.poster}></image>
                 <image className='image-2' src={item.targetType === 'tourist' ? Attractions : food}></image>
               </view>
               <view className='title-content'>
-                <view className='Pro-title' onClick={() => { goFood() }} >
+                <view className='Pro-title'  >
                   <view className='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
                 </view>
-                <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
+                <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>
@@ -92,7 +64,7 @@ export default (props) => {
               </view>
             </view>
             <view class='right-complete-two'>
-              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+              <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }); }}>
                 {/* <view className='right-number'>×1</view> */}
                 <image className='right-image' src={SeeDetails} />
                 <view className='right-title'>查看详情</view>
@@ -106,30 +78,27 @@ export default (props) => {
           targetType !== "shop_package" && (
             <view class='wrapper-tourist'>
               <view class='left-complete-one'   >
-                <view className='title-image' onClick={() => { goFood() }}>
+                <view className='title-image'>
                   <image className='image-1' mode='scaleToFill' src={item.poster}></image>
                   <image className='image-2' src={item.targetType === 'tourist' ? Attractions : food}></image>
                 </view>
                 <view className='title-content'>
-                  <view className='Pro-title' onClick={() => { goFood() }} >
+                  <view className='Pro-title'  >
                     <view className='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
                   </view>
-                  <text className='title-money' >￥{(item.actualPrice / 100)?.toFixed(2)}元<text className='title-money-2'>门市价{(item.standardPrice / 100)?.toFixed(2)}元</text></text>
-                  <view onClick={toggleSave}>
-                    <image className='title-on' src={isLike > 0 ? baozan : weibaozan} />
-                    <text onClick={toggleLike} className='title-on-text'>{isLike > 0 ? '已爆赞' : '爆赞'}</text>
+                  <text className='title-money' >￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
+                  <view onClick={toggleLike}>
+                    <image className='title-on' src={isLike === 1 ? baozan : weibaozan} />
+                    <text className='title-on-text'>{isLike === 1 ? '已爆赞' : '爆赞'}</text>
                   </view>
                   <view className='title-position-on'>
-
                     <image className='title-position' src={position} />
-
                     <text className='title-position-image'>{item.areaPName}/{item.areaName}</text>
-
                   </view>
                 </view>
               </view>
               <view class='right-complete-two'>
-                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/PayOrder/index?packageId=${item.packageId}` }); }}>
+                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }); }}>
                   {/* <view className='right-number'>×1</view> */}
                   <image className='right-image' src={SeeDetails} />
                   <view className='right-title'>查看详情</view>

src/pages/MineUserAll/Collect/index.jsx

@@ -2,31 +2,14 @@
 import CustomNav from '@/components/CustomNav'
 import { useState, useEffect } from "react";
 import withLayout from '@/layouts'
-
-import Taro from '@tarojs/taro'
-import image from '@/assets/icons/ProCard/8kb.jpg'
-import Pay from '@/assets/icons/GuideCheck/Pay_logo.png'
-import SeeDetails from '@/assets/icons/GuideCheck/SeeDetails.png'
 import { getCollectList } from '@/services/home'
-
-import Attractions from '@/assets/icons/GuideCheck/Attractions.png'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import position from '@/assets/icons/GuideCheck/position_logo.png'
-import starOn from '@/assets/icons/GuideCheck/starOn.png'
-import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import FoodCollect from '@/components/CollectList/FoodCollect'
-
-
+import MyCollect from '@/components/CollectList/MyCollect'
 import './style.less'
 
-
 export default withLayout((props) => {
   const { router, person, location } = props
-  console.log("🚀 ~ file: index.jsx ~ line 27 ~ withLayout ~ props", props)
   const [collectContent, setCollectContent] = useState([])
-
-
+  console.log("🚀 ~ file: index.jsx ~ line 12 ~ withLayout ~ collectContent", collectContent)
 
   useEffect(() => {
     getCollectList({
@@ -39,24 +22,14 @@ export default withLayout((props) => {
     })
   }, [location])
 
-
-
-
   return (
     <view className='box-content'>
       <CustomNav title='我的收藏' />
-
       <view>
         {
-          collectContent.map((item, index) => {
-            return <FoodCollect key={(index)} item={item} />
-          })
-
+          collectContent.map((item, index) => { return <MyCollect key={(index)} item={item} /> })
         }
-
-
       </view>
-
       <view className='foot'>
         已经到底了~
       </view>

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -1,6 +1,7 @@
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
 import Taro from "@tarojs/taro";
 import { Button, Icon, Text, Textarea } from "@tarojs/components";
+import formatPrice from "@/utils/formatPrice";
 
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
@@ -86,7 +87,7 @@ export default withLayout((props) => {
   const onRefund = () => {
     // console.log(explain, checkeds, "----onRefund----");
     refund(id, {
-      refundDecription: checkeds?.map(x=>options.filter(y=>y.key==x)[0]?.title).join(';'),
+      refundDecription: checkeds?.map(x => options.filter(y => y.key == x)[0]?.title).join(';'),
       refundReason: explain,
     }).then((res) => {
       Taro.showToast({
@@ -94,7 +95,7 @@ export default withLayout((props) => {
         icon: "none",
         duration: 2000,
       });
-      Taro.navigateBack({delta: 1})
+      Taro.navigateBack({ delta: 1 })
     });
   };
 
@@ -127,13 +128,13 @@ export default withLayout((props) => {
       </view>
       {/* 商品信息结束 */}
       <view>
-        {(list||[]).map((item) => {
+        {(list || []).map((item) => {
           return (
             <view class="wrapper" key={item.orderId}>
               <view class="left-complete-one">
                 <image className="left-image-1" src={ProCard_hot}></image>
                 <view className="left-viewText">
-                  返现￥{item.cashback / 100}
+                  返现￥{formatPrice(item.cashback)}
                 </view>
                 <view className="title-image">
                   <image
@@ -153,9 +154,9 @@ export default withLayout((props) => {
                     </view>
                   </view>
                   <text className="title-money">
-                    ￥{item.unitPrice / 100}元
+                    ￥{formatPrice(item.unitPrice)}元
                     <text className="title-money-2">
-                      门市价{item.standardPrice / 100}元
+                      门市价{formatPrice(item.standardPrice)}元
                     </text>
                   </text>
                   <view className="title-time">
@@ -188,11 +189,10 @@ export default withLayout((props) => {
         {options.map((x) => {
           return (
             <text
-              className={`Refund-star-view${x.key} ${
-                checkeds.indexOf(x.key) > -1
+              className={`Refund-star-view${x.key} ${checkeds.indexOf(x.key) > -1
                   ? "bg2"
                   : `Refund-star-view${x.key}`
-              }`}
+                }`}
               key={x.key}
               onClick={() => viewOK(x)}
             >
@@ -221,15 +221,15 @@ export default withLayout((props) => {
       </view>
       <view className="money-title">
         实付金额:{" "}
-        <text className="money-name">{totalPrice.charges / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.charges)}元</text>
       </view>
       <view className="money-title">
         已获返现:{" "}
-        <text className="money-name">{totalPrice.cashback / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.cashback)}元</text>
       </view>
       <view className="money-title">
         退款金额:{" "}
-        <text className="money-name">{totalPrice.refundPrice / 100}元</text>
+        <text className="money-name">{formatPrice(totalPrice.refundPrice)}元</text>
       </view>
       <view className="ul-li-text">
         <view className="ul-li-view"></view>

src/pages/PayOrder/index.jsx

@@ -117,7 +117,7 @@ export default withLayout((props) => {
         ).then((res) => {
           setPayInfo(res);
           requestPayment(res);
-        }).catch(()=>{
+        }).catch(() => {
           Taro.hideLoading()
           Taro.showToast({
             title: "支付失败",
@@ -130,7 +130,7 @@ export default withLayout((props) => {
         payOrder(orderId).then((res) => {
           setPayInfo(res);
           requestPayment(res);
-        }).catch(()=>{
+        }).catch(() => {
           Taro.hideLoading()
           Taro.showToast({
             title: "支付失败",
@@ -217,7 +217,7 @@ export default withLayout((props) => {
         </view>
       </Popup>
       <view class="coupon-list">
-        {(list||[]).map((item) => {
+        {(list || []).map((item) => {
           return (
             <view class="wrapper" key={item.orderId}>
               <view class="left-complete-one">
@@ -291,17 +291,17 @@ export default withLayout((props) => {
         <view className="button-box-button-box">
           <view className="button-text-image">
             <text className="button-text-money-hot">
-              返现￥{(totalPrice?.cashback || 0) / 100}
+              返现￥{formatPrice(totalPrice?.cashback || 0)}
             </text>
             <image className="button-image" src={ProCard_hot}>
               123123
             </image>
             <view className="button-text-money">
-              门店市面价：{(totalPrice?.standardPrice || 0) / 100}元
+              门店市面价：{formatPrice(totalPrice?.standardPrice || 0)}元
             </view>
           </view>
           <Button className="button-box-one" onClick={() => onShowPay()}>
-            ￥{(totalPrice?.actualPrice || 0) / 100}元
+            ￥{formatPrice(totalPrice?.actualPrice || 0)}元
             <text className="button-text-one">支付订单</text>
           </Button>
         </view>

src/pages/TobeShop/index.jsx

@@ -4,6 +4,8 @@ import withLayout from "@/layouts";
 import CustomNav from "@/components/CustomNav";
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home'
 import Popup from "@/components/Popup";
+import formatPrice from "@/utils/formatPrice";
+
 import LocationBig from "@/assets/icons/UserCenter/LocationBig.png";
 import Perfection from "@/assets/icons/UserCenter/Perfection.png";
 import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
@@ -147,7 +149,7 @@ export default withLayout((props) => {
           <text className="shop-title-title">请选择你要核销的套餐</text>
         </view>
         <view>
-          {(list||[]).map((item) => {
+          {(list || []).map((item) => {
 
             return (
               <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
@@ -173,7 +175,7 @@ export default withLayout((props) => {
                       </view>
                     </view>
                     <text className="title-money">
-                      ￥{item.actualPrice / 100}元<text className="title-money-2">门市价{item.standPrice / 100}元</text>
+                      ￥{formatPrice(item.actualPrice)}元<text className="title-money-2">门市价{formatPrice(item.standPrice)}元</text>
                     </text>
                     <view className="title-time">
                       有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-

src/pages/index/tabs/Guide.jsx

@@ -245,7 +245,7 @@ export default (props) => {
                   <image mode='scaleToFill' className='title-image-cup' src={BlackSpot} />
                   <text className='title-title-boss' >更多指引</text>
                 </view>
-                {(extend||[]).map((item, index) => <MoreGuide key={(index)} item={item} />)}
+                {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
 
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
                   <view>点击查看更多</view>
@@ -261,7 +261,7 @@ export default (props) => {
             <text className='title-title-boss' >老板推荐好吃的</text>
           </view>
         </view>
-        {(spackage||[]).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
+        {(spackage || []).map((item, index) => <BossCard cardNavigateTo={cardNavigateTo} key={(index)} item={item} />)}
         {/* 卡片------------- */}
         {/* <view className='Guide-Content-box-two'>
           <view className='title-image-two'>