Merge branch 'master' of http://47.100.3.209:3000/gongdecai/wangluohuoyun-htqd

# Conflicts:
#	src/router/driverManagement/index.js
#	src/views/enterpriseManagement/enterpriseAudit.vue

src/router/driverManagement/index.js

@@ -38,6 +38,7 @@ const driverManagementRouter = {
             icon: ''
         }
     },
+
     ]
 }
 

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -144,7 +144,14 @@
         </div>
         <div class="right_title">视频验证</div>
         <div class="right_item">
-           <video ref="video" id="video"  :src="infoData.videoAddressUrl" autoplay="false" controls="true" class="right_img"></video>
+          <!-- <img src="../../../public/img/yonghu.jpg" class="right_img"> -->
+          <!-- <video :src="infoData.videoAddressUrl" class="right_img">
+             <source src="movie.mp4" type="video/mp4">
+             <source src="movie.ogg" type="video/ogg">
+          </video> -->
+          <video ref="video" id="video" :src="infoData.videoAddressUrl" autoplay="false" controls="true"
+            class="right_img">
+          </video>
         </div>
         <div class="right_item">{{infoData.advanceFreightService == 1 ? "申请开通平台垫付运费业务" : "未申请开通平台垫付运费业务"}}</div>
         <div class="right_btn">
@@ -174,19 +181,19 @@
         billList:[],
         tableData: [],
         //分页
-        searchkeyWord: "",
+        searchkeyWord: '',
         currentPage: 1,
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        search: "1",
+        search: '1',
         addressUrl: [],
         disabled: false,
         rejectInfo: false,
         checkList: [],
         form: {
           checkList: [],
-          textarea: "",
+          textarea: '',
         },
         rightSee: false,
         infoData: {},
@@ -240,15 +247,15 @@
       submit(num) {
         var _allowObj = {}
         _allowObj.id = this.infoData.id
-        let allowTitle = ""
+        let allowTitle = ''
         if (num == 1) {
           _allowObj.flag = 1
-          allowTitle = "通过"
+          allowTitle = '通过'
         } else if (num == 2) {
           _allowObj.flag = 2
-          allowTitle = "驳回"
+          allowTitle = '驳回'
         }
-        this.$confirm("确定" + allowTitle + "企业审核？", '提示', {
+        this.$confirm('确定' + allowTitle + '企业审核？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning',
@@ -295,7 +302,7 @@
             this.formData.addressUrl = response;
           })
           .catch((res) => {
-            EventBus.$emit("error", (JSON.parse(res) || {}).message);
+            EventBus.$emit('error', (JSON.parse(res) || {}).message);
             this.$refs.upload.clearFiles();
           });
       },