李志伟 3 년 전
부모
커밋
05b111a042

+ 0
- 3
src/components/AlreadyUsedMolded/style.less 파일 보기

@@ -4,8 +4,6 @@
4 4
   display: flex;
5 5
   position: relative;
6 6
   margin: 30px auto;
7
-  // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
8
-  // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
9 7
   filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
10 8
 
11 9
   .left-complete-one {
@@ -19,7 +17,6 @@
19 17
       radial-gradient(circle at bottom right, transparent 15px, #fff 0) bottom
20 18
         right;
21 19
     background-size: 100% 60%;
22
-    background-repeat: no-repeat;
23 20
 
24 21
     width: 100%;
25 22
     border-radius: 15px 0px 0px 15px;

+ 41
- 2
src/components/CompoentsOrder/AlreadyUsed/index.jsx 파일 보기

@@ -1,7 +1,10 @@
1 1
 import { useState, useEffect } from 'react'
2
+import Taro from '@tarojs/taro'
3
+import { View, Text } from '@tarojs/components'
2 4
 import starOn from '@/assets/icons/GuideCheck/starOn.png'
3 5
 import starOff from '@/assets/icons/GuideCheck/starOff.png'
4
-import AlreadyUsedMolded from '@/components/AlreadyUsedMolded'
6
+import formatTime from '@/utils/formatTime'
7
+import food from '@/assets/icons/ProCard/food.png'
5 8
 import Popup from '@/components/Popup'
6 9
 import './style.less'
7 10
 
@@ -30,7 +33,43 @@ export default (props) => {
30 33
 
31 34
   return (
32 35
     <Popup show={showCutover} maskClosable={maskClosable} onClose={onClose} className='box-content' >
33
-      <AlreadyUsedMolded list={list} />
36
+      {/* <AlreadyUsedMolded list={list} /> */}
37
+      {
38
+        list.map((item, index) => {
39
+          return (
40
+            <View class='left-complete-one'  >
41
+              <View className='v1'>
42
+                <View className='left-viewText'>
43
+                  返现¥{(item.cashback / 100)?.toFixed(2)}
44
+                </View>
45
+              </View>
46
+              <View className='v2'>
47
+                <View className='title-image' >
48
+                  <image className='image-1' mode='scaleToFill' src={item.poster || []}></image>
49
+                  <image className='image-2' src={food}></image>
50
+                </View>
51
+                <View className='title-content'>
52
+                  <View className='Pro-title'  >
53
+                    <View className='title-text'>
54
+                      {item.packageDescription}
55
+                    </View>
56
+                    <View className='title-money-2'>
57
+                      数量:{item.amount}张
58
+                    </View>
59
+                  </View>
60
+                  <text className='title-money' >¥{(item.unitPrice / 100)?.toFixed(2)}元</text><text className='title-money-3'>订单编号:{item.orderId}</text>
61
+                  <View className='title-time'>
62
+                    核销时间:{" "}
63
+                    {formatTime(item.verifiedDate, "yyyy/MM/dd hh:mm")}
64
+                  </View>
65
+                </View>
66
+              </View>
67
+            </View>
68
+          )
69
+
70
+        })
71
+      }
72
+      <View className='pjLine'></View>
34 73
       <view className='item-center-Number' >
35 74
         {/* 评分 */}
36 75
         <view className='card-box-star'>

+ 101
- 30
src/components/CompoentsOrder/AlreadyUsed/style.less 파일 보기

@@ -1,39 +1,95 @@
1 1
 @whiteColor: #fff;
2
-
3
-// .box-content {
4
-
5
-
6
-  .item-center-Number {
7
-    .card-box-star {
8
-      margin-top: 23px;
9
-      width: auto;
10
-      height: 44.3px;
11
-      font-size: 20px;
12
-      color: @whiteColor;
13
-      .card-box-star-text {
14
-        display: inline-block;
15
-        height: 22px;
16
-        font-size: 24px;
17
-        font-weight: 400;
18
-        color: #666666;
2
+.box-content{
3
+  .weui-dialog__bd{
4
+    padding: 30px 20px 28px 20px;
5
+  }
6
+  .left-complete-one{
7
+    .v1{    
8
+      flex: none;
9
+      box-sizing: border-box;
10
+      width: 160px;
11
+      position: relative;
12
+      padding-bottom:20px;
13
+      .left-viewText{
14
+        box-sizing: border-box;
15
+        background: url('~@/assets/icons/ProCard/ProCard_hot.png') no-repeat;
16
+        background-size: 100% 100%;
17
+        padding: 16px 25px 10px 10px;
18
+        font-size: 20px;
19
+        color: #fff;
20
+        line-height: 1em;
19 21
       }
20
-      .card-star-image {
21
-        padding-left: 30px;
22
-        width: 21px;
23
-        height: 21px;
22
+    }
23
+    .v2{
24
+      display: flex;
25
+      padding-bottom: 20px;
26
+      .title-image{
27
+        opacity: none;
28
+        width: 144px;
29
+        height: 144px;
30
+        border-radius: 24px;
31
+        position: relative;
32
+        overflow: hidden;
33
+        flex: none;
34
+        .image-1{
35
+          width: 100%;
36
+          height: 100%;
37
+          display: block;
38
+        }
39
+        .image-2{
40
+          box-sizing: border-box;
41
+          position: absolute;
42
+          width: 99px;
43
+          height: 36px;
44
+          left: 0;
45
+          top: 0;
46
+        }
24 47
       }
25
-      .card-star-text {
26
-        padding-left: 10px;
27
-        font-size: 20px;
28
-        color: #333;
29
-        font-weight: 700;
48
+      .title-content {
49
+        padding-left: 18px;
50
+        flex: auto;
51
+        text-align: left;
52
+        .Pro-title {
53
+          display: flex;
54
+          .title-text {
55
+            flex: auto;
56
+            font-size: 24px;
57
+            padding-bottom: 10px;          
58
+          }
59
+          .title-money-2 {
60
+            flex: none;
61
+            font-size: 20px;
62
+            color: #333333;
63
+            padding-left: 40px;
64
+          }
65
+        }
66
+        .title-money {
67
+          font-size: 24px;
68
+          font-weight: bold;
69
+          color: #333333;
70
+        }
71
+        .title-time {
72
+          font-size: 24px;
73
+          padding-top: 20px;
74
+          color: #c0c8d3;
75
+        }
76
+        .title-money-3 {
77
+          font-size: 20px;
78
+          padding-left: 10px;
79
+          color: #666;
80
+        }
30 81
       }
31 82
     }
32 83
   }
33
-
84
+  .pjLine{
85
+    height: 2px;
86
+    background: #000;
87
+    width: 100%;
88
+    opacity: 0.1;
89
+  }
34 90
   .buy-button-box {
35 91
     width: 100%;
36
-    margin: 40px 0 0 0;
92
+    margin-top: 53px;
37 93
 
38 94
     .button-Cancel {
39 95
       display: inline-block;
@@ -48,7 +104,6 @@
48 104
     }
49 105
     .button-OK {
50 106
       display: inline-block;
51
-
52 107
       width: 236px;
53 108
       height: 78px;
54 109
       background: #274291;
@@ -58,5 +113,21 @@
58 113
       color: #ffffff;
59 114
     }
60 115
   }
116
+  .item-center-Number {
117
+    .card-box-star {
118
+      margin: 23px 0 7px 0;
119
+      .card-box-star-text {
120
+        font-size: 24px;
121
+        color: #666;
122
+      }
123
+      .card-star-image {
124
+        padding-left: 35px;
125
+        width: 22px;
126
+        height: 21px;
127
+      }
128
+    }
129
+  }
130
+}
131
+
132
+
61 133
 
62
-// }

+ 6
- 3
src/components/CompoentsOrder/OrderCard/index.jsx 파일 보기

@@ -77,9 +77,12 @@ export default (props) => {
77 77
               <Text className='cpn-card-text_mn'>¥{`${(item.unitPrice / 100)?.toFixed(2)}元`}</Text>
78 78
             </View>
79 79
             <View className='cpn-md-act'>
80
-              <view className='title-time'>
81
-                有效期:{formatTime(item?.startTime, "yyyy/MM/dd")}-
82
-                {formatTime(item.endTime, "yyyy/MM/dd")}
80
+              <view className={item.isVerified == 1 ?'title-time':''}>
81
+                {
82
+                  item.isVerified == 1 ? '核销时间 :'+ formatTime(item?.verifiedDate, "yyyy/MM/dd"):
83
+                '有效期:'+formatTime(item?.startTime, "yyyy/MM/dd")+'-'+
84
+                formatTime(item.endTime, "yyyy/MM/dd")
85
+              }
83 86
               </view>
84 87
             </View>
85 88
           </CouponMedia.Body>

+ 3
- 3
src/components/CompoentsOrder/OrderCard/style.less 파일 보기

@@ -33,10 +33,10 @@
33 33
   display: flex;
34 34
   margin-top: 10px;
35 35
   position: relative;
36
+  font-size: 22px;
37
+  color: #c0c8d3;
36 38
   .title-time {
37
-    font-size: 22px;
38
-    // padding-top: 20px;
39
-    color: #c0c8d3;
39
+    font-size: 28px;
40 40
   }
41 41
 }
42 42
 .OrderNumber {

+ 0
- 60
src/components/CompoentsOrder/complete/style.less 파일 보기

@@ -20,64 +20,4 @@
20 20
     margin-top: 40px;
21 21
     text-align: center;
22 22
   }
23
-  .AlreadyUsed-box {
24
-    margin: 40px auto;
25
-    padding: 0 30px;
26
-
27
-    .item-center-Number {
28
-      .card-box-star {
29
-        margin-top: 23px;
30
-        width: auto;
31
-        height: 44.3px;
32
-        font-size: 20px;
33
-        color: @whiteColor;
34
-        .card-box-star-text {
35
-          display: inline-block;
36
-          height: 22px;
37
-          font-size: 24px;
38
-          font-weight: 400;
39
-          color: #666666;
40
-        }
41
-        .card-star-image {
42
-          padding-left: 30px;
43
-          width: 21px;
44
-          height: 21px;
45
-        }
46
-        .card-star-text {
47
-          padding-left: 10px;
48
-          font-size: 20px;
49
-          color: #333;
50
-          font-weight: 700;
51
-        }
52
-      }
53
-    }
54
-
55
-    .buy-button-box {
56
-      width: 100%;
57
-      margin: 40px 0 0 0;
58
-
59
-      .button-Cancel {
60
-        display: inline-block;
61
-        width: 236px;
62
-        height: 78px;
63
-        border: 2px solid #274291;
64
-        font-size: 30px;
65
-        font-weight: bold;
66
-        color: #274291;
67
-        border-radius: 12px;
68
-        margin-right: 80px;
69
-      }
70
-      .button-OK {
71
-        display: inline-block;
72
-
73
-        width: 236px;
74
-        height: 78px;
75
-        background: #274291;
76
-        border-radius: 12px;
77
-        font-size: 30px;
78
-        font-weight: bold;
79
-        color: #ffffff;
80
-      }
81
-    }
82
-  }
83 23
 }

+ 0
- 1
src/components/foodCards/foodCards.jsx 파일 보기

@@ -1,4 +1,3 @@
1
-import useSave from "@/utils/hooks/useSave"
2 1
 import Taro from '@tarojs/taro'
3 2
 import { View, Text } from '@tarojs/components'
4 3
 import CouponCard from '@/components/CouponCard'