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

src/components/AlreadyUsedMolded/index.jsx

@@ -1,64 +0,0 @@
-
-
-import food from '@/assets/icons/ProCard/food.png'
-import ProCard_hot from '@/assets/icons/ProCard/ProCard_hot.png'
-import formatTime from '@/utils/formatTime'
-
-import { useState } from 'react'
-import './style.less'
-
-
-
-
-const scoreList = new Array(5).fill(0);
-const score = "3.9";
-
-export default (props) => {
-  const [detail, setDetail] = useState({})
-
-  const star = parseFloat(((detail.sweetScore + detail.environmentScore + detail.serviceScore) / 3).toFixed(1));
-
-  const { list } = props
-
-  return (
-    <view>
-      {
-        list.map((item, index) => {
-          return (
-            <view class='wrapper-box' key={index} >
-              <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 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 className='title-money-3'>订单编号：{item.orderId}</text></text>
-                  <view className='title-time'>
-                    核销时间：{" "}
-                    {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
-                  </view>
-                </view>
-              </view>
-            </view>
-          )
-
-        })
-      }
-    </view>
-
-
-
-  )
-}

src/components/AlreadyUsedMolded/style.less

@@ -1,129 +0,0 @@
-@whiteColor: #fff;
-
-.wrapper-box {
-  display: flex;
-  position: relative;
-  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));
-
-  .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: 100%;
-    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-2 {
-            height: 19px;
-            font-size: 20px;
-            font-weight: 400;
-            color: #333333;
-            padding-left: 40px;
-          }
-        }
-      }
-      .title-money {
-        width: 58px;
-        height: 21px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #333333;
-        font-weight: 800;
-      }
-      .title-time {
-        font-size: 24px;
-        // padding-top: 20px;
-        color: #c0c8d3;
-      }
-      .title-money-3 {
-        font-size: 18px;
-        padding-left: 10px;
-        color: rgba(102, 102, 102, 0.8);
-      }
-
-      .title-time {
-        font-size: 24px;
-        padding-top: 20px;
-        color: #c0c8d3;
-      }
-    }
-  }
-}
-
-//线条
-.right-complete-two::after {
-  content: "";
-  position: absolute;
-  top: 15px;
-  margin: 26px auto;
-  height: 70%;
-  border-left: 1px dashed #595959;
-  opacity: 0.12;
-}

src/components/BossCard/index.jsx

@@ -36,16 +36,18 @@ export default (props) => {
           badge='food'
         />
         <CouponMedia.Body star={st}>
-          <View className='cpn-card-text'>
-            {(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}
-          </View>
-          <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-            <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
-            <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
-          </View>
-          <View className='cpn-md-act'>
-            <Location {...det} />
-            <SaveIcon saved={item.isSaved > 0} targetType='shop_package' targetId={item.packageId} />
+          <View className='bossCard'>
+            <View className='cpn-card-text'>
+              {(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}
+            </View>
+            <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+              <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
+              <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
+            </View>
+            <View className='cpn-md-act'>
+              <Location {...det} />
+              <SaveIcon saved={item.isSaved > 0} targetType='shop_package' targetId={item.packageId} />
+            </View>
           </View>
         </CouponMedia.Body>
       </CouponMedia>

src/components/BossCard/style.less

@@ -1,265 +1,38 @@
-
-.cpn-card-text {
-  font-size: 24px;
-  font-weight: 400;
-  color: #333333;
-  line-height: 40px;
-  vertical-align: baseline;
-
-  & > text {
-    display: inline-block;
-
-    & + text {
-      margin-left: 8px;
-    }
-  }
-  &_mn {
+.bossCard{
+  .cpn-card-text {
     font-size: 24px;
-    font-weight: bold;
-    color: #333333;
-  }
-
-  &_rm {
-    font-size: 18px;
     font-weight: 400;
-    text-decoration: line-through;
-    color: #666666;
-  }
-}
-
-.cpn-md-act {
-  display: flex;
-  margin-top: 10px;
-
-  & > view {
-    flex: 1;
-  }
-}
-
-
-// @whiteColor: #fff;
-// @Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
-// .container {
-//   width: 100%;
-//   .item-center-Number {
-//     width: 100%;
-//     margin-top: 30px;
-//     .buy-num-minus {
-//       display: inline-block;
-//       width: 60px;
-//       height: 60px;
-//       background: #ffffff;
-//       border: 1px solid #999999;
-//       border-radius: 8px 0px 0px 8px;
-//     }
-//     .buy-num-input {
-//       display: inline-block;
-//       width: 90px;
-//       height: 60px;
-//       font-size: 28px;
-//       font-weight: 400;
-//       color: #202020;
-//       background: #ffffff;
-//       border: 1px solid #999999;
-//       position: relative;
-//       top: 26px;
-//     }
-//     .buy-num-add {
-//       display: inline-block;
-
-//       width: 60px;
-//       height: 60px;
-//       background: #ffffff;
-//       border: 1px solid #999999;
-//       border-radius: 0px 8px 8px 0px;
-//     }
-//   }
-//   .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;
-//     }
-//   }
-
-//   .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));
-
-//     .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 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;
-//       }
-//       // @/assets/icons/ProCard/ProCard_hot.png
-//       .left-viewText {
-//         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;
+    color: #333333;
+    line-height: 40px;
+    vertical-align: baseline;
 
-        .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);
-        }
+    & > text {
+      display: inline-block;
 
-        .title-time {
-          font-size: 24px;
-          padding-top: 20px;
-          color: #c0c8d3;
-        }
+      & + text {
+        margin-left: 8px;
       }
-//     }
-//   }
-
-//   .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: 100px;
-//       // height: 80px;
-//       position: absolute;
-//       top: 50%;
-//       left: 50%;
-//       transform: translate(-50%, -50%);
-//       // border: 1px solid red;
+    }
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
+    }
 
-//       .right-number {
-//         width: 40px;
-//         font-size: 20px;
-//         border-radius: 4px;
-//         border: 2px solid #999;
-//         margin: auto;
-//         text-align: center;
-//       }
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
+    }
+  }
 
-//       .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;
-//   }
-// }
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
 
+    & > view {
+      flex: 1;
+    }
+  }
+}

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -1,70 +1,132 @@
-import { useState, useEffect } from 'react'
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { View } from '@tarojs/components'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
-import AlreadyUsedMolded from '@/components/AlreadyUsedMolded'
+import formatTime from '@/utils/formatTime'
+import food from '@/assets/icons/ProCard/food.png'
 import Popup from '@/components/Popup'
+import { saveEvaluate } from '@/services/mine'
 import './style.less'
 
 
-const scoreList = new Array(5).fill(0)
-const score = '3.9'
 
 
 
-export default (props) => {
-  const { showCutover, maskClosable, list, onClose } = props
 
-  const [CollectNub, setCollectNub] = useState(1)
+export default (props) => {
+  const { showCutover, maskClosable, item, onClose } = props
+  const scoreList = new Array(5).fill(0)
 
   const ButtonCancel = () => {
     onClose()
   }
   const ButtonOK = (e) => {
-    onClose()
+    if (evaluate.sweetScore == 0 || evaluate.environmentScore == 0 || evaluate.serviceScore == 0) {
+      Taro.showToast({
+        title: '请您给本店点亮小星星哦',
+        icon: 'none'
+      })
+      return;
+    }
+    else {
+      saveEvaluate(evaluate.targetType, evaluate.targetId, evaluate).then((res) => {
+        console.log(res)
+      })
+      onClose()
+    }
+  }
+  const [evaluate, setEvaluate] = useState({
+    sweetScore: 0,//口味
+    environmentScore: 0,//环境
+    serviceScore: 0,//服务
+    targetId: '',
+    targetType: 'shop'
+  })
+  const [kwCollectNub, setkwCollectNub] = useState(0)
+  const kwChange = (val) => {
+    setkwCollectNub(val + 1)
+    setEvaluate({ ...evaluate, sweetScore: val + 1, targetId: item.shopId })
+  }
+
+  const [hjCollectNub, sethjCollectNub] = useState(0)
+  const hjChange = (val) => {
+    sethjCollectNub(val + 1)
+    setEvaluate({ ...evaluate, serviceScore: val + 1 })
 
   }
 
-  const Nuberr = () => {
-    setCollectNub(+1)
+  const [fwCollectNub, setfwCollectNub] = useState(0)
+  const fwChange = (val) => {
+    setfwCollectNub(val + 1)
+    setEvaluate({ ...evaluate, environmentScore: val + 1 })
   }
 
   return (
     <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose} className='box-content' >
-      <AlreadyUsedMolded list={list} />
+      <View class='left-complete-one'  >
+        <View className='v1'>
+          <View className='left-viewText'>
+            返现￥{(item.cashback / 100)?.toFixed(2)}
+          </View>
+        </View>
+        <View className='v2'>
+          <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.packageDescription}
+              </View>
+              <View className='title-money-2'>
+                数量：{item.amount}张
+              </View>
+            </View>
+            <text className='title-money' >￥{(item.unitPrice / 100)?.toFixed(2)}元</text><text className='title-money-3'>订单编号：{item.orderId}</text>
+            <View className='title-time'>
+              核销时间：{" "}
+              {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
+            </View>
+          </View>
+        </View>
+      </View>
+      <View className='pjLine'></View>
       <view className='item-center-Number' >
         {/* 评分 */}
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >口味：</text>
+          <text className='card-box-star-text'  >口味：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index < kwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={() => kwChange(index)} />
               )
             })
           }
         </view>
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >环境：</text>
+          <text className='card-box-star-text' >环境：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index < hjCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={() => hjChange(index)} />
               )
             })
           }
         </view>
         <view className='card-box-star'>
-          <text className='card-box-star-text' onClick={Nuberr} >服务：</text>
+          <text className='card-box-star-text'  >服务：</text>
           {
             scoreList.map((_, index) => {
 
-              const src = (index + `${CollectNub}`) < score ? starOn : starOff
+              const src = index < fwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={Nuberr} />
+                <image className='card-star-image' key={index} src={src} onClick={() => fwChange(index)} />
               )
             })
           }

src/components/CompoentsOrder/AlreadyUsed/style.less

@@ -1,39 +1,95 @@
 @whiteColor: #fff;
-
-// .box-content {
-
-
-  .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;
+.box-content{
+  .weui-dialog__bd{
+    padding: 30px 20px 28px 20px;
+  }
+  .left-complete-one{
+    .v1{    
+      flex: none;
+      box-sizing: border-box;
+      width: 160px;
+      position: relative;
+      padding-bottom:20px;
+      .left-viewText{
+        box-sizing: border-box;
+        background: url('~@/assets/icons/ProCard/ProCard_hot.png') no-repeat;
+        background-size: 100% 100%;
+        padding: 16px 25px 10px 10px;
+        font-size: 20px;
+        color: #fff;
+        line-height: 1em;
       }
-      .card-star-image {
-        padding-left: 30px;
-        width: 21px;
-        height: 21px;
+    }
+    .v2{
+      display: flex;
+      padding-bottom: 20px;
+      .title-image{
+        opacity: none;
+        width: 144px;
+        height: 144px;
+        border-radius: 24px;
+        position: relative;
+        overflow: hidden;
+        flex: none;
+        .image-1{
+          width: 100%;
+          height: 100%;
+          display: block;
+        }
+        .image-2{
+          box-sizing: border-box;
+          position: absolute;
+          width: 99px;
+          height: 36px;
+          left: 0;
+          top: 0;
+        }
       }
-      .card-star-text {
-        padding-left: 10px;
-        font-size: 20px;
-        color: #333;
-        font-weight: 700;
+      .title-content {
+        padding-left: 18px;
+        flex: auto;
+        text-align: left;
+        .Pro-title {
+          display: flex;
+          .title-text {
+            flex: auto;
+            font-size: 24px;
+            padding-bottom: 10px;          
+          }
+          .title-money-2 {
+            flex: none;
+            font-size: 20px;
+            color: #333333;
+            padding-left: 40px;
+          }
+        }
+        .title-money {
+          font-size: 24px;
+          font-weight: bold;
+          color: #333333;
+        }
+        .title-time {
+          font-size: 24px;
+          padding-top: 20px;
+          color: #c0c8d3;
+        }
+        .title-money-3 {
+          font-size: 20px;
+          padding-left: 10px;
+          color: #666;
+        }
       }
     }
   }
-
+  .pjLine{
+    height: 2px;
+    background: #000;
+    width: 100%;
+    opacity: 0.1;
+  }
   .buy-button-box {
     width: 100%;
-    margin: 40px 0 0 0;
+    margin-top: 53px;
 
     .button-Cancel {
       display: inline-block;
@@ -48,7 +104,6 @@
     }
     .button-OK {
       display: inline-block;
-
       width: 236px;
       height: 78px;
       background: #274291;
@@ -58,5 +113,21 @@
       color: #ffffff;
     }
   }
+  .item-center-Number {
+    .card-box-star {
+      margin: 23px 0 7px 0;
+      .card-box-star-text {
+        font-size: 24px;
+        color: #666;
+      }
+      .card-star-image {
+        padding-left: 35px;
+        width: 22px;
+        height: 21px;
+      }
+    }
+  }
+}
+
+
 
-// }

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -4,8 +4,11 @@ import formatTime from "@/utils/formatTime";
 import CouponCard from '@/components/CouponCard'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
+import Cancel from "@/assets/icons/UserCenter/Cancel.png";
 import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
 import Null from "@/assets/icons/UserCenter/null_logo.png";
+import Evaluated from "@/assets/icons/UserCenter/evaluated.png";
+import Refund from "@/assets/icons/UserCenter/Refund.png";
 import Evaluation from "@/assets/icons/UserCenter/Evaluation.png";
 import './style.less'
 
@@ -14,7 +17,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 
 export default (props) => {
-  const { item, setShowCutover } = props
+  const { item, setShowCutover, show, sh, kkp } = props
 
   const handleDetail = () => {
     if (item.status === 0) {
@@ -46,19 +49,33 @@ export default (props) => {
     });
   }
   //评价
-  const evaluation = () => {
+  const evaluation = (val) => {
+    show(val)
     setShowCutover(true)
   }
+  //售后
+  const handleRefund = (item) => {
+    Taro.navigateTo({
+      url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
+    });
+  };
   const PayAction =
-    item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
-      item.status === 1 && item.isVerified == 0 ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
-        item.status === 2 && item.isVerified == 0 ? <Action.Image image={refund} /> :
-          item.status === 9 ? <Action.Image image={Null} /> :
-            item.isVerified == 1 ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation()} /> : ''
+    kkp == '1' ? null :
+      sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> :
+        item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
+          item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
+            item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
+              item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> :
+                item.status === 9 ? <Action.Image image={Null} /> :
+                  item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> :
+                    item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : null
+
 
   return (
     <>
-      <view className='OrderNumber'>订单编号：{item.orderId}</view>
+      {
+        sh != '1'|| kkp == '1'? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
+      }
       <CouponCard action={PayAction}>
         <CouponMedia>
           <CouponMedia.Header
@@ -66,21 +83,27 @@ export default (props) => {
             image={item.poster}
             badge='food'
           />
-          <CouponMedia.Body star={item.score}>
-            <View className='cpn-card-text'>
-              <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
-              <text className='title-money-2'>
-                数量：{item.amount}张
-              </text>
-            </View>
-            <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-              <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
-            </View>
-            <View className='cpn-md-act'>
-              <view className='title-time'>
-                有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
-                {formatTime(item.endTime, "yyyy/MM/dd")}
-              </view>
+          <CouponMedia.Body star={kkp == '1' ? null : item.score}>
+            <View className='orderCard'>
+              <View className='cpn-card-text'>
+                <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
+                <text className={kkp == '1' ? 'shanchu' : 'title-money-2'}>
+                  数量：{item.amount}张
+                </text>
+              </View>
+              <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                <Text className='cpn-card-text_mn'>￥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
+              </View>
+              <View className='cpn-md-act'>
+                <view className={item.isVerified == 1 ? 'title-time' : ''}>
+                  {
+                    sh == 1 ? '有效期：' + formatTime(item.endTime, "yyyy/MM/dd") :
+                      item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
+                        '有效期：' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
+                        formatTime(item.endTime, "yyyy/MM/dd")
+                  }
+                </view>
+              </View>
             </View>
           </CouponMedia.Body>
         </CouponMedia>

src/components/CompoentsOrder/OrderCard/style.less

@@ -1,46 +1,54 @@
-.cpn-card-text {
-  font-size: 24px;
-  font-weight: 400;
-  color: #333333;
-  line-height: 40px;
-  vertical-align: baseline;
-  display: flex;
-  .title-money-2 {
-    font-size: 20px;
+.orderCard{
+  .cpn-card-text {
+    font-size: 24px;
+    font-weight: 400;
     color: #333333;
-  }
-  & > text {
-    display: inline-block;
+    line-height: 40px;
+    vertical-align: baseline;
+    display: flex;
+    .title-money-2 {
+      font-size: 20px;
+      color: #333333;
+      text-decoration: line-through;
+    }
+    .shanchu{
+      font-size: 20px;
+      color: #333333;
+    }
+    & > text {
+      display: inline-block;
 
-    & + text {
-      margin-left: 8px;
+      & + text {
+        margin-left: 8px;
+      }
+    }
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
     }
-  }
-  &_mn {
-    font-size: 24px;
-    font-weight: bold;
-    color: #333333;
-  }
 
-  &_rm {
-    font-size: 18px;
-    font-weight: 400;
-    text-decoration: line-through;
-    color: #666666;
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
+    }
   }
-}
-.cpn-md-act {
-  display: flex;
-  margin-top: 10px;
-  position: relative;
-  .title-time {
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
+    position: relative;
     font-size: 22px;
-    // padding-top: 20px;
     color: #c0c8d3;
+    .title-time {
+      font-size: 28px;
+    }
   }
 }
+
 .OrderNumber {
   font-size: 20px;
-  font-weight: 400;
   color: #666666;
+  padding: 20px 0;
 }

src/components/CompoentsOrder/complete/index.jsx

@@ -77,10 +77,13 @@ export default (props) => {
       }
     }
   }, [IsPull]);
-
-
+  const [ite, setItem] = useState({})
+  const show = (val) => {
+    setItem(val)
+  }
   const slideButtonTap = (e) => {
-    deleteOrder(e.orderId || '').then(() => {
+    console.log(e)
+    deleteOrder(e.orderId).then(() => {
       Taro.showToast({
         title: '删除订单成功',
         icon: 'none',
@@ -109,7 +112,7 @@ export default (props) => {
           list.length == 0 ?
             <NoData /> :
             <view className='complete-boxs'>
-              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} list={list} />
+              <AlreadyUsed showCutover={showCutover} maskClosable={showCutover} onClose={onClose} item={ite} />
               {list.map((item, index) => {
                 /* 待支付 */
                 if (item.status === 0) {
@@ -125,7 +128,7 @@ export default (props) => {
                 else if (item.isVerified == 1) {
                   return (
                     <view key={`${type}-${item.orderId}`}>
-                      <OrderCard item={item} setShowCutover={setShowCutover} />
+                      <OrderCard item={item} setShowCutover={setShowCutover} show={show} />
                     </view>
                   );
                 }

src/components/CompoentsOrder/complete/style.less

@@ -8,76 +8,12 @@
 }
 
 .complete-boxs {
-  margin: 40px auto;
+  margin: 20px auto;
   padding: 0 30px;
   .foot {
-    width: 100%;
-    height: 26px;
     font-size: 28px;
-    font-weight: 400;
     color: #c0c8d3;
-    line-height: 34px;
-    margin-top: 40px;
+    margin: 40px 0;
     text-align: center;
   }
-  .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;
-      }
-    }
-  }
 }

src/components/CouponCard/Media/Body.jsx

@@ -10,7 +10,10 @@ export default (props) => {
 
   return (
     <View className='coupun-media_body'>
-      {enableStar && <Star score={(star).toFixed(1)} style={{ marginTop: '26rpx' }} />}      
+      {
+      !enableStar?
+      <Star score={5} style={{ marginTop: '26rpx',opacity: '0' }} />:
+       <Star score={(star).toFixed(1)} style={{ marginTop: '26rpx' }} />}      
       <View className='coupun-media_body_ctt'>
         {props.children}
       </View>

src/components/MoreGuide/index.jsx

@@ -23,7 +23,6 @@ export default (props) => {
               autoplay={false}
               loop={false}
               muted={false} style={{ width: "100%", height: '200px' }} src={item.content}></Video>
-
       }
 
     </>

src/components/ShopUsed/index.jsx

@@ -23,7 +23,6 @@ export default (props) => {
         duration: 2000,
       })
       setButtonStyle('none')
-
     })
   }
 
@@ -34,7 +33,7 @@ export default (props) => {
     <View className='orderCard'>
       <View style={{ overflow: 'hidden' }}>
         <View className='orderId'>订单编号：{item.orderId}</View>
-        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:ss') || ''}</View>
+        <View className='orderTime'>下单日期：{formatTimes(item.orderDate, 'yyyy-MM-dd hh:mm') || ''}</View>
       </View>
       <View className='order'>
         <Image className='orderImg' src={item.poster} mode='aspectFit' />
@@ -42,6 +41,9 @@ export default (props) => {
           <View className='foodName'>{item.description}</View>
           <View className='price'>合计金额：￥<Text style={{ fontSize: '24rpx' }}>{item.actualPrice / 100}</Text>元 <Text className='pnum'>数量：<Text>1</Text>张</Text> </View>
         </View>
+
+        <View className='veri_Date' > 核销时间：{formatTimes(item.verifiedDate, 'yyyy-MM-dd hh:mm')}</View>
+
         <View className='line' />
         <View className='phone'>客户手机：<Text>{item.phone.replace(/^(\d{3})\d{4}(\d+)/, "$1****$2") || ''}</Text>
           {

src/components/ShopUsed/style.less

@@ -1,104 +1,105 @@
-.orderCard{
+.orderCard {
   margin-bottom: 20px;
-  .orderId{
+  .orderId {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: left;
     margin: 60px 0 32px 0;
-
   }
-  .orderTime{    
+  .orderTime {
     font-size: 20px;
     color: #666666;
     line-height: 44px;
     float: right;
     margin: 60px 0 32px 0;
   }
-  .order{
-    background: #FFFFFF;
+  .order {
+    background: #ffffff;
     box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.08);
     border-radius: 12px;
     padding: 20px;
-    .orderImg{
+    .orderImg {
       width: 194px;
       height: 194px;
       border-radius: 22px;
       float: left;
-      margin:0 26px 30px 0;
+      margin: 0 26px 30px 0;
     }
-    .orderRight{
-      .foodName{
+    .orderRight {
+      .foodName {
         height: 63px;
         font-size: 24px;
         color: #333333;
         line-height: 40px;
       }
-      .price{
+      .price {
         font-size: 20px;
         font-weight: bold;
         color: #202020;
         line-height: 44px;
         margin: 37px 0 40px 0;
         height: 19px;
-        .pnum{
+        .pnum {
           color: #333333;
           font-weight: 400;
-          margin-left: 47px;         
+          margin-left: 47px;
         }
       }
-      .price+view{
+      .price + view {
         font-size: 20px;
         font-weight: bold;
-        color: #FF3434;
+        color: #ff3434;
         line-height: 44px;
         margin-bottom: 35px;
         height: 19px;
       }
     }
-    .line{
+    .veri_Date {
+      color: red;
+      height: 5px;
+      letter-spacing: 1px;
+      font-size: 30px;
+    }
+    .line {
       width: 100%;
       height: 2px;
       background: #000;
       opacity: 0.1;
       margin-top: 100px;
     }
-    .phone{
+    .phone {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       height: 23px;
       margin: 30px 0;
       // .Button-OK{
-      //   font-size: 28px;   
+      //   font-size: 28px;
       //   color: #C0C8D3;
       //   line-height: 34px;
       //   text-align: center;
       //   padding:40px 0 100px 0;
       // }
-
     }
 
-    .tripTime{
+    .tripTime {
       font-size: 24px;
       color: #666666;
       line-height: 44px;
       margin-bottom: 30px;
     }
   }
-
-  
 }
-button{
+button {
   width: 160px;
-height: 40px;
-background: #1A3B83;
-/* margin: 0 auto; */
-line-height: 40px;
-border-radius: 12px;
-font-size: 23px;
-color: #ffffff;
-position: relative;
-right: -8em;
-top: -2em;
+  height: 40px;
+  background: #1a3b83;
+  line-height: 40px;
+  border-radius: 12px;
+  font-size: 23px;
+  color: #ffffff;
+  position: relative;
+  right: -8em;
+  top: -2em;
 }

src/components/foodCards/foodCards.jsx

@@ -1,4 +1,3 @@
-import useSave from "@/utils/hooks/useSave"
 import Taro from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import CouponCard from '@/components/CouponCard'
@@ -23,7 +22,7 @@ export default (props) => {
   }
   const PayAction = <Action.Icon icon={Pay} text='支付' onClick={handlePayClick} />
   return (
-    <View style={{margin:'15px 5px'}}>
+    <View style={{ margin: '15px 5px' }}>
       <CouponCard action={PayAction}>
         <CouponMedia onClick={goshop ? '' : goFood}>
           <CouponMedia.Header
@@ -32,16 +31,18 @@ export default (props) => {
             badge='food'
           />
           <CouponMedia.Body star={st}>
-            <View className='cpn-card-text'>
-              {(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}
-            </View>
-            <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
-              <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
-              <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
-            </View>
-            <View className='cpn-md-act'>
-              <Location {...det} />
-              <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+            <View className='foodCard'>
+              <View className='cpn-card-text'>
+                {(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}
+              </View>
+              <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+                <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
+                <Text className='cpn-card-text_rm'>{`门市价${(item.standardPrice / 100)?.toFixed(2)}元`}</Text>
+              </View>
+              <View className='cpn-md-act'>
+                <Location {...det} />
+                <SaveIcon saved={item.isSaved > 0} targetType='shop_package' editable={editable} targetId={item.packageId} />
+              </View>
             </View>
           </CouponMedia.Body>
         </CouponMedia>

src/components/foodCards/style.less

@@ -1,36 +1,38 @@
-.cpn-card-text {
-  font-size: 24px;
-  font-weight: 400;
-  color: #333333;
-  line-height: 40px;
-  vertical-align: baseline;
+.foodCard{
+  .cpn-card-text {
+    font-size: 24px;
+    font-weight: 400;
+    color: #333333;
+    line-height: 40px;
+    vertical-align: baseline;
 
-  & > text {
-    display: inline-block;
+    & > text {
+      display: inline-block;
 
-    & + text {
-      margin-left: 8px;
+      & + text {
+        margin-left: 8px;
+      }
+    }
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
     }
-  }
-  &_mn {
-    font-size: 24px;
-    font-weight: bold;
-    color: #333333;
-  }
 
-  &_rm {
-    font-size: 18px;
-    font-weight: 400;
-    text-decoration: line-through;
-    color: #666666;
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
+    }
   }
-}
 
-.cpn-md-act {
-  display: flex;
-  margin-top: 10px;
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
 
-  & > view {
-    flex: 1;
+    & > view {
+      flex: 1;
+    }
   }
 }

src/components/toggleRole/ToggleRole.less

@@ -1,56 +1,54 @@
-.User-box-sths{
+.User-box-sths {
   display: flex;
-  margin: 40px 0  60px 0;
+  margin: 40px 0 60px 0;
   justify-content: space-around;
   flex-wrap: wrap;
-  .User-box-selectUser{
+  .User-box-selectUser {
     width: 100%;
     font-size: 32px;
     font-weight: bold;
     color: #202020;
     line-height: 32px;
-    margin: 60px 0 70px  0;
+    margin: 60px 0 70px 0;
     text-align: left;
   }
-  .User-box-tourist{
+  .User-box-tourist {
     display: inline-block;
 
-     .Ubs-tourist-image{
+    .Ubs-tourist-image {
       width: 86px;
       height: 86px;
-
     }
-    .Ubs-tourist-text{
+    .Ubs-tourist-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color: #999999;      
+      color: #999999;
     }
   }
-  .User-box-hotelBoss{
+  .User-box-hotelBoss {
     display: inline-block;
-    .Ubs-hotelBoss-image{
+    .Ubs-hotelBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-hotelBoss-text{
+    .Ubs-hotelBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
       color: #999999;
     }
   }
-  .User-box-shopBoss{
-    .Ubs-shopBoss-image{
+  .User-box-shopBoss {
+    .Ubs-shopBoss-image {
       width: 86px;
       height: 86px;
     }
-    .Ubs-shopBoss-text{
+    .Ubs-shopBoss-text {
       display: block;
       font-size: 30px;
       font-weight: bold;
-      color:#202020;
+      color: #202020;
     }
   }
-
-}
+}

src/hotel/components/HouseManage/houseManage.jsx

@@ -94,6 +94,7 @@ export default React.forwardRef((props, ref) => {
     getShareMessage: () => {
       const { shareImage, roomOrderId } = shareDataRef.current
       setShowCard(false)
+      // console.log(`/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`)
       return {
         title: room.roomName,
         path: `/pages/index/index?tab=1&roomId=${room.roomId}&roomOrderId=${roomOrderId}&fromType=hotel&recommender=${hotel.hotelId}`,

src/hotel/pages/landlord/landlord.jsx

@@ -68,14 +68,6 @@ export default withLayout((props) => {
         {hotel?.hotelId ? currentTab === 0 && <HouseManage hotelList={hotelList} hotel={hotel} onHotelChange={handleHotelChange} ref={houseRef} disabled={!hotel.hotelId} /> : <NoData />}
       </view>
       <view className='index-tabbar'>
-        {/* <TabBar extClass='custom-tabbar bottomTab' current={currentTab} onChange={handleTabChange}>
-          <view className={`${currentTab === 0 ? 'houseTab' : ''}`}>
-            <image className='house' src={currentTab === 0 ? onhouseImg : houseImg} /><text>房源管理</text>
-          </view>
-          <view className={`${currentTab === 1 ? 'incomeTab' : ''}`}>
-            <image className='incomes' src={currentTab === 1 ? onincomeImg : incomeImg} /><text>我的收入</text>
-          </view>
-        </TabBar> */}
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>

src/layouts/Loading.jsx

@@ -1,3 +1,4 @@
+import { View } from '@tarojs/components'
 import Spin from '@/components/Spin'
 import logo from '@/assets/icons/comm/logo_small.png'
 import './style.less'
@@ -13,6 +14,19 @@ export default (props) => {
         logoVisible !== false &&
         (<image className='loading-logo' src={logo} style={{ width, height }} />)
       }
+      <View
+        style={{
+          width: '28vw',
+          color: '#4D4D4D',
+          padding: '12px',
+          position: 'absolute',
+          left: '-4vh',
+          textAlign: 'center',
+          opacity: '0.8'
+        }}
+      >
+        收集人间美好
+      </View>
     </view>
   )
 }

src/layouts/index.jsx

@@ -59,4 +59,5 @@ export default (Child) => (props) => {
   }
 
   return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
+
 }

src/pages/MineUserAll/ContactMe/index.jsx

@@ -31,15 +31,16 @@ export default withLayout((props) => {
   }
   return (
     <view className='box-content'>
-      <CustomNav title='联系我们' />
+      <view className='index-navbar'>
+        <CustomNav title='联系我们' />
+      </view>
       <view style={{ padding: '60rpx 30rpx' }}>
         <view class='section'>
-          <textarea autoHeight placeholder='请输入您的建议或意见!' id='content' />
+          <textarea autoHeight placeholder='有任何疑难杂症或者不开心，就在这里留言。' id='content' />
         </view>
         <view className='weChate-image' >
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
         </view>
-
         <view className='button-info'>
           <Button className='button-box' onClick={submit}>提交</Button>
           <Button className='button-box-Cancel' onClick={back} >取消</Button>

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

@@ -1,9 +1,10 @@
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
 import Taro from "@tarojs/taro";
-import { Button, Textarea } from "@tarojs/components";
+import { Button, Textarea, View } from "@tarojs/components";
 import formatPrice from "@/utils/formatPrice";
 import formatTime from "@/utils/formatTime";
 import { useState, useEffect } from "react";
+import OrderCard from '@/components/CompoentsOrder/OrderCard'
 import withLayout from "@/layouts";
 import { getOrderSub, refund } from "@/services/payOrder";
 import food from "@/assets/icons/ProCard/food.png";
@@ -87,7 +88,7 @@ export default withLayout((props) => {
       refundReason: explain,
     }).then((res) => {
       Taro.hideLoading();
-      Taro.navigateBack({ delta: 1 })
+      Taro.navigateTo({ url: '/pages/MineUserAll/AllOrder/index?tabJump=0' })
       Taro.showToast({
         title: "退款成功",
         icon: "none",
@@ -110,148 +111,108 @@ export default withLayout((props) => {
   }, [list]);
 
   return (
-    <view className='box-content'>
-      <CustomNav title='售后退款' />
-      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
-
-        <view className='Refund-Content-box'>
-
-          <view className='title-image'>
-            <image
-              mode='scaleToFill'
-              className='title-image-cup'
-              src={BlackSpot}
-            />
-            <text className='title-title-boss'>商品信息</text>
+    <view>
+      <view className='index-navbar'>
+        <CustomNav title='售后退款' />
+      </view>
+      <scroll-view scroll-y style='height: calc(100vh - 65px);' >
+        <View className='index-container box-content'>
+          <view className='Refund-Content-box'>
+            <view className='title-image'>
+              <image
+                mode='scaleToFill'
+                className='title-image-cup'
+                src={BlackSpot}
+              />
+              <text className='title-title-boss'>商品信息</text>
+            </view>
           </view>
-        </view>
-        {/* 商品信息结束 */}
-        <view>
-          {(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.packageDescription}
-                        <text className='title-money-2'>
-                          数量：{item.amount}张
-                        </text>
-                      </view>
-                    </view>
-                    <text className='title-money'>
-                      ￥{formatPrice(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'>
-                  <view className='right-content'></view>
-                </view>
-              </view>
-            );
-          })}
-        </view>
-
-        {/* 卡片结束 */}
-        <view className='Refund-Content-box'>
-          <view className='title-image'>
-            <image
-              mode='scaleToFill'
-              className='title-image-cup'
-              src={BlackSpot}
-            />
-            <text className='title-title-boss'>退款原因</text>
+          {/* 商品信息结束 */}
+          <view>
+            {(list || []).map((item) => {
+              return (
+                <OrderCard item={item}  key={item.orderId} kkp='1' />                
+              );
+            })}
           </view>
-          {/* 退款结束 */}
-        </view>
-        <view className='Refund-content'>
-          {options.map((x) => {
-            return (
-              <text
-                className={`Refund-star-view${x.key} ${checkeds.indexOf(x.key) > -1
-                  ? "bg2"
-                  : `Refund-star-view${x.key}`
-                  }`}
-                key={x.key}
-                onClick={() => viewOK(x)}
-              >
-                {x.title}
-              </text>
-            );
-          })}
-        </view>
-
-        <view className='Refund-Content-box'>
-          <view className='title-image'>
-            <image
-              mode='scaleToFill'
-              className='title-image-cup'
-              src={BlackSpot}
+          {/* 卡片结束 */}
+          <view className='Refund-Content-box'>
+            <view className='title-image'>
+              <image
+                mode='scaleToFill'
+                className='title-image-cup'
+                src={BlackSpot}
+              />
+              <text className='title-title-boss'>退款原因</text>
+            </view>
+            {/* 退款结束 */}
+          </view>
+          <view className='Refund-content'>
+            {options.map((x) => {
+              return (
+                <text
+                  className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
+                    ? "bg2"
+                    : `Refund-star-view2`
+                    }`}
+                  key={x.key}
+                  onClick={() => viewOK(x)}
+                >
+                  {x.title}
+                </text>
+              );
+            })}
+          </view>
+          <view className='Refund-Content-box'>
+            <view className='title-image'>
+              <image
+                mode='scaleToFill'
+                className='title-image-cup'
+                src={BlackSpot}
+              />
+              <text className='title-title-boss'>退款说明</text>
+            </view>
+          </view>
+          <view class='section'>
+            <Textarea
+              placeholder='请补充退款说明（选填）!'
+              onInput={(e) => setExplain(e.detail.value)}
+              confirm-type='done'
             />
-            <text className='title-title-boss'>退款说明</text>
           </view>
-        </view>
-        <view class='section'>
-          <Textarea
-            placeholder='请补充退款说明（选填）!'
-            onInput={(e) => setExplain(e.detail.value)}
-            confirm-type='done'
-          />
-        </view>
-        <view className='money-title'>
-          实付金额:{" "}
-          <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
-        </view>
-        <view className='money-title'>
-          已获返现:{" "}
-          <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
-        </view>
-        <view className='money-title'>
-          退款金额:{" "}
-          <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
-        </view>
-        <view className='ul-li-text'>
-          <view className='ul-li-view'></view>
-          <text className='ul-li-textname'>退款金额不可修改</text>
-        </view>
-        <view className='ul-li-text'>
-          <view className='ul-li-view'></view>
-          <text className='ul-li-textname'>
-            下单获得返现金额，会在退款时被扣除；
-          </text>
-        </view>
-        <view className='ul-li-text'>
-          <view className='ul-li-view'></view>
-          <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
-        </view>
-
-        <view className='button-info'>
-          <Button className='button-box' onClick={() => onRefund()}>
-            提交申请
-          </Button>
-        </view>
+          <view className='money-title'>
+            实付金额:{" "}
+            <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
+          </view>
+          <view className='money-title'>
+            已获返现:{" "}
+            <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
+          </view>
+          <view className='money-title'>
+            退款金额:{" "}
+            <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
+          </view>
+          <view className='ul-li-text'>
+            <view className='ul-li-view'></view>
+            <text className='ul-li-textname'>退款金额不可修改</text>
+          </view>
+          <view className='ul-li-text'>
+            <view className='ul-li-view'></view>
+            <text className='ul-li-textname'>
+              下单获得返现金额，会在退款时被扣除；
+            </text>
+          </view>
+          <view className='ul-li-text'>
+            <view className='ul-li-view'></view>
+            <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
+          </view>
+          <view className='button-info'>
+            <Button className='button-box' onClick={() => onRefund()}>
+              提交申请
+            </Button>
+          </view>
+        </View>
       </scroll-view>
-
     </view >
   );
 });

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

@@ -1,9 +1,7 @@
 @whiteColor: #fff;
 
 .box-content {
-  width: 100%;
-  margin: 0 35px;
-
+  margin: 0 30px;
   .Refund-Content-box {
     .title-image {
       margin-top: 39px;
@@ -15,365 +13,59 @@
         height: 32px;
         margin-top: 10px;
         padding-right: 10px;
-        align-items: center;
       }
       .title-title-boss {
-        align-items: center;
         font-size: 32px;
         font-weight: 800;
-        color: #202020;
-      }
-    }
-  }
-
-  .wrapper {
-    margin: auto;
-
-    margin-top: 40px;
-    display: flex;
-    position: relative;
-    // 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));
-    .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;
-      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;
-
-      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 {
-        height: 144px;
-        margin-left: 20px;
-        border-radius: 24px;
-        overflow: hidden;
-        position: relative;
-
-        .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-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;
-          display: inline-block;
-          font-weight: 800;
-          margin: 15px auto;
-        }
-        .title-money-2 {
-          height: 19px;
-          font-size: 20px;
-          font-weight: 400;
-          color: #333333;
-          padding-left: 50px;
-          text-decoration: line-through;
-        }
-
-        .title-time {
-          font-size: 24px;
-          // padding-top: 20px;
-          color: #c0c8d3;
-        }
-        .title-position-on {
-          display: flex;
-          font-size: 20px;
-          .title-position {
-            width: 18px;
-            height: 24px;
-            padding-right: 10px;
-            padding-top: 5px;
-          }
-          .title-position-image {
-            align-items: center;
-            font-size: 20px;
-            color: #333;
-          }
-          .title-on {
-            // margin-bottom: 10px;
-            padding-top: 5px;
-            padding-left: 40px;
-            width: 21px;
-            height: 21px;
-            padding-right: 10px;
-          }
-          .title-on-text {
-            align-items: center;
 
-            font-size: 20px;
-            color: #333;
-          }
-        }
       }
     }
   }
 
-  .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: 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-title {
-        font-weight: 700;
-        font-size: 24px;
-        padding-top: 10px;
-        text-align: center;
-      }
-    }
-  }
   .Refund-content {
-    width: 100%;
     margin-top: 45px;
     .Refund-star-view1 {
-      display: inline-block;
-      width: 295px;
-      height: 60px;
       border: 1px solid #999999;
-
       border-radius: 30px;
       font-size: 24px;
-      font-weight: bold;
-      color: #666666;
-
-      text-align: center;
-      line-height: 60px;
-    }
-    .Refund-star-view2 {
-      width: 198px;
-      height: 60px;
-      border: 1px solid #999999;
-
-      border-radius: 30px;
-      font-size: 24px;
-      font-weight: bold;
-      color: #666666;
-
-      text-align: center;
-      line-height: 60px;
       display: inline-block;
-      margin-left: 30px;
-    }
-    .Refund-star-view3 {
-      margin: 30px auto;
-      display: inline-block;
-      width: 507px;
-      height: 60px;
-      border: 1px solid #999999;
-
-      border-radius: 30px;
-      font-size: 24px;
-      font-weight: bold;
-      color: #666666;
-
-      text-align: center;
-      line-height: 60px;
-    }
-    .Refund-star-view4 {
-      display: inline-block;
-      width: 146px;
-      height: 60px;
-      background: #ffffff;
-      border-radius: 30px;
-      border: 1px solid #999999;
-      font-size: 24px;
-      font-weight: bold;
-      color: #666666;
-      text-align: center;
-      line-height: 60px;
-      margin-left: 30px;
-    }
-    .Refund-star-view5 {
-      display: inline-block;
-
-      width: 220px;
-      height: 60px;
-      background: #ffffff;
-      border-radius: 30px;
-      border: 1px solid #999999;
-      font-size: 24px;
       font-weight: bold;
       color: #666666;
-      text-align: center;
-      line-height: 60px;
+      padding: 18px 23px 19px 23px;
+      margin-bottom: 30px;
     }
-    .Refund-star-view6 {
-      display: inline-block;
-
-      width: 257px;
-      height: 60px;
-      background: #ffffff;
-      border-radius: 30px;
-      border: 1px solid #999999;
-      font-size: 24px;
-      font-weight: bold;
-      color: #666666;
-      text-align: center;
-      line-height: 60px;
-      margin-left: 30px;
+    .Refund-star-view2 {
+      margin-right: 30px;
     }
-
     /* 点击以后的样式 */
     .bg2 {
       color: #274190;
+      margin-right: 30px;
       border: 2px solid #274190;
     }
   }
 
   .section {
-    width: 86%;
-    height: 254px;
-    background: #ffffff;
     border: 1px solid #b5b5b5;
+    font-size: 24px;
     box-shadow: 0px 4px 24px 0px rgba(0, 0, 0, 0.08);
-    padding: 0 20px 0 20px;
+    padding: 30px;
     margin-top: 40px;
-    textarea {
-      padding-top: 20px;
-      font-size: 24px;
-      font-weight: 400;
-      color: #666666;
-    }
   }
 
   .money-title {
-    // display: inline-block;
     margin: 40px 0;
-    width: 86%;
-    padding-bottom: 20px;
-    // height: 29px;
+    padding: 30px 0;
     font-size: 30px;
     font-weight: bold;
     color: #202020;
-    // border-bottom: 1px solid ;
-    background: #ffffff;
     box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.12);
+    .money-name {
+      font-size: 30px;
+      color: #ff3434;
+    }
   }
-
-  .money-name {
-    font-size: 30px;
-    font-weight: bold;
-    color: #ff3434;
-  }
+  
   .ul-li-text {
     .ul-li-view {
       display: inline-block;
@@ -385,37 +77,22 @@
       border-radius: 50%;
     }
     .ul-li-textname {
-      // width: 177px;
-      display: inline-block;
-      height: 19px;
       font-size: 20px;
-      font-weight: 400;
       color: #999999;
     }
   }
 
   .button-info {
-    margin-bottom: 70px;
-
+    margin-bottom: 80px;
     .button-box {
-      margin: 60px 0;
-      width: calc(100% - 60px);
-      height: 88px;
-      line-height: 88px;
-      background: #274291;
+      margin-top: 60px;
+      height: 92px;
+      line-height: 92px;
+      background: #1A3B83;      
       border-radius: 12px;
       color: @whiteColor;
-      margin-bottom: 2em;
+      font-size: 30px;
+      letter-spacing: 0.1em;
     }
   }
-
-  //线条
-  // .right-complete-two::after {
-  //   content: "";
-  //   position: absolute;
-  //   top: 15px;
-  //   margin: 26px auto;
-  //   height: 70%;
-  //   border-left: 1px dashed #595959;
-  // }
 }

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -1,21 +1,12 @@
 import { useState, useEffect } from "react";
 import Taro, { useDidShow } from "@tarojs/taro";
-import food from "@/assets/icons/ProCard/food.png";
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
 import withLayout from "@/layouts";
-
-import Null from "@/assets/icons/UserCenter/null_logo.png";
-import Refund from "@/assets/icons/UserCenter/Refund.png";
-
-import starOn from "@/assets/icons/GuideCheck/starOn.png";
-import starOff from "@/assets/icons/GuideCheck/starOff.png";
-
+import OrderCard from '@/components/CompoentsOrder/OrderCard'
 import { getOrderSub } from "@/services/payOrder";
-import formatTime from '@/utils/formatTime'
 import CustomNav from "@/components/CustomNav";
 import "./style.less";
 
-const scoreList = new Array(5).fill(0);
+
 export default withLayout((props) => {
   const { router, person } = props;
   const [list, setList] = useState([]);
@@ -44,11 +35,6 @@ export default withLayout((props) => {
     });
   };
 
-  const handleRefund2 = (item) => {
-    Taro.navigateTo({
-      url: `/pages/MineUserAll/RefundMoney/CheckRefund/index?id=${item.orderId}`,
-    });
-  };
   const pageRefresh = () => {
     // 页面下拉刷新回调
     setPull(true);
@@ -82,10 +68,12 @@ export default withLayout((props) => {
   useEffect(() => {
     getList();
   }, [pageNum]);
-
+    
   return (
     <view className='box-content'>
-      <CustomNav title='售后退款' />
+      <view className='index-navbar'>
+        <CustomNav title='售后退款' />
+      </view>
       <scroll-view
         scrollY
         style='height: calc(100vh - 176rpx);'
@@ -98,61 +86,8 @@ export default withLayout((props) => {
         <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 className='left-viewText'>
-                    返现￥{item.cashback / 100}
-                  </view>
-                  {/* 评分 */}
-                  <view className='card-box-star'>
-                    {scoreList.map((_, index) => {
-                      const src = index + 1 <= item.score ? starOn : starOff;
-                      return (
-                        <image
-                          className='card-star-image'
-                          key={index}
-                          src={src}
-                        />
-                      );
-                    })}
-                    <text className='card-star-text'>
-                      {item.score?.toFixed(1)}
-                    </text>
-                  </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.packageDescription}
-                        <text className='title-money-2'>
-                          数量：{item.amount}张
-                        </text>
-                      </view>
-                    </view>
-                    <text className='title-money'>
-                      ￥{item.unitPrice / 100}元
-                    </text>
-                    <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'>
-                    {/* <image className='right-image-two' src={Null} /> */}
-                    <image className='right-image' src={Refund} />
-                    <view className='right-title'>售后/退款</view>
-                  </view>
-                </view>
-              </view>
-            );
+              <OrderCard item={item}  key={item.orderId} sh='1' />              
+            )            
           })}
           <view className='foot'>这是我的底线</view>
         </view>

src/pages/MineUserAll/RefundMoney/style.less

@@ -1,236 +1,12 @@
 @whiteColor: #fff;
 
 .box-content {
-  width: 100%;
   .View-box-Card {
-    .wrapper {
-      width: calc(100% -25px);
-      margin-left: 25px;
-      margin-top: 40px;
-      display: flex;
-      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;
-        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;
-        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;
-
-        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;
-          height: 144px;
-          margin-left: 20px;
-          border-radius: 24px;
-          overflow: hidden;
-          position: relative;
-
-          .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-content {
-          // padding: 84px 0 56px 20px;
-          padding-left: 18px;
-
-          .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-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-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)
-          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;
-          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;
-    }
+    margin: 30px 30px 0 30px;
     .foot {
-      width: 100%;
-      height: 26px;
       font-size: 28px;
-      font-weight: 400;
       color: #c0c8d3;
-      line-height: 34px;
-      margin-top: 40px;
+      margin: 40px 0;
       text-align: center;
     }
   }

src/pages/PayOrder/style.less

@@ -65,230 +65,6 @@
       color: #ffffff;
     }
   }
-  // .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 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;
-
-  //     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;
-
-  //       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;
-
-  //       .Pro-title {
-  //         .title-text {
-  //           width: 375px;
-  //           overflow: hidden;
-  //           text-overflow: ellipsis;
-  //           display: -webkit-box; //必须要
-  //           -webkit-line-clamp: 1;
-  //           -webkit-box-orient: vertical;
-  //           word-break: break-all; /* 多出文本省略号代替 */
-  //           text-align: left;
-  //           font-size: 24px;
-  //           padding-bottom: 10px;
-  //         }
-  //       }
-  //       .title-money {
-  //         padding-top: 34px;
-  //         font-size: 24px;
-  //         // color: red;
-  //         font-weight: 800;
-  //       }
-  //       .title-money-2 {
-  //         font-size: 18px;
-  //         color: #666;
-  //         padding-left: 10px;
-  //         text-decoration: line-through;
-  //       }
-
-  //       .title-time {
-  //         font-size: 24px;
-  //         padding-top: 20px;
-  //         color: #c0c8d3;
-  //       }
-  //     }
-  //   }
-
-  //   .right-complete-two {
-  //     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: 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;
@@ -339,11 +115,7 @@
           border-radius: 50%;
         }
         .ul-li-textname {
-          // width: 177px;
-          display: inline-block;
-          height: 19px;
-          font-size: 20px;
-          font-weight: 400;
+          font-size: 25px;
           color: #999999;
         }
       }

src/pages/TobeShop/index.jsx

@@ -1,8 +1,11 @@
 import Taro from "@tarojs/taro";
+import { Button, Icon, Text, Textarea, View } from "@tarojs/components";
 import { useState, useEffect } from "react";
 import withLayout from "@/layouts";
 import CustomNav from "@/components/CustomNav";
 import { getShopDetail, getShopPackage, getExtendContent } from '@/services/home';
+import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
+import formatTime from '@/utils/formatTime'
 import Popup from "@/components/Popup";
 import formatPrice from "@/utils/formatPrice";
 
@@ -13,9 +16,6 @@ import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
 import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
 import food from "@/assets/icons/ProCard/food.png";
 import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
-import { Button, Icon, Text, Textarea } from "@tarojs/components";
-import { getVerifyTargetList, putVerifyTarget } from "@/services/payOrder";
-import formatTime from '@/utils/formatTime'
 
 import "./style.less";
 
@@ -71,7 +71,6 @@ export default withLayout((props) => {
   };
   const ButtonOK = (e) => {
     if (!checked) return
-    // setShowDialog(false)
     if (showDialog === true) {
       Taro.showLoading({
         title: '核销中'
@@ -81,7 +80,6 @@ export default withLayout((props) => {
         Taro.hideLoading()
         setShowDialog(false);
         setConsumption(true);
-        Taro.navigateTo({ url: '/pages/MineUserAll/AllOrder/index?tabJump=3' })
       }).catch(e => {
         Taro.hideLoading()
         setShowDialog(false);
@@ -104,12 +102,14 @@ export default withLayout((props) => {
   };
 
   return (
-    <view className='shop-Eat'>
-      <CustomNav title='到店核销' />
+    <view className='shop-Eat'>      
+      <view className='index-navbar'>
+        <CustomNav title='到店核销' />
+      </view>
       <Popup show={showDialog} maskClosable={false}>
-        <view className='Consumption-Now'>您即将核销1张套餐券！</view>
-        <text className='Consumption-text'>核销后套餐券不退不换</text>
-        <text className='Consumption-text'>请核对无误后再点击确认！</text>
+        <View className='Consumption-Now'>真的要翻我的牌子吗？</View>
+        <View className='Consumption-text'>核销后套餐券不退不换,</View>
+        <View className='Consumption-text'>请核对无误后再点击确认。</View>
         <view className='buy-button-box'>
           <button className='button-Cancel' onClick={ButtonCancel}>
             取消
@@ -122,11 +122,13 @@ export default withLayout((props) => {
       <Popup show={Consumption} maskClosable={false}>
         <view className='Perfection-image-view'>
           <image src={Perfection} className='Perfection-image' />
+          <View>
+            <text className='tleft'>请和店员说一下：</text><text className='tright'>“我核销好了”</text>
+          </View>
         </view>
-        <text>核销完成！请与店铺确认！</text>
         <view className='buy-button-box'>
           <button className='button-OK' onClick={PerfectionOK}>
-            完成
+            说过了
           </button>
         </view>
       </Popup>
@@ -161,12 +163,12 @@ export default withLayout((props) => {
                     <image className='image-2' src={food}></image>
                   </view>
                   <view className='title-content'>
-                    <view className='Pro-title'>
-                      <view className='title-text'>
-                        {item.description}
-                        <text className='title-money-2'>数量：1张</text>
-                      </view>
-                    </view>
+                    <View className='cpn-card-text'>
+                      <View style={{ flex: '1' }}>{(item.description).toString().length > 25 ? (item.description).substring(0, 25) + '...' : (item.description)}</View>
+                      <text className='title-money-2'>
+                        数量：1张
+                      </text>
+                    </View>
                     <text className='title-money'>
                       ￥{formatPrice(item.actualPrice)}元<text className='title-money-2'>门市价{formatPrice(item.standPrice)}元</text>
                     </text>

src/pages/TobeShop/style.less

@@ -3,36 +3,41 @@
 .shop-Eat {
   padding: 0 30px;
   .Consumption-Now {
-    height: 33px;
     font-size: 34px;
     font-weight: bold;
     color: #ff3434;
-    text-align: center;
-    margin: 60px 0 42px 0;
+    margin: 60px 0 32px 0;
   }
   .Consumption-text {
-    display: inline-block;
-    width: 309px;
-    height: 33px;
+    line-height: 43px;
     font-size: 24px;
     font-weight: bold;
     color: #333333;
-    text-align: center;
-    margin: auto;
   }
   .Perfection-image-view {
-    width: 150px;
-    margin: auto;
-
+    font-size: 24px;
+    font-weight: bold;
     .Perfection-image {
       width: 54px;
       height: 43px;
-      margin: 70px 0 40px 0;
+      margin: 70px auto 40px auto;
+    }
+    View{
+      margin-bottom: 35px;
+      .tleft{
+        color: #333333;
+      }
+      .tright{
+        font-size: 38px;
+        color: #000;
+      }
     }
   }
-
+  .weui-dialog__bd{
+    padding: 0 67px;
+    margin-bottom: 40px;
+  }
   .position-header {
-    background-color: rgba(0, 0, 0, 0);
     display: flex;
     align-items: center;
     .position-LocationBig {
@@ -63,7 +68,6 @@
     }
     .shop-title-title {
       align-items: center;
-
       font-size: 32px;
       font-weight: 800;
       color: #202020;
@@ -71,46 +75,12 @@
   }
 
   .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;
-      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;
-      }
-    }
+    filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));    
 
     .left-complete-one {
-      // padding-left: 64px;
-      width: 560px;
       padding-top: 87px;
       padding-bottom: 43px;
-      position: relative;
       display: flex;
       background: @whiteColor;
       background: radial-gradient(circle at top right, transparent 15px, #fff 0)
@@ -119,26 +89,16 @@
           right;
       background-size: 100% 60%;
       background-repeat: no-repeat;
-
       border-radius: 15px 0px 0px 15px;
-      // border-radius: 12px;
-
       align-items: center;
-
       .left-image-1 {
         width: 145px;
         height: 44px;
         position: absolute;
-        // margin-left: 85px;
         top: 22px;
       }
       .left-viewText {
-        // background-image: url(@Image-ProCard_hot);
-        // width: 287px;
-        width: auto;
-        height: 44.3px;
         position: absolute;
-        // left: 85px;
         top: 28px;
         font-size: 20px;
         color: @whiteColor;
@@ -146,6 +106,7 @@
       //图片
       .title-image {
         width: 145px;
+        height: 145px;
         margin-left: 20px;
         border-radius: 24px;
         overflow: hidden;
@@ -153,7 +114,7 @@
         flex: none;
         .image-1 {
           width: 100%;
-          height: 145px;
+          height: 100%;
         }
         .image-2 {
           width: 89px;
@@ -165,73 +126,31 @@
       }
       // 商品标题
       .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;
-          }
+        padding-left: 20px;
+        .cpn-card-text {
+          font-size: 24px;
+          font-weight: 400;
+          color: #333333;
+          line-height: 40px;
+          vertical-align: baseline;
+          display: flex;
         }
         .title-money {
-          // padding-top: 34px;
           font-size: 24px;
-          // color: red;
           display: inline-block;
           font-weight: 800;
           margin: 15px auto;
         }
         .title-money-2 {
-          height: 19px;
           font-size: 20px;
           font-weight: 400;
           color: #333333;
           padding-left: 50px;
         }
-
         .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;
-          }
-        }
       }
     }
   }
@@ -245,16 +164,13 @@
     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;
       .Check_OK-box {
         position: relative;
         left: 37vw;
@@ -264,41 +180,16 @@
           height: 34px;
         }
       }
-      .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-title {
-        font-weight: 700;
-        font-size: 24px;
-        padding-top: 10px;
-        text-align: center;
-      }
     }
   }
   .button-info {
-    margin-bottom: 70px;
-
+    margin-bottom: 80px;
+    position: absolute;
+    bottom: 0;
+    width: calc(100% - 60px);
     .button-box {
-      margin: 60px 0;
-      width: calc(100% - 60px);
-      height: 88px;
-      line-height: 88px;
+      height: 92px;
+      line-height: 92px;
       background: #274291;
       border-radius: 12px;
       color: @whiteColor;
@@ -306,8 +197,7 @@
   }
   //弹窗确认核销按钮
   .buy-button-box {
-    width: 100%;
-    margin: 40px 0 0 0;
+    margin: 50px 0 0 0;
 
     .button-Cancel {
       display: inline-block;

src/pages/index/tabs/Guide.jsx

@@ -48,10 +48,8 @@ export default (props) => {
   //全部指南个数
   const [AllextNum, setAllextNum] = useState(0)
   //指南当前页数
-  const [epage, setEpage] = useState(2)
   const extendMore = () => {
-    setEpage(epage + 1)
-    getExtendContent('room', roomId, { pageNum: epage }).then((res) => {
+    getExtendContent('room', roomId, { pageNum: 99999 }).then((res) => {
       setExtend([...extend, ...res.records])
       setNewextNum(newextNum + res.records.length)
     })
@@ -166,7 +164,7 @@ export default (props) => {
           ifroomId === 'havenot' && (
             <view className='Guide-image-text-box'>
               <image className='Guide-images' src={sleep} />
-              <view className='Guide-text'>休息一下，休息一下~</view>
+              <view className='Guide-text'>您还没有入住订单哟~</view>
             </view>
           )
         }
@@ -174,62 +172,6 @@ export default (props) => {
         {
           ifroomId === 'reality' && (
             <view>
-              {/* 
-              <view className='MessageCard'>
-                <view className='MessageCard-title1'>
-                  <text className='MessageCard-left'>----------</text>
-                  名称
-                  <text className='MessageCard-right'>----------</text>
-                </view>
-                <view className='MessageCard-content'>
-                  <view className='MessageCard-name' >{taRoomContent?.roomName}</view>
-                </view>
-              </view>
-              <view className='MessageCard-hotle'>
-                <view className='MessageCard-title1-hotle'>
-                  <text className='MessageCard-left-hotle'>----------</text>
-                  民宿位置
-                  <text className='MessageCard-right-hotle'>----------</text>
-                </view>
-                <view className='MessageCard-content-hotle'>
-                  <view className='MessageCard-name-hotle' >{taRoomContent?.address}</view>
-                </view>
-                <view className='MessageCard-button-RoomName-hotle' onClick={() => { goRoomMap() }}>
-                  <image className='MessageCard-image-hotle' src={GoHere} />
-                  <text className='MessageCard-text-hotle'  >去这里</text>
-                </view>
-              </view>
-              <view className='MessageCard-parkView'>
-                <view className='MessageCard-title1-parkView'>
-                  <text className='MessageCard-left-parkView'>----------</text>
-                  停车位置
-                  <text className='MessageCard-right-parkView'>----------</text>
-                </view>
-                <view className='MessageCard-content-parkView'>
-                  <view className='MessageCard-name-parkView' >{taRoomContent?.parkingAddress}</view>
-                </view>
-                <view className='MessageCard-button-Park-parkView' onClick={() => { goParkMap() }} style={{ display: parkingButtonStyle }} >
-                  <image className='MessageCard-image-parkView' src={Taxi} />
-                  <text className='MessageCard-text-parkView'  >去这里</text>
-                </view>
-              </view>
-              <view className='MessageCard'>
-                <view className='MessageCard-title1'>
-                  <text className='MessageCard-left'>----------</text>
-                  WiFi信息
-                  <text className='MessageCard-right'>----------</text>
-                </view>
-                <view className='MessageCard-content' style={{ display: wifiButtonStyle }} >
-                  <view className='MessageCard-name' >名称：{taRoomContent?.wifiName}</view>
-                  <view className='MessageCard-info'  ><text className='MessageCard-name'>密码：</text>{taRoomContent?.wifiPassword}</view>
-                </view>
-
-                <view className='MessageCard-button' onClick={() => { wifiCopy() }} style={{ display: wifiButtonStyle }}>
-                  <image className='MessageCard-image' src={WiFi} />
-                  <text className='MessageCard-text'>复制</text>
-                </view>
-              </view> */}
-
 
               <view className='room-box-info-ROOM'>
                 <view className='room-bi-name-ROOM' >
@@ -288,11 +230,11 @@ export default (props) => {
                   <text className='title-title-boss' >更多指引</text>
                 </view>
                 {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-
+                {/* 
                 <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
                   <view>点击查看更多</view>
                   <image src={showMore} className='moreTip' />
-                </view>
+                </view> */}
               </view>
             </view>
           )

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

@@ -337,46 +337,6 @@
         font-weight: 700;
       }
     }
-    .left-complete-one {
-      // 商品标题
-      .title-content {
-        .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 {
     //右面部分

src/services/guide.js

@@ -1,19 +0,0 @@
-//入住指引模块
-import request from '@/utils/request'
-
-/**
- * 民宿详情
- * @param {*} id 
- * @returns 
- * 看home.js里面getHotelDetail
- */
-/**
- * 套餐详情
- * @param {*} id 
- * @returns 
- */
-/**
- * 套餐列表绑定民宿老板id
- * @param {*} id 
- * @returns 
- */

src/services/mine.js

@@ -5,17 +5,7 @@ import request from '@/utils/request'
  * @param {*} data 
  * @returns 
  */
- export const saveEvaluation = (data) => request('/taEvaluation', { method: 'post', data })
-
- /**
- * 查看评价详情
- * @param {*} id 
- * @returns 
- */
-  export const getEvaluationDetail = (id) => request(`/taEvaluation/${id}`)
-
- //订单列表用哪个表    
-//收藏列表
+ export const saveEvaluate = (type,id,data) => request(`/${type}/${id}/evaluate`, { method: 'post', data })
 
 /**
  * 联系我们

src/services/payOrder.js

@@ -55,15 +55,6 @@ export const putVerifyTarget = (id) => request(`/verifyTarget/${id}`, { method:
 
 
 
-/**
-* 评价
-* @param {*} id
-* @returns 
-*/
-export const orderEvaluation = (targetType, targetId) => request(`/${targetType}/${targetId}/evaluate`, { method: 'post' })
-
-
-
 /**
 * 删除已支付订单
 * @param {*} id

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -16,7 +16,7 @@ import './shopKeeper.less'
 
 
 export default (props) => {
-  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, onVarified, onVarifiedTwo, setVer, shopId, amountType } = props
+  const { shopList, shop, onHotelChange, verifiedOrder, shopMoney, onVarified } = props
   const { params } = useRouter()
   const { tabJump } = params || {}
 

src/shop/components/Sparead/spreadMoney.jsx

@@ -1,8 +1,8 @@
-import { useState,  useMemo } from 'react'
+import { useState, useMemo } from 'react'
 import Taro from '@tarojs/taro'
 import List from '@/components/List';
 import Picker from '@/components/Picker'
-import {getAccount} from '@/services/shopBoss'
+import { getAccount } from '@/services/shopBoss'
 import ShopCommission from '@/components/ShopCommission'
 import eyes from '@/assets/icons/shopKeeper/eyesON.png'
 import ceyes from '@/assets/icons/shopKeeper/eyesOFF.png'
@@ -54,8 +54,12 @@ export default (props) => {
   return (
     <view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
+
       <view style={{ padding: '30rpx', height: '100%' }}>
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
+
           <view className='storexx'>
+
             <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>
               <image className='User-info-cutover-image' src={cutoverUser} />
@@ -77,7 +81,10 @@ export default (props) => {
                   <image className='micon2' src={isMomth ? eyes : ceyes} onClick={handleMonth}></image>
                 </view></view>
             </view>
+
           </view>
+
+
           <view className='title'>推广收入记录</view>
           <List
             style={{ height: 'calc(100% - 145px)' }}
@@ -87,7 +94,10 @@ export default (props) => {
             render={({ item, index }) => <ShopCommission key={(index)} item={item} />}
           >
           </List>
+        </scroll-view>
+
       </view>
-    </view>
+
+    </view >
   )
 }