Merge branch 'feat/lyf' into 'develop'

添加报错信息

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!286

src/views/goods/order-manage.vue

@@ -259,13 +259,13 @@
           </template>
         </el-table-column>
 
-        <el-table-column
+        <!-- <el-table-column
           prop="fanxxxx"
           label="返现"
           min-width="100"
           align="center"
         >
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           prop="saleTypeStr"
@@ -742,8 +742,11 @@
           </el-table-column>
           <el-table-column prop="failInfo" label="失败原因" align="center">
           </el-table-column>
-          <el-table-column prop="operationGuide" label="操作指引" align="center">
-
+          <el-table-column
+            prop="operationGuide"
+            label="操作指引"
+            align="center"
+          >
           </el-table-column>
         </el-table>
       </div>
@@ -768,8 +771,11 @@
           ></el-table-column>
           <el-table-column prop="failInfo" label="失败原因" align="center">
           </el-table-column>
-          <el-table-column prop="operationGuide" label="操作指引" align="center">
-
+          <el-table-column
+            prop="operationGuide"
+            label="操作指引"
+            align="center"
+          >
           </el-table-column>
         </el-table>
       </div>
@@ -985,10 +991,10 @@ export default {
     ShowExportDialog(type) {
       this.ExportType = type;
       this.exportDialog = true;
-      this.fileData={
+      this.fileData = {
         fileBaseStr: "",
         fileName: "",
-      }
+      };
     },
     // 批量更新物流操作
     uploadExpress() {
@@ -1010,14 +1016,19 @@ export default {
     // 批量取消退款操作
     uploadRefund() {
       openLoading(this);
-      uploadRefund(this.fileData).then((res) => {
-        console.log(res);
-        if (res && res.code == "000000") {
+      uploadRefund(this.fileData)
+        .then((res) => {
+          console.log(res);
+          if (res && res.code == "000000") {
+            closeLoading(this);
+            this.getUploadRefundProgress(res.data.tradeBatchUploadLogId);
+          } else {
+            this.$message.error(res.message);
+          }
+        })
+        .catch((err) => {
           closeLoading(this);
-
-          this.getUploadRefundProgress(res.data.tradeBatchUploadLogId);
-        }
-      });
+        });
     },
 
     // 获取物流上传进度
@@ -1040,7 +1051,7 @@ export default {
             this.$message.error(res.message);
           }
         });
-      }, 2000);
+      }, 1000);
     },
     // 获取批量取消进度
     getUploadRefundProgress(id) {
@@ -1062,7 +1073,7 @@ export default {
             this.$message.error(res.message);
           }
         });
-      }, 2000);
+      }, 1000);
     },
 
     // 取消导入物流信息
@@ -1093,7 +1104,7 @@ export default {
     },
     // 确认取消订单
     showReasondialog() {
-      this.statFlg=false;
+      this.statFlg = false;
       this.FailureReasonFlag = true;
     },