From ec3c9428b33e6ba93301bd92be475f28cdc6fdb0 Mon Sep 17 00:00:00 2001 From: zhangmanman <994797151@qq.com> Date: Thu, 23 Sep 2021 10:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/interfaces/store.js | 100 +- components/store-boss/store-boss.vue | 33 +- .../store-order-details.vue | 252 + components/store-order/store-order.vue | 228 + components/store-staff/store-staff.vue | 16 +- pages.json | 49 + pages/goods/attestation.vue | 1 - pages/order/details.vue | 1 + pages/property/index.vue | 3 +- pages/store/Spread.vue | 225 +- pages/store/customer.vue | 1 - pages/store/deliver.vue | 141 + pages/store/deliverForm.vue | 166 + pages/store/examine.vue | 114 + pages/store/index.vue | 27 +- pages/store/journal.vue | 83 + pages/store/logistic.vue | 161 + pages/store/orderDetails.vue | 38 + pages/store/return.vue | 171 + static/icons/fire.png | Bin 0 -> 2214 bytes static/icons/order-null.png | Bin 0 -> 11682 bytes static/icons/store_codeBack.png | Bin 5127 -> 92904 bytes static/icons/store_contBack.png | Bin 0 -> 24917 bytes static/icons/store_downBack.png | Bin 0 -> 3231 bytes static/icons/store_logistic.png | Bin 0 -> 15947 bytes .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 25533 ++++++++-------- unpackage/dist/dev/app-plus/app-view.js | 20506 +++++++------ .../dev/app-plus/static/icons/未标题-4.png | Bin 5127 -> 0 bytes 29 files changed, 26009 insertions(+), 21844 deletions(-) create mode 100644 components/store-order-details/store-order-details.vue create mode 100644 components/store-order/store-order.vue create mode 100644 pages/store/deliver.vue create mode 100644 pages/store/deliverForm.vue create mode 100644 pages/store/examine.vue create mode 100644 pages/store/journal.vue create mode 100644 pages/store/logistic.vue create mode 100644 pages/store/orderDetails.vue create mode 100644 pages/store/return.vue create mode 100644 static/icons/fire.png create mode 100644 static/icons/order-null.png create mode 100644 static/icons/store_contBack.png create mode 100644 static/icons/store_downBack.png create mode 100644 static/icons/store_logistic.png delete mode 100644 unpackage/dist/dev/app-plus/static/icons/未标题-4.png diff --git a/apis/interfaces/store.js b/apis/interfaces/store.js index d6f1fdd..657da5c 100644 --- a/apis/interfaces/store.js +++ b/apis/interfaces/store.js @@ -54,11 +54,109 @@ const companiesCode = () => { }) } +// 退货单列表 +const storeReturn = (state) => { + return request({ + url: 'manages/refunds', + data: { + state + } + }) +} + +// 退货单详情 +const orderDetails = (refund_id) => { + return request({ + url: 'manages/refunds/' + refund_id + }) +} + +// 退货单-操作日志 +const orderJournal = (refund_id) => { + return request({ + url: 'mall/refunds/' + refund_id + '/logs' + }) +} + +// 退货单签收 +const storeSign = (refund_id) => { + return request({ + url: 'manages/refunds/' + refund_id + '/sign' + }) +} + +// 退货单-退货 +const storeToken = (refund_id) => { + return request({ + url: 'manages/refunds/' + refund_id + '/retoken' + }) +} + +// 退货单-审核 +const storeAudit = (refund_id, data) => { + return request({ + url: 'manages/refunds/' + refund_id + '/audit', + method: 'POST', + data: data + }) +} + +// 提货单列表 +const storeDeliver = (state) => { + return request({ + url: 'manages/shipments', + data: { + state + } + }) +} + +// 提货单详情 +const deliverDetails = (shipment__no) => { + return request({ + url: 'manages/shipments/' + shipment__no + }) +} + +// 提货单发货前置 +const deliverFront = (shipment__no) => { + return request({ + url: 'manages/shipments/' + shipment__no + '/deliver' + }) +} + +// 提货单发货 +const deliverForm = (shipment__no, data) => { + return request({ + url: 'manages/shipments/' + shipment__no + '/deliver', + method: 'POST', + data: data + }) +} + +// 提货单物流 +const deliverLogistic = (shipment__no) => { + return request({ + url: 'manages/shipments/' + shipment__no + '/logistic' + }) +} + export { index, customer, visitors, basicsConfig, basicsInfo, - companiesCode + companiesCode, + storeReturn, + orderDetails, + orderJournal, + storeSign, + storeToken, + storeAudit, + storeDeliver, + deliverDetails, + deliverFront, + deliverForm, + deliverLogistic } diff --git a/components/store-boss/store-boss.vue b/components/store-boss/store-boss.vue index 720c40f..c0c6087 100644 --- a/components/store-boss/store-boss.vue +++ b/components/store-boss/store-boss.vue @@ -27,10 +27,16 @@ - 会员升级/续费 - 有效期：2022年10月1日 + 会员升级/续费 + 续费 + 企业会员 + 有效期：{{wordData.identity}} - + + + 已满级 + + 去升级 @@ -65,12 +71,12 @@ {{wordData.middle.sale || 0}} 在售权证 - - {{wordData.top.barter_total || 0}} + + {{wordData.order.deliver || 0}} 退货单处理 - - {{wordData.top.barter_total || 0}} + + {{wordData.order.refund || 0}} 发货单处理 @@ -132,7 +138,7 @@ 智能名片 --> - + 营销推广码 @@ -162,7 +168,16 @@ order : {} } } - } + }, + identityData:{ + type: Object, + default: () => { + return { + time : {}, + grade : {} + } + } + } } } diff --git a/components/store-order-details/store-order-details.vue b/components/store-order-details/store-order-details.vue new file mode 100644 index 0000000..2ebc690 --- /dev/null +++ b/components/store-order-details/store-order-details.vue @@ -0,0 +1,252 @@ + + + + + diff --git a/components/store-order/store-order.vue b/components/store-order/store-order.vue new file mode 100644 index 0000000..2d03114 --- /dev/null +++ b/components/store-order/store-order.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/components/store-staff/store-staff.vue b/components/store-staff/store-staff.vue index 29c7703..9119fba 100644 --- a/components/store-staff/store-staff.vue +++ b/components/store-staff/store-staff.vue @@ -23,17 +23,17 @@ - - - - 发货单管理 + + + + 退换货管理 - - - - 退换货管理 + + + + 发货单管理 diff --git a/pages.json b/pages.json index 59ad031..e606789 100644 --- a/pages.json +++ b/pages.json @@ -342,6 +342,13 @@ "navigationBarTitleText": "成交客户", "navigationBarBackgroundColor": "#FFFFFF" } + }, { + "path": "pages/store/examine", + "name": "Examine", + "style": { + "navigationBarTitleText": "退货单审核", + "navigationBarBackgroundColor": "#FFFFFF" + } }, { "path": "pages/store/basics", "name": "Basics", @@ -366,6 +373,48 @@ "navigationBarTitleText": "营销推广码", "navigationBarBackgroundColor": "#FFFFFF" } + }, { + "path": "pages/store/return", + "name": "Return", + "style": { + "navigationBarTitleText": "退货单处理", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/store/orderDetails", + "name": "storeOrderDetails", + "style": { + "navigationBarTitleText": "订单详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/store/deliver", + "name": "Deliver", + "style": { + "navigationBarTitleText": "提货单处理", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/store/deliverForm", + "name": "DeliverForm", + "style": { + "navigationBarTitleText": "我要发货", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/store/logistic", + "name": "Logistic", + "style": { + "navigationBarTitleText": "提货单物流", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/store/journal", + "name": "storeJournal", + "style": { + "navigationBarTitleText": "操作日志", + "navigationBarBackgroundColor": "#FFFFFF" + } }, { "path": "pages/employees/list", "name": "Employees", diff --git a/pages/goods/attestation.vue b/pages/goods/attestation.vue index c427093..21da268 100644 --- a/pages/goods/attestation.vue +++ b/pages/goods/attestation.vue @@ -115,7 +115,6 @@ }, created() { managesAttestation(this.$Route.query.id).then(res=>{ - console.log(res) this.info = res }) }, diff --git a/pages/order/details.vue b/pages/order/details.vue index 3f1bf59..5a76d0e 100644 --- a/pages/order/details.vue +++ b/pages/order/details.vue @@ -5,6 +5,7 @@ diff --git a/pages/store/customer.vue b/pages/store/customer.vue index 0e2a42d..7fa3c5a 100644 --- a/pages/store/customer.vue +++ b/pages/store/customer.vue @@ -68,7 +68,6 @@ methods:{ // tabs筛选 onTbas(type){ - console.log(type) getDate(type).then(res => { this.tabsIndex = type this.dateValue = res diff --git a/pages/store/deliver.vue b/pages/store/deliver.vue new file mode 100644 index 0000000..e74fac2 --- /dev/null +++ b/pages/store/deliver.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/pages/store/deliverForm.vue b/pages/store/deliverForm.vue new file mode 100644 index 0000000..d87b24e --- /dev/null +++ b/pages/store/deliverForm.vue @@ -0,0 +1,166 @@ + + + + + diff --git a/pages/store/examine.vue b/pages/store/examine.vue new file mode 100644 index 0000000..f99c77f --- /dev/null +++ b/pages/store/examine.vue @@ -0,0 +1,114 @@ +