Merge branch 'master' of qk:zhuishuyun/precise_delivery_distribution_front

src/views/account/kuaishou.vue

@@ -13,7 +13,7 @@
       :loading="loading"
       :pagination="tablePageOptions"
       :columns="columns"
-      :scroll="{ y: 600 }"
+      :scroll="{ y: 600}"
       bordered
       :data-source="list"
       @change="onLoadOfficials"

src/views/data/performance-detail.vue

@@ -178,11 +178,13 @@ const PerformanceDetial = defineComponent({
           moment(val[0]).format("YYYY-MM"),
           moment(val[1]).format("YYYY-MM"),
         ];
+        console.log(this.search.date_arr, "1");
       } else {
         this.search.date_arr = [
           moment(val[0]).format("YYYY-MM-DD"),
           moment(val[1]).format("YYYY-MM-DD"),
         ];
+        console.log(this.search.date_arr, "2");
       }
       this.getList();
     },
@@ -238,8 +240,13 @@ const PerformanceDetial = defineComponent({
     // 月、日查询类型改变
     onTypeChange(val: string) {
       var date = new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
-      console.log(val);
       if (val === "month") {
+        //如果是月份格式化
+        this.search.date_arr = [
+          moment(this.search.date_arr[0]).format("YYYY-MM"),
+          moment(this.search.date_arr[1]).format("YYYY-MM"),
+        ];
+        console.log(this.search.date_arr, "3");
         this.search.value = 3;
         var list = this.getDateRange(date, 30, true);
         this.mode2 = ["month", "month"];
@@ -256,9 +263,14 @@ const PerformanceDetial = defineComponent({
             moment(this.search.date_arr[1], "YYYY-MM"),
           ];
         }
-      } else {
+      }
+      if (val === "day") {
+        //如果是日期格式化
+        this.search.date_arr = [
+          moment(this.search.date_arr[0]).format("YYYY-MM-DD"),
+          moment(this.search.date_arr[1]).format("YYYY-MM-DD"),
+        ];
         this.search.value = "";
-
         this.mode2 = ["date", "date"];
         if (this.$route.query.start_time && this.$route.query.end_time) {
           this.value[0] = moment(this.search.date_arr[0], "YYYY-MM-DD");

src/views/material/component/upload-image.vue

@@ -111,7 +111,7 @@ const UploadVideo = defineComponent({
     async onUploadImage() {
       if (this.fileList.length === 0) return message.warning("请选择图片");
       this.$emit("close");
-      // message.info("素材上传中...");
+      message.info("素材上传中...");
       const key = "start";
       notification.open({
         key,