Browse Source

修改问题

lex 1 year ago
parent
commit
284ca6c68b

+ 5 - 3
src/teacher/share-page/share-album/index.tsx

@@ -46,9 +46,11 @@ export default defineComponent({
     const color = ref<string>('#fff')
     const heightInfo = ref<any>('auto')
 
-    const tmpUrl = `${location.origin}/student/#/music-album-detail/${
-      route.query.id
-    }?${qs.stringify(route.query)}`
+    const tmpUrl = `${location.origin}/${
+      route.query.p == 'tenant' ? 'tenant.html' : 'student/'
+    }#/music-album-detail/${route.query.id}?${qs.stringify(route.query)}`
+
+    console.log(tmpUrl, 'tmpUrl')
     const jumpUrl = ref<string>(tmpUrl)
 
     const FetchList = async (id?: any) => {

+ 3 - 3
src/teacher/share-page/share-music/index.tsx

@@ -94,9 +94,9 @@ export default defineComponent({
       radio: 'staff' // staff first fixed
     })
 
-    const tmpUrl = `${location.origin}/student/#/music-detail?${qs.stringify(
-      route.query
-    )}`
+    const tmpUrl = `${location.origin}/${
+      route.query.p == 'tenant' ? 'tenant' : 'student'
+    }/#/music-detail?${qs.stringify(route.query)}`
     const jumpUrl = ref<string>(tmpUrl)
 
     const colors: any = {

+ 1 - 1
src/tenant/music/album-detail/index.tsx

@@ -232,7 +232,7 @@ export default defineComponent({
           shareDiscount.value = res.data.discount || 0
         }
       }
-      shareUrl.value = `${location.origin}/teacher#/shareAblum?id=${id}&recomUserId=${userId}&activityId=${activityId}&userType=${state.platformType}`
+      shareUrl.value = `${location.origin}/teacher/#/shareAblum?id=${id}&recomUserId=${userId}&activityId=${activityId}&userType=${state.platformType}&p=tenant`
       // console.log(shareUrl.value, 'shareUrl')
       shareStatus.value = true
     }

+ 1 - 1
src/tenant/music/music-detail/index.tsx

@@ -496,7 +496,7 @@ export default defineComponent({
         })
         let url =
           location.origin +
-          `/teacher/#/shareMusic?id=${musicDetail.value?.id}&recomUserId=${state.user.data?.userId}&userType=${state.platformType}`
+          `/teacher/#/shareMusic?id=${musicDetail.value?.id}&recomUserId=${state.user.data?.userId}&userType=${state.platformType}&p=tenant`
         // 判断是否有活动
         if (res.data.discount === 1) {
           url += `&activityId=${res.data.activityId}`

+ 1 - 2
src/tenant/music/train-tool/index.tsx

@@ -91,7 +91,6 @@ export default defineComponent({
         }
         const { data } = await request.post(url)
         state.details = data || {}
-        console.log(state.details, 'details')
         state.buyList.forEach((item: any, index: number) => {
           item.salePrice = (index + 1) * data.salePrice
           item.costPrice = (index + 1) * data.costPrice
@@ -369,7 +368,7 @@ export default defineComponent({
             </List>
           </div>
         </div>
-        {!state.loading && baseState.platformType === 'STUDENT' && (
+        {baseState.platformType === 'STUDENT' && (
           <TheSticky position="bottom">
             <div class={styles.btnGroup}>
               <Button

+ 2 - 0
src/tenant/ranking-list/index.module.less

@@ -15,4 +15,6 @@
       background-size: 100% 214px;
     }
   }
+
+  // --van-nav-bar-height: 0px;
 }

+ 9 - 0
src/tenant/ranking-list/index.tsx

@@ -15,8 +15,17 @@ export default defineComponent({
               background="transparent"
               isFixed={false}
               border={false}
+              title=" "
               color="#131415"
             />
+
+            {/* <van-tabs v-model:active="active">
+              <van-tab title="标签 1">内容 1</van-tab>
+              <van-tab title="标签 2" disabled>
+                内容 2
+              </van-tab>
+              <van-tab title="标签 3">内容 3</van-tab>
+            </van-tabs> */}
           </TheSticky>
           <img class={styles.bgImg} src={bgImg} />
         </div>