diff --git a/src/api/merchant.js b/src/api/merchant.js index 5b74093..8194853 100644 --- a/src/api/merchant.js +++ b/src/api/merchant.js @@ -9,6 +9,11 @@ // +---------------------------------------------------------------------- import request from './request' +// 新增修改状态 +export function updateStatus(mer_id, data) { + return request.post(`merchant/intention/status/${mer_id}`, data) +} + /** * @description 商户权限管理 -- 列表 */ @@ -67,8 +72,8 @@ export function merchantUpdateApi(id) { /** * @description 商户列表 -- 编辑 */ -export function merchantUpdate(id,data) { - return request.post(`system/merchant/update/${id}`,data) +export function merchantUpdate(id, data) { + return request.post(`system/merchant/update/${id}`, data) } /** * @description 商户列表 -- 删除 @@ -195,19 +200,19 @@ export function intentionAgreeInfo() { * @description 申请管理 -- 入驻协议保存 */ export function intentionAgreeUpdate(data) { - return request.post(`agreement/sys_intention_agree`,data) + return request.post(`agreement/sys_intention_agree`, data) } /** * @description 店铺类型 -- 获取说明 */ - export function getStoreTypeApi(key) { - return request.get(`agreement/${key}`) +export function getStoreTypeApi(key) { + return request.get(`agreement/${key}`) } /** * @description 店铺类型 -- 编辑说明 */ export function updateStoreTypeApi(type, data) { - return request.post(`agreement/${type}`, data) + return request.post(`agreement/${type}`, data) } /** * @description 商户列表 -- 开启关闭 @@ -226,102 +231,102 @@ export function merchantCountApi() { * @description 店铺类型 -- 创建店铺类型 */ export function storeTypeCreateApi(data) { - return request.post(`merchant/type/create`, data) + return request.post(`merchant/type/create`, data) } /** * @description 店铺类型 -- 列表 */ - export function storeTypeLstApi(data) { +export function storeTypeLstApi(data) { return request.get(`merchant/type/lst`, data) } /** * @description 店铺类型 -- 店铺权限 */ - export function storeJurisdictionApi() { +export function storeJurisdictionApi() { return request.get(`merchant/mer_auth`) } /** * @description 店铺类型 -- 创建店铺类型 */ export function storeTypeUpdateApi(id, data) { - return request.post(`merchant/type/update/${id}`, data) + return request.post(`merchant/type/update/${id}`, data) } /** * @description 店铺类型列表 -- 删除 */ export function storeTypeDeleteApi(id) { - return request.delete(`merchant/type/delete/${id}`) + return request.delete(`merchant/type/delete/${id}`) } /** * @description 店铺类型列表 -- 备注 */ export function merchantTypeMarkForm(id) { - return request.get(`merchant/type/mark/${id}`) + return request.get(`merchant/type/mark/${id}`) } /** * @description 店铺类型列表 -- 详情 */ - export function merchantTypeDetailApi(id) { +export function merchantTypeDetailApi(id) { return request.get(`/merchant/type/detail/${id}`) } /** * @description 店铺类型 -- 获取选择项 */ export function getstoreTypeApi() { - return request.get(`merchant/type/options`) + return request.get(`merchant/type/options`) } /** * @description 商户分类 -- 获取选择项 */ export function getMerCateApi() { - return request.get(`system/merchant/category/options`) + return request.get(`system/merchant/category/options`) } /** * @description 服务申请 -- 列表 */ export function getApplymentLst(data) { - return request.get(`system/applyments/lst`, data) + return request.get(`system/applyments/lst`, data) } /** * @description 服务申请 -- 审核 */ export function applymentStatusApi(id, data) { - return request.post(`system/applyments/status/${id}`, data) + return request.post(`system/applyments/status/${id}`, data) } /** * @description 服务申请 -- 详情 */ export function applymentDetailApi(id) { - return request.get(`system/applyments/detail/${id}`) + return request.get(`system/applyments/detail/${id}`) } /** * @description 商户 -- 分账列表 */ - export function applymentLstApi(data) { - return request.get(`profitsharing/lst`, data) +export function applymentLstApi(data) { + return request.get(`profitsharing/lst`, data) } /** * @description 商户 -- 分账（立即分账） */ - export function splitAccountApi(id) { - return request.post(`profitsharing/again/${id}`) +export function splitAccountApi(id) { + return request.post(`profitsharing/again/${id}`) } /** * @description 分账申请 -- 备注 */ export function splitAccountMark(id) { - return request.get(`system/applyments/mark/${id}/form`) + return request.get(`system/applyments/mark/${id}/form`) } /** * @description 分账管理 -- 导出 */ - export function ledgerManageExportApi(data) { +export function ledgerManageExportApi(data) { return request.get(`profitsharing/export`, data) } /** * @description 缴存保证金 -- 列表 */ - export function marginLstApi(data) { +export function marginLstApi(data) { return request.get(`margin/lst`, data) } /** @@ -339,37 +344,37 @@ export function marginPaymentApi(id) { /** * @description 退回保证金 -- 列表 */ - export function marginRefundLstApi(data) { +export function marginRefundLstApi(data) { return request.get(`margin/refund/lst`, data) } /** * @description 退回保证金 -- 审核 */ - export function marginRefundStatus(id) { +export function marginRefundStatus(id) { return request.get(`margin/refund/status/${id}/form`) } /** * @description 退回保证金 -- 备注 */ - export function marginRefundMark(id) { +export function marginRefundMark(id) { return request.get(`margin/refund/mark/${id}/form`) } /** * @description 退回保证金 -- 退回信息 */ - export function marginRefundInfo(id) { +export function marginRefundInfo(id) { return request.get(`margin/refund/show/${id}`) } /** * @description 退回保证金 -- 扣费记录 */ - export function marginDeductionRecord(id, data) { +export function marginDeductionRecord(id, data) { return request.get(`margin/list/${id}`, data) } /** * @description 退回保证金 -- 保证金扣费 */ - export function marginDeductionForm(id) { +export function marginDeductionForm(id) { return request.get(`margin/set/${id}/form`) } /** diff --git a/src/api/order.js b/src/api/order.js index 054ec21..260ecfe 100644 --- a/src/api/order.js +++ b/src/api/order.js @@ -9,6 +9,13 @@ // +---------------------------------------------------------------------- import request from './request' +/** + * @description 转账订单 -- 上传凭证 + */ +export function orderOtherPayOrder(data) { + return request.get('order/change/' + data.id + "?img=" + data.images) +} + /** * @description 订单 -- 列表 */ @@ -27,7 +34,7 @@ export function chartApi() { * @description 订单 -- 卡片 */ export function cardListApi(data) { - return request.get('order/title', data) + return request.get('order/title', data) } /** * @description 订单 -- 编辑 @@ -52,7 +59,7 @@ export function orderDetailApi(id) { /** * @description 订单 -- 记录 */ - export function orderLogApi(id, data) { +export function orderLogApi(id, data) { return request.get(`order/status/${id}`, data) } /** @@ -83,13 +90,13 @@ export function getExpress(id) { * @description 导出订单 */ export function exportOrderApi(data) { - return request.get(`order/excel`, data ) + return request.get(`order/excel`, data) } /** * @description 导出退款单 */ - export function exportRefundOrderApi(data) { - return request.get(`order/refund/excel`, data ) +export function exportRefundOrderApi(data) { + return request.get(`order/refund/excel`, data) } /** * @description 导出文件列表 @@ -118,48 +125,48 @@ export function takeOrderListApi(data) { /** * @description 核销订单 -- 卡片 */ - export function takeCardListApi(data) { - return request.get('order/take_title', data) +export function takeCardListApi(data) { + return request.get('order/take_title', data) } /** * @description 导出列表 -- 文件类型 */ - export function excelFileType() { - return request.get('excel/type') +export function excelFileType() { + return request.get('excel/type') } /** * @description 发送货 -- 门店列表 */ - export function getStoreLst() { +export function getStoreLst() { return request.get(`delivery/station/options`) } /** * @description 同城配送 -- 订单列表 */ - export function deliveryOrderLst(data) { +export function deliveryOrderLst(data) { return request.get(`delivery/order/lst`, data) } /** * @description 同城订单 -- 取消 */ - export function deliveryOrderCancle(id) { +export function deliveryOrderCancle(id) { return request.get(`delivery/order/cancel/${id}/form`) } /** * @description 同城配送 -- 充值记录列表 */ - export function rechargeLst(data) { +export function rechargeLst(data) { return request.get(`delivery/station/payLst`, data) } /** * @description 同城配送 -- 充值记录卡片数据 */ - export function rechargeCardApi() { +export function rechargeCardApi() { return request.get(`delivery/title`) } /** * @description 同城配送 -- 充值余额 */ - export function rechargeBalancei() { +export function rechargeBalancei() { return request.get(`delivery/belence`) } \ No newline at end of file diff --git a/src/api/public.js b/src/api/public.js new file mode 100644 index 0000000..ddb9d3f --- /dev/null +++ b/src/api/public.js @@ -0,0 +1,17 @@ +// +---------------------------------------------------------------------- +// | CRMEB [ CRMEB赋能开发者，助力企业发展 ] +// +---------------------------------------------------------------------- +// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved. +// +---------------------------------------------------------------------- +// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权 +// +---------------------------------------------------------------------- +// | Author: CRMEB Team +// +---------------------------------------------------------------------- +import request from './request' +/** + * @description 上传图片 + */ +export function uploadImage(data) { + return request.post('upload/image/0/file', data) +} + diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue index f0770cf..857ef92 100644 --- a/src/views/merchant/application/index.vue +++ b/src/views/merchant/application/index.vue @@ -361,7 +361,8 @@ import { intentionDelte, intentionStatusApi, getstoreTypeApi, - getMerCateApi + getMerCateApi, + updateStatus } from "@/api/merchant"; import { fromList, statusList } from "@/libs/constants.js"; import { roterPre } from "@/settings"; @@ -510,6 +511,25 @@ export default { // 添加 + // 提交状态修改 + handleSubmit() { + if (this.statusAuditForm.state == 2 && !this.statusAuditForm.fail_msg) { + return this.$message.warning("请输入拒绝原因"); + } + + updateStatus(this.statusAuditForm.mer_intention_id, { + status: this.statusAuditForm.state, + create_mer: this.statusAuditForm.create_mer, + fail_msg: this.statusAuditForm.fail_msg + }).then(res => { + this.statusAuditVisible = false; + this.$message.success(res.message); + this.getList(""); + }).catch(({ message }) => { + this.$message.error(message); + }); + }, + // 编辑 onEdit(id) { this.$modalForm(auditApi(id)).then(() => this.getList("")); diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue index af07801..221704d 100644 --- a/src/views/order/list/index.vue +++ b/src/views/order/list/index.vue @@ -3,189 +3,95 @@
- - 全部 {{ '(' +orderChartType.all?orderChartType.all:0 + ')' }} - 待付款 {{ '(' +orderChartType.unpaid?orderChartType.unpaid:0+ ')' }} - 待发货 {{ '(' +orderChartType.unshipped?orderChartType.unshipped:0+ ')' }} - 待收货 {{ '(' +orderChartType.untake?orderChartType.untake:0+ ')' }} - 待评价 {{ '(' +orderChartType.unevaluate?orderChartType.unevaluate:0+ ')' }} - 交易完成 {{ '(' +orderChartType.complete?orderChartType.complete:0+ ')' }} - 已退款 {{ '(' +orderChartType.refund?orderChartType.refund:0+ ')' }} - 已删除 {{ '(' +orderChartType.del?orderChartType.del:0+ ')' }} + + 全部 {{ '(' + orderChartType.all ? orderChartType.all : 0 + ')' }} + 待付款 {{ '(' + orderChartType.unpaid ? orderChartType.unpaid : 0 + ')' + }} + 待发货 {{ '(' + orderChartType.unshipped ? orderChartType.unshipped : 0 + ')' + }} + 待收货 {{ '(' + orderChartType.untake ? orderChartType.untake : 0 + ')' + }} + 待评价 {{ '(' + orderChartType.unevaluate ? orderChartType.unevaluate : 0 + ')' + }} + 交易完成 {{ '(' + orderChartType.complete ? orderChartType.complete : 0 + ')' + }} + 已退款 {{ '(' + orderChartType.refund ? orderChartType.refund : 0 + ')' + }} + 已删除 {{ '(' + orderChartType.del ? orderChartType.del : 0 + ')' + }} - + - - + + - - + + - + - + - + - - - - - - - - - + + + + + + + + + - + - + - + 搜索 - 重置 + 重置
- + 导出列表 - + + + + + + - +
- +
- + - + + + + + + + + + +
+ + +
+ 将凭证图片拖到此处，或点击上传 +
+
+ 只能上传图片文件 +
+ +
+ +
+ 取消 + 确认 +
+ + @@ -344,7 +266,7 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- -import { orderListApi, chartApi, cardListApi, exportOrderApi } from "@/api/order"; +import { orderListApi, chartApi, cardListApi, exportOrderApi, orderOtherPayOrder } from "@/api/order"; import { merSelectApi } from "@/api/product"; import userDetails from '../../user/list/userDetails'; import orderDetail from './orderDetails.vue'; @@ -352,10 +274,13 @@ import createWorkBook from '@/utils/newToExcel.js'; import cardsData from "@/components/cards/index"; import { fromList } from "@/libs/constants.js"; import timeOptions from '@/utils/timeOptions'; +import { uploadImage } from "@/api/public"; + export default { components: { orderDetail, cardsData, userDetails }, data() { return { + dialogVoucher: false, //上传凭证 pickerOptions: timeOptions, orderId: 0, tableData: { @@ -363,11 +288,11 @@ export default { total: 0, }, activity: [ - {name: "普通订单",type: 0}, - {name: "秒杀订单",type: 1}, - {name: "预售订单",type: 2}, - {name: "助力订单",type: 3}, - {name: "拼团订单",type: 4} + { name: "普通订单", type: 0 }, + { name: "秒杀订单", type: 1 }, + { name: "预售订单", type: 2 }, + { name: "助力订单", type: 3 }, + { name: "拼团订单", type: 4 } ], listLoading: true, tableFrom: { @@ -384,7 +309,7 @@ export default { is_trader: '', pay_type: "", filter_delivery: '', - filter_product : '', + filter_product: '', activity_type: '' }, dliveryWayList: [ @@ -421,6 +346,10 @@ export default { merSelect: [], drawer: false, userDawer: false, + voucherInfo: { + id: '', + images: '' + } }; }, mounted() { @@ -447,8 +376,47 @@ export default { this.getList(''); }, methods: { + + // 上传凭证 + uploadVoucher(data) { + this.voucherInfo.id = data.order_id; + this.voucherInfo.order_sn = data.order_sn; + this.dialogVoucher = true; + }, + + async uploadVoucherImage(options) { + console.log('上传', options); + const file = options.file; + const formData = new FormData(); + formData.append('file', file); + uploadImage(formData).then((res) => { + this.$message.success('上传成功'); + this.voucherInfo.image = res.data.src; + }).catch(e => { + this.$message.error(e); + }) + }, + // 上传 + addVoucher() { + if (!this.voucherInfo.image) return this.$message.error('请先上传凭证!'); + orderOtherPayOrder({ + id: this.voucherInfo.id, + images: this.voucherInfo.image + }).then(res => { + this.$message.success(res.message); + this.closeDialogVoucher(); + this.getList(); + }).catch(e => { + this.$message.error(e); + }) + }, + + closeDialogVoucher() { + this.dialogVoucher = false; + }, + /**重置 */ - searchReset(){ + searchReset() { this.timeVal = [] this.tableFrom.date = "" this.$refs.searchForm.resetFields() @@ -500,7 +468,7 @@ export default { onUserDetails(uid) { this.uid = uid this.userDawer = true - this.$refs.userDetails.getData(uid,false,true); + this.$refs.userDetails.getData(uid, false, true); }, closeDrawer() { this.drawer = false @@ -517,13 +485,13 @@ export default { let lebData = {}; for (let i = 0; i < pageCount; i++) { lebData = await this.downData(excelData) - pageCount = Math.ceil(lebData.count/excelData.limit) + pageCount = Math.ceil(lebData.count / excelData.limit) if (lebData.export.length) { data = data.concat(lebData.export) excelData.page++ } } - createWorkBook(lebData.header, lebData.title, data, lebData.foot,lebData.filename); + createWorkBook(lebData.header, lebData.title, data, lebData.foot, lebData.filename); return }, /**订单列表 */ @@ -595,17 +563,17 @@ export default { .then((res) => { this.tableData.data = res.data.list; this.tableData.total = res.data.count; - // this.cardLists = res.data.stat; + // this.cardLists = res.data.stat; this.listLoading = false; - // this.getCardList(); + // this.getCardList(); }) .catch((res) => { this.$message.error(res.message); this.listLoading = false; }); }, - getCardList(){ - cardListApi(this.tableFrom) + getCardList() { + cardListApi(this.tableFrom) .then((res) => { this.cardLists = res.data; }) @@ -636,16 +604,19 @@ export default {