更新

src/constant/index.ts

@@ -25,3 +25,10 @@ export const levelMember = {
   ADVANCED: '进阶级',
   PERFORMER: '大师级'
 }
+
+export const memberType = {
+  MONTH: '月度会员',
+  QUARTERLY: '季度会员',
+  YEAR_HALF: '半年会员',
+  YEAR: '年度会员'
+}

src/student/member-center/index.tsx

@@ -9,6 +9,7 @@ import { state } from '@/state'
 import iconStudent from '@common/images/icon_student.png'
 import { orderStatus } from '@/views/order-detail/orderStatus'
 import dayjs from 'dayjs'
+import { memberType } from '@/constant'
 
 export const getAssetsHomeFile = (fileName: string) => {
   const path = `./images/${fileName}`
@@ -73,15 +74,8 @@ export default defineComponent({
           id: item.id,
           status: false
         }
-        if (item.period === 'MONTH') {
-          tempItem.title = `月度会员`
-        } else if (item.period === 'QUARTERLY') {
-          tempItem.title = `季度会员`
-        } else if (item.period === 'YEAR_HALF') {
-          tempItem.title = `半年会员`
-        } else if (item.period === 'YEAR') {
-          tempItem.title = `年度会员`
-        }
+
+        tempItem.title = memberType[item.period]
 
         item.period !== 'DAY' && settingList.push(tempItem)
       })
@@ -115,6 +109,7 @@ export default defineComponent({
       orderStatus.orderObject.orderName = '云教练' + member.title
       orderStatus.orderObject.orderDesc = '云教练' + member.title
       orderStatus.orderObject.actualPrice = member.salePrice
+      orderStatus.orderObject.orderNo = ''
       orderStatus.orderObject.orderList = [
         {
           orderType: 'VIP',

src/student/trade/tradeOrder.ts

@@ -1,7 +1,8 @@
+import { memberType } from '@/constant'
 import request from '@/helpers/request'
 import { orderStatus } from '@/views/order-detail/orderStatus'
 import dayjs from 'dayjs'
-//   LIVE: '直播课',
+// LIVE: '直播课',
 // PRACTICE: '陪练课',
 // VIDEO: '视频课',
 // VIP: '开通会员',
@@ -77,16 +78,15 @@ export const formatOrderDetail = async (item: any) => {
     case 'VIP':
       {
         try {
-          const res = await getVipDetail()
-          const buyObject = res.find((member: any) => member.id === item.bizId)
+          const res = await getVipDetail(item.id)
           tempList = {
             orderType: item.goodType,
             goodsName: item.goodName,
-            id: buyObject.id,
-            title: buyObject.title,
-            price: buyObject.salePrice
-            // startTime: dayjs(startTime).format('YYYY-MM-DD'),
-            // endTime: dayjs(endTime).format('YYYY-MM-DD')
+            id: res.id,
+            title: memberType[res.period] || '',
+            price: res.salePrice,
+            startTime: dayjs(res.startTime).format('YYYY-MM-DD'),
+            endTime: dayjs(res.endTime).format('YYYY-MM-DD')
           }
         } catch (e: any) {
           throw new Error(e.message)
@@ -147,14 +147,9 @@ export const getLiveDetail = async (groupId: any) => {
 }
 
 // 获取会员详情
-export const getVipDetail = async () => {
+export const getVipDetail = async (id: any) => {
   try {
-    const setting = await request.post(
-      '/api-student/memberPriceSettings/list',
-      {
-        data: {}
-      }
-    )
+    const setting = await request.get('/api-student/vipCardRecord/detail/' + id)
     return setting.data || []
   } catch {
     throw new Error('获取会员详情失败')
@@ -191,7 +186,6 @@ export const tradeOrder = (result: any, callBack?: any) => {
     orderDetailList.forEach(async (item: any) => {
       await formatOrderDetail(item)
     })
-    // console.log(orderStatus.orderObject, 'orderStatus.orderObject')
     callBack && callBack()
   } catch {
     //