-1
+
+
+
+
+
当前订单状态：{{ orderObj.orderStatus }}
+
+
+
+ 取消订单
+
+
+
+
+
+
+
+
+ 退款
+
+
+
+
+
+
+
+ 基本信息
+
+
+
+ 订单编号
+ 拍摄地点
+ 拍摄日期
+ 拍摄时间
+ 妆造服务
+ 拍摄服务
+
+
+ {{ orderObj.orderNumber }}
+ {{ orderObj.isIndoors ? '室内' : '室外' }}
+ {{ orderObj.specificDate }}
+ {{ orderObj.timePoint }}
+ {{ orderObj.isMakeup ? '带妆造' : '不带妆造' }}
+ {{ orderObj.isPhotography ? '是' : '否' }}
+
+
+
+
+ 收货人信息
+
+
+
+ 联系人
+ 手机号码
+
+
+ {{ contactsSnapshot.name }}
+ {{ contactsSnapshot.phone }}
+
+
+
+
+ 商品信息
+
+
+
+ 服装图片
+ 服装名
+ 服装类别
+ 服装价格
+
+
+ ![]()
+ {{ photoProductsSnapshot.name }}
+ {{ photoProductsSnapshot.categoryName }}
+ {{ photoProductsSnapshot.price }}
+
+
+ 合计：￥{{ totalAmount }}
+
+
\ No newline at end of file
diff --git a/src/views/Orders/OrderList.vue b/src/views/Orders/OrderList.vue
index 5d1cf48..cb0aec2 100644
--- a/src/views/Orders/OrderList.vue
+++ b/src/views/Orders/OrderList.vue
@@ -1,14 +1,14 @@
-
+
搜索
重置
+ :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+ :header-cell-style="{ 'text-align': 'center' }" :row-style="{ height: '70px' }">
@@ -21,8 +21,9 @@
-
-
+
+
@@ -30,25 +31,25 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
@@ -57,24 +58,29 @@
详情
-
+
发货
-
-
-
-
- 退款
-
+
+
+
+
+
+ 退款
+
+
+ :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+ :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+ :total="total" />
@@ -107,9 +113,9 @@
-
-
-
+
+
+
@@ -120,33 +126,33 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
@@ -164,13 +170,13 @@
import { onMounted, ref } from "vue";
import myAxios from "@/api/myAxios";
import { ElMessage } from "element-plus";
-import { SuccessInfo , ErrorInfo } from "@/utils/messageInfo";
+import { SuccessInfo, ErrorInfo } from "@/utils/messageInfo";
const tableData: any = ref([]); //表单展示数据
const total = ref(0);
const title = ref('')
const disabled = ref(true)
const editForm: any = ref({});//编辑表单
-const shipment:any = ref({
+const shipment: any = ref({
trackingNumber: null
})//物流单号
const DialogVisible = ref(false); //详情展示
@@ -229,7 +235,7 @@ const showDetail = (index: number, row: any) => {
couponAmount.value = row.couponSnapshot.conditionAmount;
}
totalAmount.value = row.totalAmount + couponAmount.value;
- console.log('editForm--->',editForm.value);
+ console.log('editForm--->', editForm.value);
editForm.value = row;
};
//发货方法
@@ -256,27 +262,27 @@ const deliverGoods = async () => { //发货方法
}
shipments.value = false;
}
-const deleteOrder = async (row : any) => { //微信退款
+const deleteOrder = async (row: any) => { //微信退款
loading.value = true
- console.log('row-->',row)
+ console.log('row-->', row)
const res = await myAxios.post('/wechat/refund/create', { id: row.id }) //传入订单号取消订单并退款
console.log(res)
- setTimeout(()=>{
- if(res.data.code === 1) {
+ setTimeout(() => {
+ if (res.data.code === 1) {
SuccessInfo('退款成功')
getOrderList()
loading.value = false
}
- },3)
+ }, 3)
}
const reset = () => { //重置搜索框
orderNumber.value = '';
};
const load = () => { } //搜索的方法
-const cancelOrder = async (row:any)=>{ //取消订单的方法(未支付能取消)
- console.log('点击的这一行--->',row);
- const res = await myAxios.post('/order/cancel/id',{ id: row.id })
- if(res.data.code === 1) {
+const cancelOrder = async (row: any) => { //取消订单的方法(未支付能取消)
+ console.log('点击的这一行--->', row);
+ const res = await myAxios.post('/order/cancel/id', { id: row.id })
+ if (res.data.code === 1) {
getOrderList()
SuccessInfo('取消订单成功')
} else {
@@ -288,9 +294,13 @@ const cancelOrder = async (row:any)=>{ //取消订单的方法(未支付能取
\ No newline at end of file
diff --git a/src/views/Orders/PendingServiceOrderList.vue b/src/views/Orders/PendingServiceOrderList.vue
index ffdca94..a2d678a 100644
--- a/src/views/Orders/PendingServiceOrderList.vue
+++ b/src/views/Orders/PendingServiceOrderList.vue
@@ -2,16 +2,16 @@
- 商品编号：
+ 商品编号：
-
+
-
+
@@ -22,8 +22,8 @@
+ :cell-style="{ 'text-align': 'center', 'font-size': '16px' }" @selection-change="handleSelectionChange"
+ :header-cell-style="{ 'text-align': 'center' }" :row-style="{ height: '70px' }">
@@ -50,13 +50,13 @@
-
+ :cell-style="{ 'text-align': 'center', 'font-size': '14px' }">
+
-
+
-
-
+
+
@@ -65,9 +65,12 @@
详情
-
- 退款
-
+
+
+ 退款
+
+
@@ -80,9 +83,9 @@
+ :current-page="searchParams.current" :page-size="searchParams.pageSize" :page-sizes="[5, 10, 15, 20]"
+ :small="null" :disabled="null" :background="null" layout="total, sizes, prev, pager, next, jumper"
+ :total="total" />
@@ -113,25 +116,25 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -139,7 +142,7 @@
@@ -149,17 +152,17 @@
import { onMounted, ref } from "vue";
import myAxios from "@/api/myAxios";
import { ElMessage } from "element-plus";
-import { SuccessInfo , ErrorInfo } from "@/utils/messageInfo";
+import { SuccessInfo, ErrorInfo } from "@/utils/messageInfo";
import DatePicker from "@/layout/components/DatePicker.vue";
import TimePicker from "@/layout/components/TimePicker.vue";
import emitter from "@/utils/emitter";
-import {checkObjectProperties} from "@/layout/js/validUtils";
+import { checkObjectProperties } from "@/layout/js/validUtils";
const tableData: any = ref([]); //表单展示数据
const total = ref(0);
const title = ref('')
const disabled = ref(true)
const editForm: any = ref({});//编辑表单
-const shipment:any = ref({
+const shipment: any = ref({
trackingNumber: null
})//物流单号
const DialogVisible = ref(false); //详情展示
@@ -179,11 +182,11 @@ const searchParams: any = ref({ //封装分页
})
const loading = ref(false)
onMounted(() => {
- emitter.on('getReservationDate', (val:any) => {
+ emitter.on('getReservationDate', (val: any) => {
reservationDate.value = val
searchParams.value.reservationDate = val
})
- emitter.on('getTimeSlot', (val:any) => {
+ emitter.on('getTimeSlot', (val: any) => {
timeSlot.value = val
searchParams.value.timeSlot = val
})
@@ -209,9 +212,9 @@ const getOrderList = async () => {
if (res.data.code === 1) {
tableData.value = res.data.data.records;
console.log(tableData.value)
- tableData.value.forEach((item:any) => {
+ tableData.value.forEach((item: any) => {
let total = 0;
- for (var i = 0; i < item.pendingServiceOrderVOList.length; i ++ ) {
+ for (var i = 0; i < item.pendingServiceOrderVOList.length; i++) {
total += item.pendingServiceOrderVOList[i].quantity;
}
item.currentNumber = total
@@ -236,7 +239,7 @@ const showDetail = (index: number, row: any) => {
title.value = "订单详情"
DialogVisible.value = true;
editForm.value = row;
- console.log('editForm--->',editForm.value);
+ console.log('editForm--->', editForm.value);
};
//发货方法
const currentId = ref(null);
@@ -262,18 +265,18 @@ const deliverGoods = async () => { //发货方法
}
shipments.value = false;
}
-const refundOrder = async (row : any) => { //微信退款
+const refundOrder = async (row: any) => { //微信退款
loading.value = true
- console.log('row-->',row)
+ console.log('row-->', row)
const res = await myAxios.post('/wechat/refund/create', { id: row.orderItemId }) //传入订单号取消订单并退款
console.log(res)
- setTimeout(()=>{
- if(res.data.code === 1) {
+ setTimeout(() => {
+ if (res.data.code === 1) {
SuccessInfo('退款成功')
getOrderList()
loading.value = false
}
- },2000)
+ }, 2000)
}
const reset = () => { //重置搜索框
goodId.value = ''
@@ -291,10 +294,10 @@ const reset = () => { //重置搜索框
const load = () => {
getOrderList()
} //搜索的方法
-const cancelOrder = async (row:any)=>{ //取消订单的方法(未支付能取消)
- console.log('点击的这一行--->',row);
- const res = await myAxios.post('/order/cancel/id',{ id: row.id })
- if(res.data.code === 1) {
+const cancelOrder = async (row: any) => { //取消订单的方法(未支付能取消)
+ console.log('点击的这一行--->', row);
+ const res = await myAxios.post('/order/cancel/id', { id: row.id })
+ if (res.data.code === 1) {
getOrderList()
SuccessInfo('取消订单成功')
} else {
@@ -306,10 +309,13 @@ const cancelOrder = async (row:any)=>{ //取消订单的方法(未支付能取
\ No newline at end of file
diff --git a/src/views/Orders/ServiceOrderList.vue b/src/views/Orders/ServiceOrderList.vue
index e9ddf66..be340d4 100644
--- a/src/views/Orders/ServiceOrderList.vue
+++ b/src/views/Orders/ServiceOrderList.vue
@@ -53,9 +53,9 @@
-
+