。

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,6 +1,6 @@
-import { useState, useEffect } from 'react'
+import { useState } from 'react'
 import Taro from '@tarojs/taro'
-import { View, Text } from '@tarojs/components'
+import { View } from '@tarojs/components'
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import formatTime from '@/utils/formatTime'

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -14,7 +14,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 
 export default (props) => {
-  const { item, setShowCutover,show } = props
+  const { item, setShowCutover, show } = props
 
   const handleDetail = () => {
     if (item.status === 0) {
@@ -55,8 +55,8 @@ export default (props) => {
       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 === 9 ? <Action.Image image={Null} /> :
-          item.isVerified == true&&item.isEvaluated==3 ? <Action.Image image={Null} /> :
-            item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> :'' 
+            item.isVerified == true && item.isEvaluated == 3 ? <Action.Image image={Null} /> :
+              item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : ''
 
 
   return (
@@ -70,23 +70,25 @@ export default (props) => {
             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={item.isVerified == 1 ?'title-time':''}>
-                {
-                  item.isVerified == 1 ? '核销时间 :'+ formatTime(item?.verifiedDate, "yyyy/MM/dd"):
-                '有效期：'+formatTime(item?.startTime, "yyyy/MM/dd")+'-'+
-                formatTime(item.endTime, "yyyy/MM/dd")
-              }
-              </view>
+            <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='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' : ''}>
+                  {
+                    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,44 +1,47 @@
-.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 {
+      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;
-  font-size: 22px;
-  color: #c0c8d3;
-  .title-time {
-    font-size: 28px;
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
+    position: relative;
+    font-size: 22px;
+    color: #c0c8d3;
+    .title-time {
+      font-size: 28px;
+    }
   }
 }
+
 .OrderNumber {
   font-size: 20px;
   color: #666666;

src/components/CompoentsOrder/complete/index.jsx

@@ -82,7 +82,8 @@ export default (props) => {
     setItem(val)
   }
   const slideButtonTap = (e) => {
-    deleteOrder(e.orderId || '').then(() => {
+    console.log(e)
+    deleteOrder(e.orderId).then(() => {
       Taro.showToast({
         title: '删除订单成功',
         icon: 'none',

src/components/foodCards/foodCards.jsx

@@ -22,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
@@ -31,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/pages/MineUserAll/ContactMe/index.jsx

@@ -30,11 +30,13 @@ export default withLayout((props) => {
     }
   }
   return (
-    <view className='box-content'>
-      <CustomNav title='联系我们' />
+    <view className='box-content'>      
+      <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' />

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

@@ -1,6 +1,6 @@
 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";
@@ -87,8 +87,8 @@ export default withLayout((props) => {
       refundReason: explain,
     }).then((res) => {
       Taro.hideLoading();
-      Taro.navigateBack({ delta: 1 })
-      Taro.showToast({
+        Taro.navigateTo({ url: '/pages/MineUserAll/AllOrder/index?tabJump=0' })
+        Taro.showToast({
         title: "退款成功",
         icon: "none",
         duration: 3000,
@@ -110,9 +110,12 @@ export default withLayout((props) => {
   }, [list]);
 
   return (
-    <view className='box-content'>
-      <CustomNav title='售后退款' />
-      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
+    <view>      
+      <view className='index-navbar'>
+        <CustomNav title='售后退款' />
+      </view>
+      <View className='box-content'>
+      <scroll-view scroll-y style='height: calc(100vh - 65px);' >
 
         <view className='Refund-Content-box'>
 
@@ -251,7 +254,7 @@ export default withLayout((props) => {
           </Button>
         </view>
       </scroll-view>
-
+</View>
     </view >
   );
 });

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

@@ -2,7 +2,7 @@
 
 .box-content {
   width: 100%;
-  margin: 0 35px;
+  padding: 0 30px;
 
   .Refund-Content-box {
     .title-image {

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -84,8 +84,10 @@ export default withLayout((props) => {
   }, [pageNum]);
 
   return (
-    <view className='box-content'>
-      <CustomNav title='售后退款' />
+    <view className='box-content'>      
+      <view className='index-navbar'>
+        <CustomNav title='售后退款' />
+      </view>
       <scroll-view
         scrollY
         style='height: calc(100vh - 176rpx);'

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

@@ -166,7 +166,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>
           )
         }

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/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