删除无用代码

src/shop/goodsDetail/index.config.ts

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '商品详情',
+  navigationBarTextStyle: 'black'
+})

src/shop/goodsDetail/index.scss

@@ -0,0 +1,5 @@
+.cart-icon{
+  background: linear-gradient(to bottom, #bbe094, #4ee265);
+  border-radius: 100px 0 0 100px;
+  height: 70px;
+}

src/shop/goodsDetail/index.tsx

@@ -0,0 +1,73 @@
+import {useEffect, useState} from "react";
+import {Image, Space, Tag, Divider} from '@nutui/nutui-react-taro'
+import {Cart} from '@nutui/icons-react-taro'
+import Taro from '@tarojs/taro'
+import {ShopGoods} from "@/api/shop/shopGoods/model";
+import {getShopGoods} from "@/api/shop/shopGoods";
+import './index.scss'
+
+const GoodsDetail = () => {
+  const [goods, setGoods] = useState<ShopGoods | null>(null);
+  const router = Taro.getCurrentInstance().router;
+  const goodsId = router?.params?.id;
+
+  useEffect(() => {
+    if (goodsId) {
+      getShopGoods(Number(goodsId)).then(res => {
+        setGoods(res);
+      }).catch(error => {
+        console.error("Failed to fetch goods detail:", error);
+      });
+    }
+  }, [goodsId]);
+
+  if (!goods) {
+    return <div>加载中...</div>;
+  }
+
+  return (
+    <div className={'py-0'}>
+      <div className={'flex flex-col justify-between items-center rounded-lg px-2'}>
+        <div className={'flex flex-col rounded-lg bg-white shadow-sm w-full mb-5'}>
+          <Image src={goods.image} mode={'scaleToFill'}
+                 radius="10px 10px 0 0" height="300"/>
+          <div className={'flex flex-col p-2 rounded-lg'}>
+            <div>
+              <div className={'car-no text-sm'}>{goods.name} #{goods.goodsId}</div>
+              <div className={'flex justify-between text-xs py-1'}>
+                <span className={'text-orange-500'}>丰江桥佛手瓜面，非油炸，Q弹爽口，营养丰</span>
+                <span className={'text-gray-400'}>已售 {goods.sales}</span>
+              </div>
+              <Space>
+                <Tag plain round background={'#ff0000'}>会客厅循环劵<Divider direction={'vertical'} style={{
+                  borderStyle: 'dashed', padding: '0',
+                  borderColor: '#fd8989', margin: '0 5px'
+                }}/>每拍2减10元</Tag>
+                <Tag plain round background={'#ff0000'}>会客厅专享<Divider direction={'vertical'} style={{
+                  borderStyle: 'dashed', padding: '0',
+                  borderColor: '#fd8989', margin: '0 5px'
+                }}/>拍1减3元</Tag>
+              </Space>
+              <div className={'flex justify-between items-center py-2'}>
+                <div className={'flex text-red-500 text-xl items-baseline'}>
+                  <span className={'text-xs'}>￥</span>
+                  <span className={'font-bold text-2xl'}>{goods.price}</span>
+                </div>
+                <div className={'buy-btn'} onClick={() => Taro.navigateTo({url: '/shop/orderConfirm/index?goodsId=' + goods.goodsId})}>
+                  <div className={'cart-icon'}><Cart size={20} className={'mx-4 mt-2'} /></div>
+                  <div className={'text-white pl-4 pr-5'}>购买</div>
+                </div>
+              </div>
+              <div className={'py-2'}>
+                <h3>商品详情</h3>
+                <div dangerouslySetInnerHTML={{ __html: goods.content || '' }} />
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default GoodsDetail;

src/shop/order/index.tsx

@@ -1,118 +0,0 @@
-import {Avatar, Cell, Space} from '@nutui/nutui-react-taro'
-import {useEffect, useState, CSSProperties} from "react";
-import {BszxPay} from "@/api/bszx/bszxPay/model";
-import {getCount, pageBszxPay} from "@/api/bszx/bszxPay";
-import {InfiniteLoading} from '@nutui/nutui-react-taro'
-import dayjs from "dayjs";
-
-const InfiniteUlStyle: CSSProperties = {
-  height: '70vh',
-  width: '100%',
-  padding: '0',
-  overflowY: 'auto',
-  overflowX: 'hidden',
-}
-function PayRecord() {
-  const [list, setList] = useState<BszxPay[]>([])
-  const [page, setPage] = useState(1)
-  const [hasMore, setHasMore] = useState(true)
-  const [totalMoney, setTotalMoney] = useState()
-  const [numbers, setNumbers] = useState()
-  const reload = async () => {
-    pageBszxPay({page}).then(res => {
-      let newList: BszxPay[] | undefined = []
-      if (res?.list && res?.list.length > 0) {
-        newList = list?.concat(res.list)
-        setHasMore(true)
-      } else {
-        newList = res?.list
-        setHasMore(false)
-      }
-      setList(newList || []);
-    })
-    getCount().then(res => {
-      setNumbers(res.numbers);
-      setTotalMoney(res.totalMoney);
-    })
-  }
-
-  const reloadMore = async () => {
-    setPage(page + 1)
-    reload();
-  }
-
-  useEffect(() => {
-    setPage(2)
-    reload()
-  }, [])
-
-  return (
-    <div className={'px-2'}>
-      <Cell>
-        <div className={'flex w-full text-center justify-around'}>
-          <div className={'item py-1'}>
-            <span className={'text-gray-400'}>已筹资金(元)</span>
-            <span className={'text-xl py-1 font-bold'}>￥{totalMoney}元</span>
-          </div>
-          <div className={'item py-1'}>
-            <span className={'text-gray-400'}>爱心人次</span>
-            <span className={'text-xl py-1 font-bold'}>{numbers}次</span>
-          </div>
-        </div>
-      </Cell>
-      <Cell>
-        <ul style={InfiniteUlStyle} id="scroll">
-          <InfiniteLoading
-            target="scroll"
-            hasMore={hasMore}
-            onLoadMore={reloadMore}
-            onScroll={() => {
-              console.log('onScroll')
-            }}
-            onScrollToUpper={() => {
-              console.log('onScrollToUpper')
-            }}
-            loadingText={
-              <>
-                加载中
-              </>
-            }
-            loadMoreText={
-              <>
-                没有更多了
-              </>
-            }
-          >
-            {list?.map(item => {
-              return (
-                <Cell style={{padding: '0'}}>
-                  <div className={'flex w-full justify-between items-center'}>
-                    <div className={'flex'}>
-                      <Space>
-                        <Avatar
-                          src={item.avatar}
-                        />
-                        <div className={'flex flex-col'}>
-                          <div className={'real-name text-lg'}>
-                            {item.name || '匿名'}
-                          </div>
-                          <div style={{maxWidth: '240px'}} className={'text-gray-400'}>{item.formName}，{dayjs(item.createTime).format('YYYY-MM-DD HH:mm')}</div>
-                          <div className={'text-green-600 my-1'}>心愿：{item.comments}</div>
-                        </div>
-                      </Space>
-                    </div>
-                    <div className={'price text-red-500 text-xl font-bold'}>
-                      ￥{item.price}
-                    </div>
-                  </div>
-                </Cell>
-              )
-            })}
-          </InfiniteLoading>
-        </ul>
-      </Cell>
-    </div>
-  )
-}
-
-export default PayRecord

src/shop/orderConfirm/index.config.ts

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '订单确认',
+  navigationBarTextStyle: 'black'
+})

src/shop/orderConfirm/index.scss

@@ -0,0 +1,27 @@
+.order-confirm-page {
+  padding-bottom: 100px; // 留出底部固定按钮的空间
+
+  .fixed-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 20px;
+    background-color: #fff;
+    border-top: 1px solid #eee;
+    box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
+
+    .total-price {
+      flex: 1;
+      text-align: right;
+      margin-right: 20px;
+    }
+
+    .submit-btn {
+      width: 150px;
+    }
+  }
+}

src/shop/orderConfirm/index.tsx

@@ -0,0 +1,69 @@
+import {useEffect, useState} from "react";
+import {Image, Button, Cell, CellGroup, Input, TextArea} from '@nutui/nutui-react-taro'
+import Taro from '@tarojs/taro'
+import {ShopGoods} from "@/api/shop/shopGoods/model";
+import {getShopGoods} from "@/api/shop/shopGoods";
+import './index.scss'
+
+const OrderConfirm = () => {
+  const [goods, setGoods] = useState<ShopGoods | null>(null);
+  const router = Taro.getCurrentInstance().router;
+  const goodsId = router?.params?.goodsId;
+
+  useEffect(() => {
+    if (goodsId) {
+      getShopGoods(Number(goodsId)).then(res => {
+        setGoods(res);
+      }).catch(error => {
+        console.error("Failed to fetch goods detail:", error);
+      });
+    }
+  }, [goodsId]);
+
+  if (!goods) {
+    return <div>加载中...</div>;
+  }
+
+  return (
+    <div className={'order-confirm-page'}>
+      <CellGroup title="商品信息">
+        <Cell>
+          <div className={'flex items-center'}>
+            <Image src={goods.image} width="80" height="80" />
+            <div className={'ml-2'}>
+              <div className={'text-sm font-bold'}>{goods.name}</div>
+              <div className={'text-red-500 text-lg'}>￥{goods.price}</div>
+            </div>
+          </div>
+        </Cell>
+      </CellGroup>
+
+      <CellGroup title="收货信息">
+        <Cell title="收货人">
+          <Input placeholder="请输入收货人姓名" />
+        </Cell>
+        <Cell title="手机号">
+          <Input placeholder="请输入手机号" type="tel" />
+        </Cell>
+        <Cell title="收货地址">
+          <TextArea placeholder="请输入详细收货地址" />
+        </Cell>
+      </CellGroup>
+
+      <CellGroup title="订单备注">
+        <Cell>
+          <TextArea placeholder="请输入订单备注" />
+        </Cell>
+      </CellGroup>
+
+      <div className={'fixed-bottom'}>
+        <div className={'total-price'}>
+          合计：<span className={'text-red-500 text-xl font-bold'}>￥{goods.price}</span>
+        </div>
+        <Button type="primary" size="large" className={'submit-btn'}>提交订单</Button>
+      </div>
+    </div>
+  );
+};
+
+export default OrderConfirm;

src/shop/orderDetail/index.config.ts

@@ -0,0 +1,4 @@
+export default definePageConfig({
+  navigationBarTitleText: '订单详情',
+  navigationBarTextStyle: 'black'
+})

src/shop/orderDetail/index.scss

@@ -0,0 +1,27 @@
+.order-detail-page {
+  padding-bottom: 80px; // 留出底部固定按钮的空间
+
+  .nut-cell-group__title {
+    padding: 10px 16px;
+    font-size: 14px;
+    color: #999;
+  }
+
+  .fixed-bottom {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    padding: 10px 20px;
+    background-color: #fff;
+    border-top: 1px solid #eee;
+    box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
+
+    .nut-button {
+      margin-left: 10px;
+    }
+  }
+}

src/shop/orderDetail/index.tsx

@@ -0,0 +1,128 @@
+import {useEffect, useState} from "react";
+import {Cell, CellGroup, Image, Space, Button} from '@nutui/nutui-react-taro'
+import Taro from '@tarojs/taro'
+import {ShopOrder} from "@/api/shop/shopOrder/model";
+import {getShopOrder} from "@/api/shop/shopOrder";
+import {listOrderGoods} from "@/api/system/orderGoods";
+import {OrderGoods} from "@/api/system/orderGoods/model";
+import {getShopGoods} from "@/api/shop/shopGoods";
+import dayjs from "dayjs";
+import './index.scss'
+
+interface OrderGoodsDetail extends OrderGoods {
+  goodsName?: string;
+  goodsImage?: string;
+}
+
+const OrderDetail = () => {
+  const [order, setOrder] = useState<ShopOrder | null>(null);
+  const [orderGoodsList, setOrderGoodsList] = useState<OrderGoodsDetail[]>([]);
+  const router = Taro.getCurrentInstance().router;
+  const orderId = router?.params?.orderId;
+
+  const getOrderStatusText = (orderStatus?: number, payStatus?: number) => {
+    if (payStatus === 0) return '待付款';
+    switch (orderStatus) {
+      case 0: return '未使用';
+      case 1: return '已完成';
+      case 2: return '已取消';
+      case 3: return '取消中';
+      case 4: return '退款申请中';
+      case 5: return '退款被拒绝';
+      case 6: return '退款成功';
+      case 7: return '客户端申请退款';
+      default: return '未知状态';
+    }
+  };
+
+  const getPayTypeText = (payType?: number) => {
+    switch (payType) {
+      case 0: return '余额支付';
+      case 1: return '微信支付';
+      case 102: return '微信Native';
+      case 2: return '会员卡支付';
+      case 3: return '支付宝';
+      case 4: return '现金';
+      case 5: return 'POS机';
+      default: return '未知支付方式';
+    }
+  };
+
+  useEffect(() => {
+    if (orderId) {
+      console.log('shop-goods',orderId)
+      getShopOrder(Number(orderId)).then(async (res) => {
+        setOrder(res);
+
+        // 获取订单商品列表
+        const goodsRes = await listOrderGoods({ orderId: Number(orderId) });
+        if (goodsRes && goodsRes.length > 0) {
+          const goodsDetailsPromises = goodsRes.map(async (item) => {
+            console.log(item,'item.>>>')
+            const shopGoods = await getShopGoods(Number(item.goodsId));
+            return {
+              ...item,
+              goodsName: shopGoods?.name,
+              goodsImage: shopGoods?.image,
+            };
+          });
+          const detailedGoodsList = await Promise.all(goodsDetailsPromises);
+          setOrderGoodsList(detailedGoodsList);
+        }
+      }).catch(error => {
+        console.error("Failed to fetch order detail:", error);
+      });
+    }
+  }, [orderId]);
+
+  if (!order) {
+    return <div>加载中...</div>;
+  }
+
+  return (
+    <div className={'order-detail-page'}>
+      <CellGroup title="订单信息">
+        <Cell title="订单编号" description={order.orderNo} />
+        <Cell title="下单时间" description={dayjs(order.createTime).format('YYYY-MM-DD HH:mm:ss')} />
+        <Cell title="订单状态" description={getOrderStatusText(order.orderStatus, order.payStatus)} />
+      </CellGroup>
+
+      <CellGroup title="商品信息">
+        {orderGoodsList.map((item, index) => (
+          <Cell key={index}>
+            <div className={'flex items-center'}>
+              <Image src={item.goodsImage} width="80" height="80" />
+              <div className={'ml-2'}>
+                <div className={'text-sm font-bold'}>{item.goodsName}</div>
+                <div className={'text-gray-500 text-xs'}>数量：{item.totalNum}</div>
+                <div className={'text-red-500 text-lg'}>￥{item.payPrice}</div>
+              </div>
+            </div>
+          </Cell>
+        ))}
+      </CellGroup>
+
+      <CellGroup title="收货信息">
+        <Cell title="收货人" description={order.realName} />
+        <Cell title="手机号" description={order.phone} />
+        <Cell title="收货地址" description={order.address} />
+      </CellGroup>
+
+      <CellGroup title="支付信息">
+        <Cell title="支付方式" description={getPayTypeText(order.payType)} />
+        <Cell title="实付金额" description={`￥${order.payPrice}`} />
+      </CellGroup>
+
+      <div className={'fixed-bottom'}>
+        <Space>
+          {order.payStatus === 0 && <Button size="small" onClick={() => console.log('取消订单')}>取消订单</Button>}
+          {order.payStatus === 0 && <Button size="small" type="primary" onClick={() => console.log('立即支付')}>立即支付</Button>}
+          {order.orderStatus === 1 && <Button size="small" onClick={() => console.log('申请退款')}>申请退款</Button>}
+          {order.deliveryStatus === 20 && <Button size="small" type="primary" onClick={() => console.log('确认收货')}>确认收货</Button>}
+        </Space>
+      </div>
+    </div>
+  );
+};
+
+export default OrderDetail;