Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/videoConverter.vue

src/views/videoConverter.vue

 <template>
-  <div class="videoConverter">
-    <ul>
-      <li
-        v-for="(item, index) in taskList"
-        :key="index"
-      >
-        <div class="info">
-          <div class="cove">
-            视频封面
-          </div>
-          <div>
-            <div>{{ item.name }}.mp4</div>
-            <div>时长:{{ item.duration }}</div>
-          </div>
-        </div>
-        <div class="operationPanel">
-          <div
-            class="wait"
-            v-show="item.state == 0"
-          >
-            <div>输出格式</div>
-            <div class="selectionFormat">
-              mp4
-            </div>
-            <div
-              class="delete"
-              @click="clearAllTasks(item)"
-            >
-              删除
-            </div>
-          </div>
-          <div
-            class="active"
-            v-show="item.state == 1"
-          >
-            <div class="progress">
-              <div>转换中{{ item.progress }}%</div>
-              <div class="slide">
-                <div />
-              </div>
-            </div>
+    <div class="videoConverter">
+        <ul>
+            <li
+v-for="(item, index) in taskList"
+:key="index">
+                <div class="info">
+                    <div class="cove">视频封面</div>
+                    <div>
+                        <div>{{ item.name }}.mp4</div>
+                        <div>时长:{{ item.duration }}</div>
+                    </div>
+                </div>
+                <div class="operationPanel">
+                    <div
+class="wait"
+v-show="item.state == 0">
+                        <div>输出格式</div>
+                        <div class="selectionFormat">mp4</div>
+                        <div
+class="delete"
+@click="clearTask(item)">删除</div>
+                    </div>
+                    <div
+class="active"
+v-show="item.state == 1">
+                        <div class="progress">
+                            <div>转换中{{ item.progress }}%</div>
+                            <div class="slide">
+                                <div></div>
+                            </div>
+                        </div>
+
+                        <div
+class="stop"
+@click="stopTask(item)">取消</div>
+                    </div>
+                </div>
+            </li>
+        </ul>
 
+        <div class="editBar">
             <div
-              class="stop"
-              @click="stopTask(item)"
-            >
-              取消
-            </div>
-          </div>
+class="addVideo"
+@click="addVideo">添加视频</div>
+            <div
+class="clearList"
+@click="clearAllTasks">清空列表</div>
+            <div class="clearWatermark">去除水印</div>
         </div>
-      </li>
-    </ul>
-
-    <div class="editBar">
-      <div
-        class="addVideo"
-        @click="addVideo"
-      >
-        添加视频
-      </div>
-      <div
-        class="clearList"
-        @click="clearAllTasks"
-      >
-        清空列表
-      </div>
-      <div class="clearWatermark">
-        去除水印
-      </div>
-    </div>
 
-    <div
-      class="startAll"
-      @click="startAllTasks"
-    >
-      开始转换
+        <div
+class="startAll"
+@click="startAllTasks">开始转换</div>
     </div>
-  </div>
 </template>
 
 <script>
@@ -106,7 +82,7 @@ export default {
             item.state = 0
         },
         clearTask(item) {
-            let index = this.taskList(item)
+            let index = this.taskList.indexOf(item)
             if (index > -1) {
                 this.taskList.splice(index, 1)
             }
@@ -154,7 +130,7 @@ export default {
         height: 100%;
         border: 1px solid black;
         flex-grow: 1;
-        overflow-y: scroll;
+        overflow-y: auto;
         > li {
             padding: 5px 0;
             height: 60px;