zianxin/pj_h5_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:修复错误

Browse Source
This commit is contained in:
weiwei committed 2025-09-25 19:12:12 +08:00
1 parent 064c13c7b0
commit d1c84d3eb5
4 files changed
+43 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/pages/integrated/visitor/invitation-record.vue
+4 -4
View File
@@ -18,8 +18,8 @@
<view class="bg-white rounded-20rpx my-20rpx font-bold py-1">
<z-tabs
:list="[
{ name: '访客申请', value: 0 },
{ name: '我的邀约', value: 1 },
{ name: '我的邀约', value: '2' },
{ name: '访客申请', value: '1' },
// { name: '访客申请', value: 0, badge: { count: 10 } },
// { name: '我的邀约', value: 1, badge: { count: 6 } },
]"
@@ -138,7 +138,7 @@ const visitorReasonList = ref<{ title: string; id: string }[]>([])
const state = reactive<any>({
params: {
checkStatus: tabs[0].value,
type: 1, // type为1:访客端主动申请 type为2:邀约端邀约 type为3:后台创建
type: 2, // type为1:访客端主动申请 type为2:邀约端邀约 type为3:后台创建
},
})
const pageRef = ref<any>(null)
@@ -164,7 +164,7 @@ const query = (page: number, pagesize: number) => {
}
const onTabChange = (e: number) => {
state.params.type = e + 1
state.params.type = e
pageRef.value.reload(true)
}
src/pages/tabbar/flowStatistics.vue
+35 -20
View File
@@ -1,30 +1,44 @@
<template>
<crud-layout bg="/static/page/blue-bg.png">
<z-paging ref="pageRef" :fixed="false" height="100%" v-model="pageHook.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="pageHook.scroll">
<z-paging
ref="pageRef"
:fixed="false"
height="100%"
v-model="pageHook.list"
:default-page-size="10"
safe-area-inset-bottom
:loading-more-enabled="false"
:show-scrollbar="false"
@query="query"
:auto-clean-list-when-reload="false"
:auto-scroll-to-top-when-reload="false"
@scroll="pageHook.scroll"
>
<template #top>
<view class="h-30rpx" />
<view class="flex items-center justify-between">
<view class="flex items-center justify-between my-2">
<view class="flex-1 bg-white rounded-12rpx p-20rpx flex justify-between items-center">
<text class="text-30 font-600">流水统计</text>
<tm-text color="#999999" font-size="26">{{ formatVal }}</tm-text>
<view class="flex items-center cursor-pointer">
<tm-between-time start="2020-1-1" end="2050-1-1" v-model="state.date"
v-model:model-str="state.formatVal" @confirm="datePickerConfirm" format="YYYY-MM-DD"
:quickDate="[]" drawerSize="900">
<tm-between-time
start="2020-1-1"
end="2050-1-1"
v-model="state.date"
v-model:model-str="state.formatVal"
@confirm="datePickerConfirm"
format="YYYY-MM-DD"
:quickDate="[]"
drawerSize="900"
>
<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
<text class="ml-1 text-30">筛选</text>
</tm-between-time>
</view>
</view>
<tm-button size="m" class="px-1 ml-1" @click="doWaterTotal">月度流水</tm-button>
</view>
</template>
<view class="h-20rpx" />
<view class="bg-white rounded-16rpx p-3 mb-2 shadow-md" v-for="(v, i) in pageHook.list" :key="i">
<view class="bg-white rounded-16rpx p-2 mb-2" v-for="(v, i) in pageHook.list" :key="i">
<view class="flex justify-between items-center text-sm text-gray-800 mb-1">
<view class="flex items-center">
<image class="w-50rpx h-50rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
@@ -36,8 +50,7 @@
<view class="flex justify-between mb-2">
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
<text class="flex-1 text-sm text-center text-gray-600">流水金额</text>
<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(v.totalPayPrice)
}}</text>
<text class="flex-1 text-sm text-center text-gray-800">¥ {{ hooks.useMoney(v.totalPayPrice) }}</text>
</view>
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
<text class="flex-1 text-sm text-center text-gray-600">流水次数</text>
@@ -47,9 +60,7 @@
<view class="flex justify-between mb-2">
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
<text class="flex-1 text-sm text-center text-gray-600">盈利金额</text>
<text class="flex-1 text-sm text-center text-green-500">¥ {{
hooks.useMoney(v.totalProfitPrice)
}}</text>
<text class="flex-1 text-sm text-center text-green-500">¥ {{ hooks.useMoney(v.totalProfitPrice) }}</text>
</view>
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
<text class="flex-1 text-sm text-center text-gray-600">盈利次数</text>
@@ -59,8 +70,7 @@
<view class="flex justify-between mb-0">
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx">
<text class="flex-1 text-sm text-center text-gray-600">退款金额</text>
<text class="flex-1 text-sm text-center text-red-500">¥ {{
hooks.useMoney(v.totalRefundPrice) }}</text>
<text class="flex-1 text-sm text-center text-red-500">¥ {{ hooks.useMoney(v.totalRefundPrice) }}</text>
</view>
<view class="flex-1 flex items-center p-2 bg-white rounded-8rpx ml-2">
<text class="flex-1 text-sm text-center text-gray-600">退款次数</text>
@@ -69,6 +79,10 @@
</view>
</view>
</view>
<view class="fixed bottom-80rpx right-40rpx">
<tm-button size="m" class="px-1 ml-1" @click="doWaterTotal">每月流水合计</tm-button>
</view>
</z-paging>
</crud-layout>
</template>
@@ -111,7 +125,8 @@ const query = (page: number, pagesize: number) => {
// 时间范围选择器确认
const datePickerConfirm = (date: any) => {
state.pa.createTimeList = formatVal.value.split("~")
const list = formatVal.value.split("~")
state.pa.createTimeList = [list[0] + " 00:00:00", list[1] + " 23:59:59"]
pageRef.value.reload(false)
}
src/pages/tabbar/index.vue
-2
View File
@@ -141,7 +141,6 @@ const doModuleJump = (item: any) => {
<template>
<crud-layout mainIsScroll bg="/static/page/blue-bg.png">
<view class="w-full h-full flex-col-center">
<view class="h-30rpx" />
<tm-sheet v-if="isDevEnv()" :margin="[0]">
<view class="flex-row items-center justify-center flex-wrap">
<view class="w-half flex justify-center py-2 rounded-1" v-for="(item, index) in moduleList" :key="index">
@@ -153,7 +152,6 @@ const doModuleJump = (item: any) => {
</view>
</tm-sheet>
<view v-else>加载中...</view>
<view class="h-30rpx" />
</view>
</crud-layout>
</template>
src/sheep/components/time-range-picker.vue
+4 -5
View File
@@ -96,10 +96,9 @@ function onConfirm() {
font-size: 24rpx;
}
.date-time-range .date-range-item {
padding: 10rpx;
padding: 10rpx 16rpx;
background-color: #eee;
border-radius: 12rpx;
margin: 0 10rpx;
text-align: center;
white-space: nowrap;
}
@@ -111,12 +110,12 @@ function onConfirm() {
.day-time-point-list {
display: flex;
flex-wrap: wrap;
gap: 20rpx;
gap: 10rpx;
margin-bottom: 20rpx;
}
.day-time-point-list button {
flex: 1 0 90rpx;
padding: 6rpx 0;
flex: 1 0 calc(100vw / 9);
padding: 6rpx;
border: none;
background: #eeeeee;
border-radius: 12rpx;