李志伟 3 年前
父节点
当前提交
99d5a24fd8

+ 15
- 13
src/components/CompoentsOrder/OrderCard/index.jsx 查看文件

@@ -16,7 +16,7 @@ const CouponMedia = CouponCard.Media
16 16
 const Action = CouponCard.Action
17 17
 
18 18
 export default (props) => {
19
-  const { item, setShowCutover, show,sh } = props
19
+  const { item, setShowCutover, show, sh } = props
20 20
 
21 21
   const handleDetail = () => {
22 22
     if (item.status === 0) {
@@ -59,18 +59,20 @@ export default (props) => {
59 59
     });
60 60
   };
61 61
   const PayAction =
62
-  sh=='1'?<Action.Icon icon={Refund} text='售后/退款' onClick={()=>handleRefund(item)} /> :
63
-    item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
64
-      item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
65
-        item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
66
-          item.status === 9 ? <Action.Image image={Null} /> :
67
-            item.isVerified == true && item.isEvaluated == 3 ? <Action.Image image={Evaluated} /> :
68
-              item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : ''
62
+    sh == '1' ? <Action.Icon icon={Refund} text='售后/退款' onClick={() => handleRefund(item)} /> :
63
+      item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
64
+        item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
65
+          item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
66
+            item.status === 9 ? <Action.Image image={Null} /> :
67
+              item.isVerified == true && item.isEvaluated == 3 ? <Action.Image image={Evaluated} /> :
68
+                item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : ''
69 69
 
70 70
 
71 71
   return (
72 72
     <>
73
-      <view className='OrderNumber'>订单编号:{item.orderId}</view>
73
+      {
74
+        sh != '1' ? <view className='OrderNumber'>订单编号:{item.orderId}</view> : ''
75
+      }
74 76
       <CouponCard action={PayAction}>
75 77
         <CouponMedia>
76 78
           <CouponMedia.Header
@@ -92,10 +94,10 @@ export default (props) => {
92 94
               <View className='cpn-md-act'>
93 95
                 <view className={item.isVerified == 1 ? 'title-time' : ''}>
94 96
                   {
95
-                    sh==1?'有效期:'+formatTime(item.endTime, "yyyy/MM/dd"):
96
-                    item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
97
-                      '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
98
-                      formatTime(item.endTime, "yyyy/MM/dd")
97
+                    sh == 1 ? '有效期:' + formatTime(item.endTime, "yyyy/MM/dd") :
98
+                      item.isVerified == 1 ? '核销时间 :' + formatTime(item?.verifiedDate, "yyyy/MM/dd") :
99
+                        '有效期:' + formatTime(item?.startTime, "yyyy/MM/dd") + '-' +
100
+                        formatTime(item.endTime, "yyyy/MM/dd")
99 101
                   }
100 102
                 </view>
101 103
               </View>

+ 1
- 5
src/components/CompoentsOrder/complete/style.less 查看文件

@@ -11,13 +11,9 @@
11 11
   margin: 20px auto;
12 12
   padding: 0 30px;
13 13
   .foot {
14
-    width: 100%;
15
-    height: 26px;
16 14
     font-size: 28px;
17
-    font-weight: 400;
18 15
     color: #c0c8d3;
19
-    line-height: 34px;
20
-    margin-top: 40px;
16
+    margin: 40px 0;
21 17
     text-align: center;
22 18
   }
23 19
 }

+ 2
- 47
src/pages/MineUserAll/RefundMoney/style.less 查看文件

@@ -2,57 +2,12 @@
2 2
 
3 3
 .box-content {
4 4
   width: 100%;
5
+  padding: 0 30px;
5 6
   .View-box-Card {
6
-    .cpn-card-text {
7
-      font-size: 24px;
8
-      font-weight: 400;
9
-      color: #333333;
10
-      line-height: 40px;
11
-      vertical-align: baseline;
12
-      display: flex;
13
-      .title-money-2 {
14
-        font-size: 20px;
15
-        color: #333333;
16
-      }
17
-      & > text {
18
-        display: inline-block;
19
-  
20
-        & + text {
21
-          margin-left: 8px;
22
-        }
23
-      }
24
-      &_mn {
25
-        font-size: 24px;
26
-        font-weight: bold;
27
-        color: #333333;
28
-      }
29
-  
30
-      &_rm {
31
-        font-size: 18px;
32
-        font-weight: 400;
33
-        text-decoration: line-through;
34
-        color: #666666;
35
-      }
36
-    }
37
-    .cpn-md-act {
38
-      display: flex;
39
-      margin-top: 10px;
40
-      position: relative;
41
-      font-size: 22px;
42
-      color: #c0c8d3;
43
-      .title-time {
44
-        font-size: 28px;
45
-      }
46
-    }
47
-    
48 7
     .foot {
49
-      width: 100%;
50
-      height: 26px;
51 8
       font-size: 28px;
52
-      font-weight: 400;
53 9
       color: #c0c8d3;
54
-      line-height: 34px;
55
-      margin-top: 40px;
10
+      margin: 40px 0;
56 11
       text-align: center;
57 12
     }
58 13
   }