From b6f8d5a656ee87d5192fcd5fad171114c3bbc12a Mon Sep 17 00:00:00 2001
From: Ankkaya <staryou@126.com>
Date: Mon, 3 Jun 2024 18:35:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95=E4=BA=A7=E5=93=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    | 104 ++--
 pages/index/order.vue                         | 372 ++++++++++++++
 pages/index/product.vue                       | 212 ++++++--
 pages/order/detail.vue                        | 124 ++---
 pages/order/list.vue                          | 203 --------
 pages/product/manageGoods.vue                 | 465 ++++++++++--------
 pages/user/wallet/money.vue                   | 381 +++++++-------
 peach/api/trade/goods.js                      |  62 ++-
 peach/api/trade/order.js                      |  31 +-
 .../p-goods-column/p-goods-column.vue         | 324 ++++++------
 .../components/p-goods-item/p-goods-item.vue  |   2 +-
 peach/hooks/useGoods.js                       |  62 ++-
 peach/scss/theme/_style.scss                  |  34 ++
 peach/store/app.js                            | 333 +++++++------
 peach/utils/index.js                          |  25 +
 static/order/order_bg.png                     | Bin 0 -> 22243 bytes
 16 files changed, 1641 insertions(+), 1093 deletions(-)
 create mode 100644 pages/index/order.vue
 delete mode 100644 pages/order/list.vue
 create mode 100644 static/order/order_bg.png

diff --git a/pages.json b/pages.json
index 95137fd..9dec229 100644
--- a/pages.json
+++ b/pages.json
@@ -12,7 +12,7 @@
             "path": "pages/index/redirect"
         },
         {
-            "path": "pages/order/list",
+            "path": "pages/index/order",
             "style": {
                 "navigationBarTitleText": "订单"
             },
@@ -115,54 +115,70 @@
                     }
                 },
                 {
-                  "path": "wallet/withdraw",
-                  "style": {
-                    "navigationBarTitleText": "提现"
-                  },
-                  "meta": {
-                    "auth": true
-                  }
+                    "path": "wallet/withdraw",
+                    "style": {
+                        "navigationBarTitleText": "提现"
+                    },
+                    "meta": {
+                        "auth": true
+                    }
                 },
                 {
-                  "path": "point/buy",
-                  "style": {
-                    "navigationBarTitleText": "购买积分"
-                  },
-                  "meta": {
-                    "auth": true
-                  }
-                }, {
-                  "path": "point/share",
-                  "style": {
-                    "navigationBarTitleText": "分发积分"
-                  },
-                  "meta": {
-                    "auth": true
-                  }
-                }, {
-                  "path": "point/loglist",
-                  "style": {
-                    "navigationBarTitleText": "历史积分"
-                  },
-                  "meta": {
-                    "auth": true
-                  }
+                    "path": "point/buy",
+                    "style": {
+                        "navigationBarTitleText": "购买积分"
+                    },
+                    "meta": {
+                        "auth": true
+                    }
+                },
+                {
+                    "path": "point/share",
+                    "style": {
+                        "navigationBarTitleText": "分发积分"
+                    },
+                    "meta": {
+                        "auth": true
+                    }
+                },
+                {
+                    "path": "point/loglist",
+                    "style": {
+                        "navigationBarTitleText": "历史积分"
+                    },
+                    "meta": {
+                        "auth": true
+                    }
                 }
             ]
         },
         {
-          "root": "pages/product",
-          "pages": [
-            {
-              "path": "manageGoods",
-              "style": {
-                "navigationBarTitleText": "商品管理"
-              },
-              "meta": {
-                "auth": false
-              }
-            }
-          ]
+            "root": "pages/product",
+            "pages": [
+                {
+                    "path": "manageGoods",
+                    "style": {
+                        "navigationBarTitleText": "商品管理"
+                    },
+                    "meta": {
+                        "auth": false
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/order",
+            "pages": [
+                {
+                    "path": "detail",
+                    "style": {
+                        "navigationBarTitleText": "订单详情"
+                    },
+                    "meta": {
+                        "auth": true
+                    }
+                }
+            ]
         }
     ],
     "tabBar": {
@@ -174,7 +190,7 @@
                 "pagePath": "pages/index/product"
             },
             {
-                "pagePath": "pages/order/list"
+                "pagePath": "pages/index/order"
             },
             {
                 "pagePath": "pages/index/my"
diff --git a/pages/index/order.vue b/pages/index/order.vue
new file mode 100644
index 0000000..15e08c1
--- /dev/null
+++ b/pages/index/order.vue
@@ -0,0 +1,372 @@
+<template>
+    <pb-layout
+        title="订单"
+        navbar="normal"
+        tabbar="/pages/index/order"
+        :bgStyle="bgStyle"
+        opacityBgUi="bg-white"
+        color="black"
+    >
+        <pb-sticky bgColor="#fff">
+            <pb-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
+        </pb-sticky>
+        <p-empty
+            v-if="state.pagination.total === 0"
+            icon="/static/order-empty.png"
+            text="暂无订单"
+            bgColor="transparent"
+        />
+        <view v-if="state.pagination.total > 0">
+            <view
+                class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
+                v-for="order in state.pagination.list"
+                :key="order.id"
+            >
+                <view @tap="onOrderDetail(order.id)">
+                    <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
+                        <view class="order-no">订单号：{{ order.no }}</view>
+                        <view class="order-state ss-font-26" :class="formatOrderColor(order)">
+                            {{ formatOrderStatus(order) }}
+                        </view>
+                    </view>
+                    <view class="border-bottom" v-for="item in order.items" :key="item.id">
+                        <p-goods-item
+                            :img="item.picUrl"
+                            :title="item.spuName"
+                            :skuText="item.properties.map((property) => property.valueName).join(' ')"
+                            :price="item.price"
+                            :num="item.count"
+                        />
+                    </view>
+
+                    <view
+                        class="order-card-footer ss-flex ss-col-center ss-p-x-20"
+                        :class="order.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'"
+                    >
+                        <view class="ss-flex ss-col-center">
+                            <button
+                                v-if="order.buttons.length === 0"
+                                class="tool-btn ss-reset-button"
+                                @tap.stop="onOrderDetail(order.id)"
+                            >
+                                查看详情
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('confirm')"
+                                class="tool-btn ss-reset-button"
+                                @tap.stop="onConfirm(order)"
+                            >
+                                确认收货
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('express')"
+                                class="tool-btn ss-reset-button"
+                                @tap.stop="onExpress(order.id)"
+                            >
+                                查看物流
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('cancel')"
+                                class="tool-btn ss-reset-button"
+                                @tap.stop="onCancel(order.id, sindex)"
+                            >
+                                取消订单
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('comment')"
+                                class="tool-btn ss-reset-button"
+                                @tap.stop="onComment(order.id)"
+                            >
+                                评价
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('delete')"
+                                class="delete-btn ss-reset-button"
+                                @tap.stop="onDelete(order.id)"
+                            >
+                                删除订单
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('verification')"
+                                class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+                                @tap.stop="onVerification(order.id)"
+                            >
+                                核销订单
+                            </button>
+                            <button
+                                v-if="order.buttons.includes('delivery')"
+                                class="tool-btn ss-reset-button ui-BG-Main-Gradient"
+                                @tap.stop="onDelivery(order.id)"
+                            >
+                                配送完成
+                            </button>
+                        </view>
+                    </view>
+                    <view class="pay-box ss-m-t-30 ss-flex ss-gap-40 ss-p-b-40 ss-row-right ss-p-r-20">
+                        <view class="ss-flex ss-col-center">
+                            <view class="discounts-title pay-color"
+                                >共 {{ totalNumsPerOrder(order) }} 件商品,总金额:</view
+                            >
+                            <view class="discounts-money pay-color"> ￥{{ fen2yuan(totalPricePerOrder(order)) }} </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <uni-load-more
+            v-if="state.pagination.total > 0"
+            :status="state.loadStatus"
+            :content-text="{ contentdown: '上拉加载更多' }"
+        />
+    </pb-layout>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import OrderApi from '@/peach/api/trade/order'
+import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { fen2yuan, formatOrderColor, formatOrderStatus, handleOrderButtons } from '@/peach/hooks/useGoods'
+import peach from '@/peach'
+import _, { isEmpty } from 'lodash'
+import { resetPagination } from '@/peach/utils'
+
+const bgStyle = {
+    backgroundColor: 'var(--ui-BG-1)',
+    description: '',
+}
+
+const state = ref({
+    currentTab: 0,
+    pagination: {
+        list: [],
+        total: 0,
+        pageNo: 1,
+        pageSize: 6,
+    },
+    loadStatus: '',
+})
+
+const tabMaps = [
+    {
+        name: '全部',
+    },
+    {
+        name: '待付款',
+        value: 0,
+    },
+    {
+        name: '待核销',
+        value: 50,
+    },
+    {
+        name: '待配送',
+        value: 60,
+    },
+]
+
+// 单个订单总商品数
+function totalNumsPerOrder(order) {
+    if (order.items.length) {
+        return order.items.reduce((per, cur) => {
+            return per + cur.count
+        }, 0)
+    }
+}
+
+// 单个订单总金额
+function totalPricePerOrder(order) {
+    if (order.items.length) {
+        return order.items.reduce((per, cur) => {
+            return per + cur.payPrice
+        }, 0)
+    }
+}
+
+// 切换选项卡
+function onTabsChange(e) {
+    if (state.value.currentTab === e.index) {
+        return
+    }
+    // 重头加载代码
+    resetPagination(state.value.pagination)
+    state.value.currentTab = e.index
+    getOrderList()
+}
+
+// 订单详情
+function onOrderDetail(id) {
+    peach.$router.go('/pages/order/detail', {
+        id,
+    })
+}
+
+// 获取订单列表
+async function getOrderList() {
+    state.value.loadStatus = 'loading'
+    let { data } = await OrderApi.getOrderPage({
+        pageNo: state.value.pagination.pageNo,
+        pageSize: state.value.pagination.pageSize,
+        status: tabMaps[state.value.currentTab].value,
+    })
+
+    data.list.forEach((item) => {
+        handleOrderButtons(item)
+    })
+    state.value.pagination.list = _.concat(state.value.pagination.list, data.list)
+    console.log(state.value.pagination.list)
+    state.value.pagination.total = data.total
+    let currentPageTotal = state.value.pagination.length
+    state.value.loadStatus = currentPageTotal < state.value.pagination.total ? 'more' : 'noMore'
+}
+
+onLoad(async (options) => {
+    if (options.type) {
+        state.value.currentTab = options.type
+    }
+    await getOrderList()
+})
+
+// 加载更多
+function loadMore() {
+    if (state.value.loadStatus === 'noMore') {
+        return
+    }
+    state.value.pagination.pageNo++
+    getOrderList()
+}
+
+// 上拉加载更多
+onReachBottom(() => {
+    loadMore()
+})
+
+// 下拉刷新
+onPullDownRefresh(() => {
+    resetPagination(state.value.pagination)
+    getOrderList()
+    setTimeout(function () {
+        uni.stopPullDownRefresh()
+    }, 800)
+})
+</script>
+
+<style lang="scss" scoped>
+.tool-btn {
+    width: 160rpx;
+    height: 60rpx;
+    background: #f6f6f6;
+    font-size: 26rpx;
+    border-radius: 30rpx;
+    margin-right: 10rpx;
+
+    &:last-of-type {
+        margin-right: 0;
+    }
+}
+
+.delete-btn {
+    width: 160rpx;
+    height: 56rpx;
+    color: #ff3000;
+    background: #fee;
+    border-radius: 28rpx;
+    font-size: 26rpx;
+    margin-right: 10rpx;
+    line-height: normal;
+
+    &:last-of-type {
+        margin-right: 0;
+    }
+}
+
+.apply-btn {
+    width: 140rpx;
+    height: 50rpx;
+    border-radius: 25rpx;
+    font-size: 24rpx;
+    border: 2rpx solid #dcdcdc;
+    line-height: normal;
+    margin-left: 16rpx;
+}
+
+.order-list-card-box {
+    .order-card-header {
+        height: 80rpx;
+
+        .order-no {
+            font-size: 26rpx;
+            font-weight: 500;
+        }
+
+        .order-state {
+        }
+    }
+
+    .pay-box {
+        .discounts-title {
+            font-size: 24rpx;
+            line-height: normal;
+            color: #999999;
+        }
+
+        .discounts-money {
+            font-size: 24rpx;
+            line-height: normal;
+            color: #999;
+            font-family: OPPOSANS;
+        }
+
+        .pay-color {
+            color: #333;
+        }
+    }
+
+    .order-card-footer {
+        height: 100rpx;
+
+        .more-item-box {
+            padding: 20rpx;
+
+            .more-item {
+                height: 60rpx;
+
+                .title {
+                    font-size: 26rpx;
+                }
+            }
+        }
+
+        .more-btn {
+            color: $dark-9;
+            font-size: 24rpx;
+        }
+
+        .content {
+            width: 154rpx;
+            color: #333333;
+            font-size: 26rpx;
+            font-weight: 500;
+        }
+    }
+}
+
+:deep(.uni-tooltip-popup) {
+    background: var(--ui-BG);
+}
+
+.warning-color {
+    color: #faad14;
+}
+
+.danger-color {
+    color: #ff3000;
+}
+
+.success-color {
+    color: #52c41a;
+}
+
+.info-color {
+    color: #999999;
+}
+</style>
diff --git a/pages/index/product.vue b/pages/index/product.vue
index d9422aa..ce1ec4b 100644
--- a/pages/index/product.vue
+++ b/pages/index/product.vue
@@ -1,85 +1,213 @@
 <template>
-  <pb-layout class="product-list" title="产品" navbar="normal" tabbar="/pages/index/product" :bgStyle="bgStyle"
-    opacityBgUi="bg-white" color="black">
-    <view v-if="state.pagination.total > 0" class="goods-list ss-m-t-20">
-      <view class="ss-p-l-20 ss-p-r-20" v-for="item in state.pagination.list" :key="item.id">
-        <p-goods-column size="lg" :data="item" :topRadius="10" bottomRadius="10"
-          @click="peach.$router.go('/pages/goods/index', { id: item.id })" />
-      </view>
-    </view>
+    <pb-layout
+        class="product-list"
+        title="产品"
+        navbar="normal"
+        tabbar="/pages/index/product"
+        :bgStyle="bgStyle"
+        opacityBgUi="bg-white"
+        color="black"
+    >
+        <view v-if="state.pagination.total > 0" class="goods-list ss-m-t-20">
+            <view class="ss-p-l-20 ss-p-r-20 ss-m-b-20" v-for="item in state.pagination.list" :key="item.id">
+                <p-goods-column
+                    size="lg"
+                    :data="item"
+                    :topRadius="10"
+                    :bottomRadius="10"
+                    @click="peach.$router.go('/pages/goods/index', { id: item.id })"
+                />
+            </view>
+        </view>
 
-    <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
-      contentdown: '上拉加载更多',
-    }" @click="loadMore" />
+        <uni-load-more
+            v-if="state.pagination.total > 0"
+            :status="state.loadStatus"
+            :content-text="{
+                contentdown: '上拉加载更多',
+            }"
+            @click="loadMore"
+        />
 
-    <view class="_icon-add-round add-product" @click="addGoods"></view>
+        <view class="_icon-add-round add-product" @click="addGoods"></view>
 
-    <p-empty v-if="state.pagination.total === 0" icon="/static/soldout-empty.png" text="暂无产品" />
-  </pb-layout>
+        <p-empty
+            v-if="state.pagination.total === 0"
+            icon="/static/soldout-empty.png"
+            text="暂无产品"
+            bgColor="transparent"
+        />
+    </pb-layout>
 </template>
 
 <script setup>
 import { ref } from 'vue'
 import { onLoad, onReachBottom } from '@dcloudio/uni-app'
+import GoodApi from '@/peach/api/trade/goods'
 import peach from '@/peach'
 import _ from 'lodash'
 import { resetPagination } from '@/peach/utils'
 
 const bgStyle = {
-  backgroundImage: '',
-  backgroundColor: '#fff',
-  description: '',
+    backgroundImage: '',
+    backgroundColor: 'var(--ui-BG-1)',
+    description: '',
 }
 
 const state = ref({
-  pagination: {
-    list: [],
-    total: 0,
-    pageNo: 1,
-    pageSize: 6,
-  },
+    pagination: {
+        list: [],
+        total: 0,
+        pageNo: 1,
+        pageSize: 6,
+        name: '',
+        createTime: [],
+    },
+    loadStatus: '',
 })
 
 function emptyList() {
-  resetPagination(state.value.pagination)
+    resetPagination(state.value.pagination)
 }
 
 function onSearch() {
-  emptyList()
-  getList()
+    emptyList()
+    getList()
 }
 
-function getList() { }
+async function getList() {
+    let { data } = await GoodApi.getProductList({
+        pageNo: state.value.pagination.pageNo,
+        pageSize: state.value.pagination.pageSize,
+    })
+
+    state.value.pagination.list = _.concat(state.value.pagination.list, data.list)
+    state.value.pagination.total = data.total
+    let currentPageTotal = state.value.pagination.length
+
+    state.value.loadStatus = currentPageTotal < state.value.pagination.total ? 'more' : 'noMore'
+}
 
 function addGoods() {
-  peach.$router.go('/pages/product/manageGoods')
+    peach.$router.go('/pages/product/manageGoods')
 }
 
 function loadMore() {
-  if (state.value.loadStatus === 'noMore') {
-    return
-  }
-  state.value.pagination.pageNo++
-  getList()
+    if (state.value.loadStatus === 'noMore') {
+        return
+    }
+    state.value.pagination.pageNo++
+    getList()
 }
 
 onLoad(async (options) => {
-  getList()
+    getList()
 })
 
 onReachBottom(() => {
-  loadMore()
+    loadMore()
 })
 </script>
 
 <style lang="scss" scoped>
 .product-list {
-  .add-product {
-    position: fixed;
-    color: var(--ui-BG-Main);
-    bottom: 70px;
-    right: 20px;
-    font-size: 80rpx;
-  }
+    .add-product {
+        position: fixed;
+        color: var(--ui-BG-Main);
+        bottom: 70px;
+        right: 20px;
+        font-size: 80rpx;
+    }
+
+    .goods-list-box {
+        width: 50%;
+        box-sizing: border-box;
+
+        .left-list {
+            margin-right: 10rpx;
+            margin-bottom: 20rpx;
+        }
+
+        .right-list {
+            margin-left: 10rpx;
+            margin-bottom: 20rpx;
+        }
+    }
+
+    .goods-box {
+        &:nth-last-of-type(1) {
+            margin-bottom: 0 !important;
+        }
+
+        &:nth-child(2n) {
+            margin-right: 0;
+        }
+    }
+
+    .list-icon {
+        width: 80rpx;
+
+        .sicon-goods-card {
+            font-size: 40rpx;
+        }
+
+        .sicon-goods-list {
+            font-size: 40rpx;
+        }
+    }
+
+    .goods-card {
+        margin-left: 20rpx;
+    }
+
+    .list-filter-tabs {
+        background-color: #fff;
+    }
+
+    .filter-list-box {
+        padding: 28rpx 52rpx;
+
+        .filter-item {
+            font-size: 28rpx;
+            font-weight: 500;
+            color: #333333;
+            line-height: normal;
+            margin-bottom: 24rpx;
+
+            &:nth-last-child(1) {
+                margin-bottom: 0;
+            }
+        }
+
+        .filter-item-active {
+            color: var(--ui-BG-Main);
+        }
+    }
+
+    .tab-item {
+        height: 50px;
+        position: relative;
+        z-index: 11;
+
+        .tab-title {
+            font-size: 30rpx;
+        }
+
+        .cur-tab-title {
+            font-weight: $font-weight-bold;
+        }
+
+        .tab-line {
+            width: 60rpx;
+            height: 6rpx;
+            border-radius: 6rpx;
+            position: absolute;
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: 10rpx;
+            background-color: var(--ui-BG-Main);
+            z-index: 12;
+        }
+    }
 }
 </style>
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 0afeca7..f5f0e81 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,6 +1,13 @@
 <!-- 订单详情 -->
 <template>
-    <s-layout title="订单详情" class="index-wrap" navbar="inner">
+    <pb-layout
+        title="订单详情"
+        class="goods-detail-wrap"
+        navbar="inner"
+        leftIcon="leftIcon"
+        color="#fff"
+        iconColor="#fff"
+    >
         <!-- 订单状态 -->
         <view
             class="state-box ss-flex-col ss-col-center ss-row-right"
@@ -19,25 +26,25 @@
                         state.orderInfo.status_code == 'nocomment'
                     "
                     class="state-img"
-                    :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
+                    :src="peach.$url.static('/static/img/shop/order/order_loading.png')"
                 >
                 </image>
                 <image
                     v-if="state.orderInfo.status_code == 'completed' || state.orderInfo.status_code == 'refund_agree'"
                     class="state-img"
-                    :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
+                    :src="peach.$url.static('/static/img/shop/order/order_success.png')"
                 >
                 </image>
                 <image
                     v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
                     class="state-img"
-                    :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
+                    :src="peach.$url.static('/static/img/shop/order/order_close.png')"
                 >
                 </image>
                 <image
                     v-if="state.orderInfo.status_code == 'noget'"
                     class="state-img"
-                    :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
+                    :src="peach.$url.static('/static/img/shop/order/order_express.png')"
                 >
                 </image>
                 <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
@@ -46,7 +53,7 @@
         </view>
 
         <!-- 收货地址 -->
-        <view class="order-address-box" v-if="state.orderInfo.receiverAreaId > 0">
+        <view class="order-address-box" v-if="state.orderInfo.receiverAreaId">
             <view class="ss-flex ss-col-center">
                 <text class="address-username">
                     {{ state.orderInfo.receiverName }}
@@ -62,7 +69,7 @@
             <!-- 订单信 -->
             <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
                 <view class="order-card">
-                    <s-goods-item
+                    <p-goods-item
                         @tap="onGoodsDetail(item.spuId)"
                         :img="item.picUrl"
                         :title="item.spuName"
@@ -76,7 +83,7 @@
                                     class="ss-reset-button apply-btn"
                                     v-if="[10, 20, 30].includes(state.orderInfo.status) && item.afterSaleStatus === 0"
                                     @tap.stop="
-                                        sheep.$router.go('/pages/order/aftersale/apply', {
+                                        peach.$router.go('/pages/order/aftersale/apply', {
                                             orderId: state.orderInfo.id,
                                             itemId: item.id,
                                         })
@@ -88,7 +95,7 @@
                                     class="ss-reset-button apply-btn"
                                     v-if="item.afterSaleStatus === 10"
                                     @tap.stop="
-                                        sheep.$router.go('/pages/order/aftersale/detail', {
+                                        peach.$router.go('/pages/order/aftersale/detail', {
                                             id: item.afterSaleId,
                                         })
                                     "
@@ -99,7 +106,7 @@
                                     class="ss-reset-button apply-btn"
                                     v-if="item.afterSaleStatus === 20"
                                     @tap.stop="
-                                        sheep.$router.go('/pages/order/aftersale/detail', {
+                                        peach.$router.go('/pages/order/aftersale/detail', {
                                             id: item.afterSaleId,
                                         })
                                     "
@@ -113,7 +120,7 @@
                                 {{ item.status_text }}
                             </button>
                         </template>
-                    </s-goods-item>
+                    </p-goods-item>
                 </view>
             </view>
         </view>
@@ -131,13 +138,13 @@
                 <view class="notice-item">
                     <text class="title">下单时间：</text>
                     <text class="detail">
-                        {{ sheep.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+                        {{ peach.$helper.timeFormat(state.orderInfo.createTime, 'yyyy-mm-dd hh:MM:ss') }}
                     </text>
                 </view>
                 <view class="notice-item" v-if="state.orderInfo.payTime">
                     <text class="title">支付时间：</text>
                     <text class="detail">
-                        {{ sheep.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
+                        {{ peach.$helper.timeFormat(state.orderInfo.payTime, 'yyyy-mm-dd hh:MM:ss') }}
                     </text>
                 </view>
                 <view class="notice-item">
@@ -183,8 +190,8 @@
         </view>
 
         <!-- 底部按钮 -->
-        <!-- TODO: 查看物流、等待成团、评价完后返回页面没刷新页面 -->
-        <su-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
+
+        <pb-fixed bottom placeholder bg="bg-white" v-if="state.orderInfo.buttons?.length">
             <view class="footer-box ss-flex ss-col-center ss-row-right">
                 <button
                     class="ss-reset-button cancel-btn"
@@ -204,7 +211,7 @@
                     class="ss-reset-button cancel-btn"
                     v-if="state.orderInfo.buttons?.includes('combination')"
                     @tap="
-                        sheep.$router.go('/pages/activity/groupon/detail', {
+                        peach.$router.go('/pages/activity/groupon/detail', {
                             id: state.orderInfo.combinationRecordId,
                         })
                     "
@@ -232,21 +239,34 @@
                 >
                     评价
                 </button>
+                <button
+                    v-if="state.orderInfo.buttons.includes('verification')"
+                    class="ss-reset-button cancel-btn ui-BG-Main-Gradient"
+                    @tap.stop="onVerification(order.id)"
+                >
+                    核销订单
+                </button>
+                <button
+                    v-if="state.orderInfo.buttons.includes('delivery')"
+                    class="ss-reset-button cancel-btn ui-BG-Main-Gradient"
+                    @tap.stop="onDelivery(order.id)"
+                >
+                    配送完成
+                </button>
             </view>
-        </su-fixed>
-    </s-layout>
+        </pb-fixed>
+    </pb-layout>
 </template>
 
 <script setup>
-import sheep from '@/sheep'
+import peach from '@/peach'
 import { onLoad } from '@dcloudio/uni-app'
 import { reactive } from 'vue'
 import { isEmpty } from 'lodash'
-import { fen2yuan, formatOrderStatus, formatOrderStatusDescription, handleOrderButtons } from '@/sheep/hooks/useGoods'
-import OrderApi from '@/sheep/api/trade/order'
+import { fen2yuan, formatOrderStatus, formatOrderStatusDescription, handleOrderButtons } from '@/peach/hooks/useGoods'
+import OrderApi from '@/peach/api/trade/order'
 
-const statusBarHeight = sheep.$platform.device.statusBarHeight * 2
-const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png')
+const statusBarHeight = peach.$platform.device.statusBarHeight * 2
 
 const state = reactive({
     orderInfo: {},
@@ -256,19 +276,19 @@ const state = reactive({
 
 // 复制
 const onCopy = () => {
-    sheep.$helper.copyText(state.orderInfo.sn)
+    peach.$helper.copyText(state.orderInfo.sn)
 }
 
 // 去支付
 function onPay(payOrderId) {
-    sheep.$router.go('/pages/pay/index', {
+    peach.$router.go('/pages/pay/index', {
         id: payOrderId,
     })
 }
 
 // 查看商品
 function onGoodsDetail(id) {
-    sheep.$router.go('/pages/goods/index', {
+    peach.$router.go('/pages/goods/index', {
         id,
     })
 }
@@ -292,7 +312,7 @@ async function onCancel(orderId) {
 
 // 查看物流
 async function onExpress(id) {
-    sheep.$router.go('/pages/order/express/log', {
+    peach.$router.go('/pages/order/express/log', {
         id,
     })
 }
@@ -305,7 +325,7 @@ async function onConfirm(orderId, ignore = false) {
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
     let isOpenBusinessView = true
     if (
-        sheep.$platform.name === 'WechatMiniProgram' &&
+        peach.$platform.name === 'WechatMiniProgram' &&
         !isEmpty(state.orderInfo.wechat_extra_data) &&
         isOpenBusinessView &&
         !ignore
@@ -325,7 +345,7 @@ async function onConfirm(orderId, ignore = false) {
 // 小程序确认收货组件
 function mpConfirm(orderId) {
     if (!wx.openBusinessView) {
-        sheep.$helper.toast(`请升级微信版本`)
+        peach.$helper.toast(`请升级微信版本`)
         return
     }
     wx.openBusinessView({
@@ -354,41 +374,30 @@ function mpConfirm(orderId) {
 
 // 评价
 function onComment(id) {
-    sheep.$router.go('/pages/goods/comment/add', {
+    peach.$router.go('/pages/goods/comment/add', {
         id,
     })
 }
 
+function onDelivery(id) {
+    uni.showModal({
+        title: '提示',
+        content: '确认完成配送吗？',
+        success: function (res) {
+            if (res.confirm) {
+            }
+        },
+    })
+}
+
 async function getOrderDetail(id) {
-    // 对详情数据进行适配
-    let res
-    if (state.comeinType === 'wechat') {
-        // 微信场景下
-        res = await OrderApi.getOrder(id, {
-            merchant_trade_no: state.merchantTradeNo,
-        })
-    } else {
-        res = await OrderApi.getOrder(id)
-    }
-    if (res.code === 0) {
-        state.orderInfo = res.data
-        handleOrderButtons(state.orderInfo)
-    } else {
-        sheep.$router.back()
-    }
+    let res = await OrderApi.getOrderDetail({ id: id })
+    state.orderInfo = res.data
+    handleOrderButtons(state.orderInfo)
 }
 
 onLoad(async (options) => {
-    let id = 0
-    if (options.id) {
-        id = options.id
-    }
-    // TODO 芋艿：下面两个变量，后续接入
-    state.comeinType = options.comein_type
-    if (state.comeinType === 'wechat') {
-        state.merchantTradeNo = options.merchant_trade_no
-    }
-    await getOrderDetail(id)
+    await getOrderDetail(options.id)
 })
 </script>
 
@@ -412,7 +421,8 @@ onLoad(async (options) => {
 .state-box {
     color: rgba(#fff, 0.9);
     width: 100%;
-    background: v-bind(headerBg) no-repeat, linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+    background: url('/static/order/order_bg.png') no-repeat,
+        linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
     background-size: 750rpx 100%;
     box-sizing: border-box;
 
diff --git a/pages/order/list.vue b/pages/order/list.vue
deleted file mode 100644
index 1ae6a2a..0000000
--- a/pages/order/list.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <pb-layout title="订单" navbar="normal" tabbar="/pages/order/list" :bgStyle="bgStyle" opacityBgUi="bg-white"
-    color="black">
-    <pb-sticky bgColor="#fff">
-      <pb-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab" />
-    </pb-sticky>
-    <p-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单" />
-    <view v-if="state.pagination.total > 0">
-      <view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.list"
-        :key="order.payOrderId">
-        <view v-for="(sorder, sindex) in order.order" @tap="onOrderDetail(sorder.id)">
-          <view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
-            <!-- <view class="order-no">订单号：{{ sorder.no }}</view> -->
-            <view class="order-no text-lg font-weight-bold">{{ sorder.particularName }}</view>
-            <view class="order-state ss-font-26" :class="formatOrderColor(sorder)">
-              {{ formatOrderStatus(sorder) }}
-            </view>
-          </view>
-          <view class="border-bottom" v-for="item in sorder.items" :key="item.id">
-            <p-goods-item :img="item.picUrl" :title="item.spuName"
-              :skuText="item.properties.map((property) => property.valueName).join(' ')" :price="item.price"
-              :num="item.count" />
-          </view>
-
-          <view class="order-card-footer ss-flex ss-col-center ss-p-x-20"
-            :class="sorder.buttons.length > 3 ? 'ss-row-between' : 'ss-row-right'">
-            <view class="ss-flex ss-col-center">
-              <button v-if="sorder.buttons.includes('combination')" class="tool-btn ss-reset-button"
-                @tap.stop="onOrderGroupon(sorder)">
-                拼团详情
-              </button>
-              <button v-if="sorder.buttons.length === 0" class="tool-btn ss-reset-button"
-                @tap.stop="onOrderDetail(sorder.id)">
-                查看详情
-              </button>
-              <button v-if="sorder.buttons.includes('confirm')" class="tool-btn ss-reset-button"
-                @tap.stop="onConfirm(sorder)">
-                确认收货
-              </button>
-              <button v-if="sorder.buttons.includes('express')" class="tool-btn ss-reset-button"
-                @tap.stop="onExpress(sorder.id)">
-                查看物流
-              </button>
-              <button v-if="sorder.buttons.includes('cancel')" class="tool-btn ss-reset-button"
-                @tap.stop="onCancel(sorder.id, sindex)">
-                取消订单
-              </button>
-              <button v-if="sorder.buttons.includes('comment')" class="tool-btn ss-reset-button"
-                @tap.stop="onComment(sorder.id)">
-                评价
-              </button>
-              <button v-if="sorder.buttons.includes('delete')" class="delete-btn ss-reset-button"
-                @tap.stop="onDelete(sorder.id)">
-                删除订单
-              </button>
-            </view>
-          </view>
-          <view class="pay-box ss-m-t-30 ss-flex ss-gap-40 ss-p-b-40 ss-row-right ss-p-r-20">
-            <view class="ss-flex ss-col-center">
-              <view class="discounts-title pay-color">共 {{ totalNumsPerOrder(order) }} 件商品,总金额:</view>
-              <view class="discounts-money pay-color"> ￥{{ fen2yuan(totalPricePerOrder(order)) }} </view>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus"
-      :content-text="{ contentdown: '上拉加载更多' }" />
-  </pb-layout>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import OrderApi from '@/peach/api/trade/order'
-import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-import { fen2yuan, formatOrderColor, formatOrderStatus, handleOrderButtons } from '@/peach/hooks/useGoods'
-import peach from '@/peach'
-import _, { isEmpty } from 'lodash'
-import { resetPagination } from '@/peach/utils'
-
-const bgStyle = {
-  backgroundColor: '#fff',
-  description: '',
-}
-
-const state = ref({
-  currentTab: 0,
-  pagination: {
-    list: [],
-    total: 0,
-    pageNo: 1,
-    pageSize: 6,
-  },
-  loadStatus: '',
-})
-
-const tabMaps = [
-  {
-    name: '全部',
-  },
-  {
-    name: '待付款',
-    value: 0,
-  },
-  {
-    name: '待核销',
-    value: 50,
-  },
-  {
-    name: '待配送',
-    value: 60,
-  },
-]
-
-// 单个订单总商品数
-function totalNumsPerOrder(order) {
-  if (order.order.length) {
-    return order.order.reduce((per, cur) => {
-      return per + cur.productCount
-    }, 0)
-  }
-}
-
-// 单个订单总金额
-function totalPricePerOrder(order) {
-  if (order.order.length) {
-    return order.order.reduce((per, cur) => {
-      return per + cur.payPrice
-    }, 0)
-  }
-}
-
-// 切换选项卡
-function onTabsChange(e) {
-  if (state.value.currentTab === e.index) {
-    return
-  }
-  // 重头加载代码
-  resetPagination(state.value.pagination)
-  state.value.currentTab = e.index
-  getOrderList()
-}
-
-// 订单详情
-function onOrderDetail(id) {
-  peach.$router.go('/pages/order/detail', {
-    id,
-  })
-}
-
-// 获取订单列表
-async function getOrderList() {
-  state.value.loadStatus = 'loading'
-  let { data } = await OrderApi.getOrderPage({
-    pageNo: state.value.pagination.pageNo,
-    pageSize: state.value.pagination.pageSize,
-    status: tabMaps[state.value.currentTab].value,
-  })
-
-  data.list.forEach((item) => {
-    item.order.forEach((sitem) => {
-      handleOrderButtons(sitem)
-    })
-  })
-  state.value.pagination.list = _.concat(state.value.pagination.list, data.list)
-  console.log(state.value.pagination.list)
-  state.value.pagination.total = data.total
-  let currentPageTotal = state.value.pagination.list.reduce((pre, cur) => {
-    return pre + cur.order.length
-  }, 0)
-  state.value.loadStatus = currentPageTotal < state.value.pagination.total ? 'more' : 'noMore'
-}
-
-onLoad(async (options) => {
-  if (options.type) {
-    state.value.currentTab = options.type
-  }
-  await getOrderList()
-})
-
-// 加载更多
-function loadMore() {
-  if (state.value.loadStatus === 'noMore') {
-    return
-  }
-  state.value.pagination.pageNo++
-  getOrderList()
-}
-
-// 上拉加载更多
-onReachBottom(() => {
-  loadMore()
-})
-
-// 下拉刷新
-onPullDownRefresh(() => {
-  resetPagination(state.value.pagination)
-  getOrderList()
-  setTimeout(function () {
-    uni.stopPullDownRefresh()
-  }, 800)
-})
-</script>
diff --git a/pages/product/manageGoods.vue b/pages/product/manageGoods.vue
index b4252b5..28d98ca 100644
--- a/pages/product/manageGoods.vue
+++ b/pages/product/manageGoods.vue
@@ -1,245 +1,292 @@
 <template>
-  <pb-layout class="manage-goods" title="发布商品" leftIcon="leftIcon" navbar="normal" tabbar="/pages/product/manageGoods"
-    :bgStyle="bgStyle" opacityBgUi="bg-white" color="black">
-    <view class="goods-form">
-      <uni-forms ref="formRef" v-model="formData" :rules="rules" label-position="top" label-width="160">
-        <uni-forms-item label="商品封面图" name="picUrl" required>
-          <p-uploader v-model:url="formData.picUrl" fileMediatype="image" limit="1" mode="grid"
-            :imageStyles="{ width: '168rpx', height: '168rpx' }" />
-        </uni-forms-item>
-        <uni-forms-item label="商品轮播图" name="sliderPicUrls" required>
-          <p-uploader v-model:url="formData.sliderPicUrls" fileMediatype="image" limit="6" mode="grid"
-            :imageStyles="{ width: '168rpx', height: '168rpx' }" />
-        </uni-forms-item>
-        <uni-forms-item label="商品名称" name="name" required>
-          <uni-easyinput type="text" trim="all" v-model="formData.name" placeholder="请输入商品名称" />
-        </uni-forms-item>
-        <uni-forms-item label="商品分类" name="categoryId" label-position="left" required>
-          <uni-easyinput type="text" v-model="formData.categoryId" :styles="selfStyles" placeholderStyle="color:#8a8a8a"
-            :clearable="false" :inputBorder="false" placeholder="请选择商品分类" disabled>
-            <template v-slot:right>
-              <uni-icons type="right" />
-            </template>
-          </uni-easyinput>
-        </uni-forms-item>
-        <uni-forms-item label="商品品牌" name="brandId" label-position="left" required>
-          <uni-easyinput type="text" v-model="formData.brandId" :styles="selfStyles" placeholderStyle="color:#8a8a8a"
-            :clearable="false" :inputBorder="false" placeholder="请选择商品品牌" disabled>
-            <template v-slot:right>
-              <uni-icons type="right" />
-            </template>
-          </uni-easyinput>
-        </uni-forms-item>
-        <uni-forms-item label="商品规格" name="skus" label-position="left" required>
-          <uni-easyinput type="text" v-model="formData.skus" :styles="selfStyles" placeholderStyle="color:#8a8a8a"
-            :clearable="false" :inputBorder="false" placeholder="请添加商品规格" disabled> <template v-slot:right>
-              <uni-icons type="right" />
-            </template></uni-easyinput>
-        </uni-forms-item>
-        <uni-forms-item label="商品关键词" name="keyword" required>
-          <uni-easyinput type="text" v-model="formData.keyword" placeholder="请输入商品关键词" />
-        </uni-forms-item>
-        <uni-forms-item label="商品简介" name="introduction" required>
-          <uni-easyinput type="textarea" trim="all" autoHeight v-model="formData.introduction" placeholder="请输入商品简介" />
-        </uni-forms-item>
-        <uni-forms-item label="物流设置" name="deliveryTypes" label-position="left" required>
-          <uni-easyinput type="text" :clearable="false" :styles="selfStyles" placeholderStyle="color:#8a8a8a"
-            :inputBorder="false" v-model="formData.keyword" placeholder="请选择配送方式" disabled>
-            <template v-slot:right>
-              <uni-icons type="right" />
-            </template>
-          </uni-easyinput>
-        </uni-forms-item>
-      </uni-forms>
-    </view>
-  </pb-layout>
+    <pb-layout
+        class="manage-goods"
+        title="发布商品"
+        leftIcon="leftIcon"
+        navbar="normal"
+        :bgStyle="bgStyle"
+        opacityBgUi="bg-white"
+        color="black"
+    >
+        <view class="goods-form">
+            <uni-forms ref="formRef" v-model="formData" :rules="rules" label-position="top" label-width="160">
+                <uni-forms-item label="商品封面图" name="picUrl" required>
+                    <p-uploader
+                        v-model:url="formData.picUrl"
+                        fileMediatype="image"
+                        limit="1"
+                        mode="grid"
+                        :imageStyles="{ width: '168rpx', height: '168rpx' }"
+                    />
+                </uni-forms-item>
+                <uni-forms-item label="商品轮播图" name="sliderPicUrls" required>
+                    <p-uploader
+                        v-model:url="formData.sliderPicUrls"
+                        fileMediatype="image"
+                        limit="6"
+                        mode="grid"
+                        :imageStyles="{ width: '168rpx', height: '168rpx' }"
+                    />
+                </uni-forms-item>
+                <uni-forms-item label="商品名称" name="name" required>
+                    <uni-easyinput type="text" trim="all" v-model="formData.name" placeholder="请输入商品名称" />
+                </uni-forms-item>
+                <uni-forms-item label="商品分类" name="categoryId" label-position="left" required>
+                    <uni-easyinput
+                        type="text"
+                        v-model="formData.categoryId"
+                        :styles="selfStyles"
+                        placeholderStyle="color:#8a8a8a"
+                        :clearable="false"
+                        :inputBorder="false"
+                        placeholder="请选择商品分类"
+                        disabled
+                    >
+                        <template v-slot:right>
+                            <uni-icons type="right" />
+                        </template>
+                    </uni-easyinput>
+                </uni-forms-item>
+                <uni-forms-item label="商品品牌" name="brandId" label-position="left" required>
+                    <uni-easyinput
+                        type="text"
+                        v-model="formData.brandId"
+                        :styles="selfStyles"
+                        placeholderStyle="color:#8a8a8a"
+                        :clearable="false"
+                        :inputBorder="false"
+                        placeholder="请选择商品品牌"
+                        disabled
+                    >
+                        <template v-slot:right>
+                            <uni-icons type="right" />
+                        </template>
+                    </uni-easyinput>
+                </uni-forms-item>
+                <uni-forms-item label="商品规格" name="skus" label-position="left" required>
+                    <uni-easyinput
+                        type="text"
+                        v-model="formData.skus"
+                        :styles="selfStyles"
+                        placeholderStyle="color:#8a8a8a"
+                        :clearable="false"
+                        :inputBorder="false"
+                        placeholder="请添加商品规格"
+                        disabled
+                    >
+                        <template v-slot:right>
+                            <uni-icons type="right" /> </template
+                    ></uni-easyinput>
+                </uni-forms-item>
+                <uni-forms-item label="商品关键词" name="keyword" required>
+                    <uni-easyinput type="text" v-model="formData.keyword" placeholder="请输入商品关键词" />
+                </uni-forms-item>
+                <uni-forms-item label="商品简介" name="introduction" required>
+                    <uni-easyinput
+                        type="textarea"
+                        trim="all"
+                        autoHeight
+                        v-model="formData.introduction"
+                        placeholder="请输入商品简介"
+                    />
+                </uni-forms-item>
+                <uni-forms-item label="物流设置" name="deliveryTypes" label-position="left" required>
+                    <uni-easyinput
+                        type="text"
+                        :clearable="false"
+                        :styles="selfStyles"
+                        placeholderStyle="color:#8a8a8a"
+                        :inputBorder="false"
+                        v-model="formData.keyword"
+                        placeholder="请选择配送方式"
+                        disabled
+                    >
+                        <template v-slot:right>
+                            <uni-icons type="right" />
+                        </template>
+                    </uni-easyinput>
+                </uni-forms-item>
+            </uni-forms>
+        </view>
+    </pb-layout>
 </template>
 
-
 <script setup>
-import { ref } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import peach from '@/peach';
-import GoodsApi from '@/peach/api/trade/goods';
-import _ from 'lodash';
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import peach from '@/peach'
+import GoodsApi from '@/peach/api/trade/goods'
+import _ from 'lodash'
 
 const bgStyle = {
-  backgroundImage: '',
-  backgroundColor: '#fff',
-  description: '',
+    backgroundImage: '',
+    backgroundColor: '#fff',
+    description: '',
 }
 
 const selfStyles = {
-  backgroundColor: '#f9f9f9'
+    backgroundColor: '#f9f9f9',
 }
 
 const formData = ref({
-  picUrl: 'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
-  sliderPicUrls: [
-    'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
-    'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
-    'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
-  ],
-  name: '测试商品',
-  categoryId: 91,
-  brandId: 4,
-  keyword: '香酥鸭，但家',
-  deliveryTypes: [3],
-  introduction: '但家贵阳香酥鸭现榨香酥鸭无任何添加剂香酥鸭但家贵阳香酥鸭现榨香酥鸭无任何添加剂香酥鸭'
-});
+    picUrl: 'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
+    sliderPicUrls: [
+        'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
+        'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
+        'http://101.43.181.163:9001/mall-backend/8f11e372520501531d06bfce15ea97bbecead41c5e4a36d15d7e40af85729ff3.png',
+    ],
+    name: '测试商品',
+    categoryId: 91,
+    brandId: 4,
+    keyword: '香酥鸭，但家',
+    deliveryTypes: [3],
+    introduction: '但家贵阳香酥鸭现榨香酥鸭无任何添加剂香酥鸭但家贵阳香酥鸭现榨香酥鸭无任何添加剂香酥鸭',
+})
 
 const rules = {
-  name: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请输入商品名称',
-      },
-    ],
-  },
-  picUrl: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请上传商品封面图',
-      },
-    ],
-  },
-  sliderPicUrls: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请上传商品轮播图',
-      },
-    ],
-  },
-  categoryId: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择商品分类',
-      },
-    ],
-  },
-  brandId: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择商品品牌',
-      },
-    ],
-  },
-  skus: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择商品规格',
-      },
-    ],
-  },
-  keyword: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请输入商品关键字',
-      },
-    ],
-  },
-  introduction: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请输入商品简介',
-      },
-    ],
-  },
-  deliveryTypes: {
-    rules: [
-      {
-        required: true,
-        errorMessage: '请选择商品物流',
-      },
-    ]
-  }
-};
+    name: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请输入商品名称',
+            },
+        ],
+    },
+    picUrl: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请上传商品封面图',
+            },
+        ],
+    },
+    sliderPicUrls: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请上传商品轮播图',
+            },
+        ],
+    },
+    categoryId: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请选择商品分类',
+            },
+        ],
+    },
+    brandId: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请选择商品品牌',
+            },
+        ],
+    },
+    skus: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请选择商品规格',
+            },
+        ],
+    },
+    keyword: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请输入商品关键字',
+            },
+        ],
+    },
+    introduction: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请输入商品简介',
+            },
+        ],
+    },
+    deliveryTypes: {
+        rules: [
+            {
+                required: true,
+                errorMessage: '请选择商品物流',
+            },
+        ],
+    },
+}
 
-const formRef = ref(null);
+const formRef = ref(null)
 
 function onSubmit() {
+    console.log('res', formData.value)
 
-  console.log('res', formData.value);
+    formRef.value
+        .validate()
+        .then(async (res) => {
+            let tempObj = { ...res }
 
-  formRef.value
-    .validate()
-    .then(async (res) => {
-      let tempObj = { ...res };
-
-
-      if (formData.value.id) {
-        tempObj.id = formData.value.id;
-        await GoodsApi.editProduct(tempObj);
-      } else {
-        await GoodsApi.addProduct(tempObj);
-      }
-
-    })
-    .catch((err) => {
-      console.log('err', err);
-    });
+            if (formData.value.id) {
+                tempObj.id = formData.value.id
+                await GoodsApi.editProduct(tempObj)
+            } else {
+                await GoodsApi.addProduct(tempObj)
+            }
+        })
+        .catch((err) => {
+            console.log('err', err)
+        })
 }
 
-
 // 获取商品详情
-function getGoodsInfo() {
-
-}
+function getGoodsInfo() {}
 
 onLoad((options) => {
-  if (options.id) {
-    getProduct();
-  }
-});
+    if (options.id) {
+        getProduct()
+    }
+})
 </script>
 
 <style lang="scss" scoped>
 .manage-goods {
-  .goods-form {
-    margin: 40rpx;
+    .goods-form {
+        margin: 40rpx;
 
-    :deep() {
-      .uni-easyinput__content-input {
-        font-size: 28rpx !important;
-        color: #333333 !important;
-        line-height: normal !important;
-      }
+        :deep() {
+            .uni-easyinput__content-input {
+                font-size: 28rpx !important;
+                color: #333333 !important;
+                line-height: normal !important;
+            }
 
-      .uni-easyinput__placeholder-class {
-        font-size: 14px;
-      }
+            .uni-easyinput__placeholder-class {
+                font-size: 14px;
+            }
 
-      .is-direction-left {
+            .is-direction-left {
+                .uni-forms-item__label {
+                    padding-left: 10px;
+                    background-color: #f9f9f9;
+                    border-radius: 10px 0 0 10px;
+                }
 
-        .uni-forms-item__label {
-          padding-left: 10px;
-          background-color: #f9f9f9;
-          border-radius: 10px 0 0 10px;
+                uni-icons {
+                    margin-right: 10px;
+                }
+
+                .uni-easyinput__content {
+                    border-radius: 0 10px 10px 0;
+                }
+            }
+
+            .is-disabled {
+                color: #333333;
+                text-align: right;
+            }
         }
-
-        uni-icons {
-          margin-right: 10px;
-        }
-
-        .uni-easyinput__content {
-          border-radius: 0 10px 10px 0;
-        }
-
-      }
-
-      .is-disabled {
-        color: #333333;
-        text-align: right;
-      }
     }
-  }
 }
 </style>
diff --git a/pages/user/wallet/money.vue b/pages/user/wallet/money.vue
index 87c4ccc..d5a3420 100644
--- a/pages/user/wallet/money.vue
+++ b/pages/user/wallet/money.vue
@@ -1,49 +1,62 @@
 <template>
-  <pb-layout navbar="inner" class="wallet-wrap" iconColor="#fff" leftIcon="leftIcon" color="#fff" title="余额"
-    :bgStyle="bgStyle">
-    <view class="header-box ss-row-center ss-col-center">
-      <view class="card-box ui-BG-Main ui-Shadow-Main ss-flex ss-row-between ss-col-center">
-        <view class="ss-flex ss-flex-col ss-row-between ss-col-top ss-gap-40">
-          <view class="card-head ss-flex ss-col-center">
-            <view class="card-title ss-m-r-10">账户余额（元）</view>
-            <view @tap="state.showMoney = !state.showMoney" class="ss-eye-icon"
-              :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'" />
-          </view>
+    <pb-layout
+        navbar="inner"
+        class="wallet-wrap"
+        iconColor="#fff"
+        leftIcon="leftIcon"
+        color="#fff"
+        title="余额"
+        :bgStyle="bgStyle"
+    >
+        <view class="header-box ss-row-center ss-col-center">
+            <view class="card-box ss-flex ss-row-between ss-col-center">
+                <view class="ss-flex ss-flex-col ss-row-between ss-col-top ss-gap-40">
+                    <view class="card-head ss-flex ss-col-center">
+                        <view class="card-title ss-m-r-10">账户余额（元）</view>
+                        <view
+                            @tap="state.showMoney = !state.showMoney"
+                            class="ss-eye-icon"
+                            :class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
+                        />
+                    </view>
 
-          <view class="money-num">{{ state.showMoney ? fen2yuan(userWallet.balance) : '*****' }}</view>
-        </view>
-        <button class="ss-reset-button topup-btn" @tap="peach.$router.go('/pages/user/wallet/withdraw')">
-          提现
-        </button>
-      </view>
-    </view>
-
-
-    <p-empty v-if="state.pagination.total === 0" :marginTop="40" text="暂无数据" icon="/static/data-empty.png" />
-
-    <!-- 钱包记录 -->
-    <view v-if="state.pagination.total > 0">
-      <view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.list" :key="item.id">
-        <view class="list-content">
-          <view class="title-box ss-flex ss-row-between ss-m-b-20">
-            <text class="title ss-line-1">
-              {{ item.title }}
-            </text>
-            <view class="money">
-              <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
-              <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
+                    <view class="money-num">{{ state.showMoney ? fen2yuan(userWallet.balance) : '*****' }}</view>
+                </view>
+                <button class="ss-reset-button topup-btn" @tap="peach.$router.go('/pages/user/wallet/withdraw')">
+                    提现
+                </button>
             </view>
-          </view>
-          <text class="time">
-            {{ peach.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
-          </text>
         </view>
-      </view>
-    </view>
-    <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
-      contentdown: '上拉加载更多',
-    }" />
-  </pb-layout>
+
+        <p-empty v-if="state.pagination.total === 0" :marginTop="40" text="暂无数据" icon="/static/data-empty.png" />
+
+        <!-- 钱包记录 -->
+        <view v-if="state.pagination.total > 0">
+            <view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.list" :key="item.id">
+                <view class="list-content">
+                    <view class="title-box ss-flex ss-row-between ss-m-b-20">
+                        <text class="title ss-line-1">
+                            {{ item.title }}
+                        </text>
+                        <view class="money">
+                            <text v-if="item.price >= 0" class="add">+{{ fen2yuan(item.price) }}</text>
+                            <text v-else class="minus">{{ fen2yuan(item.price) }}</text>
+                        </view>
+                    </view>
+                    <text class="time">
+                        {{ peach.$helper.timeFormat(state.createTime, 'yyyy-mm-dd hh:MM:ss') }}
+                    </text>
+                </view>
+            </view>
+        </view>
+        <uni-load-more
+            v-if="state.pagination.total > 0"
+            :status="state.loadStatus"
+            :content-text="{
+                contentdown: '上拉加载更多',
+            }"
+        />
+    </pb-layout>
 </template>
 
 <script setup>
@@ -57,207 +70,203 @@ import { fen2yuan } from '@/peach/hooks/useGoods'
 import { resetPagination } from '@/peach/utils'
 
 const bgStyle = {
-  backgroundImage: '/static/bg-page.png',
-  imageType: 'local',
-  backgroundColor: '#fff',
-  description: '',
+    backgroundImage: '/static/bg-page.png',
+    imageType: 'local',
+    backgroundColor: '#fff',
+    description: '',
 }
 
 // const headerBg = peach.$url.css('/static/img/shop/user/wallet_card_bg.png')
 
 // 数据
 const state = reactive({
-  showMoney: false,
-  pagination: {
-    list: [],
-    total: 0,
-    pageNo: 1,
-    pageSize: 8,
-  },
-  loadStatus: '',
+    showMoney: false,
+    pagination: {
+        list: [],
+        total: 0,
+        pageNo: 1,
+        pageSize: 8,
+    },
+    loadStatus: '',
 })
 
 const userWallet = computed(() => peach.$store('user').userWallet)
 
-
 // 获得钱包记录分页
 async function getLogList() {
-  state.loadStatus = 'loading'
-  // const { data, code } = await PayWalletApi.getWalletTransactionPage({
-  //   pageNo: state.pagination.pageNo,
-  //   pageSize: state.pagination.pageSize,
+    state.loadStatus = 'loading'
+    // const { data, code } = await PayWalletApi.getWalletTransactionPage({
+    //   pageNo: state.pagination.pageNo,
+    //   pageSize: state.pagination.pageSize,
 
-  // })
+    // })
 
-  // state.pagination.list = _.concat(state.pagination.list, data.list)
-  // state.pagination.total = data.total
-  // state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore'
+    // state.pagination.list = _.concat(state.pagination.list, data.list)
+    // state.pagination.total = data.total
+    // state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore'
 }
 
-
 onLoad(() => {
-  getLogList()
-  // 刷新钱包的缓存
-  // peach.$store('user').getWallet()
+    getLogList()
+    // 刷新钱包的缓存
+    // peach.$store('user').getWallet()
 })
 
-
-
 onReachBottom(() => {
-  if (state.loadStatus === 'noMore') {
-    return
-  }
-  state.pagination.pageNo++
-  getLogList()
+    if (state.loadStatus === 'noMore') {
+        return
+    }
+    state.pagination.pageNo++
+    getLogList()
 })
 </script>
 
 <style lang="scss" scoped>
 .header-box {
-  .card-box {
-    width: 100%;
-    min-height: 250rpx;
-    padding: 0 40rpx;
-    background-size: 100% 100%;
-    border-radius: 30rpx;
-    overflow: hidden;
-    position: relative;
-    z-index: 1;
-    box-sizing: border-box;
+    .card-box {
+        width: 100%;
+        min-height: 250rpx;
+        padding: 0 40rpx;
+        background-size: 100% 100%;
+        border-radius: 30rpx;
+        overflow: hidden;
+        position: relative;
+        z-index: 1;
+        box-sizing: border-box;
 
-    .card-head {
-      color: $white;
-      font-size: 30rpx;
-    }
+        .card-head {
+            color: $white;
+            font-size: 30rpx;
+        }
 
-    .ss-eye-icon {
-      font-size: 40rpx;
-      color: $white;
-    }
+        .ss-eye-icon {
+            font-size: 40rpx;
+            color: $white;
+        }
 
-    .money-num {
-      font-size: 70rpx;
-      line-height: 70rpx;
-      font-weight: 500;
-      color: $white;
-      font-family: OPPOSANS;
-    }
+        .money-num {
+            font-size: 70rpx;
+            line-height: 70rpx;
+            font-weight: 500;
+            color: $white;
+            font-family: OPPOSANS;
+        }
 
-    .reduce-num {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: $white;
-    }
+        .reduce-num {
+            font-size: 26rpx;
+            font-weight: 400;
+            color: $white;
+        }
 
-    .topup-btn {
-      width: 150rpx;
-      height: 60rpx;
-      line-height: 60rpx;
-      border-radius: 30px;
-      font-size: 26rpx;
-      font-weight: 500;
-      background-color: $white;
-      color: var(--ui-BG-Main);
+        .topup-btn {
+            width: 150rpx;
+            height: 60rpx;
+            line-height: 60rpx;
+            border-radius: 30px;
+            font-size: 26rpx;
+            font-weight: 500;
+            background-color: $white;
+            color: var(--ui-BG-Main);
+        }
     }
-  }
 }
 
 // 筛选
 
 .filter-box {
-  height: 114rpx;
-  background-color: $bg-page;
+    height: 114rpx;
+    background-color: $bg-page;
 
-  .total-box {
-    font-size: 24rpx;
-    font-weight: 500;
-    color: $dark-9;
-  }
-
-  .date-btn {
-    background-color: $white;
-    line-height: 54rpx;
-    border-radius: 27rpx;
-    padding: 0 20rpx;
-    font-size: 24rpx;
-    font-weight: 500;
-    color: $dark-6;
-
-    .ss-seldate-icon {
-      font-size: 50rpx;
-      color: $dark-9;
+    .total-box {
+        font-size: 24rpx;
+        font-weight: 500;
+        color: $dark-9;
+    }
+
+    .date-btn {
+        background-color: $white;
+        line-height: 54rpx;
+        border-radius: 27rpx;
+        padding: 0 20rpx;
+        font-size: 24rpx;
+        font-weight: 500;
+        color: $dark-6;
+
+        .ss-seldate-icon {
+            font-size: 50rpx;
+            color: $dark-9;
+        }
     }
-  }
 }
 
 // tab
 .wallet-tab-card {
-  .tab-item {
-    height: 80rpx;
-    position: relative;
+    .tab-item {
+        height: 80rpx;
+        position: relative;
 
-    .tab-title {
-      font-size: 30rpx;
-    }
+        .tab-title {
+            font-size: 30rpx;
+        }
 
-    .cur-tab-title {
-      font-weight: $font-weight-bold;
-    }
+        .cur-tab-title {
+            font-weight: $font-weight-bold;
+        }
 
-    .tab-line {
-      width: 60rpx;
-      height: 6rpx;
-      border-radius: 6rpx;
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      bottom: 2rpx;
-      background-color: var(--ui-BG-Main);
+        .tab-line {
+            width: 60rpx;
+            height: 6rpx;
+            border-radius: 6rpx;
+            position: absolute;
+            left: 50%;
+            transform: translateX(-50%);
+            bottom: 2rpx;
+            background-color: var(--ui-BG-Main);
+        }
     }
-  }
 }
 
 // 钱包记录
 .wallet-list {
-  padding: 30rpx;
-  background-color: #ffff;
+    padding: 30rpx;
+    background-color: #ffff;
 
-  .head-img {
-    width: 70rpx;
-    height: 70rpx;
-    border-radius: 50%;
-    background: $gray-c;
-  }
-
-  .list-content {
-    justify-content: space-between;
-    align-items: flex-start;
-    flex: 1;
-
-    .title {
-      font-size: 28rpx;
-      color: $dark-3;
-      width: 400rpx;
+    .head-img {
+        width: 70rpx;
+        height: 70rpx;
+        border-radius: 50%;
+        background: $gray-c;
     }
 
-    .time {
-      color: $gray-c;
-      font-size: 22rpx;
-    }
-  }
+    .list-content {
+        justify-content: space-between;
+        align-items: flex-start;
+        flex: 1;
 
-  .money {
-    font-size: 28rpx;
-    font-weight: bold;
-    font-family: OPPOSANS;
+        .title {
+            font-size: 28rpx;
+            color: $dark-3;
+            width: 400rpx;
+        }
 
-    .add {
-      color: var(--ui-BG-Main);
+        .time {
+            color: $gray-c;
+            font-size: 22rpx;
+        }
     }
 
-    .minus {
-      color: $dark-3;
+    .money {
+        font-size: 28rpx;
+        font-weight: bold;
+        font-family: OPPOSANS;
+
+        .add {
+            color: var(--ui-BG-Main);
+        }
+
+        .minus {
+            color: $dark-3;
+        }
     }
-  }
 }
 </style>
diff --git a/peach/api/trade/goods.js b/peach/api/trade/goods.js
index 4de984b..212664a 100644
--- a/peach/api/trade/goods.js
+++ b/peach/api/trade/goods.js
@@ -1,30 +1,38 @@
-import request from "@/peach/request";
+import request from '@/peach/request'
 
 const GoodsApi = {
-  // 商品详情
-  getProduct: (data) => {
-    return request({
-      url: "/trade/order/page",
-      method: "GET",
-      params: data,
-    });
-  },
-  // 添加商品
-  addProduct: (data) => {
-    return request({
-      url: "/trade/order/page",
-      method: "POST",
-      data,
-    });
-  },
-  // 修改商品
-  editProduct: (data) => {
-    return request({
-      url: "/trade/order/page",
-      method: "POST",
-      data,
-    });
-  },
-};
+    // 商品列表
+    getProductList: (data) => {
+        return request({
+            url: '/product/spu/page',
+            method: 'GET',
+            params: data,
+        })
+    },
+    // 商品详情 spuIds
+    getProduct: (data) => {
+        return request({
+            url: '/product/spu/list',
+            method: 'GET',
+            params: data,
+        })
+    },
+    // 添加商品
+    addProduct: (data) => {
+        return request({
+            url: '/trade/order/page',
+            method: 'POST',
+            data,
+        })
+    },
+    // 修改商品
+    editProduct: (data) => {
+        return request({
+            url: '/trade/order/page',
+            method: 'POST',
+            data,
+        })
+    },
+}
 
-export default GoodsApi;
+export default GoodsApi
diff --git a/peach/api/trade/order.js b/peach/api/trade/order.js
index 75692c7..2bc0333 100644
--- a/peach/api/trade/order.js
+++ b/peach/api/trade/order.js
@@ -1,14 +1,23 @@
-import request from "@/peach/request";
+import request from '@/peach/request'
 
 const OrderUtil = {
-  // 获取订单列表
-  getOrderPage: (data) => {
-    return request({
-      url: "/trade/order/page",
-      method: "GET",
-      params: data,
-    });
-  },
-};
+    // 获取订单列表
+    getOrderPage: (data) => {
+        return request({
+            url: '/trade/order/page',
+            method: 'GET',
+            params: data,
+        })
+    },
 
-export default OrderUtil;
+    // 订单详情
+    getOrderDetail: (data) => {
+        return request({
+            url: '/trade/order/get-detail',
+            method: 'GET',
+            params: data,
+        })
+    },
+}
+
+export default OrderUtil
diff --git a/peach/components/p-goods-column/p-goods-column.vue b/peach/components/p-goods-column/p-goods-column.vue
index b34f1cc..b9ff01b 100644
--- a/peach/components/p-goods-column/p-goods-column.vue
+++ b/peach/components/p-goods-column/p-goods-column.vue
@@ -1,176 +1,210 @@
 <template>
-  <view class="ss-goods-wrap">
-    <view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @click="onClick">
-      <image class="lg-img-box" :src="peach.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
-      <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
-        <view>
-          <view v-if="goodsFields.title?.show || goodsFields.name?.show" class="lg-goods-title ss-line-2"
-            :style="[{ color: titleColor }]">
-            {{ data.title || data.name }}
-          </view>
-          <view v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
-            class="lg-goods-subtitle ss-m-t-10 ss-line-1"
-            :style="[{ color: subTitleColor, background: subTitleBackground }]">
-            {{ data.subtitle || data.introduction }}
-          </view>
-        </view>
-        <view>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view v-if="goodsFields.price?.show" class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]">
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+    <view class="ss-goods-wrap">
+        <view v-if="size === 'lg'" class="lg-goods-card ss-flex ss-col-stretch" :style="[elStyles]" @click="onClick">
+            <image class="lg-img-box" :src="peach.$url.cdn(data.image || data.picUrl)" mode="aspectFill"></image>
+            <view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
+                <view>
+                    <view
+                        v-if="goodsFields.title?.show || goodsFields.name?.show"
+                        class="lg-goods-title ss-line-2"
+                        :style="[{ color: titleColor }]"
+                    >
+                        {{ data.title || data.name }}
+                    </view>
+                    <view
+                        v-if="goodsFields.subtitle?.show || goodsFields.introduction?.show"
+                        class="lg-goods-subtitle ss-m-t-10 ss-line-1"
+                        :style="[{ color: subTitleColor, background: subTitleBackground }]"
+                    >
+                        {{ data.subtitle || data.introduction }}
+                    </view>
+                </view>
+                <view>
+                    <view class="ss-flex ss-col-bottom ss-m-t-10">
+                        <view
+                            v-if="goodsFields.price?.show"
+                            class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
+                            :style="[{ color: goodsFields.price.color }]"
+                        >
+                            <text class="ss-font-24">{{ priceUnit }}</text>
+                            {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+                        </view>
+                        <view
+                            v-if="
+                                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                                (data.original_price > 0 || data.marketPrice > 0)
+                            "
+                            class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
+                            :style="[{ color: originPriceColor }]"
+                        >
+                            <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+                            <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+                        </view>
+                    </view>
+                    <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
+                        <view class="sales-text">{{ salesAndStock }}</view>
+                    </view>
+                </view>
             </view>
-            <view
-              v-if="(goodsFields.original_price?.show || goodsFields.marketPrice?.show) && (data.original_price > 0 || data.marketPrice > 0)"
-              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS" :style="[{ color: originPriceColor }]">
-              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
-              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
-            </view>
-          </view>
-          <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
-            <view class="sales-text">{{ salesAndStock }}</view>
-          </view>
         </view>
-      </view>
-      <view>
-        <button>详情</button>
-        <button>编辑</button>
-        <button>删除</button>
-      </view>
+        <view class="ss-flex ss-row-around" :style="btnStyles">
+            <button class="ss-reset-button btn-group">详情</button>
+            <button class="ss-reset-button btn-group">编辑</button>
+            <button class="ss-reset-button btn-group btn-del">删除</button>
+        </view>
     </view>
-  </view>
 </template>
 
 <script setup>
+import peach from '@/peach'
 import { ref, computed } from 'vue'
-import { isArray } from 'lodash';
-import { fen2yuan, formatSales, formatStock } from '@/peach/hooks/useGoods';
+import { isArray } from 'lodash'
+import { fen2yuan, formatSales, formatStock } from '@/peach/hooks/useGoods'
 
 const props = defineProps({
-  goodsFields: {
-    type: [Array, Object],
-    default() {
-      return {
-        price: { show: true },
-        stock: { show: true },
-        name: { show: true },
-        introduction: { show: true },
-        marketPrice: { show: true },
-        salesCount: { show: true }
-      }
-    }
-  },
-  data: {
-    type: Object,
-    default: {}
-  },
-  size: {
-    type: String,
-    default: ''
-  },
-  topRadius: {
-    type: Number,
-    default: 0,
-  },
-  bottomRadius: {
-    type: Number,
-    default: 0,
-  },
-  priceUnit: {
-    type: String,
-    default: '￥',
-  },
-  titleColor: {
-    type: String,
-    default: '#333',
-  },
-  subTitleColor: {
-    type: String,
-    default: '#999999',
-  },
-  subTitleBackground: {
-    type: String,
-    default: '',
-  },
+    goodsFields: {
+        type: [Array, Object],
+        default() {
+            return {
+                price: { show: true },
+                stock: { show: true },
+                name: { show: true },
+                introduction: { show: true },
+                marketPrice: { show: true },
+                salesCount: { show: true },
+            }
+        },
+    },
+    data: {
+        type: Object,
+        default: {},
+    },
+    size: {
+        type: String,
+        default: '',
+    },
+    originPriceColor: {
+        type: String,
+        default: '#C4C4C4',
+    },
+    topRadius: {
+        type: Number,
+        default: 0,
+    },
+    bottomRadius: {
+        type: Number,
+        default: 0,
+    },
+    priceUnit: {
+        type: String,
+        default: '￥',
+    },
+    titleColor: {
+        type: String,
+        default: '#333',
+    },
+    subTitleColor: {
+        type: String,
+        default: '#999999',
+    },
+    subTitleBackground: {
+        type: String,
+        default: '',
+    },
 })
 
 const emits = defineEmits(['click'])
 
 function onClick() {
-  emits('click')
+    emits('click')
 }
 
 const elStyles = computed(() => {
-  return {
-    background: props.background,
-    'border-top-left-radius': props.topRadius + 'px',
-    'border-top-right-radius': props.topRadius + 'px',
-    'border-bottom-left-radius': props.bottomRadius + 'px',
-    'border-bottom-right-radius': props.bottomRadius + 'px',
-  }
+    return {
+        background: props.background,
+        'border-top-left-radius': props.topRadius + 'px',
+        'border-top-right-radius': props.topRadius + 'px',
+    }
+})
+
+const btnStyles = computed(() => {
+    return {
+        background: '#fff',
+        'border-bottom-left-radius': props.bottomRadius + 'px',
+        'border-bottom-right-radius': props.bottomRadius + 'px',
+        padding: '8px 0',
+    }
 })
 
 // 格式化销量、库存信息
 const salesAndStock = computed(() => {
-  let text = [];
-  if (props.goodsFields.salesCount?.show) {
-    text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
-  }
-  if (props.goodsFields.stock?.show) {
-    text.push(formatStock(props.data.stock_show_type, props.data.stock));
-  }
-  return text.join(' | ');
-});
+    let text = []
+    if (props.goodsFields.salesCount?.show) {
+        text.push(formatSales(props.data.sales_show_type, props.data.salesCount))
+    }
+    if (props.goodsFields.stock?.show) {
+        text.push(formatStock(props.data.stock_show_type, props.data.stock))
+    }
+    return text.join(' | ')
+})
 </script>
 
 <style lang="scss" scoped>
-.lg-goods-card {
-  overflow: hidden;
-  position: relative;
-  z-index: 1;
-  background-color: $white;
-  height: 280rpx;
+.ss-goods-wrap {
+    .lg-goods-card {
+        overflow: hidden;
+        position: relative;
+        z-index: 1;
+        background-color: $white;
+        height: 280rpx;
 
-  .lg-img-box {
-    width: 280rpx;
-    height: 280rpx;
-    margin-right: 20rpx;
-  }
+        .lg-img-box {
+            width: 280rpx;
+            height: 280rpx;
+            margin-right: 20rpx;
+        }
 
-  .lg-goods-title {
-    font-size: 28rpx;
-    font-weight: 500;
-    color: #333333;
-    // line-height: 36rpx;
-    // width: 410rpx;
-  }
+        .lg-goods-title {
+            font-size: 28rpx;
+            font-weight: 500;
+            color: #333333;
+            // line-height: 36rpx;
+            // width: 410rpx;
+        }
 
-  .lg-goods-subtitle {
-    font-size: 24rpx;
-    font-weight: 400;
-    color: #999999;
-    // line-height: 30rpx;
-    // width: 410rpx;
-  }
+        .lg-goods-subtitle {
+            font-size: 24rpx;
+            font-weight: 400;
+            color: #999999;
+            // line-height: 30rpx;
+            // width: 410rpx;
+        }
 
-  .lg-goods-price {
-    font-size: 30rpx;
-    color: $red;
-    line-height: 36rpx;
-  }
+        .lg-goods-price {
+            font-size: 30rpx;
+            color: $red;
+            line-height: 36rpx;
+        }
 
-  .buy-box {
-    position: absolute;
-    bottom: 20rpx;
-    right: 20rpx;
-    z-index: 2;
-    width: 120rpx;
-    height: 50rpx;
-    background: linear-gradient(90deg, #fe8900, #ff5e00);
-    border-radius: 25rpx;
-    font-size: 24rpx;
-    color: #ffffff;
-  }
+        .sales-text {
+            display: table;
+            font-size: 24rpx;
+            transform: scale(0.8);
+            margin-left: 0rpx;
+            color: #c4c4c4;
+        }
+    }
+    .btn-group {
+        width: 120rpx;
+        height: 50rpx;
+        background: var(--ui-BG-1);
+        border-radius: 25rpx;
+        font-size: 24rpx;
+        color: #000;
+    }
+    .btn-del {
+        color: var(--ui-BG-Main);
+        background-color: var(--ui-BG-Main-opacity-1);
+    }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/peach/components/p-goods-item/p-goods-item.vue b/peach/components/p-goods-item/p-goods-item.vue
index f4926c9..973dca8 100644
--- a/peach/components/p-goods-item/p-goods-item.vue
+++ b/peach/components/p-goods-item/p-goods-item.vue
@@ -8,7 +8,7 @@
             :style="[{ borderRadius: radius + 'rpx', marginBottom: marginBottom + 'rpx' }]"
         >
             <view class="img-box ss-m-r-24">
-                <image class="order-img" :src="sheep.$url.cdn(img)" mode="aspectFill"></image>
+                <image class="order-img" :src="peach.$url.cdn(img)" mode="aspectFill"></image>
             </view>
             <view
                 class="box-right ss-flex-col ss-row-between"
diff --git a/peach/hooks/useGoods.js b/peach/hooks/useGoods.js
index 088e6f7..408a35b 100644
--- a/peach/hooks/useGoods.js
+++ b/peach/hooks/useGoods.js
@@ -1,5 +1,32 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
+import { formatDate } from '@/peach/utils'
+
+/**
+ * 格式化数字
+ * @param {string} prefix 前缀
+ * @param {'exact' | string} type 格式类型：exact=精确值，其它=大致数量
+ * @param {number} num 销量
+ * @return {string} 格式化后的销量字符串
+ */
+export function formatNum(prefix, type, num) {
+    num = num || 0
+    // 情况一：精确数值
+    if (type === 'exact') {
+        return prefix + num
+    }
+    // 情况二：小于等于 10
+    if (num < 10) {
+        return `${prefix}≤10`
+    }
+    // 情况三：大于 10，除第一位外，其它位都显示为0
+    // 例如：100  - 199  显示为 100+
+    //      9000 - 9999 显示为 9000+
+    const numStr = num.toString()
+    const first = numStr[0]
+    const other = '0'.repeat(numStr.length - 1)
+    return `${prefix}${first}${other}+`
+}
 
 /**
  * 将分转成元
@@ -32,6 +59,31 @@ export function formatStock(type, num) {
     return formatNum('库存', type, num)
 }
 
+export function formatOrderStatusDescription(order) {
+    if (order.status === 0) {
+        if (!order.payExpireTime) {
+            return '当前支付已过期'
+        }
+        return `请在 ${formatDate(order.payExpireTime)} 前完成支付`
+    }
+    if (order.status === 10) {
+        return '商家未发货，请耐心等待'
+    }
+    if (order.status === 20) {
+        return '商家已发货，请耐心等待'
+    }
+    if (order.status === 30 && !order.commentStatus) {
+        return '已收货，快去评价一下吧'
+    }
+    if (order.status === 30 && order.commentStatus) {
+        return '交易完成，感谢您的支持'
+    }
+    if (order.status === 50) {
+        return '请及时到店核销商品'
+    }
+    return '交易关闭'
+}
+
 export function formatOrderStatus(order) {
     if (order.status === 0) {
         return '待付款'
@@ -105,6 +157,14 @@ export function handleOrderButtons(order) {
     }
     if (order.status === 40) {
         // 删除订单
-        order.buttons.push('delete')
+        // order.buttons.push('delete')
+    }
+    if (order.status === 50) {
+        // 核销订单
+        order.buttons.push('verification')
+    }
+    if (order.status === 60) {
+        // 配送完成
+        order.buttons.push('delivery')
     }
 }
diff --git a/peach/scss/theme/_style.scss b/peach/scss/theme/_style.scss
index 03f24b9..6e8f592 100644
--- a/peach/scss/theme/_style.scss
+++ b/peach/scss/theme/_style.scss
@@ -19,6 +19,40 @@
     }
 }
 
+@each $value in ('', '-1', '-2', '-3', '-4') {
+    // 背景色 + 文字色 ： 白色 + 默认色；
+    .ui-BG#{$value} {
+        background-color: var(--ui-BG#{$value}) !important;
+        color: var(--ui-TC);
+    }
+    // 文字颜色
+    .ui-TC#{$value} {
+        color: var(--ui-TC#{$value}) !important;
+    }
+    // 主题色背景
+    .ui-BG-Main#{$value} {
+        background-color: var(--ui-BG-Main#{$value}) !important;
+        color: var(--ui-BG-Main-TC) !important;
+    }
+    // 主题色渐变，横向
+    .ui-BG-Main-Gradient {
+        background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)) !important;
+        color: var(--ui-BG-Main-TC) !important;
+    }
+    // 主题色文字
+    .ui-TC-Main#{$value} {
+        color: var(--ui-BG-Main#{$value}) !important;
+    }
+    // 主题色阴影
+    .ui-Shadow-Main {
+        box-shadow: var(--ui-Main-box-shadow) !important;
+    }
+    .ui-BG-Main-light {
+        background: var(----ui-BG-Main-light) !important;
+        color: var(--ui-BG-Main#{$value}) !important;
+    }
+}
+
 @each $color, $value in $colors {
     .main-#{$color} {
         --ui-BG-Main: #{$value};
diff --git a/peach/store/app.js b/peach/store/app.js
index 6b88b04..4a24b0b 100644
--- a/peach/store/app.js
+++ b/peach/store/app.js
@@ -1,182 +1,181 @@
-import { ref } from "vue";
-import { defineStore } from "pinia";
-import $platform from "@/peach/platform";
-import $router from "@/peach/router";
-import useSysStore from "./sys";
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import $platform from '@/peach/platform'
+import $router from '@/peach/router'
+import useSysStore from './sys'
 
 const useAppStore = defineStore(
-  "app",
-  () => {
-    /**
-     * @description 应用信息
-     * @param string name 应用名称
-     * @param string logo 应用logo
-     * @param string version 应用版本
-     * @param string copyright 版权信息
-     * @param string copyrightTime 版权时间
-     * @param string cdnurl 静态资源域名
-     * @param string filesystem 文件系统
-     */
-    const info = ref({
-      name: "",
-      logo: "",
-      version: "",
-      copyright: "",
-      copytime: "",
-      cdnurl: "",
-      filesystem: "",
-    });
+    'app',
+    () => {
+        /**
+         * @description 应用信息
+         * @param string name 应用名称
+         * @param string logo 应用logo
+         * @param string version 应用版本
+         * @param string copyright 版权信息
+         * @param string copyrightTime 版权时间
+         * @param string cdnurl 静态资源域名
+         * @param string filesystem 文件系统
+         */
+        const info = ref({
+            name: '',
+            logo: '',
+            version: '',
+            copyright: '',
+            copytime: '',
+            cdnurl: '',
+            filesystem: '',
+        })
 
-    /**
-     * @description 平台信息
-     * @param Array share.methods 分享方式
-     * @param Object share.forwardInfo 转发信息
-     * @param Object share.posterInfo 海报信息
-     * @param string share.linkAddress 分享链接地址
-     * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
-     */
-    const platform = ref({
-      share: {
-        methods: [],
-        forwardInfo: {},
-        posterInfo: {},
-        linkAddress: "",
-      },
-      bindMobile: 0,
-    });
-
-    const chat = ref({});
-
-    /**
-     * @description 模板信息
-     * @param Object basic 基础模板
-     * @param Object tabbar 底部导航模板
-     */
-    const template = ref({
-      basic: {
-        tabbar: {
-          items: [
-            {
-              activeIconUrl: "/static/a-index.png",
-              iconUrl: "/static/index.png",
-              text: "首页",
-              url: "/pages/index/index",
+        /**
+         * @description 平台信息
+         * @param Array share.methods 分享方式
+         * @param Object share.forwardInfo 转发信息
+         * @param Object share.posterInfo 海报信息
+         * @param string share.linkAddress 分享链接地址
+         * @param number bindMobile 绑定手机号提醒 0: 提醒 1: 不提醒
+         */
+        const platform = ref({
+            share: {
+                methods: [],
+                forwardInfo: {},
+                posterInfo: {},
+                linkAddress: '',
             },
-            {
-              activeIconUrl: "/static/a-product.png",
-              iconUrl: "/static/product.png",
-              text: "产品",
-              url: "/pages/index/product",
+            bindMobile: 0,
+        })
+
+        const chat = ref({})
+
+        /**
+         * @description 模板信息
+         * @param Object basic 基础模板
+         * @param Object tabbar 底部导航模板
+         */
+        const template = ref({
+            basic: {
+                tabbar: {
+                    items: [
+                        {
+                            activeIconUrl: '/static/a-index.png',
+                            iconUrl: '/static/index.png',
+                            text: '首页',
+                            url: '/pages/index/index',
+                        },
+                        {
+                            activeIconUrl: '/static/a-product.png',
+                            iconUrl: '/static/product.png',
+                            text: '产品',
+                            url: '/pages/index/product',
+                        },
+                        {
+                            activeIconUrl: '/static/a-order.png',
+                            iconUrl: '/static/order.png',
+                            text: '订单',
+                            url: '/pages/index/order',
+                        },
+                        {
+                            activeIconUrl: '/static/a-my.png',
+                            iconUrl: '/static/my.png',
+                            text: '我的',
+                            url: '/pages/index/my',
+                        },
+                        {
+                            activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png',
+                            iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
+                            text: 'icons',
+                            url: '/pages/index/icons',
+                        },
+                    ],
+                    style: {
+                        activeColor: '#fc4141',
+                        bgColor: '#fff',
+                        bgType: 'color',
+                        color: '#282828',
+                    },
+                    theme: 'red',
+                },
             },
-            {
-              activeIconUrl: "/static/a-order.png",
-              iconUrl: "/static/order.png",
-              text: "订单",
-              url: "/pages/order/list",
-            },
-            {
-              activeIconUrl: "/static/a-my.png",
-              iconUrl: "/static/my.png",
-              text: "我的",
-              url: "/pages/index/my",
-            },
-            {
-              activeIconUrl:
-                "http://mall.yudao.iocoder.cn/static/images/4-002.png",
-              iconUrl: "http://mall.yudao.iocoder.cn/static/images/4-001.png",
-              text: "icons",
-              url: "/pages/index/icons",
-            },
-          ],
-          style: {
-            activeColor: "#fc4141",
-            bgColor: "#fff",
-            bgType: "color",
-            color: "#282828",
-          },
-          theme: "red",
-        },
-      },
-    });
+        })
 
-    // 全局分享信息
-    const shareInfo = ref({});
+        // 全局分享信息
+        const shareInfo = ref({})
 
-    // 小程序发货信息管理 0: 没有 1：有
-    const hasWechatTradeManaged = ref(0);
+        // 小程序发货信息管理 0: 没有 1：有
+        const hasWechatTradeManaged = ref(0)
 
-    /**
-     * @author Ankkaya
-     * @description 小程序初始化
-     * @param {Type}  -
-     * @returns {Type}
-     */
-    async function init() {
-      // 检查网络
-      const networkStatus = await $platform.checkNetwork();
-      if (!networkStatus) {
-        $router.error("NetworkError");
-      }
+        /**
+         * @author Ankkaya
+         * @description 小程序初始化
+         * @param {Type}  -
+         * @returns {Type}
+         */
+        async function init() {
+            // 检查网络
+            const networkStatus = await $platform.checkNetwork()
+            if (!networkStatus) {
+                $router.error('NetworkError')
+            }
 
-      if (true) {
-        this.info = {
-          name: "🍑商城",
-          logo: "https://static.iocoder.cn/ruoyi-vue-pro-logo.png",
-          version: "1.0.0",
-          copyright: "全部开源，个人与企业可 100% 免费使用",
-          copytime: "Copyright© 2018-2024",
+            if (true) {
+                this.info = {
+                    name: '🍑商城',
+                    logo: 'https://static.iocoder.cn/ruoyi-vue-pro-logo.png',
+                    version: '1.0.0',
+                    copyright: '全部开源，个人与企业可 100% 免费使用',
+                    copytime: 'Copyright© 2018-2024',
 
-          cdnurl: "https://file.sheepjs.com", // 云存储域名
-          filesystem: "qcloud", // 云存储平台
-        };
-        this.platform = {
-          share: {
-            methods: ["poster", "link"],
-            linkAddress: "https://shopro.sheepjs.com/#/",
-            posterInfo: {
-              user_bg: "/static/img/shop/config/user-poster-bg.png",
-              goods_bg: "/static/img/shop/config/goods-poster-bg.png",
-              groupon_bg: "/static/img/shop/config/groupon-poster-bg.png",
-            },
-          },
-          bind_mobile: 0,
-        };
-        this.chat = {
-          chat_domain: "https://api.shopro.sheepjs.com/chat",
-          room_id: "admin",
-        };
-        this.has_wechat_trade_managed = 0;
+                    cdnurl: 'https://file.sheepjs.com', // 云存储域名
+                    filesystem: 'qcloud', // 云存储平台
+                }
+                this.platform = {
+                    share: {
+                        methods: ['poster', 'link'],
+                        linkAddress: 'https://shopro.sheepjs.com/#/',
+                        posterInfo: {
+                            user_bg: '/static/img/shop/config/user-poster-bg.png',
+                            goods_bg: '/static/img/shop/config/goods-poster-bg.png',
+                            groupon_bg: '/static/img/shop/config/groupon-poster-bg.png',
+                        },
+                    },
+                    bind_mobile: 0,
+                }
+                this.chat = {
+                    chat_domain: 'https://api.shopro.sheepjs.com/chat',
+                    room_id: 'admin',
+                }
+                this.has_wechat_trade_managed = 0
 
-        // 加载主题
-        const sysStore = useSysStore();
-        sysStore.setTheme();
+                // 加载主题
+                const sysStore = useSysStore()
+                sysStore.setTheme()
 
-        return Promise.resolve(true);
-      } else {
-        $router.error("InitError", res.msg || "加载失败");
-      }
-    }
+                return Promise.resolve(true)
+            } else {
+                $router.error('InitError', res.msg || '加载失败')
+            }
+        }
 
-    return {
-      info,
-      platform,
-      chat,
-      template,
-      shareInfo,
-      hasWechatTradeManaged,
-      init,
-    };
-  },
-  {
-    persist: {
-      enabled: true,
-      strategies: [
-        {
-          key: "app-store",
-        },
-      ],
+        return {
+            info,
+            platform,
+            chat,
+            template,
+            shareInfo,
+            hasWechatTradeManaged,
+            init,
+        }
     },
-  }
-);
+    {
+        persist: {
+            enabled: true,
+            strategies: [
+                {
+                    key: 'app-store',
+                },
+            ],
+        },
+    }
+)
 
-export default useAppStore;
+export default useAppStore
diff --git a/peach/utils/index.js b/peach/utils/index.js
index 7b31a2c..2ee2b1b 100644
--- a/peach/utils/index.js
+++ b/peach/utils/index.js
@@ -1,5 +1,30 @@
+import dayjs from 'dayjs'
+
 export function resetPagination(pagination) {
     pagination.list = []
     pagination.total = 0
     pagination.pageNo = 1
 }
+
+/**
+ * 时间日期转换
+ * @param {dayjs.ConfigType} date 当前时间，new Date() 格式
+ * @param {string} format 需要转换的时间格式字符串
+ * @description format 字符串随意，如 `YYYY-mm、YYYY-mm-dd`
+ * @description format 季度："YYYY-mm-dd HH:MM:SS QQQQ"
+ * @description format 星期："YYYY-mm-dd HH:MM:SS WWW"
+ * @description format 几周："YYYY-mm-dd HH:MM:SS ZZZ"
+ * @description format 季度 + 星期 + 几周："YYYY-mm-dd HH:MM:SS WWW QQQQ ZZZ"
+ * @returns {string} 返回拼接后的时间字符串
+ */
+export function formatDate(date, format) {
+    // 日期不存在，则返回空
+    if (!date) {
+        return ''
+    }
+    // 日期存在，则进行格式化
+    if (format === undefined) {
+        format = 'YYYY-MM-DD HH:mm:ss'
+    }
+    return dayjs(date).format(format)
+}
diff --git a/static/order/order_bg.png b/static/order/order_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..c83c5b50e4eb8d8958fdd9d539a0aabd252e8bcf
GIT binary patch
literal 22243
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
SDFSO?rAWj;LXT%G?f(E3m^r@y

literal 0
HcmV?d00001