Merge branch 'dev_hxz' of http://120.27.146.32:8888/wangfulong/shop-new into dev_zwn

src/api/module/order.js

 import request from '@/utils/request'
 
+// 查询 订单 四种状态和总数量
+export function getOrderTabData(query) {
+  return request({
+    url: '/system/order/statusCount',
+    method: 'get',
+    params: query
+  })
+}
+
 // 查询order列表
 export function listOrder(query) {
     return request({
-        url: '/system/order/getOrderList',
+        url: '/system/order/getOrderSellerList',
         method: 'get',
         params: query
     })
@@ -12,25 +21,25 @@ export function listOrder(query) {
 // 查询order详细
 export function orderInfo (query) {
     return request({
-        url: '/system/order/getOrderInfo',
+        url: '/system/order/getOrderSellerListInfo',
         method: 'get',
         params: query
     })
 }
 
 // order发货
-export function sendOrder(data) {
+/*export function sendOrder(data) {
     return request({
         url: '/system/order/sendOrde',
         method: 'post',
         data: data
     })
-}
+}*/
 
 //查看物流
 export function expressInfoNew(params){
   return request({
-      url: '/system/order/getExpressInfoNew',
+      url: '/system/order/getOrderInfoDeliver',
       method: 'get',
       params
   })
@@ -39,7 +48,7 @@ export function expressInfoNew(params){
 // 修改订单收货信息
 export function orderInfoEdit(data){
   return request({
-      url: '/system/order/orderInfoEdit',
+      url: '/system/order/orderUpdateAddress',
       method: 'post',
       data: data
   })
@@ -48,7 +57,7 @@ export function orderInfoEdit(data){
 //订单备注
 export function remarkOrder(data){
   return request({
-      url: '/system/order/remarkOrder',
+      url: '/system/order/orderListRemark',
       method: 'post',
       data: data
   })
@@ -90,14 +99,22 @@ export function delOrder(ids) {
     })
 }
 
-// 订单导出
+// 订单导出-按搜索条件，全部导出
 export function exportOrder(query) {
   return request({
-    url: '/system/order/batchDeliveryGoodsOut',
+    url: '/system/order/unSendOrderGoodsExport',
     method: 'get',
     params: query
   })
 }
+// old
+// export function exportOrder(query) {
+//   return request({
+//     url: '/system/order/getOrderListExport',
+//     method: 'get',
+//     params: query
+//   })
+// }
 
 // 批量发货
 export function deliveryOrder(data) {
@@ -107,3 +124,32 @@ export function deliveryOrder(data) {
     data: data
   })
 }
+
+// 订单 右上角的 批量发货接口 /system/order/batchDeliveryGoodsOut 老接口
+
+// 批量 去发货
+export function deliveryOrderOne(data) {
+  return request({
+    url: '/system/order/orderListSend',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量 补单发货
+export function deliveryOrderTwo(data) {
+  return request({
+    url: '/system/order/orderListAllSend',
+    method: 'post',
+    data: data
+  })
+}
+//
+// // 单商品订单 补单发货
+// export function toReissueOrderData(data) {
+//   return request({
+//     url: '/system/order/orderListAgainSend',
+//     method: 'post',
+//     data: data
+//   })
+// }

src/api/module/retreat.js

@@ -20,21 +20,6 @@ export function refundReject(data) {
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 // 查询retreat列表
 export function listRetreat(query) {
     return request({
@@ -88,3 +73,47 @@ export function getSearchParams(query) {
 //     })
 // }
 
+// 列表
+export function getRetreatList(query) {
+  return request({
+    url: '/system/retreat/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详情
+export function getASOrderDetail(query) {
+  return request({
+    url: '/system/retreat/edit',
+    method: 'get',
+    params: query
+  })
+}
+
+// 售后 同意类操作
+export function agreeRefundData(data) {
+  return request({
+    url: '/system/retreat/refundAgree',
+    method: 'post',
+    data: data
+  })
+}
+
+// 售后 拒绝类 操作
+export function refuseRefundData(data) {
+  return request({
+    url: '/system/retreat/refundReject',
+    method: 'post',
+    data: data
+  })
+}
+
+// 退货退款  地址
+export function getASAdressData(query) {
+  return request({
+    url: '/local/AfterSalesAddress/list',
+    method: 'get',
+    params: query
+  })
+}

src/router/index.js

@@ -216,12 +216,12 @@ export const constantRoutes = [
         name: 'modelFields',
         meta: { title: '商品导入' }
       },
-      {
-        path: 'management',
-        component: (resolve) => require(['@/views/system/goodsimport/goodsgement.vue'], resolve),
-        name: 'goodsgement',
-        meta: { title: '商品管理' }
-      }
+      // {
+      //   path: 'management',
+      //   component: (resolve) => require(['@/views/system/goodsimport/goodsgement.vue'], resolve),
+      //   name: 'goodsgement',
+      //   meta: { title: '商品管理' }
+      // }
     ]
   }
   /* 正式上线需要  注释 */