feat: 更新

src/api/labour.js

@@ -2,7 +2,7 @@ import { request } from '@/utils/request.js';
 
 export const getLabourDetail = (id) => {
   return request({
-    url: `website/basic/jobProject/detail?id=${id}`,
+    url: `/website/basic/jobProject/detail?id=${id}`,
     method: 'GET',
   });
 };

src/pages/food/submit-order/index.vue

@@ -32,11 +32,11 @@
         </view>
         <view class="packing-fee">
           <text>打包费</text>
-          <text>${{ deliveryOrderDto.packCharge }}</text>
+          <text>${{ deliveryOrderDto.packCharge || 0 }}</text>
         </view>
         <view class="delivery-fee">
           <text>配送费</text>
-          <text>${{ deliveryOrderDto.deliveryFee }}</text>
+          <text>${{ deliveryOrderDto.deliveryFee || 0 }}</text>
         </view>
         <view class="line"></view>
         <view class="total-fee">
@@ -80,6 +80,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { createOrder } from '@/api/food';
+import dayjs from 'dayjs'
 
 import BottomSafeWrapper from '@/components/bottom-safe-wrapper/index.vue';
 
@@ -148,7 +149,9 @@ async function settlement() {
       number: i.count,
     };
   });
-  // const { data } = await createOrder({ deliveryOrderItemsDtoList, deliveryOrderDto });
+  deliveryOrderDto.orderTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+  const { data } = await createOrder({ deliveryOrderItemsDtoList, deliveryOrderDto });
+  deliveryOrderDto.docNo = data;
   await uni.setStorageSync('deliveryOrderDto', JSON.stringify(deliveryOrderDto));
   uni.navigateTo({
     url: "/pages/profile/order/order-detail/index",
@@ -157,7 +160,7 @@ async function settlement() {
 
 const totalPrice = computed(() => {
   const sum = cartItems.value.reduce((sum, item) => sum + item.price * item.count, 0);
-  const orderAmount =  parseFloat(sum.toFixed(2)) + Number(deliveryOrderDto.packCharge) + Number(deliveryOrderDto.deliveryFee);
+  const orderAmount =  parseFloat(sum.toFixed(2)) + Number(deliveryOrderDto.packCharge || 0) + Number(deliveryOrderDto.deliveryFee || 0);
   deliveryOrderDto.orderAmount = orderAmount;
   deliveryOrderDto.payAmount = orderAmount;
   return orderAmount;

src/pages/profile/order/order-detail/index.vue

@@ -22,6 +22,7 @@
 
         <view v-if="true" class="yiwancheng">
           <text class="title">订单已完成</text>
+          <!-- <text class="title">订单进行中</text> -->
           <view style="width: 85px">
             <up-button size="small" color="#fd9a00" text="致电商家"></up-button>
           </view>
@@ -40,38 +41,35 @@
       <view class="row">
         <text class="label">收货电话</text>
         <text class="content">{{ deliveryOrderDto.deliveryPhone }}</text>
-        <view class="action">
+        <!-- <view class="action">
           <up-button text="修改" size="mini"></up-button>
-        </view>
+        </view> -->
       </view>
       <view class="row">
         <text class="label">备注信息</text>
         <text class="content">{{ deliveryOrderDto.deliveryRemark || '暂无'}}</text>
-        <view class="action">
+        <!-- <view class="action">
           <up-button text="修改" size="mini"></up-button>
-        </view>
+        </view> -->
       </view>
       <view class="row">
         <text class="label">餐具数量</text>
         <text class="content">{{ deliveryOrderDto.tableware || '商家按餐量提供'}}</text>
-        <view class="action">
+        <!-- <view class="action">
           <up-button text="修改" size="mini"></up-button>
-        </view>
+        </view> -->
       </view>
       <view class="row">
         <text class="label">订单号码</text>
-        <text class="content">2601263881324717 437</text>
-        <view class="action">
-          <up-button text="修改" size="mini"></up-button>
-        </view>
+        <text class="content">{{ deliveryOrderDto.docNo }}</text>
       </view>
       <view class="row">
         <text class="label">下单时间</text>
-        <text class="content">2024-09-24 16: 46:14</text>
+        <text class="content">{{ deliveryOrderDto.orderTime }}</text>
       </view>
       <view class="row">
         <text class="label">支付方式</text>
-        <text class="content">在线支付</text>
+        <text class="content">线下支付</text>
       </view>
     </view>
     <SizedBox height="15" />

src/utils/request.js

@@ -73,8 +73,8 @@ const handleSuccessCallback = ({
     // gotoLogin();
     // reject({ msg: data.msg, detail: res });
   } else {
-    if (showErrorToast) uni.showToast({ icon: "none", title: data.msg });
-    reject({ msg: data.msg, detail: res });
+    if (showErrorToast) uni.showToast({ icon: "none", title: data.errorMessage });
+    reject({ msg: data.errorMessage, detail: res });
   }
 };