Merge branch 'iteration-20240410-music' into jenkins

src/student/main.ts

@@ -29,6 +29,7 @@ const getClassroomDefaultInfo = async () => {
       // state.orchestraInfo.avatar = content.avatar
       // state.orchestraInfo.unionId = content.unionId || 0
       console.log(content, 'orchestra')
+
       const { data } = await request.post('/api-auth/smsLogin', {
         requestType: 'form',
         data: {
@@ -91,9 +92,15 @@ const initProject = async () => {
   const parseSearch: any = qs.parse(location.search)
   const hashSearch = qs.parse(location.hash.split('?')[1])
   const source: string = parseSearch.source || hashSearch.source || ''
+  const Authorization: string =
+    parseSearch.Authorization || hashSearch.Authorization || ''
   if (source === 'kt') {
     // 获取课堂乐器token
-    await getClassroomDefaultInfo()
+    if (Authorization) {
+      state.sourcType = 'kt'
+    } else {
+      await getClassroomDefaultInfo()
+    }
   }
 
   if (browser().isTeacher) {

src/views/cart/components/shop-address/address-operation.tsx

@@ -15,6 +15,7 @@ import { verifiyNumberInteger } from '@/helpers/toolsValidate'
 import { useRoute, useRouter } from 'vue-router'
 import request from '@/helpers/request'
 import ColSticky from '@/components/col-sticky'
+import ColHeader from '@/components/col-header'
 
 export default defineComponent({
   name: 'address-operation',
@@ -130,6 +131,7 @@ export default defineComponent({
     })
     return () => (
       <div class={styles.operation}>
+        <ColHeader />
         <CellGroup inset class={styles.form}>
           <Field
             label="收货人"

src/views/cart/components/shop-address/index.tsx

@@ -17,6 +17,7 @@ import { useRouter } from 'vue-router'
 import request from '@/helpers/request'
 import ColSticky from '@/components/col-sticky'
 import ColResult from '@/components/col-result'
+import ColHeader from '@/components/col-header'
 
 export default defineComponent({
   name: 'shop-address',
@@ -121,6 +122,7 @@ export default defineComponent({
     })
     return () => (
       <div class={[styles.shopAddress]}>
+        <ColHeader />
         {form.listState.dataShow ? (
           <List
             // v-model:loading={form.listState.loading}

src/views/shop-mall/index.tsx

@@ -113,9 +113,9 @@ export default defineComponent({
 
         if (state.sourcType === 'kt') {
           if (url.indexOf('?') !== -1) {
-            url += `&Authorization=${getAuth()}`
+            url += `&Authorization=${getAuth()}&source=kt`
           } else {
-            url += `?Authorization=${getAuth()}`
+            url += `?Authorization=${getAuth()}&source=kt`
           }
         }
         postMessage({