Merge branch 'beta' into 'master'

Beta

See merge request !13

src/views/dialogue-detail/components/digital/digital-audio-card.vue

@@ -26,18 +26,18 @@ const timebreId = computed(() => digitalHumanDialogueStore.humanInfo.timebreId)
 
 <template>
   <div
-    class="relative mb-4 flex items-center gap-2 rounded-2xl border p-2 hover:shadow"
+    class="relative mb-4 flex items-center gap-2 rounded-2xl border hover:shadow"
     :class="!showToggle && dialogueTimbreItem?.timebreId === timebreId ? 'border-blue' : 'border-gray-200'"
     @click="emit('click', dialogueTimbreItem!.timebreId)"
   >
     <div
-      class="h-16 w-16 rounded-lg bg-[length:100%_100%]"
+      class="m-2 mr-0 h-16 w-16 rounded-lg bg-[length:100%_100%]"
       :style="{
         backgroundImage: `url(${dialogueTimbreItem?.iconUrl || 'https://digital-human-js-cdn.cdn.bcebos.com/web_base/20240926112018/digital-human-web-new-base/img/boy.png'})`,
       }"
     />
-    <div class="flex-1 overflow-hidden">
-      <div class="mb-3 flex items-center gap-2">
+    <div class="mt-2 flex-1 overflow-hidden pr-2">
+      <div class="mb-[11px] flex items-center gap-2">
         <div class="max-w-32 truncate">{{ dialogueTimbreItem?.name }}</div>
         <CustomIcon
           class="cursor-pointer text-lg"
@@ -45,7 +45,7 @@ const timebreId = computed(() => digitalHumanDialogueStore.humanInfo.timebreId)
           @click.stop.prevent="emit('play', dialogueTimbreItem!.audioUrl)"
         />
       </div>
-      <NScrollbar x-scrollable>
+      <NScrollbar x-scrollable class="pb-2">
         <div class="flex gap-2">
           <NTag v-for="(style, index) in dialogueTimbreItem?.style" :key="index" type="warning" round>
             {{ style }}

src/views/dialogue-detail/components/digital/digital-audio.vue

@@ -60,7 +60,7 @@ watch(
 )
 
 onMounted(() => {
-  currentSelectedAudioType.value = digitalHumanDialogueStore.humanInfo.timebreId ? 'mandarin' : 'cantonese'
+  currentSelectedAudioType.value = digitalHumanDialogueStore.humanInfo.timebreId === '101019' ? 'cantonese' : 'mandarin'
   getDigitalTimbreList()
 })