。

src/app.js

@@ -6,16 +6,23 @@ import './app.less'
 
 class App extends Component {
 
+  componentDidShow(options) {
+    if (options.path === 'pages/index/index' && options.query?.tab === '1' && options.query?.roomId) {
+      const { setRoomId } = store.getModel('hotel').getState()
+      setRoomId(options.query?.roomId)
+    }
+  }
+
   onLaunch(options) {
     console.group('APP Launch')
     console.debug(options)
     console.groupEnd()
 
-    const { login} = store.getModel('person').getState()
+    const { login } = store.getModel('person').getState()
 
     // 预拉取数据
     preFetchData().then((fetchData) => {
-      const { fromType, recommender, scene : qrCodeId } = options.query
+      const { fromType, recommender, scene: qrCodeId } = options.query
       Taro.setStorageSync({ key: 'scene', data: qrCodeId })
 
       // 登录获取人员信息
@@ -34,7 +41,7 @@ class App extends Component {
   }
 
   // this.props.children 是将要会渲染的页面
-  render () {
+  render() {
     return (
       <StoreRoot>
         {this.props.children}

src/components/AlreadyUsedMolded/style.less

@@ -14,9 +14,9 @@
     position: relative;
     display: flex;
     background: @whiteColor;
-    background: radial-gradient(circle at top right, transparent 15px, #fff) top
-        right,
-      radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
+    background: radial-gradient(circle at top right, transparent 15px, #fff 0)
+        top right,
+      radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
         right;
     background-size: 100% 60%;
     background-repeat: no-repeat;

src/components/BossCard/index.jsx

@@ -36,8 +36,8 @@ export default (props) => {
   return (
     <view class='container'>
       <view class='wrapper'>
-        <view class='left-complete-one'  >
-          <image className='left-image-1' src={ProCard_hot}></image>
+        <view class='left-complete-one' onClick={() => { goFood() }} >
+          {/* <image className='left-image-1' src={ProCard_hot}></image> */}
           <view className='left-viewText'>
             返现￥{(item.cashback / 100)?.toFixed(2)}
           </view>
@@ -46,23 +46,23 @@ export default (props) => {
             <Star star={st} />
             <text className='card-star-text' >{st}</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={food}></image>
           </view>
           <view className='title-content'>
-            <view className='Pro-title' onClick={() => { goFood() }} >
+            <view className='Pro-title'  >
               <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(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'>{det.areaName == '南京市' ? det.areaName : det.areaPName + '/' + det.areaName}</text>
-              <view style={{ display: 'inline-block' }} onClick={toggleSave}>
+              {/* <view style={{ display: 'inline-block' }} onClick={toggleSave}>
 
                 <image className='title-on' src={isSaved > 0 ? starOn : starOff} />
                 <text className='title-on-text'>{isSaved > 0 ? '已收藏' : '加入收藏'}</text>
-              </view>
+              </view> */}
             </view>
           </view>
         </view>

src/components/BossCard/style.less

@@ -78,10 +78,14 @@
       position: relative;
       display: flex;
       background: @whiteColor;
-      background: radial-gradient(circle at top right, transparent 15px, #fff 0)
+      background: radial-gradient(
+            circle at top right,
+            transparent 15px,
+            #fff 0 0
+          )
           top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
-          right;
+        radial-gradient(circle at bottom right, transparent 15px, #fff 0 0)
+          bottom right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
 
@@ -96,15 +100,17 @@
         position: absolute;
         top: 22px;
       }
+      // @/assets/icons/ProCard/ProCard_hot.png
       .left-viewText {
-        // background-image: url(@Image-ProCard_hot);
-        // width: 287px;
+        background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
+        background-size: 100% 100%;
+        padding: 0 24px 7px 2px;
         width: auto;
+        font-size: 24px;
+        line-height: 48px;
         height: 44.3px;
         position: absolute;
-        left: 1px;
-        top: 28px;
-        font-size: 24px;
+        top: 20px;
         color: @whiteColor;
         font-weight: 600;
       }
@@ -170,9 +176,9 @@
 
   .right-complete-two {
     background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff 0)
+    background: radial-gradient(circle at top left, transparent 15px, #fff 0 0)
         top left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
+      radial-gradient(circle at bottom left, transparent 15px, #fff 0 0) bottom
         left;
     background-size: 100% 60%;
     background-repeat: no-repeat;

src/components/CollectList/MyCollect/index.jsx

@@ -84,14 +84,15 @@ export default (props) => {
                   <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.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standardPrice)}元</text></text>
+                  <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'>{isLike === 1 ? '已爆赞' : '爆赞'}</text>
+                    <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'>
+
                       {
                         targetType === "tourist" && (
                           item.areaPName == null ? item.areaName : (item.areaPName + '/' + item.areaName)
@@ -106,7 +107,7 @@ export default (props) => {
                 </view>
               </view>
               <view class='right-complete-two'>
-                <view className='right-content' onClick={() => { Taro.navigateTo({ url: `/pages/details/mjDetails/sceneryDetails?id=${item.targetId}` }) }}>
+                <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>

src/components/CollectList/MyCollect/style.less

@@ -43,9 +43,9 @@
 //     position: relative;
 //     display: flex;
 //     background: @whiteColor;
-//     background: radial-gradient(circle at top right, transparent 15px, #fff) top
+//     background: radial-gradient(circle at top right, transparent 15px, #fff 0 ) top
 //         right,
-//       radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
+//       radial-gradient(circle at bottom right, transparent 15px, #fff 0 ) bottom
 //         right;
 //     background-size: 100% 60%;
 //     background-repeat: no-repeat;
@@ -153,6 +153,11 @@
 //         //   height: 21px;
 //         //   padding-right: 10px;
 //         // }
+// .title-on {
+//   width: 21px;
+//   height: 21px;
+//   padding-right: 10px;
+// }
 //         .title-on-text {
 //           align-items: center;
 
@@ -170,9 +175,9 @@
 
 // .right-complete-two {
 //   background: @whiteColor;
-//   background: radial-gradient(circle at top left, transparent 15px, #fff) top
+//   background: radial-gradient(circle at top left, transparent 15px, #fff 0 ) top
 //       left,
-//     radial-gradient(circle at bottom left, transparent 15px, #fff) bottom left;
+//     radial-gradient(circle at bottom left, transparent 15px, #fff 0 ) bottom left;
 //   background-size: 100% 60%;
 //   background-repeat: no-repeat;
 //   width: 129px;
@@ -251,9 +256,9 @@
 //     position: relative;
 //     display: flex;
 //     background: @whiteColor;
-//     background: radial-gradient(circle at top right, transparent 15px, #fff) top
+//     background: radial-gradient(circle at top right, transparent 15px, #fff 0 ) top
 //         right,
-//       radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
+//       radial-gradient(circle at bottom right, transparent 15px, #fff 0 ) bottom
 //         right;
 //     background-size: 100% 60%;
 //     background-repeat: no-repeat;
@@ -422,7 +427,7 @@
               #fff 0
             )
             top right,
-          radial-gradient(circle at bottom right, transparent 15px, #fff 0)
+          radial-gradient(circle at bottom right, transparent 15px, #fff 0 0)
             bottom right;
         background-size: 100% 60%;
         background-repeat: no-repeat;
@@ -541,10 +546,14 @@
 
     .right-complete-two {
       background: @whiteColor;
-      background: radial-gradient(circle at top left, transparent 15px, #fff 0)
+      background: radial-gradient(
+            circle at top left,
+            transparent 15px,
+            #fff 0 0
+          )
           top left,
-        radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
-          left;
+        radial-gradient(circle at bottom left, transparent 15px, #fff 0 0)
+          bottom left;
       background-size: 100% 60%;
       background-repeat: no-repeat;
       width: 129px;
@@ -586,5 +595,226 @@
     }
   }
   .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;
+            }
+          }
+        }
+      }
+    }
+
+    .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);
+        }
+
+        .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;
+    }
   }
 }

src/components/CompoentsOrder/TobeWritten/index.jsx

@@ -0,0 +1,59 @@
+
+import formatTime from "@/utils/formatTime";
+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 QRcode from "@/assets/icons/UserCenter/QRcode.png";
+
+import './style.less'
+
+
+export default (props) => {
+
+  const { item, onWrite } = props
+
+  return (
+    <view class='wrapper'>
+      <view class='left-complete-one'>
+        <image className='left-image-1' src={ProCard_hot}></image>
+        <view className='left-viewText'>
+          返现￥{(item.cashback / 100).toFixed(2)}
+        </view>
+        <view className='title-image'>
+          <image
+            className='image-1'
+            mode='scaleToFill'
+            src={item.poster || image}
+          ></image>
+          <image className='image-2' src={food}></image>
+        </view>
+        <view className='title-content'>
+          <view className='Pro-title'>
+            <view className='title-text'>
+              {item.packageDescription}
+              <text className='title-money-2'>
+                数量：{item.amount}张
+              </text>
+            </view>
+          </view>
+          <text className='title-money'>
+            ￥{(item.unitPrice / 100).toFixed(2)}元
+          </text>
+          <view className='title-time'>
+            有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+            {formatTime(item.endTime, "yyyy/MM/dd")}
+          </view>
+        </view>
+      </view>
+      <view class='right-complete-two'>
+        <view
+          className='right-content'
+          onClick={() => onWrite(item)}
+        >
+          <image className='right-image' src={QRcode} />
+          <view className='right-title'>扫码核销</view>
+        </view>
+      </view>
+    </view>
+  )
+}

src/components/CompoentsOrder/TobeWritten/style.less

@@ -0,0 +1,180 @@
+@whiteColor: #fff;
+
+.wrapper-Written {
+  margin-top: 40px;
+  display: flex;
+  position: relative;
+  margin: 30px auto;
+  width: 100%;
+  filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
+
+  .left-complete-one-Written {
+    padding-top: 85px;
+    padding-bottom: 43px;
+    position: relative;
+    display: flex;
+    background: @whiteColor;
+    background: radial-gradient(circle at top right, transparent 15px, #fff 0 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-Written {
+      width: 145px;
+      height: 44px;
+      position: absolute;
+      top: 22px;
+    }
+    .left-viewText-Written {
+      // 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-Written {
+      height: 144px;
+      margin-left: 20px;
+      border-radius: 24px;
+      overflow: hidden;
+      position: relative;
+      .image-1-Written {
+        width: 144px;
+        height: 144px;
+        margin: 0;
+      }
+      .image-2-Written {
+        width: 89px;
+        height: 34px;
+        position: absolute;
+        left: 0;
+      }
+    }
+    // 商品标题
+    .title-content-Written {
+      // padding: 84px 0 56px 20px;
+      padding-left: 18px;
+
+      .Pro-title-Written {
+        .title-text-Written {
+          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-Written {
+        // padding-top: 34px;
+        font-size: 24px;
+        // color: red;
+        font-weight: 800;
+      }
+      .title-money-2-Written {
+        height: 19px;
+        font-size: 20px;
+        font-weight: 400;
+        color: #333333;
+        padding-left: 40px;
+      }
+
+      .title-time-Written {
+        font-size: 24px;
+        // padding-top: 20px;
+        color: #c0c8d3;
+      }
+      .title-position-on-Written {
+        display: flex;
+        font-size: 20px;
+        .title-position-Written {
+          width: 18px;
+          height: 24px;
+          padding-right: 10px;
+          padding-top: 5px;
+        }
+        .title-position-image-Written {
+          align-items: center;
+          font-size: 20px;
+          color: #333;
+        }
+        .title-on-Written {
+          // margin-bottom: 10px;
+          padding-top: 5px;
+          padding-left: 40px;
+          width: 21px;
+          height: 21px;
+          padding-right: 10px;
+        }
+        .title-on-text-Written {
+          align-items: center;
+
+          font-size: 20px;
+          color: #333;
+        }
+      }
+    }
+  }
+  .right-complete-two-Written {
+    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-Written {
+      width: 100px;
+      height: 134px;
+      position: absolute;
+      top: calc(50% - 45px);
+      left: calc(50% - 46px);
+      .right-image-2-Written {
+        width: 76px;
+        height: 66px;
+        margin-top: 1em;
+      }
+      .right-image-Written {
+        width: 35px;
+        height: 34px;
+        margin-left: calc(50% - 17.5px);
+      }
+      .right-title-Written {
+        font-weight: 700;
+        font-size: 24px;
+        padding-top: 15px;
+        text-align: center;
+      }
+    }
+  }
+  //线条
+  .right-complete-two-Written::after {
+    content: "";
+    position: absolute;
+    top: 15px;
+    margin: 26px auto;
+    height: 70%;
+    border-left: 1px dashed #595959;
+    opacity: 0.12;
+  }
+}

src/components/CompoentsOrder/complete/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from "react";
-import Taro, { useDidShow } from "@tarojs/taro";
-import { getOrderSub } from "@/services/payOrder";
+// import { AtSwipeAction } from "taro-ui";
+import Taro, { useDidShow, AtSwipeAction } from "@tarojs/taro";
+import { getOrderSub, deleteOrder } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
 import image from "@/assets/icons/ProCard/8kb.jpg";
 import food from "@/assets/icons/ProCard/food.png";
@@ -13,7 +14,9 @@ import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
 import starOn from "@/assets/icons/GuideCheck/starOn.png";
 import starOff from "@/assets/icons/GuideCheck/starOff.png";
+import ico_delete from '../../../assets/icons/ProCard/ico_delete.png'
 import AlreadyUsed from "../AlreadyUsed";
+import TobeWritten from "../TobeWritten";
 import "./style.less";
 
 const scoreList = new Array(5).fill(0);
@@ -120,6 +123,30 @@ export default (props) => {
     });
   };
 
+  const slideButtonTap = (e) => {
+
+    deleteOrder(e.orderId || '').then(() => {
+      Taro.showToast({
+        title: '删除订单成功',
+        icon: 'none',
+      })
+      getList();
+
+    })
+
+
+  }
+
+
+
+
+  const button = [{
+    // type: 'warn',
+    // text: '删除',
+    extClass: 'test-button',
+    src: ico_delete
+  }]
+
   return (
     <scroll-view
       scrollY
@@ -139,56 +166,62 @@ export default (props) => {
               /* 待支付 */
               if (item.status === 0) {
                 return (
-                  <view key={`${type}-${item.orderId}`}>
-                    <view className='OrderNumber'>订单编号：{item.orderId}</view>
+                  <mp-slideview buttons={button} onButtontap={() => slideButtonTap(item)} icon >
 
-                    <view class='wrapper'>
-                      <view class='left-complete-one'>
-                        <image className='left-image-1' src={ProCard_hot}></image>
-                        <view className='left-viewText'>
-                          返现￥{(item.cashback / 100).toFixed(2)}
-                        </view>
-                        <view className='title-image'>
-                          <image
-                            className='image-1'
-                            mode='scaleToFill'
-                            src={item.poster || image}
-                          ></image>
-                          <image className='image-2' src={food}></image>
-                        </view>
-                        <view className='title-content'>
-                          <view className='Pro-title'>
-                            <view className='title-text'>
-                              {item.packageDescription}
-                              <text className='title-money-2'>
-                                数量：{item.amount}张
-                              </text>
-                            </view>
+                    <view key={`${type}-${item.orderId}`}  >
+                      <view className='OrderNumber'>订单编号：{item.orderId}</view>
+                      {/* <TobePaid item={item} /> */}
+                      <view class='wrapper'>
+                        <view class='left-complete-one'>
+                          <image className='left-image-1' src={ProCard_hot}></image>
+                          <view className='left-viewText'>
+                            返现￥{(item.cashback / 100).toFixed(2)}
                           </view>
-                          <text className='title-money'>
-                            ￥{(item.unitPrice / 100).toFixed(2)}元
-                          </text>
-                          <view className='title-time'>
-                            有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
-                            {formatTime(item.endTime, "yyyy/MM/dd")}
+                          <view className='title-image'>
+                            <image
+                              className='image-1'
+                              mode='scaleToFill'
+                              src={item.poster || image}
+                            ></image>
+                            <image className='image-2' src={food}></image>
+                          </view>
+                          <view className='title-content'>
+                            <view className='Pro-title'>
+                              <view className='title-text'>
+                                {item.packageDescription}
+                                <text className='title-money-2'>
+                                  数量：{item.amount}张
+                                </text>
+                              </view>
+                            </view>
+                            <text className='title-money'>
+                              ￥{(item.unitPrice / 100).toFixed(2)}元
+                            </text>
+                            <view className='title-time'>
+                              有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                              {formatTime(item.endTime, "yyyy/MM/dd")}
+                            </view>
                           </view>
                         </view>
-                      </view>
-                      <view class='right-complete-two'>
-                        <view
-                          className='right-content'
-                          onClick={() => {
-                            Taro.navigateTo({
-                              url: `/pages/PayOrder/index?orderId=${item.orderId}`,
-                            });
-                          }}
-                        >
-                          <image className='right-image' src={Pay} />
-                          <view className='right-title'>支付</view>
+                        <view class='right-complete-two'>
+                          <view
+                            className='right-content'
+                            onClick={() => {
+                              Taro.navigateTo({
+                                url: `/pages/PayOrder/index?orderId=${item.orderId}`,
+                              });
+                            }}
+                          >
+                            <image className='right-image' src={Pay} />
+                            <view className='right-title'>支付</view>
+                          </view>
                         </view>
                       </view>
                     </view>
-                  </view>
+                  </mp-slideview>
+
+
+
                 );
               }
               /* 待核销 */
@@ -196,6 +229,7 @@ export default (props) => {
                 return (
                   <view key={`${type}-${item.orderId}`}>
                     <view className='OrderNumber'>订单编号：{item.orderId}</view>
+                    {/* <TobeWritten item={item} onWrite={onWriteOff} /> */}
                     <view class='wrapper'>
                       <view class='left-complete-one'>
                         <image className='left-image-1' src={ProCard_hot}></image>
@@ -410,7 +444,7 @@ export default (props) => {
               }
             })}
 
-            <view className='foot'>已经到底了~</view>
+            <view className='foot'>这是我的底线</view>
           </view>
       }
     </scroll-view>

src/components/CompoentsOrder/complete/style.less

@@ -1,15 +1,35 @@
 @whiteColor: #fff;
 
+.test-button {
+  // width: 67px;
+  // height: 266px;
+  // background: #ffffff !important;
+  // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
+  // border-radius: 12px;
+  // position: relative;
+  // top: 18%;
+
+  .weui-slideview__btn {
+    position: relative;
+    top: 20px;
+  }
+}
+
 .complete-boxs {
   margin: 40px auto;
   padding: 0 30px;
 
+  // .test-button {
+  //   border-radius: 10%;
+  //   background-color: #fff;
+  // }
+
   .OrderNumber {
-    height: 19px;
+    // height: 19px;
     font-size: 20px;
     font-weight: 400;
     color: #666666;
-    line-height: 44px;
+    // line-height: 44px;
   }
   .wrapper {
     margin-top: 40px;
@@ -47,10 +67,14 @@
       position: relative;
       display: flex;
       background: @whiteColor;
-      background: radial-gradient(circle at top right, transparent 15px, #fff)
+      background: radial-gradient(
+            circle at top right,
+            transparent 15px,
+            #fff 0 0
+          )
           top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
-          right;
+        radial-gradient(circle at bottom right, transparent 15px, #fff 0 0)
+          bottom right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
 
@@ -168,9 +192,10 @@
 
   .right-complete-two {
     background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff) top
-        left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff) bottom left;
+    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;

src/components/CompoentsOrder/complete/styleoen.less

@@ -1,316 +0,0 @@
-@whiteColor: #fff;
-
-.AlreadyUsed-box {
-  margin: 40px auto;
-  padding: 0 30px;
-
-  .item-center-Number {
-    .card-box-star {
-      margin-top: 23px;
-      width: auto;
-      height: 44.3px;
-      font-size: 20px;
-      color: @whiteColor;
-      .card-box-star-text {
-        display: inline-block;
-        height: 22px;
-        font-size: 24px;
-        font-weight: 400;
-        color: #666666;
-      }
-      .card-star-image {
-        padding-left: 30px;
-        width: 21px;
-        height: 21px;
-      }
-      .card-star-text {
-        padding-left: 10px;
-        font-size: 20px;
-        color: #333;
-        font-weight: 700;
-      }
-    }
-  }
-
-  .buy-button-box {
-    width: 100%;
-    margin: 40px 0 0 0;
-
-    .button-Cancel {
-      display: inline-block;
-      width: 236px;
-      height: 78px;
-      border: 2px solid #274291;
-      font-size: 30px;
-      font-weight: bold;
-      color: #274291;
-      border-radius: 12px;
-      margin-right: 80px;
-    }
-    .button-OK {
-      display: inline-block;
-
-      width: 236px;
-      height: 78px;
-      background: #274291;
-      border-radius: 12px;
-      font-size: 30px;
-      font-weight: bold;
-      color: #ffffff;
-    }
-  }
-  .OrderNumber {
-    // width: 234px;
-    height: 19px;
-    font-size: 20px;
-    font-weight: 400;
-    color: #666666;
-    line-height: 44px;
-  }
-  .wrapper {
-    margin-top: 40px;
-    display: flex;
-    position: relative;
-    // margin-top: 600px;
-    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: 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, #fff)
-          top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff) 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 {
-          height: 19px;
-          font-size: 20px;
-          font-weight: 400;
-          color: #333333;
-          padding-left: 40px;
-        }
-
-        .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, #fff) top
-        left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff) 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-image-2 {
-        width: 76px;
-        height: 66px;
-        margin-top: 1em;
-      }
-      .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;
-    opacity: 0.12;
-  }
-  .foot {
-    width: 100%;
-    height: 26px;
-    font-size: 28px;
-    font-weight: 400;
-    color: #c0c8d3;
-    line-height: 34px;
-    margin-top: 40px;
-    text-align: center;
-  }
-
-  .button-info {
-    margin-bottom: 70px;
-
-    .button-box {
-      margin: 60px 0;
-      width: calc(100% - 60px);
-      height: 88px;
-      line-height: 88px;
-      background: #274291;
-      border-radius: 12px;
-      color: @whiteColor;
-    }
-  }
-}

src/components/List/index.jsx

@@ -106,7 +106,7 @@ export default React.forwardRef((props, ref) => {
       }
       {!list || !list.length && noData}
 
-      {list && list.length > 0 && !hasMore && <view className='botton'>已经到底了~</view>}
+      {list && list.length > 0 && !hasMore && <view className='botton'>这是我的底线</view>}
 
     </ScrollView>
   )

src/components/OrderMolded/index.jsx

@@ -11,22 +11,22 @@ export default (props) => {
   const { item } = props
 
   return (
-    <view class='wrapper-box'>
-      <view class='left-complete-one'>
-        <image className='left-image-1' src={ProCard_hot}></image>
-        <view className='left-viewText'>
+    <view class='wrapper-box-cardOrder'>
+      <view class='left-complete-one-cardOrder'>
+        <image className='left-image-1-cardOrder' src={ProCard_hot}></image>
+        <view className='left-viewText-cardOrder'>
           返现￥{(item.cashback / 100).toFixed(2)}
         </view>
-        <view className='title-image'>
-          <image className='image-1' mode='scaleToFill' src={item.poster}></image>
-          <image className='image-2' src={food}></image>
+        <view className='title-image-cardOrder'>
+          <image className='image-1-cardOrder' mode='scaleToFill' src={item.poster}></image>
+          <image className='image-2-cardOrder' src={food}></image>
         </view>
-        <view className='title-content'>
-          <view className='Pro-title'>
-            <view className='title-text'>{item.description}</view>
-          </view>
-          <text className='title-money' >￥{(item.actualPrice / 100).toFixed(2)}元</text>
-          <view className='title-time' >有效期：{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
+        <view className='title-content-cardOrder'>
+
+          <view className='title-text-cardOrder'>{item.description}</view>
+
+          <text className='title-money-cardOrder' >￥{(item.actualPrice / 100).toFixed(2)}元</text>
+          <view className='title-time-cardOrder' >有效期：{formatTimes(item.startTime, "yyyy/MM/dd")}-{formatTimes(item.endTime, "yyyy/MM/dd")}</view>
         </view>
       </view>
     </view>

src/components/OrderMolded/style.less

@@ -1,23 +1,19 @@
 @whiteColor: #fff;
 
-.wrapper-box {
+.wrapper-box-cardOrder {
   border-bottom: 1px dashed rgba(0, 0, 0, 0.1);
 
-  .left-complete-one {
+  .left-complete-one-cardOrder {
     padding-top: 87px;
     padding-bottom: 21px;
     position: relative;
     display: flex;
     background: @whiteColor;
-    background: radial-gradient(
-          circle at top right,
-          transparent 15px,
-          #fff
-        )
-        top right,
-      radial-gradient(circle at bottom right, transparent 15px, #fff)
-        bottom right;
-    background-size: 100% 60%;
+    // background: radial-gradient(circle at top right, transparent 15px, #fff 0 ) top
+    //     right,
+    //   radial-gradient(circle at bottom right, transparent 15px, #fff 0 ) bottom
+    //     right;
+    // background-size: 100% 60%;
     background-repeat: no-repeat;
 
     width: 573px;
@@ -25,13 +21,13 @@
     // border-radius: 12px;
 
     align-items: center;
-    .left-image-1 {
+    .left-image-1-cardOrder {
       width: 145px;
       height: 44px;
       position: absolute;
       top: 22px;
     }
-    .left-viewText {
+    .left-viewText-cardOrder {
       // background-image: url(@Image-ProCard_hot);
       // width: 287px;
       width: auto;
@@ -44,17 +40,17 @@
       font-weight: 600;
     }
     //图片
-    .title-image {
+    .title-image-cardOrder {
       width: 145px;
       margin-left: 20px;
       border-radius: 24px;
       overflow: hidden;
       position: relative;
-      .image-1 {
+      .image-1-cardOrder {
         width: 100%;
         height: 145px;
       }
-      .image-2 {
+      .image-2-cardOrder {
         width: 89px;
         height: 34px;
         position: absolute;
@@ -63,25 +59,24 @@
       }
     }
     // 商品标题
-    .title-content {
+    .title-content-cardOrder {
       // 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-text-cardOrder {
+        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 {
+
+      .title-money-cardOrder {
         padding-top: 34px;
         font-size: 24px;
         // color: red;
@@ -89,14 +84,14 @@
         right: 136px;
         font-weight: 800;
       }
-      .title-money-2 {
+      .title-money-2-cardOrder {
         font-size: 18px;
         color: #666;
         padding-left: 10px;
         text-decoration: line-through;
       }
 
-      .title-time {
+      .title-time-cardOrder {
         font-size: 24px;
         padding-top: 20px;
         color: #c0c8d3;
@@ -105,16 +100,11 @@
   }
 }
 
-.right-complete-two {
+.right-complete-two-cardOrder {
   background: @whiteColor;
-  background: radial-gradient(
-        circle at top left,
-        transparent 15px,
-        #fff
-      )
-      top left,
-    radial-gradient(circle at bottom left, transparent 15px, #fff)
-      bottom left;
+  background: radial-gradient(circle at top left, transparent 15px, #fff 0) top
+      left,
+    radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom left;
   background-size: 100% 60%;
   background-repeat: no-repeat;
   width: 129px;

src/components/PayOrderCard/style.less

@@ -78,9 +78,9 @@
       position: relative;
       display: flex;
       background: @whiteColor;
-      background: radial-gradient(circle at top right, transparent 15px, #fff)
+      background: radial-gradient(circle at top right, transparent 15px, #fff 0)
           top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
+        radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
           right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
@@ -168,9 +168,10 @@
 
   .right-complete-two {
     background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff) top
-        left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff) bottom left;
+    background: radial-gradient(circle at top left, transparent 15px, #fff 0)
+        top left,
+      radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
+        left;
     background-size: 100% 60%;
     background-repeat: no-repeat;
     width: 129px;

src/components/tip/index.jsx

@@ -1,34 +1,34 @@
-import { Swiper, SwiperItem,View} from '@tarojs/components';
-import { getTipList} from '@/services/home'
-import { useState,useEffect } from 'react';
+import { Swiper, SwiperItem, View } from '@tarojs/components';
+import { getTipList } from '@/services/home'
+import { useState, useEffect } from 'react';
 import icontip from '@/assets/icons/housemantj/tip.png'
 import './index.less'
 
-export default ()=>{  
-  const [tips,setTips]=useState([])
+export default () => {
+  const [tips, setTips] = useState([])
   useEffect(() => {
-    getTipList(1).then((res)=>{
-      setTips(res.records||[])
+    getTipList(1).then((res) => {
+      setTips(res.records || [])
     })
-  },[])
-    return (      
-      <view className='tip'>
-        <image className='tipicon' src={icontip} />
+  }, [])
+  return (
+    <view className='tip'>
+      <image className='tipicon' src={icontip} />
       <Swiper
-      className='swp'
+        className='swp'
         vertical
-        circular        
-        interval="3000"        
+        circular
+        interval="3000"
         autoplay>
-          {
-            tips==''?<SwiperItem>Tip:暂无公告  欢迎使用十公里小程序</SwiperItem>:
-            tips.map((item)=>
+        {
+          tips == '' ? <SwiperItem>暂无公告  欢迎使用十公里小程序</SwiperItem> :
+            tips.map((item) =>
               <SwiperItem>
-                <View>Tip:{item.content}</View>
+                <View>{item.content}</View>
               </SwiperItem>
             )
-          }        
+        }
       </Swiper>
-      </view>
-    )  
+    </view>
+  )
 }

src/components/toggleRole/ToggleRole.jsx

@@ -31,15 +31,15 @@ export default (props) => {
         <view className='User-box-selectUser'>请选择身份：</view>
         <view className='User-box-tourist' onClick={goToPerson}>
           <image className='Ubs-tourist-image' src={role === 'normal' ? touristON : touristOFF} />
-          <text className='Ubs-tourist-text'>游客</text>
+          <text className='Ubs-tourist-text'>我是用户</text>
         </view>
         <view className='User-box-hotelBoss' onClick={goToHotel}>
           <image className='Ubs-hotelBoss-image' src={role === 'hotel' ? hotelBossON : hotelBossOFF} />
-          <text className='Ubs-hotelBoss-text'>民宿老板</text>
+          <text className='Ubs-hotelBoss-text'>我是房东</text>
         </view>
         <view className='User-box-shopBoss' onClick={goToShop}>
           <image className='Ubs-shopBoss-image' src={role === 'shop' ? shopBossON : shopBossOFF} />
-          <text className='Ubs-shopBoss-text'>店铺老板</text>
+          <text className='Ubs-shopBoss-text'>我是商铺</text>
         </view>
       </view>
     </Popup>

src/pages/MineUserAll/AllOrder/index.config.js

@@ -3,7 +3,12 @@ export default {
   navigationStyle: 'custom',
   "usingComponents": {
     "mp-dialog": "weui-miniprogram/dialog/dialog",
-    "mp-tabs": "../../../components/tabs/index"
+    "mp-tabs": "../../../components/tabs/index",
+    "mp-slideview": "weui-miniprogram/slideview/slideview",
+    "mp-cells": "weui-miniprogram/cells/cells",
+    "mp-cell": "weui-miniprogram/cell/cell"
   }
 
+
+
 }

src/pages/MineUserAll/ContactMe/index.jsx

@@ -1,56 +1,65 @@
+import { saveFeedback } from '@/services/mine'
+import QCRsgl from '@/assets/icons/ProCard/QCRsgl.png'
 import CustomNav from '@/components/CustomNav'
 import Taro from '@tarojs/taro'
+import { Image, Button } from '@tarojs/components'
 import withLayout from '@/layouts'
-import { Button} from '@tarojs/components'
 import './style.less'
-import {saveFeedback} from '@/services/mine'
 
 
 export default withLayout((props) => {
   const { person } = props
-  const {personId}=person
+  const { personId } = person
   const back = () => {
     Taro.navigateBack()
   }
-  const submit=()=>{
-    var content=document.getElementById('content').value
-    if(content!=''){
+  const submit = () => {
+    var content = document.getElementById('content').value
+    if (content != '') {
       saveFeedback({
         personId,
         content
-      }).then(()=>{
+      }).then(() => {
         // 成功返回一个模态框提醒用户
-        wx.showModal({
-          title: '提示',
-          content: '反馈成功，感谢提交；\r\n如有需要平台将在24小时内添加您的微信，请留意您的手机信息。',
-          showCancel:false,
-          success (res) {
-            if (res.confirm) {
-              back()
-            }
-          }
-        })             
+        // Taro.showModal({
+        //   title: '提示',
+        //   content: '反馈成功，感谢提交；\r\n如有需要平台将在24小时内添加您的微信，请留意您的手机信息。',
+        //   showCancel: false,
+        //   success(res) {
+        //     if (res.confirm) {
+        //       back()
+        //     }
+        //   }
+        // })
       })
     }
-    else{
-      wx.showToast({
+    else {
+      Taro.showToast({
         title: '请重新输入',
         icon: 'none',
         duration: 2000
-      }) 
+      })
     }
   }
   return (
     <view className='box-content'>
       <CustomNav title='联系我们' />
-      <view style={{padding:'60rpx 30rpx'}}>
-      <view class='section'>
-        <textarea placeholder='请输入您的建议或意见!' id='content' />
-      </view>
-      <view className='button-info'>
-        <Button className='button-box' onClick={submit}>提交</Button>
-        <Button className='button-box-Cancel' onClick={back} >取消</Button>
-      </view>
+      <view style={{ padding: '60rpx 30rpx' }}>
+        <view class='section'>
+          <textarea placeholder='请输入您的建议或意见!' id='content' />
+        </view>
+        <view className='content-Title'   >
+          如有需要平台将在24小时内添加您的微信，请留意您的手机信息。您也可直接截图后微信扫描二维码
+        </view>
+        <view className='content-Title'   >
+          <view>您也可直接截图后微信扫描二维码</view>
+          <view>添加客服企业微信号联系我们哟~</view>
+        </view>
+        <Image src={QCRsgl} style={{ width: '30vw', height: '30vw', margin: '0 auto', display: 'block' }} />
+        <view className='button-info'>
+          <Button className='button-box' onClick={submit}>提交</Button>
+          <Button className='button-box-Cancel' onClick={back} >取消</Button>
+        </view>
       </view>
     </view>
   )

src/pages/MineUserAll/ContactMe/style.less

@@ -2,9 +2,10 @@
   .section {
     height: 254px;
     border: 1px solid #b5b5b5;
+    font-size: 24px;
+
     box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
     padding: 30px;
-    font-size: 24px;
     textarea {
       height: 100%;
     }
@@ -14,6 +15,13 @@
     border-radius: 12px;
     line-height: 88px;
   }
+  .content-Title {
+    margin-top: 1em;
+    color: #b5b5b5;
+    font-size: 24px;
+    text-align: center;
+  }
+
   .button-info {
     width: calc(100% - 60px);
     position: absolute;

src/pages/MineUserAll/RefundMoney/CheckRefund/style.less

@@ -35,7 +35,7 @@
     // margin-top: 600px;
     // margin: 30px auto;
     // width: 100%;
-
+    width: calc(100% -25px);
     // 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));
@@ -60,7 +60,6 @@
         font-weight: 700;
       }
     }
-    
 
     .left-complete-one {
       padding-top: 87px;
@@ -68,14 +67,10 @@
       position: relative;
       display: flex;
       background: @whiteColor;
-      background: radial-gradient(
-            circle at top right,
-            transparent 15px,
-            #fff
-          )
+      background: radial-gradient(circle at top right, transparent 15px, #fff 0)
           top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff)
-          bottom right;
+        radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
+          right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
 
@@ -103,7 +98,6 @@
       }
       //图片
       .title-image {
-
         height: 144px;
         margin-left: 20px;
         border-radius: 24px;
@@ -158,7 +152,7 @@
           font-weight: 400;
           color: #333333;
           padding-left: 50px;
-          text-decoration:line-through;
+          text-decoration: line-through;
         }
 
         .title-time {
@@ -201,14 +195,10 @@
 
   .right-complete-two {
     background: @whiteColor;
-    background: radial-gradient(
-          circle at top left,
-          transparent 15px,
-          #fff
-        )
+    background: radial-gradient(circle at top left, transparent 15px, #fff 0)
         top left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff)
-        bottom left;
+      radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
+        left;
     background-size: 100% 60%;
     background-repeat: no-repeat;
     width: 129px;

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -82,77 +82,77 @@ export default withLayout((props) => {
   }, [pageNum]);
 
   return (
-    <view className="box-content">
-      <CustomNav title="售后退款" />
+    <view className='box-content'>
+      <CustomNav title='售后退款' />
       <scroll-view
         scrollY
-        style="height: calc(100vh - 176rpx);"
+        style='height: calc(100vh - 176rpx);'
         refresher-enabled
         refresher-triggered={IsPull}
         onrefresherrefresh={pageRefresh}
-        refresher-background="#fff"
+        refresher-background='#fff'
         onscrolltolower={pageLoadMore}
       >
-        <view>
+        <view className='View-box-Card'>
           {(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 class='wrapper' key={item.orderId}>
+                <view class='left-complete-one'>
+                  <image className='left-image-1' src={ProCard_hot}></image>
 
-                  <view className="left-viewText">
+                  <view className='left-viewText'>
                     返现￥{item.cashback / 100}
                   </view>
                   {/* 评分 */}
-                  <view className="card-box-star">
+                  <view className='card-box-star'>
                     {scoreList.map((_, index) => {
                       const src = index + 1 <= item.score ? starOn : starOff;
                       return (
                         <image
-                          className="card-star-image"
+                          className='card-star-image'
                           key={index}
                           src={src}
                         />
                       );
                     })}
-                    <text className="card-star-text">
+                    <text className='card-star-text'>
                       {item.score?.toFixed(1)}
                     </text>
                   </view>
-                  <view className="title-image">
+                  <view className='title-image'>
                     <image
-                      className="image-1"
-                      mode="scaleToFill"
+                      className='image-1'
+                      mode='scaleToFill'
                       src={item.poster}
                     ></image>
-                    <image className="image-2" src={food}></image>
+                    <image className='image-2' src={food}></image>
                   </view>
-                  <view className="title-content">
-                    <view className="Pro-title">
-                      <view className="title-text">
+                  <view className='title-content'>
+                    <view className='Pro-title'>
+                      <view className='title-text'>
                         {item.packageDescription}
-                        <text className="title-money-2">
+                        <text className='title-money-2'>
                           数量：{item.amount}张
                         </text>
                       </view>
                     </view>
-                    <text className="title-money">
+                    <text className='title-money'>
                       ￥{item.unitPrice / 100}元
                     </text>
-                    <view className="title-time">有效期：{formatTime(item?.endTime, "yyyy/MM/dd")}</view>
+                    <view className='title-time'>有效期：{formatTime(item?.endTime, "yyyy/MM/dd")}</view>
                   </view>
                 </view>
-                <view class="right-complete-two" onClick={() => handleRefund2(item)}>
-                  <view className="right-content">
+                <view class='right-complete-two' onClick={() => handleRefund2(item)}>
+                  <view className='right-content'>
                     {/* <image className='right-image-two' src={Null} /> */}
-                    <image className="right-image" src={Refund} />
-                    <view className="right-title">售后</view>
+                    <image className='right-image' src={Refund} />
+                    <view className='right-title'>售后/退款</view>
                   </view>
                 </view>
               </view>
             );
           })}
-          <view className="foot">已经到底了~</view>
+          <view className='foot'>这是我的底线</view>
         </view>
       </scroll-view>
     </view>

src/pages/MineUserAll/RefundMoney/style.less

@@ -2,247 +2,236 @@
 
 .box-content {
   width: 100%;
-  .wrapper {
-    margin: auto;
-
-    margin-top: 40px;
-    display: flex;
-    position: relative;
-    // margin-top: 600px;
-    // 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: 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: 87px;
-      padding-bottom: 43px;
-      position: relative;
+  .View-box-Card {
+    .wrapper {
+      width: calc(100% -25px);
+      margin-left: 25px;
+      margin-top: 40px;
       display: flex;
-      background: @whiteColor;
-      background: radial-gradient(circle at top right, transparent 15px, #fff)
-          top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff) 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: relative;
+      // margin-top: 600px;
+      // margin: 30px auto;
+      // 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;
-        top: 22px;
-      }
-      .left-viewText {
-        // background-image: url(@Image-ProCard_hot);
-        // width: 287px;
         width: auto;
         height: 44.3px;
         position: absolute;
-        left: 1px;
+        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;
+        }
       }
-      //图片
-      .title-image {
-        // width: 145px;
-        // margin-left: 20px;
-        // border-radius: 24px;
-        // overflow: hidden;
-        // position: relative;
-        height: 144px;
-        margin-left: 20px;
-        border-radius: 24px;
-        overflow: hidden;
+
+      .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)
+            bottom right;
+        background-size: 100% 60%;
+        background-repeat: no-repeat;
 
-        .image-1 {
-          // width: 100%;
-          // height: 145px;
-          width: 144px;
-          height: 144px;
-          margin: 0;
+        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;
         }
-        .image-2 {
-          width: 89px;
-          height: 34px;
+        .left-viewText {
+          // background-image: url(@Image-ProCard_hot);
+          // width: 287px;
+          width: auto;
+          height: 44.3px;
           position: absolute;
-          left: 0;
-          top: 0;
+          left: 1px;
+          top: 28px;
+          font-size: 20px;
+          color: @whiteColor;
         }
-      }
-      // 商品标题
-      .title-content {
-        // padding: 84px 0 56px 20px;
-        padding-left: 18px;
+        //图片
+        .title-image {
+          // width: 145px;
+          // margin-left: 20px;
+          // border-radius: 24px;
+          // overflow: hidden;
+          // position: relative;
+          height: 144px;
+          margin-left: 20px;
+          border-radius: 24px;
+          overflow: hidden;
+          position: relative;
 
-        .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;
+          .image-1 {
+            // width: 100%;
+            // height: 145px;
+            width: 144px;
+            height: 144px;
+            margin: 0;
+          }
+          .image-2 {
+            width: 89px;
+            height: 34px;
+            position: absolute;
+            left: 0;
+            top: 0;
           }
         }
-        .title-money {
-          // padding-top: 34px;
-          font-size: 24px;
-          // color: red;
-          display: inline-block;
-          font-weight: 800;
-          margin: 10px auto;
-        }
-        .title-money-2 {
-          height: 19px;
-          font-size: 20px;
-          font-weight: 400;
-          color: #333333;
-          padding-left: 50px;
-        }
+        // 商品标题
+        .title-content {
+          // padding: 84px 0 56px 20px;
+          padding-left: 18px;
 
-        .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;
+          .Pro-title {
+            .title-text {
+              width: 375px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              -webkit-line-clamp: 1;
+              -webkit-box-orient: vertical;
+              text-align: left;
+              font-size: 24px;
+            }
           }
-          .title-position-image {
-            align-items: center;
-            font-size: 20px;
-            color: #333;
+          .title-money {
+            // padding-top: 34px;
+            font-size: 24px;
+            // color: red;
+            display: inline-block;
+            font-weight: 800;
+            margin: 10px auto;
           }
-          .title-on {
-            // margin-bottom: 10px;
-            padding-top: 5px;
-            padding-left: 40px;
-            width: 21px;
-            height: 21px;
-            padding-right: 10px;
+          .title-money-2 {
+            height: 19px;
+            font-size: 20px;
+            font-weight: 400;
+            color: #333333;
+            padding-left: 50px;
           }
-          .title-on-text {
-            align-items: center;
 
+          .title-time {
+            font-size: 24px;
+            // padding-top: 20px;
+            color: #c0c8d3;
+          }
+          .title-position-on {
+            display: flex;
             font-size: 20px;
-            color: #333;
+            .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;
+            }
           }
         }
       }
     }
-  }
-
-  .right-complete-two {
-    background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff) top
-        left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff) 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: 36px;
-        height: 36px;
-        margin: 0 auto;
-        align-items: center;
-        margin: auto;
-        padding-left: 8px;
-        // text-align: center;
-      }
+    .right-complete-two {
+      background: @whiteColor;
+      background: radial-gradient(circle at top left, transparent 15px, #fff 0)
+          top left,
+        radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
+          left;
+      background-size: 100% 60%;
+      background-repeat: no-repeat;
+      width: 129px;
+      border-radius: 0 15px 15px 0;
+      position: relative;
+      //右面部分
+      .right-content {
+        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-align: center;
+        }
 
-      .right-title {
-        font-weight: 700;
-        font-size: 24px;
-        padding-top: 10px;
-        text-align: center;
+        .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;
-  }
-  //已过期logo
-  .right-image-two {
-    margin-top: 30px;
-    width: 76px;
-    height: 66px;
-  }
-  .foot {
-    width: 100%;
-    height: 26px;
-    font-size: 28px;
-    font-weight: 400;
-    color: #c0c8d3;
-    line-height: 34px;
-    margin-top: 40px;
-    text-align: center;
+    //线条
+    .right-complete-two::after {
+      content: "";
+      position: absolute;
+      top: 15px;
+      margin: 26px auto;
+      height: 70%;
+      border-left: 1px dashed #595959;
+      opacity: 0.12;
+    }
+    //已过期logo
+    .right-image-two {
+      margin-top: 30px;
+      width: 76px;
+      height: 66px;
+    }
+    .foot {
+      width: 100%;
+      height: 26px;
+      font-size: 28px;
+      font-weight: 400;
+      color: #c0c8d3;
+      line-height: 34px;
+      margin-top: 40px;
+      text-align: center;
+    }
   }
 }

src/pages/PayOrder/Card/index.jsx

@@ -0,0 +1,64 @@
+import formatTime from "@/utils/formatTime";
+import { useState, useEffect } from "react";
+
+import formatPrice from "@/utils/formatPrice";
+import food from "@/assets/icons/ProCard/food.png";
+
+import './style.less'
+
+
+export default (props) => {
+  const { item, packageId, onMoldeOn } = props
+  // const [BuyNumber, setBuyNumber] = useState(1);
+  // const [detail, setDetail] = useState({});
+  // const [showDialog, setShowDialog] = useState(false);
+  // const ShowMoldeOn = (e) => {
+  //   if (packageId) {
+  //     setBuyNumber(e.amount || 1);
+  //     setDetail(e);
+  //     setShowDialog(true);
+  //   }
+  // };
+  return (
+    <view class='wrapper-payOrder' key={item.orderId}>
+      <view class='left-complete-one-payOrder'>
+        {/* <image className='left-image-1' src={ProCard_hot}></image> */}
+        <view className='left-viewText-payOrder'>
+          返现￥{formatPrice(item.cashback)}
+        </view>
+        <view className='title-image-payOrder'>
+          <image
+            className='image-1-payOrder'
+            mode='scaleToFill'
+            src={item.poster}
+          ></image>
+          <image className='image-2-payOrder' src={food}></image>
+        </view>
+        <view className='title-content-payOrder'>
+          {/* <view className='Pro-title-payOrder'> */}
+          <view className='title-text-payOrder'>{item.description}</view>
+          {/* </view> */}
+          <text className='title-money-payOrder'>
+            ￥{formatPrice(item.actualPrice || item.unitPrice)}元
+            <text className='title-money-2-payOrder'>
+              门市价{item.standardPrice}元
+            </text>
+          </text>
+          <view className='title-time-payOrder'>
+            有效期：{formatTime(item.startTime, "yyyy/MM/dd")}-
+            {formatTime(item.endTime, "yyyy/MM/dd")}
+          </view>
+        </view>
+      </view>
+      <view
+        class='right-complete-two-payOrder'
+        onClick={() => onMoldeOn(item)}
+      >
+        <view className='right-content-payOrder'>
+          <view className='right-number-payOrder'>×{item.amount || 1}</view>
+          <view className='right-title-payOrder'>数量</view>
+        </view>
+      </view>
+    </view>
+  )
+}

src/pages/PayOrder/Card/style.less

@@ -0,0 +1,168 @@
+@whiteColor: #fff;
+
+.wrapper-payOrder {
+  display: flex;
+  position: relative;
+  // margin-top: 600px;
+  margin: 30px auto;
+  width: calc(100% - 50px); // 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));
+
+  .left-complete-one-payOrder {
+    padding-top: 87px;
+    padding-bottom: 43px;
+    position: relative;
+    display: flex;
+    background: #fff;
+
+    background: radial-gradient(circle at top right, transparent 15px, #fff 0 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-payOrder {
+      width: 145px;
+      height: 44px;
+      position: absolute;
+      top: 22px;
+    }
+    .left-viewText-payOrder {
+      // 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;
+
+      background: url(../../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
+      background-size: 100% 100%;
+      padding: 0 24px 7px 2px;
+      width: auto;
+      font-size: 24px;
+      line-height: 48px;
+      height: 44.3px;
+      position: absolute;
+      top: 20px;
+      color: @whiteColor;
+      font-weight: 600;
+    }
+    //图片
+    .title-image-payOrder {
+      height: 144px;
+      margin-left: 20px;
+      border-radius: 24px;
+      overflow: hidden;
+      position: relative;
+      .image-1-payOrder {
+        width: 144px;
+        height: 144px;
+        margin: 0;
+      }
+      .image-2-payOrder {
+        width: 89px;
+        height: 34px;
+        position: absolute;
+        left: 0;
+      }
+    }
+    // 商品标题
+    .title-content-payOrder {
+      // padding: 84px 0 56px 20px;
+      padding-left: 18px;
+
+      // .Pro-title {
+      .title-text-payOrder {
+        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-payOrder {
+        padding-top: 34px;
+        font-size: 24px;
+        // color: red;
+        font-weight: 800;
+      }
+      .title-money-2-payOrder {
+        font-size: 18px;
+        color: #666;
+        padding-left: 10px;
+        text-decoration: line-through;
+      }
+
+      .title-time-payOrder {
+        font-size: 24px;
+        padding-top: 20px;
+        color: #c0c8d3;
+      }
+    }
+  }
+
+  .right-complete-two-payOrder {
+    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-payOrder {
+      // width: 100px;
+      // height: 80px;
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%, -50%);
+      // border: 1px solid red;
+
+      .right-number-payOrder {
+        width: 40px;
+        font-size: 20px;
+        border-radius: 4px;
+        border: 2px solid #999;
+        margin: auto;
+        text-align: center;
+      }
+
+      .right-title-payOrder {
+        font-weight: 700;
+        font-size: 24px;
+        padding-top: 20px;
+        text-align: center;
+      }
+    }
+  }
+  //线条
+  .right-complete-two-payOrder::after {
+    content: "";
+    position: absolute;
+    top: 15px;
+    margin: 26px auto;
+    height: 70%;
+    border-left: 1px dashed #595959;
+    opacity: 0.12;
+  }
+}

src/pages/PayOrder/index.jsx

@@ -14,14 +14,15 @@ import { getPackageDetail } from "@/services/home";
 import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
 import formatTime from "@/utils/formatTime";
 import formatPrice from "@/utils/formatPrice";
+import Card from "./Card";
 
 export default withLayout((props) => {
+  //#region 
   const { router, person } = props;
   const { packageId, orderId } = props.router.params;
 
   const [payInfo, setPayInfo] = useState();
 
-  const [showDialog, setShowDialog] = useState(false);
   // 是否已阅读协议
   const [agreement, setAgreement] = useState(false);
   // 总价 totalPrice
@@ -30,6 +31,7 @@ export default withLayout((props) => {
 
   const [BuyNumber, setBuyNumber] = useState(1);
   const [detail, setDetail] = useState({});
+  const [showDialog, setShowDialog] = useState(false);
 
   const [DisabledBool, setDisabledBool] = useState(false);
 
@@ -186,130 +188,99 @@ export default withLayout((props) => {
     setTotalPrice(total);
   }, [list]);
 
+  //#endregion
   return (
-    !person.phone ? <AuthPage /> : <view class='container'>
-      <CustomNav title='订单' />
-      <Popup show={showDialog} maskClosable={false}>
-        <OrderMolded item={detail} />
-        <view className='item-center-Number'>
-          <view
-            className='buy-num-minus'
-            disabled={DisabledBool}
-            onClick={NumberCut}
-          >
-            -
+    !person.phone ? <AuthPage /> :
+      <view class='container'>
+        <CustomNav title='订单' />
+        <Popup show={showDialog} maskClosable={false}>
+          <OrderMolded item={detail} />
+          <view className='item-center-Number'>
+            <view
+              className='buy-num-minus'
+              disabled={DisabledBool}
+              onClick={NumberCut}
+            >
+              -
+            </view>
+            <Input
+              className='buy-num-input'
+              type='number'
+              min='1'
+              onInput={onInput}
+              value={BuyNumber}
+            />
+            <view className='buy-num-add' onClick={NumberAdd}>
+              +
+            </view>
           </view>
-          <Input
-            className='buy-num-input'
-            type='number'
-            min='1'
-            onInput={onInput}
-            value={BuyNumber}
-          />
-          <view className='buy-num-add' onClick={NumberAdd}>
-            +
+          <view className='buy-button-box'>
+            <button className='button-Cancel' onClick={ButtonCancel}>
+              取消
+            </button>
+            <button className='button-OK' onClick={ButtonOK}>
+              确定
+            </button>
           </view>
+        </Popup>
+        <view class='coupon-list-box'>
+          {(list || []).map((item, index) => {
+            return (
+              <Card key={index} item={item} packageId={packageId} onMoldeOn={ShowMoldeOn} />
+            );
+          })}
         </view>
-        <view className='buy-button-box'>
-          <button className='button-Cancel' onClick={ButtonCancel}>
-            取消
-          </button>
-          <button className='button-OK' onClick={ButtonOK}>
-            确定
-          </button>
-        </view>
-      </Popup>
-      <view class='coupon-list'>
-        {(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'>
-                  返现￥{formatPrice(item.cashback)}
-                </view>
-                <view className='title-image'>
-                  <image
-                    className='image-1'
-                    mode='scaleToFill'
-                    src={item.poster}
-                  ></image>
-                  <image className='image-2' src={food}></image>
-                </view>
-                <view className='title-content'>
-                  <view className='Pro-title'>
-                    <view className='title-text'>{item.description}</view>
-                  </view>
-                  <text className='title-money'>
-                    ￥{formatPrice(item.actualPrice || item.unitPrice)}元
-                    <text className='title-money-2'>
-                      门市价{formatPrice(item.standardPrice)}元
-                    </text>
-                  </text>
-                  <view className='title-time'>
-                    有效期：{formatTime(item.startTime, "yyyy/MM/dd")}-
-                    {formatTime(item.endTime, "yyyy/MM/dd")}
-                  </view>
-                </view>
-              </view>
-              <view
-                class='right-complete-two'
-                onClick={() => ShowMoldeOn(item)}
-              >
-                <view className='right-content'>
-                  <view className='right-number'>×{item.amount || 1}</view>
-                  <view className='right-title'>数量</view>
-                </view>
-              </view>
+        <view className='view-button'>
+          {/* 协议条款 */}
+          <view className='Card-number-box'>
+            <view className='Card-number'>
+              <text style='left:29px;position: absolute; padding-top:20px'>
+                手机号码:
+              </text>
+              <text style='right:29px;position: absolute;padding-top:20px'>
+                {person.phone}
+              </text>
             </view>
-          );
-        })}
-      </view>
-      <view className='view-button'>
-        <view className='Card-number-box'>
-          <view className='Card-number'>
-            <text style='left:29px;position: absolute; padding-top:20px'>
-              手机号码:
-            </text>
-            <text style='right:29px;position: absolute;padding-top:20px'>
-              {person.phone}
-            </text>
-          </view>
-          <view className='Card-user'>
-            <Radio
-              className='Radio-text'
-              value='agreement'
-              checked={agreement}
-              onClick={() => {
-                setAgreement(!agreement);
-              }}
-            >
-              我已阅读知晓并同意
+            <view className='Card-user'>
+              <Radio
+                className='Radio-text'
+                value='agreement'
+                checked={agreement}
+                onClick={() => {
+                  setAgreement(!agreement);
+                }}
+              >
+                我已阅读知晓并同意
               </Radio>
-              <text className='ptxy'onClick={goRules}>
+              <text className='ptxy' onClick={goRules}>
                 《平台用户服务协议》
               </text>
+            </view>
+            <view className='ul-li-text'>
+              <view className='ul-li-view'></view>
+              <text className='ul-li-textname'>返现金将以退款形式到账</text>
+            </view>
 
           </view>
-        </view>
-        <view className='button-box-button-box'>
-          <view className='button-text-image'>
-            <text className='button-text-money-hot'>
-              返现￥{formatPrice(totalPrice?.cashback || 0)}
-            </text>
-            <image className='button-image' src={ProCard_hot}>
-              123123
-            </image>
-            <view className='button-text-money'>
-              门店市面价：{formatPrice(totalPrice?.standardPrice || 0)}元
+          {/* 支付按钮 */}
+          <view className='button-box-button-box'>
+            <view className='button-text-image'>
+              <text className='button-text-money-hot'>
+                返现￥{formatPrice(totalPrice?.cashback || 0)}
+              </text>
+              <image className='button-image' src={ProCard_hot}>
+                123123
+              </image>
+              <view className='button-text-money'>
+                门店市面价：{formatPrice(totalPrice?.standardPrice || 0)}元
+              </view>
             </view>
+            <Button className='button-box-one' onClick={() => onShowPay()}>
+              ￥{formatPrice(totalPrice?.actualPrice || 0)}元
+              <text className='button-text-one'>支付订单</text>
+            </Button>
           </view>
-          <Button className='button-box-one' onClick={() => onShowPay()}>
-            ￥{formatPrice(totalPrice?.actualPrice || 0)}元
-            <text className='button-text-one'>支付订单</text>
-          </Button>
         </view>
       </view>
-    </view>
   );
 });

src/pages/PayOrder/style.less

@@ -2,8 +2,10 @@
 @Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
 .container {
   width: 100%;
+  //商品数量
   .item-center-Number {
-    width: 100%;
+    width: auto;
+    height: auto;
     margin-top: 30px;
     .buy-num-minus {
       display: inline-block;
@@ -23,7 +25,7 @@
       background: #ffffff;
       border: 1px solid #999999;
       position: relative;
-      top: 26px;
+      top: 29px;
     }
     .buy-num-add {
       display: inline-block;
@@ -35,6 +37,7 @@
       border-radius: 0px 8px 8px 0px;
     }
   }
+  //确定按钮
   .buy-button-box {
     width: 100%;
     margin: 40px 0 0 0;
@@ -62,161 +65,231 @@
       color: #ffffff;
     }
   }
-  .wrapper {
-    display: flex;
-    position: relative;
-    // margin-top: 600px;
-    margin: 30px auto;
-    width: calc(
-      100% - 50px
-    ); // 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));
+  // .coupon-list-box {
+  //卡片
+  // .wrapper {
+  //   display: flex;
+  //   position: relative;
+  //   // margin-top: 600px;
+  //   margin: 30px auto;
+  //   width: calc(
+  //     100% - 50px
+  //   ); // 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));
 
-    .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)
-          top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff) bottom
-          right;
-      background-size: 100% 60%;
-      background-repeat: no-repeat;
+  //   .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 ) bottom
+  //     //     right;
+  //     // background-size: 100% 60%;
+  //     background-repeat: no-repeat;
 
-      width: 573px;
-      border-radius: 15px 0px 0px 15px;
-      // border-radius: 12px;
+  //     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;
+  //     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;
 
-        .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;
-        }
+  //       background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
+  //       background-size: 100% 100%;
+  //       padding: 0 24px 7px 2px;
+  //       width: auto;
+  //       font-size: 24px;
+  //       line-height: 48px;
+  //       height: 44.3px;
+  //       position: absolute;
+  //       top: 20px;
+  //       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;
 
-        .title-time {
-          font-size: 24px;
-          padding-top: 20px;
-          color: #c0c8d3;
-        }
-      }
-    }
-  }
+  //       .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;
+  //       }
 
-  .right-complete-two {
-    background: @whiteColor;
-    background: radial-gradient(circle at top left, transparent 15px, #fff) top
-        left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff) 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: 80px;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-      // border: 1px solid red;
+  //       .title-time {
+  //         font-size: 24px;
+  //         padding-top: 20px;
+  //         color: #c0c8d3;
+  //       }
+  //     }
+  //   }
 
-      .right-number {
-        width: 40px;
-        font-size: 20px;
-        border-radius: 4px;
-        border: 2px solid #999;
-        margin: auto;
-        text-align: center;
-      }
+  //   .right-complete-two {
+  //     background: @whiteColor;
 
-      .right-title {
-        font-weight: 700;
-        font-size: 24px;
-        padding-top: 20px;
-        text-align: center;
-      }
-    }
-  }
-  //线条
-  .right-complete-two::after {
-    content: "";
-    position: absolute;
-    top: 15px;
-    margin: 26px auto;
-    height: 70%;
-    border-left: 1px dashed #595959;
-    opacity: 0.12;
-  }
+  //     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: 129px;
+  //     border-radius: 0 15px 15px 0;
+  //     position: relative;
+  //     //右面部分
+  //     .right-content {
+  //       // width: 100px;
+  //       // height: 80px;
+  //       position: absolute;
+  //       top: 50%;
+  //       left: 50%;
+  //       transform: translate(-50%, -50%);
+  //       // border: 1px solid red;
+
+  //       .right-number {
+  //         width: 40px;
+  //         font-size: 20px;
+  //         border-radius: 4px;
+  //         border: 2px solid #999;
+  //         margin: auto;
+  //         text-align: center;
+  //       }
 
+  //       .right-title {
+  //         font-weight: 700;
+  //         font-size: 24px;
+  //         padding-top: 20px;
+  //         text-align: center;
+  //       }
+  //     }
+  //   }
+  //   //线条
+  //   .right-complete-two::after {
+  //     content: "";
+  //     position: absolute;
+  //     top: 15px;
+  //     margin: 26px auto;
+  //     height: 70%;
+  //     border-left: 1px dashed #595959;
+  //     opacity: 0.12;
+  //   }
+  // }
+
+  // .right-complete-two {
+  //   background: @whiteColor;
+  //   background: radial-gradient(circle at top left, transparent 15px, #fff 0 )
+  //       top left,
+  //     radial-gradient(circle at bottom left, transparent 15px, #fff 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: 80px;
+  //     position: absolute;
+  //     top: 50%;
+  //     left: 50%;
+  //     transform: translate(-50%, -50%);
+  //     // border: 1px solid red;
+
+  //     .right-number {
+  //       width: 40px;
+  //       font-size: 20px;
+  //       border-radius: 4px;
+  //       border: 2px solid #999;
+  //       margin: auto;
+  //       text-align: center;
+  //     }
+
+  //     .right-title {
+  //       font-weight: 700;
+  //       font-size: 24px;
+  //       padding-top: 20px;
+  //       text-align: center;
+  //     }
+  //   }
+  // }
+  // //线条
+  // .right-complete-two::after {
+  //   content: "";
+  //   position: absolute;
+  //   top: 15px;
+  //   margin: 26px auto;
+  //   height: 70%;
+  //   border-left: 1px dashed #595959;
+  //   opacity: 0.12;
+  // }
+  // }
+  //协议条款 + 支付按钮
   .view-button {
     position: fixed;
     bottom: 0;
@@ -250,6 +323,30 @@
         text-decoration: underline;
         font-size: 25px;
       }
+      .ul-li-text {
+        padding-left: 30px;
+        /* padding-bottom: 10px; */
+        position: relative;
+        top: -1em;
+
+        .ul-li-view {
+          display: inline-block;
+          margin-bottom: 3px;
+          margin-right: 5px;
+          width: 10px;
+          height: 10px;
+          background: #999999;
+          border-radius: 50%;
+        }
+        .ul-li-textname {
+          // width: 177px;
+          display: inline-block;
+          height: 19px;
+          font-size: 20px;
+          font-weight: 400;
+          color: #999999;
+        }
+      }
     }
     .button-box-button-box {
       position: relative;

src/pages/TobeShop/index.jsx

@@ -156,7 +156,7 @@ export default withLayout((props) => {
                     <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'>返现￥{item.cashback}</view>
+                  <view className='left-viewText'>返现￥{(item.cashback / 100).toFixed(2)}</view>
                   <view className='title-image'>
                     <image
                       className='image-1'

src/pages/TobeShop/style.less

@@ -1,7 +1,6 @@
 @whiteColor: #fff;
 
 .shop-Eat {
-  width: 100%;
   padding: 0 30px;
   .Consumption-Now {
     height: 33px;
@@ -114,14 +113,10 @@
       position: relative;
       display: flex;
       background: @whiteColor;
-      background: radial-gradient(
-            circle at top right,
-            transparent 15px,
-            #fff
-          )
+      background: radial-gradient(circle at top right, transparent 15px, #fff 0)
           top right,
-        radial-gradient(circle at bottom right, transparent 15px, #fff)
-          bottom right;
+        radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
+          right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
 
@@ -249,14 +244,10 @@
   }
   .right-complete-two {
     background: @whiteColor;
-    background: radial-gradient(
-          circle at top left,
-          transparent 15px,
-          #fff
-        )
+    background: radial-gradient(circle at top left, transparent 15px, #fff 0)
         top left,
-      radial-gradient(circle at bottom left, transparent 15px, #fff)
-        bottom left;
+      radial-gradient(circle at bottom left, transparent 15px, #fff 0) bottom
+        left;
     background-size: 100% 60%;
     background-repeat: no-repeat;
     width: 129px;

src/pages/details/foodDetails/foodDetails.jsx

@@ -32,15 +32,7 @@ export default withLayout((props) => {
   const { id, subOrderId, scene } = props.router.params;
 
   useEffect(() => {
-    if (id && subOrderId) {
-      Taro.navigateTo({
-        url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
-      });
-    }
-  }, [id, subOrderId]);
-
-  useEffect(() => {
-    if (id && scene&&!subOrderId) {
+    if (id && (scene || subOrderId)) {
       getVerifyTargetList({
         shopId: id,
         isMine: true,
@@ -48,12 +40,12 @@ export default withLayout((props) => {
       }).then((res) => {
         if (res?.records?.length > 0) {
           Taro.navigateTo({
-            url: `/pages/TobeShop/index?id=${id}`,
+            url: `/pages/TobeShop/index?id=${id}&subOrderId=${subOrderId}`,
           });
         }
       });
     }
-  }, [id, scene]);
+  }, [id, scene, subOrderId]);
 
   //商铺基础信息
   const [detail, setDetail] = useState({});
@@ -271,7 +263,7 @@ export default withLayout((props) => {
                   className="botton"
                   style={{ display: newextNum == AllextNum ? "" : "none" }}
                 >
-                  已经到底了~
+                  这是我的底线
                 </view>
               </>
           }

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -10,7 +10,7 @@ import baozan from '@/assets/icons/housemantj/bgood.png'
 import weibaozan from '@/assets/icons/housemantj/unLike.png'
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
 import withLayout from '@/layouts'
-import { useState, useEffect} from 'react'
+import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem, Button } from '@tarojs/components';
 import useSave from "@/utils/hooks/useSave"
@@ -156,10 +156,10 @@ export default withLayout((props) => {
             <view className='title'>
               <image src={titlems} />老板推荐好吃的
             </view>
-            
-            {(recommend || []).map((item) => <Cards item={item} det={item} st={parseFloat(item.score.toFixed(1))}/>)}
+
+            {(recommend || []).map((item) => <Cards item={item} det={item} st={parseFloat(item.score.toFixed(1))} />)}
           </view>
-          <view className='bottom'>已经到底了~</view>
+          <view className='bottom'>这是我的底线</view>
         </scroll-view>
       </view>
       <view className='bottomTab'>
@@ -168,7 +168,7 @@ export default withLayout((props) => {
           <image className='share' src={share} />分享
         </view>
         <view className='tab' onClick={toggleLike}>
-          <image className='good' style={{top:'1px'}} src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
+          <image className='good' style={{ top: '1px' }} src={isLike > 0 ? baozan : weibaozan} />{isLike > 0 ? '已爆赞' : '爆赞'}
         </view>
         <view className='tab' onClick={toggleSave}>
           <image className='collection' src={isSaved > 0 ? ax : good} />{isSaved > 0 ? '已收藏' : '加入收藏'}

src/pages/index/index.config.js

@@ -5,10 +5,11 @@ export default {
   enableShareAppMessage: true,
   usingComponents: {
     "mp-tabbar": "weui-miniprogram/tabbar/tabbar",
-    "mp-tabs": "../../../components/tabs/index",
+    "mp-tabs": "../../../components/tabs/index",
     "mp-checkbox-group": "weui-miniprogram/checkbox-group/checkbox-group",
     "mp-checkbox": "weui-miniprogram/checkbox/checkbox",
     "mp-cells": "weui-miniprogram/cells/cells",
-    "mp-dialog": "weui-miniprogram/dialog/dialog"
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
+    "mp-slideview": "weui-miniprogram/slideview/slideview",
   }
 }

src/pages/index/index.jsx

@@ -30,9 +30,9 @@ export default withLayout((props) => {
 
   const [currentTab, setCurrentTab] = useState(0)
 
-  const [isDidShow,setIsDidShow] = useState(0)
+  const [isDidShow, setIsDidShow] = useState(0)
 
-  useDidShow(()=>{
+  useDidShow(() => {
     setIsDidShow(isDidShow + 1)
   })
   const handleTabChange = (e) => {
@@ -82,7 +82,7 @@ export default withLayout((props) => {
         {currentTab === 0 && <Recommend location={location} />}
         {currentTab === 1 && <Guide person={person} router={router} location={location} />}
         {/* {currentTab === 2 && <Strategy />} */}
-        {currentTab === 2 && <Mine person={person} isDidShow={isDidShow}/>}
+        {currentTab === 2 && <Mine person={person} isDidShow={isDidShow} router={router} />}
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>

src/pages/index/tabs/Guide.jsx

@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from "react";
-import Taro from '@tarojs/taro'
+import Taro, { useDidShow } from '@tarojs/taro'
 import MoreGuide from "@/components/MoreGuide";
 import BossCard from '@/components/BossCard'
 import Taxi from '@/assets/icons/GuideCheck/taxi.png'
@@ -12,16 +12,23 @@ import sleep from '@/assets/icons/GuideCheck/sleep_logo.png'
 import { getTaRoom, goToRoomForm } from '@/services/taRoom​'
 import useTrackClick from '@/utils/hooks/useTrackClick'
 import showMore from '@/assets/icons/housemantj/setMore.png'
+import { useModel } from "@/store";
 import './GuideCss/style.less'
 
 
 export default (props) => {
   const { router, person, location, } = props
-  const { roomId, roomOrderId } = router.params
+  let { roomId, roomOrderId } = router.params
   const [extend, setExtend] = useState([])
   const [ifroomId, setIfroomId] = useState('havenot')
   const [spackage, setPackage] = useState([])
 
+  const { roomId: rid } = useModel('hotel')
+  console.log("🚀 ~ file: Guide.jsx ~ line 27 ~ rid", rid)
+
+  if (!roomId && rid) {
+    roomId = rid
+  }
 
   const trackClick = useTrackClick(router)
 
@@ -52,23 +59,25 @@ export default (props) => {
     })
   }
 
-  useEffect(() => {
+
+  useDidShow(() => {
     if (roomOrderId) {
       goToRoomForm(roomOrderId).then((res) => {
-        if (res.status !== 1) {
+        if (res.status !== 0) {
           Taro.navigateTo({
             url: `/pages/RoomOrder/index?roomOrderId=${roomOrderId}&status=${res.status}&roomId=${roomId}`,
           })
+
         }
       })
     }
-  }, [roomOrderId])
-
+  })
 
 
   useEffect(() => {
 
     if (roomId) {
+      console.log('--------------------------');
       // 点击’去这里‘跳转导航
       getTaRoom(roomId).then((res) => {
         Roomlog.current = (res.location).toString().split(',')[0]
@@ -87,7 +96,9 @@ export default (props) => {
       // getRecommendList({ location: RoomLocation }).then((res) => {
       //   setPackage(res || [])
       // })
-
+      getRecommendList({ location: location }).then((res) => {
+        setPackage(res || [])
+      })
 
     } else {
       getRecommendList({ location: location }).then((res) => {
@@ -107,7 +118,7 @@ export default (props) => {
     }
 
 
-  }, [roomId, RoomLocation])
+  }, [roomId, RoomLocation, taRoomContent?.wifiPassword, taRoomContent?.parkingAddress, location])
 
 
   const goRoomMap = () => {
@@ -153,6 +164,8 @@ export default (props) => {
     <scroll-view scrollY style='height:100%;'  >
 
       <view className='Guide-Home-box'>
+
+
         {
           ifroomId === 'havenot' && (
             <view className='Guide-image-text-box'>

src/pages/index/tabs/Mine.jsx

@@ -22,7 +22,7 @@ import './MineCss/style.less'
 
 
 export default (props) => {
-  const { person,isDidShow } = props
+  const { person, isDidShow, router } = props
   const { getAvatar, sessionKey } = useModel('person')
   const [showCutover, setShowCutover] = useState(false)
   const hasAvatar = !!person.avatar
@@ -85,7 +85,7 @@ export default (props) => {
   }
   //入住指引
   const handleHomeLogo = () => {
-    Taro.navigateTo({ url: '/pages/index/index?tab=1' })
+    Taro.navigateTo({ url: `/pages/index/index?tab=1` })
   }
   //收藏
   const handleCollect = () => {

src/services/payOrder.js

@@ -63,3 +63,12 @@ export const putVerifyTarget = (id) => request(`/verifyTarget/${id}`, { method:
 export const orderEvaluation = (targetType, targetId) => request(`/${targetType}/${targetId}/evaluate`, { method: 'post' })
 
 
+
+/**
+* 删除已支付订单
+* @param {*} id
+* @returns 
+*/
+export const deleteOrder = (id) => request(`/order/${id}`, { method: 'delete' })
+
+

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -175,7 +175,7 @@ export default (props) => {
               </>
             }
           </view>
-          {/* <view className='botton'>已经到底了~</view> */}
+          {/* <view className='botton'>这是我的底线</view> */}
         </scroll-view>
       </view>
     </view>

src/store/index.js

@@ -1,11 +1,13 @@
 import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-tiny-store'
 import system from './models/system'
 import person from './models/person'
+import hotel from './models/hotel'
 
 const store = createStore()
 const models = {
   system,
   person,
+  hotel,
 }
 
 const useModel = createModelHook(store)

src/store/models/hotel.js

@@ -0,0 +1,10 @@
+import { useState } from "react";
+
+export default function useHotel() {
+  const [roomId, setRoomId] = useState()
+
+  return {
+    roomId,
+    setRoomId,
+  }
+}

src/utils/hooks/useRouter.js

@@ -10,7 +10,7 @@ export default () => {
   const { qrCode } = useModel('person')
 
   const [toggleRefresh, setToggleRefresh] = useState()
-  
+
   routerRef.current = router
   const scene = router?.params?.scene
   const loginScene = Taro.getStorageSync('scene')
@@ -23,7 +23,7 @@ export default () => {
         routerRef.current.params = {
           ...routerRef.current.params || {},
           ...qrParams,
-          parseQRFinished: true, 
+          parseQRFinished: true,
         }
         setToggleRefresh(Math.random().toString())
         console.log('-----------qrCode---------------', qrCode)
@@ -34,12 +34,16 @@ export default () => {
           routerRef.current.params = {
             ...routerRef.current.params || {},
             ...qrParams,
-            parseQRFinished: true, 
+            parseQRFinished: true,
           }
           setToggleRefresh(Math.random().toString())
         })
       }
     }
   }, [qrCode, scene])
+<<<<<<< HEAD
+=======
+
+>>>>>>> b871529541525c34775f5c58a561d7153f4f99f7
   return routerRef.current
 }