diff --git a/src/components/SimpleQRCodeModal.tsx b/src/components/SimpleQRCodeModal.tsx index 167c8cc..1acde23 100644 --- a/src/components/SimpleQRCodeModal.tsx +++ b/src/components/SimpleQRCodeModal.tsx @@ -81,7 +81,7 @@ const SimpleQRCodeModal: React.FC = ({ {qrContent ? ( 二维码 void}) => { {item.price} + 会员价 + ¥{item.salePrice} diff --git a/src/shop/category/components/GoodsList.tsx b/src/shop/category/components/GoodsList.tsx index 19f34aa..f84ae9e 100644 --- a/src/shop/category/components/GoodsList.tsx +++ b/src/shop/category/components/GoodsList.tsx @@ -1,5 +1,6 @@ import {Image} from '@nutui/nutui-react-taro' import {Share} from '@nutui/icons-react-taro' +import {View, Text} from '@tarojs/components' import Taro from '@tarojs/taro' import './GoodsList.scss' @@ -8,43 +9,45 @@ const GoodsList = (props: any) => { return ( <> -
-
- {props.data?.map((item, index) => { + + + {props.data?.map((item: any, index: number) => { return ( -
+ Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}/> -
-
-
{item.name}
-
- {item.comments} - 已售 {item.sales} -
-
-
- - {item.price} -
-
-
+ + + {item.name} + + {item.comments} + 已售 {item.sales} + + + + + {item.price} + 会员价 + ¥{item.salePrice} + + + Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}/> -
-
+ Taro.navigateTo({url: '/shop/goodsDetail/index?id=' + item.goodsId})}>购买 -
-
-
-
-
-
+
+
+ + + + ) })} -
-
+
+
) } diff --git a/src/shop/goodsDetail/index.tsx b/src/shop/goodsDetail/index.tsx index 3b716eb..37a6630 100644 --- a/src/shop/goodsDetail/index.tsx +++ b/src/shop/goodsDetail/index.tsx @@ -280,8 +280,10 @@ const GoodsDetail = () => { <> - - {goods.price} + + {goods.price} + 会员价 + ¥{goods.salePrice} 已售 {goods.sales} diff --git a/src/user/order/components/OrderList.tsx b/src/user/order/components/OrderList.tsx index 1ccbac2..b7d9015 100644 --- a/src/user/order/components/OrderList.tsx +++ b/src/user/order/components/OrderList.tsx @@ -284,7 +284,7 @@ function OrderList(props: OrderListProps) { await updateShopOrder({ ...orderToConfirmReceive, - deliveryStatus: 30, // 已收货 + deliveryStatus: 20, // 已收货 orderStatus: 1 // 已完成 }); @@ -748,10 +748,10 @@ function OrderList(props: OrderListProps) { {/* 待收货状态:显示查看物流和确认收货 */} {item.deliveryStatus === 20 && item.orderStatus !== 2 && ( - {/**/} +