diff --git a/src/pages/admin/add_order/pending_order/index.scss b/src/pages/admin/add_order/pending_order/index.scss index 82e9198..45de757 100644 --- a/src/pages/admin/add_order/pending_order/index.scss +++ b/src/pages/admin/add_order/pending_order/index.scss @@ -58,6 +58,7 @@ page { image { width: 195px; + min-width: 195px; height: 195px; border-radius: 12px; } diff --git a/src/pages/admin/add_order/pending_order/index.vue b/src/pages/admin/add_order/pending_order/index.vue index fdccaf0..f3d289c 100644 --- a/src/pages/admin/add_order/pending_order/index.vue +++ b/src/pages/admin/add_order/pending_order/index.vue @@ -42,7 +42,13 @@ > - + @@ -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(() => { diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss b/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss index ce8de0a..2c5a505 100644 --- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss +++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.scss @@ -32,6 +32,7 @@ width: 195px; height: 195px; border-radius: 12px; + min-width: 195px; } .center { diff --git a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue index 412c583..ab275c7 100644 --- a/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue +++ b/src/pages/admin/add_order/pending_order/pending_order_detail/index.vue @@ -22,6 +22,9 @@ diff --git a/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue b/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue index 45b76ca..bf43b14 100644 --- a/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue +++ b/src/pages/admin/add_order/pending_order/wx_pay_code/index.vue @@ -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); }