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

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -199,7 +199,7 @@
         <div class="recharge_css">
           <div class="title_css">上传截图 :</div>
           <div class="upLoad">
-            <el-upload class="avatar-uploader" action="https://apitest.changyuntong56.com/appendix/api/upload" :show-file-list="false"
+            <el-upload class="avatar-uploader" action="https://api.changyuntong56.com/appendix/api/upload" :show-file-list="false"
               :on-success="handleAvatarSuccess">
               <img v-if="imageUrl" :src="imageUrl" class="avatar" />
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>

src/views/operationLog/logManagement.vue

@@ -135,14 +135,18 @@
       };
     },
     mounted() {
-      let date = new Date();
-      let date1 = new Date().setTime(date.getTime() - 24 * 60 * 60 * 1000); //一天前的时间蹉
+      let now = new Date();
+      let date1 = new Date().setTime(now.getTime() - 24 * 60 * 60 * 1000); //一天前的时间蹉
+      let date = new Date().setTime(now.getTime());
       date1 = new Date(parseInt(date1))
         .toLocaleString()
         .split(' ')[0]
         .replaceAll('/', '-');
       console.log(date1);
-
+      date = new Date(parseInt(date))
+        .toLocaleString()
+        .split(' ')[0]
+        .replaceAll('/', '-');
       this.startDate =
         date1.split('-')[0] +
         '-' +
@@ -154,13 +158,16 @@
           '0' + date1.split('-')[2] :
           date1.split('-')[2]);
       this.endDate =
-        date.getFullYear() +
+        date.split('-')[0] +
         '-' +
-        (date.getMonth() + 1 < 10 ?
-          '0' + (date.getMonth() + 1) :
-          date.getMonth()) +
+        (date.split('-')[1] < 10 ?
+          '0' + date.split('-')[1] :
+          date.split('-')[1]) +
         '-' +
-        (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()); //當前時間
+        (date.split('-')[2] < 10 ?
+          '0' + date.split('-')[2] :
+          date.split('-')[2]);
+        debugger
       this.value1 = [this.startDate, this.endDate];
       this.getList();
     },