From be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:59:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages/order/myOrder.vue | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 820e33b..758797e 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -213,21 +213,12 @@
</template>
<script>
-import UEmpty from '@/uview-components/uview-ui/components/u-empty/u-empty.vue';
-import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
-import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
-import URadioGroup from '@/uview-components/uview-ui/components/u-radio-group/u-radio-group.vue';
-import URadio from '@/uview-components/uview-ui/components/u-radio/u-radio.vue';
-import UButton from '@/uview-components/uview-ui/components/u-button/u-button.vue';
-import UToast from '@/uview-components/uview-ui/components/u-toast/u-toast.vue';
-import UModal from '@/uview-components/uview-ui/components/u-modal/u-modal.vue';
-import { getOrderList, cancelOrder, confirmReceipt } from "@/api/order.js";
+import '@/components/uview-components/uview-ui';
+import { getOrderXcxList, cancelOrder, confirmReceipt } from "@/api/order.js";
import { getClearReason } from "@/api/after-sale.js";
import LiLiWXPay from "@/js_sdk/lili-pay/wx-pay.js";
export default {
- components: {
- UEmpty,UImage,UPopup,URadioGroup,URadio,UButton,UToast,UModal
- },
+
data() {
return {
lightColor: this.$lightColor,
@@ -424,18 +415,9 @@
*/
pay(val) {
if (val.sn) {
- // #ifdef MP-WEIXIN
- new LiLiWXPay({
- sn: val.sn,
- price: val.flowPrice,
- orderType: "ORDER",
- }).pay();
- // #endif
- // #ifndef MP-WEIXIN
uni.navigateTo({
url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
});
- // #endif
}
},
@@ -445,7 +427,7 @@
loadData(index) {
this.params.pageNumber = this.navList[index].pageNumber;
// this.params.tag = this.orderStatus[index].orderStatus;
- getOrderList(this.params).then((res) => {
+ getOrderXcxList(this.params).then((res) => {
uni.stopPullDownRefresh();
if (!res.data.success) {
this.navList[index].loadStatus = "noMore";
--
Gitblit v1.8.0