Merge branch 'iteration-20241126'

src/student/teacher-dependent/teacher-style/index.tsx

@@ -90,7 +90,7 @@ export default defineComponent({
                         <div class={styles.info}>
                           <div class={styles.teUserInfo}>
                             <Image
-                              src={item.avatar || iconTeacher}
+                              src={state.userInfo?.heardUrl || iconTeacher}
                               class={styles.teUserLogo}
                             />
                             <span
@@ -136,7 +136,7 @@ export default defineComponent({
                         <div class={styles.info}>
                           <div class={styles.teUserInfo}>
                             <Image
-                              src={item.avatar || iconTeacher}
+                              src={state.userInfo?.heardUrl || iconTeacher}
                               class={styles.teUserLogo}
                             />
                             <span

src/views/order-detail/index.tsx

@@ -165,6 +165,7 @@ export default defineComponent({
     orderList.forEach((order: any) => {
       tempGoodsType.push({
         orderType: order.orderType,
+        basePrice: order.price,
         price: order.price
       })
     })
@@ -629,6 +630,13 @@ export default defineComponent({
                   orderStatus.orderObject.discountCardPrice = Number(
                     item.discountPrice
                   )
+
+                  this.orderGoodsType.forEach((item: any)=> {
+                    if(item.orderType !== 'DISCOUNT') {
+                      item.price = numberToTwoUp(item.price - Number(item.discountPrice))
+                    }
+                  })
+
                   this.orderPrice = Number(
                     numberToTwoUp(
                       Number(this.orderAmount) -
@@ -658,6 +666,11 @@ export default defineComponent({
                     orderStatus.orderObject.discountCardPrice = Number(
                       item.discountPrice
                     )
+                    this.orderGoodsType.forEach((item: any)=> {
+                      if(item.orderType !== 'DISCOUNT') {
+                        item.price = numberToTwoUp(item.price - Number(item.discountPrice))
+                      }
+                    })
                     if (index === -1) {
                       this.orderAmount = this.orderAmount + item.salePrice
                       this.selectGoods.push({
@@ -679,7 +692,11 @@ export default defineComponent({
                     if (index !== -1) {
                       this.selectGoods.splice(index, 1)
                       this.orderAmount = this.orderAmount - item.salePrice
-
+                      this.orderGoodsType.forEach((item: any)=> {
+                        if(item.orderType !== 'DISCOUNT') {
+                          item.price = item.basePrice
+                        }
+                      })
                       const typeIndex = tempType.findIndex((child: any) => child.orderType === item.vipType)
                       if(typeIndex !== -1) {
                         tempType.splice(typeIndex, 1)

src/views/order-detail/use-coupons/choice-coupon.tsx

@@ -67,52 +67,6 @@ export default defineComponent({
     useEventTracking('优惠券')
   },
   methods: {
-    // async getList() {
-    //   if (this.dataLoading) return
-    //   this.dataLoading = true
-    //   try {
-    //     const res = await request.post(`${state.platformApi}/couponInfo/page`, {
-    //       data: {
-    //         couponCategory: this.couponCategory,
-    //         couponType: 'FULL_DISCOUNT',
-    //         useState: 'USABLE',
-    //         page: 1,
-    //         rows: 100
-    //       }
-    //     })
-    //     this.dataLoading = false
-    //     const result = res.data || {}
-    //     // 处理重复请求数据
-    //     if (this.list.length > 0 && result.pageNo === 1) return
-    //     this.list = result.rows || []
-
-    //     // 处理可用优惠券是否支付使用
-    //     this.list.forEach((item: any) => {
-    //       item.checked = false
-    //       // 如果使用金额大于订单金额则优惠券不可用
-    //       if (item.useLimit > this.orderAmount) {
-    //         item.disabled = true
-    //       } else {
-    //         item.disabled = false
-    //       }
-
-    //       // 处理显示已选择的优惠券
-    //       this.useCoupon.forEach((coupon: any) => {
-    //         if (item.couponIssueId === coupon.couponIssueId) {
-    //           item.checked = true
-    //         }
-    //       })
-    //     })
-    //     // 初始化排序
-    //     const canUsable = this.list.filter((list: any) => !list.disabled)
-    //     const canUsed = this.list.filter((list: any) => list.disabled)
-    //     this.list = [...canUsable, ...canUsed]
-
-    //     this.calcCoupon()
-    //   } catch {
-    //     //
-    //   }
-    // },
     onSubmit() {
       // 返回选中的优惠券
       this.$emit(
@@ -140,9 +94,21 @@ export default defineComponent({
 
         // 判断使用优惠券之后还有没有其它优惠券可用
         this.list.forEach((item: any) => {
-          const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
-          const useLastAmount = disItem.price - (usedMap.get(item.couponCategory) || 0)
-          if (!item.checked && (useList.length > 0  || Number(item.useLimit) > useLastAmount)) {
+          let disabled = true
+          if(item.couponCategory === 'UNIVERSAL') {
+            this.orderGoodsType.forEach((goods: any) => {
+              const useLastAmount = goods ? goods.price - (usedMap.get(item.couponCategory) || 0) : 0
+              if(Number(item.useLimit) <= useLastAmount && disabled) {
+                disabled = false
+              }
+            })
+          } else {
+            const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
+            const useLastAmount = disItem ? disItem.price - (usedMap.get(item.couponCategory) || 0) : 0
+            disabled = Number(item.useLimit) > useLastAmount
+          }
+          
+          if (!item.checked && (useList.length > 0  || disabled)) {
             item.disabled = true
           } else {
             item.disabled = false

src/views/order-detail/use-coupons/index.tsx

@@ -141,14 +141,24 @@ export default defineComponent({
 
         // 处理可用优惠券是否支付使用
         this.list.forEach((item: any) => {
-          const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
-          const useLastAmount = disItem.price || 0
           item.checked = false
-          // 如果使用金额大于订单金额则优惠券不可用
-          if (item.useLimit > useLastAmount) {
-            item.disabled = true
+          if(item.couponCategory === 'UNIVERSAL') {
+            let disabled = true;
+            this.orderGoodsType.forEach((goods: any) => {
+              if(item.useLimit <= goods.price && disabled) {
+                disabled = false
+              }
+            })
+            item.disabled = disabled
           } else {
-            item.disabled = false
+            const disItem: any = this.orderGoodsType.find((goods: any) => goods.orderType === item.couponCategory)
+            const useLastAmount = disItem.price || 0
+            // 如果使用金额大于订单金额则优惠券不可用
+            if (item.useLimit > useLastAmount) {
+              item.disabled = true
+            } else {
+              item.disabled = false
+            }
           }
         })
 

src/views/trade/trade-detail.module.less

@@ -98,9 +98,15 @@
     flex-shrink: 0;
     width: 35px;
     height: 35px;
-    border-radius: 50%;
+    // margin-bottom: 10px;
+   
     margin-right: 10px;
     overflow: hidden;
+    :global {
+      img {
+        border-radius: 50%;
+      }
+    }
   }
 
   .title,