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

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -6,6 +6,8 @@ import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.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 +16,7 @@ const CouponMedia = CouponCard.Media
 const Action = CouponCard.Action
 
 export default (props) => {
-  const { item, setShowCutover, show } = props
+  const { item, setShowCutover, show, sh } = props
 
   const handleDetail = () => {
     if (item.status === 0) {
@@ -50,18 +52,27 @@ export default (props) => {
     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 == 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)} /> : ''
+    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 === 9 ? <Action.Image image={Null} /> :
+              item.isVerified == true && item.isEvaluated == 3 ? <Action.Image image={Evaluated} /> :
+                item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : ''
 
 
   return (
     <>
-      <view className='OrderNumber'>订单编号：{item.orderId}</view>
+      {
+        sh != '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : ''
+      }
       <CouponCard action={PayAction}>
         <CouponMedia>
           <CouponMedia.Header
@@ -83,9 +94,10 @@ export default (props) => {
               <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")
+                    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>

src/components/CompoentsOrder/complete/style.less

@@ -11,13 +11,9 @@
   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;
   }
 }

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

@@ -3,7 +3,6 @@
 .box-content {
   width: 100%;
   padding: 0 30px;
-
   .Refund-Content-box {
     .title-image {
       margin-top: 39px;
@@ -28,16 +27,10 @@
 
   .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;
@@ -73,11 +66,8 @@
           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;
@@ -86,8 +76,6 @@
         top: 22px;
       }
       .left-viewText {
-        // background-image: url(@Image-ProCard_hot);
-        // width: 287px;
         width: auto;
         height: 44.3px;
         position: absolute;
@@ -105,8 +93,6 @@
         position: relative;
 
         .image-1 {
-          // width: 100%;
-          // height: 145px;
           width: 144px;
           height: 144px;
           margin: 0;
@@ -121,7 +107,6 @@
       }
       // 商品标题
       .title-content {
-        // padding: 84px 0 56px 20px;
         padding-left: 18px;
 
         .Pro-title {
@@ -129,19 +114,16 @@
             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;
@@ -157,7 +139,6 @@
 
         .title-time {
           font-size: 24px;
-          // padding-top: 20px;
           color: #c0c8d3;
         }
         .title-position-on {
@@ -175,7 +156,6 @@
             color: #333;
           }
           .title-on {
-            // margin-bottom: 10px;
             padding-top: 5px;
             padding-left: 40px;
             width: 21px;
@@ -206,31 +186,19 @@
     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 {
@@ -249,12 +217,10 @@
       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;
     }
@@ -262,12 +228,10 @@
       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;
@@ -279,12 +243,10 @@
       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;
     }
@@ -304,7 +266,6 @@
     }
     .Refund-star-view5 {
       display: inline-block;
-
       width: 220px;
       height: 60px;
       background: #ffffff;
@@ -318,7 +279,6 @@
     }
     .Refund-star-view6 {
       display: inline-block;
-
       width: 257px;
       height: 60px;
       background: #ffffff;
@@ -331,7 +291,6 @@
       line-height: 60px;
       margin-left: 30px;
     }
-
     /* 点击以后的样式 */
     .bg2 {
       color: #274190;
@@ -356,15 +315,12 @@
   }
 
   .money-title {
-    // display: inline-block;
     margin: 40px 0;
     width: 86%;
     padding-bottom: 20px;
-    // height: 29px;
     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);
   }
@@ -385,7 +341,6 @@
       border-radius: 50%;
     }
     .ul-li-textname {
-      // width: 177px;
       display: inline-block;
       height: 19px;
       font-size: 20px;
@@ -396,7 +351,6 @@
 
   .button-info {
     margin-bottom: 70px;
-
     .button-box {
       margin: 60px 0;
       width: calc(100% - 60px);
@@ -408,14 +362,4 @@
       margin-bottom: 2em;
     }
   }
-
-  //线条
-  // .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,9 +68,9 @@ export default withLayout((props) => {
   useEffect(() => {
     getList();
   }, [pageNum]);
-
+    
   return (
-    <view className='box-content'>      
+    <view className='box-content'>
       <view className='index-navbar'>
         <CustomNav title='售后退款' />
       </view>
@@ -100,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

@@ -2,235 +2,12 @@
 
 .box-content {
   width: 100%;
+  padding: 0 30px;
   .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;
-    }
     .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;
     }
   }