Compare commits

..

No commits in common. "4f271fcb1d96c51dd8ae48912959651079ce9bda" and "9482747e0175ff3df48d202754f4ef43b34fddba" have entirely different histories.

6 changed files with 33 additions and 84 deletions

View File

@ -120,21 +120,7 @@ export function orderInfoGetById(params = {}) {
} }
//申请退款 //申请退款
export function refundApprove(params = {}) { export function refundApprove(params = {}) {
return request('/user-center/refund/approve', { return request('/user-center/refund/refundApprove', {
method: 'POST',
data: params,
});
}
//确认收货
export function sureToReceive(params = {}) {
return request('/user-center/orderInfo/sureToReceive', {
method: 'POST',
data: params,
});
}
//付款
export function payOrder(params = {}) {
return request('/user-center/orderInfo/payOrder', {
method: 'POST', method: 'POST',
data: params, data: params,
}); });

View File

@ -10,7 +10,7 @@
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="refundVs = false">取消</el-button> <el-button @click="refundVs = false">取消</el-button>
<el-button type="primary" @click="upRefund"> 确认 </el-button> <el-button type="primary" @click="upRefund()"> 确认 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -39,26 +39,22 @@
<el-icon style="cursor: pointer" size="30" @click="back()"><ArrowLeftBold /></el-icon> <el-icon style="cursor: pointer" size="30" @click="back()"><ArrowLeftBold /></el-icon>
<span style="font-weight: bold; color: #25bf82; font-size: 20px"> <span style="font-weight: bold; color: #25bf82; font-size: 20px">
{{ {{
detailsData.orderStatus == '1' JSON.parse(route.query.page).orderStatus == '1'
? '待支付' ? '待支付'
: detailsData.orderStatus == '2' || detailsData.orderStatus == '3' : JSON.parse(route.query.page).orderStatus == '2' || JSON.parse(route.query.page).orderStatus == '3'
? '待发货' ? '待发货'
: detailsData.orderStatus == '4' || detailsData.orderStatus == '5' : JSON.parse(route.query.page).orderStatus == '4' || JSON.parse(route.query.page).orderStatus == '5'
? '已发货' ? '已发货'
: detailsData.orderStatus == '6' : JSON.parse(route.query.page).orderStatus == '6'
? '已收货' ? '已收货'
: detailsData.orderStatus == '7' : JSON.parse(route.query.page).orderStatus == '7'
? '已取消' ? '已取消'
: detailsData.orderStatus == '8' : JSON.parse(route.query.page).orderStatus == '8'
? '已完成' ? '已完成'
: detailsData.orderStatus == '10' : ''
? '退款中'
: detailsData.orderStatus == '11'
? '已退款'
: ''
}}</span }}</span
> >
<span v-if="detailsData.orderStatus == '1'" style="font-size: 15px">在71小时59分59秒之前发货</span> <span v-if="JSON.parse(route.query.page).orderStatus == '1'" style="font-size: 15px">在71小时59分59秒之前发货</span>
</div> </div>
</div> </div>
@ -109,14 +105,6 @@
<div>付款时间</div> <div>付款时间</div>
<div style="color: #999999">{{ detailsData.paymentTime }}</div> <div style="color: #999999">{{ detailsData.paymentTime }}</div>
</div> </div>
<div v-if="detailsData.orderStatus == '11'" class="order-list-warp-right-list">
<div>退款时间</div>
<div style="color: #999999">{{ detailsData.refundTime }}</div>
</div>
<div v-if="detailsData.orderStatus == '11'" class="order-list-warp-right-list">
<div>退款金额</div>
<div style="color: red">{{ detailsData.refundAmount }}</div>
</div>
</div> </div>
<div v-if="detailsData.totalAmount" style="margin-top: 30px"> <div v-if="detailsData.totalAmount" style="margin-top: 30px">
<div style="width: 100%; text-align: left; font-size: 18px; font-weight: bold">付款信息</div> <div style="width: 100%; text-align: left; font-size: 18px; font-weight: bold">付款信息</div>
@ -139,7 +127,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="display: flex; align-items: center; justify-content: center; width: 100%"> <div style="display: flex; align-items: center; justify-content: start">
<div v-if="detailsData.orderStatus == '1'" class="button-bottom" @click="doPay(1)">立即付款</div> <div v-if="detailsData.orderStatus == '1'" class="button-bottom" @click="doPay(1)">立即付款</div>
<div <div
v-if=" v-if="
@ -150,7 +138,7 @@
> >
确认收货 确认收货
</div> </div>
<div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottoms" @click="reAddress()">修改地址</div> <div class="button-bottoms" @click="reAddress()">修改地址</div>
<div <div
v-if=" v-if="
detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5' detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5'
@ -170,12 +158,12 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { userPostAddress, upOrderInfoList, confirmOrder, refundApprove } from '../../apis/user'; import { userPostAddress, upOrderInfoList, confirmOrder } from '../../apis/user';
import common from './components/common.vue'; import common from './components/common.vue';
import { ref, reactive, computed, onMounted } from 'vue'; import { ref, reactive, computed, onMounted } from 'vue';
import userHeader from './components/userHeader.vue'; import userHeader from './components/userHeader.vue';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import { cancelOrder, updateOrderReceiveAddress, orderInfoGetById } from '../../apis/user'; import { cancelOrder, updateOrderReceiveAddress, orderInfoGetById, refundApprove } from '../../apis/user';
import { useGetUserOrder } from '../../store/modules/userOrder'; import { useGetUserOrder } from '../../store/modules/userOrder';
let store = useGetUserOrder(); let store = useGetUserOrder();
let dialogVisible = ref(false); let dialogVisible = ref(false);
@ -192,23 +180,23 @@ let page = reactive({
current: 1, current: 1,
size: 10, size: 10,
}); });
let optionsValue = ref('1'); let optionsValue = ref('不想要了');
const options = [ const options = [
{ {
value: '1', value: '不想要了',
label: '不想要了', label: '不想要了',
}, },
{ {
value: '2', value: '与卖家协商一致',
label: '与卖家协商一致', label: '与卖家协商一致',
}, },
{ {
value: '3', value: '货物损坏',
label: '货物损坏', label: '货物损坏',
}, },
{ {
value: '4', value: '实物与宣传不符',
label: '实物与宣传不符', label: '实物与宣传不符',
}, },
]; ];
@ -251,10 +239,10 @@ const refund = () => {
const upRefund = () => { const upRefund = () => {
refundApprove({ refundApprove({
orderId: route.query.id, orderId: 0,
refundCategory: '1', refundCategory: '1',
refundType: optionsValue.value, refundType: 1,
refundReason: input.value, refundReason: input,
}).then((res) => { }).then((res) => {
getDetails(); getDetails();
refundVs.value = false; refundVs.value = false;

View File

@ -34,13 +34,7 @@
</div> </div>
<div class="pay-style-warp"> <div class="pay-style-warp">
<div class="title">支付方式</div> <div class="title" @click="paySuccess">支付方式</div>
<div
style="background-color: #25bf82; padding: 5px 10px; font-size: 20px; font-weight: bold; color: #fff; cursor: pointer"
@click="paySuccess"
>
点击模拟支付
</div>
<div class="pay-list"> <div class="pay-list">
<div class="pay-list-pos"> <div class="pay-list-pos">
<div <div
@ -94,7 +88,7 @@ import { useRoute, useRouter } from 'vue-router';
import userHeader from './components/userHeader.vue'; import userHeader from './components/userHeader.vue';
import costomImg from '@/components/costomImg.vue'; import costomImg from '@/components/costomImg.vue';
import { qrImg } from '@/layouts/component/Header/base64img.js'; import { qrImg } from '@/layouts/component/Header/base64img.js';
import { userPostAddress, upOrderInfoList, confirmOrder, payOrder } from '../../apis/user'; import { userPostAddress, upOrderInfoList, confirmOrder } from '../../apis/user';
const route = useRoute(); const route = useRoute();
const router = useRouter(); const router = useRouter();
// let totalAmout = ref(196); // let totalAmout = ref(196);
@ -159,9 +153,7 @@ let payAmout = ref(147);
// //
let paySuccess = () => { let paySuccess = () => {
payOrder({ orderId: route.query.id }).then((res) => { router.push('/sub-operation-service/paySuccess');
router.push('/sub-operation-service/paySuccess');
});
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -19,7 +19,7 @@
<el-button @click="toLink('/sub-operation-service/userOrders')">查看订单</el-button> <el-button @click="toLink('/sub-operation-service/userOrders')">查看订单</el-button>
</div> </div>
<div class="do-item"> <div class="do-item">
<el-button type="primary" @click="toLink('/sub-operation-service/smartFarm/main')">返回首页</el-button> <el-button type="primary" @click="toLink('/sub-operation-service/home')">返回首页</el-button>
</div> </div>
</div> </div>
</div> </div>

View File

@ -68,7 +68,7 @@
<div v-if="n.orderItemInfos && n.orderItemInfos.length > 0" class="good-list"> <div v-if="n.orderItemInfos && n.orderItemInfos.length > 0" class="good-list">
<div v-for="(g, indexg) in n.orderItemInfos" :key="indexg" class="good-item"> <div v-for="(g, indexg) in n.orderItemInfos" :key="indexg" class="good-item">
<div class="good-img"> <div class="good-img">
<img class="good-img" :src="g.productImage" /> <img class="good-img" :url="g.productImage" />
</div> </div>
<!-- :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')]" --> <!-- :preview-list="[getAssetsFile('images/ecommerce/' + 'pic.png')]" -->
<div class="good-info"> <div class="good-info">

View File

@ -68,15 +68,12 @@
<div v-if="o.orderStatus == '1'" class="right-item do-btn"> <div v-if="o.orderStatus == '1'" class="right-item do-btn">
<el-button type="primary" @click="doPay(o.id)">立即付款</el-button> <el-button type="primary" @click="doPay(o.id)">立即付款</el-button>
</div> </div>
<div v-if="o.orderStatus == '4' || o.orderStatus == '5'" class="right-item do-btn">
<el-button type="primary" @click="sureToReceives(o.id)">确认收货</el-button>
</div>
<div v-if="o.orderStatus == '1'" class="right-item do-btn"> <div v-if="o.orderStatus == '1'" class="right-item do-btn">
<el-button @click="doCancel(o.id)">取消订单</el-button> <el-button @click="doCancel(o.id)">取消订单</el-button>
</div> </div>
<!-- <div v-if="o.orderStatus == '5'" class="right-item">已发货</div> --> <div v-if="o.orderStatus == '5'" class="right-item">已发货</div>
<!-- <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div> --> <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div>
<el-button type="primary" class="right-item do-btn" @click="goInfo(o.id)">订单详情</el-button> <div class="right-item text-link" @click="goInfo(o.id)">订单详情</div>
<div class="right-item text-link"> <div class="right-item text-link">
{{ {{
o.orderStatus == '7' o.orderStatus == '7'
@ -89,11 +86,7 @@
? '待收货' ? '待收货'
: o.orderStatus == '6' : o.orderStatus == '6'
? '已收货' ? '已收货'
: o.orderStatus == '10' : ''
? '退款中'
: o.orderStatus == '11'
? '已退款'
: ''
}} }}
</div> </div>
</div> </div>
@ -114,7 +107,7 @@ import { ref, reactive, onMounted } from 'vue';
import { isEmpty, getAssetsFile } from '@/utils'; import { isEmpty, getAssetsFile } from '@/utils';
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
import userHeader from './components/userHeader.vue'; import userHeader from './components/userHeader.vue';
import { cancelOrder, sureToReceive } from '../../apis/user'; import { cancelOrder } from '../../apis/user';
import { useGetUserOrder } from '../../store/modules/userOrder'; import { useGetUserOrder } from '../../store/modules/userOrder';
let store = useGetUserOrder(); let store = useGetUserOrder();
const route = useRoute(); const route = useRoute();
@ -125,7 +118,6 @@ let page = reactive({
}); });
let show = ref(false); let show = ref(false);
let handleClick = (value) => { let handleClick = (value) => {
activeCurrent.value = value;
page.orderStatus = value; page.orderStatus = value;
store.getData(page).then((res) => { store.getData(page).then((res) => {
console.log(res); console.log(res);
@ -149,11 +141,8 @@ let bottomList = reactive([
{ title: '全部', name: 'all' }, { title: '全部', name: 'all' },
{ title: '待付款', name: '1' }, { title: '待付款', name: '1' },
{ title: '待发货', name: '3' }, { title: '待发货', name: '3' },
// { title: '', name: '6' }, { title: '已发货', name: '6' },
{ title: '待收货', name: '5' }, { title: '待收货', name: '5' },
{ title: '已收货', name: '6' },
{ title: '退款中', name: '10' },
{ title: '已退款', name: '11' },
]); ]);
onMounted(() => { onMounted(() => {
@ -167,12 +156,6 @@ onMounted(() => {
}); });
}); });
const sureToReceives = (id) => {
sureToReceive({ orderId: id }).then((res) => {
store.getData(page);
});
};
let activeCurrent = ref('all'); let activeCurrent = ref('all');
let orderList = reactive([ let orderList = reactive([