fix(custom):
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-03-09 20:19:34 +08:00
parent 1f969e59c7
commit c84f2e63f5
5 changed files with 20 additions and 9 deletions

View File

@@ -58,6 +58,7 @@ page {
image {
width: 195px;
min-width: 195px;
height: 195px;
border-radius: 12px;
}

View File

@@ -42,7 +42,13 @@
>
<image :src="itm.Goods.cover"></image>
<view class="center">
<nut-ellipsis direction="end" :content="itm.Goods.name"></nut-ellipsis>
<nut-ellipsis
direction="end"
:content="itm.Goods.name"
rows="3"
expand-text="展开"
collapse-text="收起"
></nut-ellipsis>
<!-- <view class="title">{{ itm.Goods.name }}</view> -->
</view>
<view class="num">
@@ -70,17 +76,13 @@ import Taro from "@tarojs/taro";
import { getAfterOrderList } from "../../../../api/admin";
import Footer from "./components/Footer.vue";
const tabsIndex = ref(0);
const tabsIndex = ref(1);
const listData = ref([]);
const tabs = ref([
{
text: "全部",
value: 0,
},
{
text: "未付款",
text: "未收款",
value: 1,
},
{
@@ -91,6 +93,10 @@ const tabs = ref([
text: "已收款",
value: 2,
},
{
text: "全部",
value: 0,
},
]);
Taro.useDidShow(() => {

View File

@@ -32,6 +32,7 @@
width: 195px;
height: 195px;
border-radius: 12px;
min-width: 195px;
}
.center {

View File

@@ -22,6 +22,9 @@
<nut-ellipsis
direction="end"
:content="itm.Goods.name"
rows="3"
expand-text="展开"
collapse-text="收起"
></nut-ellipsis>
<!-- <view class="title">{{ itm.Goods.name }}</view> -->
</view>

View File

@@ -29,7 +29,7 @@ Taro.useLoad((e) => {
bid: info.value.bid,
oid: info.value.oid,
});
if (data.data.status !== 0) {
if (data.data.status !== 0 && data.data.status !== 2) {
clearInterval(time_id.value);
Taro.showToast({
title: "支付成功",
@@ -37,7 +37,7 @@ Taro.useLoad((e) => {
});
setTimeout(() => {
Taro.navigateTo({
url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${info.value.oid}&bid=${info.value.bid}`
url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${info.value.oid}&bid=${info.value.bid}`,
});
}, 3000);
}