fix(app): 订单详情

packages/app/src/core/libs/requests.ts

@@ -14,6 +14,7 @@ import {
   BannerMode,
   Banner,
   StudyTour,
+  PointsOrder,
 } from '../models/moment'
 import dayjs from 'dayjs'
 
@@ -456,32 +457,11 @@ export const orderPay = (data: {
 }) => httpPost(`/app-api/member/points-order/placingPay`, data)
 export const getPointsOrders = (query) =>
   httpGet<{
-    list: {
-      id: number
-      materialsId: any
-      materialsBrand: any
-      stylistId: number
-      orderMoney: any
-      projectName: string
-      pointsRate: any
-      points: string
-      orderImgUrl?: string
-      orderStatus: string
-      verifyTime: any
-      completeTime?: number
-      turnDownTime: any
-      cancelTime: number
-      cancelReason: any
-      turnDownReason: any
-      remark: any
-      couponId: any
-      orderNo: string
-      createTime: number
-      brokerageRate: any
-      brokerage: any
-    }[]
+    list: PointsOrder[]
     total: number
   }>('/app-api/member/points-order/page', query)
+export const getPointsOrder = (id) =>
+  httpGet<Partial<PointsOrder>>('/app-api/member/points-order/get', { id })
 export const getActivities = (query) =>
   httpGet<{
     list: Activity[]

packages/app/src/core/models/moment.ts

@@ -414,6 +414,44 @@ export interface Banner {
   designDesc: any
   createTime: number
 }
+export interface PointsOrder {
+  id: number
+  orderType: number
+  item: number
+  materialsId: any
+  materialsBrand: any
+  stylistId: number
+  /**
+   * 订单金额
+   */
+  orderMoney: any
+  projectName: string
+  pointsRate: any
+  /**
+   * 积分单价
+   */
+  points: string
+  orderImgUrl: string
+  orderStatus: string
+  verifyTime: any
+  completeTime: number
+  turnDownTime: any
+  cancelTime: number
+  cancelReason: any
+  turnDownReason: any
+  remark: any
+  couponId: any
+  orderNo: string
+  createTime: number
+  brokerageRate: any
+  brokerage: any
+  orderQuantity: number
+  payType: number
+  /**
+   * 实付积分
+   */
+  payPoints: number
+}
 export enum DictType {
   /**
    *  擅长空间类型
@@ -478,3 +516,4 @@ export enum BannerMode {
    */
   StudyTour = 5,
 }
+export enum OrderPayType {}

packages/app/src/pages/mine/orders/detail/index.vue

@@ -3,7 +3,18 @@
 </route>
 <script setup lang="ts">
 import SectionHeading from '@/components/section-heading.vue'
-const data = ref([{}, {}, {}])
+import { getPointsOrder } from '../../../../core/libs/requests'
+import BottomAppBar from '@/components/bottom-app-bar.vue'
+import dayjs from 'dayjs'
+
+const id = ref()
+const status = ref({ '0': '待交付', '1': '已完成', '2': '已驳回', '3': '已撤销' })
+const payTypes = ref({ 0: '积分支付', 1: '现金支付' })
+const { data, run: setData } = useRequest(() => getPointsOrder(id.value), { initialData: {} })
+onLoad((query: { id: string }) => {
+  id.value = query.id
+  setData()
+})
 </script>
 <template>
   <div class="flex-grow flex flex-col gap-4 px-3.5 bg-white">
@@ -11,7 +22,7 @@ const data = ref([{}, {}, {}])
       <div
         class="text-right text-[#ef4343] text-sm font-normal font-['PingFang_SC'] leading-normal"
       >
-        已完成
+        {{ status[data.orderStatus] }}
       </div>
     </div>
     <div class="flex gap-4 border-b border-b-solid border-b-[#f2f2f2] pb-5">
@@ -19,37 +30,50 @@ const data = ref([{}, {}, {}])
         width="94"
         height="94"
         custom-class="rounded-2xl overflow-hidden"
-        src="https://via.placeholder.com/94x94"
+        :src="data.orderImgUrl"
       />
       <div class="flex flex-col flex-1">
         <div class="text-black text-base font-normal font-['PingFang_SC'] leading-normal">
-          方晓峰
+          {{ data.projectName }}
         </div>
         <div
           class="text-start text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal"
         >
-          x1
+          x{{ data.orderQuantity }}
         </div>
         <div class="flex-1"></div>
         <div
           class="text-start text-black/60 text-sm font-normal font-['PingFang_SC'] leading-normal"
         >
-          1600积分
+          {{ data.points }}积分
         </div>
       </div>
       <div>
         <div class="text-black/40 text-sm font-normal font-['PingFang_SC'] leading-normal">
-          已完成
+          <!-- 已完成 -->
+          {{ status[data.orderStatus] }}
         </div>
       </div>
     </div>
-    <SectionHeading title="订单金额" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading title="订单金额" size="sm" :end-text="`¥ ${data.orderMoney}`"></SectionHeading>
     <SectionHeading title="总积分" size="sm" end-text="¥ 200"></SectionHeading>
-    <SectionHeading title="实际支付积分" size="sm" end-text="¥ 200"></SectionHeading>
-    <SectionHeading title="订单号" size="sm" end-text="¥ 200"></SectionHeading>
-    <SectionHeading title="支付时间" size="sm" end-text="¥ 200"></SectionHeading>
-    <SectionHeading title="支付方式" size="sm" end-text="¥ 200"></SectionHeading>
+    <SectionHeading
+      title="实际支付积分"
+      size="sm"
+      :end-text="`¥ ${data.payPoints}`"
+    ></SectionHeading>
+    <SectionHeading title="订单号" size="sm" :end-text="data.orderNo"></SectionHeading>
+    <SectionHeading
+      title="支付时间"
+      size="sm"
+      :end-text="dayjs(data.createTime).format('YYYY-MM-DD hh:mm')"
+    ></SectionHeading>
+    <SectionHeading title="支付方式" size="sm" :end-text="payTypes[data.payType]"></SectionHeading>
     <div class="flex-1"></div>
-    <div><wd-button :round="false" block>取消订单</wd-button></div>
+    <BottomAppBar fixed>
+      <div>
+        <wd-button :round="false" block v-if="data.orderStatus === '0'">取消订单</wd-button>
+      </div>
+    </BottomAppBar>
   </div>
 </template>

packages/app/src/pages/mine/orders/index.vue

@@ -7,13 +7,16 @@ import PageHelper from '@/components/page-helper.vue'
 import { getPointsOrders } from '../../../core/libs/requests'
 import { useUserStore } from '../../../store'
 import { storeToRefs } from 'pinia'
+import { PointsOrder } from '../../../core/models/moment'
+import { useRouter } from '../../../core/utils/router'
 
 const userStore = useUserStore()
 const { userInfo } = storeToRefs(userStore)
+const router = useRouter()
 
 const status = ref({ '0': '待交付', '1': '已完成', '2': '已驳回', '3': '已撤销' })
-const handleClick = () => {
-  uni.navigateTo({ url: '/pages/mine/orders/detail/index' })
+const handleClick = (order: PointsOrder) => {
+  router.push(`/pages/mine/orders/detail/index?id=${order.id}`)
 }
 </script>
 <template>
@@ -22,7 +25,7 @@ const handleClick = () => {
       <template #default="{ source }">
         <div class="flex-grow flex flex-col gap-4">
           <template v-for="(it, i) in source.list" :key="i">
-            <div @click="handleClick">
+            <div @click="handleClick(it)">
               <Card>
                 <div class="flex gap-4">
                   <wd-img