|
|
@@ -101,11 +101,7 @@ export default defineComponent({
|
|
|
</div>
|
|
|
}
|
|
|
{
|
|
|
-<<<<<<< HEAD
|
|
|
- state.modeType === 'practise' && state.playType === "sing" && state.mingSong && state.mingSongGirl &&
|
|
|
-=======
|
|
|
state.modeType === 'practise' && state.playSource === "mingSong" && state.mingSong && state.mingSongGirl &&
|
|
|
->>>>>>> feature-tianyong-newVersion
|
|
|
<div class={styles.cellBox}>
|
|
|
<div class={styles.tit}>唱名类型</div>
|
|
|
<div class={styles.radioBox}>
|
