Merge remote-tracking branch 'origin/master'

src/api/hisStore/storeAfterSales.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询售后记录列表
 export function listStoreAfterSales(query) {
   return request({
-    url: '/store/storeAfterSales/list',
+    url: '/store/store/storeAfterSales/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listStoreAfterSales(query) {
 // 查询售后记录详细
 export function getStoreAfterSales(id) {
   return request({
-    url: '/store/storeAfterSales/' + id,
+    url: '/store/store/storeAfterSales/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getStoreAfterSales(id) {
 // 新增售后记录
 export function addStoreAfterSales(data) {
   return request({
-    url: '/store/storeAfterSales',
+    url: '/store/store/storeAfterSales',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addStoreAfterSales(data) {
 // 修改售后记录
 export function updateStoreAfterSales(data) {
   return request({
-    url: '/store/storeAfterSales',
+    url: '/store/store/storeAfterSales',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateStoreAfterSales(data) {
 // 删除售后记录
 export function delStoreAfterSales(id) {
   return request({
-    url: '/store/storeAfterSales/' + id,
+    url: '/store/store/storeAfterSales/' + id,
     method: 'delete'
   })
 }
@@ -46,7 +46,7 @@ export function delStoreAfterSales(id) {
 // 导出售后记录
 export function exportStoreAfterSales(query) {
   return request({
-    url: '/store/storeAfterSales/export',
+    url: '/store/store/storeAfterSales/export',
     method: 'get',
     params: query
   })
@@ -56,7 +56,7 @@ export function exportStoreAfterSales(query) {
 
 export function cancel(data) {
   return request({
-    url: '/store/storeAfterSales/cancel',
+    url: '/store/store/storeAfterSales/cancel',
     method: 'post',
     data: data
   })
@@ -64,7 +64,7 @@ export function cancel(data) {
 
 export function refund(data) {
   return request({
-    url: '/store/storeAfterSales/refund',
+    url: '/store/store/storeAfterSales/refund',
     method: 'post',
     data: data
   })
@@ -72,16 +72,15 @@ export function refund(data) {
 
 export function audit1(data) {
   return request({
-    url: '/store/storeAfterSales/audit1',
+    url: '/store/store/storeAfterSales/audit1',
     method: 'post',
     data: data
   })
 }
 export function audit2(data) {
   return request({
-    url: '/store/storeAfterSales/audit2',
+    url: '/store/store/storeAfterSales/audit2',
     method: 'post',
     data: data
   })
 }
-

src/api/hisStore/storeOrder.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询订单列表
 export function listStoreOrder(data) {
   return request({
-    url: '/store/storeOrder/list',
+    url: '/store/store/storeOrder/list',
     method: 'post',
     data: data
   })
@@ -12,7 +12,7 @@ export function listStoreOrder(data) {
 // 查询订单明细总数
 export function getOrderItemsNum(query) {
   return request({
-    url: '/store/storeOrder/orderItemsNum',
+    url: '/store/store/storeOrder/orderItemsNum',
     method: 'get',
     params: query
   })
@@ -20,7 +20,7 @@ export function getOrderItemsNum(query) {
 // 查询尾款订单列表
 export function listPayRemainOrder(query) {
   return request({
-    url: '/store/storeOrder/payRemainList',
+    url: '/store/store/storeOrder/payRemainList',
     method: 'get',
     params: query
   })
@@ -28,7 +28,7 @@ export function listPayRemainOrder(query) {
 // 查询推广订单列表
 export function listPromotionOrder(query) {
   return request({
-    url: '/store/storeOrder/promotionList',
+    url: '/store/store/storeOrder/promotionList',
     method: 'get',
     params: query
   })
@@ -36,7 +36,7 @@ export function listPromotionOrder(query) {
 // 查询健康商城订单列表
 export function listHealthStoreOrder(data) {
   return request({
-    url: '/store/storeOrder/healthList',
+    url: '/store/store/storeOrder/healthList',
     method: 'post',
     data: data
   })
@@ -44,7 +44,7 @@ export function listHealthStoreOrder(data) {
 
 export function getCustomerOrderList(query) {
   return request({
-    url: '/store/storeOrder/getCustomerOrderList',
+    url: '/store/store/storeOrder/getCustomerOrderList',
     method: 'get',
     params: query
   })
@@ -57,7 +57,7 @@ export function getCustomerOrderList(query) {
 // 查询订单详细
 export function getStoreOrder(id) {
   return request({
-    url: '/store/storeOrder/' + id,
+    url: '/store/store/storeOrder/' + id,
     method: 'get'
   })
 }
@@ -65,7 +65,7 @@ export function getStoreOrder(id) {
 // 查询订单详细
 export function getStoreOrderAddress(id) {
   return request({
-    url: '/store/storeOrder/queryAddress/' + id,
+    url: '/store/store/storeOrder/queryAddress/' + id,
     method: 'get'
   })
 }
@@ -73,7 +73,7 @@ export function getStoreOrderAddress(id) {
 // 查询订单详细
 export function getStoreOrderPhone(id) {
   return request({
-    url: '/store/storeOrder/queryPhone/' + id,
+    url: '/store/store/storeOrder/queryPhone/' + id,
     method: 'get'
   })
 }
@@ -81,7 +81,7 @@ export function getStoreOrderPhone(id) {
 
 export function getExpress(id) {
   return request({
-    url: '/store/storeOrder/getExpress/' + id,
+    url: '/store/store/storeOrder/getExpress/' + id,
     method: 'get'
   })
 }
@@ -89,7 +89,7 @@ export function getExpress(id) {
 // 新增订单
 export function addStoreOrder(data) {
   return request({
-    url: '/store/storeOrder',
+    url: '/store/store/storeOrder',
     method: 'post',
     data: data
   })
@@ -98,7 +98,7 @@ export function addStoreOrder(data) {
 // 修改订单
 export function updateStoreOrder(data) {
   return request({
-    url: '/store/storeOrder',
+    url: '/store/store/storeOrder',
     method: 'put',
     data: data
   })
@@ -107,7 +107,7 @@ export function updateStoreOrder(data) {
 // 修改物流编号
 export function updateDeliveryId(data) {
   return request({
-    url: '/store/storeOrder/editDeliveryId',
+    url: '/store/store/storeOrder/editDeliveryId',
     method: 'put',
     data: data
   })
@@ -116,7 +116,7 @@ export function updateDeliveryId(data) {
 // 删除订单
 export function delStoreOrder(id) {
   return request({
-    url: '/store/storeOrder/' + id,
+    url: '/store/store/storeOrder/' + id,
     method: 'delete'
   })
 }
@@ -124,7 +124,7 @@ export function delStoreOrder(id) {
 // 导出订单
 export function exportStoreOrder(data) {
   return request({
-    url: '/store/storeOrder/export',
+    url: '/store/store/storeOrder/export',
     method: 'post',
     data: data
   })
@@ -133,7 +133,7 @@ export function exportStoreOrder(data) {
 // 导出订单
 export function exportStoreOrderDetails(data) {
   return request({
-    url: '/store/storeOrder/exportDetails',
+    url: '/store/store/storeOrder/exportDetails',
     method: 'post',
     data: data
   })
@@ -143,7 +143,7 @@ export function exportStoreOrderDetails(data) {
 // 导出订单
 export function exportHealthStoreOrder(data) {
   return request({
-    url: '/store/storeOrder/healthExport',
+    url: '/store/store/storeOrder/healthExport',
     method: 'post',
     data: data
   })
@@ -152,7 +152,7 @@ export function exportHealthStoreOrder(data) {
 // 导出订单
 export function exportHealthStoreOrderDetails(data) {
   return request({
-    url: '/store/storeOrder/healthExportDetails',
+    url: '/store/store/storeOrder/healthExportDetails',
     method: 'post',
     data: data
   })
@@ -161,7 +161,7 @@ export function exportHealthStoreOrderDetails(data) {
 // 导出订单
 export function exportPromotionOrder(query) {
   return request({
-    url: '/store/storeOrder/promotionExport',
+    url: '/store/store/storeOrder/promotionExport',
     method: 'get',
     params: query
   })
@@ -170,7 +170,7 @@ export function exportPromotionOrder(query) {
 // 导出付尾款订单
 export function exportStorePayRemainOrder(query) {
   return request({
-    url: '/store/storeOrder/payRemainExport',
+    url: '/store/store/storeOrder/payRemainExport',
     method: 'get',
     params: query
   })
@@ -179,7 +179,7 @@ export function exportStorePayRemainOrder(query) {
 // 导出订单
 export function exportStoreOrderItems(query) {
   return request({
-    url: '/store/storeOrder/exportItems',
+    url: '/store/store/storeOrder/exportItems',
     method: 'get',
     params: query
   })
@@ -188,7 +188,7 @@ export function exportStoreOrderItems(query) {
 // 导出订单
 export function exportStoreOrderItemsDetails(query) {
   return request({
-    url: '/store/storeOrder/exportItemsDetails',
+    url: '/store/store/storeOrder/exportItemsDetails',
     method: 'get',
     params: query
   })
@@ -197,7 +197,7 @@ export function exportStoreOrderItemsDetails(query) {
 // 导出订单
 export function exportHealthStoreOrderItems(query) {
   return request({
-    url: '/store/storeOrder/healthExportItems',
+    url: '/store/store/storeOrder/healthExportItems',
     method: 'get',
     params: query
   })
@@ -206,7 +206,7 @@ export function exportHealthStoreOrderItems(query) {
 // 导出订单
 export function exportHealthStoreOrderItemsDetails(query) {
   return request({
-    url: '/store/storeOrder/healthExportItemsDetails',
+    url: '/store/store/storeOrder/healthExportItemsDetails',
     method: 'get',
     params: query
   })
@@ -214,7 +214,7 @@ export function exportHealthStoreOrderItemsDetails(query) {
 
 export function createUserOrder(data) {
   return request({
-    url: '/store/storeOrder/createUserOrder',
+    url: '/store/store/storeOrder/createUserOrder',
     method: 'post',
     data: data
   })
@@ -222,21 +222,21 @@ export function createUserOrder(data) {
 
 export function finishOrder(data) {
   return request({
-    url: '/store/storeOrder/finishOrder',
+    url: '/store/store/storeOrder/finishOrder',
     method: 'post',
     data: data
   })
 }
 export function importTemplate() {
   return request({
-    url: '/store/storeOrder/importTemplate',
+    url: '/store/store/storeOrder/importTemplate',
     method: 'get'
   })
 }
 
 export function editTuiMoney(data) {
   return request({
-    url: '/store/storeOrder/editTuiMoney',
+    url: '/store/store/storeOrder/editTuiMoney',
     method: 'post',
     data: data
   })
@@ -244,7 +244,7 @@ export function editTuiMoney(data) {
 
 export function refundOrderMoney(data) {
   return request({
-    url: '/store/storeOrder/refundOrderMoney',
+    url: '/store/store/storeOrder/refundOrderMoney',
     method: 'post',
     data: data
   })
@@ -252,14 +252,14 @@ export function refundOrderMoney(data) {
 
 export function updateExpress(data) {
   return request({
-    url: '/store/storeOrder/updateExpress',
+    url: '/store/store/storeOrder/updateExpress',
     method: 'post',
     data: data
   })
 }
 export function syncExpress(data) {
   return request({
-    url: '/store/storeOrder/syncExpress',
+    url: '/store/store/storeOrder/syncExpress',
     method: 'post',
     data: data
   })
@@ -267,14 +267,14 @@ export function syncExpress(data) {
 
 export function updateErp(data) {
   return request({
-    url: '/store/storeOrder/updateErpOrder',
+    url: '/store/store/storeOrder/updateErpOrder',
     method: 'post',
     data: data
   })
 }
 export function addTuiMoney(data) {
   return request({
-    url: '/store/storeOrder/addTuiMoney',
+    url: '/store/store/storeOrder/addTuiMoney',
     method: 'post',
     data: data
   })
@@ -282,7 +282,7 @@ export function addTuiMoney(data) {
 
 export function getEroOrder(query) {
   return request({
-    url: '/store/storeOrder/getEroOrder',
+    url: '/store/store/storeOrder/getEroOrder',
     method: 'get',
     params: query
   })
@@ -290,7 +290,7 @@ export function getEroOrder(query) {
 
 export function createErpOrder(query) {
   return request({
-    url: '/store/storeOrder/createErpOrder',
+    url: '/store/store/storeOrder/createErpOrder',
     method: 'get',
     params: query
   })
@@ -299,7 +299,7 @@ export function createErpOrder(query) {
 //审核
 export function auditPayRemain(data) {
   return request({
-    url: '/store/storeOrder/auditPayRemain',
+    url: '/store/store/storeOrder/auditPayRemain',
     method: 'post',
     data: data
   })
@@ -308,7 +308,7 @@ export function auditPayRemain(data) {
 // 订单维度分页查询接口
 export function orderDimensionStatisticsList(query) {
   return request({
-    url: '/store/storeOrder/orderDimensionStatisticsList',
+    url: '/store/store/storeOrder/orderDimensionStatisticsList',
     method: 'get',
     params: query
   })
@@ -317,7 +317,7 @@ export function orderDimensionStatisticsList(query) {
 // 导出订单维度统计接口
 export function orderDimensionStatisticsExport(query) {
   return request({
-    url: '/store/storeOrder/orderDimensionStatisticsExport',
+    url: '/store/store/storeOrder/orderDimensionStatisticsExport',
     method: 'get',
     params: query
   })
@@ -325,14 +325,14 @@ export function orderDimensionStatisticsExport(query) {
 
 export function importDeliveryNoteExpressTemplate() {
   return request({
-    url: '/store/storeOrder/importDeliveryNoteExpressTemplate',
+    url: '/store/store/storeOrder/importDeliveryNoteExpressTemplate',
     method: 'get'
   })
 }
 
 export function queryErpPhone(query) {
   return request({
-    url: '/store/storeOrder/queryErpPhone',
+    url: '/store/store/storeOrder/queryErpPhone',
     method: 'get',
     params: query
   })
@@ -340,7 +340,7 @@ export function queryErpPhone(query) {
 
 export function saveErpPhone(data) {
   return request({
-    url: '/store/storeOrder/saveErpPhone',
+    url: '/store/store/storeOrder/saveErpPhone',
     method: 'post',
     data: data
   })
@@ -348,7 +348,7 @@ export function saveErpPhone(data) {
 
 export function editErpPhone(data) {
   return request({
-    url: '/store/storeOrder/editErpPhone',
+    url: '/store/store/storeOrder/editErpPhone',
     method: 'post',
     data: data
   })
@@ -356,7 +356,7 @@ export function editErpPhone(data) {
 
 export function batchCreateErpOrder(data) {
   return request({
-    url: '/store/storeOrder/batchCreateErpOrder',
+    url: '/store/store/storeOrder/batchCreateErpOrder',
     method: 'post',
     data: data
   })
@@ -364,7 +364,7 @@ export function batchCreateErpOrder(data) {
 
 export function batchSetErpOrder(data) {
   return request({
-    url: '/store/storeOrder/batchSetErpOrder',
+    url: '/store/store/storeOrder/batchSetErpOrder',
     method: 'post',
     data: data
   })
@@ -373,7 +373,7 @@ export function batchSetErpOrder(data) {
 
 export function getErpAccount() {
   return request({
-    url: '/store/storeOrder/getErpAccount',
+    url: '/store/store/storeOrder/getErpAccount',
     method: 'get'
   })
 }
@@ -381,7 +381,7 @@ export function getErpAccount() {
 // 导出发货单
 export function healthExportShippingOrder(query) {
   return request({
-    url: '/store/storeOrder/healthExportShippingOrder',
+    url: '/store/store/storeOrder/healthExportShippingOrder',
     method: 'get',
     params: query
   })
@@ -390,7 +390,7 @@ export function healthExportShippingOrder(query) {
 // 订单确认审核
 export function auditStoreOrder(data) {
   return request({
-    url: '/store/storeOrder/batchAudit',
+    url: '/store/store/storeOrder/batchAudit',
     method: 'post',
     data: data
   })
@@ -399,7 +399,7 @@ export function auditStoreOrder(data) {
 // 订单备注
 export function orderRemark(data) {
   return request({
-    url: '/store/storeOrder/remark',
+    url: '/store/store/storeOrder/remark',
     method: 'post',
     data: data
   })

src/api/hisStore/storePayment.js

@@ -10,7 +10,7 @@ export function listStorePayment(query,refundDateRange) {
       query.refundEndTime =null;
     }
     return request({
-      url: '/store/storePayment/list',
+      url: '/store/store/storePayment/list',
       method: 'get',
       params: query
     })
@@ -19,7 +19,7 @@ export function listStorePayment(query,refundDateRange) {
 // 查询支付明细详细
 export function getStorePayment(paymentId) {
   return request({
-    url: '/store/storePayment/' + paymentId,
+    url: '/store/store/storePayment/' + paymentId,
     method: 'get'
   })
 }
@@ -27,7 +27,7 @@ export function getStorePayment(paymentId) {
 // 新增支付明细
 export function addStorePayment(data) {
   return request({
-    url: '/store/storePayment',
+    url: '/store/store/storePayment',
     method: 'post',
     data: data
   })
@@ -35,7 +35,7 @@ export function addStorePayment(data) {
 
 export function refundStorePayment(data) {
   return request({
-    url: '/store/storePayment/refundStorePayment',
+    url: '/store/store/storePayment/refundStorePayment',
     method: 'post',
     data: data
   })
@@ -45,7 +45,7 @@ export function refundStorePayment(data) {
 // 修改支付明细
 export function updateStorePayment(data) {
   return request({
-    url: '/store/storePayment',
+    url: '/store/store/storePayment',
     method: 'put',
     data: data
   })
@@ -54,7 +54,7 @@ export function updateStorePayment(data) {
 // 删除支付明细
 export function delStorePayment(paymentId) {
   return request({
-    url: '/store/storePayment/' + paymentId,
+    url: '/store/store/storePayment/' + paymentId,
     method: 'delete'
   })
 }
@@ -62,7 +62,7 @@ export function delStorePayment(paymentId) {
 // 导出支付明细
 export function exportStorePayment(query) {
   return request({
-    url: '/store/storePayment/export',
+    url: '/store/store/storePayment/export',
     method: 'get',
     params: query
   })
@@ -71,7 +71,7 @@ export function exportStorePayment(query) {
 //同步订单状态
 export function setPayNotify(data) {
   return request({
-    url: '/store/storePayment/returnPayStatus',
+    url: '/store/store/storePayment/returnPayStatus',
     method: 'post',
     data: data
   })
@@ -80,7 +80,7 @@ export function setPayNotify(data) {
 //同步订单状态
 export function oneClickShipping(data) {
   return request({
-    url: '/store/storePayment/oneClickShipping',
+    url: '/store/store/storePayment/oneClickShipping',
     method: 'post',
     data: data
   })

src/api/qw/user.js

@@ -55,7 +55,7 @@ export function getMyQwUserList(query) {
 }
 export function getMyQwCompanyList(query) {
   return request({
-    url: '/qw/user/getMyQwCompanyList/' + query,
+    url: '/qw/user/getMyQwCompanyListAll',
     method: 'get'
   })
 }

src/views/company/companyRecharge/doRecharge.vue

@@ -49,7 +49,7 @@
 <script>
 import { listCompanyRecharge, getCompanyRecharge, delCompanyRecharge, addCompanyRecharge, updateCompanyRecharge, exportCompanyRecharge } from "@/api/company/companyRecharge";
 import { getCompanyInfo } from "@/api/company/company";
-import { getConfigByKey } from '@/api/company/companyConfig'
+import { getConfigByKey } from '@/api/system/config'
 import {queryOrder, weixinPay, wxQrPay} from "@/api/company/pay";
 import QRCode from 'qrcodejs2'
 

src/views/company/companyRecharge/index.vue

@@ -211,7 +211,7 @@
 <script>
 import { listCompanyRecharge, getCompanyRecharge, delCompanyRecharge, addCompanyRecharge, updateCompanyRecharge, exportCompanyRecharge, recharge, redRecharge, getCompanyRedPacketBalance } from "@/api/company/companyRecharge";
 import { getInfo } from '@/api/login';
-import { getConfigByKey } from '@/api/company/companyConfig'
+import { getConfigByKey } from '@/api/system/config'
 export default {
   name: "CompanyRecharge",
   data() {

src/views/hisStore/storeOrder/index.vue

@@ -1269,7 +1269,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/store/storeOrder/importExpress",
+        url: process.env.VUE_APP_BASE_API + "/store/store/storeOrder/importExpress",
       },
       orderUpload: {
         // 是否显示弹出层（用户导入）