From 64a74564bbce8cec408b114154fb68d1bcc42fec Mon Sep 17 00:00:00 2001
From: code <2388224167@qq.com>
Date: Wed, 13 Nov 2024 08:14:20 +0800
Subject: [PATCH] 11

---
 src/pages/merchant/components/product-car.vue | 2 +-
 src/pages/merchant/detail.vue                 | 6 +++---
 src/pages/order/detail.vue                    | 2 +-
 src/pages/tabbar/order.vue                    | 8 ++++----
 src/sheep/utils/request.ts                    | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/merchant/components/product-car.vue b/src/pages/merchant/components/product-car.vue
index e50d47c..19a9b84 100644
--- a/src/pages/merchant/components/product-car.vue
+++ b/src/pages/merchant/components/product-car.vue
@@ -55,7 +55,7 @@ const getHeight = () => {
 
 
 <template>
-    <tm-drawer z-index="100" v-model:show="props.modelValue" showFooter title="购物车" position="bottom" size="50%"
+    <tm-drawer z-index="100" v-model:show="props.modelValue" showFooter title="购物车" position="bottom" size="60%"
         @close="doClose">
         <product-row v-for="(v, i) in props.carList" mode="car" :key="v.id" v-model="v.productCount" :pic="v.productPic"
             :count="v.productCount" :name="v.name" :price="v.productPrice" :marketPrice="v.marketPrice"
diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index 3ff07ee..b2b99ec 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -291,13 +291,13 @@ const doFood = () => {
         <!-- end 商品 end -->
         <template #main-bottom>
             <view class="car z-200 p-x-30rpx p-y-30rpx bg-white">
-                <product-total :totPrice="state.totPrice" :totCount="state.totCount" @submit="doPay"
-                    @doContainer="doVisibleCar" />
+                <product-total :totPrice="state.totPrice" :totCount="state.totCount" @doContainer="doVisibleCar"
+                    @submit="doPay" />
             </view>
         </template>
     </crud-layout>
     <product-car v-model="state.showCarDialog" :carList="state.carList" :totPrice="state.totPrice"
-        :totCount="state.totCount" @add="doAdd" @remove="remove" />
+        :totCount="state.totCount" @add="doAdd" @remove="remove" @submit="doPay" />
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 50bc0b7..7a22b1d 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -43,7 +43,7 @@ const getShopCarList = async () => {
 
 
 <template>
-    <crud-layout title="订单详情" bg="/static/page/blue-bg.png">
+    <crud-layout title="订单详情" mainIsScroll bg="/static/page/blue-bg.png">
         <view class="h-30rpx" />
         <view class="relative flex-col justify-center overflow-hidden card p-x-20rpx p-y-30rpx m-b-20rpx">
             <image class="absolute top--20rpx right--60rpx w-160rpx h-160rpx" src="/static/icon/guarantee.png"
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index a0a8dd4..aa25474 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -12,8 +12,8 @@ const data = {
         { id: null, name: '全部', disabled: false },
         { id: 1, name: '未支付', disabled: false },
         { id: 5, name: '待核销', disabled: false },
-        { id: 10, name: '已核销', disabled: false },
-        { id: 15, name: '已退款', disabled: false },
+        { id: 10, name: '已退款', disabled: false },
+        { id: 15, name: '已核销', disabled: false },
     ]
 }
 const state = reactive<any>({
@@ -100,8 +100,8 @@ const doRefund = (v: any) => {
                             </view>
                             <tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
                             <tm-tag v-if="v.orderStatus == 5" color="success" size="xs">待核销</tm-tag>
-                            <tm-tag v-if="v.orderStatus == 10" size="xs">已核销</tm-tag>
-                            <tm-tag v-if="v.orderStatus == 15" color="error" size="xs">已退款</tm-tag>
+                            <tm-tag v-if="v.orderStatus == 10" color="error" size="xs">已退款</tm-tag>
+                            <tm-tag v-if="v.orderStatus == 15" size="xs">已核销</tm-tag>
                         </view>
                         <view class="m-t-5rpx">
                             <view class="second-text-26">
diff --git a/src/sheep/utils/request.ts b/src/sheep/utils/request.ts
index 5f3f17a..6078103 100644
--- a/src/sheep/utils/request.ts
+++ b/src/sheep/utils/request.ts
@@ -93,9 +93,9 @@ http.interceptors.response.use(
               router.jump("/pages/tabbar/my", {}, 2);
             }, 500);
             break;
-          case 500:
+          default:
             uni.showToast({
-              title: response.data.message || "服务器开小差啦,请稍后再试~",
+              title: response.data.msg || "服务器开小差啦,请稍后再试~",
               icon: "none",
               mask: true,
             });