。

src/components/CollectList/MyCollect/index.jsx

@@ -1,16 +1,8 @@
 import Taro from '@tarojs/taro'
-import useLike from "@/utils/hooks/useLike"
 import { View, Text } 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'
-import Attractions from '@/assets/icons/GuideCheck/Attractions.png'
 import baozan from '@/assets/icons/housemantj/bgood.png'
-import weibaozan from '@/assets/icons/housemantj/unLike.png'
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-
 import CouponCard from '@/components/CouponCard'
 import Location from '@/components/Location'
 import './style.less'
@@ -20,16 +12,14 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 export default (props) => {
   const { item, cardNavigateTo } = props
-  const [isLike, toggleLike] = useLike(item.isLike, 'tourist', item.targetId)
 
   const targetType = item.targetType
-
   const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
 
   const handleDetail = () => {
-    targetType=="shop_package"? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
-    :targetType=="tourist"?Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
-    :Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
+    targetType == "shop_package" ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })
+      : targetType == "tourist" ? Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` })
+        : Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` })
   }
 
   const PayAction = <Action.Icon icon={SeeDetails} text='查看详情' onClick={handleDetail} />
@@ -37,7 +27,6 @@ export default (props) => {
   return (
 
     <View className='View-box-LR'>
-      <View className='left-View-box'>
         {
           targetType === "shop_package" && (
             <View style={{ margin: '15px 5px' }}>
@@ -65,11 +54,8 @@ export default (props) => {
             </View>
           )
         }
-      </View>
-      <View className='right-View-box'>
         {
           targetType !== "shop_package" && (
-
             <View style={{ margin: '15px 5px' }}>
               <CouponCard action={PayAction}>
                 <CouponMedia>
@@ -84,56 +70,20 @@ export default (props) => {
                     <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
                       <Text className='cpn-card-text_mn'>￥{`${formatPrice(item.averagePrice)}元`}</Text>
                     </View>
-                   
-                    <View className='cpn-md-act'> 
-                    <Location {...item} />
 
-                    <view onClick={toggleLike} className='wdscbaozan'>
-                   <image className='title-on' src={isLike === 1 ? baozan : weibaozan} />
-                   <text className='title-on-text'>爆赞 {item.likeNum}</text>
-                 </view>
+                    <View className='cpn-md-act'>
+                      <Location {...item} />
+                      <view className='wdscbaozan'>
+                        <image className='title-on' src={ baozan} />
+                        <text className='title-on-text'>爆赞 {item.likeNum}</text>
+                      </view>
                     </View>
                   </CouponMedia.Body>
                 </CouponMedia>
               </CouponCard>
             </View>
-
-          )
-          // <view class='wrapper'>
-          //   <view class='left-complete-one'   >
-          //     <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'  >
-          //         <view className='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
-          //       </view>
-          //       <text className='title-money' >￥{formatPrice(item.averagePrice)}元</text>
-          //       <view onClick={toggleLike}>
-          //         <image className='title-on' src={isLike === 1 ? baozan : weibaozan} />
-          //         <text className='title-on-text'>爆赞 {item.likeNum}</text>
-          //       </view>
-          //       <view className='title-position-on'>
-          //         <image className='title-position' src={position} />
-          //         <text className='title-position-image'>
-          //           {
-          //             item.areaPName === null ? item.areaName : (item.areaPName + '/' + item.areaName)
-          //           }
-          //         </text>
-          //       </view>
-          //     </view>
-          //   </view>
-          //   <view class='right-complete-two'>
-          //     <view className='right-content' onClick={() => { targetType === 'tourist' ? Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }) : Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.targetId}` }) }}>
-          //       <image className='right-image' src={SeeDetails} />
-          //       <view className='right-title'>查看详情</view>
-          //     </view>
-          //   </view>
-          // </view>
-
+          )          
         }
-      </View>
     </View>
   )
 }

src/components/CollectList/MyCollect/style.less

@@ -1,489 +1,49 @@
-@whiteColor: #fff;
 .View-box-LR {
-  margin: 30px 0;
-  .left-View-box {
-    .wrapper {
-      display: flex;
-      position: relative;
-      margin: 30px auto;
-      width: 100%;
-      // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-      // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
-      filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
-
-      .card-box-star {
-        position: absolute;
-        width: auto;
-        height: 44.3px;
-        position: absolute;
-        left: 183px;
-        top: 28px;
-        font-size: 20px;
-        color: @whiteColor;
-        .card-star-image {
-          padding-left: 6px;
-          width: 21px;
-          height: 21px;
-        }
-        .card-star-text {
-          padding-left: 10px;
-          font-size: 20px;
-          color: #333;
-          font-weight: 700;
-        }
-      }
-
-      .left-complete-one {
-        padding-top: 87px;
-        padding-bottom: 43px;
-        position: relative;
-        display: flex;
-        background: @whiteColor;
-        background: radial-gradient(
-              circle at top right,
-              transparent 15px,
-              #fff 0
-            )
-            top right,
-          radial-gradient(circle at bottom right, transparent 15px, #fff 0 0)
-            bottom right;
-        background-size: 100% 60%;
-        background-repeat: no-repeat;
-
-        width: 573px;
-        border-radius: 15px 0px 0px 15px;
-        // border-radius: 12px;
-
-        align-items: center;
-        .left-image-1 {
-          width: 145px;
-          height: 44px;
-          position: absolute;
-          top: 22px;
-        }
-        .left-viewText {
-          // background-image: url(@Image-ProCard_hot);
-          // width: 287px;
-          width: auto;
-          height: 44.3px;
-          position: absolute;
-          left: 1px;
-          top: 28px;
-          font-size: 24px;
-          color: @whiteColor;
-          font-weight: 600;
-        }
-        //图片
-        .title-image {
-          height: 144px;
-          margin-left: 20px;
-          border-radius: 24px;
-          overflow: hidden;
-          position: relative;
-          .image-1 {
-            width: 144px;
-            height: 144px;
-            margin: 0;
-          }
-          .image-2 {
-            width: 89px;
-            height: 34px;
-            position: absolute;
-            left: 0;
-          }
-        }
-        // 商品标题
-        .title-content {
-          // padding: 84px 0 56px 20px;
-          padding-left: 18px;
-
-          .Pro-title {
-            .title-text {
-              width: 375px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              display: -webkit-box; //必须要
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
-              word-break: break-all; /* 多出文本省略号代替 */
-              text-align: left;
-              font-size: 24px;
-              padding-bottom: 10px;
-            }
-          }
-          .title-money {
-            padding-top: 34px;
-            font-size: 24px;
-            // color: red;
-            font-weight: 800;
-          }
-          .title-money-2 {
-            font-size: 18px;
-            padding-left: 10px;
-            text-decoration: line-through;
-            color: rgba(102, 102, 102, 0.8);
-          }
-
-          .title-time {
-            font-size: 24px;
-            padding-top: 20px;
-            color: #c0c8d3;
-          }
-          .title-position-on {
-            display: flex;
-            font-size: 20px;
-            .title-position {
-              width: 18px;
-              height: 24px;
-              padding-right: 10px;
-              padding-top: 5px;
-            }
-            .title-position-image {
-              align-items: center;
-              font-size: 20px;
-              color: #333;
-            }
-            // .title-on {
-            //   // margin-bottom: 10px;
-            //   padding-top: 5px;
-            //   padding-left: 40px;
-            //   width: 21px;
-            //   height: 21px;
-            //   padding-right: 10px;
-            // }
-            .title-on-text {
-              align-items: center;
-
-              font-size: 20px;
-              color: #333;
-            }
-          }
-        }
-      }
-    }
+  margin: 30px 0;  
+  .cpn-card-text {
+    font-size: 24px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 40px;
+    vertical-align: baseline;
 
-    .right-complete-two {
-      background: @whiteColor;
-      background: radial-gradient(
-            circle at top left,
-            transparent 15px,
-            #fff 0 0
-          )
-          top left,
-        radial-gradient(circle at bottom left, transparent 15px, #fff 0 0)
-          bottom left;
-      background-size: 100% 60%;
-      background-repeat: no-repeat;
-      width: 129px;
-      border-radius: 0 15px 15px 0;
-      position: relative;
-      //右面部分
-      .right-content {
-        // width: 50%;
-        height: 134px;
-        position: absolute;
-        top: calc(50% - 45px);
-        left: calc(50% - 30px);
-        .right-image {
-          width: 35px;
-          height: 34px;
-          margin-left: calc(50% - 41.5px);
-        }
+    & > text {
+      display: inline-block;
 
-        .right-title {
-          font-weight: 700;
-          width: 110px;
-          font-size: 24px;
-          padding-top: 15px;
-          text-align: center;
-          position: relative;
-          left: -22px;
-        }
+      & + text {
+        margin-left: 8px;
       }
     }
-    //线条
-    .right-complete-two::after {
-      content: "";
-      position: absolute;
-      top: 15px;
-      margin: 26px auto;
-      height: 70%;
-      border-left: 1px dashed #595959;
-      opacity: 0.12;
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
     }
-  }
-  .right-View-box {
-    .wrapper {
-      display: flex;
-      position: relative;
-      margin: 30px auto;
-      width: 100%;
-      // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-      // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
-      filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
-
-      .card-box-star {
-        position: absolute;
-        width: auto;
-        height: 44.3px;
-        position: absolute;
-        left: 183px;
-        top: 28px;
-        font-size: 20px;
-        color: @whiteColor;
-        .card-star-image {
-          padding-left: 6px;
-          width: 21px;
-          height: 21px;
-        }
-        .card-star-text {
-          padding-left: 10px;
-          font-size: 20px;
-          color: #333;
-          font-weight: 700;
-        }
-      }
-
-      .left-complete-one {
-        padding-top: 41px;
-        padding-bottom: 45px;
-        position: relative;
-        display: flex;
-        background: @whiteColor;
-        background: radial-gradient(
-              circle at top right,
-              transparent 15px,
-              #fff 0
-            )
-            top right,
-          radial-gradient(circle at bottom right, transparent 15px, #fff 0 0)
-            bottom right;
-        background-size: 100% 60%;
-        background-repeat: no-repeat;
-
-        width: 573px;
-        border-radius: 15px 0px 0px 15px;
-        // border-radius: 12px;
-
-        align-items: center;
-        .left-image-1 {
-          width: 145px;
-          height: 44px;
-          position: absolute;
-          top: 22px;
-        }
-        .left-viewText {
-          // background-image: url(@Image-ProCard_hot);
-          // width: 287px;
-          width: auto;
-          height: 44.3px;
-          position: absolute;
-          left: 1px;
-          top: 28px;
-          font-size: 24px;
-          color: @whiteColor;
-          font-weight: 600;
-        }
-        //图片
-        .title-image {
-          height: 144px;
-          margin-left: 20px;
-          border-radius: 24px;
-          overflow: hidden;
-          position: relative;
-          .image-1 {
-            width: 144px;
-            height: 144px;
-            margin: 0;
-          }
-          .image-2 {
-            width: 89px;
-            height: 34px;
-            position: absolute;
-            left: 0;
-          }
-        }
-        // 商品标题
-        .title-content {
-          // padding: 84px 0 56px 20px;
-          padding-left: 18px;
-
-          .Pro-title {
-            .title-text {
-              width: 375px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              // display: -webkit-box; //必须要
-              -webkit-line-clamp: 1;
-              -webkit-box-orient: vertical;
-              // word-break: break-all; /* 多出文本省略号代替 */
-              text-align: left;
-              font-size: 24px;
-              // padding-bottom: 10px;
-              //
-            }
-          }
-          .title-money {
-            padding-top: 34px;
-            font-size: 24px;
-            // color: red;
-            font-weight: 800;
-          }
-          .title-money-2 {
-            font-size: 18px;
-            padding-left: 10px;
-            text-decoration: line-through;
-            color: rgba(102, 102, 102, 0.8);
-          }
-          .title-on {
-            width: 21px;
-            height: 21px;
-            padding-right: 10px;
-          }
-          .title-on-text {
-            align-items: center;
 
-            font-size: 20px;
-            color: #333;
-          }
-
-          .title-time {
-            font-size: 24px;
-            padding-top: 20px;
-            color: #c0c8d3;
-          }
-          .title-position-on {
-            display: flex;
-            font-size: 20px;
-            .title-position {
-              width: 18px;
-              height: 24px;
-              padding-right: 10px;
-              padding-top: 5px;
-            }
-            .title-position-image {
-              align-items: center;
-              font-size: 20px;
-              color: #333;
-            }
-            // .title-on {
-            //   // margin-bottom: 10px;
-            //   padding-top: 5px;
-            //   padding-left: 40px;
-            //   width: 21px;
-            //   height: 21px;
-            //   padding-right: 10px;
-            // }
-            .title-on-text {
-              align-items: center;
-
-              font-size: 20px;
-              color: #333;
-            }
-          }
-        }
-      }
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
     }
-
-    .right-complete-two {
-      background: @whiteColor;
-      background: radial-gradient(
-            circle at top left,
-            transparent 15px,
-            #fff 0 0
-          )
-          top left,
-        radial-gradient(circle at bottom left, transparent 15px, #fff 0 0)
-          bottom left;
-      background-size: 100% 60%;
-      background-repeat: no-repeat;
-      width: 129px;
-      border-radius: 0 15px 15px 0;
+  }
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
+    position: relative;
+    .wdscbaozan{
+    .title-on {
+      width: 28px;
+      height: 28px;
+      padding-right: 10px;
       position: relative;
-      //右面部分
-      .right-content {
-        // width: 50%;
-        height: 134px;
-        position: absolute;
-        top: calc(50% - 45px);
-        left: calc(50% - 30px);
-        .right-image {
-          width: 35px;
-          height: 34px;
-          margin-left: calc(50% - 41.5px);
-        }
-
-        .right-title {
-          font-weight: 700;
-          width: 110px;
-          font-size: 24px;
-          padding-top: 15px;
-          text-align: center;
-          position: relative;
-          left: -22px;
-        }
-      }
-    }
-    //线条
-    .right-complete-two::after {
-      content: "";
-      position: absolute;
-      top: 15px;
-      margin: 26px auto;
-      height: 70%;
-      border-left: 1px dashed #595959;
-      opacity: 0.12;
+      top: 0.1em;
     }
-  }
-}
-.cpn-card-text {
-  font-size: 24px;
-  font-weight: 400;
-  color: #333333;
-  line-height: 40px;
-  vertical-align: baseline;
-
-  & > text {
-    display: inline-block;
-
-    & + text {
-      margin-left: 8px;
+    .title-on-text {
+      align-items: center;
+      font-size: 22px;
+      color: #333;
     }
   }
-  &_mn {
-    font-size: 24px;
-    font-weight: bold;
-    color: #333333;
-  }
-
-  &_rm {
-    font-size: 18px;
-    font-weight: 400;
-    text-decoration: line-through;
-    color: #666666;
-  }
-}
-
-.cpn-md-act {
-  display: flex;
-  margin-top: 10px;
-  position: relative;
-
-  & > view {
-    flex: 1;
-  }
-  .wdscbaozan{
-  .title-on {
-    width: 28px;
-    height: 28px;
-    padding-right: 10px;
-    position: relative;
-    top: 0.1em;
-  }
-  .title-on-text {
-    align-items: center;
-    font-size: 22px;
-    color: #333;
   }
-}
-}
+}

src/components/CompoentsOrder/complete/index.jsx

@@ -123,17 +123,13 @@ export default (props) => {
   };
 
   const slideButtonTap = (e) => {
-
     deleteOrder(e.orderId || '').then(() => {
       Taro.showToast({
         title: '删除订单成功',
         icon: 'none',
       })
       getList();
-
     })
-
-
   }
 
 
@@ -447,11 +443,6 @@ export default (props) => {
           </view>
       }
     </scroll-view>
-  );
+  
+  )
 };
-
-//  {/* 待核销 */}
-
-//  {/* 待支付 */}
-
-//  {/* 已过期 */}

src/pages/MineUserAll/Collect/index.jsx

@@ -1,4 +1,4 @@
-
+import Taro, { useDidShow } from '@tarojs/taro'
 import CustomNav from '@/components/CustomNav'
 import { useState } from "react";
 import withLayout from '@/layouts'
@@ -12,6 +12,9 @@ export default withLayout((props) => {
   const { router, person, location } = props
   const [collectContent, setCollectContent] = useState([])
   const [queryParams, setQueryParams] = useState({ location: location, pageNum: 1, pageSize: 10 })
+  useDidShow(() => {
+    setQueryParams({ location: location, pageNum: 1, pageSize: 10 })
+  })
   return (
     <view className='page-index box-content'>
       <view className='index-navbar'>

src/pages/MineUserAll/Collect/style.less

@@ -1,5 +1,3 @@
-@whiteColor: #fff;
-
 .box-content {
   padding: 0 25px;
   .botton{

src/pages/index/tabs/MineCss/style.less

@@ -174,7 +174,7 @@
 
       .Badge-list-logo {
         width: 39px;
-        height: 33px;
+        height: 39px;
         padding: 0 30px;
       }
       .Badge-list-titme {