From d83cc71c5d17dbf77cee23e6fa64db9328a485cc Mon Sep 17 00:00:00 2001
From: mo-bai <1873032855@qq.com>
Date: Tue, 19 Apr 2022 16:37:36 +0800
Subject: [PATCH] http

---
 pages/digital-workshops/index.vue |  2 +-
 pages/order-detail/index.vue      |  1 -
 utils/http/http.js                | 12 ++++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue
index ab261f9..4a1bd68 100644
--- a/pages/digital-workshops/index.vue
+++ b/pages/digital-workshops/index.vue
@@ -459,7 +459,7 @@ export default {
       display: grid;
       grid-template-columns: repeat(2, 1fr);
       grid-row-gap: 22rpx;
-      grid-column-gap: 16rpx;
+      grid-column-gap: 10rpx;
       .grid-item {
         padding: 24rpx 20rpx 20rpx;
         border-radius: 22rpx;
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 93a7567..a708552 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -243,7 +243,6 @@ export default {
       getClientOrderInfo({
         customerOrderId: orderId
       }).then((res) => {
-        console.log('订单详情', res)
         if (res) {
           this.orderInfo = res
         }
diff --git a/utils/http/http.js b/utils/http/http.js
index 5de2eed..a83a6c0 100644
--- a/utils/http/http.js
+++ b/utils/http/http.js
@@ -2,6 +2,14 @@ import { isFunction } from '../is.js'
 import env from '@/env/index.js'
 const urlEnv = env === 'production' ? '' : `-${env}`
 const uploadUrl = `https://api-ops-yyt${urlEnv}.qniao.cn/cloud-print-user-center/utils/uploadImage`
+
+/**
+ * 定义的一个thenable对象
+ */
+class ErrorPromise {
+  then() {}
+}
+
 export default class Http {
   constructor(config = {}, { reqInterceptor, resInterceptor, transformConfig } = {}) {
     this.baseUrl = config.baseUrl
@@ -55,6 +63,8 @@ export default class Http {
           let data = resInterceptor(res, opt)
           if (!data) {
             console.log('报错的请求参数:', conf)
+            reject(res)
+            return
           }
           // 服务器错误也会用then抛出，需要自己判断data==null
           resolve(data)
@@ -69,6 +79,8 @@ export default class Http {
     }).catch((err) => {
       // 吃掉请求产生的异常 后期可以记录
       console.error('native response error', err)
+      // 不会再进入后面传递的then函数了
+      return new ErrorPromise()
     })
   }
   // config:{}