Skip to content

M
mallapp
Commit e712f302 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 2ac85cb5
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 151 deletions
pages/MallMange/afterOrderDetail.vue
View file @ e712f302
...@@ -22,7 +22,18 @@ ...@@ -22,7 +22,18 @@
<view class="title" v-if="scrollTop > 50">订单详情</view> <view class="title" v-if="scrollTop > 50">订单详情</view>
</view> </view>
<view class="status" :style="[headStyle]"> <view class="status" :style="[headStyle]">
<view class="status-title">{{ orders.ReOrderStatusName }}</view> <view class="status-title" v-if="orders.ReOrderStatus === 1"
>待审核</view
>
<view class="status-title" v-if="orders.ReOrderStatus === 2"
>待买家处理</view
>
<view class="status-title" v-if="orders.ReOrderStatus === 3"
>待卖家处理</view
>
<view class="status-title" v-if="orders.ReOrderStatus === 6"
>已完成</view
>
<view <view
class="sub-title" class="sub-title"
v-if=" v-if="
...@@ -34,7 +45,7 @@ ...@@ -34,7 +45,7 @@
> >
</view> </view>
</view> </view>
<view class="block address"> <!-- <view class="block address">
<view class="icon"> <view class="icon">
<u-icon name="location-o" color="#111" size="40"></u-icon> <u-icon name="location-o" color="#111" size="40"></u-icon>
</view> </view>
...@@ -50,9 +61,9 @@ ...@@ -50,9 +61,9 @@
}}{{ orders.OrderInfo.ShoppingAddress }}</view }}{{ orders.OrderInfo.ShoppingAddress }}</view
> >
</view> </view>
</view> </view> -->
<view class="block goods"> <view class="block goods">
<view class="item" > <view class="item">
<view style="display: flex"> <view style="display: flex">
<image <image
:src="orders.OrderInfo.CoverImagePath" :src="orders.OrderInfo.CoverImagePath"
...@@ -67,7 +78,7 @@ ...@@ -67,7 +78,7 @@
<view class="good-attr"> <view class="good-attr">
<text>数量:{{ orders.OrderInfo.Number }}</text> <text>数量:{{ orders.OrderInfo.Number }}</text>
<text> <text>
{{ orders.OrderInfo.SpecificationList.join(',') }} {{ orders.OrderInfo.SpecificationList.join(",") }}
</text> </text>
</view> </view>
<view <view
...@@ -79,7 +90,8 @@ ...@@ -79,7 +90,8 @@
" "
@click.native.stop="goUrl(orders.OrderInfo.FreeShippingUrl)" @click.native.stop="goUrl(orders.OrderInfo.FreeShippingUrl)"
v-if=" v-if="
orders.OrderInfo.FreeShippingRemarks != null && orders.OrderInfo.FreeShippingRemarks != '' orders.OrderInfo.FreeShippingRemarks != null &&
orders.OrderInfo.FreeShippingRemarks != ''
" "
> >
<view <view
...@@ -95,7 +107,9 @@ ...@@ -95,7 +107,9 @@
</Text> </Text>
</view> </view>
</view> </view>
<view class="good-price">￥{{ orders.OrderInfo.Final_Price }}</view> <view class="good-price"
>￥{{ orders.OrderInfo.Final_Price }}</view
>
</view> </view>
</view> </view>
<template v-for="(e, ei) in expressInfo"> <template v-for="(e, ei) in expressInfo">
...@@ -162,126 +176,127 @@ ...@@ -162,126 +176,127 @@
<view class="content">{{ orders.Remark }}</view> <view class="content">{{ orders.Remark }}</view>
</view> </view>
</view> </view>
<view class="order-info-item"> <!-- <view class="order-info-item">
<view class="field"> <view class="field">
<view class="label">支付方式：</view> <view class="label">支付方式：</view>
<view class="content">{{ orders.OrderInfo.PaymentWayName }}</view> <view class="content">{{ orders.OrderInfo.PaymentWayName }}</view>
</view> </view>
</view> </view> -->
</view> </view>
<view class="block"> <view class="block">
<view class="order-info-item"> <view class="order-info-item">
<view class="field"> <view class="field">
<view class="label">实付金额</view> <view class="label">实付金额</view>
<view class="content right">￥{{ orders.OrderInfo.Income }}</view> <view class="content right">￥{{ orders.Income }}</view>
</view> </view>
<view class="field"> <view class="field">
<view class="label">申请退款</view> <view class="label">申请退款</view>
<view class="content right">￥{{ orders.OrderInfo.Refund }}</view> <view class="content right">￥{{ orders.Refund }}</view>
</view> </view>
<view class="field"> <view class="field">
<view class="label">实际退款</view> <view class="label">实际退款</view>
<view class="content right">￥{{ orders.OrderInfo.RefundActual }}</view> <view class="content right">￥{{ orders.RefundActual }}</view>
</view> </view>
<view <view
style="width: 100%; height: 1px; background: #f5f5f5; margin: 5px 0" style="width: 100%; height: 1px; background: #f5f5f5; margin: 5px 0"
></view> ></view>
</view> </view>
</view> </view>
<view style="padding: 12px" v-if="recommend.length > 0">
<goodlist :list="recommend"></goodlist>
</view>
<view class="btn-box"> <view class="btn-box">
<view class="item"> <view class="item">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
v-if="orders.OrderStatus === 1" v-if="orders.ReOrderStatus === 1"
@click="Offpayment" @click="agree"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
>线下付款</u-button >同意</u-button
> >
</view> </view>
<view class="item"> <view class="item">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
v-if="orders.OrderStatus === 2" v-if="orders.ReOrderStatus === 1"
@click=" @click="disagree"
jumpPage(`/pages/MallMange/sendGoods?OrderId=${orders.OrderId}`)
"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
>发货</u-button >拒绝</u-button
> >
</view> </view>
<view class="item"> <view class="item">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
v-if="orders.OrderStatus === 2" v-if="orders.ReOrderStatus === 3 && orders.Type == 2"
@click=" @click="
jumpPage( jumpPage(
`/pages/MallMange/sendGoods?OrderId=${orders.OrderId}&modify=true` `/pages/MallMange/sendGoodsSaleAfter?ReOrderId=${data.ReOrderId}`
) )
" "
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
>修改快递单号</u-button >发货</u-button
> >
</view> </view>
<view class="item"> <view class="item">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
v-if="orders.OrderStatus === 2 || orders.OrderStatus === 1" v-if="orders.ReOrderStatus === 3 && orders.Type == 1"
@click="OrderCancel" @click="shouHuo"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
>强制取消</u-button >收货</u-button
> >
</view> </view>
<view class="item"> <view class="item">
<u-button <u-button
shape="circle" shape="circle"
size="medium" size="medium"
v-if="orders.OrderStatus === 3" v-if="orders.ReOrderStatus === 4 && orders.Type == 1"
@click="ConfirmReceipt" @click="dkOpenDig"
:custom-style="themCustomStyle" :custom-style="themCustomStyle"
>确认收货</u-button >打款</u-button
> >
</view> </view>
<view class="item">
<u-button
shape="circle"
size="medium"
v-if="orders.OrderStatus === 3"
@click="
jumpPage(
`/pages/MallMange/modifyAddress?OrderId=${orders.OrderId}`
)
"
:custom-style="themCustomStyle"
>修改地址</u-button
>
</view> </view>
<!-- <view </view>
class="item" <!-- 待处理 -->
v-if="orders.OrderStatus == '3' && orders.PresentFXGrade != 1" <u-modal
v-model="handleModal"
:show-cancel-button="true"
@confirm="regionsubmitForm"
contentSlot
title="选择退货地址"
> >
<u-button <view class="radioBox">
<u-radio-group v-model="SetOrderMsg.DeliveryId">
<u-radio
shape="circle" shape="circle"
size="medium" v-for="(item, index) in regionlist"
:custom-style="customStyle" :key="index"
@click="openAfterHandler" :name="item.ID"
>申请售后</u-button
> >
</view> --> <view class="radioItem">
</view> <view>{{ item.Name }}-{{ item.Mobile }}</view>
<after-sale <view>{{ item.Address }}</view>
:list="orders.DetailList" </view>
v-if="showAfter" </u-radio>
@close="closeAfterHandler" </u-radio-group>
></after-sale> </view>
</u-modal>
<!-- 打款 -->
<u-modal
v-model="dkModal"
:show-cancel-button="true"
@confirm="SaleForRefunds"
contentSlot
title="确认已收到货"
>
<view class="dkBox">
退款金额￥
<input type="number" class="dkInput" v-model="dkMsg.Refund" />
元将直接返还给用户！
</view> </view>
</u-modal>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</scroll-view> </scroll-view>
</template> </template>
...@@ -310,7 +325,6 @@ export default { ...@@ -310,7 +325,6 @@ export default {
padding: "0 30rpx", padding: "0 30rpx",
}, },
scrollTop: 0, scrollTop: 0,
recommend: [],
prevPage: "", prevPage: "",
themCustomStyle: { themCustomStyle: {
marginLeft: "20px", marginLeft: "20px",
...@@ -319,6 +333,24 @@ export default { ...@@ -319,6 +333,24 @@ export default {
}, },
expressInfo: [], expressInfo: [],
showAfter: false, showAfter: false,
regionlist: [],
regiontotal: 1,
handleModal: false,
dkModal: false,
regionMsg: {
pageIndex: 1,
pageSize: 20,
Name: "",
},
SetOrderMsg: {
ReOrderId: 0,
Type: 0,
DeliveryId: "",
},
//打款
dkMsg: {
Refund: 0,
},
}; };
}, },
onLoad(option) { onLoad(option) {
...@@ -383,98 +415,98 @@ export default { ...@@ -383,98 +415,98 @@ export default {
} }
); );
}, },
goExpressHandler(express, no, id) { //售后订单审核-同意
uni.navigateTo({ agree() {
url:
"/pages/order/express?express=" +
express +
"&no=" +
no +
"&address=" +
this.orders?.OrderInfo?.DistrictAddress +
this.orders?.OrderInfo?.ShoppingAddress +
"&id=" +
id,
});
},
// 强制取消
OrderCancel() {
let that = this; let that = this;
let text = ""; this.SetOrderMsg.Type = 1;
if (this.orders.OrderStatus == 1) { this.SetOrderMsg.ReOrderId = this.orders.ReOrderId;
text = "确认取消?";
} else if (this.orders.OrderStatus == 2) {
text = "确认取消?客人付款金额将原路退回。";
}
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: text, content: "是否同意?",
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.requestAdmin( that.handleModal = true;
"/api/order/SetOrderForcedToCancel", that.getLogisticsDeliveryPage();
{ OrderId: that.orders.OrderId }, }
},
});
},
//退货地址列表
getLogisticsDeliveryPage() {
this.requestAdmin(
"/api/MallBase/GetLogisticsDeliveryPage",
this.regionMsg,
(res) => { (res) => {
if (res.resultCode == 1) { if (res.resultCode == 1) {
uni.showToast({ this.regionlist = res.data.pageData;
title: "操作成功", this.regiontotal = res.data.count;
icon: "success",
duration: 2000,
});
that.getData();
} }
} }
); );
}
}, },
regionsubmitForm() {
let that = this;
if (this.SetOrderMsg.DeliveryId == "") {
uni.showToast({
icon: "none",
title: "请选择退货地址",
});
return;
}
this.requestAdmin(
"/api/order/SetOrderAfterSaleAudit",
this.SetOrderMsg,
(res) => {
uni.showToast({
title: "操作成功",
}); });
that.getData();
}, },
//确认收货 null
ConfirmReceipt() { );
let msg = { },
OrderId: this.orders.OrderId, // 售后订单审核-拒绝
Type: 5, disagree() {
}; this.SetOrderMsg.ReOrderId = this.orders.ReOrderId;
this.SetOrderMsg.Type = 2;
this.SetOrderMsg.DeliveryId = "";
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "是否确认收货?", content: "确认拒绝?",
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.requestAdmin("/api/order/SetOrderOperation", msg, (res) => { that.requestAdmin(
if (res.resultCode == 1) { "/api/order/SetOrderAfterSaleAudit",
that.SetOrderMsg,
(res) => {
uni.showToast({ uni.showToast({
title: "操作成功", title: "操作成功",
icon: "success",
duration: 2000,
}); });
that.getData(); that.getData();
} },
}); null
);
} }
}, },
}); });
}, },
//线下付款 // 卖家收货
Offpayment() { shouHuo() {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "确认转为线下付款，转后无法恢复!", content: "确认收货?",
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.requestAdmin( that.requestAdmin(
"/api/order/SetOrderOfflinePayment", "/api/order/SetOrderReceivingForReturnsAndRefunds",
{ OrderId: that.orders.OrderId }, { ReOrderId: that.orders.ReOrderId },
(_res) => { (res) => {
if (_res.resultCode === 1) {
uni.showToast({ uni.showToast({
title: "操作成功", title: "操作成功",
icon: "success",
duration: 2000,
}); });
that.getData(); that.getData();
}
}, },
null null
); );
...@@ -482,11 +514,34 @@ export default { ...@@ -482,11 +514,34 @@ export default {
}, },
}); });
}, },
// 打款
dkOpenDig() {
this.dkMsg = {
Refund: this.orders.Refund,
ReOrderId: this.orders.ReOrderId,
};
this.dkModal = true;
},
// 确认打款
SaleForRefunds() {
let that = this;
this.requestAdmin(
"/api/order/SetOrderAfterSaleForRefunds",
this.dkMsg,
(res) => {
uni.showToast({
title: "操作成功",
});
that.getData();
},
null
);
},
}, },
}; };
</script> </script>
<style> <style lang="scss">
.orderdetail { .orderdetail {
overflow: hidden; overflow: hidden;
background: #f3f4f6; background: #f3f4f6;
...@@ -709,4 +764,27 @@ export default { ...@@ -709,4 +764,27 @@ export default {
border: none; border: none;
outline: none; outline: none;
} }
.radioBox {
box-sizing: border-box;
padding: 30rpx;
.radioItem {
font-size: 24rpx;
color: #000;
margin-left: 20rpx;
}
}
.dkBox {
box-sizing: border-box;
padding: 30rpx;
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
font-size: 26rpx;
.dkInput {
width: 100rpx;
background-color: #f7f7f7;
margin: 0 10rpx;
}
}
</style> </style>
\ No newline at end of file
pages/MallMange/components/orderItem.vue
View file @ e712f302
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<text>(含运费￥{{ data.FreightMoney.toFixed(2) }})</text> <text>(含运费￥{{ data.FreightMoney.toFixed(2) }})</text>
</view> </view>
<view class="btnBox"> <view class="btnBox">
<button class="btn" @click="modal = true">备注</button> <button class="btn" @click="showRemark">备注</button>
<button class="btn" v-if="data.OrderStatus === 1" @click="Offpayment"> <button class="btn" v-if="data.OrderStatus === 1" @click="Offpayment">
线下付款 线下付款
</button> </button>
...@@ -177,6 +177,9 @@ export default { ...@@ -177,6 +177,9 @@ export default {
.toString(); .toString();
return str; return str;
}, },
showRemark(){
this.modal = true;
},
// 修改备注 // 修改备注
setOrderInfo() { setOrderInfo() {
this.modal = false; this.modal = false;
......
pages/MallMange/components/saleAfterOrderItem.vue
View file @ e712f302
...@@ -248,7 +248,7 @@ export default { ...@@ -248,7 +248,7 @@ export default {
let that = this; let that = this;
uni.showModal({ uni.showModal({
title: "提示", title: "提示",
content: "是否拒绝?", content: "确认拒绝?",
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm) {
that.requestAdmin( that.requestAdmin(
......
pages/MallMange/order.vue
View file @ e712f302
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</view> </view>
</view> </view>
<view class="searchBox flex-between"> <view class="searchBox flex-between">
<view class="search flex-center"> <view class="search flex-center" @click="jumpSearch">
<u-icon name="search"></u-icon> <u-icon name="search"></u-icon>
<view>搜索</view> <view>搜索</view>
</view> </view>
...@@ -271,21 +271,6 @@ export default { ...@@ -271,21 +271,6 @@ export default {
day, day,
valueS: [9999, month - 1, day - 1], valueS: [9999, month - 1, day - 1],
valueE: [9999, month - 1, day - 1], valueE: [9999, month - 1, day - 1],
list: [
{
name: "全部",
},
{
name: "待收货",
},
{
name: "待付款",
},
{
name: "待评价",
count: 5,
},
],
currentTab: 0, currentTab: 0,
page_count: 1, page_count: 1,
msg: { msg: {
...@@ -339,6 +324,11 @@ export default { ...@@ -339,6 +324,11 @@ export default {
}; };
}, },
methods: { methods: {
jumpSearch(){
uni.navigateTo({
url: '/pages/MallMange/orderSearch'
});
},
goOrderSearch(){ goOrderSearch(){
uni.navigateTo({ uni.navigateTo({
url: '/pages/MallMange/orderSearch?orderType='+this.orderType url: '/pages/MallMange/orderSearch?orderType='+this.orderType
......
pages/MallMange/orderDetail.vue
View file @ e712f302
...@@ -219,9 +219,6 @@ ...@@ -219,9 +219,6 @@
</view> </view>
</view> </view>
</view> </view>
<view style="padding: 12px" v-if="recommend.length > 0">
<goodlist :list="recommend"></goodlist>
</view>
<view class="btn-box"> <view class="btn-box">
<view class="item"> <view class="item">
<u-button <u-button
...@@ -334,7 +331,6 @@ export default { ...@@ -334,7 +331,6 @@ export default {
padding: "0 30rpx", padding: "0 30rpx",
}, },
scrollTop: 0, scrollTop: 0,
recommend: [],
prevPage: "", prevPage: "",
themCustomStyle: { themCustomStyle: {
marginLeft: "20px", marginLeft: "20px",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment