From c9e728f4978554a0161d545d6e79d96fee4ca3b1 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 18 Mar 2025 20:07:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BD=93=E5=95=86=E6=88=B7=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E3=80=81=E8=AE=A2=E5=8D=95=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                       |  26 +++++
 src/pages/refund/apply.vue           |  22 +----
 src/pages/tabbar/flowStatistics.vue  | 115 ++++++++++++++++++++++
 src/pages/tabbar/individualOrder.vue | 139 +++++++++++++++++++++++++++
 4 files changed, 283 insertions(+), 19 deletions(-)
 create mode 100644 src/pages/tabbar/flowStatistics.vue
 create mode 100644 src/pages/tabbar/individualOrder.vue

diff --git a/src/pages.json b/src/pages.json
index 45db073..c76a654 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -30,6 +30,20 @@
 				"disableScroll": true
 			}
 		},
+		{
+			"path": "pages/tabbar/flowStatistics",
+			"style": {
+				"navigationBarTitleText": "流水统计",
+				"disableScroll": true
+			}
+		},
+		{
+			"path": "pages/tabbar/individualOrder",
+			"style": {
+				"navigationBarTitleText": "订单",
+				"disableScroll": true
+			}
+		},
 		{
 			"path": "pages/tabbar/my",
 			"style": {
@@ -285,6 +299,18 @@
 				"iconPath": "static/tabbar/order.png",
 				"selectedIconPath": "static/tabbar/order-select.png"
 			},
+			{
+				"pagePath": "pages/tabbar/flowStatistics",
+				"text": "流水统计",
+				"iconPath": "static/tabbar/order.png",
+				"selectedIconPath": "static/tabbar/order-select.png"
+			},
+			{
+				"pagePath": "pages/tabbar/individualOrder",
+				"text": "订单",
+				"iconPath": "static/tabbar/order.png",
+				"selectedIconPath": "static/tabbar/order-select.png"
+			},
 			{
 				"pagePath": "pages/tabbar/my",
 				"text": "我的",
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index b42c13a..b75392f 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -22,9 +22,7 @@ const state = reactive<any>({
 	selectList: [],
 })
 const uploadApplyPicUrls = ref<Array<Record<string, any> | string>>([]) // 补充凭证图片
-const applyPicUrls = computed(() =>
-	uploadApplyPicUrls.value.map((item: any) => JSON.parse(item.response).data.url).join(","),
-)
+const applyPicUrls = computed(() => uploadApplyPicUrls.value.map((item: any) => JSON.parse(item.response).data.url).join(","))
 
 const applyForm = reactive<any>({
 	way: data.payType[0].type,
@@ -154,14 +152,7 @@ const doSubmit = async () => {
 			<view class="sub-text-28">售后类型</view>
 			<view class="m-t-20rpx">
 				<tm-radio-group @change="radioChange" direction="column" gap="20" v-model="applyForm.way">
-					<tm-radio
-						:disabled="v.disabled"
-						v-for="(v, i) in data.payType"
-						:key="i"
-						v-show="v.visible"
-						:value="v.type"
-						:label="v.text"
-					/>
+					<tm-radio :disabled="v.disabled" v-for="(v, i) in data.payType" :key="i" v-show="v.visible" :value="v.type" :label="v.text" />
 				</tm-radio-group>
 			</view>
 		</view>
@@ -187,7 +178,6 @@ const doSubmit = async () => {
 			</tm-picker>
 		</view>
 		<view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
-			<<<<<<< HEAD
 			<view class="sub-text-28">补充凭证图片</view>
 			<view class="m-t-20rpx">
 				<tm-upload-photo
@@ -201,15 +191,9 @@ const doSubmit = async () => {
 			<view class="sub-text-20 c-red!">注：图片大小不超过5M，最多上传6张</view>
 		</view>
 		<view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
-			======= >>>>>>> c3eaafa5d0575ebd0fa74be0180c5cfe8a9901ea
 			<view class="sub-text-28">相关描述</view>
 			<view class="m-t-20rpx">
-				<tm-input
-					v-model="applyForm.remark"
-					type="textarea"
-					:showClear="false"
-					placeholder="客官～请描述您遇到的问题"
-				></tm-input>
+				<tm-input v-model="applyForm.remark" type="textarea" :showClear="false" placeholder="客官～请描述您遇到的问题"></tm-input>
 			</view>
 		</view>
 		<view class="h-30rpx" />
diff --git a/src/pages/tabbar/flowStatistics.vue b/src/pages/tabbar/flowStatistics.vue
new file mode 100644
index 0000000..537082c
--- /dev/null
+++ b/src/pages/tabbar/flowStatistics.vue
@@ -0,0 +1,115 @@
+<template>
+	<crud-layout bg="/static/page/blue-bg.png">
+		<z-paging
+			ref="pageRef"
+			:fixed="false"
+			v-model="list"
+			:default-page-size="10"
+			safe-area-inset-bottom
+			:loading-more-enabled="true"
+			:show-scrollbar="false"
+			@query="query"
+			:auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false"
+			@scroll="scroll"
+		>
+			<template #top>
+				<view class="h-30rpx" />
+				<view class="bg-white rounded-12rpx p-20rpx flex justify-between items-center">
+					<text class="text-30 font-600">流水统计</text>
+					<view @click="openFilter" class="flex items-center cursor-pointer">
+						<svg
+							t="1742280333491"
+							class="icon"
+							viewBox="0 0 1024 1024"
+							version="1.1"
+							xmlns="http://www.w3.org/2000/svg"
+							p-id="4288"
+							width="16"
+							height="16"
+						>
+							<path
+								d="M568.552727 954.181818a86.341818 86.341818 0 0 1-41.425454-10.472727l-114.269091-62.836364a86.574545 86.574545 0 0 1-44.916364-76.101818V442.181818a16.989091 16.989091 0 0 0-6.981818-13.730909L97.047273 218.298182 93.090909 214.807273A85.876364 85.876364 0 0 1 155.927273 69.818182h711.214545A86.574545 86.574545 0 0 1 930.909091 214.807273l-3.490909 3.490909-266.24 213.410909a17.454545 17.454545 0 0 0-6.050909 13.730909v422.4A86.341818 86.341818 0 0 1 568.552727 954.181818zM141.963636 166.632727l262.283637 209.454546A85.178182 85.178182 0 0 1 437.061818 442.181818v362.589091a17.92 17.92 0 0 0 8.610909 15.592727l114.269091 62.138182a17.687273 17.687273 0 0 0 17.687273 0 17.221818 17.221818 0 0 0 8.378182-15.36V445.44a85.876364 85.876364 0 0 1 31.883636-67.258182l263.214546-211.549091a17.687273 17.687273 0 0 0 1.62909-18.152727 17.454545 17.454545 0 0 0-15.592727-8.843636H155.927273a17.221818 17.221818 0 0 0-13.963637 27.694545zM920.669091 512h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128.930909h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z m0 128h-188.974546a34.443636 34.443636 0 0 1 0-69.818182h188.974546a34.443636 34.443636 0 0 1 0 69.818182z"
+								p-id="4289"
+							/>
+						</svg>
+						<text class="ml-1 text-30">筛选</text>
+					</view>
+				</view>
+			</template>
+
+			<view class="h-20rpx" />
+
+			<view class="bg-white rounded-16rpx p-2 mb-2 shadow-md" v-for="(v, i) in list" :key="i">
+				<view class="text-28 text-gray-800 font-medium px-2 mb-2">
+					{{ "2022-01-01" }}
+				</view>
+				<view class="bg-gray-100 rounded-12rpx p-2">
+					<view class="flex justify-between mb-2">
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
+							<text class="flex-1 text-center text-gray-600">流水金额</text>
+							<text class="flex-1 text-center text-26 text-gray-800 font-medium">¥{{ 1145 }}</text>
+						</view>
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-center text-gray-600">流水次数</text>
+							<text class="flex-1 text-center text-26 text-gray-800 font-medium">{{ 1145 }}</text>
+						</view>
+					</view>
+					<view class="flex justify-between mb-2">
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
+							<text class="flex-1 text-center text-gray-600">退款金额</text>
+							<text class="flex-1 text-center text-26 text-red-500 font-medium">¥{{ 1145 }}</text>
+						</view>
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-center text-gray-600">退款次数</text>
+							<text class="flex-1 text-center text-26 text-red-500 font-medium">{{ 1145 }}</text>
+						</view>
+					</view>
+					<view class="flex justify-between mb-0">
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx mr-1">
+							<text class="flex-1 text-center text-gray-600">盈利金额</text>
+							<text class="flex-1 text-center text-26 text-green-500 font-medium">¥{{ 1145 }}</text>
+						</view>
+						<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-1">
+							<text class="flex-1 text-center text-gray-600">盈利次数</text>
+							<text class="flex-1 text-center text-26 text-green-500 font-medium">{{ 1145 }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</z-paging>
+	</crud-layout>
+
+	<tm-drawer v-model:show="state.drawerShow" :height="900" hideHeader>aaa</tm-drawer>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from "vue"
+import { onShow } from "@dcloudio/uni-app"
+import { hooks } from "@@/index"
+import { orderApi } from "@@/api"
+
+const pageRef = ref<any>(null)
+const state = reactive<any>({
+	pa: {
+		payTimeList: [],
+	},
+	drawerShow: false,
+})
+const { list, startPage, scroll } = hooks.usePage(pageRef, orderApi.page, null, "data.records")
+
+onShow(() => {
+	// const isLogin = await hooks.useCheckLogin()
+	// if (!isLogin) return
+})
+
+const query = (page: number, pagesize: number) => {
+	// const isLogin = hooks.useStaticCheckLogin()
+	// if (!isLogin) return
+	startPage(page, pagesize, false, state.pa)
+}
+
+const openFilter = () => {
+	state.drawerShow = true
+}
+</script>
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
new file mode 100644
index 0000000..c599c3e
--- /dev/null
+++ b/src/pages/tabbar/individualOrder.vue
@@ -0,0 +1,139 @@
+<template>
+	<crud-layout bg="/static/page/blue-bg.png">
+		<z-paging
+			ref="pageRef"
+			:fixed="false"
+			v-model="list"
+			:default-page-size="10"
+			safe-area-inset-bottom
+			:loading-more-enabled="true"
+			:show-scrollbar="false"
+			@query="query"
+			:auto-clean-list-when-reload="false"
+			:auto-scroll-to-top-when-reload="false"
+			@scroll="scroll"
+		>
+			<template #top>
+				<view class="h-30rpx" />
+				<view class="bg-white rounded-16rpx px-20rpx">
+					<z-tabs :list="tabs" @change="tabChange" />
+				</view>
+			</template>
+
+			<view class="h-20rpx" />
+
+			<view class="flex-col justify-center card p-x-15rpx p-y-25rpx m-b-20rpx" v-for="(v, i) in list" :key="i">
+				<view class="flex-row items-center">
+					<image class="w-100rpx h-100rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<view class="flex-1 flex-col m-l-20rpx">
+						<view class="flex-row items-center justify-between">
+							<view class="flex-row items-center">
+								<view class="main-text-28">{{ v.merchantName }}</view>
+								<view v-if="false" class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />
+							</view>
+							<tm-tag v-if="v.orderStatus !== 1" color="success" size="xs">已支付</tm-tag>
+							<tm-tag v-if="v.orderStatus == 2" color="info" size="xs">售后</tm-tag>
+						</view>
+						<view class="flex justify-between items-end m-t-5rpx">
+							<view class="flex flex-col m-t-5rpx">
+								<view class="second-text-20">
+									<text>{{ "某个人" }}</text>
+									<text class="m-l-10rpx">{{ "13155555555" }}</text>
+								</view>
+								<view class="second-text-20">
+									<text>下单时间</text>
+									<text class="m-l-10rpx">
+										{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
+									</text>
+								</view>
+							</view>
+							<view class="flex flex-row">
+								<view class="m-t-14rpx m-r-20rpx second-text-26">共 {{ v.carList.length }} 件</view>
+								<view class="m-t-10rpx main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="h-20rpx m-t-[-10rpx] flex justify-end items-center">
+					<!-- <view class="absolute top-0 right-0 bottom-0 left-0 h-180rpx">
+						<scroll-view scroll-x class="flex-row-center whitespace-nowrap">
+							<view class="flex-row items-center">
+								<view
+									class="inline-flex! flex-col justify-center h-180rpx m-r-20rpx"
+									v-for="(pV, pI) in v.carList"
+									:key="pI"
+									@tap.stop="
+										router.jump('/pages/merchant/product-detail', {
+											id: pV.productId,
+										})
+									"
+								>
+									<image class="w-160rpx h-120rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
+									<view class="w-160rpx m-t-10rpx sub-text-24 show-line text-center">
+										{{ pV.productName }}
+									</view>
+								</view>
+								<view class="inline-flex! h-180rpx">
+									<view class="w-160rpx h-full" />
+								</view>
+							</view>
+						</scroll-view>
+					</view> -->
+				</view>
+				<view class="flex-row items-center justify-end">
+					<view class="botder_btn" @tap.stop="">退款</view>
+				</view>
+			</view>
+		</z-paging>
+
+		<!-- <tm-drawer ref="calendarView" placement="bottom" v-model:show="state.showDrawer">
+			<view style="height: 1800rpx"></view>
+		</tm-drawer> -->
+	</crud-layout>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive } from "vue"
+import { onShow } from "@dcloudio/uni-app"
+import { hooks } from "@@/index"
+import { filePath } from "@@/utils/file"
+import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
+import { orderApi } from "@@/api"
+
+const pageRef = ref<any>(null)
+// 选项卡
+const tabs = [
+	{ id: null, name: "全部", disabled: false },
+	{ id: 1, name: "已支付", disabled: false },
+	{ id: 2, name: "售后", disabled: false },
+]
+const state = reactive<any>({
+	pa: {
+		orderStatus: tabs[0].id,
+	},
+	// showDrawer: false,
+})
+const { list, startPage, scroll } = hooks.usePage(pageRef, orderApi.page, null, "data.records")
+
+onShow(() => {
+	// const isLogin = await hooks.useCheckLogin()
+	// if (!isLogin) return
+})
+
+// 切换选项卡
+const tabChange = (e: number) => {
+	state.pa.orderStatus = tabs[e].id
+	pageRef.value.reload(true)
+}
+
+const query = (page: number, pagesize: number) => {
+	// const isLogin = hooks.useStaticCheckLogin()
+	// if (!isLogin) return
+	startPage(page, pagesize, false, state.pa)
+}
+
+// 点击退款
+// const tabRefund = (v: any) => {
+// 	state.showDrawer = true
+// }
+</script>