Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CollectList/AttractionsCollect/index.jsx

@@ -0,0 +1,47 @@
+import Taro from "@tarojs/taro";
+import { useState } from "react";
+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 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/housemantj/onlove.png'
+import starOff from '@/assets/icons/housemantj/景点爆赞.png'
+import './style.less'
+
+
+export default (props) => {
+
+  return (
+    <view class='wrapper'>
+      <view class='left-complete-one' style='padding-top: 20px;'>
+        <view className='title-image'>
+          <image className='image-1' mode='scaleToFill' src={image}></image>
+          <image className='image-2' src={Attractions}></image>
+        </view>
+        <view className='title-content'>
+          <view className='Pro-title'>
+            <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
+          </view>
+          <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
+          <view className='title-position-on'>
+            <image className='title-position' src={position} />
+            <text className='title-position-image'>南京市/秦淮区</text>
+            <image className='title-on' src={starOn} />
+          </view>
+        </view>
+      </view>
+      <view class='right-complete-two'>
+        <view className='right-content'>
+          <image className='right-image' src={SeeDetails} />
+          <view className='right-title'>查看详情</view>
+        </view>
+      </view>
+    </view>
+  )
+}
+

src/components/CollectList/AttractionsCollect/style.less

@@ -0,0 +1,228 @@
+@whiteColor: #fff;
+
+.wrapper-tourist {
+  margin-top: 40px;
+  display: flex;
+  position: relative;
+  // margin-top: 600px;
+  // margin: 30px auto;
+  width: 700px;
+
+  // 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: 200px;
+    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: 85px;
+    padding-bottom: 43px;
+    position: relative;
+    display: flex;
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top right,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top right,
+      radial-gradient(circle at bottom right, transparent 15px, @whiteColor 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: 20px;
+      color: @whiteColor;
+    }
+    //图片
+    .title-image {
+      width: 145px;
+      margin-left: 20px;
+      border-radius: 24px;
+      overflow: hidden;
+      position: relative;
+      .image-1 {
+        width: 100%;
+        height: 145px;
+      }
+      .image-2 {
+        width: 89px;
+        height: 34px;
+        position: absolute;
+        left: 0;
+        top: 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;
+        color: #666;
+        padding-left: 10px;
+        text-decoration: line-through;
+      }
+
+      .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;
+        }
+      }
+    }
+  }
+  // .left-complete-one:nth-child(2) {
+  //   background: rgb(182, 0, 0);
+  //   padding-top: 10px;
+  // }
+}
+
+.right-complete-two {
+  background: @whiteColor;
+  background: radial-gradient(
+        circle at top left,
+        transparent 15px,
+        @whiteColor 0
+      )
+      top left,
+    radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+      bottom left;
+  background-size: 100% 60%;
+  background-repeat: no-repeat;
+  width: 129px;
+  border-radius: 0 15px 15px 0;
+  position: relative;
+  //右面部分
+  .right-content {
+    // width: 100px;
+    height: 120px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    // border: 1px solid red;
+
+    .right-number {
+      // width: 32px;
+      // font-size: 20px;
+      // border-radius: 4px;
+      // border: 2px solid #999;
+      // margin: auto;
+      // text-align: center;
+    }
+    .right-image {
+      // float: convert();
+      width: 35px;
+      height: 34px;
+      margin: 0 auto;
+      align-items: center;
+      margin: auto;
+      padding-left: 8px;
+      // text-align: center;
+    }
+
+    .right-title {
+      font-weight: 700;
+      font-size: 24px;
+      padding-top: 15px;
+      text-align: center;
+    }
+  }
+}
+//线条
+.right-complete-two::after {
+  content: "";
+  position: absolute;
+  top: 15px;
+  margin: 26px auto;
+  height: 70%;
+  border-left: 1px dashed #595959;
+}

src/components/CollectList/FoodCollect/index.jsx

@@ -0,0 +1,147 @@
+import Taro from '@tarojs/taro'
+import useSave from "@/utils/hooks/useSave"
+import useLike from "@/utils/hooks/useLike"
+
+import { getShopDetail, getShopcity } from '@/services/home'
+import { useState, useEffect } from 'react'
+import { View } from '@tarojs/components'
+
+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/爆赞.png'
+import weibaozan from '@/assets/icons/housemantj/未赞.png'
+import starOn from '@/assets/icons/housemantj/onlove.png'
+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 './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 [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])
+
+
+
+  const star = parseFloat(((item.sweetScore + item.environmentScore + item.serviceScore) / 3).toFixed(1));
+  return (
+    <View>
+      {
+        targetType === "shop_package" && (
+          <view class='wrapper'>
+            <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}
+              </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() }}>
+                <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='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
+                </view>
+                <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>
+                <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-number'>×1</view> */}
+                <image className='right-image' src={SeeDetails} />
+                <view className='right-title'>查看详情</view>
+              </view>
+            </view>
+          </view>
+        )
+      }
+      <View>
+        {
+          targetType !== "shop_package" && (
+            <view class='wrapper-tourist'>
+              <view class='left-complete-one'   >
+                <view className='title-image' onClick={() => { goFood() }}>
+                  <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='title-text'>{(item.title).toString().length > 25 ? (item.title).substring(0, 25) + '...' : (item.title)}</view>
+                  </view>
+                  <text className='title-money' >￥{item.actualPrice / 100}元<text className='title-money-2'>门市价{item.standardPrice / 100}元</text></text>
+                  <view onClick={toggleSave}>
+                    <image className='title-on' src={isLike > 0 ? baozan : weibaozan} />
+                    <text onClick={toggleLike} className='title-on-text'>{isLike > 0 ? '已爆赞' : '爆赞'}</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-number'>×1</view> */}
+                  <image className='right-image' src={SeeDetails} />
+                  <view className='right-title'>查看详情</view>
+                </view>
+              </view>
+            </view>
+          )
+        }
+      </View>
+
+    </View>
+
+
+  )
+}

src/components/CollectList/FoodCollect/style.less

@@ -0,0 +1,456 @@
+@whiteColor: #fff;
+
+.wrapper {
+  margin-top: 40px;
+  display: flex;
+  position: relative;
+  // margin-top: 600px;
+  // margin: 30px auto;
+  width: 700px;
+
+  // 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: 200px;
+    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: 85px;
+    padding-bottom: 43px;
+    position: relative;
+    display: flex;
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top right,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top right,
+      radial-gradient(circle at bottom right, transparent 15px, @whiteColor 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: 20px;
+      color: @whiteColor;
+    }
+    //图片
+    .title-image {
+      width: 145px;
+      margin-left: 20px;
+      border-radius: 24px;
+      overflow: hidden;
+      position: relative;
+      .image-1 {
+        width: 100%;
+        height: 145px;
+      }
+      .image-2 {
+        width: 89px;
+        height: 34px;
+        position: absolute;
+        left: 0;
+        top: 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;
+        color: #666;
+        padding-left: 10px;
+        text-decoration: line-through;
+      }
+
+      .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;
+        }
+      }
+    }
+  }
+  // .left-complete-one:nth-child(2) {
+  //   background: rgb(182, 0, 0);
+  //   padding-top: 10px;
+  // }
+}
+
+.right-complete-two {
+  background: @whiteColor;
+  background: radial-gradient(
+        circle at top left,
+        transparent 15px,
+        @whiteColor 0
+      )
+      top left,
+    radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+      bottom left;
+  background-size: 100% 60%;
+  background-repeat: no-repeat;
+  width: 129px;
+  border-radius: 0 15px 15px 0;
+  position: relative;
+  //右面部分
+  .right-content {
+    // width: 100px;
+    height: 120px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    // border: 1px solid red;
+
+    .right-number {
+      // width: 32px;
+      // font-size: 20px;
+      // border-radius: 4px;
+      // border: 2px solid #999;
+      // margin: auto;
+      // text-align: center;
+    }
+    .right-image {
+      // float: convert();
+      width: 35px;
+      height: 34px;
+      margin: 0 auto;
+      align-items: center;
+      margin: auto;
+      padding-left: 8px;
+      // text-align: center;
+    }
+
+    .right-title {
+      font-weight: 700;
+      font-size: 24px;
+      padding-top: 15px;
+      text-align: center;
+    }
+  }
+}
+//线条
+.right-complete-two::after {
+  content: "";
+  position: absolute;
+  top: 15px;
+  margin: 26px auto;
+  height: 70%;
+  border-left: 1px dashed #595959;
+}
+
+
+.wrapper-tourist {
+  margin-top: 40px;
+  display: flex;
+  position: relative;
+  // margin-top: 600px;
+  // margin: 30px auto;
+  width: 700px;
+
+  // 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: 200px;
+    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: 35px;
+    padding-bottom: 43px;
+    position: relative;
+    display: flex;
+    background: @whiteColor;
+    background: radial-gradient(
+          circle at top right,
+          transparent 15px,
+          @whiteColor 0
+        )
+        top right,
+      radial-gradient(circle at bottom right, transparent 15px, @whiteColor 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: 20px;
+      color: @whiteColor;
+    }
+    //图片
+    .title-image {
+      width: 145px;
+      margin-left: 20px;
+      border-radius: 24px;
+      overflow: hidden;
+      position: relative;
+      .image-1 {
+        width: 100%;
+        height: 145px;
+      }
+      .image-2 {
+        width: 89px;
+        height: 34px;
+        position: absolute;
+        left: 0;
+        top: 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;
+        color: #666;
+        padding-left: 10px;
+        text-decoration: line-through;
+      }
+
+      .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;
+      }
+    }
+  }
+  // .left-complete-one:nth-child(2) {
+  //   background: rgb(182, 0, 0);
+  //   padding-top: 10px;
+  // }
+}
+
+.right-complete-two {
+  background: @whiteColor;
+  background: radial-gradient(
+        circle at top left,
+        transparent 15px,
+        @whiteColor 0
+      )
+      top left,
+    radial-gradient(circle at bottom left, transparent 15px, @whiteColor 0)
+      bottom left;
+  background-size: 100% 60%;
+  background-repeat: no-repeat;
+  width: 129px;
+  border-radius: 0 15px 15px 0;
+  position: relative;
+  //右面部分
+  .right-content {
+    // width: 100px;
+    height: 120px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    // border: 1px solid red;
+
+    .right-number {
+      // width: 32px;
+      // font-size: 20px;
+      // border-radius: 4px;
+      // border: 2px solid #999;
+      // margin: auto;
+      // text-align: center;
+    }
+    .right-image {
+      // float: convert();
+      width: 35px;
+      height: 34px;
+      margin: 0 auto;
+      align-items: center;
+      margin: auto;
+      padding-left: 8px;
+      // text-align: center;
+    }
+
+    .right-title {
+      font-weight: 700;
+      font-size: 24px;
+      padding-top: 15px;
+      text-align: center;
+    }
+  }
+}
+//线条
+.right-complete-two::after {
+  content: "";
+  position: absolute;
+  top: 15px;
+  margin: 26px auto;
+  height: 70%;
+  border-left: 1px dashed #595959;
+}

src/components/ShopUsed/index.jsx

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/taro'
 import { getShopList, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
-
+import { View, Button, Text, Image } from '@tarojs/components'
 import { useState, useEffect } from 'react'
 import iconsearch from '@/assets/icons/housemantj/search.png'
 import ms from '@/assets/icons/housemantj/ms3.jpg'
@@ -34,22 +34,22 @@ export default (props) => {
   }, [])
 
   return (
-    <view className='orderCard'>
-      <view style={{ overflow: 'hidden' }}>
-        <view className='orderId'>订单编号：{item.orderId}</view>
-        <view className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</view>
-      </view>
-      <view className='order'>
-        <image className='orderImg' src={item.poster} mode='aspectFit' />
-        <view className='orderRight'>
-          <view className='foodName'>{item.description}</view>
-          <view className='price'>合计金额：￥<text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</text>元 <text className='pnum'>数量：<text>1</text>张</text> </view>
-        </view>
-        <view className='line' />
-        <view className='phone'>客户手机：<text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</text>
-          <button className='button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button> </view>
-      </view>
-    </view>
+    <View className='orderCard'>
+      <View style={{ overflow: 'hidden' }}>
+        <View className='orderId'>订单编号：{item.orderId}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss')}</View>
+      </View>
+      <View className='order'>
+        <Image className='orderImg' src={item.poster} mode='aspectFit' />
+        <View className='orderRight'>
+          <View className='foodName'>{item.description}</View>
+          <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
+        </View>
+        <View className='line' />
+        <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
+          <button className='Button-OK' onClick={confirmOrder} style={{ display: buttonStyle }}  >确认核销</button> </View>
+      </View>
+    </View>
   )
 }
 

src/components/ShopUsed/style.less

@@ -69,20 +69,16 @@
       line-height: 44px;
       height: 23px;
       margin: 30px 0;
+      // .Button-OK{
+      //   font-size: 28px;   
+      //   color: #C0C8D3;
+      //   line-height: 34px;
+      //   text-align: center;
+      //   padding:40px 0 100px 0;
+      // }
+
     }
-    .button-OK{
-      width: 160px;
-    height: 40px;
-    background: #1A3B83;
-    /* margin: 0 auto; */
-    line-height: 40px;
-    border-radius: 12px;
-    font-size: 23px;
-    color: #ffffff;
-    position: relative;
-    right: -8em;
-    top: -2em;
-    }
+
     .tripTime{
       font-size: 24px;
       color: #666666;
@@ -90,12 +86,19 @@
       margin-bottom: 30px;
     }
   }
+
   
 }
-.botton{
-  font-size: 28px;   
-  color: #C0C8D3;
-  line-height: 34px;
-  text-align: center;
-  padding:40px 0 100px 0;
-}
+button{
+  width: 160px;
+height: 40px;
+background: #1A3B83;
+/* margin: 0 auto; */
+line-height: 40px;
+border-radius: 12px;
+font-size: 23px;
+color: #ffffff;
+position: relative;
+right: -8em;
+top: -2em;
+}

src/pages/MineUserAll/Collect/index.jsx

@@ -1,156 +1,68 @@
 
 import CustomNav from '@/components/CustomNav'
-import { useState } from "react";
+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 AttractionsCollect from '@/components/CollectList/AttractionsCollect'
+import FoodCollect from '@/components/CollectList/FoodCollect'
+
 
 import './style.less'
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
 
 export default withLayout((props) => {
-  const { router, person } = props
+  const { router, person, location } = props
+  console.log("🚀 ~ file: index.jsx ~ line 27 ~ withLayout ~ props", props)
+  const [collectContent, setCollectContent] = useState([])
+
 
-  const [value, setVaule] = useState('已收藏')
-  const [imageSrc, setImageSrc] = useState(starOn)
 
+  useEffect(() => {
+    getCollectList({
+      pageNum: 1,
+      pageSize: 99,
+      location: location,
+
+    }).then(val => {
+      setCollectContent(val.records)
+    })
+  }, [location])
 
 
 
-  const Ac = () => {
-    setImageSrc(starOff)
-    setVaule('加入收藏')
-    // console.log('------------', value);
 
-  }
   return (
     <view className='box-content'>
       <CustomNav title='我的收藏' />
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          {/* 评分 */}
-          <view className='card-box-star'>
-            {
-              scoreList.map((_, index) => {
-
-                const src = (index + '0.1') < score ? starOn : starOff
-                return (
-                  <image className='card-star-image' key={index} src={src} />
-                )
-              })
-            }
-            <text className='card-star-text' >{score}</text>
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
-            </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-position-on'>
-              <image className='title-position' src={position} />
-              <text className='title-position-image'>南京市/秦淮区</text>
-              <image className='title-on' src={imageSrc} />
-              <text onClick={() => Ac()} className='title-on-text'>{value}</text>
-            </view>
-          </view>
-        </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-            <image className='right-image' src={SeeDetails} />
-            <view className='right-title'>查看详情</view>
-          </view>
-        </view>
-      </view>
-      <view class='wrapper'>
-        <view class='left-complete-one'>
-          <image className='left-image-1' src={ProCard_hot}></image>
-          <view className='left-viewText'>
-            返现￥16.00
-          </view>
-          {/* 评分 */}
-          <view className='card-box-star'>
-            {
-              scoreList.map((_, index) => {
-
-                const src = (index + '0.1') < score ? starOn : starOff
-                return (
-                  <image className='card-star-image' key={index} src={src} />
-                )
-              })
-            }
-            <text className='card-star-text' >{score}</text>
-          </view>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={food}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
-            </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-position-on'>
-              <image className='title-position' src={position} />
-              <text className='title-position-image'>南京市/秦淮区</text>
-              <image className='title-on' src={imageSrc} />
-              <text onClick={() => Ac()} className='title-on-text'>{value}</text>
-            </view>
-          </view>
-        </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-            <image className='right-image' src={SeeDetails} />
-            <view className='right-title'>查看详情</view>
-          </view>
-        </view>
-      </view>
-      <view class='wrapper'>
-        <view class='left-complete-one' style='padding-top: 20px;'>
-          <view className='title-image'>
-            <image className='image-1' mode='scaleToFill' src={image}></image>
-            <image className='image-2' src={Attractions}></image>
-          </view>
-          <view className='title-content'>
-            <view className='Pro-title'>
-              <view className='title-text'>【橘里橘啊换行啊啊啊气咖啡店】新鲜出炉啦!</view>
-            </view>
-            <text className='title-money' >￥6990元<text className='title-money-2'>门市价78元</text></text>
-            <view className='title-position-on'>
-              <image className='title-position' src={position} />
-              <text className='title-position-image'>南京市/秦淮区</text>
-              <image className='title-on' src={imageSrc} />
-              <text onClick={() => Ac()} className='title-on-text'>{value}</text>
-            </view>
-          </view>
-        </view>
-        <view class='right-complete-two'>
-          <view className='right-content'>
-            <image className='right-image' src={SeeDetails} />
-            <view className='right-title'>查看详情</view>
-          </view>
-        </view>
+
+      <view>
+        {
+          collectContent.map((item, index) => {
+            return <FoodCollect key={(index)} item={item} />
+          })
+
+        }
+
+
       </view>
+      {/* {
+        collectContent.map((item, index) => {
+          return <AttractionsCollect key={(index)} item={item} />
+        })
+
+      } */}
       <view className='foot'>
         已经到底了~
       </view>

src/pages/RoomOrder/components/RoomForm/index.jsx

@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import { Text, Input } from '@tarojs/components'
 import './style.less'
+import { useShareTimeline } from '@tarojs/taro'
 
 
 

src/pages/TobeShop/index.jsx

@@ -12,7 +12,7 @@ import image from "@/assets/icons/ProCard/8kb.jpg";
 import food from "@/assets/icons/ProCard/food.png";
 import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import { Button, Icon, Text, Textarea } from "@tarojs/components";
-import { getVerifyTargetList,putVerifyTarget } from "@/services/payOrder";
+import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
 import formatTime from '@/utils/formatTime'
 import "./style.less";
 import Taro from "@tarojs/taro";
@@ -26,7 +26,7 @@ export default withLayout((props) => {
 
   const [checked, setChecked] = useState();
 
-  
+
 
   const [list, setList] = useState([]);
 
@@ -35,17 +35,17 @@ export default withLayout((props) => {
       shopId: id,
       isMine: true,
       isVerified: 0,
-      pageNum:1,
-      pageSize:50,
+      pageNum: 1,
+      pageSize: 50,
     }).then((res) => {
-      if(res){
+      if (res) {
         setList(res.records)
-        
-          setChecked(res?.records.filter(x=>x.subOrderId==subOrderId)[0].verifyNo)
-        
+
+        setChecked(res?.records.filter(x => x.subOrderId == subOrderId)[0]?.verifyNo)
+
         // if(item.verifyNo==checked)
       }
-      
+
     });
   };
 
@@ -60,18 +60,18 @@ export default withLayout((props) => {
     setShowDialog(false);
   };
   const ButtonOK = (e) => {
-    if(!checked) return
+    if (!checked) return
     // setShowDialog(false)
     if (showDialog === true) {
       Taro.showLoading({
-        title:'核销中'
+        title: '核销中'
       })
-    
-      putVerifyTarget(checked).then(res=>{
+
+      putVerifyTarget(checked).then(res => {
         Taro.hideLoading()
         setShowDialog(false);
         setConsumption(true);
-      }).catch(e=>{
+      }).catch(e => {
         Taro.hideLoading()
         setShowDialog(false);
         Taro.showToast({
@@ -85,10 +85,10 @@ export default withLayout((props) => {
 
   const PerfectionOK = () => {
     setConsumption(false);
-    if(list?.length>1){
+    if (list?.length > 1) {
       getList()
-    }else{
-      Taro.navigateBack({delta: 1})
+    } else {
+      Taro.navigateBack({ delta: 1 })
     }
   };
 
@@ -136,12 +136,12 @@ export default withLayout((props) => {
         </view>
         <view>
           {list?.map((item) => {
-            
+
             return (
-              <view class="wrapper" key={item.verifyNo} onClick={()=>setChecked(item.verifyNo)}>
+              <view class="wrapper" key={item.verifyNo} onClick={() => setChecked(item.verifyNo)}>
                 <view class="left-complete-one">
                   <view className="Check_OK-box">
-                    <image className="Check_OK-image" src={item.verifyNo==checked? Check_OK:Check_NO} />
+                    <image className="Check_OK-image" src={item.verifyNo == checked ? Check_OK : Check_NO} />
                   </view>
                   <image className="left-image-1" src={ProCard_hot}></image>
                   <view className="left-viewText">返现￥16.00</view>
@@ -161,11 +161,11 @@ export default withLayout((props) => {
                       </view>
                     </view>
                     <text className="title-money">
-                      ￥{item.actualPrice/100}元<text className="title-money-2">门市价{item.standPrice/100}元</text>
+                      ￥{item.actualPrice / 100}元<text className="title-money-2">门市价{item.standPrice / 100}元</text>
                     </text>
                     <view className="title-time">
                       有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
-                        {formatTime(item?.expireDate, "yyyy/MM/dd")}
+                      {formatTime(item?.expireDate, "yyyy/MM/dd")}
                     </view>
                   </view>
                 </view>

src/pages/details/foodDetails/foodDetails.jsx

@@ -23,18 +23,19 @@ import './foodDetails.less'
 
 export default withLayout((props) => {
   const { router, person } = props
-  const { id, subOrderId} = props.router.params
+  const { id, subOrderId } = props.router.params
   // console.log(id,subOrderId,'--333-----')
-  useEffect(()=>{
-    console.log(id,subOrderId,'-------')
-    if(id&&subOrderId){
+  useEffect(() => {
+    console.log(id, subOrderId, '-------')
+    if (id && subOrderId) {
       Taro.navigateTo({
         url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
       });
     }
-  },[id, subOrderId])
+  }, [id, subOrderId])
   //商铺基础信息
   const [detail, setDetail] = useState({})
+  console.log("🚀 ~ file: foodDetails.jsx ~ line 38 ~ withLayout ~ setDetail", setDetail)
   //商铺套餐
   const [spackage, setPackage] = useState([])
   //banner图集数组

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

@@ -66,7 +66,7 @@
       position: relative;
       text-align: center;
       display: inline-block;
-      left: 1.5em;
+      left: -0.5em;
       .MessageCard-image {
         width: 30px;
         height: 30px;
@@ -90,7 +90,7 @@
       position: relative;
       text-align: center;
       display: inline-block;
-      left: 1.5em;
+      left: -0.5em;
       .MessageCard-image {
         width: 30px;
         height: 30px;
@@ -115,7 +115,7 @@
       text-align: center;
       display: inline-block;
       bottom: 40px;
-      left: 1.5em;
+      left: -0.5em;
       .MessageCard-image {
         width: 30px;
         height: 30px;

src/services/home.js

@@ -41,12 +41,27 @@ export const removeCollection = (targetType, targetId) => request(`/${targetType
  */
 export const getCollection = (targetType, targetId) => request(`/${targetType}/save/${targetId}`)
 
+
+
+/**
+ * 个人中心 --我的收藏
+ * @param {*} data 
+ * @returns 
+ */
+export const getCollectList = (params) => request(`/save`, { params })
+
+
+
+
 /**
  * 商铺详情
  * @param {*} id 
  * @returns 
  */
 export const getShopDetail = (id) => request(`/shop/${id}`)
+
+
+
 /**
 * 获取商铺套餐列表
 * @returns 

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -29,7 +29,7 @@ export default (props) => {
   const { params } = useRouter()
   const { tabJump } = params || {}
 
-  const [isyear, setYear] = useState(false)
+  const [isyear, setYear] = useState(true)
   const [isMomth, setMonth] = useState(false)
   //小眼睛开关
   const handleYear = () => {
@@ -77,7 +77,7 @@ export default (props) => {
   }
 
 
-  const onSeacrh = (e) => {
+  const onSearch = (e) => {
     console.log('eeeeeeeeeeeeeeeeee', e.detail.value);
   }