Commit 827efd7e authored by 罗超's avatar 罗超

1

parent 63260856
......@@ -673,8 +673,8 @@
"path": "upCamp/activeInner" //相亲up营活动列表
}, {
"path": "releasePosts" //发布帖子
},{
"path":"personal/MyGroupLeader"//我的群组
}, {
"path": "personal/MyGroupLeader" //我的群组
}
]
},
......@@ -811,14 +811,16 @@
}, {
"path": "userManage"
}, {
"path": "modifyAddress"//修改地址
},{
"path": "modifyAddress" //修改地址
}, {
"path": "sendGoods" //发货
},{
}, {
"path": "sendGoodsSaleAfter" //售后发货
}, {
"path": "commentsManage" //评论管理
},{
}, {
"path": "tixianApply" //提现申请
},{
}, {
"path": "orderMessage" //订单消息
}]
}
......
......@@ -288,7 +288,6 @@ export default {
created() {
this.exitMsg.Remark = this.data?.Remark;
this.exitMsg.OrderId = this.data?.OrderId;
console.log(261, this.data);
},
};
</script>
......@@ -349,7 +348,7 @@ export default {
font-size: 24rpx;
color: #333;
.goodsName {
height: 45%;
line-height: 30rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -358,7 +357,7 @@ export default {
word-break: break-all;
}
.weight {
height: 35%;
line-height: 70rpx;
color: #808080;
}
}
......
......@@ -57,28 +57,81 @@
<view class="priceBox">
<text>实际退款</text>
<text style="color: #111; margin: 0 4rpx; fond-size: 26rpx"
>{{data.RefundActual!=null ? data.RefundActual.toFixed(2):0.00}}</text
>{{
data.RefundActual != null ? data.RefundActual.toFixed(2) : 0.0
}}</text
>
</view>
<view class="btnBox">
<button class="btn" v-if="item.ReOrderStatus==1" @click="pending(2)">
<button class="btn" v-if="data.ReOrderStatus == 1" @click="disagree">
拒绝
</button>
<button class="btn" v-if="item.ReOrderStatus==1" @click="pending(1)">
<button class="btn" v-if="data.ReOrderStatus == 1" @click="agree">
同意
</button>
<button
class="btn"
v-if="data.Type == 2 && data.ReOrderStatus == 3"
@click="
jumpPage(`/pages/MallMange/sendGoodsSaleAfter?ReOrderId=${data.ReOrderId}`)
"
>
发货
</button>
<button
class="btn"
v-if="data.Type == 1 && data.ReOrderStatus == 3"
@click="shouHuo"
>
收货
</button>
<button
class="btn"
v-if="data.Type == 1 && data.ReOrderStatus == 4"
@click="dkOpenDig"
>
打款
</button>
</view>
<!-- 待处理 -->
<u-modal
v-model="pendModal"
v-model="handleModal"
:show-cancel-button="true"
@confirm="pendingForm"
@confirm="regionsubmitForm"
contentSlot
title="备注"
title="选择退货地址"
>
<view class="radioBox">
<u-radio-group v-model="SetOrderMsg.DeliveryId">
<u-radio
shape="circle"
v-for="(item, index) in regionlist"
:key="index"
:name="item.ID"
>
<textarea class="textarea" v-model="pendMsg.Remark" />
<view class="radioItem">
<view>{{ item.Name }}-{{ item.Mobile }}</view>
<view>{{ item.Address }}</view>
</view>
</u-radio>
</u-radio-group>
</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>
</u-modal>
</view>
</template>
......@@ -90,19 +143,25 @@ export default {
},
data() {
return {
modal: false,
exitMsg: {
OrderId: 0,
Type: 1,
Remark: "",
handleModal: false,
//收货地址
regionMsg: {
pageIndex: 1,
pageSize: 20,
Name: "",
},
// 待处理
pendMsg: {
OrderId: 0,
Type: 1,
Remark: 0,
regionlist: [],
regiontotal: 1,
SetOrderMsg: {
ReOrderId: 0,
Type: 0,
DeliveryId: "",
},
pendModal: false,
//打款
dkMsg: {
Refund: 0,
},
dkModal: false,
};
},
methods: {
......@@ -125,25 +184,130 @@ export default {
.toString();
return str;
},
//确认收货
ConfirmReceipt() {
//售后订单审核-同意
agree() {
let that = this;
this.SetOrderMsg.Type = 1;
this.SetOrderMsg.ReOrderId = this.data.ReOrderId;
uni.showModal({
title: "提示",
content: "是否确认收货?",
content: "是否同意?",
success: function (res) {
if (res.confirm) {
that.handleModal = true;
that.getLogisticsDeliveryPage();
}
},
});
},
//退货地址列表
getLogisticsDeliveryPage() {
this.requestAdmin(
"/api/MallBase/GetLogisticsDeliveryPage",
this.regionMsg,
(res) => {
console.log(186, res);
if (res.resultCode == 1) {
this.regionlist = res.data.pageData;
this.regiontotal = res.data.count;
}
}
);
},
regionsubmitForm() {
if (this.SetOrderMsg.DeliveryId == "") {
uni.showToast({
icon: "none",
title: "请选择退货地址",
});
return;
}
this.requestAdmin(
"/api/order/SetOrderAfterSaleAudit",
this.SetOrderMsg,
(res) => {
uni.showToast({
title: "操作成功",
});
this.$emit("update");
},
null
);
},
// 售后订单审核-拒绝
disagree() {
this.SetOrderMsg.ReOrderId = this.data.ReOrderId;
this.SetOrderMsg.Type = 2;
this.SetOrderMsg.DeliveryId = "";
let that = this;
uni.showModal({
title: "提示",
content: "是否拒绝?",
success: function (res) {
if (res.confirm) {
that.requestAdmin(
"/api/order/SetOrderAfterSaleAudit",
that.SetOrderMsg,
(res) => {
uni.showToast({
title: "操作成功",
});
this.$emit("update");
},
null
);
}
},
});
},
// 卖家收货
shouHuo() {
let that = this;
uni.showModal({
title: "提示",
content: "确认收货?",
success: function (res) {
if (res.confirm) {
that.requestAdmin(
"/api/order/SetOrderReceivingForReturnsAndRefunds",
{ ReOrderId: that.data.ReOrderId },
(res) => {
uni.showToast({
title: "操作成功",
});
that.$emit("update");
},
null
);
}
},
});
},
// 打款
dkOpenDig() {
this.dkMsg = {
Refund: this.data.Refund,
ReOrderId: this.data.ReOrderId,
};
this.dkModal = true;
},
// 确认打款
SaleForRefunds() {
this.requestAdmin(
"/api/order/SetOrderAfterSaleForRefunds",
this.dkMsg,
(res) => {
uni.showToast({
title: "操作成功",
});
this.$emit("update");
},
null
);
},
},
created() {
this.exitMsg.Remark = this.data?.Remark;
this.exitMsg.OrderId = this.data?.OrderId;
console.log(169, this.data);
},
};
</script>
......@@ -218,7 +382,7 @@ export default {
font-size: 24rpx;
color: #333;
.goodsName {
height: 45%;
line-height: 30rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
......@@ -227,7 +391,7 @@ export default {
word-break: break-all;
}
.weight {
height: 35%;
line-height: 70rpx;
color: #808080;
}
}
......@@ -242,7 +406,6 @@ export default {
justify-content: flex-end;
align-items: center;
.btn {
// width: 90rpx;
height: 50rpx;
border-radius: 25rpx;
border: 2rpx solid #f7f7f7;
......@@ -274,4 +437,27 @@ export default {
font-size: 24rpx;
margin: 20rpx auto;
}
.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>
\ No newline at end of file
......@@ -230,7 +230,7 @@ export default {
days.push(i);
}
return {
orderType: 1, //1普通订单,2售后订单
orderType: 2, //1普通订单,2售后订单
loading: false,
status: "loadmore",
loadText: {
......
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