合并

src/components/select-courseware-member/index.module.less

@@ -35,13 +35,13 @@
 
   .list {
     width: 258px;
-    margin-top: 110px;
+    margin-top: 120px;
     margin-left: 17px;
     position: relative;
     font-size: 14px;
     color: #333333;
     line-height: 22px;
-    padding-bottom: 20px;
+    padding-bottom: 25px;
 
     span {
       color: #FF5A56;
@@ -65,4 +65,4 @@
       margin-bottom: 9px;
     }
   }
-}
+}

src/components/select-courseware-member/index.tsx

@@ -33,8 +33,10 @@ export default defineComponent({
             }}
           />
           <div class={styles.list} id="list">
-            该功能为乐器AI专属权益，领取即可<span>查看所有课件</span>
-            ，是否立即领取
+            {/* 该功能为乐器AI专属权益，领取即可<span>查看所有课件</span>
+            ，是否立即领取 */}
+            <span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
+            服务，解锁更多专属权益，享受全新学习体验！
           </div>
           <div class={styles.btnGroup}>
             <img
@@ -54,7 +56,6 @@ export default defineComponent({
                 });
               }}
             />
-            <div onClick={close}>暂不领取</div>
           </div>
         </div>
       </div>

src/components/the-vip/index.module.less

@@ -25,7 +25,7 @@
 
 .content {
   position: relative;
-  padding: 33px 13px 20px 13px;
+  padding: 62px 13px 25px 13px;
   font-size: 15px;
   font-weight: 400;
   color: #333333;
@@ -48,4 +48,4 @@
     width: 100%;
     margin-bottom: 9px;
   }
-}
+}

src/components/the-vip/index.tsx

@@ -18,8 +18,8 @@ export default defineComponent({
         />
         <img class={styles.title} src={icon_title} />
         <div class={styles.content}>
-          您还未领取<span style={{ color: '#FF5A56' }}>“乐器AI学练工具”</span>
-          哦，如需继续使用，请领取～
+          <span style={{ color: '#FF5A56' }}>"乐器AI学练工具"</span>
+          服务，解锁更多专属权益，享受全新学习体验！
         </div>
         <div class={styles.btns}>
           <img
@@ -27,7 +27,6 @@ export default defineComponent({
             src={icon_btn}
             onClick={() => emit('close', true)}
           />
-          <div onClick={() => emit('close')}>暂不领取</div>
         </div>
       </div>
     );

src/router/routes-common.ts

@@ -155,7 +155,7 @@ export default [
         name: 'collection-record',
         component: () => import('@/views/collection-record/index'),
         meta: {
-          title: '领取记录'
+          title: '我的订单'
         }
       },
       {
@@ -163,7 +163,7 @@ export default [
         name: 'collection-record-detail',
         component: () => import('@/views/collection-record-detail/index'),
         meta: {
-          title: '领取详情'
+          title: '开通详情'
         }
       },
       {

src/views/co-ai/index.module.less

@@ -54,9 +54,10 @@
       // align-items: center;
       // padding: 0;
       // width: 100%;
-      // height: 36px;
+      height: 36px;
       // color: #999;
       // font-size: 13px;
+      padding: 0 12px;
     }
 
     .van-popover__content {
@@ -64,6 +65,17 @@
       overflow-x: hidden;
       overflow-y: auto;
     }
+
+    // var(--van-padding-md)
+    .van-popover__action-text {
+      display: block;
+      width: 136px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      text-align: center;
+      line-height: 36px;
+    }
   }
 }
 

src/views/co-ai/index.tsx

@@ -155,7 +155,7 @@ export default defineComponent({
     const goback = () => {
       postMessage({ api: 'back' });
     };
-    /** 去云教练 */
+    /** 去云练习 */
     const handleGoto = () => {
       if (!data.vipMember) {
         data.showVip = true;
@@ -717,7 +717,7 @@ export default defineComponent({
                         </div>
                       )} */}
                       {
-                        data.musics[data.musicIndex]?.id && 
+                        data.musics[data.musicIndex]?.id &&
                         <iframe
                           id="staffIframeRef"
                           style={{
@@ -812,10 +812,10 @@ export default defineComponent({
                 <img id="coai-2" src={icon_down} onClick={handleSave} />
               )}
               {
-                data.musics[data.musicIndex]?.id && 
+                data.musics[data.musicIndex]?.id &&
                 <div class={styles.rightBtnsRight} id="coai-3">
                   <img src={icons.icon_start} onClick={() => handleGoto()} />
-                </div>                
+                </div>
               }
             </div>
           </div>

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

@@ -36,8 +36,8 @@ export default defineComponent({
     // 判断是否是退款详情
     const isRefund = route.query.userRefundOrderId ? true : false;
     const state = reactive({
-      refundAudit: '' as any, // 退回审核状态
-      refundOrderId: '', // 退回订单id
+      refundAudit: '' as any, // 退款审核状态
+      refundOrderId: '', // 退款订单id
       orders: {} as any,
       goodsInfos: [] as any,
       background: 'transparent',
@@ -113,17 +113,17 @@ export default defineComponent({
 
     const formatOrderStatus = (status: string) => {
       const temp: any = {
-        WAIT_PAY: '领取中',
-        PAYING: '领取中',
-        PAID: '领取成功',
+        WAIT_PAY: '支付中',
+        PAYING: '支付中',
+        PAID: '支付成功',
         TIMEOUT: '订单超时',
-        FAIL: '领取失败',
+        FAIL: '支付失败',
         CLOSED: '已关闭',
-        ING: '退回申请中',
-        PASS: '已退回',
-        REJECT: '退回失败',
+        ING: '退款申请中',
+        PASS: '已退款',
+        REJECT: '退款失败',
         REFUNDING: '退款中',
-        REFUNDED: '已退回'
+        REFUNDED: '已退款'
       };
       return temp[status];
     };
@@ -153,14 +153,14 @@ export default defineComponent({
     /** 取消退款申请 */
     const handleBack = async () => {
       await api_userPaymentOrderCancelRefund(state.refundOrderId);
-      showToast('撤销退回成功');
+      showToast('撤销退款成功');
       await getDetails();
     };
     return () => (
       <div class={styles.paymentResult}>
         <div class={[styles.paymentTitle]}>
           <MHeader
-            title={isRefund ? '申请退回' : '领取详情'}
+            title={isRefund ? '申请退款' : '订单详情'}
             background="transparent"
           />
 
@@ -183,7 +183,7 @@ export default defineComponent({
                     state.orders.status
                   ) && (
                     <div class={styles.orderPrice}>
-                      退回金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
+                      退款金额：￥ {moneyFormat(state.orders.paymentCashAmount)}
                     </div>
                   )}
                   {['CLOSED'].includes(state.orders.status) && (
@@ -251,7 +251,7 @@ export default defineComponent({
             round
             type="primary"
             onClick={() => handleBack()}>
-            撤销退回
+            撤销退款
           </Button>
         )}
       </div>

src/views/collection-record/api.ts

@@ -1,7 +1,7 @@
 import request from '@/helpers/request';
 
 export const type_OrderTypes: { [_: string]: string } = {
-  VIP: '数字化器乐学练工具',
+  VIP: '数字化乐器AI学练工具',
   SCHOOL_REGISTER: '学生报名'
 };
 export const type_OrderStatus: { [_: string]: string } = {
@@ -16,13 +16,13 @@ export const type_OrderStatus: { [_: string]: string } = {
 export interface IApiUserPaymentOrderPage {
   /** 订单状态,可用值:WAIT_PAY,PAYING,PAID,TIMEOUT,FAIL,CLOSED,REFUNDED */
   orderStatus:
-    | 'WAIT_PAY'
-    | 'PAYING'
-    | 'PAID'
-    | 'TIMEOUT'
-    | 'FAIL'
-    | 'CLOSED'
-    | 'REFUNDED';
+  | 'WAIT_PAY'
+  | 'PAYING'
+  | 'PAID'
+  | 'TIMEOUT'
+  | 'FAIL'
+  | 'CLOSED'
+  | 'REFUNDED';
   /** 分页行数 */
   rows: number;
   /** 当前页 */
@@ -30,7 +30,7 @@ export interface IApiUserPaymentOrderPage {
   /** 订单年份, 类似: 2023-06 */
   payMonth: string;
 }
-/** 获取领取列表 */
+/** 获取开通列表 */
 export const api_userPaymentOrderPage = (
   params: IApiUserPaymentOrderPage
 ): Promise<any> => {
@@ -38,7 +38,7 @@ export const api_userPaymentOrderPage = (
     data: params
   });
 };
-/** 获取退回列表 */
+/** 获取退款列表 */
 export const api_userPaymentOrderStudentRefundOrderPage = (
   params: any
 ): Promise<any> => {
@@ -51,7 +51,7 @@ export const api_userPaymentOrderStudentRefundOrderPage = (
 export const api_userPaymentOrderDetail = (params: any): Promise<any> => {
   return request.get(`/edu-app/userPaymentOrder/detail/${params}`);
 };
-/** 获取退回订单详情 */
+/** 获取退款订单详情 */
 export const api_userPaymentOrderRefundDetail = (params: any): Promise<any> => {
   return request.get(`/edu-app/userPaymentOrder/refundDetail/${params}`);
 };

src/views/collection-record/component/item.tsx

@@ -91,7 +91,7 @@ export default defineComponent({
               }))
           : []
       });
-      showToast('申请退回成功');
+      showToast('申请退款成功');
       data.open = false;
       emit('close');
       emit('refund');
@@ -185,14 +185,14 @@ export default defineComponent({
                   size="small"
                   loading={data.cancelOrderLoading}
                   onClick={() => handleCancelOrder()}>
-                  取消领取
+                  取消支付
                 </Button>
                 <Button
                   round
                   size="small"
                   loading={data.confirmLoading}
                   onClick={() => onConfirmOrder()}>
-                  继续领取
+                  立即支付
                 </Button>
               </div>
             )}
@@ -203,7 +203,7 @@ export default defineComponent({
                 data.open = true;
                 getDetails(props.item);
               }}>
-              申请退回
+              申请退款
             </div>
           )}
         </CellGroup>
@@ -216,14 +216,14 @@ export default defineComponent({
           <div class={styles.cancelBox}>
             <div class={styles.boxContent}>
               <div class={styles.title}>
-                <div class={styles.titleTag}></div> 申请退回
+                <div class={styles.titleTag}></div> 申请退款
               </div>
               <div class={styles.des}>
-                您将要发起退回，退回需承担千分之六的手续费，确认退回后款项将原路返还到您的付款账户中。
+                您将要发起退款，退款需承担千分之六的手续费，确认退款后款项将原路返还到您的付款账户中。
               </div>
               <div class={styles.radioTitle}>
                 <span style={{ color: 'rgba(244, 69, 65, 1)' }}>*</span>
-                请选择您的退回原因
+                请选择您的退款原因
               </div>
               <RadioGroup v-model={forms.refundReason}>
                 <Cell>
@@ -275,7 +275,7 @@ export default defineComponent({
                   label=""
                   type="textarea"
                   maxlength="50"
-                  placeholder="在这里填写退回原因"
+                  placeholder="在这里填写退款原因"
                 />
               </div>
             </div>
@@ -284,19 +284,19 @@ export default defineComponent({
                 block
                 onClick={() => {
                   if (!forms.refundReason) {
-                    showToast('请选择退回原因');
+                    showToast('请选择退款原因');
                     return;
                   }
                   if (
                     forms.refundReason === '其他原因' &&
                     !forms.refundReasonDes
                   ) {
-                    showToast('请输入退回原因');
+                    showToast('请输入退款原因');
                     return;
                   }
                   handleCancel();
                 }}>
-                确认退回
+                确认退款
               </Button>
               <Button
                 block

src/views/collection-record/component/list.tsx

@@ -55,11 +55,11 @@ export default defineComponent({
       dataOpen: false
     });
     const statusTypes: { [_: string]: string } = {
-      WAIT_PAY: '待领取',
-      PAYING: '待领取',
-      PAID: '领取成功',
+      WAIT_PAY: '待支付',
+      PAYING: '待支付',
+      PAID: '支付成功',
       CLOSED: '已关闭',
-      REFUNDED: '退回成功'
+      REFUNDED: '退款成功'
     };
     const statusColors: { [_: string]: string } = {
       WAIT_PAY: 'rgba(64, 196, 203, 1)',
@@ -72,10 +72,10 @@ export default defineComponent({
       REFUNDED: 'rgba(255, 162, 68, 1)'
     };
     const refundTypes: { [_: string]: string } = {
-      ING: '退回申请中',
-      REJECT: '退回失败',
-      PASS: '退回成功',
-      CLOSED: '退回关闭'
+      ING: '退款申请中',
+      REJECT: '退款失败',
+      PASS: '退款成功',
+      CLOSED: '退款关闭'
     };
     const getList = async () => {
       data.loading = true;
@@ -185,7 +185,7 @@ export default defineComponent({
                 fill="currentColor"
                 fill-rule="evenodd">
                 <g
-                  id="领取记录-待领取"
+                  id="开通记录-待开通"
                   transform="translate(-99.000000, -155.000000)"
                   fill="currentColor">
                   <g id="编组-2" transform="translate(13.000000, 144.000000)">

src/views/collection-record/image/icon_arrow.svg

@@ -2,7 +2,7 @@
 <svg width="9px" height="5px" viewBox="0 0 9 5" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>三角形</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="领取记录-待领取" transform="translate(-99.000000, -155.000000)" fill="#AAAAAA">
+        <g id="开通记录-待开通" transform="translate(-99.000000, -155.000000)" fill="#AAAAAA">
             <g id="编组-2" transform="translate(13.000000, 144.000000)">
                 <g id="筛选目录备份" transform="translate(12.000000, 3.000000)">
                     <path d="M78.8716471,8.41294119 L82.2489659,12.1655176 C82.4336954,12.3707726 82.4170562,12.6869176 82.2118012,12.8716471 C82.1199888,12.9542782 82.0008397,13 81.8773188,13 L75.1226812,13 C74.8465388,13 74.6226812,12.7761424 74.6226812,12.5 C74.6226812,12.3764791 74.668403,12.25733 74.7510341,12.1655176 L78.1283529,8.41294119 C78.3130824,8.20768618 78.6292274,8.19104698 78.8344824,8.37577649 C78.8475136,8.38750459 78.859919,8.39990996 78.8716471,8.41294119 Z" id="三角形" transform="translate(78.500000, 10.500000) rotate(-180.000000) translate(-78.500000, -10.500000) "></path>
@@ -10,4 +10,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

src/views/collection-record/image/icon_order.svg

@@ -8,7 +8,7 @@
         </linearGradient>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="领取记录-已领取" transform="translate(-28.000000, -237.000000)">
+        <g id="开通记录-已开通" transform="translate(-28.000000, -237.000000)">
             <g id="编组备份" transform="translate(13.000000, 182.000000)">
                 <g id="乐团报名缴费" transform="translate(15.000000, 55.000000)">
                     <rect id="矩形" fill="url(#linearGradient-1)" x="0" y="0" width="36" height="36" rx="6"></rect>
@@ -17,4 +17,4 @@
             </g>
         </g>
     </g>
-</svg>
+</svg>

src/views/collection-record/index.tsx

@@ -16,14 +16,17 @@ export default defineComponent({
         <MHeader />
         <div class={styles.content}>
           <Tabs v-model:active={data.tab} animated swipeable>
-            <Tab name="1" title="待领取">
+            <Tab name="1" title="待付款">
               <div class={styles.wrap}>
                 <List orderStatus="WAIT_PAY,PAYING" />
               </div>
             </Tab>
-            <Tab name="2" title="已领取">
+            <Tab name="2" title="已完成">
               <div class={styles.wrap}>
-                <List orderStatus="PAID,REFUNDED" onRefund={() => data.refundIndex = data.refundIndex + 1} />
+                <List
+                  orderStatus="PAID,REFUNDED"
+                  onRefund={() => (data.refundIndex = data.refundIndex + 1)}
+                />
               </div>
             </Tab>
             <Tab name="3" title="已关闭">
@@ -31,7 +34,7 @@ export default defineComponent({
                 <List orderStatus="CLOSED" />
               </div>
             </Tab>
-            <Tab name="4" title="退回">
+            <Tab name="4" title="退款">
               <div class={styles.wrap}>
                 <List refundIndex={data.refundIndex} orderStatus="REFUNDED" />
               </div>

src/views/courseware-play/component/musicScore.tsx

@@ -101,7 +101,7 @@ export default defineComponent({
       }
     });
 
-    // 去云教练完整版
+    // 去云练习完整版
     const gotoAccomany = () => {
       if (!state.user.data?.vipMember) {
         // showVip.value = true;

src/views/member-center/index.tsx

@@ -271,7 +271,7 @@ export default defineComponent({
                         </span>
                       </div>
                     ) : (
-                      <div>您还未领取器乐学练工具哟</div>
+                      <div>您还未开通乐器AI学练工具哟</div>
                     )}
                   </>
                 </div>
@@ -307,7 +307,7 @@ export default defineComponent({
                   title: () => (
                     <div class={styles.gift}>
                       <img src={iconGift} class={styles.iconGift} />
-                      现在领取赠送{' '}
+                      现在开通赠送{' '}
                       <span>{this.users.membershipGiftDays || 0}</span>
                       天有效期
                     </div>
@@ -351,7 +351,7 @@ export default defineComponent({
           </div>
           {this.userInfo.id ? (
             <Button round class={styles.btn} onClick={this.onSubmit}>
-              立即领取
+              立即开通
             </Button>
           ) : (
             ''

src/views/preview-protocol/privacy.tsx

@@ -157,7 +157,7 @@ export default defineComponent({
             <br />
             我们的基础功能使用权益：查看课表、查看课后作业要求、阶段自测、请假、通讯、相册、乐团资讯（不含收费功能-团练宝的使用权限）。
             <br />
-            收费功能（包含但不限于团练宝）其使用权益：五线谱跟播、演奏指法跟播、电子节拍器/校音、曲目选段练习、原音/伴奏一键切换、演奏速度调整、训练声部/合奏电子曲谱、云教程回放、作业中的知识点与相关内容的观看和使用、单元测与测评报告、智能练习测评与报告、即时练习数据统计、练习成长数据报告、练习PK排行榜、测评音视频云储存功能等。
+            收费功能（包含但不限于团练宝）其使用权益：五线谱跟播、演奏指法跟播、电子节拍器/校音、曲目选段练习、原音/伴奏一键切换、演奏速度调整、训练声部/合奏电子曲谱、云课堂回放、作业中的知识点与相关内容的观看和使用、单元测与测评报告、智能练习测评与报告、即时练习数据统计、练习成长数据报告、练习PK排行榜、测评音视频云储存功能等。
             <br />
             我们的产品与/或功能为您提供内容展示、浏览、播放、储存、信息查阅、通讯等功能，在此过程中，我们会根据您使用我们产品与/或功能的具体操作收集您的一些信息，包括如下个人信息：
             <br />
@@ -284,7 +284,7 @@ export default defineComponent({
           <br />
           （七）训练与练习
           <br />
-          乐团训练与练习会使用到相关课件或云教程或团练宝（包含但不限于视频、曲目播放及练习等功能）时，我们将会申请访问您的设备信息的权限（麦克风、摄像头等）并根据您的授权获取相关信息。
+          乐团训练与练习会使用到相关课件或云课堂或团练宝（包含但不限于视频、曲目播放及练习等功能）时，我们将会申请访问您的设备信息的权限（麦克风、摄像头等）并根据您的授权获取相关信息。
           <br />
           （八）消息通知
           <br />