张延森 3 years ago
parent
commit
2ed3a5899c

+ 1
- 1
src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx View File

@@ -108,7 +108,7 @@ export default withLayout((props) => {
108 108
   }, [list]);
109 109
 
110 110
   return (
111
-    <view>
111
+    <view className='page-index'>
112 112
       <view className='index-navbar'>
113 113
         <CustomNav title='售后退款' />
114 114
       </view>

+ 1
- 0
src/pages/PayOrder/Card/style.less View File

@@ -18,6 +18,7 @@
18 18
     background-repeat: no-repeat;
19 19
     border-radius: 15px 0px 0px 15px;
20 20
     align-items: center;
21
+    width: 100%;
21 22
     .left-image-1-payOrder {
22 23
       width: 145px;
23 24
       height: 44px;

+ 16
- 26
src/pages/PayOrder/index.jsx View File

@@ -4,17 +4,15 @@ import { getPackageDetail } from "@/services/home";
4 4
 import { saveOrder, getOrderSub, payOrder } from "@/services/payOrder";
5 5
 import { useState, useEffect } from "react";
6 6
 import formatPrice from "@/utils/formatPrice";
7
+import { Button, Radio, View } from "@tarojs/components";
7 8
 import InputNumber from "@/components/InputNumber";
8
-import { Button, Checkbox, Input, RadioGroup, Radio } from "@tarojs/components";
9 9
 import AuthPage from '@/components/AuthPage'
10
-import food from "@/assets/icons/ProCard/food.png";
11
-import ProCard_hot from "@/assets/icons/ProCard/ProCard_hot.png";
12 10
 import CustomNav from "@/components/CustomNav";
13 11
 import OrderMolded from "@/components/OrderMolded";
14 12
 import Popup from "@/components/Popup";
13
+import Card from "./Card";
15 14
 import "./style.less";
16 15
 
17
-import Card from "./Card";
18 16
 
19 17
 export default withLayout((props) => {
20 18
   //#region 
@@ -188,11 +186,12 @@ export default withLayout((props) => {
188 186
     setTotalPrice(total);
189 187
   }, [list]);
190 188
 
191
-  //#endregion
192 189
   return (
193 190
     !person.phone ? <AuthPage /> :
194
-      <view class='container'>
195
-        <CustomNav title='订单' />
191
+      <view class='page-index container'>
192
+        <view className='index-navbar'>
193
+          <CustomNav title='订单' />
194
+        </view>
196 195
         <Popup show={showDialog} maskClosable={false}>
197 196
           <OrderMolded item={detail} />
198 197
           <InputNumber value={BuyNumber} onChange={x => setBuyNumber(x)} style={{ marginTop: '40rpx' }} />
@@ -216,10 +215,10 @@ export default withLayout((props) => {
216 215
           {/* 协议条款 */}
217 216
           <view className='Card-number-box'>
218 217
             <view className='Card-number'>
219
-              <text style='left:29px;position: absolute; padding-top:20px'>
218
+              <text>
220 219
                 手机号码:
221 220
               </text>
222
-              <text style='right:29px;position: absolute;padding-top:20px'>
221
+              <text style='right:0;position: absolute;'>
223 222
                 {person.phone}
224 223
               </text>
225 224
             </view>
@@ -245,23 +244,14 @@ export default withLayout((props) => {
245 244
 
246 245
           </view>
247 246
           {/* 支付按钮 */}
248
-          <view className='button-box-button-box'>
249
-            <view className='button-text-image'>
250
-              <text className='button-text-money-hot'>
251
-                返现¥{formatPrice(totalPrice?.cashback || 0)}
252
-              </text>
253
-              <image className='button-image' src={ProCard_hot}>
254
-                123123
255
-              </image>
256
-              <view className='button-text-money'>
257
-                门店市面价:{formatPrice(totalPrice?.standardPrice || 0)}元
258
-              </view>
259
-            </view>
260
-            <Button className='button-box-one' onClick={() => onShowPay()}>
261
-              ¥{formatPrice(totalPrice?.actualPrice || 0)}元
262
-              <text className='button-text-one'>支付订单</text>
263
-            </Button>
264
-          </view>
247
+          <Button className='payorder' onClick={() => onShowPay()}>
248
+            <View className='paytext'>¥{formatPrice(totalPrice?.actualPrice || 0)}元</View>
249
+            <View className='paycontent'>
250
+              <View className='paybuttontop'>返现¥{formatPrice(totalPrice?.cashback || 0)}</View>
251
+              <View className='paybuttonbottom'>门店市面价:{formatPrice(totalPrice?.standardPrice || 0)}元</View>
252
+            </View>
253
+            <View className='paytext'>支付订单</View>
254
+          </Button>
265 255
         </view>
266 256
       </view>
267 257
   );

+ 35
- 63
src/pages/PayOrder/style.less View File

@@ -1,5 +1,4 @@
1 1
 @whiteColor: #fff;
2
-@Image-ProCard_hot: "../../assets/icons/ProCard/ProCard_hot.png";
3 2
 .container {
4 3
   width: 100%;
5 4
   //商品数量
@@ -29,7 +28,6 @@
29 28
     }
30 29
     .buy-num-add {
31 30
       display: inline-block;
32
-
33 31
       width: 60px;
34 32
       height: 60px;
35 33
       background: #ffffff;
@@ -40,8 +38,7 @@
40 38
   //确定按钮
41 39
   .buy-button-box {
42 40
     width: 100%;
43
-    margin: 40px 0 0 0;
44
-
41
+    margin-top: 40px;
45 42
     .button-Cancel {
46 43
       display: inline-block;
47 44
       width: 236px;
@@ -55,7 +52,6 @@
55 52
     }
56 53
     .button-OK {
57 54
       display: inline-block;
58
-
59 55
       width: 236px;
60 56
       height: 78px;
61 57
       background: #274291;
@@ -67,26 +63,20 @@
67 63
   }
68 64
   //协议条款 + 支付按钮
69 65
   .view-button {
70
-    position: fixed;
66
+    position: absolute;
71 67
     bottom: 0;
72
-    left: 0;
73
-    right: 0;
68
+    width: 100%;
74 69
     .Card-number-box {
75
-      width: calc(100% - 60px);
76
-      margin: auto;
77 70
       box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
71
+      padding: 40px 30px 0;
72
+      margin: 0 30px;
78 73
       .Card-number {
79
-        width: 100%;
80
-        height: 96px;
81
-        background-color: @whiteColor;
74
+        position: relative;
75
+        font-size: 30px;
82 76
       }
83 77
       .Card-user {
84
-        height: 96px;
85
-        padding-bottom: 30px;
86
-        line-height: 96px;
87
-        background-color: @whiteColor;
78
+        margin: 20px 0 40px 0;
88 79
         .Radio-text {
89
-          padding-left: 40px;
90 80
           position: relative;
91 81
           bottom: 6px;
92 82
           color: #666666;
@@ -100,11 +90,8 @@
100 90
         font-size: 25px;
101 91
       }
102 92
       .ul-li-text {
103
-        padding-left: 30px;
104
-        /* padding-bottom: 10px; */
105 93
         position: relative;
106 94
         top: -1em;
107
-
108 95
         .ul-li-view {
109 96
           display: inline-block;
110 97
           margin-bottom: 3px;
@@ -120,54 +107,39 @@
120 107
         }
121 108
       }
122 109
     }
123
-    .button-box-button-box {
124
-      position: relative;
125
-      .button-text-image {
126
-        width: 144px;
127
-        height: 45px;
128
-        position: absolute;
129
-        top: -35px;
130
-        left: calc(50% - 72px);
131
-        z-index: 1;
132
-        .button-text-money-hot {
133
-          position: absolute;
134
-          width: 144px;
135
-          height: 43px;
136
-          line-height: 43px;
110
+    .payorder{
111
+      margin: 40px 30px;
112
+      color: #fff;
113
+      background-color: #274190;
114
+      border-radius: 12px;
115
+      height: 92px;
116
+      display: flex;
117
+      //水平居中
118
+      align-items: center;
119
+      //垂直居中
120
+      justify-content: center;
121
+      .paytext{
122
+        font-size: 30px;
123
+      }
124
+      .paycontent{
125
+        margin:0 15px;
126
+        .paybuttontop{
127
+          background: url(../../assets/icons/ProCard/ProCard_hot.png) no-repeat;
128
+          background-size: 100% 100%;
129
+          padding: 5px 25px 8px 6px;
137 130
           font-size: 24px;
138
-          font-weight: bold;
131
+          height: 44.3px;
132
+          line-height: 44.3px;
133
+          box-sizing: border-box;
139 134
           color: @whiteColor;
135
+          font-weight: 600;
140 136
         }
141
-        .button-image {
142
-          width: 143px;
143
-          height: 43px;
144
-        }
145
-        .button-text-money {
146
-          position: absolute;
147
-          margin-top: -8;
148
-          width: 157px;
137
+        .paybuttonbottom{          
149 138
           font-size: 18px;
150
-          font-weight: 400;
151 139
           text-decoration: line-through;
152
-          color: @whiteColor;
153
-        }
154
-      }
155
-      .button-box-one {
156
-        font-size: 30px;
157
-        line-height: 92px;
158
-        margin-top: 3em;
159
-        background-color: #274190;
160
-        border-radius: 12px;
161
-        width: calc(100% - 60px);
162
-        height: 92px;
163
-        color: @whiteColor;
164
-        bottom: 40px;
165
-        .button-text-one {
166
-          right: 133px;
167
-          font-size: 30px;
168
-          padding-left: 220px;
140
+          line-height: 17px;
169 141
         }
170 142
       }
171 143
     }
172 144
   }
173
-}
145
+}