Merge branch 'master' of http://git.cc-lotus.info/count/webnew-count

package.json

@@ -18,7 +18,7 @@
     "naf-core": "^0.1.2",
     "vue": "^2.6.11",
     "vue-meta": "^2.3.4",
-    "vue-router": "^3.3.1",
+    "vue-router": "^3.3.2",
     "vuex": "^3.1.3",
     "wangeditor": "^3.1.1"
   },

src/views/pcenter/parts/infoAdmin.vue

@@ -76,7 +76,7 @@
                 <upload v-else :limit="1" :data="form.img_url" type="img_url" :url="'/files/imgpath/upload'" @upload="uploadSuccess"></upload>
               </el-form-item>
               <el-form-item label="视频" prop="file_url" v-if="form.type == '0' && form.col_name == '科技培训'">
-                <video v-if="disabled" :src="file_url" controls="controls" style="height: 395px; width: 100%;">
+                <video v-if="disabled" :src="form.file_url" controls="controls" style="height: 395px; width: 100%;">
                   您的浏览器不支持 video 标签。
                 </video>
                 <upload