From 2174c91c4bbc93340d65e6eebdae9d74da21177c Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Fri, 8 Mar 2024 22:21:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(custom):=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               | 19 ++++
 src/components/Cart.vue                       |  1 -
 src/pages/admin/order_manage/detail/index.vue | 89 +++++++++++++++----
 src/pages/admin/order_manage/list/index.scss  |  1 +
 src/pages/admin/order_manage/list/index.vue   |  8 +-
 5 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 5718692..045c0cb 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -12,18 +12,37 @@ declare module '@vue/runtime-core' {
     Cart: typeof import('./src/components/Cart.vue')['default']
     MerList: typeof import('./src/components/MerList.vue')['default']
     NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
+    NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
     NutButton: typeof import('@nutui/nutui-taro')['Button']
+    NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
     NutCell: typeof import('@nutui/nutui-taro')['Cell']
     NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
+    NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
+    NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
     NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
     NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
     NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
+    NutForm: typeof import('@nutui/nutui-taro')['Form']
+    NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
     NutGrid: typeof import('@nutui/nutui-taro')['Grid']
     NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
+    NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
+    NutInput: typeof import('@nutui/nutui-taro')['Input']
     NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
+    NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
+    NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
+    NutPicker: typeof import('@nutui/nutui-taro')['Picker']
     NutPopup: typeof import('@nutui/nutui-taro')['Popup']
     NutPrice: typeof import('@nutui/nutui-taro')['Price']
+    NutSearchbar: typeof import('@nutui/nutui-taro')['Searchbar']
+    NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
+    NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
+    NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
     NutTable: typeof import('@nutui/nutui-taro')['Table']
+    NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
+    NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
+    NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
+    NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
     Pay: typeof import('./src/components/Pay.vue')['default']
     Popup: typeof import('./src/components/Popup.vue')['default']
     RichEditor: typeof import('./src/components/RichEditor.vue')['default']
diff --git a/src/components/Cart.vue b/src/components/Cart.vue
index 5ac53cf..0a2638f 100644
--- a/src/components/Cart.vue
+++ b/src/components/Cart.vue
@@ -25,7 +25,6 @@ const props = defineProps({
     type: Object,
   },
   IsPendingOrder: {
-    required: true,
     type: Boolean,
     default: false,
   },
diff --git a/src/pages/admin/order_manage/detail/index.vue b/src/pages/admin/order_manage/detail/index.vue
index 1a18056..a7ec2bd 100644
--- a/src/pages/admin/order_manage/detail/index.vue
+++ b/src/pages/admin/order_manage/detail/index.vue
@@ -4,30 +4,43 @@
       <view>订单号:{{ info.oid }}</view>
       <view>{{ info.add_time }}</view>
     </view>
-    <view class="good-info">
-      <view class="top">
-        <image :src="info.BindGoods?.cover" />
-        <view class="title">{{ info.BindGoods?.name }}</view>
+    <view class="card">
+      <view class="center" v-for="(itm, idx) in info.OrderGoods" :key="idx">
+        <view class="top">
+          <image :src="itm.Goods.cover" />
+          <view class="title">{{ itm.Goods.name }} </view>
+          <view class="right">
+            <view v-if="info.pay_type === 1">{{ itm.pay_price }}元</view>
+            <view v-else>{{ itm.pay_integral }}积分</view>
+            <view>x{{ itm.number }}</view>
+          </view>
+        </view>
       </view>
-
-      <view class="public-total">
-        共{{ info.count }}件商品，已支付
-        <text class="money">{{ info.number }}</text>
+      <view class="line"></view>
+      <view class="bom" style="text-align: right">
+        共{{ info.count }}件商品,支付方式:{{
+          info.pay_type === 1 ? "微信" : "积分"
+        }},实付:
+        <text style="color: red">{{
+          info.pay_type === 1 ? `${info.price}元` : `${info.exchange}积分`
+        }}</text>
       </view>
     </view>
+
     <nut-cell-group>
       <nut-cell title="订单状态:" :desc="orderStatus"></nut-cell>
-      <nut-cell title="下单用户:" :desc="info.BindUser?.nickName"></nut-cell>
-      <nut-cell title="用户手机号:" :desc="info.BindUser?.phone"></nut-cell>
+      <nut-cell title="下单用户:" :desc="info.User?.nickName"></nut-cell>
+      <nut-cell title="用户手机号:" :desc="info.User?.phone"></nut-cell>
+      <nut-cell title="核销时间:" :desc="info.User?.phone"></nut-cell>
       <nut-cell
         v-if="info.status === 2"
         title="核销人员:"
-        :desc="info.BindCancelUser?.nickName"
+        :desc="info.CancelUser?.nickName"
       ></nut-cell>
       <nut-cell
         v-if="info.status === 2"
         title="核销人手机号:"
-        :desc="info.BindCancelUser?.phone"
+        :desc="info.CancelUser?.phone"
       ></nut-cell>
     </nut-cell-group>
   </view>
@@ -35,15 +48,16 @@
 
 <script setup lang="ts">
 import Taro from "@tarojs/taro";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 
 const info = ref<any>({});
 
 Taro.useLoad(() => {
   info.value = Taro.getStorageSync("ver_order_info");
+  console.log(info.value);
 });
 
-const orderStatus = () => {
+const orderStatus = computed(() => {
   switch (info.value.status) {
     case 1:
       return "待核销";
@@ -52,7 +66,7 @@ const orderStatus = () => {
     case 3:
       return "已失效";
   }
-};
+});
 </script>
 
 <style lang="scss">
@@ -60,6 +74,13 @@ page {
   --nut-cell-desc-color: #000;
 }
 
+.line {
+  width: 100%;
+  height: 1px;
+  background-color: #f5f5f5;
+  margin: 10px;
+}
+
 .header {
   background: linear-gradient(90deg, #2291f8 0, #1cd1dc);
   padding: 30px;
@@ -86,6 +107,7 @@ page {
     image {
       width: 200px;
       height: 200px;
+      border-radius: 10px;
     }
 
     .title {
@@ -113,4 +135,41 @@ page {
     color: #ff4c3c;
   }
 }
+
+.card {
+  box-sizing: border-box;
+  margin: 15px auto;
+  background-color: #fff;
+  padding: 20px;
+}
+
+.center {
+  .top {
+    display: flex;
+    justify-content: space-between;
+    // align-items: flex-start;
+
+    image {
+      width: 150px;
+      height: 150px;
+      border-radius: 10px;
+    }
+
+    .title {
+      margin-left: 10px;
+      display: -webkit-box;
+      overflow: hidden;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      text-overflow: ellipsis;
+      width: 350px;
+    }
+
+    .right {
+      margin-left: 10px;
+      font-size: 28px;
+      text-align: right;
+    }
+  }
+}
 </style>
diff --git a/src/pages/admin/order_manage/list/index.scss b/src/pages/admin/order_manage/list/index.scss
index 92df2e4..3cbe3e4 100644
--- a/src/pages/admin/order_manage/list/index.scss
+++ b/src/pages/admin/order_manage/list/index.scss
@@ -63,6 +63,7 @@
       image {
         width: 150px;
         height: 150px;
+        border-radius: 10px;
       }
 
       .title {
diff --git a/src/pages/admin/order_manage/list/index.vue b/src/pages/admin/order_manage/list/index.vue
index bbf453b..d273226 100644
--- a/src/pages/admin/order_manage/list/index.vue
+++ b/src/pages/admin/order_manage/list/index.vue
@@ -26,7 +26,7 @@
         <view class="top">
           <view class="name">订单号:{{ item.oid }}</view>
           <!-- <view class="sub">下单时间：{{ item.add_time }}</view> -->
-          <view class="sub">核销时间：{{ item.cancel_time || "待核销" }}</view>
+          <view class="sub" v-if="item.status !== 3">核销时间：{{ item.cancel_time || "待核销" }}</view>
           <!-- <view style="color: red">{{
                         item.status === 0
                             ? "待付款"
@@ -43,8 +43,8 @@
             <image :src="itm.Goods.cover" />
             <view class="title">{{ itm.Goods.name }} </view>
             <view class="right">
-              <view>{{ itm.pay_price }}元</view>
-              <view>{{ itm.pay_integral }}积分</view>
+              <view v-if="item.pay_type === 1">{{ itm.pay_price }}元</view>
+              <view v-else>{{ itm.pay_integral }}积分</view>
               <view>x{{ itm.number }}</view>
             </view>
           </view>
@@ -55,7 +55,7 @@
             item.pay_type === 1 ? "微信" : "积分"
           }},实付:
           <text style="color: red">{{
-            item.pay_type === 1 ? item.price : item.exchange
+            item.pay_type === 1 ? `${item.price}元` : `${item.exchange}积分`
           }}</text>
         </view>
       </view>