Merge branch 'fine-music-score' into share-member

src/components/col-upload-video/index.tsx

@@ -8,7 +8,7 @@ import umiRequest from 'umi-request'
 import iconUploader from '@common/images/icon_uploader_video.png'
 import iconUploadPoster from '@common/images/icon_upload_poster.png'
 import { postMessage } from '@/helpers/native-message'
-import { state } from '@/state'
+import { getOssUploadUrl, state } from '@/state'
 
 export default defineComponent({
   name: 'ColUploadVideo',
@@ -100,8 +100,8 @@ export default defineComponent({
           method: 'POST',
           data: formData
         })
-        console.log(state.ossUploadUrl + this.bucket + '/' + key)
-        const uploadUrl = state.ossUploadUrl + this.bucket + '/' + key
+        console.log(getOssUploadUrl(this.bucket) + key)
+        const uploadUrl = getOssUploadUrl(this.bucket) + key
         Toast.clear()
         this.$emit('update:modelValue', uploadUrl)
         // this.onUploadChange(uploadUrl)

src/components/col-upload/index.tsx

@@ -7,7 +7,7 @@ import { postMessage } from '@/helpers/native-message'
 import umiRequest from 'umi-request'
 import iconUploader from '@common/images/icon_uploader.png'
 import request from '@/helpers/request'
-import { state } from '@/state'
+import { getOssUploadUrl, state } from '@/state'
 
 export default defineComponent({
   name: 'col-upload',
@@ -147,8 +147,8 @@ export default defineComponent({
           method: 'POST',
           data: formData
         })
-        console.log(state.ossUploadUrl + this.bucket + '/' + key)
-        const uploadUrl = state.ossUploadUrl + this.bucket + '/' + key
+        console.log(getOssUploadUrl(this.bucket) + key)
+        const uploadUrl = getOssUploadUrl(this.bucket) + key
         Toast.clear()
         this.$emit('update:modelValue', uploadUrl)
         this.onUploadChange(uploadUrl)

src/state.ts

@@ -17,6 +17,12 @@ export const state = reactive({
   openLiveStatus: false as boolean // 是否开通直播
 })
 
+// 预览上传到oss的地址
+export const getOssUploadUrl = (bucket: string) => {
+  const tmpBucket = bucket || 'daya'
+  return `https://${tmpBucket}.ks3-cn-beijing.ksyuncs.com/`
+}
+
 export const setLoginInit = () => {
   state.user.status = 'init'
   state.user.data = null

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

@@ -27,7 +27,7 @@ import styles from './index.module.less'
 import { useRect } from '@vant/use'
 import { Vue3Lottie } from 'vue3-lottie'
 import { getRandomKey } from '@/views/music/music'
-import { state } from '@/state'
+import { getOssUploadUrl, state } from '@/state'
 import { useEventTracking } from '@/helpers/hooks'
 import ColSticky from '@/components/col-sticky'
 import { browser, moneyFormat } from '@/helpers/utils'
@@ -185,13 +185,13 @@ export default defineComponent({
         const files = base64ToBlob(file)
 
         formData.append('file', files, fileName)
-        const ossUploadUrl = 'https://ks3-cn-beijing.ksyuncs.com/cloud-coach'
+        const ossUploadUrl = state.ossUploadUrl + 'cloud-coach'
         await umiRequest(ossUploadUrl, {
           method: 'POST',
           data: formData
         })
         Toast.clear()
-        const imgurl = ossUploadUrl + '/' + keyTime
+        const imgurl = getOssUploadUrl('cloud-coach') + keyTime
 
         await request.post(state.platformApi + '/open/music/sheet/img', {
           data: { musicSheetId: musicDetail.value.id, musicImg: imgurl }

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

@@ -27,7 +27,7 @@ import styles from './index.module.less'
 import { useRect } from '@vant/use'
 import { Vue3Lottie } from 'vue3-lottie'
 import { getRandomKey, musicBuy } from '../music'
-import { state } from '@/state'
+import { getOssUploadUrl, state } from '@/state'
 import { useEventTracking } from '@/helpers/hooks'
 import ColSticky from '@/components/col-sticky'
 import { browser, moneyFormat } from '@/helpers/utils'
@@ -183,13 +183,13 @@ export default defineComponent({
         const files = base64ToBlob(file)
 
         formData.append('file', files, fileName)
-        const ossUploadUrl = 'https://ks3-cn-beijing.ksyuncs.com/cloud-coach'
+        const ossUploadUrl = state.ossUploadUrl + 'cloud-coach'
         await umiRequest(ossUploadUrl, {
           method: 'POST',
           data: formData
         })
         Toast.clear()
-        const imgurl = ossUploadUrl + '/' + keyTime
+        const imgurl = getOssUploadUrl('cloud-coach') + keyTime
 
         await request.post(state.platformApi + '/open/music/sheet/img', {
           data: { musicSheetId: musicDetail.value.id, musicImg: imgurl }