Merge branch 'dai-master'

src/components/FileUpload/index.vue

@@ -111,6 +111,11 @@ export default {
       }
     };
   },
+  mounted() {
+    //计算是http还是https
+    let urlPre=window.location.protocol;
+    this.uploadFileUrl=urlPre+this.uploadFileUrl.substring(this.uploadFileUrl.indexOf(':')+1);
+  },
   computed: {
     // 是否显示提示
     showTip() {

src/components/Study/manager.vue

@@ -115,7 +115,7 @@
               <!-- <el-table-column prop="finishTime" label="结束时间"></el-table-column> -->
               <el-table-column prop="totalDuration" label="学习时长(分)">
                  <template slot-scope="scope">
-                  {{ scope.row.totalDuration == 0? '0': scope.row.totalDuration/60}}
+                  {{ scope.row.totalDuration == 0? '0': (scope.row.totalDuration/60).toFixed(2)}}
                 </template>
               </el-table-column>
               <el-table-column prop="progress" label="进度">