Merge branch 'share-member' into dev

src/constant/index.ts

@@ -4,6 +4,7 @@ export const goodsType = {
   VIDEO: '视频课',
   VIP: '开通会员',
   MUSIC: '单曲点播',
+  ALBUM: '专辑购买',
   PINAO_ROOM: '琴房时长充值',
   ACTI_REGIST: '活动报名'
 }

src/student/trade/tradeOrder.ts

@@ -124,6 +124,21 @@ export const formatOrderDetail = async (item: any, amount?: IAmount) => {
         }
       }
       break
+    case 'ALBUM':
+      {
+        console.log(item)
+        try {
+          const res = await getAlbumDetail(item.bizId)
+          tempList = {
+            orderType: item.goodType,
+            goodName: item.goodName,
+            ...res
+          }
+        } catch (e: any) {
+          throw new Error(e.message)
+        }
+      }
+      break
     case 'ACTI_REGIST':
       {
         try {
@@ -209,6 +224,18 @@ export const getMusicActiveTrack = async (id: any) => {
   }
 }
 
+// 获取专辑详情
+export const getAlbumDetail = async (id: any) => {
+  try {
+    const res = await request.post(`${apiSuffix}//music/album/detail`, {
+      data: { id }
+    })
+    return res.data
+  } catch {
+    throw new Error('获取专辑详情失败')
+  }
+}
+
 // 为了处理继续支付逻辑
 export const tradeOrder = (result: any, callBack?: any) => {
   const {

src/views/order-detail/orderStatus.ts

@@ -116,7 +116,7 @@ export const orderInfos = () => {
       }
     } else if (item.orderType === 'ALBUM') {
       params.bizContent = {
-        id: item.id,
+        musicSheetId: item.id,
         actualPrice: item.actualPrice || 0,
         clientType: state.platformType
       }