perf(订单)：信息展示

pages/index/index.vue

@@ -22,22 +22,22 @@
                 <view class="income flex justify-between align-center">
                     <view class="left flex align-center">
                         <view class="unit self-start">￥</view>
-                        <view class="sincome ss-font-60">{{ state.statistic.todayPaymentAmount || 0 }}</view>
+                        <view class="sincome ss-font-60">{{ fen2yuan(state.statistic.todayPaymentAmount || 0) }}</view>
                     </view>
                     <!-- <button class="right-btn ss-reset-button">查看详情</button> -->
                 </view>
                 <view class="des ss-m-t-20">
-                    总销售额 {{ state.statistic.totalSalesAmount }} 元 | 成功退款 {{ state.statistic.refundCount }} 笔 |
+                    总销售额 {{ fen2yuan(state.statistic.totalSalesAmount) }} 元 | 成功退款
-                    退款金额 {{ state.statistic.refundAmount }} 元
+                    {{ state.statistic.refundCount }} 笔 | 退款金额 {{ fen2yuan(state.statistic.refundAmount) }} 元
                 </view>
             </view>
 
             <view class="more ss-m-t-70">
                 <view class="title ss-m-b-30">基础数据</view>
                 <view class="items">
-                    <view class="item" v-for="item in state.more" :key="item.name">
+                    <view class="item" v-for="(item, index) in state.more" :key="item.name">
                         <view class="label">{{ item.name }}</view>
-                        <view class="value">{{ item.value }}</view>
+                        <view class="value">{{ index !== 0 ? item.value : fen2yuan(item.value) }}</view>
                         <view class="last"> 昨日 {{ item.last }} </view>
                     </view>
                 </view>
@@ -51,7 +51,9 @@ import { ref, computed } from 'vue'
 import { onLoad, onShow } from '@dcloudio/uni-app'
 import peach from '@/peach'
 import $store from '@/peach/store'
+import { fen2yuan } from '@/peach/hooks/useGoods'
 import UserUtil from '@/peach/api/member/user'
+import OrderUtil from '@/peach/api/trade/order'
 import bg from '@/static/bg-page.png'
 
 const bgStyle = {
@@ -121,7 +123,37 @@ async function getStatistic() {
  * @param {Type}  -
  * @returns {Type}
  */
-function checkVerifi() {}
+function checkVerifi() {
+    // 扫描二维码
+    uni.scanCode({
+        success: (res) => {
+            uni.showModal({
+                title: '提示',
+                content: '是否核销该订单',
+                success: function (sres) {
+                    if (sres.confirm) {
+                        OrderUtil.orderVerification({
+                            verifyCode: res.result,
+                        }).then((res) => {
+                            uni.showToast({
+                                title: '订单核销成功',
+                                icon: 'success',
+                            })
+                            setTimeout(() => {
+                                peach.$router.go('/pages/order/detail', {
+                                    id: res.data,
+                                })
+                            }, 500)
+                        })
+                    }
+                },
+            })
+        },
+        fail: (err) => {
+            console.log(err)
+        },
+    })
+}
 
 onShow(() => {
     getStatistic()

pages/index/order.vue

@@ -151,19 +151,33 @@ const tabMaps = [
         name: '全部',
     },
     {
-        name: '待付款',
+        name: '已付款',
-        value: 0,
+        value: '50,60',
     },
     {
-        name: '待核销',
+        name: '已评价',
-        value: 50,
+        value: '30',
     },
     {
-        name: '待配送',
+        name: '已退货',
-        value: 60,
+        value: '10,20',
     },
 ]
 
+function onDelivery(id) {
+    OrderApi.orderComplete({ orderId: id }).then(() => {
+        uni.showToast({
+            title: '配送成功',
+            icon: 'success',
+        })
+        setTimeout(() => {
+            peach.$router.go('/pages/order/detail', {
+                id: id,
+            })
+        }, 500)
+    })
+}
+
 // 单个订单总商品数
 function totalNumsPerOrder(order) {
     if (order.items.length) {
@@ -206,14 +220,14 @@ async function getOrderList() {
     let { data } = await OrderApi.getOrderPage({
         pageNo: state.value.pagination.pageNo,
         pageSize: state.value.pagination.pageSize,
-        status: tabMaps[state.value.currentTab].value,
+        status: state.value.currentTab !== 3 ? tabMaps[state.value.currentTab].value : undefined,
+        refundStatus: state.value.currentTab === 3 ? tabMaps[state.value.currentTab].value : undefined,
     })
 
     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'

pages/order/detail.vue

@@ -77,7 +77,7 @@
                         :price="item.price"
                         :num="item.count"
                     >
-                        <template #tool>
+                        <!-- <template #tool>
                             <view class="ss-flex">
                                 <button
                                     class="ss-reset-button apply-btn"
@@ -114,7 +114,7 @@
                                     退款成功
                                 </button>
                             </view>
-                        </template>
+                        </template> -->
                         <template #priceSuffix>
                             <button class="ss-reset-button tag-btn" v-if="item.status_text">
                                 {{ item.status_text }}

peach/api/trade/order.js

@@ -18,6 +18,24 @@ const OrderUtil = {
             params: data,
         })
     },
+
+    // 商品核销
+    orderVerification: (data) => {
+        return request({
+            url: '/trade/order/verify-code',
+            method: 'POST',
+            data: data,
+        })
+    },
+
+    // 完成订单
+    orderComplete: (data) => {
+        return request({
+            url: '/trade/order/completed-order',
+            method: 'POST',
+            data: data,
+        })
+    },
 }
 
 export default OrderUtil

peach/hooks/useGoods.js

@@ -73,7 +73,7 @@ export function formatOrderStatusDescription(order) {
         return '商家已发货，请耐心等待'
     }
     if (order.status === 30 && !order.commentStatus) {
-        return '已收货，快去评价一下吧'
+        return '已收货，待评价'
     }
     if (order.status === 30 && order.commentStatus) {
         return '交易完成，感谢您的支持'
@@ -81,6 +81,9 @@ export function formatOrderStatusDescription(order) {
     if (order.status === 50) {
         return '请及时到店核销商品'
     }
+    if (order.status === 60) {
+        return '商家已接单，待配送'
+    }
     return '交易关闭'
 }
 
@@ -151,18 +154,18 @@ export function handleOrderButtons(order) {
         order.buttons.push('cancel')
         // order.buttons.push('pay');
     }
-    if (order.status === 30 && !order.commentStatus) {
+    // if (order.status === 30 && !order.commentStatus) {
-        // 发起评价
+    //     // 发起评价
-        order.buttons.push('comment')
+    //     order.buttons.push('comment')
-    }
+    // }
     if (order.status === 40) {
         // 删除订单
         // order.buttons.push('delete')
     }
-    if (order.status === 50) {
+    // if (order.status === 50) {
-        // 核销订单
+    //     // 核销订单
-        order.buttons.push('verification')
+    //     order.buttons.push('verification')
-    }
+    // }
     if (order.status === 60) {
         // 配送完成
         order.buttons.push('delivery')