更新打包

src/views/collection-record-detail/index.tsx

@@ -179,13 +179,18 @@ export default defineComponent({
                     </div>
                   ) : null}
 
-                  {['ING', 'PASS', 'REJECT', 'CLOSED', 'REFUNDED'].includes(
+                  {['ING', 'PASS', 'REJECT', 'REFUNDED'].includes(
                     state.orders.status
                   ) && (
                     <div class={styles.orderPrice}>
                       退回金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
                     </div>
                   )}
+                  {['CLOSED'].includes(state.orders.status) && (
+                    <div class={styles.orderPrice}>
+                      支付金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
+                    </div>
+                  )}
                 </div>
               </div>
             </>

src/views/courseware-list/component/book/index.tsx

@@ -208,6 +208,13 @@ export default defineComponent({
             isHideTitle: false
           }
         });
+        // router.push({
+        //   path: '/courseware-play',
+        //   query: {
+        //     id: item.id,
+        //     name: item.name
+        //   }
+        // });
       }
     };
     return () => (

src/views/courseware-play/component/audio-item/index.module.less

@@ -1,133 +1,142 @@
 .videoWrap {
-    position: relative;
-    width: 100%;
-    height: 100%;
+  position: relative;
+  width: 100%;
+  height: 100%;
 }
-.content{
-    height: 100%;
-    padding: 8% 20px;
+
+.content {
+  height: 100%;
+  padding: 8% 20px;
 }
-.contentWrap{
+
+.contentWrap {
+  height: 100%;
+
+  canvas {
+    width: 100%;
     height: 100%;
-    canvas{
-        width: 100%;
-        height: 100%;
-    }
+  }
 }
 
 .controls {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 80px;
-    background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 80px;
+  background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  transition: all 0.5s;
+
+  &.hide {
+    transform: translateY(100%);
+  }
+
+  .time {
     display: flex;
-    flex-direction: column;
     justify-content: space-between;
-    transition: all 0.5s;
+    width: 100%;
+    color: #fff;
+    font-size: 10px;
+    padding: 4px 20px;
+  }
 
-    &.hide{
-        transform: translateY(100%);
-    }
+  .slider {
+    width: 100%;
+    padding: 0 20px;
 
-    .time {
-        display: flex;
-        justify-content: space-between;
+    :global {
+      .n-slider {
+        --n-handle-size: 13px !important;
+        --n-fill-color: var(--van-primary-color) !important;
+        --n-fill-color-hover: var(--van-primary-color) !important;
+      }
+
+      .van-loading {
         width: 100%;
-        color: #fff;
-        font-size: 10px;
-        padding: 4px 20px;
+        height: 100%;
+      }
     }
+  }
 
-    .slider {
-        width: 100%;
-        padding: 0 20px;
-        :global {
-            .n-slider{
-                --n-handle-size: 13px !important;
-                --n-fill-color: var(--van-primary-color) !important;
-                --n-fill-color-hover: var(--van-primary-color) !important;
-            }
-            .van-loading {
-                width: 100%;
-                height: 100%;
-            }
-        }
+  .actions {
+    display: flex;
+    width: 100%;
+    color: #fff;
+    font-size: 12px;
+    padding: 0 20px;
+    align-items: center;
+
+    .actionWrap {
+      display: flex;
+    }
+
+    .actionBtn {
+      display: flex;
+      width: 28px;
+      height: 28px;
+      padding: 4px 0;
+      background: transparent;
+    }
+
+    .actionBtn>img {
+      width: 100%;
+      height: 100%;
     }
 
-    .actions {
-        display: flex;
+    :global {
+      .van-loading__circular {
         width: 100%;
-        color: #fff;
-        font-size: 12px;
-        padding: 0 20px;
-        align-items: center;
+        height: 100%;
+      }
+    }
 
-        .actionWrap {
-            display: flex;
-        }
+    .playIcon {
+      display: none;
+    }
 
-        .actionBtn {
-            display: flex;
-            width: 38px;
-            height: 38px;
-            padding: 4px 0;
-            background: transparent;
-        }
+    .btnPlay img:nth-child(2) {
+      display: block;
+    }
 
-        .actionBtn>img {
-            width: 100%;
-            height: 100%;
-        }
+    .btnPause img:nth-child(3) {
+      display: block;
+    }
 
-        :global {
-            .van-loading__circular {
-                width: 100%;
-                height: 100%;
-            }
+    .btnPlay,
+    .btnPause {
+      :global {
+        .van-loading {
+          display: none;
         }
+      }
+    }
 
-        .playIcon {
-            display: none;
+    .loopBtn {
+      :global {
+        .loop {
+          display: block;
         }
 
-        .btnPlay img:nth-child(2) {
-            display: block;
+        .loopActive {
+          display: none;
         }
+      }
+    }
 
-        .btnPause img:nth-child(3) {
-            display: block;
+    .loopBtn.active {
+      :global {
+        .loop {
+          display: none;
         }
 
-        .btnPlay,
-        .btnPause {
-            :global {
-                .van-loading {
-                    display: none;
-                }
-            }
-        }
-        .loopBtn{
-            :global{
-                .loop{
-                    display: block;
-                }
-                .loopActive{
-                    display: none;
-                }
-            }
-        }
-        .loopBtn.active{
-            :global{
-                .loop{
-                    display: none;
-                }
-                .loopActive{
-                    display: block;
-                }
-            }
+        .loopActive {
+          display: block;
         }
-
+      }
     }
+
+  }
 }

src/views/courseware-play/component/audio-item/index.tsx

@@ -2,10 +2,10 @@ import { defineComponent, reactive, toRefs, watch } from 'vue';
 import { ref } from 'vue';
 import styles from './index.module.less';
 
-import iconLoop from '../../image/icon-loop.svg';
-import iconLoopActive from '../../image/icon-loop-active.svg';
-import iconplay from '../../image/icon-play.svg';
-import iconpause from '../../image/icon-pause.svg';
+import iconLoop from '../../image/icon-loop.png';
+import iconLoopActive from '../../image/icon-loop-active.png';
+import iconplay from '../../image/icon-play.png';
+import iconpause from '../../image/icon-pause.png';
 import { NSlider } from 'naive-ui';
 import Vudio from 'vudio.js';
 import { getSecondRPM } from '@/helpers/utils';

src/views/courseware-play/component/video-item/index.module.less

@@ -1,132 +1,141 @@
 .videoWrap {
-    position: relative;
-    width: 100%;
-    height: 100%;
+  position: relative;
+  width: 100%;
+  height: 100%;
 }
-.content{
-    height: 100%;
+
+.content {
+  height: 100%;
 }
-.contentWrap{
+
+.contentWrap {
+  height: 100%;
+
+  video {
+    width: 100%;
     height: 100%;
-    video{
-        width: 100%;
-        height: 100%;
-    }
+  }
 }
 
 .controls {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    height: 80px;
-    background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 80px;
+  background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  transition: all 0.5s;
+
+  &.hide {
+    transform: translateY(100%);
+  }
+
+  .time {
     display: flex;
-    flex-direction: column;
     justify-content: space-between;
-    transition: all 0.5s;
+    width: 100%;
+    color: #fff;
+    font-size: 10px;
+    padding: 4px 20px;
+  }
 
-    &.hide{
-        transform: translateY(100%);
-    }
+  .slider {
+    width: 100%;
+    padding: 0 20px;
 
-    .time {
-        display: flex;
-        justify-content: space-between;
+    :global {
+      .n-slider {
+        --n-handle-size: 13px !important;
+        --n-fill-color: var(--van-primary-color) !important;
+        --n-fill-color-hover: var(--van-primary-color) !important;
+      }
+
+      .van-loading {
         width: 100%;
-        color: #fff;
-        font-size: 10px;
-        padding: 4px 20px;
+        height: 100%;
+      }
     }
+  }
 
-    .slider {
-        width: 100%;
-        padding: 0 20px;
-        :global {
-            .n-slider{
-                --n-handle-size: 13px !important;
-                --n-fill-color: var(--van-primary-color) !important;
-                --n-fill-color-hover: var(--van-primary-color) !important;
-            }
-            .van-loading {
-                width: 100%;
-                height: 100%;
-            }
-        }
+  .actions {
+    display: flex;
+    width: 100%;
+    color: #fff;
+    font-size: 12px;
+    padding: 0 20px;
+    align-items: center;
+
+    .actionWrap {
+      display: flex;
+    }
+
+    .actionBtn {
+      display: flex;
+      width: 28px;
+      height: 28px;
+      padding: 4px 0;
+      background: transparent;
+    }
+
+    .actionBtn>img {
+      width: 100%;
+      height: 100%;
     }
 
-    .actions {
-        display: flex;
+    :global {
+      .van-loading__circular {
         width: 100%;
-        color: #fff;
-        font-size: 12px;
-        padding: 0 20px;
-        align-items: center;
+        height: 100%;
+      }
+    }
 
-        .actionWrap {
-            display: flex;
-        }
+    .playIcon {
+      display: none;
+    }
 
-        .actionBtn {
-            display: flex;
-            width: 38px;
-            height: 38px;
-            padding: 4px 0;
-            background: transparent;
-        }
+    .btnPlay img:nth-child(2) {
+      display: block;
+    }
 
-        .actionBtn>img {
-            width: 100%;
-            height: 100%;
-        }
+    .btnPause img:nth-child(3) {
+      display: block;
+    }
 
-        :global {
-            .van-loading__circular {
-                width: 100%;
-                height: 100%;
-            }
+    .btnPlay,
+    .btnPause {
+      :global {
+        .van-loading {
+          display: none;
         }
+      }
+    }
 
-        .playIcon {
-            display: none;
+    .loopBtn {
+      :global {
+        .loop {
+          display: block;
         }
 
-        .btnPlay img:nth-child(2) {
-            display: block;
+        .loopActive {
+          display: none;
         }
+      }
+    }
 
-        .btnPause img:nth-child(3) {
-            display: block;
+    .loopBtn.active {
+      :global {
+        .loop {
+          display: none;
         }
 
-        .btnPlay,
-        .btnPause {
-            :global {
-                .van-loading {
-                    display: none;
-                }
-            }
-        }
-        .loopBtn{
-            :global{
-                .loop{
-                    display: block;
-                }
-                .loopActive{
-                    display: none;
-                }
-            }
-        }
-        .loopBtn.active{
-            :global{
-                .loop{
-                    display: none;
-                }
-                .loopActive{
-                    display: block;
-                }
-            }
+        .loopActive {
+          display: block;
         }
-
+      }
     }
+
+  }
 }

src/views/courseware-play/component/video-item/index.tsx

@@ -2,10 +2,10 @@ import { defineComponent, onMounted, reactive, toRefs, watch } from 'vue';
 import { ref } from 'vue';
 import styles from './index.module.less';
 
-import iconLoop from '../../image/icon-loop.svg';
-import iconLoopActive from '../../image/icon-loop-active.svg';
-import iconplay from '../../image/icon-play.svg';
-import iconpause from '../../image/icon-pause.svg';
+import iconLoop from '../../image/icon-loop.png';
+import iconLoopActive from '../../image/icon-loop-active.png';
+import iconplay from '../../image/icon-play.png';
+import iconpause from '../../image/icon-pause.png';
 import { NSlider } from 'naive-ui';
 import { getSecondRPM } from '@/helpers/utils';
 

src/views/courseware-play/index.tsx

@@ -123,7 +123,10 @@ export default defineComponent({
         data.knowledgePointList = res.data.map((item: any) => {
           return {
             ...item,
-            url: item.type === 'SONG' ? 'https://gyt.ks3-cn-beijing.ksyuncs.com/courseware/1687916228530.png' : item.coverImg
+            url:
+              item.type === 'SONG'
+                ? 'https://gyt.ks3-cn-beijing.ksyuncs.com/courseware/1687916228530.png'
+                : item.coverImg
           };
         });
       }

src/views/exercise-record/exercis-detail.tsx

@@ -222,7 +222,7 @@ export default defineComponent({
             </OFullRefresh>
           ) : (
             <OEmpty
-              description="暂无练习统计"
+              description="暂无评测记录"
               style={{ height: `calc(100vh - ${topWrapHeight.value}px)` }}
             />
           )}

src/views/information/help-center/index.tsx

@@ -46,6 +46,7 @@ export default defineComponent({
         if (form.list.length > 0 && result.current === 1) {
           return;
         }
+        //
         form.list = form.list.concat(result.rows || []);
         form.listState.finished = result.current >= result.pages;
         form.params.page = result.current + 1;
@@ -108,7 +109,12 @@ export default defineComponent({
             ))}
           </List>
         ) : (
-          <OEmpty description="暂无数据" />
+          <div
+            style={{
+              height: `calc(100vh - var(--header-height))`
+            }}>
+            <OEmpty description="暂无数据" />
+          </div>
         )}
       </div>
     );

src/views/member-center/index.module.less

@@ -243,6 +243,17 @@
         }
       }
     }
+
+    .allPrice {
+      display: inline-block;
+      padding-left: 8px;
+      font-size: 14px;
+      font-family: DINAlternate-Bold, DINAlternate;
+      font-weight: bold;
+      color: #8C6142;
+      line-height: 16px;
+      opacity: 0.5;
+    }
   }
 }
 
@@ -282,4 +293,4 @@
     width: 29px;
     height: 29px;
   }
-}
+}

src/views/member-center/index.tsx

@@ -274,13 +274,15 @@ export default defineComponent({
 
         <div class={styles.btnGroup}>
           <div class={styles.priceSection}>
-            工具领取：
             <div class={styles.price}>
               <span class={styles.priceUnit}>￥</span>
               <span class={styles.priceNum}>
                 {moneyFormat(this.calcSalePrice(this.selectMember) || 0)}
               </span>
             </div>
+            <del class={styles.allPrice}>
+              ¥ {moneyFormat(this.selectMember.originalPrice)}
+            </del>
           </div>
           {this.userInfo.id ? (
             <Button round class={styles.btn} onClick={this.onSubmit}>

src/views/preview-protocol/privacy.tsx

@@ -26,7 +26,7 @@ export default defineComponent({
           </h2>
           引言
           <br />
-          {this.name}是由武汉乐小雅网络科技有限公司（以下简称“我们”）提供给学校
+          {this.name}是由武汉酷乐秀网络科技有限公司（以下简称“我们”）提供给学校
           {this.name}
           使用的乐团双师训练平台。我们十分重视用户的个人信息和数据。您在使用我们的服务时，我们可能会收集和使用您的相关信息。我们希望通过本《隐私政策》向您说明，在使用我们的服务时，我们如何收集、使用、储存和分享这些信息，以及我们为您提供的访问、更新、控制和保护这些信息的方式。本《隐私政策》与您所使用的
           {this.name}
@@ -460,7 +460,7 @@ export default defineComponent({
               textAlign: 'right',
               paddingTop: '18px'
             }}>
-            武汉乐小雅网络科技有限公司
+            武汉酷乐秀网络科技有限公司
           </div>
           <br />
           <strong>发布日期：2023-02-28</strong>

src/views/student-register/index.tsx

@@ -208,7 +208,7 @@ export default defineComponent({
           {
             hideLoading: false,
             data: {
-              paymentType: 'adapay',
+              // paymentType: 'adapay',
               bizId: forms.schoolId, // 乐团编号
               orderType: 'SCHOOL_REGISTER',
               paymentCashAmount: calcPrice.value.amount || 0,

src/views/student-register/register-modal/index.module.less

@@ -47,7 +47,7 @@
   }
 
   .codeText {
-    color: #333;
+    color: #FFCF7C;
     font-size: 14px;
     font-weight: 600;
 
@@ -87,4 +87,4 @@
 
 .radioSection+.radioSection {
   margin-left: 12px;
-}
+}