lhl há 1 ano atrás
pai
commit
f7759e84dc

+ 325 - 277
src/api/order.js

@@ -14,11 +14,11 @@ import request from '@/plugins/request';
  * @param {Object} param data {Object} 传值参数
  */
 export function orderList(data) {
-    return request({
-        url: '/order/list',
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: '/order/list',
+		method: 'get',
+		params: data
+	});
 };
 
 /**
@@ -26,22 +26,22 @@ export function orderList(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function getOrdes(data) {
-    return request({
-        url: '/order/chart',
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: '/order/chart',
+		method: 'get',
+		params: data
+	});
 };
 
 /**
  * @description 积分商城订单 -- 导出
  */
 export function storeIntegralOrder(data) {
-    return request({
-        url: `export/storeIntegralOrder`,
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: `export/storeIntegralOrder`,
+		method: 'get',
+		params: data
+	});
 }
 
 /**
@@ -49,10 +49,10 @@ export function storeIntegralOrder(data) {
  * @param {Number} param id {Number} 订单id
  */
 export function getOrdeDatas(id) {
-    return request({
-        url: `/order/edit/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/edit/${id}`,
+		method: 'get'
+	});
 };
 
 /**
@@ -60,33 +60,33 @@ export function getOrdeDatas(id) {
  * @param {Number} param id {Number} 订单id
  */
 export function getDataInfo(id) {
-    return request({
-        url: `/order/info/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/info/${id}`,
+		method: 'get'
+	});
 };
 
 /**
  * @description 订单表单详情数据-退款详情
  * @param {Number} param id {Number} 订单id
  */
- export function getRefundDataInfo (id) {
-    return request({
-        url: `/refund/detail/${id}`,
-        method: 'get'
-    })
+export function getRefundDataInfo(id) {
+	return request({
+		url: `/refund/detail/${id}`,
+		method: 'get'
+	})
 };
 
 /**
  * @description 售后订单表单详情数据
  * @param {Number} param id {Number} 订单id
  */
- export function getServiceRefundDataInfo (data) {
-    return request({
-        url: `/service/refund_info`,
-        method: 'get',
-		prompt:data
-    })
+export function getServiceRefundDataInfo(data) {
+	return request({
+		url: `/service/refund_info`,
+		method: 'get',
+		prompt: data
+	})
 };
 
 
@@ -96,11 +96,11 @@ export function getDataInfo(id) {
  * @param {String} param data.remark {String} 备注信息
  */
 export function putRemarkData(data) {
-    return request({
-        url: `/order/remark/${data.id}`,
-        method: 'put',
-        data: data.remark
-    });
+	return request({
+		url: `/order/remark/${data.id}`,
+		method: 'put',
+		data: data.remark
+	});
 };
 
 /**
@@ -108,12 +108,12 @@ export function putRemarkData(data) {
  * @param {Number} param data.id {Number} 订单id
  * @param {String} param data.remark {String} 备注信息
  */
- export function putRefundRemarkData(data) {
-    return request({
-        url: `/refund/remark/${data.id}`,
-        method: 'put',
-        data: data.remark
-    });
+export function putRefundRemarkData(data) {
+	return request({
+		url: `/refund/remark/${data.id}`,
+		method: 'put',
+		data: data.remark
+	});
 };
 
 /**
@@ -122,11 +122,11 @@ export function putRemarkData(data) {
  * @param {String} param data.datas {String} 分页参数
  */
 export function getOrderRecord(data) {
-    return request({
-        url: `/order/status/${data.id}`,
-        method: 'get',
-        params: data.datas
-    });
+	return request({
+		url: `/order/status/${data.id}`,
+		method: 'get',
+		params: data.datas
+	});
 };
 
 /**
@@ -134,31 +134,31 @@ export function getOrderRecord(data) {
  * @param {Number} param id {Number} 订单id
  */
 export function getRefundFrom(id) {
-    return request({
-        url: `/order/refund/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/refund/${id}`,
+		method: 'get'
+	});
 };
 
 /**
  * @description 获取售后退款表单数据
  * @param {Number} param id {Number} 订单id
  */
- export function getRefundOrderFrom(id) {
-    return request({
-        url: `/refund/refund/${id}`,
-        method: 'get'
-    });
+export function getRefundOrderFrom(id) {
+	return request({
+		url: `/refund/refund/${id}`,
+		method: 'get'
+	});
 };
 
 /**
  * @description 获取快递公司
  */
 export function getExpressData(status) {
-    return request({
-        url: `/order/express_list?status=` + status,
-        method: 'get'
-    })
+	return request({
+		url: `/order/express_list?status=` + status,
+		method: 'get'
+	})
 };
 
 /**
@@ -166,10 +166,10 @@ export function getExpressData(status) {
  * @param {Number} param id {Number} 订单id
  */
 export function getnoRefund(id) {
-    return request({
-        url: `/order/no_refund/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/no_refund/${id}`,
+		method: 'get'
+	});
 };
 
 /**
@@ -178,11 +178,11 @@ export function getnoRefund(id) {
  * @param {Object} param data.datas {Object} 表单信息
  */
 export function putDelivery(data) {
-    return request({
-        url: `/order/delivery/${data.id}`,
-        method: 'put',
-        data: data.datas
-    });
+	return request({
+		url: `/order/delivery/${data.id}`,
+		method: 'put',
+		data: data.datas
+	});
 };
 
 /**
@@ -191,11 +191,11 @@ export function putDelivery(data) {
  * @param {Object} param data.datas {Object} 表单信息
  */
 export function splitDelivery(data) {
-    return request({
-        url: `/order/split_delivery/${data.id}`,
-        method: 'put',
-        data: data.datas
-    });
+	return request({
+		url: `/order/split_delivery/${data.id}`,
+		method: 'put',
+		data: data.datas
+	});
 };
 
 /**
@@ -203,10 +203,10 @@ export function splitDelivery(data) {
  * @param {Number} param id {Number} 订单id
  */
 export function refundIntegral(id) {
-    return request({
-        url: `/order/refund_integral/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/refund_integral/${id}`,
+		method: 'get'
+	});
 };
 
 /**
@@ -215,10 +215,10 @@ export function refundIntegral(id) {
  * @param {String} param method {String} 请求方式
  */
 export function payOffline(path, method) {
-    return request({
-        url: path,
-        method: method
-    });
+	return request({
+		url: path,
+		method: method
+	});
 };
 
 /**
@@ -226,10 +226,10 @@ export function payOffline(path, method) {
  * @param {Number} param id {Number} 订单id
  */
 export function getDistribution(id) {
-    return request({
-        url: `/order/distribution/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/distribution/${id}`,
+		method: 'get'
+	});
 };
 
 /**
@@ -237,10 +237,10 @@ export function getDistribution(id) {
  * @param {Number} param id {Number} 订单id
  */
 export function getExpress(id) {
-    return request({
-        url: `/order/express/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/express/${id}`,
+		method: 'get'
+	});
 };
 
 /**
@@ -248,32 +248,32 @@ export function getExpress(id) {
  * @param {String} param data {String} 核销内容
  */
 export function putWrite(data) {
-    return request({
-        url: '/order/write',
-        method: 'post',
-        data: data
-    });
+	return request({
+		url: '/order/write',
+		method: 'post',
+		data: data
+	});
 }
 
 /**
  * @description 订单管理 -- 导出
  */
 export function storeOrderApi(data) {
-    return request({
-        url: `export/storeOrder`,
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: `export/storeOrder`,
+		method: 'get',
+		params: data
+	});
 }
 
 /**
  * @description 订单核销
  */
 export function writeUpdate(id) {
-    return request({
-        url: `/order/write_update/${id}`,
-        method: 'put'
-    });
+	return request({
+		url: `/order/write_update/${id}`,
+		method: 'put'
+	});
 }
 
 /**
@@ -281,52 +281,52 @@ export function writeUpdate(id) {
  * @param {com} data 快递公司编号
  */
 export function orderExpressTemp(data) {
-    return request({
-        url: '/order/express/temp',
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: '/order/express/temp',
+		method: 'get',
+		params: data
+	});
 }
 
 /**
  * 配送员列表
  */
 export function orderDeliveryIndex() {
-    return request({
-        url: '/order/delivery/index',
-        method: 'get'
-    });
+	return request({
+		url: '/order/delivery/index',
+		method: 'get'
+	});
 }
 
 /**
  * 所有配送员列表
  */
 export function deliveryList(data) {
-    return request({
-        url: '/order/delivery/index',
-        method: 'get',
-        params: data
-    });
+	return request({
+		url: '/order/delivery/index',
+		method: 'get',
+		params: data
+	});
 }
 
 /**
  * 订单时获取所有配送员列表
  */
 export function orderDeliveryList() {
-    return request({
-        url: '/order/delivery/list',
-        method: 'get'
-    });
+	return request({
+		url: '/order/delivery/list',
+		method: 'get'
+	});
 }
 
 /**
  * 新增配送员表单
  */
 export function orderDeliveryAdd() {
-    return request({
-        url: '/order/delivery/add',
-        method: 'get'
-    });
+	return request({
+		url: '/order/delivery/add',
+		method: 'get'
+	});
 }
 
 /**
@@ -334,10 +334,10 @@ export function orderDeliveryAdd() {
  * @param {*} id id
  */
 export function orderDeliveryEdit(id) {
-    return request({
-        url: `/order/delivery/${id}/edit`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/delivery/${id}/edit`,
+		method: 'get'
+	});
 }
 
 /**
@@ -345,10 +345,10 @@ export function orderDeliveryEdit(id) {
  * @param {*} id id
  */
 export function orderDeliveryDel(id) {
-    return request({
-        url: `/order/delivery/del/${id}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/delivery/del/${id}`,
+		method: 'get'
+	});
 }
 
 /**
@@ -356,39 +356,39 @@ export function orderDeliveryDel(id) {
  * @param {*} data data
  */
 export function orderDeliveryStatus(data) {
-    return request({
-        url: `/order/delivery/set_status/${data.id}/${data.status}`,
-        method: 'get'
-    });
+	return request({
+		url: `/order/delivery/set_status/${data.id}/${data.status}`,
+		method: 'get'
+	});
 }
 
 export function orderSheetInfo() {
-    return request({
-        url: '/order/sheet_info',
-        method: 'get'
-    });
+	return request({
+		url: '/order/sheet_info',
+		method: 'get'
+	});
 }
 
 /**
  * 收银订单
  */
 export function orderScanList(data) {
-    return request({
-        url: 'order/scan_list',
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: 'order/scan_list',
+		method: 'get',
+		params: data
+	})
 }
 
 /**
  * 线下收款码
  */
 export function orderOfflineScan(id) {
-    return request({
-        url: 'order/offline_scan',
-        method: 'get',
-        params: id
-    })
+	return request({
+		url: 'order/offline_scan',
+		method: 'get',
+		params: id
+	})
 }
 
 /**
@@ -396,10 +396,10 @@ export function orderOfflineScan(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderInvoiceChart() {
-    return request({
-        url: 'order/invoice/chart',
-        method: 'get'
-    })
+	return request({
+		url: 'order/invoice/chart',
+		method: 'get'
+	})
 };
 
 /**
@@ -407,11 +407,11 @@ export function orderInvoiceChart() {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderInvoiceList(data) {
-    return request({
-        url: 'order/invoice/list',
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: 'order/invoice/list',
+		method: 'get',
+		params: data
+	})
 };
 
 /**
@@ -419,11 +419,11 @@ export function orderInvoiceList(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderInvoiceSet(id, data) {
-    return request({
-        url: `order/invoice/set/${id}`,
-        method: 'post',
-        data
-    })
+	return request({
+		url: `order/invoice/set/${id}`,
+		method: 'post',
+		data
+	})
 };
 
 /**
@@ -431,10 +431,10 @@ export function orderInvoiceSet(id, data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderInvoiceInfo(id) {
-    return request({
-        url: `order/invoice_order_info/${id}`,
-        method: 'get'
-    })
+	return request({
+		url: `order/invoice_order_info/${id}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -442,11 +442,11 @@ export function orderInvoiceInfo(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function handBatchDelivery(data) {
-    return request({
-        url: 'order/hand/batch_delivery',
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: 'order/hand/batch_delivery',
+		method: 'get',
+		params: data
+	})
 };
 
 /**
@@ -454,11 +454,11 @@ export function handBatchDelivery(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function otherBatchDelivery(data) {
-    return request({
-        url: 'order/other/batch_delivery',
-        method: 'post',
-        data
-    })
+	return request({
+		url: 'order/other/batch_delivery',
+		method: 'post',
+		data
+	})
 };
 
 /**
@@ -466,11 +466,11 @@ export function otherBatchDelivery(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function queueIndex(data) {
-    return request({
-        url: 'queue/index',
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: 'queue/index',
+		method: 'get',
+		params: data
+	})
 };
 
 /**
@@ -478,11 +478,11 @@ export function queueIndex(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function deliveryLog(id, type, data) {
-    return request({
-        url: `queue/delivery/log/${id}/${type}`,
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: `queue/delivery/log/${id}/${type}`,
+		method: 'get',
+		params: data
+	})
 };
 
 /**
@@ -490,10 +490,10 @@ export function deliveryLog(id, type, data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function queueAgain(id, type) {
-    return request({
-        url: `queue/again/do_queue/${id}/${type}`,
-        method: 'get'
-    })
+	return request({
+		url: `queue/again/do_queue/${id}/${type}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -501,10 +501,10 @@ export function queueAgain(id, type) {
  * @param {Object} param data {Object} 传值参数
  */
 export function queueDel(id, type) {
-    return request({
-        url: `queue/del/wrong_queue/${id}/${type}`,
-        method: 'get'
-    })
+	return request({
+		url: `queue/del/wrong_queue/${id}/${type}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -512,10 +512,10 @@ export function queueDel(id, type) {
  * @param {Object} param data {Object} 传值参数
  */
 export function queueRepair(id, type) {
-    return request({
-        url: `queue/repair/wrong_queue/${id}/${type}`,
-        method: 'get'
-    })
+	return request({
+		url: `queue/repair/wrong_queue/${id}/${type}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -523,10 +523,10 @@ export function queueRepair(id, type) {
  * @param {Object} param data {Object} 传值参数
  */
 export function batchOrderDelivery(id, type, catchType) {
-    return request({
-        url: `export/batchOrderDelivery/${id}/${type}/${catchType}`,
-        method: 'get'
-    })
+	return request({
+		url: `export/batchOrderDelivery/${id}/${type}/${catchType}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -534,10 +534,10 @@ export function batchOrderDelivery(id, type, catchType) {
  * @param {Object} param data {Object} 传值参数
  */
 export function exportExpressList(id) {
-    return request({
-        url: 'export/expressList',
-        method: 'get'
-    })
+	return request({
+		url: 'export/expressList',
+		method: 'get'
+	})
 };
 
 /**
@@ -545,10 +545,10 @@ export function exportExpressList(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function stopWrongQueue(id) {
-    return request({
-        url: `queue/stop/wrong_queue/${id}`,
-        method: 'get'
-    })
+	return request({
+		url: `queue/stop/wrong_queue/${id}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -556,20 +556,20 @@ export function stopWrongQueue(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function splitCartInfo(id) {
-    return request({
-        url: `order/split_cart_info/${id}`,
-        method: 'get'
-    })
+	return request({
+		url: `order/split_cart_info/${id}`,
+		method: 'get'
+	})
 };
 /**
  * @description 提醒发货
  * @param {Object} param data {Object} 传值参数
  */
 export function remindOrder(data) {
-    return request({
-        url: `order/deliver_remind/${data.supplier_id}/${data.id}`,
-        method: 'put',
-    })
+	return request({
+		url: `order/deliver_remind/${data.supplier_id}/${data.id}`,
+		method: 'put',
+	})
 };
 
 /**
@@ -577,10 +577,10 @@ export function remindOrder(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function splitOrderList(id) {
-    return request({
-        url: `order/split_order/${id}`,
-        method: 'get'
-    })
+	return request({
+		url: `order/split_order/${id}`,
+		method: 'get'
+	})
 };
 
 /**
@@ -588,11 +588,13 @@ export function splitOrderList(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function distributionOrder(id) {
-    return request({
-        url: `/order/distribution_info`,
-        method: 'get',
-        params:{ids:id}
-    })
+	return request({
+		url: `/order/distribution_info`,
+		method: 'get',
+		params: {
+			ids: id
+		}
+	})
 };
 
 /**
@@ -600,11 +602,11 @@ export function distributionOrder(id) {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderServiceRefundList(data) {
-    return request({
-        url: '/service/refund_lst ',
-        method: 'post',
-        data
-    })
+	return request({
+		url: '/service/refund_lst ',
+		method: 'post',
+		data
+	})
 };
 
 /**
@@ -612,11 +614,11 @@ export function orderServiceRefundList(data) {
  * @param {Object} param data {Object} 传值参数
  */
 export function orderRefundList(data) {
-    return request({
-        url: 'refund/list',
-        method: 'get',
-        params: data
-    })
+	return request({
+		url: 'refund/list',
+		method: 'get',
+		params: data
+	})
 };
 
 
@@ -625,12 +627,12 @@ export function orderRefundList(data) {
  * @description 发票导出
  * @param {Object} param data {Object} 传值参数
  */
- export function exportInvoiceList(data) {
-    return request({
-        url: 'export/invoiceExport',
-        method: 'get',
-        params: data
-    })
+export function exportInvoiceList(data) {
+	return request({
+		url: 'export/invoiceExport',
+		method: 'get',
+		params: data
+	})
 };
 
 
@@ -638,12 +640,12 @@ export function orderRefundList(data) {
  * @description 发货记录
  * @param {Object} param data {Object} 传值参数
  */
- export function splitOrder(id,data) {
-    return request({
-        url: 'order/split_order/'+id,
-        method: 'get',
-				params: data	
-    })
+export function splitOrder(id, data) {
+	return request({
+		url: 'order/split_order/' + id,
+		method: 'get',
+		params: data
+	})
 };
 
 /**
@@ -652,19 +654,19 @@ export function orderRefundList(data) {
  * @returns 
  */
 export function putOpenRefund(data) {
-  return request({
-      url: `/order/open/refund/${data.id}`,
-      method: 'post',
-      data
-  })
+	return request({
+		url: `/order/open/refund/${data.id}`,
+		method: 'post',
+		data
+	})
 };
 
 
 export function getServeOrder(params) {
 	return request({
-	    url: `service/Subscribe/lst`,
-	    method: 'get',
-	    params
+		url: `service/Subscribe/lst`,
+		method: 'get',
+		params
 	})
 }
 
@@ -672,32 +674,78 @@ export function getServeOrder(params) {
 //服务项目退款审核
 export function serveRefund(data) {
 	return request({
-	    url: `service/refund_order_examine`,
-	    method: 'post',
-	    data
+		url: `service/refund_order_examine`,
+		method: 'post',
+		data
 	});
 }
 
 export function member_update(data) {
 	return request({
-	    url: `service/Subscribe/member_update`,
-	    method: 'post',
-	    data});
+		url: `service/Subscribe/member_update`,
+		method: 'post',
+		data
+	});
 }
 
 //服务项目退单
 export function active_refund_order(data) {
 	return request({
-	    url: `/service/active_refund_order`,
-	    method: 'post',
-	    data});
+		url: `/service/active_refund_order`,
+		method: 'post',
+		data
+	});
 }
 //员工订单统计
 export function getSubscribeOrderCount(params) {
 	return request({
-	    url: `/work/getSubscribeOrderCount`,
-	    method: 'get',
-	    params
-		});
+		url: `/work/getSubscribeOrderCount`,
+		method: 'get',
+		params
+	});
 }
 
+//
+export function getRechargeList(params) {
+	return request({
+		url: `/store/recharge/lst`,
+		method: 'get',
+		params
+	});
+}
+
+///store/recharge/order_lst
+export function getRechargeOrderList(params) {
+	return request({
+		url: `/store/recharge/order_lst`,
+		method: 'get',
+		params
+	});
+}
+
+//store/recharge/complete_order_lst
+export function completeOrderLst(data) {
+	return request({
+		url: `/store/recharge/complete_order`,
+		method: 'post',
+		data
+	});
+}
+
+///adminapi/store/recharge/delete
+export function deleteOrderLst(data) {
+	return request({
+		url: `/store/recharge/delete`,
+		method: 'post',
+		data
+	});
+}
+
+///store/recharge/edit 
+export function editOrderLst(data) {
+	return request({
+		url: `/store/recharge/edit `,
+		method: 'post',
+		data
+	});
+}

+ 529 - 0
src/pages/marketing/chongzhi/index.vue

@@ -0,0 +1,529 @@
+<template>
+	<!-- 订单-售后订单 -->
+	<div>
+		<!-- <Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
+			<div class="new_card_pd">
+				<Form ref="pagination" inline :model="pagination" :label-width="labelWidth"
+					:label-position="labelPosition" @submit.native.prevent>
+					<FormItem label="支付状态:">
+						<Select v-model="pagination.paid" class="input-add">
+							<Option v-for="(item, index) in num" :value="item.value" :key="index">{{ item.name }}
+							</Option>
+						</Select>
+					</FormItem>
+					<FormItem label="员工ID:" label-for="title">
+						<div class='flex-search'>
+							<Input v-model="pagination.work_member_id" icon="ios-search" @on-click='openmid'
+								placeholder="请输入员工ID" class="input-add mr14" />
+						</div>
+					</FormItem>
+					<FormItem label="用户ID:" label-for="title">
+						<div class='flex-search'>
+							<Input v-model="pagination.uid" icon="ios-search" @on-click='openuid' placeholder="请输入用户ID"
+								class="input-add mr14" />
+						</div>
+					</FormItem>
+
+					<FormItem label="订单搜索:" label-for="title">
+						<Input v-model="pagination.order_id" placeholder="请输入订单号" class="input-add mr14" />
+						<Button type="primary" @click="orderSearch()">查询</Button>
+					</FormItem>
+				</Form>
+			</div>
+		</Card> -->
+		<Menu mode="horizontal" theme="light" active-name="0" @on-select='changeSelect'>
+			<MenuItem name="0">
+			话费充值
+			</MenuItem>
+<!-- 			<MenuItem name="1">
+			话费快充
+			</MenuItem> -->
+			<MenuItem name="2">
+			电费充值
+			</MenuItem>
+		</Menu>
+		<Card :bordered="false" dis-hover class="ivu-mt">
+			<!-- 售后订单表格 -->
+			<Table :columns="thead" :data="tbody" ref="table" :loading="loading" highlight-row no-userFrom-text="暂无数据"
+				no-filtered-userFrom-text="暂无筛选结果">
+				<template slot-scope="{ row }" slot="order_id">
+					<span v-text="row.order_id" style="display: block"></span>
+					<span v-show="row.is_del === 1 && row.delete_time == null" class="span-del">用户已删除</span>
+				</template>
+				<template slot-scope="{ row }" slot="nickname">
+					<div>姓名:{{ row.real_name }}</div>
+					<div>充值号码:{{ row.rechargeno }}</div>
+				</template>
+				<template slot-scope="{ row, index }" slot="kf">
+					<span class="tabBox_pice">{{showName(row.work_member_id)}}</span>
+				</template>
+				<template slot-scope="{ row }" slot="goods_name">
+					<div class="tabBox_serve" >
+						{{row.goods_name}} ( {{row.pay_price}} )
+					</div>
+				</template>
+				<template slot-scope="{ row, index }" slot="pay_price">
+					<span class="tabBox_pice">{{row.pay_price}}</span>
+				</template>
+				<template slot-scope="{ row, index }" slot="reservation_time">
+					<span class="tabBox_pice">{{showTime(row.reservation_time)}}</span>
+				</template>
+				<template slot-scope="{ row }" slot="action">
+					<a @click="changeMenu(row)">修改</a>
+				</template>
+			</Table>
+			<div class="acea-row row-right page">
+				<Page :total="total" :current="pagination.page" show-elevator show-total @on-change="pageChange"
+					:page-size="pagination.limit" />
+			</div>
+		</Card>
+		<Modal v-model="modals" scrollable title="修改" class="order_box" :closable="false">
+			<Form :label-width="80">
+				<FormItem label="售价:" prop="goods_name">
+					<!-- <Select v-model="chooseId" style="width: 250px">
+						<Option v-for="item in ygList" :key="item.id" :value="item.id">{{ item.name }}</Option>
+					</Select> -->
+					<Input v-model="chooseGood.goods_name" placeholder="请输入商品名称" />
+				</FormItem>
+				<FormItem label="实际到账:" prop="num">
+					<!-- <Select v-model="chooseId" style="width: 250px">
+						<Option v-for="item in ygList" :key="item.id" :value="item.id">{{ item.name }}</Option>
+					</Select> -->
+					<Input v-model="chooseGood.num" disabled/>
+				</FormItem>
+				<FormItem label="售价:" prop="chooseId">
+					<!-- <Select v-model="chooseId" style="width: 250px">
+						<Option v-for="item in ygList" :key="item.id" :value="item.id">{{ item.name }}</Option>
+					</Select> -->
+					<Input v-model="chooseGood.price" placeholder="请输入售价" />
+				</FormItem>
+			</Form>
+			<div slot="footer">
+				<Button type="primary" @click="goCancal">提交</Button>
+				<Button @click="cancal">取消</Button>
+			</div>
+		</Modal>
+		<Modal v-model="userListShow" width='80' mask title="用户选择">
+			<userlist @imageObject='checkUser'></userlist>
+			<template #footer>
+				<Button @click="userListShow=false">取消</Button>
+			</template>
+		</Modal>
+		<Modal v-model="memberListShow" width='80' mask title="员工选择">
+			<staffList @getProductId='checkmember'></staffList>
+			<template #footer>
+				<Button @click="memberListShow=false">取消</Button>
+			</template>
+		</Modal>
+		<Modal v-model="delModel" scrollable title="退单" class="order_box" :closable="false">
+			<Form :label-width="80">
+				<FormItem label="备注:">
+					<Input v-model="delData.remarks" placeholder="请输入退单备注" />
+				</FormItem>
+			</Form>
+			<div slot="footer">
+				<Button type="primary" @click="delConfirm">提交</Button>
+				<Button @click="delModel=false">取消</Button>
+			</div>
+		</Modal>
+	</div>
+</template>
+
+<script>
+	import {
+		mapState
+	} from "vuex";
+	import {
+		getServeOrder,
+		member_update,
+		active_refund_order,
+		getRechargeList,
+		getRechargeOrderList,
+		completeOrderLst,
+		editOrderLst,
+		deleteOrderLst
+	} from "@/api/order";
+	import {
+		getYgList
+	} from "@/api/store"
+	import {
+		erpConfig
+	} from "@/api/erp";
+	import userlist from "@/components/customerInfo/index";
+	import staffList from "@/components/staffList/index";
+	export default {
+		components: {
+			userlist,
+			staffList
+		},
+		data() {
+			return {
+				// price: 0,
+				chooseGood: {
+					price: 0
+				},
+				delModel: false,
+				delData: {
+					id: '',
+					remarks: ''
+				},
+				memberListShow: false,
+				// 显示用户列表
+				userListShow: false,
+				modals: false,
+				order_id: '',
+				ygList: [],
+				chooseId: 0,
+				openErp: false,
+				thead: [
+					{
+						title: "id",
+						align: "center",
+						key: "goods_id",
+						minWidth: 160,
+					},
+					{
+						title: "商品信息",
+						key: "goods_name",
+						minWidth: 250,
+					},
+					{
+						title: "实际到账",
+						key: "num",
+						minWidth: 70,
+					},
+					{
+						title: "售价",
+						key: "price",
+						minWidth: 80,
+					},
+					{
+						title: "操作",
+						slot: "action",
+						fixed: "right",
+						minWidth: 150,
+						align: "center",
+					},
+				],
+				tbody: [],
+				num: [{
+						name: '待支付',
+						value: 0
+					},
+					{
+						name: '已支付',
+						value: 1
+					}
+				],
+				loading: false,
+				total: 0,
+				pagination: {
+					page: 1,
+					limit: 15,
+					order_id: "",
+					time: "",
+					status: 0,
+					uid: '',
+					work_member_id: ''
+				},
+			};
+		},
+		computed: {
+			labelWidth() {
+				return this.isMobile ? undefined : 96;
+			},
+			labelPosition() {
+				return this.isMobile ? "top" : "right";
+			},
+		},
+		created() {
+			this.getYgList()
+			this.getOrderList();
+			// this.getRechargeList()
+			this.getRechargeOrderList()
+		},
+		methods: {
+			// 选中对象
+			changeSelect(res) {
+				this.id = res;
+				this.pagination = {
+					status: '',
+					page: 1,
+					limit: 20,
+					ctype: this.id
+				};
+				this.getOrderList();
+				console.log(res);
+			},
+			getRechargeList() {
+				getRechargeList().then(res => {
+					console.log(res)
+				})
+			},
+			getRechargeOrderList() {
+				getRechargeOrderList().then(res => {
+					console.log(res)
+				})
+			},
+			delConfirm(row) {
+				const that = this;
+				that.delModel = false;
+				that.$Modal.confirm({
+					title: "确认删除",
+					content: '<p>确定删除吗?</p><p>删除后将无法恢复,请谨慎操作!</p>',
+					onOk: () => {
+						console.log('进入');
+						setTimeout(function() {
+							that.$Modal.remove();
+							deleteOrderLst({
+								goods_id: row.id
+							}).then((res) => {
+								that.getOrderList()
+								that.$Message.success("删除成功");
+							}).catch((err) => {
+								that.$Message.error(err.msg);
+							})
+						}, 300);
+					}
+				});
+			},
+			del(row) {
+				const that = this;
+				that.delModel = true;
+				that.delData.id = row.id;
+			},
+			// 打开弹窗
+			openmid(e) {
+				this.memberListShow = true;
+			},
+			// 选中员工
+			checkmember(res) {
+				let data = res[0];
+				this.memberListShow = false;
+				this.pagination.work_member_id = data.id;
+			},
+			// 选中用户
+			checkUser(res) {
+				this.userListShow = false;
+				this.pagination.uid = res.uid;
+			},
+			// 打开弹窗
+			openuid(e) {
+				this.userListShow = true;
+			},
+			showName(id) {
+				let yg = this.ygList.find(item => {
+					return item.id == id
+				})
+				// console.log(yg,'ygygygyg')
+				return yg ? yg.name : ''
+			},
+			getYgList() {
+				// getYgList({
+				// 	page: 1,
+				// 	limit: 1000
+				// }).then(res => {
+				// 	this.ygList = res.data.list
+				// })
+				this.ygList = [
+					{
+						name: '待下单',
+						id: 0
+					},
+					{
+						name: '未充值',
+						id: 1
+					},
+					{
+						name: '已充值',
+						id: 2
+					},
+					{
+						name: '已取消',
+						id: -1
+					}
+				]
+				
+			},
+			showTime(time) {
+				var date = new Date(time * 1000);
+				var year = date.getFullYear(); // 获取年份
+				var month = ("0" + (date.getMonth() + 1)).slice(-2); // 获取月份(注意月份从 0 开始,需要加 1)
+				var day = ("0" + date.getDate()).slice(-2); // 获取日期
+				var hours = ("0" + date.getHours()).slice(-2); // 获取小时
+				var minutes = ("0" + date.getMinutes()).slice(-2); // 获取分钟
+				var seconds = ("0" + date.getSeconds()).slice(-2); // 获取秒钟
+				var dateString = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; // 自定义时间格式
+				return dateString
+			},
+			showPrice(list) {
+				let price = 0;
+				list.forEach(item => {
+					price += item.pay_price * 1
+				})
+				return price.toFixed(2)
+			},
+			// 操作
+			changeMenu(row, name) {
+				this.chooseGood = row
+				this.modals = true
+				this.order_id = row.id
+			},
+			cancal() {
+				this.modals = false
+			},
+			getygList() {
+				getYgList().then(res => {
+					console.log(res)
+					this.ygList = res.data.list
+				})
+			},
+			goCancal() {
+				if (this.chooseGood.price == '') {
+					return this.$Message.error('输入售价')
+				}
+				if (this.chooseGood.goods_name == '') {
+					return this.$Message.error('输入商品名称')
+				}
+				this.modals = false
+				editOrderLst({
+					goods_id: this.chooseGood.goods_id,
+					goods_name: this.chooseGood.goods_name,
+					cid: this.chooseGood.cid,
+					price: this.chooseGood.price,
+					num: this.chooseGood.num
+				}).then(res => {
+					this.$Message.success(res.msg)
+					this.getOrderList()
+				}).catch(err => {
+					this.$Message.error(err.msg)
+				})
+
+			},
+			// 订单列表
+			getOrderList() {
+				this.loading = true;
+				getRechargeList(this.pagination)
+					.then((res) => {
+						this.loading = false;
+						// const {
+						// 	count,
+						// 	list,
+						// 	num,
+						// 	data
+						// } = res.data;
+						// this.total = count;
+						// this.tbody = data;
+						let arr = [];
+						res.data.forEach(item =>{
+							// arr.push(item.)
+							console.log(item.goods)
+							arr = arr.concat(item.goods)
+						})
+						this.tbody = arr;
+						console.log(arr,'arr')
+					})
+					.catch((err) => {
+						this.loading = false;
+						this.$Message.error(err.msg);
+					});
+			},
+			// 分页
+			pageChange(index) {
+				this.pagination.page = index;
+				this.getOrderList();
+			},
+			// 订单搜索
+			orderSearch() {
+				this.pagination.page = 1;
+				this.getOrderList();
+			},
+		},
+	};
+</script>
+
+<style lang="stylus" scoped>
+	.span-del {
+		color: #ed4014;
+		display: block
+	}
+
+	.code {
+		position: relative;
+	}
+
+	.QRpic {
+		width: 180px;
+		height: 259px;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.tabBox {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.tabRow {
+			width: 0;
+			flex-grow: 1;
+			display: flex;
+		}
+
+		.tabBox_serve {
+			flex-shrink: 0;
+			padding-left: 5px;
+		}
+
+		.tabBox_content {
+			width: 0;
+			flex-grow: 1;
+			padding-left: 5px;
+		}
+
+		.tabBox_pice {
+			flex-shrink: 0;
+		}
+
+		.tabBox_img {
+			width: 30px;
+			height: 30px;
+			flex-shrink: 0;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.tabBox_tit {
+			flex-grow: 1;
+			font-size: 12px !important;
+			letter-spacing: 1px;
+			box-sizing: border-box;
+		}
+	}
+
+	.tabBox+.tabBox {
+		margin-top: 5px;
+	}
+
+	.pictrue-box {
+		display: flex;
+		align-item: center;
+	}
+
+	.pictrue {
+		width: 25px;
+		height: 25px;
+	}
+
+	.flex-search {
+		display: flex;
+	}
+</style>

+ 534 - 0
src/pages/order/three/index.vue

@@ -0,0 +1,534 @@
+<template>
+	<!-- 订单-售后订单 -->
+	<div>
+		<!-- <Card :bordered="false" dis-hover class="ivu-mt" :padding="0">
+			<div class="new_card_pd">
+				<Form ref="pagination" inline :model="pagination" :label-width="labelWidth"
+					:label-position="labelPosition" @submit.native.prevent>
+					<FormItem label="支付状态:">
+						<Select v-model="pagination.paid" class="input-add">
+							<Option v-for="(item, index) in num" :value="item.value" :key="index">{{ item.name }}
+							</Option>
+						</Select>
+					</FormItem>
+					<FormItem label="员工ID:" label-for="title">
+						<div class='flex-search'>
+							<Input v-model="pagination.work_member_id" icon="ios-search" @on-click='openmid'
+								placeholder="请输入员工ID" class="input-add mr14" />
+						</div>
+					</FormItem>
+					<FormItem label="用户ID:" label-for="title">
+						<div class='flex-search'>
+							<Input v-model="pagination.uid" icon="ios-search" @on-click='openuid' placeholder="请输入用户ID"
+								class="input-add mr14" />
+						</div>
+					</FormItem>
+
+					<FormItem label="订单搜索:" label-for="title">
+						<Input v-model="pagination.order_id" placeholder="请输入订单号" class="input-add mr14" />
+						<Button type="primary" @click="orderSearch()">查询</Button>
+					</FormItem>
+				</Form>
+			</div>
+		</Card> -->
+		<Card :bordered="false" dis-hover class="ivu-mt">
+			<!-- 售后订单表格 -->
+			<Table :columns="thead" :data="tbody" ref="table" :loading="loading" highlight-row no-userFrom-text="暂无数据"
+				no-filtered-userFrom-text="暂无筛选结果">
+				<template slot-scope="{ row }" slot="order_id">
+					<span v-text="row.order_id" style="display: block"></span>
+					<span v-show="row.is_del === 1 && row.delete_time == null" class="span-del">用户已删除</span>
+				</template>
+				<template slot-scope="{ row }" slot="nickname">
+					<div>姓名:{{ row.real_name }}</div>
+					<div>充值号码:{{ row.rechargeno }}</div>
+				</template>
+				<template slot-scope="{ row, index }" slot="kf">
+					<span class="tabBox_pice">{{showName(row.work_member_id)}}</span>
+				</template>
+				<template slot-scope="{ row }" slot="goods_name">
+					<div class="tabBox_serve" >
+						{{row.goods_name}} ( {{row.pay_price}} )
+					</div>
+				</template>
+				<template slot-scope="{ row, index }" slot="pay_price">
+					<span class="tabBox_pice">{{row.pay_price}}</span>
+				</template>
+				<template slot-scope="{ row, index }" slot="reservation_time">
+					<span class="tabBox_pice">{{showTime(row.reservation_time)}}</span>
+				</template>
+				<template slot-scope="{ row, index }" slot="status">
+					<div class="tabBox_serve" v-if="row.status==0">
+						待下单
+					</div>
+					<div class="tabBox_serve" v-if="row.status==1">
+						未充值
+					</div>
+					<div class="tabBox_serve" v-if="row.status==2">
+						已充值
+					</div>
+					<div class="tabBox_serve" v-if="row.status== -1">
+						已取消
+					</div>
+				</template>
+				<template slot-scope="{ row }" slot="pay_type">
+					<div class="tabBox_serve" v-if="row.pay_type=='weixin'">
+						微信
+					</div>
+					<div class="tabBox_serve" v-if="row.pay_type=='yue'">
+						余额
+					</div>
+					<div class="tabBox_serve" v-if="row.pay_type=='offline'">
+						线下
+					</div>
+					<div class="tabBox_serve" v-if="row.pay_type=='alipay'">
+						支付宝
+					</div>
+					<div class="tabBox_serve" v-if="row.pay_type=='cash'">
+						现金
+					</div>
+				</template>
+				<template slot-scope="{ row }" slot="paid">
+					<div class="tabBox_serve" v-if="row.paid==0" style="color: red;">
+						未支付
+					</div>
+					<div class="tabBox_serve" v-if="row.paid==1" style="color: #57a3f3;">
+						已支付
+					</div>
+				</template>
+				<template slot-scope="{ row, index }" slot="add_time">
+					<span class="tabBox_pice">{{showTime(row.add_time)}}</span>
+				</template>
+				<template slot-scope="{ row }" slot="action">
+					<a @click="changeMenu(row)">修改状态</a>
+				</template>
+			</Table>
+			<div class="acea-row row-right page">
+				<Page :total="total" :current="pagination.page" show-elevator show-total @on-change="pageChange"
+					:page-size="pagination.limit" />
+			</div>
+		</Card>
+		<Modal v-model="modals" scrollable title="修改订单状态" class="order_box" :closable="false">
+			<Form :label-width="80">
+				<FormItem label="订单状态:" prop="chooseId">
+					<Select v-model="chooseId" style="width: 250px">
+						<Option v-for="item in ygList" :key="item.id" :value="item.id">{{ item.name }}</Option>
+					</Select>
+				</FormItem>
+			</Form>
+			<div slot="footer">
+				<Button type="primary" @click="goCancal">提交</Button>
+				<Button @click="cancal">取消</Button>
+			</div>
+		</Modal>
+		<Modal v-model="userListShow" width='80' mask title="用户选择">
+			<userlist @imageObject='checkUser'></userlist>
+			<template #footer>
+				<Button @click="userListShow=false">取消</Button>
+			</template>
+		</Modal>
+		<Modal v-model="memberListShow" width='80' mask title="员工选择">
+			<staffList @getProductId='checkmember'></staffList>
+			<template #footer>
+				<Button @click="memberListShow=false">取消</Button>
+			</template>
+		</Modal>
+		<Modal v-model="delModel" scrollable title="退单" class="order_box" :closable="false">
+			<Form :label-width="80">
+				<FormItem label="备注:">
+					<Input v-model="delData.remarks" placeholder="请输入退单备注" />
+				</FormItem>
+			</Form>
+			<div slot="footer">
+				<Button type="primary" @click="delConfirm">提交</Button>
+				<Button @click="delModel=false">取消</Button>
+			</div>
+		</Modal>
+	</div>
+</template>
+
+<script>
+	import {
+		mapState
+	} from "vuex";
+	import {
+		getServeOrder,
+		member_update,
+		active_refund_order,
+		getRechargeList,
+		getRechargeOrderList,
+		completeOrderLst,
+		deleteOrderLst
+	} from "@/api/order";
+	import {
+		getYgList
+	} from "@/api/store"
+	import {
+		erpConfig
+	} from "@/api/erp";
+	import userlist from "@/components/customerInfo/index";
+	import staffList from "@/components/staffList/index";
+	export default {
+		components: {
+			userlist,
+			staffList
+		},
+		data() {
+			return {
+				delModel: false,
+				delData: {
+					id: '',
+					remarks: ''
+				},
+				memberListShow: false,
+				// 显示用户列表
+				userListShow: false,
+				modals: false,
+				order_id: '',
+				ygList: [],
+				chooseId: 0,
+				openErp: false,
+				thead: [
+					{
+						title: "id",
+						align: "center",
+						key: "id",
+						minWidth: 160,
+					},
+					{
+						title: "用户信息",
+						slot: "nickname",
+						minWidth: 140,
+					},
+					{
+						title: "商品信息",
+						slot: "goods_name",
+						minWidth: 250,
+					},
+					{
+						title: "支付金额",
+						slot: "pay_price",
+						minWidth: 70,
+					},
+					{
+						title: "支付方式",
+						slot: "pay_type",
+						minWidth: 80,
+					},
+					{
+						title: "支付状态",
+						slot: "paid",
+						minWidth: 70,
+					},
+					{
+						title: "状态",
+						slot: "status",
+						minWidth: 80,
+					},
+					{
+						title: "下单时间",
+						key: "create_time",
+						minWidth: 130,
+					},
+					{
+						title: "操作",
+						slot: "action",
+						fixed: "right",
+						minWidth: 150,
+						align: "center",
+					},
+				],
+				tbody: [],
+				num: [{
+						name: '待支付',
+						value: 0
+					},
+					{
+						name: '已支付',
+						value: 1
+					}
+				],
+				loading: false,
+				total: 0,
+				pagination: {
+					page: 1,
+					limit: 15,
+					order_id: "",
+					time: "",
+					status: 0,
+					uid: '',
+					work_member_id: ''
+				},
+			};
+		},
+		computed: {
+			labelWidth() {
+				return this.isMobile ? undefined : 96;
+			},
+			labelPosition() {
+				return this.isMobile ? "top" : "right";
+			},
+		},
+		created() {
+			this.getYgList()
+			this.getOrderList();
+			this.getRechargeList()
+			this.getRechargeOrderList()
+		},
+		methods: {
+			getRechargeList() {
+				getRechargeList().then(res => {
+					console.log(res)
+				})
+			},
+			getRechargeOrderList() {
+				getRechargeOrderList().then(res => {
+					console.log(res)
+				})
+			},
+			delConfirm(row) {
+				const that = this;
+				that.delModel = false;
+				that.$Modal.confirm({
+					title: "确认删除",
+					content: '<p>确定删除吗?</p><p>删除后将无法恢复,请谨慎操作!</p>',
+					onOk: () => {
+						console.log('进入');
+						setTimeout(function() {
+							that.$Modal.remove();
+							deleteOrderLst({
+								goods_id: row.id
+							}).then((res) => {
+								that.getOrderList()
+								that.$Message.success("删除成功");
+							}).catch((err) => {
+								that.$Message.error(err.msg);
+							})
+						}, 300);
+					}
+				});
+			},
+			del(row) {
+				const that = this;
+				that.delModel = true;
+				that.delData.id = row.id;
+			},
+			// 打开弹窗
+			openmid(e) {
+				this.memberListShow = true;
+			},
+			// 选中员工
+			checkmember(res) {
+				let data = res[0];
+				this.memberListShow = false;
+				this.pagination.work_member_id = data.id;
+			},
+			// 选中用户
+			checkUser(res) {
+				this.userListShow = false;
+				this.pagination.uid = res.uid;
+			},
+			// 打开弹窗
+			openuid(e) {
+				this.userListShow = true;
+			},
+			showName(id) {
+				let yg = this.ygList.find(item => {
+					return item.id == id
+				})
+				// console.log(yg,'ygygygyg')
+				return yg ? yg.name : ''
+			},
+			getYgList() {
+				// getYgList({
+				// 	page: 1,
+				// 	limit: 1000
+				// }).then(res => {
+				// 	this.ygList = res.data.list
+				// })
+				this.ygList = [
+					{
+						name: '待下单',
+						id: 0
+					},
+					{
+						name: '未充值',
+						id: 1
+					},
+					{
+						name: '已充值',
+						id: 2
+					},
+					{
+						name: '已取消',
+						id: -1
+					}
+				]
+				
+			},
+			showTime(time) {
+				var date = new Date(time * 1000);
+				var year = date.getFullYear(); // 获取年份
+				var month = ("0" + (date.getMonth() + 1)).slice(-2); // 获取月份(注意月份从 0 开始,需要加 1)
+				var day = ("0" + date.getDate()).slice(-2); // 获取日期
+				var hours = ("0" + date.getHours()).slice(-2); // 获取小时
+				var minutes = ("0" + date.getMinutes()).slice(-2); // 获取分钟
+				var seconds = ("0" + date.getSeconds()).slice(-2); // 获取秒钟
+				var dateString = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds; // 自定义时间格式
+				return dateString
+			},
+			showPrice(list) {
+				let price = 0;
+				list.forEach(item => {
+					price += item.pay_price * 1
+				})
+				return price.toFixed(2)
+			},
+			// 操作
+			changeMenu(row, name) {
+				this.modals = true
+				this.order_id = row.id
+			},
+			cancal() {
+				this.modals = false
+			},
+			getygList() {
+				getYgList().then(res => {
+					console.log(res)
+					this.ygList = res.data.list
+				})
+			},
+			goCancal() {
+				if (this.chooseId == '') {
+					return this.$Message.error('请选择订单状态')
+				}
+				this.modals = false
+				completeOrderLst({
+					id: this.order_id,
+					status: this.chooseId
+				}).then(res => {
+					this.$Message.success(res.msg)
+					this.getOrderList()
+				}).catch(err => {
+					this.$Message.error(err.msg)
+				})
+
+			},
+			// 订单列表
+			getOrderList() {
+				this.loading = true;
+				getRechargeOrderList(this.pagination)
+					.then((res) => {
+						this.loading = false;
+						const {
+							count,
+							list,
+							num
+						} = res.data;
+						this.total = count;
+						this.tbody = list;
+					})
+					.catch((err) => {
+						this.loading = false;
+						this.$Message.error(err.msg);
+					});
+			},
+			// 分页
+			pageChange(index) {
+				this.pagination.page = index;
+				this.getOrderList();
+			},
+			// 订单搜索
+			orderSearch() {
+				this.pagination.page = 1;
+				this.getOrderList();
+			},
+		},
+	};
+</script>
+
+<style lang="stylus" scoped>
+	.span-del {
+		color: #ed4014;
+		display: block
+	}
+
+	.code {
+		position: relative;
+	}
+
+	.QRpic {
+		width: 180px;
+		height: 259px;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	.tabBox {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		.tabRow {
+			width: 0;
+			flex-grow: 1;
+			display: flex;
+		}
+
+		.tabBox_serve {
+			flex-shrink: 0;
+			padding-left: 5px;
+		}
+
+		.tabBox_content {
+			width: 0;
+			flex-grow: 1;
+			padding-left: 5px;
+		}
+
+		.tabBox_pice {
+			flex-shrink: 0;
+		}
+
+		.tabBox_img {
+			width: 30px;
+			height: 30px;
+			flex-shrink: 0;
+
+			img {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.tabBox_tit {
+			flex-grow: 1;
+			font-size: 12px !important;
+			letter-spacing: 1px;
+			box-sizing: border-box;
+		}
+	}
+
+	.tabBox+.tabBox {
+		margin-top: 5px;
+	}
+
+	.pictrue-box {
+		display: flex;
+		align-item: center;
+	}
+
+	.pictrue {
+		width: 25px;
+		height: 25px;
+	}
+
+	.flex-search {
+		display: flex;
+	}
+</style>

+ 9 - 0
src/router/modules/marketing.js

@@ -29,6 +29,15 @@ export default {
             },
             component: () => import('@/pages/marketing/home/index')
         },
+		{
+		    path: 'chongzhi',
+		    name: `${pre}chongzhi`,
+		    meta: {
+		        auth: ['admin-marketing-chongzhi'],
+		        title: '充值商品'
+		    },
+		    component: () => import('@/pages/marketing/chongzhi/index')
+		},
         {
             path: 'store_combination/index',
             name: `${pre}combinalist`,

+ 9 - 0
src/router/modules/order.js

@@ -39,6 +39,15 @@ export default {
 		    },
 		    component: () => import('@/pages/order/serveList/index')
 		},
+		{
+		    path: 'three',
+		    name: `${pre}three`,
+		    meta: {
+		        auth: ['admin-order-three-index'],
+		        title: '预约订单'
+		    },
+		    component: () => import('@/pages/order/three/index')
+		},
         {
             path: 'split_list',
             name: `${pre}split_list`,