Browse Source

Merge branch 'NPC-lhd' ui包

natasha 3 years ago
parent
commit
f465d8f79c
1 changed files with 15 additions and 3 deletions
  1. 15 3
      src/components/Adult/preview/Picture.vue

+ 15 - 3
src/components/Adult/preview/Picture.vue

@@ -63,11 +63,11 @@
                     <el-checkbox v-model="userAnswer.singlechecked"><span></span></el-checkbox>
                 </template>
                 <!-- 三件套 -->
-                <div class="luyinVoice-box" v-if="items.mp3_list.length>0||fn_list_obj&&fn_list_obj.indexOf('image_record')>-1">
+                <div class="luyinVoice-box" v-if="items.mp3_list.length>0||fn_list_obj&&fn_list_obj.indexOf('image_record')>-1||items.RecordControl">
                     <template v-if="items.mp3_list.length>0">
                         <span :class="['voice',mp3Play]" @click="playmicrophone(items.mp3_list[0].url,'mp3')"></span>
                     </template>
-                    <Soundrecord @handleWav="handleWav" :type="items.RecordControl?items.RecordControl:'normal'" class="luyin-box" v-if="fn_list_obj.indexOf('image_record')>-1||items.RecordControl"/>
+                    <Soundrecord @handleWav="handleWav" :type="items.RecordControl?items.RecordControl:'normal'" class="luyin-box" :class="[items.RecordControl]" v-if="fn_list_obj.indexOf('image_record')>-1||items.RecordControl"/>
                     <!-- <span :class="['luyin',microphoneStatus?'active':'']" @click="microphone"></span>
                     <span :class="['play',hasMicro]" @click="playmicrophone(wavblob)"></span> -->
                 </div>
@@ -327,9 +327,21 @@ export default {
                 .luyin-box{
                     flex: 1;
                     justify-content: start;
-                    padding-left: 12px;
+                    padding: 0 12px;
                     border: 1px solid rgba(0, 0, 0, 0.1);
                     border-radius: 8px;
+                    &.mini{
+                        width: 64px;
+                    }
+                    &.normal{
+                        width:129px;
+                    }
+                    &.pro{
+                        width:200px;
+                    }
+                    &.promax{
+                        width:280px;
+                    }
                 }
             }
             .fill-box{