|
@@ -8,12 +8,13 @@ import dateUtil from "@/utils/dateUtil";
|
|
import { useRouter } from 'vue-router'
|
|
import { useRouter } from 'vue-router'
|
|
import { useTradeStore } from '@/stores/trade';
|
|
import { useTradeStore } from '@/stores/trade';
|
|
|
|
|
|
-// 状态,0未确认,1已确认,2特殊取消
|
|
|
|
|
|
+// 状态,0未确认,1已确认(双方已确认),2买家已付款(卖家未确认),3特殊取消
|
|
const showStatusText = (statusVal) => {
|
|
const showStatusText = (statusVal) => {
|
|
const statusMap = {
|
|
const statusMap = {
|
|
- 0: '未确认',
|
|
|
|
|
|
+ 0: '买家未付款',
|
|
1: '已确认',
|
|
1: '已确认',
|
|
- 2: '特殊取消',
|
|
|
|
|
|
+ 2: '待确认',
|
|
|
|
+ 3: '特殊取消',
|
|
}
|
|
}
|
|
return statusMap[statusVal] || '未知状态';
|
|
return statusMap[statusVal] || '未知状态';
|
|
}
|
|
}
|
|
@@ -44,8 +45,8 @@ const getList = async () => {
|
|
const { data } = await getSellConfList(
|
|
const { data } = await getSellConfList(
|
|
Object.assign({}, searchParams)
|
|
Object.assign({}, searchParams)
|
|
);
|
|
);
|
|
|
|
+ console.log("卖出列表 >>>", data.data);
|
|
if (data.code === "00000") {
|
|
if (data.code === "00000") {
|
|
- console.log("打印一下", data.data);
|
|
|
|
if (searchParams.current === 0) {
|
|
if (searchParams.current === 0) {
|
|
sellConfList.value = [];
|
|
sellConfList.value = [];
|
|
}
|
|
}
|
|
@@ -54,11 +55,8 @@ const getList = async () => {
|
|
data.data
|
|
data.data
|
|
);
|
|
);
|
|
|
|
|
|
- console.log("sellConfList.value >>", sellConfList.value);
|
|
|
|
|
|
|
|
sellConfListTotal.value = data.data.length;
|
|
sellConfListTotal.value = data.data.length;
|
|
- console.log("sellConfListTotal.val >>>", sellConfListTotal.value);
|
|
|
|
- console.log("data.data.length >>>", data.data.length);
|
|
|
|
if (sellConfList.value.length === data.data.length) {
|
|
if (sellConfList.value.length === data.data.length) {
|
|
finished.value = true;
|
|
finished.value = true;
|
|
}
|
|
}
|
|
@@ -77,11 +75,11 @@ const showDateTime = (date) => {
|
|
|
|
|
|
// const userStore = useUserStore();
|
|
// const userStore = useUserStore();
|
|
const tradeStore = useTradeStore();
|
|
const tradeStore = useTradeStore();
|
|
-// 去付款
|
|
|
|
|
|
+// 去收款
|
|
const toConf = (item) => {
|
|
const toConf = (item) => {
|
|
// userStore.setUserInfo(item);
|
|
// userStore.setUserInfo(item);
|
|
tradeStore.setTradeItem(item);
|
|
tradeStore.setTradeItem(item);
|
|
- router.push({ name: 'buyConf' });
|
|
|
|
|
|
+ router.push({ name: 'sellConf' });
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -136,8 +134,8 @@ onMounted(async () => {
|
|
<div v-for="item in sellConfList" :key="item.id" class="listItem">
|
|
<div v-for="item in sellConfList" :key="item.id" class="listItem">
|
|
<div class="itemBox">
|
|
<div class="itemBox">
|
|
<div class="itemRow">
|
|
<div class="itemRow">
|
|
- <span class="itemTitle">卖家: </span>{{
|
|
|
|
- item.seller }}
|
|
|
|
|
|
+ <span class="itemTitle">买家: </span>{{
|
|
|
|
+ item.buyer }}
|
|
</div>
|
|
</div>
|
|
<div class="itemRow">
|
|
<div class="itemRow">
|
|
<span class="itemTitle">股票价格: </span>{{
|
|
<span class="itemTitle">股票价格: </span>{{
|
|
@@ -161,9 +159,8 @@ onMounted(async () => {
|
|
}}
|
|
}}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
- <!-- 这里要改TODO: -->
|
|
|
|
<!-- 未确认,去确认收款 -->
|
|
<!-- 未确认,去确认收款 -->
|
|
- <div v-if="item.status === '0'" class="itemRow"
|
|
|
|
|
|
+ <div v-if="item.status === '2'" class="itemRow"
|
|
style="display: flex; justify-content: flex-end">
|
|
style="display: flex; justify-content: flex-end">
|
|
<van-button span="5" round type="primary" :style="{
|
|
<van-button span="5" round type="primary" :style="{
|
|
height: '2em',
|
|
height: '2em',
|
|
@@ -178,13 +175,18 @@ onMounted(async () => {
|
|
</van-button>
|
|
</van-button>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
+ <!-- 未付款-红#F90068,付款未确认-蓝#00A2F9,双方确认-绿#23EF00,特殊取消-紫#5300EF -->
|
|
<div class="itemRow" style="display: flex; justify-content: flex-end">
|
|
<div class="itemRow" style="display: flex; justify-content: flex-end">
|
|
|
|
+ <!-- 未付款 -->
|
|
|
|
+ <span v-if="item.status === '0'">{{
|
|
|
|
+ showStatusText(item.status)
|
|
|
|
+ }}</span>
|
|
<!-- 已确认 -->
|
|
<!-- 已确认 -->
|
|
- <span v-if="item.status === '1'" style="color: #4fc08d">{{
|
|
|
|
|
|
+ <span v-if="item.status === '1'" style="color: #23EF00">{{
|
|
showStatusText(item.status)
|
|
showStatusText(item.status)
|
|
}}</span>
|
|
}}</span>
|
|
<!-- 特殊取消 -->
|
|
<!-- 特殊取消 -->
|
|
- <span v-if="item.status === '2'" style="color: #ff0000">{{
|
|
|
|
|
|
+ <span v-if="item.status === '3'" style="color: #5300EF">{{
|
|
showStatusText(item.status)
|
|
showStatusText(item.status)
|
|
}}</span>
|
|
}}</span>
|
|
</div>
|
|
</div>
|