。

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -2,8 +2,6 @@ import Taro from "@tarojs/taro";
 import { View, Text } from '@tarojs/components'
 import formatTime from "@/utils/formatTime";
 import SlideViewOrder from '@/components/SlideViewOrder';
-import { getOrderSub, deleteOrder } from "@/services/payOrder";
-
 import CouponCard from '@/components/CouponCard'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
@@ -92,7 +90,7 @@ export default (props) => {
               <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'}>
+                  <text className='title-money-2'>
                     数量：{item.amount}张
                   </text>
                 </View>

src/components/CompoentsOrder/OrderCard/style.less

@@ -9,11 +9,6 @@
     .title-money-2 {
       font-size: 20px;
       color: #333333;
-      text-decoration: line-through;
-    }
-    .shanchu{
-      font-size: 20px;
-      color: #333333;
     }
     & > text {
       display: inline-block;

src/pages/TobeShop/Card/index.jsx

@@ -0,0 +1,46 @@
+import Taro from "@tarojs/taro";
+import { View, Text } from '@tarojs/components'
+import formatTime from "@/utils/formatTime";
+import CouponCard from '@/components/CouponCard'
+import Check_OK from "@/assets/icons/UserCenter/Check_OK.png";
+import Check_NO from "@/assets/icons/UserCenter/Check_NO.png";
+import './style.less'
+
+const CouponMedia = CouponCard.Media
+const Action = CouponCard.Action
+export default (props) => {
+  const { item, checked, handleCheck } = props
+
+  const PayAction = <Action.Icon icon={checked?.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} onClick={handleCheck} />
+  return (
+    <CouponCard action={PayAction} onClick={() => handleCheck(item.verifyNo)}>
+      <CouponMedia>
+        <CouponMedia.Header
+          cashback={item.cashback}
+          image={item.poster}
+          badge='food'
+        />
+        <CouponMedia.Body star='ss'>
+          <View className='orderCard'>
+            <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>
+            <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+              <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
+            </View>
+            <View className='cpn-md-act'>
+              {
+                '有效期：' + formatTime(item?.createDate, "yyyy/MM/dd") + '-' +
+                formatTime(item.expireDate, "yyyy/MM/dd")
+              }
+            </View>
+          </View>
+        </CouponMedia.Body>
+      </CouponMedia>
+    </CouponCard>
+
+  )
+}

src/pages/TobeShop/Card/style.less

@@ -0,0 +1,46 @@
+.orderCard{
+  .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;
+      color: #333333;
+    }
+    & > text {
+      display: inline-block;
+
+      & + text {
+        margin-left: 8px;
+      }
+    }
+    &_mn {
+      font-size: 24px;
+      font-weight: bold;
+      color: #333333;
+    }
+
+    &_rm {
+      font-size: 18px;
+      font-weight: 400;
+      text-decoration: line-through;
+      color: #666666;
+    }
+  }
+  .cpn-md-act {
+    display: flex;
+    margin-top: 10px;
+    position: relative;
+    font-size: 22px;
+    color: #c0c8d3;
+  }
+}
+
+.OrderNumber {
+  font-size: 20px;
+  color: #666666;
+  padding: 20px 0;
+}

src/pages/TobeShop/index.jsx

@@ -17,6 +17,7 @@ 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 TBCard from './Card'
 
 import "./style.less";
 
@@ -110,23 +111,23 @@ export default withLayout((props) => {
 
       setSubmiting(true);
       Promise.all(checked.map(verifyNo => putVerifyTarget(verifyNo)))
-      .then(res => {
-        Taro.hideLoading()
-        setSubmiting(false);
-        setShowDialog(false);
-        setConsumption(true);
-      })
-      .catch(e => {
-        Taro.hideLoading()
-        setShowDialog(false);
-        setSubmiting(false);
-        getList();  // 刷新数据
-        Taro.showToast({
-          title: '核销失败',
-          icon: 'none',
-          duration: 2000
+        .then(res => {
+          Taro.hideLoading()
+          setSubmiting(false);
+          setShowDialog(false);
+          setConsumption(true);
+        })
+        .catch(e => {
+          Taro.hideLoading()
+          setShowDialog(false);
+          setSubmiting(false);
+          getList();  // 刷新数据
+          Taro.showToast({
+            title: '核销失败',
+            icon: 'none',
+            duration: 2000
+          })
         })
-      })
     }
   };
 
@@ -139,10 +140,9 @@ export default withLayout((props) => {
     }
   };
 
-  const btnText = ['确认核销', checked && checked.length > 0  ? `(${checked.length})` : undefined].filter(Boolean).join(' ')
-
+  const btnText = ['确认核销', checked && checked.length > 0 ? `(${checked.length})` : undefined].filter(Boolean).join(' ')
   return (
-    <view className='shop-Eat'>      
+    <view className='shop-Eat'>
       <view className='index-navbar'>
         <CustomNav title='到店核销' />
       </view>
@@ -190,44 +190,80 @@ export default withLayout((props) => {
         <SpinBox loading={loading}>
           {(list || []).map((item) => {
             return (
-              <view class='wrapper' key={item.verifyNo} onClick={() => handleCheck(item.verifyNo)}>
-                <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='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>
-                    <view className='title-time'>
-                      有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
-                      {formatTime(item?.expireDate, "yyyy/MM/dd")}
-                    </view>
-                  </view>
-                </view>
-
-                <view class='right-complete-two'>
-                  <view className='right-content'>
-                    <view className='Check_OK-box'>
-                      <image className='Check_OK-image' src={checked.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} />
-                    </view>
-                  </view>
-                </view>
-              </view>
-            );
+              <TBCard item={item} key={item.verifyNo} checked={checked} handleCheck={handleCheck} />
+              // <CouponCard action={PayAction} onClick={() => handleCheck(item.verifyNo)}>
+              //   <CouponMedia>
+              //     <CouponMedia.Header
+              //       cashback={item.cashback}
+              //       image={item.poster}
+              //       badge='food'
+              //     />
+              //     <CouponMedia.Body star={null}>
+              //       <View className='orderCard'>
+              //         <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'}>
+              //             数量：{item.amount}张
+              //           </text>
+              //         </View>
+              //         <View className='cpn-card-text' style={{ marginTop: '10rpx' }}>
+              //           <Text className='cpn-card-text_mn'>￥{`${(item.actualPrice / 100)?.toFixed(2)}元`}</Text>
+              //         </View>
+              //         <View className='cpn-md-act'>
+              //           <view className='title-time'>
+              //             {
+              //               '有效期：' + formatTime(item?.createDate, "yyyy/MM/dd") + '-' +
+              //               formatTime(item.expireDate, "yyyy/MM/dd")
+              //             }
+              //           </view>
+              //         </View>
+              //       </View>
+              //     </CouponMedia.Body>
+              //   </CouponMedia>
+              // </CouponCard>
+
+
+
+
+            )
+            // <view class='wrapper' key={item.verifyNo} onClick={() => handleCheck(item.verifyNo)}>
+            //   <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='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>
+            //       <view className='title-time'>
+            //         有效期：{formatTime(item?.createDate, "yyyy/MM/dd")}-
+            //         {formatTime(item?.expireDate, "yyyy/MM/dd")}
+            //       </view>
+            //     </view>
+            //   </view>
+
+            //   <view class='right-complete-two'>
+            //     <view className='right-content'>
+            //       <view className='Check_OK-box'>
+            //         <image className='Check_OK-image' src={checked.indexOf(item.verifyNo) > -1 ? Check_OK : Check_NO} />
+            //       </view>
+            //     </view>
+            //   </view>
+            // </view>
+
           })}
         </SpinBox>