From 2b99047683332624832c1dfcae596e957a710b7d Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:20:49 +0800
Subject: [PATCH] bug修复
---
src/views/personalCenter/components/OrderMng.vue | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 104 insertions(+), 15 deletions(-)
diff --git a/src/views/personalCenter/components/OrderMng.vue b/src/views/personalCenter/components/OrderMng.vue
index 93429a8..b8c9777 100644
--- a/src/views/personalCenter/components/OrderMng.vue
+++ b/src/views/personalCenter/components/OrderMng.vue
@@ -5,7 +5,11 @@
<div class="left">
<div class="id">
璁㈠崟缂栧彿/浜у搧鍚嶇О
- <el-input v-model="inputText" placeholder="璇疯緭鍏�"></el-input>
+ <el-input
+ style="width: 140px"
+ v-model="inputText"
+ placeholder="璇疯緭鍏�"
+ ></el-input>
</div>
<div class="cluster">
@@ -18,7 +22,25 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
:default-time="['00:00:00', '23:59:59']"
+ style="width: 212px"
></el-date-picker>
+ </div>
+
+ <div class="id">
+ 鐘舵��
+ <el-select
+ class="selectStatus"
+ v-model="status"
+ @change="searchingBtn"
+ >
+ <el-option label="鍏ㄩ儴" :value="-10"></el-option>
+ <el-option label="宸插彇娑�" :value="-1"></el-option>
+ <el-option label="鏈笅鍗�" :value="0"></el-option>
+ <el-option label="寰呮敮浠�" :value="1"></el-option>
+ <el-option label="宸叉敮浠�" :value="2"></el-option>
+ <el-option label="瀹℃牳涓�" :value="11"></el-option>
+ <el-option label="宸查┏鍥�" :value="12"></el-option>
+ </el-select>
</div>
</div>
@@ -60,8 +82,15 @@
prop="createTime"
label="鍒涘缓鏃堕棿"
show-overflow-tooltip
+ sortable
+ width="180"
></el-table-column>
- <el-table-column prop="orderMoney" label="璁㈠崟閲戦"></el-table-column>
+ <el-table-column
+ prop="orderMoney"
+ label="璁㈠崟閲戦(鍏�)"
+ sortable
+ width="140"
+ ></el-table-column>
<el-table-column label="鏀粯鏂瑰紡">
<template slot-scope="scope">
<div v-if="scope.row.payMethod == 0">绾夸笅姹囨</div>
@@ -69,11 +98,27 @@
<div v-if="scope.row.payMethod == 2">寰俊</div>
</template>
</el-table-column>
- <el-table-column prop="status" label="璁㈠崟鐘舵��"></el-table-column>
+ <el-table-column
+ prop="status"
+ label="璁㈠崟鐘舵��"
+ sortable
+ ></el-table-column>
- <el-table-column label="鎿嶄綔">
+ <el-table-column label="鎿嶄綔" width="140">
<template slot-scope="scope">
- <span class="option" @click="showDetail(scope.row)">璁㈠崟璇︽儏</span>
+ <span class="option" @click="showDetail(scope.row)">璇︽儏</span>
+ <span
+ class="option"
+ v-if="scope.row.status === '寰呮敮浠�'"
+ @click="showPayBox(scope.row.id)"
+ >鏀粯</span
+ >
+ <span
+ class="option"
+ v-if="scope.row.status === '寰呮敮浠�'"
+ @click="cancel(scope.row.id)"
+ >鍙栨秷</span
+ >
</template>
</el-table-column>
</el-table>
@@ -90,6 +135,12 @@
></el-pagination>
</div>
</div>
+
+ <ConfirmOrder
+ v-if="showOrder"
+ :orderId="orderId"
+ @close="closeBox"
+ ></ConfirmOrder>
</div>
<div class="order-detail" v-else>
@@ -237,20 +288,25 @@
</template>
<script>
-import { getOrders, getAuthFile } from "@/api/order";
+import { getOrders, getAuthFile, cancelOrder } from "@/api/order";
import { getOrderById } from "@/api/product";
+import ConfirmOrder from "@/views/productDetail/components/ConfirmOrder";
export default {
- components: {},
+ components: {
+ ConfirmOrder,
+ },
created() {
+ let type = sessionStorage.getItem("type");
+ if (type) {
+ this.status = +type;
+ sessionStorage.removeItem("type");
+ }
this.searchingBtn();
},
data() {
return {
- searchTime: [
- this.$moment().format("YYYY-MM-DD 00:00:00"),
- this.$moment().format("YYYY-MM-DD HH:mm:ss"),
- ], //鎼滅储鏃堕棿
+ searchTime: [], //鎼滅储鏃堕棿
page: 1,
size: 10, //鍒嗛〉鐩稿叧
inputText: "", //杈撳叆妗嗗唴瀹�
@@ -277,6 +333,9 @@
form: {}, //澶勭悊涓殑璁惧
isShowDetail: false,
showTable: false,
+ orderId: "",
+ showOrder: false,
+ status: -10,
};
},
methods: {
@@ -291,7 +350,7 @@
productBaseId: "0",
orderName: "",
orderType: "",
- status: 0,
+ status: this.status,
};
getOrders(param)
.then((res) => {
@@ -397,7 +456,7 @@
clearSearch() {
debugger;
- this.searchTime = this.getDateInit();
+ this.searchTime = [];
debugger;
this.inputText = "";
this.searchingBtn();
@@ -551,6 +610,30 @@
window.URL.revokeObjectURL(Temp);
},
+
+ showPayBox(id) {
+ this.showOrder = true;
+ this.orderId = id;
+ },
+
+ cancel(id) {
+ cancelOrder("/saas/api-s/saasOrder/cancel/" + id).then((res) => {
+ if (res && res.success) {
+ this.$notify({
+ type: "success",
+ message: "璁㈠崟鍙栨秷鎴愬姛",
+ duration: 2500,
+ offset: 57,
+ });
+ this.searchingBtn();
+ }
+ });
+ },
+
+ closeBox() {
+ this.showOrder = false;
+ this.searchingBtn();
+ },
},
mounted() {},
};
@@ -586,7 +669,7 @@
color: #fff;
background: #0065ff;
border-radius: 3px;
- margin-right: 20px;
+ margin-right: 10px;
}
.right {
display: flex;
@@ -602,7 +685,7 @@
color: #fff;
align-items: center;
justify-content: center;
- margin-left: 195px;
+ margin-left: 20px;
cursor: pointer;
}
.resetBtn {
@@ -663,6 +746,12 @@
}
}
+ .selectStatus {
+ margin: 0 10px;
+ margin-right: 30px;
+ width: 100px;
+ }
+
.el-input ::v-deep {
width: 200px;
margin-left: 10px;
--
Gitblit v1.8.0