Merge branch 'master' of http://git.ycjcjy.com/ershoufang/mp-agent into master

src/store/models/loading.js

@@ -1,4 +1,4 @@
-import { reactive } from "@vue/reactivity"
+import { reactive } from "vue"
 
 export default () => {
   const loading = reactive({})

src/utils/request/index.js

@@ -1,7 +1,15 @@
 import axios from 'axios'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
 
 // request 拦截器
 const requestInterceptor = config => {
+  if (config.loadingId) {
+    const { setLoading } = useModel('loading')
+    
+    config.setLoading = loading => setLoading(config.loadingId, loading)
+    config.setLoading(true)
+  }
+
   return config
 }
 
@@ -9,6 +17,10 @@ const requestInterceptor = config => {
 const responseInterceptor = response => {
   const { data, headers } = response
   const contentType = headers['Content-Type'] || headers['content-type'] || ''
+  
+  if (response.config.setLoading) {
+    response.config.setLoading(false)
+  }
 
   if (/json/.test(contentType)) {
     if ('0' === data.code) {
@@ -25,7 +37,11 @@ const responseInterceptor = response => {
 }
 
 // 错误处理
-const handleError = type => error => {
+const handleError = type => error => {  
+  if (error.config.setLoading) {
+    error.config.setLoading(false)
+  }
+
   if (error.response) {
     console.error(`[${type}]:`)
     console.error(error.response)