Merge branch 'colexiu1.3'

src/tenant/music/train-tool/index.tsx

@@ -262,7 +262,8 @@ export default defineComponent({
 
     return () => (
       <div class={styles.trainTool}>
-        {state.tenantAlbumStatus === 0 || !state.ablumStatus ? (
+        {(state.tenantAlbumStatus === 0 || !state.ablumStatus) &&
+        state.buy != '1' ? (
           <>
             <TheSticky position="top">
               <ColHeader border={false} isFixed={false} />

src/views/article-center/help-center.tsx

@@ -29,7 +29,11 @@ export default defineComponent({
         title: '',
         status: 1,
         // STUDENT:学生 TEACHER：老师 ANALYSIS:智能陪练
-        catalogType: query.platformType || state.platformType,
+        catalogType:
+          query.platformType ||
+          (state.projectType === 'tenant' && state.platformType === 'STUDENT')
+            ? 'TENANT_STUDENT'
+            : state.platformType,
         page: 1,
         rows: 20
       }
@@ -99,7 +103,7 @@ export default defineComponent({
           <List
             v-model:loading={this.loading}
             finished={this.finished}
-            finishedText="没有更多了"
+            finishedText=" "
             onLoad={this.getList}
           >
             {this.list.map((item: any) => (

src/views/music/music-detail/index.tsx

@@ -857,7 +857,7 @@ export default defineComponent({
             >
               <div>
                 <img src={iconAlbum} />
-                <span>进入曲目所在专辑列表</span>
+                <span>进入曲目所在平台专辑列表</span>
               </div>
               <Icon name="arrow" size={16} color="#666" />
             </div>

src/views/tenantStudentRejest/index.module.less

@@ -332,7 +332,7 @@
       height: 40px;
       background: #fe2451;
       border-radius: 20px;
-      border: 1px solid #dbdbdb;
+      // border: 1px solid #dbdbdb;
       line-height: 40px;
       font-size: 14px;
       font-weight: 400;

src/views/tenantStudentRejest/index.tsx

@@ -314,7 +314,7 @@ export default defineComponent({
                     <Field
                       class={styles.inputCode}
                       inputAlign="left"
-                      label="请输入验证码"
+                      label="验证码"
                       labelWidth={0}
                       v-model={forms.code}
                       maxlength={6}
@@ -446,10 +446,10 @@ export default defineComponent({
             <div class={styles.secondWrap}>
               <h2>提示</h2>
               <p>
-                当前账号已存在 <span>【{data.userSchoolName}】</span> ，是否
-              </p>
-              <p>
-                确认更换到<span>{data.schoolName}</span>吗?
+                当前账号已存在 <span>【{data.userSchoolName}】</span>{' '}
+                ，是否确认更换到
+                <span>{data.schoolName}</span>
+                吗?
               </p>
               <div class={styles.buttonWrap}>
                 <div

src/views/trade/trade-detail.tsx

@@ -98,7 +98,7 @@ export default defineComponent({
         const urlFix =
           state.platformType === 'TEACHER' ? '/api-teacher' : '/api-student'
         const res = await request.get(
-          `${urlFix}/userOrder/detailByOrderNo/${this.orderNo}`,
+          `${urlFix}/open/userOrder/detailByOrderNo/${this.orderNo}`,
           {
             hideLoading: status
           }