Merge branch 'iteration_1.3.4' into paino_change

src/student/trade/tradeOrder.ts

@@ -11,7 +11,7 @@ const apiSuffix =
 // VIDEO: '视频课',
 // VIP: '开通会员',
 // MUSIC: '单曲点播'
-export const formatOrderDetail = async (item: any) => {
+export const formatOrderDetail = async (item: any, couponAmount?: number) => {
   const type = item.goodType
   let tempList: any = {}
 
@@ -88,7 +88,10 @@ export const formatOrderDetail = async (item: any) => {
             goodName: item.goodName,
             id: item.id,
             title: memberType[res.period] || '',
-            price: res.salePrice || item.actualPrice,
+            // 判断是否有优惠金额
+            price: couponAmount
+              ? Number((res.salePrice - couponAmount).toFixed(2))
+              : res.salePrice || item.actualPrice,
             startTime: dayjs(res.startTime).format('YYYY-MM-DD'),
             endTime: dayjs(res.endTime).format('YYYY-MM-DD')
           }
@@ -204,7 +207,8 @@ export const tradeOrder = (result: any, callBack?: any) => {
     orderDesc,
     orderName,
     orderType,
-    orderDetailList
+    orderDetailList,
+    couponAmount // 优惠金额
   } = result
   orderStatus.orderObject.orderType = orderType
   orderStatus.orderObject.orderName = orderName
@@ -215,7 +219,7 @@ export const tradeOrder = (result: any, callBack?: any) => {
   orderStatus.orderObject.orderList = []
   try {
     orderDetailList.forEach(async (item: any) => {
-      await formatOrderDetail(item)
+      await formatOrderDetail(item, couponAmount)
     })
     callBack && callBack()
   } catch {

src/views/member-center/index.tsx

@@ -91,6 +91,8 @@ export default defineComponent({
           originalPrice: item.originalPrice,
           period: item.period,
           id: item.id,
+          discount: item.discount,
+          discountPrice: item.discountPrice,
           status: false
         }
 
@@ -110,7 +112,8 @@ export default defineComponent({
   methods: {
     calcSalePrice(item: any) {
       // discount
-      if (item.discount) {
+
+      if (item.discount === 1) {
         const tempPrice = Number(
           (item.salePrice - item.discountPrice).toFixed(2)
         )
@@ -138,8 +141,9 @@ export default defineComponent({
       orderStatus.orderObject.orderType = 'VIP'
       orderStatus.orderObject.orderName = '小酷Ai' + member.title
       orderStatus.orderObject.orderDesc = '小酷Ai' + member.title
-      orderStatus.orderObject.actualPrice = member.salePrice
+      orderStatus.orderObject.actualPrice = this.calcSalePrice(member)
       orderStatus.orderObject.recomUserId = this.recomUserId
+      orderStatus.orderObject.activityId = this.activityId
       orderStatus.orderObject.orderNo = ''
       orderStatus.orderObject.orderList = [
         {
@@ -147,7 +151,7 @@ export default defineComponent({
           goodsName: '小酷Ai' + member.title,
           id: member.id,
           title: member.title,
-          price: member.salePrice,
+          price: this.calcSalePrice(member),
           startTime: dayjs(startTime).format('YYYY-MM-DD'),
           endTime: dayjs(endTime).format('YYYY-MM-DD'),
           recomUserId: this.recomUserId
@@ -300,7 +304,7 @@ export default defineComponent({
               <span class={styles.priceUnit}>￥</span>
               <span class={styles.priceNum}>
                 {(this as any).$filters.moneyFormat(
-                  this.selectMember?.salePrice || 0
+                  this.calcSalePrice(this.selectMember) || 0
                 )}
               </span>
             </div>

src/views/order-detail/index.tsx

@@ -36,6 +36,7 @@ export default defineComponent({
       loading: false, // 是否加载中，为了处理0元订单（）
       orderType: query.orderType,
       recomUserId: query.recomUserId, // 推荐人id
+      activityId: query.activityId, // 活动编号
       id: query.id,
       agreeStatus: false,
       popupShow: false,
@@ -125,6 +126,7 @@ export default defineComponent({
         orderStatus.orderObject.orderDesc = item.musicSheetName
         orderStatus.orderObject.actualPrice = item.musicPrice
         orderStatus.orderObject.recomUserId = this.recomUserId
+        orderStatus.orderObject.activityId = this.activityId
         // 判断当前订单是否在支付中
         if (['WAIT_PAY', 'PAYING'].includes(item.orderStatus)) {
           orderStatus.orderObject.orderNo = item.orderNo
@@ -194,6 +196,7 @@ export default defineComponent({
             orderType: orderObject.orderType,
             actualPrice: orderObject.actualPrice || 0,
             recomUserId: orderObject.recomUserId,
+            activityId: orderObject.activityId,
             orderInfos: [...orderInfos()]
           }
         })
@@ -234,6 +237,7 @@ export default defineComponent({
         orderDesc: '',
         orderType: '',
         recomUserId: null as any,
+        activityId: '',
         orderList: []
       }
     }

src/views/order-detail/orderStatus.ts

@@ -35,7 +35,8 @@ export const orderStatus = reactive({
     orderDesc: '',
     orderType: '' as orderType,
     recomUserId: null as any,
-    orderList: [] as Array<any>
+    orderList: [] as Array<any>,
+    activityId: '' as any
   }
 })
 
@@ -117,6 +118,7 @@ export const onSubmitZero = async (callBack?: Function): Promise<void> => {
         orderType: orderObject.orderType,
         actualPrice: orderObject.actualPrice || 0,
         recomUserId: orderObject.recomUserId,
+        activityId: orderObject.activityId,
         orderInfos: [...orderInfos()]
       }
     })