From 7160c12ee6c5eb9ffbce1caea864110f3585c0e1 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:29:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
apps/taro/src/subpackages/order/order/InnerPage.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/apps/taro/src/subpackages/order/order/InnerPage.vue b/apps/taro/src/subpackages/order/order/InnerPage.vue
index 0bdfd9d..eac44ba 100644
--- a/apps/taro/src/subpackages/order/order/InnerPage.vue
+++ b/apps/taro/src/subpackages/order/order/InnerPage.vue
@@ -1,17 +1,24 @@
<template>
- <ContentScrollView :paddingH="false">
- <Order />
- </ContentScrollView>
+ <ProTabs v-model="orderType" name="user-home-tabs" class="user-home-tabs" flexTitle fullHeight>
+ <ProTabPane title="璇濊垂璁㈠崟" pane-key="1">
+ <PhoneOrder />
+ </ProTabPane>
+ <ProTabPane title="鐢佃垂璁㈠崟" pane-key="2">
+ <ElectricOrder />
+ </ProTabPane>
+ </ProTabs>
</template>
<script setup lang="ts">
-import { Order } from '@life-payment/components';
+import { PhoneOrder, ElectricOrder } from '@life-payment/components';
import Taro from '@tarojs/taro';
defineOptions({
name: 'InnerPage',
});
+const orderType = ref('1');
+
function goPay() {
Taro.navigateTo({
url: RouterPath.selectPayType,
--
Gitblit v1.9.1