chenlei 9 months ago
parent
commit
481c8c2b35
4 changed files with 61 additions and 46 deletions
  1. 1 1
      README.md
  2. 4 42
      api/web/index.js
  3. 3 3
      config/index.js
  4. 53 0
      convert.js

+ 1 - 1
README.md

@@ -2,7 +2,7 @@
 
 前端工具库
 
-# 版本
+## 版本
 1.01
  增加功能:
  1.基于axios、vuex封装的公共请求框架,支持接口配置,请求状态跟踪

+ 4 - 42
api/web/index.js

@@ -1,9 +1,6 @@
 import Axios from 'axios'
 import store from '@/store'
-import { Toast, Dialog } from 'vant'
-import { getLocalStorage } from '@/utils/storage'
-import { webParamsTransmit } from '@/utils/tools'
-import * as list from '@/utils/list'
+import { Toast } from 'vant'
 import Config from 'submodule/utils/config'
 const Base64 = require('js-base64').Base64
 
@@ -50,44 +47,9 @@ axios.interceptors.response.use(
         Toast(response.data.message)
       }
       return Promise.resolve(response.data.data)
-    } else if (response.data.code === 2814) {
-      if (getLocalStorage('appType') == 1) {
-        Toast(response.data.message)
-        webParamsTransmit(1)
-      } else {
-        Toast(response.data.message)
-        store.dispatch('clear').then(() => {
-          location.reload() // 为了重新实例化vue-router对象 避免bug
-        })
-      }
-    } else if ((response.data.code === 3012 && response.data.message.includes('校验码错误')) || response.data.code == 2223) {
-      Toast(response.data.message)
-      return Promise.resolve(response.data)
-    } else if (response.data.code === 8901 && !response.config.url.includes('truck_by_platform_driver')) {
-      if (response.data.data && response.data.data.type == null) {
-        Toast(response.data.message)
-        return Promise.reject(response.data.message)
-      } else {
-        return Promise.resolve(response.data.data)
-      }
     } else {
-      if (response.config.url.includes('pay/pay/wxpay')) {
-        Toast(response.data.message)
-        this.$router.replace('perpayOrder')
-      } else if (response.config.url.includes('user/truck_driver_remove/remove')) {
-        setTimeout(() => {
-          Dialog.alert({
-            title: '温馨提示',
-            message: response.data.message
-          }).then(() => { })
-        }, 0)
-      } else if (list.notMsgArrayInterface.some(item => response.config.url.includes(item))) {
-        // 返回报错接口里所有信息,方便根据错误码定制化显示弹窗提示
-        return Promise.reject(response.data)
-      } else {
-        Toast(response.data.message)
-      }
-      return Promise.reject(response.data.message)
+      Toast(response.data.message)
+      return Promise.reject(response.data)
     }
   },
   err => {
@@ -120,6 +82,6 @@ export default (urlObj, data = {}, method = 'POST', responseType = 'json') => {
     return res
   }).catch(err => {
     store.commit('webapi/set', { urlObj, value: Config.enums.request.err.storeValue })
-    return Promise.reject(err.message)
+    return Promise.reject(err)
   })
 }

+ 3 - 3
config/index.js

@@ -7,17 +7,17 @@ export default {
         // 事件总线key
         eventBusKey: 'REQUEST.BEFORE',
         // 存储的值
-        storeValue: 1
+        storeValue: 0
       },
       // 请求成功
       sus: {
         eventBusKey: 'REQUEST.FINALLY',
-        storeValue: 0
+        storeValue: 1
       },
       // 请求失败
       err: {
         eventBusKey: 'REQUEST.ERR',
-        storeValue: -1
+        storeValue: 2
       }
     }
   },

+ 53 - 0
convert.js

@@ -0,0 +1,53 @@
+import config from 'submodule/utils/config'
+const convert = {
+  getTradeTypeStr(tradeType) {
+    const map = config.tradeType
+    return map.find((f) => f.value === String(tradeType))?.label
+  },
+  getTypeStr(typeName, value) {
+    const map = config[typeName]
+    return map.find((f) => f.value == value)?.label
+  },
+  getCheckItem(obj, filterFunc = (f) => true) {
+    let arr = []
+    if (typeof obj === 'string') {
+      obj = config[obj]
+    }
+    if (obj.push) {
+      arr = obj
+    } else {
+      arr = Object.keys(obj).map((m) => {
+        return {
+          value: m,
+          label: obj[m]
+        }
+      })
+    }
+    arr.forEach((f) => (f.checked = false))
+    arr.unshift({
+      value: '-1',
+      label: '全部',
+      checked: true
+    })
+    return arr.filter(filterFunc)
+  },
+  // 空值显示
+  nullView(data) {
+    return !data && data !== 0 ? '--' : data
+  },
+  nullViewStr: '--' // '—',
+}
+// 空
+convert.isNull = (val) => {
+  return convert.nullView(val) === '--'
+}
+// 非空
+convert.unNull = (val) => {
+  return convert.nullView(val) !== '--'
+}
+convert.getOrderStatusStr = (settleStatus) => {
+  const map = config.settleStatus
+  return convert.nullView(map.find((f) => f.value === String(settleStatus))?.label)
+}
+
+export default convert