Browse Source

feat: 订单详情

zqf 5 months ago
parent
commit
232ff052de
2 changed files with 28 additions and 14 deletions
  1. 5 1
      src/pages/food/submit-order/index.vue
  2. 23 13
      src/pages/profile/order/order-detail/index.vue

+ 5 - 1
src/pages/food/submit-order/index.vue

@@ -148,7 +148,11 @@ async function settlement() {
       number: i.count,
     };
   });
-  const { data } = await createOrder({ deliveryOrderItemsDtoList, deliveryOrderDto });
+  // const { data } = await createOrder({ deliveryOrderItemsDtoList, deliveryOrderDto });
+  await uni.setStorageSync('deliveryOrderDto', JSON.stringify(deliveryOrderDto));
+  uni.navigateTo({
+    url: "/pages/profile/order/order-detail/index",
+  })
 }
 
 const totalPrice = computed(() => {

+ 23 - 13
src/pages/profile/order/order-detail/index.vue

@@ -35,25 +35,25 @@
       </view>
       <view class="row">
         <text class="label">配送地址</text>
-        <text class="content">奥特莱斯澜铂湾2期-3号楼-3单元</text>
+        <text class="content">{{ deliveryOrderDto.deliveryAddress }}</text>
       </view>
       <view class="row">
         <text class="label">收货电话</text>
-        <text class="content">19118083224</text>
+        <text class="content">{{ deliveryOrderDto.deliveryPhone }}</text>
         <view class="action">
           <up-button text="修改" size="mini"></up-button>
         </view>
       </view>
       <view class="row">
         <text class="label">备注信息</text>
-        <text class="content">暂无</text>
+        <text class="content">{{ deliveryOrderDto.deliveryRemark || '暂无'}}</text>
         <view class="action">
           <up-button text="修改" size="mini"></up-button>
         </view>
       </view>
       <view class="row">
         <text class="label">餐具数量</text>
-        <text class="content">商家按餐量提供</text>
+        <text class="content">{{ deliveryOrderDto.tableware || '商家按餐量提供'}}</text>
         <view class="action">
           <up-button text="修改" size="mini"></up-button>
         </view>
@@ -79,40 +79,50 @@
     <view class="section-2 card">
       <view class="section-title">订单信息</view>
       <view class="restaurant-name"> 美味的黄焖鸡德州店 </view>
-      <view class="food-item" v-for="item in 4" :key="item">
+      <view class="food-item" v-for="item in cartItems" :key="item.id">
         <up-image
           class="img"
-          src="https://www.xiaoyaotravel.com/api/admin/app/tourismProject/download?id=1843658873626431488&fieldName=tourismUrl&asImage=true&filename=b3cc4250ec214f9fa9c6828abd6ecf88.jpg"
+          :src="item.urlAfterConvert[0]"
           width="64px"
           height="64px"
           radius="10px"
         ></up-image>
         <view class="right">
           <view class="row-1">
-            <view class="name">黄焖鸡+米饭+鹌鹑蛋黄焖鸡+米饭+鹌鹑蛋</view>
-            <view class="price">¥18.00</view>
+            <view class="name">{{ item.name }}</view>
+            <view class="price">{{ item.priceUnit }}{{ item.price }}</view>
           </view>
-          <view class="row-2">x1份</view>
+          <view class="row-2">x{{ item.count }}份</view>
         </view>
       </view>
       <view class="fee packing">
         <text class="label">打包费</text>
-        <text class="content">$18.00</text>
+        <text class="content">${{ deliveryOrderDto.packCharge }}</text>
       </view>
       <view class="fee delivery">
         <text class="label">配送费</text>
-        <text class="content">$5.00</text>
+        <text class="content">${{ deliveryOrderDto.deliveryFee }}</text>
       </view>
       <up-line></up-line>
       <view class="fee total">
         <text class="label">总计</text>
-        <text class="content">$28.00</text>
+        <text class="content">${{ deliveryOrderDto.payAmount }}</text>
       </view>
     </view>
   </view>
 </template>
 
-<script setup></script>
+<script setup>
+import { onMounted, reactive } from "vue";
+
+const cartItems = ref([]);
+const deliveryOrderDto = ref({});
+
+onMounted(async () => {
+  cartItems.value = await JSON.parse(uni.getStorageSync('cartItems') || '[]');
+  deliveryOrderDto.value = await JSON.parse(uni.getStorageSync('deliveryOrderDto') || '{}');
+})
+</script>
 
 <style lang="scss">
 page {