fixbug2463-2466

src/views/system/order/index.vue

@@ -651,6 +651,8 @@
 
             this.total = res.data.count || 0
             this.tableDataList = res.data.data
+          } else {
+            this.$message({type: "error",message: res.message ? res.message : "查询订单失败"});
           }
         })
       },
@@ -684,7 +686,7 @@
           if (res.code === 1) {
             const aLink = document.createElement('a');
             aLink.href = res.data.file_url;
-            //aLink.download = '订单.xls'; //下载的文件名
+            aLink.download = '待发货订单.xls'; //下载的文件名
             aLink.style.display = 'none';
             document.body.appendChild(aLink);
             aLink.click();

src/views/system/shop/brand.vue

@@ -492,7 +492,7 @@
         if (this.queryParams.brand_type == '1' || this.queryParams.brand_type == '2' || this.queryParams.brand_type == '3') {
           data['brand_type'] = this.queryParams.brand_type
         }
-        if (this.queryParams.status == '0' || this.queryParams.status == '1' || this.queryParams.status == '2') {
+        if (this.queryParams.status == '0' || this.queryParams.status == '1' || this.queryParams.status == '2' || this.queryParams.status == '3') {
           data['status'] = this.queryParams.status
         }
         getBrandsInf(data).then(res => {