|
@@ -4,17 +4,14 @@ 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
|
|
-
|
8
|
|
-import { Button, Checkbox, Input, RadioGroup, Radio } from "@tarojs/components";
|
|
7
|
+import { Button, Input, Radio, Text, View } from "@tarojs/components";
|
9
|
8
|
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
|
9
|
import CustomNav from "@/components/CustomNav";
|
13
|
10
|
import OrderMolded from "@/components/OrderMolded";
|
14
|
11
|
import Popup from "@/components/Popup";
|
|
12
|
+import Card from "./Card";
|
15
|
13
|
import "./style.less";
|
16
|
14
|
|
17
|
|
-import Card from "./Card";
|
18
|
15
|
|
19
|
16
|
export default withLayout((props) => {
|
20
|
17
|
//#region
|
|
@@ -188,11 +185,12 @@ export default withLayout((props) => {
|
188
|
185
|
setTotalPrice(total);
|
189
|
186
|
}, [list]);
|
190
|
187
|
|
191
|
|
- //#endregion
|
192
|
188
|
return (
|
193
|
189
|
!person.phone ? <AuthPage /> :
|
194
|
190
|
<view class='container'>
|
195
|
|
- <CustomNav title='订单' />
|
|
191
|
+ <view className='index-navbar'>
|
|
192
|
+ <CustomNav title='订单' />
|
|
193
|
+ </view>
|
196
|
194
|
<Popup show={showDialog} maskClosable={false}>
|
197
|
195
|
<OrderMolded item={detail} />
|
198
|
196
|
<view className='item-center-Number'>
|
|
@@ -234,10 +232,10 @@ export default withLayout((props) => {
|
234
|
232
|
{/* 协议条款 */}
|
235
|
233
|
<view className='Card-number-box'>
|
236
|
234
|
<view className='Card-number'>
|
237
|
|
- <text style='left:29px;position: absolute; padding-top:20px'>
|
|
235
|
+ <text>
|
238
|
236
|
手机号码:
|
239
|
237
|
</text>
|
240
|
|
- <text style='right:29px;position: absolute;padding-top:20px'>
|
|
238
|
+ <text style='right:0;position: absolute;'>
|
241
|
239
|
{person.phone}
|
242
|
240
|
</text>
|
243
|
241
|
</view>
|
|
@@ -263,23 +261,14 @@ export default withLayout((props) => {
|
263
|
261
|
|
264
|
262
|
</view>
|
265
|
263
|
{/* 支付按钮 */}
|
266
|
|
- <view className='button-box-button-box'>
|
267
|
|
- <view className='button-text-image'>
|
268
|
|
- <text className='button-text-money-hot'>
|
269
|
|
- 返现¥{formatPrice(totalPrice?.cashback || 0)}
|
270
|
|
- </text>
|
271
|
|
- <image className='button-image' src={ProCard_hot}>
|
272
|
|
- 123123
|
273
|
|
- </image>
|
274
|
|
- <view className='button-text-money'>
|
275
|
|
- 门店市面价:{formatPrice(totalPrice?.standardPrice || 0)}元
|
276
|
|
- </view>
|
277
|
|
- </view>
|
278
|
|
- <Button className='button-box-one' onClick={() => onShowPay()}>
|
279
|
|
- ¥{formatPrice(totalPrice?.actualPrice || 0)}元
|
280
|
|
- <text className='button-text-one'>支付订单</text>
|
281
|
|
- </Button>
|
282
|
|
- </view>
|
|
264
|
+ <Button className='payorder' onClick={() => onShowPay()}>
|
|
265
|
+ <View className='paytext'>¥{formatPrice(totalPrice?.actualPrice || 0)}元</View>
|
|
266
|
+ <View className='paycontent'>
|
|
267
|
+ <View className='paybuttontop'>返现¥{formatPrice(totalPrice?.cashback || 0)}</View>
|
|
268
|
+ <View className='paybuttonbottom'>门店市面价:{formatPrice(totalPrice?.standardPrice || 0)}元</View>
|
|
269
|
+ </View>
|
|
270
|
+ <View className='paytext'>支付订单</View>
|
|
271
|
+ </Button>
|
283
|
272
|
</view>
|
284
|
273
|
</view>
|
285
|
274
|
);
|