Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master

# Conflicts:
#	src/components/subject/ListenTopic.vue

src/components/subject/ListenTopic.vue

@@ -36,10 +36,10 @@
           ></audio>
           <view
             class="item1"
-            :style="{ height: `calc(100vh - 540rpx - ${statusBarHeight}px)` }"
+            :style="{ height: `calc(100vh - 580rpx - ${statusBarHeight}px)` }"
           >
             <view class="flex flex_start_center">
-              <!-- <view
+              <view
                 class="audioBox flex flex_center_center"
                 @click="audioManage(item1.Src)"
               >
@@ -55,7 +55,7 @@
                   ref="listenCountdown"
                   format="mm:ss"
                 />
-              </view> -->
+              </view>
             </view>
             <view class="questionView">
               <view