李志伟 преди 3 години
родител
ревизия
005087e7a1

+ 1
- 1
src/components/CompoentsOrder/OrderCard/index.jsx Целия файл

83
             image={item.poster}
83
             image={item.poster}
84
             badge='food'
84
             badge='food'
85
           />
85
           />
86
-          <CouponMedia.Body star={kkp == '1' ? null : item.score}>
86
+          <CouponMedia.Body star={kkp == '1' ? 'ss' : item.score}>
87
             <View className='orderCard'>
87
             <View className='orderCard'>
88
               <View className='cpn-card-text'>
88
               <View className='cpn-card-text'>
89
                 <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>
89
                 <View style={{ flex: '1' }}>{(item.packageDescription).toString().length > 25 ? (item.packageDescription).substring(0, 25) + '...' : (item.packageDescription)}</View>

+ 3
- 3
src/components/CouponCard/Media/Body.jsx Целия файл

11
   return (
11
   return (
12
     <View className='coupun-media_body'>
12
     <View className='coupun-media_body'>
13
       {
13
       {
14
-      !enableStar?
15
-      <Star score={5} style={{ marginTop: '26rpx',opacity: '0' }} />:
16
-       <Star score={(star).toFixed(1)} style={{ marginTop: '26rpx' }} />}      
14
+        star == 'ss' ? <Star score={5} style={{ marginTop: '26rpx', opacity: '0' }} /> :
15
+          enableStar ? <Star score={(star).toFixed(1)} style={{ marginTop: '26rpx' }} /> : null
16
+      }
17
       <View className='coupun-media_body_ctt'>
17
       <View className='coupun-media_body_ctt'>
18
         {props.children}
18
         {props.children}
19
       </View>
19
       </View>

+ 96
- 97
src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx Целия файл

1
-import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
2
 import Taro from "@tarojs/taro";
1
 import Taro from "@tarojs/taro";
3
 import { Button, Textarea, View } from "@tarojs/components";
2
 import { Button, Textarea, View } from "@tarojs/components";
4
 import formatPrice from "@/utils/formatPrice";
3
 import formatPrice from "@/utils/formatPrice";
5
-import formatTime from "@/utils/formatTime";
6
 import { useState, useEffect } from "react";
4
 import { useState, useEffect } from "react";
7
 import OrderCard from '@/components/CompoentsOrder/OrderCard'
5
 import OrderCard from '@/components/CompoentsOrder/OrderCard'
8
 import withLayout from "@/layouts";
6
 import withLayout from "@/layouts";
9
 import { getOrderSub, refund } from "@/services/payOrder";
7
 import { getOrderSub, refund } from "@/services/payOrder";
10
-import food from "@/assets/icons/ProCard/food.png";
11
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
12
 import CustomNav from "@/components/CustomNav";
8
 import CustomNav from "@/components/CustomNav";
9
+import BlackSpot from "@/assets/icons/GuideCheck/BlackSpot.png";
13
 import "./style.less";
10
 import "./style.less";
14
 
11
 
15
 const options = [
12
 const options = [
115
       <view className='index-navbar'>
112
       <view className='index-navbar'>
116
         <CustomNav title='售后退款' />
113
         <CustomNav title='售后退款' />
117
       </view>
114
       </view>
118
-      <scroll-view scroll-y style='height: calc(100vh - 65px);' >
119
-        <View className='index-container box-content'>
120
-          <view className='Refund-Content-box'>
121
-            <view className='title-image'>
122
-              <image
123
-                mode='scaleToFill'
124
-                className='title-image-cup'
125
-                src={BlackSpot}
126
-              />
127
-              <text className='title-title-boss'>商品信息</text>
115
+      <View className='index-container'>
116
+        <View className='box-content'>
117
+          <scroll-view scroll-y style='height: calc(100vh - 65px);' >
118
+            <view className='Refund-Content-box'>
119
+              <view className='title-image'>
120
+                <image
121
+                  mode='scaleToFill'
122
+                  className='title-image-cup'
123
+                  src={BlackSpot}
124
+                />
125
+                <text className='title-title-boss'>商品信息</text>
126
+              </view>
128
             </view>
127
             </view>
129
-          </view>
130
-          {/* 商品信息结束 */}
131
-          <view>
132
-            {(list || []).map((item) => {
133
-              return (
134
-                <OrderCard item={item}  key={item.orderId} kkp='1' />                
135
-              );
136
-            })}
137
-          </view>
138
-          {/* 卡片结束 */}
139
-          <view className='Refund-Content-box'>
140
-            <view className='title-image'>
141
-              <image
142
-                mode='scaleToFill'
143
-                className='title-image-cup'
144
-                src={BlackSpot}
145
-              />
146
-              <text className='title-title-boss'>退款原因</text>
128
+            {/* 商品信息结束 */}
129
+            <view>
130
+              {(list || []).map((item) => {
131
+                return (
132
+                  <OrderCard item={item} key={item.orderId} kkp='1' />
133
+                );
134
+              })}
135
+            </view>
136
+            {/* 卡片结束 */}
137
+            <view className='Refund-Content-box'>
138
+              <view className='title-image'>
139
+                <image
140
+                  mode='scaleToFill'
141
+                  className='title-image-cup'
142
+                  src={BlackSpot}
143
+                />
144
+                <text className='title-title-boss'>退款原因</text>
145
+              </view>
146
+              {/* 退款结束 */}
147
+            </view>
148
+            <view className='Refund-content'>
149
+              {options.map((x) => {
150
+                return (
151
+                  <text
152
+                    className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
153
+                      ? "bg2"
154
+                      : `Refund-star-view2`
155
+                      }`}
156
+                    key={x.key}
157
+                    onClick={() => viewOK(x)}
158
+                  >
159
+                    {x.title}
160
+                  </text>
161
+                );
162
+              })}
163
+            </view>
164
+            <view className='Refund-Content-box'>
165
+              <view className='title-image'>
166
+                <image
167
+                  mode='scaleToFill'
168
+                  className='title-image-cup'
169
+                  src={BlackSpot}
170
+                />
171
+                <text className='title-title-boss'>退款说明</text>
172
+              </view>
147
             </view>
173
             </view>
148
-            {/* 退款结束 */}
149
-          </view>
150
-          <view className='Refund-content'>
151
-            {options.map((x) => {
152
-              return (
153
-                <text
154
-                  className={`Refund-star-view1 ${checkeds.indexOf(x.key) > -1
155
-                    ? "bg2"
156
-                    : `Refund-star-view2`
157
-                    }`}
158
-                  key={x.key}
159
-                  onClick={() => viewOK(x)}
160
-                >
161
-                  {x.title}
162
-                </text>
163
-              );
164
-            })}
165
-          </view>
166
-          <view className='Refund-Content-box'>
167
-            <view className='title-image'>
168
-              <image
169
-                mode='scaleToFill'
170
-                className='title-image-cup'
171
-                src={BlackSpot}
174
+            <view class='section'>
175
+              <Textarea
176
+                placeholder='请补充退款说明(选填)!'
177
+                onInput={(e) => setExplain(e.detail.value)}
178
+                confirm-type='done'
172
               />
179
               />
173
-              <text className='title-title-boss'>退款说明</text>
174
             </view>
180
             </view>
175
-          </view>
176
-          <view class='section'>
177
-            <Textarea
178
-              placeholder='请补充退款说明(选填)!'
179
-              onInput={(e) => setExplain(e.detail.value)}
180
-              confirm-type='done'
181
-            />
182
-          </view>
183
-          <view className='money-title'>
184
-            实付金额:{" "}
185
-            <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
186
-          </view>
187
-          <view className='money-title'>
188
-            已获返现:{" "}
189
-            <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
190
-          </view>
191
-          <view className='money-title'>
192
-            退款金额:{" "}
193
-            <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
194
-          </view>
195
-          <view className='ul-li-text'>
196
-            <view className='ul-li-view'></view>
197
-            <text className='ul-li-textname'>退款金额不可修改</text>
198
-          </view>
199
-          <view className='ul-li-text'>
200
-            <view className='ul-li-view'></view>
201
-            <text className='ul-li-textname'>
202
-              下单获得返现金额,会在退款时被扣除;
203
-            </text>
204
-          </view>
205
-          <view className='ul-li-text'>
206
-            <view className='ul-li-view'></view>
207
-            <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
208
-          </view>
209
-          <view className='button-info'>
210
-            <Button className='button-box' onClick={() => onRefund()}>
211
-              提交申请
212
-            </Button>
213
-          </view>
181
+            <view className='money-title'>
182
+              实付金额:{" "}
183
+              <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
184
+            </view>
185
+            <view className='money-title'>
186
+              已获返现:{" "}
187
+              <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
188
+            </view>
189
+            <view className='money-title'>
190
+              退款金额:{" "}
191
+              <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
192
+            </view>
193
+            <view className='ul-li-text'>
194
+              <view className='ul-li-view'></view>
195
+              <text className='ul-li-textname'>退款金额不可修改</text>
196
+            </view>
197
+            <view className='ul-li-text'>
198
+              <view className='ul-li-view'></view>
199
+              <text className='ul-li-textname'>
200
+                下单获得返现金额,会在退款时被扣除;
201
+              </text>
202
+            </view>
203
+            <view className='ul-li-text'>
204
+              <view className='ul-li-view'></view>
205
+              <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
206
+            </view>
207
+            <view className='button-info'>
208
+              <Button className='button-box' onClick={() => onRefund()}>
209
+                提交申请
210
+              </Button>
211
+            </view>
212
+          </scroll-view>
214
         </View>
213
         </View>
215
-      </scroll-view>
214
+      </View>
216
     </view >
215
     </view >
217
   );
216
   );
218
 });
217
 });

+ 1
- 0
src/pages/MineUserAll/RefundMoney/CheckRefund/style.less Целия файл

2
 
2
 
3
 .box-content {
3
 .box-content {
4
   margin: 0 30px;
4
   margin: 0 30px;
5
+  height: 100%;
5
   .Refund-Content-box {
6
   .Refund-Content-box {
6
     .title-image {
7
     .title-image {
7
       margin-top: 39px;
8
       margin-top: 39px;

+ 1
- 14
src/pages/PayOrder/Card/index.jsx Целия файл

8
 
8
 
9
 
9
 
10
 export default (props) => {
10
 export default (props) => {
11
-  const { item, packageId, onMoldeOn } = props
12
-  // const [BuyNumber, setBuyNumber] = useState(1);
13
-  // const [detail, setDetail] = useState({});
14
-  // const [showDialog, setShowDialog] = useState(false);
15
-  // const ShowMoldeOn = (e) => {
16
-  //   if (packageId) {
17
-  //     setBuyNumber(e.amount || 1);
18
-  //     setDetail(e);
19
-  //     setShowDialog(true);
20
-  //   }
21
-  // };
11
+  const { item, onMoldeOn } = props
22
   return (
12
   return (
23
     <view class='wrapper-payOrder' key={item.orderId}>
13
     <view class='wrapper-payOrder' key={item.orderId}>
24
       <view class='left-complete-one-payOrder'>
14
       <view class='left-complete-one-payOrder'>
25
-        {/* <image className='left-image-1' src={ProCard_hot}></image> */}
26
         <view className='left-viewText-payOrder'>
15
         <view className='left-viewText-payOrder'>
27
           返现¥{formatPrice(item.cashback)}
16
           返现¥{formatPrice(item.cashback)}
28
         </view>
17
         </view>
35
           <image className='image-2-payOrder' src={food}></image>
24
           <image className='image-2-payOrder' src={food}></image>
36
         </view>
25
         </view>
37
         <view className='title-content-payOrder'>
26
         <view className='title-content-payOrder'>
38
-          {/* <view className='Pro-title-payOrder'> */}
39
           <view className='title-text-payOrder'>{item.description}</view>
27
           <view className='title-text-payOrder'>{item.description}</view>
40
-          {/* </view> */}
41
           <text className='title-money-payOrder'>
28
           <text className='title-money-payOrder'>
42
             ¥{formatPrice(item.actualPrice || item.unitPrice)}元
29
             ¥{formatPrice(item.actualPrice || item.unitPrice)}元
43
             <text className='title-money-2-payOrder'>
30
             <text className='title-money-2-payOrder'>

+ 4
- 45
src/pages/PayOrder/Card/style.less Целия файл

2
 
2
 
3
 .wrapper-payOrder {
3
 .wrapper-payOrder {
4
   display: flex;
4
   display: flex;
5
-  position: relative;
6
-  // margin-top: 600px;
7
-  margin: 30px auto;
8
-  width: calc(100% - 50px); // box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
9
-  // filter: drop-shadow(5px 8px 6px rgb(202, 202, 202));
5
+  margin: 30px 30px 0;
10
   filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
6
   filter: drop-shadow(0 0 0.9rem rgba(0, 0, 0, 0.12));
11
-
12
   .left-complete-one-payOrder {
7
   .left-complete-one-payOrder {
13
     padding-top: 87px;
8
     padding-top: 87px;
14
     padding-bottom: 43px;
9
     padding-bottom: 43px;
15
     position: relative;
10
     position: relative;
16
     display: flex;
11
     display: flex;
17
     background: #fff;
12
     background: #fff;
18
-
19
     background: radial-gradient(circle at top right, transparent 15px, #fff 0 0)
13
     background: radial-gradient(circle at top right, transparent 15px, #fff 0 0)
20
         top right,
14
         top right,
21
       radial-gradient(circle at bottom right, transparent 15px, #fff 0 0) bottom
15
       radial-gradient(circle at bottom right, transparent 15px, #fff 0 0) bottom
22
         right;
16
         right;
23
     background-size: 100% 60%;
17
     background-size: 100% 60%;
24
     background-repeat: no-repeat;
18
     background-repeat: no-repeat;
25
-
26
-    width: 573px;
27
     border-radius: 15px 0px 0px 15px;
19
     border-radius: 15px 0px 0px 15px;
28
-    // border-radius: 12px;
29
-
30
     align-items: center;
20
     align-items: center;
31
     .left-image-1-payOrder {
21
     .left-image-1-payOrder {
32
       width: 145px;
22
       width: 145px;
35
       top: 22px;
25
       top: 22px;
36
     }
26
     }
37
     .left-viewText-payOrder {
27
     .left-viewText-payOrder {
38
-      // background-image: url(@Image-ProCard_hot);
39
-      // width: 287px;
40
-      // width: auto;
41
-      // height: 44.3px;
42
-      // position: absolute;
43
-      // left: 1px;
44
-      // top: 28px;
45
-      // font-size: 24px;
46
-      // color: @whiteColor;
47
-      // font-weight: 600;
48
-
49
       background: url(../../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
28
       background: url(../../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
50
       background-size: 100% 100%;
29
       background-size: 100% 100%;
51
       padding: 0 24px 7px 2px;
30
       padding: 0 24px 7px 2px;
52
-      width: auto;
53
       font-size: 24px;
31
       font-size: 24px;
54
       line-height: 48px;
32
       line-height: 48px;
55
       height: 44.3px;
33
       height: 44.3px;
61
     //图片
39
     //图片
62
     .title-image-payOrder {
40
     .title-image-payOrder {
63
       height: 144px;
41
       height: 144px;
42
+      min-width: 144px;
64
       margin-left: 20px;
43
       margin-left: 20px;
65
       border-radius: 24px;
44
       border-radius: 24px;
66
       overflow: hidden;
45
       overflow: hidden;
79
     }
58
     }
80
     // 商品标题
59
     // 商品标题
81
     .title-content-payOrder {
60
     .title-content-payOrder {
82
-      // padding: 84px 0 56px 20px;
83
-      padding-left: 18px;
61
+      padding-left: 20px;
84
 
62
 
85
-      // .Pro-title {
86
       .title-text-payOrder {
63
       .title-text-payOrder {
87
-        width: 375px;
88
-        overflow: hidden;
89
-        text-overflow: ellipsis;
90
-        display: -webkit-box; //必须要
91
-        -webkit-line-clamp: 1;
92
-        -webkit-box-orient: vertical;
93
-        word-break: break-all; /* 多出文本省略号代替 */
94
-        text-align: left;
95
         font-size: 24px;
64
         font-size: 24px;
96
         padding-bottom: 10px;
65
         padding-bottom: 10px;
97
       }
66
       }
98
-      // }
99
       .title-money-payOrder {
67
       .title-money-payOrder {
100
         padding-top: 34px;
68
         padding-top: 34px;
101
         font-size: 24px;
69
         font-size: 24px;
102
-        // color: red;
103
         font-weight: 800;
70
         font-weight: 800;
104
       }
71
       }
105
       .title-money-2-payOrder {
72
       .title-money-2-payOrder {
125
         left;
92
         left;
126
     background-size: 100% 60%;
93
     background-size: 100% 60%;
127
     background-repeat: no-repeat;
94
     background-repeat: no-repeat;
128
-    width: 129px;
95
+    min-width: 129px;
129
     border-radius: 0 15px 15px 0;
96
     border-radius: 0 15px 15px 0;
130
     position: relative;
97
     position: relative;
131
     //右面部分
98
     //右面部分
132
     .right-content-payOrder {
99
     .right-content-payOrder {
133
-      // width: 100px;
134
-      // height: 80px;
135
       position: absolute;
100
       position: absolute;
136
       top: 50%;
101
       top: 50%;
137
       left: 50%;
102
       left: 50%;
138
       transform: translate(-50%, -50%);
103
       transform: translate(-50%, -50%);
139
-      // border: 1px solid red;
140
-
141
       .right-number-payOrder {
104
       .right-number-payOrder {
142
-        width: 40px;
143
         font-size: 20px;
105
         font-size: 20px;
144
         border-radius: 4px;
106
         border-radius: 4px;
145
         border: 2px solid #999;
107
         border: 2px solid #999;
146
-        margin: auto;
147
         text-align: center;
108
         text-align: center;
148
       }
109
       }
149
-
150
       .right-title-payOrder {
110
       .right-title-payOrder {
151
         font-weight: 700;
111
         font-weight: 700;
152
         font-size: 24px;
112
         font-size: 24px;
153
         padding-top: 20px;
113
         padding-top: 20px;
154
-        text-align: center;
155
       }
114
       }
156
     }
115
     }
157
   }
116
   }