Sfoglia il codice sorgente

Merge branch 'iteration-20241126'

lex-xin 7 mesi fa
parent
commit
0a2c3b12d1

+ 0 - 1
src/student/teacher-dependent/model/teacher-header.tsx

@@ -187,7 +187,6 @@ export default defineComponent({
                       `游客${this.userInfo.userId || ''}`}
                   </div>
                   <div class={styles.teacherHonor}>
-                    <div class={styles.score}>评分:</div>
                     <div class={styles.level}>
                       {this.starGrade ? (
                         <Rate

+ 1 - 1
src/teacher/practice-class/timer/timer.module.less

@@ -115,7 +115,7 @@
   height: 28px;
   background: #eff6f5;
   border-radius: 4px;
-  font-size: 14px;
+  font-size: 12px;
   font-weight: 500;
   color: #2dc7aa;
   display: flex;

+ 4 - 0
src/views/order-detail/add-discount/index.module.less

@@ -51,6 +51,10 @@
         color: #131415;
         font-weight: 600;
         line-height: 22px;
+
+        .price {
+          font-weight: bold;
+        }
     }
 
     .center {

+ 7 - 0
src/views/order-detail/order-live/index.module.less

@@ -16,6 +16,11 @@
     color: #333333;
   }
 
+  .courseGroupName {
+    max-width: 250px;
+    display: inline-block;
+    vertical-align: middle;
+  }
   .collapseItem {
     :global(.van-cell) {
       background: #f7f8f9;
@@ -37,6 +42,8 @@
     color: #131415;
     line-height: 20px;
     i {
+      padding-right: 2px;
+      font-style: normal;
       font-size: 14px;
     }
   }

+ 1 - 1
src/views/order-detail/order-live/index.tsx

@@ -48,7 +48,7 @@ export default defineComponent({
               ),
               default: () => (
                 <span class={styles.price}>
-                  <i>¥</i>
+                  <i>¥</i> 
                   {moneyFormat(item.coursePrice)}
                 </span>
               )

+ 6 - 2
src/views/order-detail/order-video/index.module.less

@@ -17,6 +17,8 @@
   }
   .courseGroupName {
     max-width: 250px;
+    display: inline-block;
+    vertical-align: middle;
   }
   .titleSong {
     font-size: 14px;
@@ -32,10 +34,12 @@
 
   .price {
     font-weight: 600;
-font-size: 14px;
-color: #131415;
+    font-size: 14px;
+    color: #131415;
     line-height: 20px;
     i {
+      padding-right: 2px;
+      font-style: normal;
       font-size: 14px;
     }
   }

+ 1 - 1
src/views/order-detail/order-video/index.tsx

@@ -79,7 +79,7 @@ export default defineComponent({
               ),
               default: () => (
                 <span class={styles.price}>
-                  <i>¥</i>
+                  <i>¥</i> 
                   {moneyFormat(item.coursePrice)}
                 </span>
               )

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

@@ -87,13 +87,11 @@ export default defineComponent({
       // 已使用的优惠券
       const useList = this.list.filter((list: any) => list.checked)
       if(this.usedLength === 'SINGLE') {
-        let usedMap: any = new Map()
+        let usedMap: any = {}
         useList.forEach((item: any) => {
-          const price = usedMap.get(item.couponCategory)
-          usedMap.set(item.couponCategory, (price || 0) + item.useLimit)
+          const price = usedMap[item.couponCategory]
+          usedMap[item.couponCategory] = (price || 0) + item.useLimit
         })
-
-        usedMap.values()
         // 判断使用优惠券之后还有没有其它优惠券可用
         this.list.forEach((item: any) => {
           let disabled = true
@@ -105,17 +103,16 @@ export default defineComponent({
             })
             // 已使用优惠券总金额
             let useCouponMoney = 0
-            if(usedMap.size > 0) {
-              useCouponMoney = usedMap.values().reduce((a: any, b: any) => {
-                return a + b
-             })
+            for(let i in usedMap) {
+              useCouponMoney = useCouponMoney + usedMap[i]
             }
             disabled = item.useLimit > allAmount - useCouponMoney
           } else {
             const disItem: any = this.orderGoodsType.find((goods: any) => couponEnum[goods.orderType] === item.couponCategory)
-            const useLastAmount = disItem ? disItem.price - (usedMap.get(item.couponCategory) || 0) : 0
+            const useLastAmount = disItem ? disItem.price - (usedMap[item.couponCategory] || 0) : 0
             disabled = Number(item.useLimit) > useLastAmount
           }
+
           if (!item.checked && (useList.length > 0  || disabled)) {
             item.disabled = true
           } else {