Merge branch 'develop/3.1.4' into test

src/components/my-audio/my-audio.vue

@@ -4,7 +4,7 @@
     <image class="pic" :src="pic" />
     <view class="info">
       <view class="song">{{ name }}</view>
-      <view class="singer">暂无歌手名</view>
+      <view class="singer">{{ singer }}</view>
     </view>
     <image v-if="newStatus === 1" class="btn" src="../../static/stop.png" @click="getPlay" />
     <image v-else class="btn" src="../../static/play.png" @click="getPlay" />
@@ -17,7 +17,11 @@ export default {
     bg: String,
     pic: String,
     name: String,
-    status: Number
+    status: Number,
+    singer: {
+      type: String,
+      default: '暂无歌手名'
+    }
   },
   data() {
     return {

src/pages/content/index.vue

@@ -10,7 +10,7 @@
           <img v-if="item.layoutType === 0" mode="aspectFit" :src="item.contentPic" />
           <!-- 音频 -->
           <my-audio v-if="item.layoutType === 1" :ref="`video${item.sort}`" :bg="form.audioBackgroundImage"
-            :pic="item.contentPic" :name="item.contentName" :status="item.playStatus" @click="getPlay($event, item)" />
+            :pic="item.contentPic" :name="item.contentName" :singer="item.contentInfo.singerName" :status="item.playStatus" @click="getPlay($event, item)" />
           <!-- 歌单 、专辑 -->
           <my-list v-if="item.layoutType === 2" :pic="item.contentPic" :name="item.contentName" :data="item.contentInfo"
             :type="item.contentType" @click="getOpen(item)" />