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

流水统计

Browse Source
This commit is contained in:
weiwei committed 2025-03-24 11:45:47 +08:00
1 parent 7819d15326
commit 2aef1e445d
7 files changed
+96 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.env
+2 -2
View File
@@ -26,9 +26,9 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
# ******************** start 开发环境 start ********************
VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
# VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地
VITE_APP_DEV_SERVICE = http://192.168.101.64:9999 # 邓-本地
# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api/ # 线上
# VITE_APP_DEV_SERVICE = http://220.191.229.171:8090/api # 线上
src/pages.json
+26 -26
View File
@@ -30,20 +30,20 @@
"disableScroll": true
}
},
// {
// "path": "pages/tabbar/flowStatistics",
// "style": {
// "navigationBarTitleText": "流水统计",
// "disableScroll": true
// }
// },
// {
// "path": "pages/tabbar/individualOrder",
// "style": {
// "navigationBarTitleText": "订单",
// "disableScroll": true
// }
// },
{
"path": "pages/tabbar/flowStatistics",
"style": {
"navigationBarTitleText": "流水统计",
"disableScroll": true
}
},
{
"path": "pages/tabbar/individualOrder",
"style": {
"navigationBarTitleText": "订单",
"disableScroll": true
}
},
{
"path": "pages/tabbar/my",
"style": {
@@ -311,18 +311,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/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": "我的",
src/pages/tabbar/flowStatistics.vue
+16 -13
View File
@@ -17,14 +17,15 @@
<view class="h-30rpx" />
<view class="bg-white rounded-12rpx p-20rpx flex justify-between items-center">
<text class="text-30 font-600">流水统计</text>
<tm-text color="#999999">{{ state.nowVal }}</tm-text>
<tm-text color="#999999">{{ state.formatVal }}</tm-text>
<view class="flex items-center cursor-pointer">
<tm-between-time
start="2020-1-1"
end="2040-1-1"
v-model="state.newdata"
v-model:model-str="state.nowVal"
v-model="state.date"
v-model:model-str="state.formatVal"
@confirm="datePickerConfirm"
format="YYYY-MM-DD"
>
<svg
t="1742280333491"
@@ -94,32 +95,34 @@
import { ref, reactive } from "vue"
import { onShow } from "@dcloudio/uni-app"
import { hooks } from "@@/index"
import { orderApi } from "@@/api"
import { flowStatisticsApi } from "@@/api"
const pageRef = ref<any>(null)
const state = reactive<any>({
pa: {
payTimeList: [],
createTimeList: [],
},
nowVal: "",
newdata: "",
formatVal: "",
date: "",
})
const { list, startPage, scroll } = hooks.usePage(pageRef, orderApi.page, null, "data.records")
const { list, startPage, scroll } = hooks.usePage(pageRef, flowStatisticsApi.page, null, "data.records")
onShow(() => {
// const isLogin = await hooks.useCheckLogin()
// if (!isLogin) return
const isLogin = hooks.useCheckLogin()
if (!isLogin) return
})
const query = (page: number, pagesize: number) => {
// const isLogin = hooks.useStaticCheckLogin()
// if (!isLogin) return
const isLogin = hooks.useStaticCheckLogin()
if (!isLogin) return
startPage(page, pagesize, false, state.pa)
}
// 时间范围选择器确认
const datePickerConfirm = (date: any) => {
state.pa.payTimeList = state.newdata
state.pa.createTimeList = date.map((v: any) => hooks.useTime(v, "{y}-{m}-{d}"))
console.log("xx", state.pa.createTimeList)
pageRef.value.reload(false)
}
</script>
src/pages/tabbar/individualOrder.vue
+9 -7
View File
@@ -31,8 +31,10 @@
<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>
<tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
<tm-tag v-if="v.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
<tm-tag v-if="v.orderStatus == 10" color="error" size="xs">售后</tm-tag>
<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
</view>
<view class="flex justify-between items-end m-t-5rpx">
<view class="flex flex-col m-t-5rpx">
@@ -48,7 +50,7 @@
</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-14rpx m-r-20rpx second-text-26">共 {{ v.carList?.length || "null" }} 件</view>
<view class="m-t-10rpx main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
</view>
</view>
@@ -98,14 +100,14 @@ 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"
import { individualOrderApi } from "@@/api"
const pageRef = ref<any>(null)
// 选项卡
const tabs = [
{ id: null, name: "全部", disabled: false },
{ id: 1, name: "已支付", disabled: false },
{ id: 2, name: "售后", disabled: false },
{ id: 5, name: "已支付", disabled: false },
{ id: 10, name: "售后", disabled: false },
]
const state = reactive<any>({
pa: {
@@ -113,7 +115,7 @@ const state = reactive<any>({
},
// showDrawer: false,
})
const { list, startPage, scroll } = hooks.usePage(pageRef, orderApi.page, null, "data.records")
const { list, startPage, scroll } = hooks.usePage(pageRef, individualOrderApi.page, null, "data.records")
onShow(() => {
// const isLogin = await hooks.useCheckLogin()
src/sheep/api/flowStatistics.ts
+13
View File
@@ -0,0 +1,13 @@
import request from "@/sheep/utils/request"
export default {
page: (params: any) =>
request({
url: "/hard/hard-total/app/mch-water-day",
method: "GET",
params,
custom: {
showLoading: false,
},
}),
}
src/sheep/api/index.ts
+17 -13
View File
@@ -1,25 +1,29 @@
export { default as applyApi } from "./apply";
export { default as applyApi } from "./apply"
export { default as boxesApi } from "./boxes";
export { default as boxesApi } from "./boxes"
export { default as commonApi } from "./common";
export { default as commonApi } from "./common"
export { default as foodApi } from "./food";
export { default as foodApi } from "./food"
export { default as merchantApi } from "./merchant";
export { default as merchantApi } from "./merchant"
export { default as orderApi } from "./order";
export { default as orderApi } from "./order"
export { default as payApi } from "./pay";
export { default as payApi } from "./pay"
export { default as productApi } from "./product";
export { default as productApi } from "./product"
export { default as refundApi } from "./refund";
export { default as refundApi } from "./refund"
export { default as userApi } from "./user";
export { default as userApi } from "./user"
export { default as walletApi } from "./wallet";
export { default as walletApi } from "./wallet"
export { default as faceApi } from "./face";
export { default as faceApi } from "./face"
export { default as shopApi } from "./shop";
export { default as shopApi } from "./shop"
export { default as flowStatisticsApi } from "./flowStatistics"
export { default as individualOrderApi } from "./individualOrder"
src/sheep/api/individualOrder.ts
+13
View File
@@ -0,0 +1,13 @@
import request from "@/sheep/utils/request"
export default {
page: (params: any) =>
request({
url: "/hard/hard-order/app/mch-page-join",
method: "GET",
params,
custom: {
showLoading: false,
},
}),
}