Merge branch 'dev_zwn' into test

src/api/module/order.js

@@ -3,39 +3,59 @@ import request from '@/utils/request'
 // 查询order列表
 export function listOrder(query) {
     return request({
-        url: '/system/order/list',
+        url: '/system/order/getOrderList',
         method: 'get',
         params: query
     })
 }
 
 // 查询order详细
-export function getOrder (id) {
+export function orderInfo (query) {
     return request({
-        url: '/system/order/getInfo?order_id='+id,
-        method: 'get'
+        url: '/system/order/getOrderInfo',
+        method: 'get',
+        params: query
     })
 }
 
 // order发货
 export function sendOrder(data) {
     return request({
-        url: '/system/order/sendOrder',
+        url: '/system/order/sendOrde',
         method: 'post',
         data: data
     })
 }
+
 //查看物流
-export function getExpressInfo(data){
+export function expressInfoNew(params){
+  return request({
+      url: '/system/order/getExpressInfoNew',
+      method: 'get',
+      params
+  })
+}
+
+// 修改订单收货信息
+export function orderInfoEdit(data){
+  return request({
+      url: '/system/order/orderInfoEdit',
+      method: 'post',
+      data: data
+  })
+}
+
+//订单备注
+export function remarkOrder(data){
   return request({
-      url: '/system/order/getExpressInfo',
+      url: '/system/order/remarkOrder',
       method: 'post',
       data: data
   })
 }
 
 // 获取 所有物流信息
-export function getExpressList(query) {
+export function expressList(query) {
   return request({
     url: '/system/order/expressList',
     method: 'get',

src/layout/components/AppMain.vue

 <template>
-  <section class="app-main">
+  <section class="app-main loadingtext">
     <transition name="fade-transform" mode="out-in">
       <keep-alive :include="cachedViews">
         <router-view :key="key" />

src/utils/request.js

 import axios from 'axios'
-import {Notification, MessageBox, Message} from 'element-ui'
+import {Notification, MessageBox, Message, Loading} from 'element-ui'
 import store from '@/store'
 import {getToken} from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 
+let loadingRequestCount = 0
+let loadingInstance
+
+const showLoading = () => {
+  if (loadingRequestCount === 0) {
+    loadingInstance = Loading.service({ target: '.loadingtext'})
+  }
+  loadingRequestCount++
+}
+
+const hideLoading = () => {
+  if (loadingRequestCount <= 0) return
+  loadingRequestCount--
+  if (loadingRequestCount === 0) {
+    loadingInstance.close()
+  }
+}
+
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
@@ -14,6 +32,8 @@ const service = axios.create({
 })
 // request拦截器
 service.interceptors.request.use(config => {
+  showLoading()
+
   // 是否需要设置 token
   const isToken = (config.headers || {}).isToken === false
   if (getToken() && !isToken) {
@@ -28,6 +48,10 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+    setTimeout(() => {
+      hideLoading()
+    }, 200)
+
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 返回所有数据的统一处理
@@ -90,6 +114,10 @@ service.interceptors.response.use(res => {
       return res.data
     }
   }, error => {
+    setTimeout(() => {
+      hideLoading()
+    }, 200)
+
     // --- start ---- 开发时候用这段，把错误彻底抛出来 --- start ---
     let {message} = error;
     if (message == 'Network Error') {