czg_team/cashier_app
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分问题修复，修改数据统计接口

Browse Source
This commit is contained in:
YeMingfei666
2025-11-24 15:48:06 +08:00
parent e4f5cc8519
commit 679207521d
20 changed files with 2610 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
components/my-components/edit-discount.vue
View File

@@ -11,31 +11,46 @@
<view class="u-m-t-40 u-flex">
<view>实收金额</view>
<view class="u-m-l-32 border u-p-l-10 u-p-r-10 u-flex-1">
<uni-easyinput type="number" @input="currentPriceInput" @change="currentPriceChange" paddingNone :inputBorder="false"
<uni-easyinput
type="number"
@input="currentPriceInput"
@change="currentPriceChange"
paddingNone
:inputBorder="false"
v-model="form.currentPrice"
placeholder="输入实际金额"></uni-easyinput>
placeholder="输入实际金额"
></uni-easyinput>
</view>
</view>
<view class="u-m-t-54 u-flex">
<view>优惠折扣</view>
<view class="u-m-l-32 u-flex-1 u-flex border u-p-l-10 u-p-r-10">
<view class="u-flex-1">
<uni-easyinput type="number" @input="discountInput" @change="discountChange" paddingNone :inputBorder="false"
<uni-easyinput
type="number"
@input="discountInput"
@change="discountChange"
paddingNone
:inputBorder="false"
v-model="form.discount"
placeholder="输入折扣"></uni-easyinput>
placeholder="输入折扣"
></uni-easyinput>
</view>
<view class="u-font-32 color-333">%</view>
</view>
</view>
</view>
</template>
<template #btn>
<view class="u-p-30">
<view class="u-m-t-10">
<my-button @tap="confirm" shape="circle" fontWeight="700" >修改</my-button>
<my-button @tap="confirm" shape="circle" fontWeight="700"
>修改</my-button
>
<view class="">
<my-button @tap="close" type="cancel" bgColor="#fff" >取消</my-button>
<my-button @tap="close" type="cancel" bgColor="#fff"
>取消</my-button
>
</view>
</view>
</view>
@@ -44,99 +59,106 @@
</template>
<script setup>
import { reactive, nextTick, ref,watch } from 'vue';
import myModel from '@/components/my-components/my-model.vue'
import myButton from '@/components/my-components/my-button.vue'
import infoBox from '@/commons/utils/infoBox.js'
import { reactive, nextTick, ref, watch } from "vue";
import myModel from "@/components/my-components/my-model.vue";
import myButton from "@/components/my-components/my-button.vue";
import infoBox from "@/commons/utils/infoBox.js";
const props = defineProps({
title: {
type: String,
default: ''
default: "",
},
discount: {
type: [Number, String],
default:100
default: 100,
},
price: {
type: [Number, String],
default: 0
default: 0,
},
})
});
function currentPriceInput(newval) {
form.discount = (newval*100/form.price).toFixed(2)
form.discount = ((newval * 100) / form.price).toFixed(2);
}
function discountInput(newval) {
form.currentPrice= uni.$utils.isMoney(form.price*newval/100).toFixed(2)
const currentPrice = uni.$utils.isMoney((form.price * newval) / 100) * 1;
form.currentPrice = currentPrice.toFixed(2);
}
function currentPriceChange(newval) {
if (newval < 0) {
form.currentPrice = '0.00'
form.discount=100
return infoBox.showToast('实收金额不能小于0')
form.currentPrice = "0.00";
form.discount = 100;
return infoBox.showToast("实收金额不能小于0");
}
console.log(props.price)
console.log(newval)
console.log(props.price);
console.log(newval);
if (newval > props.price) {
form.currentPrice = (uni.$utils.isMoney(props.price)*1).toFixed(2)
form.discount=0
return infoBox.showToast('实收金额不能大于应付金额')
const currentPrice = uni.$utils.isMoney(props.price * 1);
form.currentPrice = currentPrice.toFixed(2);
form.discount = 0;
return infoBox.showToast("实收金额不能大于应付金额");
}
}
function discountChange(newval) {
if (newval < 0) {
form.currentPrice=props.price
form.discount=0
return infoBox.showToast('优惠折扣不能小于0')
form.currentPrice = props.price;
form.discount = 0;
return infoBox.showToast("优惠折扣不能小于0");
}
if (newval > 100) {
form.discount=100
form.currentPrice=0
return infoBox.showToast('优惠折扣不能大于100')
form.discount = 100;
form.currentPrice = 0;
return infoBox.showToast("优惠折扣不能大于100");
}
}
const $form = {
price: props.price,
currentPrice: props.price,
discount: 100
}
discount: 100,
};
const form = reactive({
...$form
})
watch(()=>props.price,(newval)=>{
form.price = (newval*1).toFixed(2)
form.currentPrice=newval
})
...$form,
});
watch(
() => props.price,
(newval) => {
form.price = (newval * 1).toFixed(2);
form.currentPrice = newval;
}
);
function resetForm() {
Object.assign(form, {
...$form
})
...$form,
});
}
const model = ref(null)
const model = ref(null);
function open() {
model.value.open()
form.price= (props.price*1).toFixed(2)
form.discount=props.discount
form.currentPrice=(props.discount*props.price/100).toFixed(2)
console.log(form)
model.value.open();
form.price = (props.price * 1).toFixed(2);
form.discount = props.discount;
form.currentPrice = ((props.discount * props.price) / 100).toFixed(2);
console.log(form);
}
function close() {
model.value.close()
model.value.close();
}
const emits = defineEmits(['confirm'])
const emits = defineEmits(["confirm"]);
function confirm() {
emits('confirm',{...form,currentPrice:Number(form.currentPrice).toFixed(2)})
close()
emits("confirm", {
...form,
currentPrice: Number(form.currentPrice).toFixed(2),
});
close();
}
defineExpose({
open,
close
})
close,
});
</script>
<style lang="scss" scoped>
@@ -151,7 +173,7 @@
.tag {
background-color: #fff;
border: 1px solid #E5E5E5;
border: 1px solid #e5e5e5;
line-height: inherit;
font-size: 24rpx;
color: #666666;
@@ -159,13 +181,13 @@
border-radius: 8rpx;
&.active {
border-color: #E6F0FF;
border-color: #e6f0ff;
color: $my-main-color;
}
}
.hover-class {
background-color: #E5E5E5;
background-color: #e5e5e5;
}
.discount {
@@ -177,7 +199,7 @@
}
.bg1 {
background: #F7F7FA;
background: #f7f7fa;
}
.tab {
@@ -185,7 +207,7 @@
}
.border {
border: 1px solid #E5E5E5;
border: 1px solid #e5e5e5;
border-radius: 4rpx;
}

33
data/index.js Normal file
View File

@@ -0,0 +1,33 @@
import dayjs from "dayjs";
export const timeList = [
{
label: "今天",
value: "today",
beginDate: dayjs().format("YYYY-MM-DD"),
endDate: dayjs().format("YYYY-MM-DD"),
},
{
label: "昨天",
value: "yesterday",
beginDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
endDate: dayjs().subtract(1, "day").format("YYYY-MM-DD"),
},
{
label: "本周",
value: "this_week",
beginDate: dayjs().startOf("week").format("YYYY-MM-DD"),
endDate: dayjs().endOf("week").format("YYYY-MM-DD"),
},
{
label: "本月",
value: "this_month",
beginDate: dayjs().startOf("month").format("YYYY-MM-DD"),
endDate: dayjs().endOf("month").format("YYYY-MM-DD"),
},
{
label: "自定义",
value: "custom",
beginDate: "",
endDate: "",
},
];

13
http/api/account/tableOrderStatistic.js Normal file
View File

@@ -0,0 +1,13 @@
import http from "@/http/http.js";
const request = http.request;
const urlType = "account";
export function tableOrderStatistic(data) {
return request({
url: `${urlType}/admin/tableOrderStatistic`,
method: "GET",
data: {
...data,
},
});
}

23
http/api/order/summary.js Normal file
View File

@@ -0,0 +1,23 @@
import http from "@/http/http.js";
const request = http.request;
const urlType = "order";
export function tableSummaryList(data) {
return request({
url: `${urlType}/admin/table/summary/list`,
method: "GET",
data: {
...data,
},
});
}
export function saleSummaryPage(data) {
return request({
url: `${urlType}/admin/sale/summary/page`,
method: "GET",
data: {
...data,
},
});
}

4
http/http.js
View File

@@ -15,8 +15,8 @@ import infoBox from "@/commons/utils/infoBox.js";
import go from "@/commons/utils/go.js";
import { reject } from "lodash";
// 设置node环境
// envConfig.changeEnv(storageManage.env('production'))
envConfig.changeEnv(storageManage.env("development"));
// envConfig.changeEnv(storageManage.env('production')) //正式
envConfig.changeEnv(storageManage.env("development")); //测试
// 测试服
// #ifdef H5

3
main.js
View File

@@ -10,6 +10,9 @@ import * as Pinia from 'pinia';
import {
createUnistorage
} from "pinia-plugin-unistorage";
uni.$utils=utils
// 设置node环境
envConfig.changeEnv(storageManage.env())

5
pageBwc/index/index.vue
View File

@@ -7,7 +7,10 @@
<view class="color-333 font-bold">霸王餐</view>
<view class="color-666 u-m-t-4 u-font-24">设置充值消费的N倍，当前订单立即免单</view>
</view>
<up-switch v-model="form.enable" size="18"></up-switch>
<up-switch v-model="form.enable" size="18"
:active-value="1"
:inactive-value="0"
></up-switch>
</view>
</view>
<view class="boxconstantbox"

2
pageMarket/distribution/components/config.vue
View File

@@ -66,7 +66,7 @@
class="number-box"
placeholder="请输入"
placeholder-class="color-999 u-font-28"
type="number"
type="digit"
v-model="form.payAmount"
/>

8
pageMarket/distribution/level-list.vue
View File

@@ -271,7 +271,13 @@ function cancel(){
}
onLoad(()=>{
showDetailListSwitch.value=distributionStore.config.levelConfigList.map(()=>true)
form.levelConfigList=[...distributionStore.config.levelConfigList||[]]
const levelConfigList=[...distributionStore.config.levelConfigList||[]]
form.levelConfigList=levelConfigList.length?levelConfigList:[
{ name:'',
levelOneCommission:'',
inviteCount:'',
costAmount:''}
]
form.upgradeType=distributionStore.config.upgradeType
})
</script>

5
pageMarket/newUserDiscount/index.vue
View File

@@ -157,7 +157,7 @@
<script setup>
import Modal from "@/pageMarket/components/modal.vue";
import { ref, reactive, computed, watch, onMounted } from "vue";
import { ref, reactive, computed, watch, onMounted ,nextTick} from "vue";
import { useNewUserDiscountStore } from "@/store/market.js";
const isLoading = ref(false);
@@ -299,7 +299,10 @@ async function init() {
};
console.log(data);
Object.assign(form, data);
nextTick(() => {
isLoading.value = false;
})
}
onMounted(() => {

379
pageSalesSummary/components/my-date-pickerview.vue
View File

@@ -6,23 +6,33 @@
<view class="close" @tap="close">
<uni-icons type="closeempty" size="24"></uni-icons>
</view>
</view>
<!-- <view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
{{item.title}}
</view>
</view> -->
<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
class="picker-view">
<picker-view
:immediate-change="true"
@pickend="pickend"
:value="value"
@change="bindChange"
class="picker-view"
>
<picker-view-column>
<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
<view class="item" v-for="(item, index) in years" :key="index"
>{{ item }}年</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
<view class="item" v-for="(item, index) in months" :key="index"
>{{ item }}月</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
<view class="item" v-for="(item, index) in days" :key="index"
>{{ item }}日</view
>
</picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
@@ -35,16 +45,27 @@
</picker-view-column> -->
</picker-view>
<view class="u-text-center color-999">至</view>
<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
class="picker-view">
<picker-view
:immediate-change="true"
:value="value1"
@pickend="pickend1"
@change="bindChange1"
class="picker-view"
>
<picker-view-column>
<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
<view class="item" v-for="(item, index) in years" :key="index"
>{{ item }}年</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
<view class="item" v-for="(item, index) in months" :key="index"
>{{ item }}月</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
<view class="item" v-for="(item, index) in days1" :key="index"
>{{ item }}日</view
>
</picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
@@ -58,188 +79,174 @@
</picker-view>
<!-- 站位 -->
<view style="height: 80px;"></view>
<view style="height: 80px"></view>
<view class="fixed_b">
<my-button shape="circle" @tap="confirm">确定</my-button>
</view>
</view>
</view>
</template>
<script setup>
import myButton from "@/components/my-components/my-button.vue"
import {
reactive,
ref
} from 'vue';
const $nowDate = new Date()
import dayjs from "dayjs";
import myButton from "@/components/my-components/my-button.vue";
import { reactive, ref } from "vue";
const $nowDate = new Date();
const nowDate = {
year: $nowDate.getFullYear(),
month: $nowDate.getMonth() + 1,
day: $nowDate.getDate(),
hours: $nowDate.getHours(),
minutes: $nowDate.getMinutes(),
seconds: $nowDate.getSeconds()
}
const yearsLen = 30
const years = new Array(yearsLen).fill(1).map((v, index) => {
return nowDate.year - index
}).reverse()
seconds: $nowDate.getSeconds(),
};
const yearsLen = 30;
const years = new Array(yearsLen)
.fill(1)
.map((v, index) => {
return nowDate.year - index;
})
.reverse();
const months = new Array(12).fill(1).map((v, index) => {
return index + 1
return index + 1;
});
const days = ref(
new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
return index + 1;
})
const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
return index + 1
}))
const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
return index + 1
}))
);
const days1 = ref(
new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
return index + 1;
})
);
const hours = new Array(24).fill(1).map((v, index) => {
return index
})
return index;
});
const minutes = new Array(60).fill(1).map((v, index) => {
return index
})
return index;
});
const seconds = new Array(60).fill(1).map((v, index) => {
return index
})
const fastTime = reactive([{
title: '今日',
key: 'now'
return index;
});
const fastTime = reactive([
{
title: "今日",
key: "now",
},
{
title: '昨日',
key: 'prve'
title: "昨日",
key: "prve",
},
{
title: '本月',
key: 'nowMonth'
title: "本月",
key: "nowMonth",
},
{
title: '上月',
key: 'prveMonth'
}
])
title: "上月",
key: "prveMonth",
},
]);
function setPrveDay() {}
function setNowMoneth() {}
function setPrveDay() {
}
function setNowMoneth() {
}
function setprveMoneth() {
}
function setprveMoneth() {}
function setDay(start, end) {
value.value = [
start.year,
start.month,
start.day,
0,
0,
0,
]
value1.value = [
end.year,
end.month,
end.day,
23,
59,
59,
]
value.value = [start.year, start.month, start.day, 0, 0, 0];
value1.value = [end.year, end.month, end.day, 23, 59, 59];
}
function changeTime(key) {
const yearIndex = years.findIndex(v => v == nowDate.year)
const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
const nowMonthIndex = nowDate.month - 1
const nowDayIndex = nowDate.day - 1
const yearIndex = years.findIndex((v) => v == nowDate.year);
const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
const nowMonthIndex = nowDate.month - 1;
const nowDayIndex = nowDate.day - 1;
const dataMap = {
now: function () {
return {
start: {
year: yearIndex,
month: nowMonthIndex,
day: nowDayIndex
day: nowDayIndex,
},
end: {
year: yearIndex,
month: nowMonthIndex,
day: nowDayIndex
}
}
day: nowDayIndex,
},
};
},
prve: function () {
const oneDay=1000*60*60*24
const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay)
const oneDay = 1000 * 60 * 60 * 24;
const date = new Date(
new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
oneDay
);
return {
start: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
day: date.getDate()-1
day: date.getDate() - 1,
},
end: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
day: date.getDate()-1
}
}
day: date.getDate() - 1,
},
};
},
nowMonth: function () {
return {
start: {
year: yearIndex,
month: nowMonthIndex,
day: 0
day: 0,
},
end: {
year: yearIndex,
month: nowMonthIndex,
day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
}
}
day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
},
};
},
prveMonth: function () {
const oneDay=1000*60*60*24
const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay)
const oneDay = 1000 * 60 * 60 * 24;
const date = new Date(
new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
);
console.log(date.getMonth());
return {
start: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth(),
day: 0
day: 0,
},
end: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth(),
day: date.getDate()
}
}
}
}
const data = dataMap[key]()
setDay(data.start, data.end)
changeDays(false,value.value)
changeDays(true,value1.value)
day: date.getDate(),
},
};
},
};
const data = dataMap[key]();
setDay(data.start, data.end);
changeDays(false, value.value);
changeDays(true, value1.value);
console.log(value1.value);
const start = returnDateString(value.value)
const end = returnDateString(value1.value)
const start = returnDateString(value.value);
const end = returnDateString(value1.value);
emits('confirm', {
emits("confirm", {
text: `${start}——${end}`,
start,
end
})
close()
end,
});
close();
}
let value = ref([
years.length - 1,
@@ -248,7 +255,7 @@
0,
0,
0,
])
]);
let value1 = ref([
years.length - 1,
nowDate.month - 1,
@@ -256,52 +263,59 @@
23,
59,
59,
])
]);
let show = ref(false)
const emits = defineEmits('close', 'open', 'confirm')
let show = ref(false);
const emits = defineEmits("close", "open", "confirm");
function toggle() {
show.value = !show.value
show.value = !show.value;
if (show.value) {
emits('open', true)
emits("open", true);
} else {
emits('close', false)
emits("close", false);
}
}
function close() {
show.value = false
emits('close', false)
show.value = false;
emits("close", false);
}
function open() {
show.value = true
emits('open', true)
show.value = true;
emits("open", true);
}
function returnDateString(arr) {
const year = years[arr[0]]
const month = arr[1] + 1
const day = arr[2] + 1
const hour = ('0' + arr[3]).slice(-2)
const min = ('0' + arr[4]).slice(-2)
const sen = ('0' + arr[5]).slice(-2)
return `${year}-${month}-${day} ${hour}:${min}:${sen}`
const year = years[arr[0]];
const month = ("0" + (arr[1] + 1)).slice(-2);
const day = ("0" + (arr[2] + 1)).slice(-2);
const hour = ("0" + arr[3]).slice(-2);
const min = ("0" + arr[4]).slice(-2);
const sen = ("0" + arr[5]).slice(-2);
return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
}
function confirm(e) {
const start = returnDateString(value.value)
const end = returnDateString(value1.value)
const start = returnDateString(value.value);
const end = returnDateString(value1.value);
console.log(start);
console.log(end);
emits('confirm', {
//如果结尾时间小于开始时间
if (new Date(start).getTime() > new Date(end).getTime()) {
return uni.showToast({
title: "结束时间不能小于开始时间",
icon: "none",
});
}
emits("confirm", {
text: `${start}——${end}`,
start,
end
})
close()
end,
});
close();
}
function returnMonthStart(arr) {
@@ -313,64 +327,79 @@
}
function changeDays(isDays1, arr) {
const end = returnMonthEnd(arr)
const end = returnMonthEnd(arr);
if (end) {
if (isDays1) {
days1.value= new Array(end).fill(1).map((v,
index) => {
return index + 1
})
days1.value = new Array(end).fill(1).map((v, index) => {
return index + 1;
});
} else {
days.value= new Array(end).fill(1).map((v,
index) => {
return index + 1
})
days.value = new Array(end).fill(1).map((v, index) => {
return index + 1;
});
}
}
}
function bindChange(e) {
value.value = e.detail.value
changeDays(false, e.detail.value)
value.value = e.detail.value;
changeDays(false, e.detail.value);
}
function bindChange1(e) {
value1.value = e.detail.value
changeDays(true, e.detail.value)
value1.value = e.detail.value;
changeDays(true, e.detail.value);
}
function getDayDate(date = new Date(), type) {
const now = date
if (type === 'start') {
const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
return startOfDay
const now = date;
if (type === "start") {
const startOfDay = new Date(
now.getFullYear(),
now.getMonth(),
now.getDate()
);
return startOfDay;
}
if (type === 'end') {
const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
if (type === "end") {
const endOfDay = new Date(
now.getFullYear(),
now.getMonth(),
now.getDate(),
23,
59,
59,
999
);
return endOfDay;
}
}
function getMonthArea(date = new Date(), type) {
let now = date
let now = date;
let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
if (type === 'start') {
return currentMonthStart
let currentMonthEnd = new Date(
now.getFullYear(),
now.getMonth() + 1,
0,
23,
59,
59,
999
);
if (type === "start") {
return currentMonthStart;
}
if (type === 'end') {
if (type === "end") {
return currentMonthEnd;
}
return {
start: currentMonthStart,
end: currentMonthEnd
end: currentMonthEnd,
};
}
function nullFunction() {
}
function nullFunction() {}
function pickend(e) {
console.log(e);
@@ -383,8 +412,8 @@
close,
open,
confirm,
toggle
})
toggle,
});
</script>
<style lang="scss">
@@ -414,7 +443,7 @@
right: 0;
bottom: 0;
top: 0;
background-color: rgba(0, 0, 0, .7);
background-color: rgba(0, 0, 0, 0.7);
.box {
position: absolute;

287
pageSalesSummary/index.vue
View File

@@ -1,7 +1,11 @@
<template>
<view class="time-wrapper">
<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
<view class="time-item" @tap="changeTime(v.value)" :class="{ 'time-selected':v.value==selected }">
<view
class="time-item"
@tap="changeTime(v.value)"
:class="[v.value == selected ? 'time-selected' : '']"
>
{{ v.label }}
</view>
<view class="xian" v-if="v.value == selected"> </view>
@@ -15,28 +19,37 @@
</view>
<view class="">
<view class=""> 优惠金额(元) </view>
<view class=""> {{list.discountAmount?list.discountAmount:0}} </view>
<view class="">
{{ list.discountAmount ? list.discountAmount : 0 }}
</view>
</view>
<view class="">
<view class=""> 客单价(元) </view>
<view class=""> {{list.customerUnitPrice?list.customerUnitPrice:0}} </view>
<view class="">
{{ list.customerUnitPrice ? list.customerUnitPrice : 0 }}
</view>
</view>
<view class="">
<view class=""> 会员消费(元) </view>
<view class=""> {{list.memberPayAmount?list.memberPayAmount:0}} </view>
<view class="">
{{ list.memberPayAmount ? list.memberPayAmount : 0 }}
</view>
</view>
<view class="">
<view class=""> 新增会员(人) </view>
<view class=""> {{list.newMemberCount?list.newMemberCount:0}} </view>
<view class="">
{{ list.newMemberCount ? list.newMemberCount : 0 }}
</view>
</view>
<view class="">
<view class=""> 翻台率(%) </view>
<view class=""> {{list.tableTurnoverRate?list.tableTurnoverRate:0}} </view>
<view class="">
{{ list.tableTurnoverRate ? list.tableTurnoverRate : 0 }}
</view>
</view>
</view>
<view class="table-scroll">
<template>
<view class="color-333 u-font-28 bg-gray default-box-padding" style="padding-top:80px;">
<view class="color-333 u-font-28 bg-gray default-box-padding">
<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
<view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
<view class="constantbox">
@@ -45,161 +58,97 @@
<view class="head">总数量</view>
<view class="head">金额</view>
</view>
<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
@click="toDetail(item)">
<view class="head" style="padding-left: 16rpx;">
<image v-if="index==0" src="../pageTable/index/images/1.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
<image v-else-if="index==1" src="../pageTable/index/images/2.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
<image v-else-if="index==2" src="../pageTable/index/images/3.png"
style="width: 22rpx;height: 30rpx;" mode=""></image>
<view
class="constantboxitem"
v-for="(item, index) in tableList"
:key="index"
@click="toDetail(item)"
>
<view class="head" style="padding-left: 16rpx">
<image
v-if="index == 0"
src="../pageTable/index/images/1.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
<image
v-else-if="index == 1"
src="../pageTable/index/images/2.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
<image
v-else-if="index == 2"
src="../pageTable/index/images/3.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
&nbsp;&nbsp;{{ item.productName }}
</view>
<view class="head">{{item.number}}</view>
<view class="head">{{item.amount || '无'}}</view>
<view class="head">{{ item.saleCount || 0 }}</view>
<view class="head">{{ item.saleAmount || 0 }}</view>
</view>
</view>
</view>
</scroll-view>
</view>
</template>
</view>
<view class="bottombtn" @tap="toUrl">
更多 <uni-icons type="right" size="16"></uni-icons>
</view>
<datePickerview @confirm="datePickerConfirm" ref="datePicker"></datePickerview>
<datePickerview
@confirm="datePickerConfirm"
ref="datePicker"
></datePickerview>
</template>
<script setup>
import { onMounted, ref } from 'vue';
import datePickerview from './components/my-date-pickerview.vue'
import dayjs from 'dayjs' //时间格式库
import go from '@/commons/utils/go.js'
import { getTrade, productSaleDate } from '@/http/api/summary.js'
import { onMounted, ref } from "vue";
import datePickerview from "./components/my-date-pickerview.vue";
import dayjs from "dayjs"; //时间格式库
import go from "@/commons/utils/go.js";
import { getTrade } from "@/http/api/summary.js";
import { saleSummaryPage } from "@/http/api/order/summary.js";
import { timeList } from "@/data/index.js";
const datePicker=ref()
const timeList = [{
label: '今天',
value: 'today'
},
{
label: '昨天',
value: 'yesterday'
},
{
label: '本周',
value: 'circumference'
}, {
label: '本月',
value: 'moon'
},
{
label: '自定义',
value: 'custom'
}
]
let selected = ref('today')
let list = ref({})
let tableList = ref([])
let day = ref(1)
const datePicker = ref();
let selected = ref("today");
let list = ref({});
let tableList = ref([]);
let day = ref(1);
onMounted(() => {
getlist()
gettableData()
})
getData();
});
/**
* 获取营业数据
* @param {Object} start
* @param {Object} end
* @param {Object} beginDate
* @param {Object} endDate
*/
function getlist(start, end) {
let startTime, endTime;
if (selected.value == 'today') {
startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'yesterday') {
startTime = formatTime() + ' 00:00:00'
endTime = formatTime() + ' 23:59:59'
} else if (selected.value == 'circumference') {
var now = new Date();
var nowTime = now.getTime();
var day = now.getDay();
var oneDayTime = 24 * 60 * 60 * 1000;
//显示周一
var MondayTime = nowTime - (day - 1) * oneDayTime;
//显示周日
var SundayTime = nowTime + (7 - day) * oneDayTime;
startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
} else if (selected.value == 'moon') {
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
let s = start.substring(0, start.indexOf(' '))
let e = end.substring(0, end.indexOf(' '))
startTime = s + ' 00:00:00'
endTime = e + ' 23:59:59'
}
function getlist(beginDate, endDate) {
getTrade({
beginDate: startTime,
endDate: endTime,
beginDate,
endDate,
rangeType: selected.value,
}).then((res) => {
list.value = res
})
list.value = res;
});
}
/**
* 获取销售数据
* @param {Object} beginDate
* @param {Object} endDate
*/
function gettableData() {
if (selected.value == 'today') {
day.value = 1
} else if (selected.value == 'yesterday') {
day.value = 1
} else if (selected.value == 'circumference') {
day.value = 7
} else if (selected.value == 'moon') {
day.value = 30
} else if (selected.value == 'custom') {
day.value = 30
}
productSaleDate({
day: day.value,
page: 1,
size: 5
function gettableData(beginDate, endDate) {
saleSummaryPage({
beginDate,
endDate,
rangeType: selected.value,
}).then((res) => {
tableList.value = res.records
})
}
/**
* 获取当前时间
*/
function getdate() {
const dt = new Date();
const y = dt.getFullYear();
const m = (dt.getMonth() + 1 + "").padStart(2, "0");
const d = (dt.getDate() + "").padStart(2, "0");
const hh = (dt.getHours() + "").padStart(2, "0");
const mm = (dt.getMinutes() + "").padStart(2, "0");
const ss = (dt.getSeconds() + "").padStart(2, "0");
return `${y}-${m}-${d}`;
}
/**
* 获取昨天时间
*/
const formatTime = () => {
let strDate = getdate()
let dateFormat = new Date(strDate);
dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
dateFormat = new Date(dateFormat);
let y = dateFormat.getFullYear()
let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
let d = dateFormat.getDate().toString().padStart(2, '0')
return `${y}-${m}-${d}`
tableList.value = (res || []).slice(0, 5);
});
}
/**
@@ -207,35 +156,63 @@
* @param {Object} e
*/
function changeTime(e) {
selected.value = e
if (e == 'custom') {
datePicker.value.toggle()
selected.value = e;
if (e == "custom") {
datePicker.value.toggle();
} else {
getlist()
gettableData()
getData();
}
}
const datePickerData = ref({
beginDate: "",
endDate: "",
});
/**
* 自定义确认
* @param {Object} e
*/
function datePickerConfirm(e) {
console.log(e)
getlist(e.start, e.end)
gettableData()
datePickerData.value.beginDate = e.start;
datePickerData.value.endDate = e.end;
getData(e.start, e.end);
}
function getData(start, end) {
let beginDate, endDate;
if (selected.value == "custom") {
beginDate = start.substring(0, start.indexOf(" "));
endDate = end.substring(0, end.indexOf(" "));
} else {
beginDate = timeList.find((item) => item.value == selected.value).beginDate;
endDate = timeList.find((item) => item.value == selected.value).endDate;
}
getlist(beginDate, endDate);
gettableData(beginDate, endDate);
}
/**
* 更多
*/
function toUrl() {
go.to('PAGES_PRODUCT_SALES_RANKING', {
day: day.value
})
let beginDate, endDate;
if (selected.value == "custom") {
beginDate = datePickerData.value.beginDate.substring(
0,
datePickerData.value.beginDate.indexOf(" ")
);
endDate = datePickerData.value.endDate.substring(
0,
datePickerData.value.endDate.indexOf(" ")
);
} else {
beginDate = timeList.find((item) => item.value == selected.value).beginDate;
endDate = timeList.find((item) => item.value == selected.value).endDate;
}
go.to("PAGES_PRODUCT_SALES_RANKING", {
beginDate,
endDate,
rangeType: selected.value,
});
}
</script>
<style>
page {
@@ -243,7 +220,6 @@
}
</style>
<style lang="scss" scoped>
.fixed-top {
padding: 32rpx 28rpx;
z-index: 100;
@@ -291,11 +267,11 @@
}
.constantboxitem:nth-child(odd) {
background: #F7F6FB;
background: #f7f6fb;
}
.constantboxitem:nth-child(1) {
background: #AEBAD2;
background: #aebad2;
color: #fff;
font-size: 24rpx;
}
@@ -330,7 +306,7 @@
.xian {
width: 40rpx;
height: 3rpx;
background-color: #318AFE;
background-color: #318afe;
// position: absolute;
// left: 16rpx;
// bottom: 0;
@@ -346,7 +322,7 @@
.pageSalesSummaryContent {
height: 320rpx;
margin: 20rpx 28rpx;
background-image: url('./svg/bgimg.svg');
background-image: url("./svg/bgimg.svg");
background-size: 694rpx 320rpx;
padding: 48rpx 28rpx;
.df;
@@ -370,7 +346,6 @@
margin: 32rpx 28rpx;
margin-right: 30rpx;
border-radius: 30rpx 30rpx 0 0;
}
.table-scroll .table {
@@ -409,7 +384,7 @@
line-height: 56rpx;
text-align: center;
margin: 0rpx auto;
background: #F1F1F1;
background: #f1f1f1;
font-size: 24rpx;
border-radius: 0rpx 0rpx 28rpx 28rpx;
}

57
pageSalesSummary/productSalesRanking.vue
View File

@@ -1,4 +1,3 @@
<template>
<template>
<view class="color-333 u-font-28 bg-gray default-box-padding">
<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
@@ -9,45 +8,51 @@
<view class="head">总数量</view>
<view class="head">金额</view>
</view>
<view class="constantboxitem" v-for="(item,index) in tableList" :key="index"
@click="toDetail(item)">
<view
class="constantboxitem"
v-for="(item, index) in tableList"
:key="index"
@click="toDetail(item)"
>
<view class="head">{{ item.productName }}</view>
<view class="head">{{item.number}}</view>
<view class="head">{{item.amount || '无'}}</view>
<view class="head">{{ item.saleCount || 0 }}</view>
<view class="head">{{ item.saleAmount || 0 }}</view>
</view>
</view>
</view>
</scroll-view>
</view>
</template>
</template>
<script setup>
import { onMounted, ref } from 'vue';
import { productSaleDate } from '@/http/api/summary.js'
import { onLoad } from "@dcloudio/uni-app";
import { onMounted, reactive, ref } from "vue";
import { saleSummaryPage } from "@/http/api/order/summary.js";
let tableList = ref([])
let tableList = ref([]);
let props = defineProps({
day: {
type: Number
}
})
onMounted(() => {
gettableData()
})
type: Number,
},
});
const options = reactive({
beginDate: "",
endDate: "",
rangeType: "",
});
onLoad((opt) => {
console.log(opt);
Object.assign(options, opt);
gettableData();
});
/**
* 获取销售数据
*/
function gettableData() {
productSaleDate({
day: props.day,
page: 1,
size: 50
}).then((res) => {
tableList.value = res.records
})
saleSummaryPage(options).then((res) => {
tableList.value = res || [];
});
}
</script>
@@ -58,7 +63,6 @@
margin: 32rpx 28rpx;
margin-right: 30rpx;
border-radius: 30rpx 30rpx 0 0;
}
.table-scroll table {
@@ -88,7 +92,6 @@
}
</style>
<style lang="scss" scoped>
.fixed-top {
padding: 32rpx 28rpx;
z-index: 100;
@@ -136,11 +139,11 @@
}
.constantboxitem:nth-child(odd) {
background: #F7F6FB;
background: #f7f6fb;
}
.constantboxitem:nth-child(1) {
background: #AEBAD2;
background: #aebad2;
color: #fff;
font-size: 24rpx;
}

346
pageSalesSummary/table.vue Normal file
View File

@@ -0,0 +1,346 @@
<template>
<view class="time-wrapper">
<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
<view
class="time-item"
@tap="changeTime(v.value)"
:class="[v.value == selected ? 'time-selected' : '']"
>
{{ v.label }}
</view>
<view class="xian" v-if="v.value == selected"> </view>
</view>
</view>
<view class="table-scroll">
<view class="color-333 u-font-28 bg-gray">
<scroll-view :scroll-x="true" class="bg-fff table u-text-center">
<view class="bg-fff border-r-12 u-flex no-wrap u-col-top">
<view class="constantbox">
<view class="constantboxitem">
<view class="head">区域名称</view>
<view class="head">台桌号</view>
<view class="head">订单数量</view>
<view class="head">订单金额</view>
</view>
<view
class="constantboxitem"
v-for="(item, index) in tableList"
:key="index"
@click="toDetail(item)"
>
<view class="head" style="padding-left: 16rpx">
<image
v-if="index == 0"
src="../pageTable/index/images/1.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
<image
v-else-if="index == 1"
src="../pageTable/index/images/2.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
<image
v-else-if="index == 2"
src="../pageTable/index/images/3.png"
style="width: 22rpx; height: 30rpx"
mode=""
></image>
&nbsp;&nbsp;{{ item.areaName }}
</view>
<view class="head">{{ item.tableName || "" }}</view>
<view class="head">{{ item.orderCount || 0 }}</view>
<view class="head">{{ item.orderAmount || 0 }}</view>
</view>
</view>
</view>
</scroll-view>
</view>
</view>
<view style="height: 80rpx;"></view>
<!-- <view class="bottombtn" @tap="toUrl">
更多 <uni-icons type="right" size="16"></uni-icons>
</view> -->
<datePickerview
@confirm="datePickerConfirm"
ref="datePicker"
></datePickerview>
</template>
<script setup>
import { onMounted, ref } from "vue";
import datePickerview from "./components/my-date-pickerview.vue";
import dayjs from "dayjs"; //时间格式库
import go from "@/commons/utils/go.js";
import { getTrade, productSaleDate } from "@/http/api/summary.js";
import { timeList } from "@/data/index.js";
import { tableSummaryList } from "@/http/api/order/summary.js";
const datePicker = ref();
let selected = ref("today");
let list = ref({});
let tableList = ref([]);
let day = ref(1);
onMounted(() => {
gettableData();
});
/**
* 获取销售数据
*/
function gettableData(start, end) {
let beginDate, endDate;
if (selected.value == "custom") {
beginDate = start.substring(0, start.indexOf(" "));
endDate = end.substring(0, end.indexOf(" "));
} else {
beginDate = timeList.find((item) => item.value == selected.value).beginDate;
endDate = timeList.find((item) => item.value == selected.value).endDate;
}
tableSummaryList({
beginDate: beginDate,
endDate: endDate,
rangeType: selected.value,
}).then((res) => {
tableList.value = res || [];
});
}
/**
* 获取当前时间
*/
function getdate() {
const dt = new Date();
const y = dt.getFullYear();
const m = (dt.getMonth() + 1 + "").padStart(2, "0");
const d = (dt.getDate() + "").padStart(2, "0");
const hh = (dt.getHours() + "").padStart(2, "0");
const mm = (dt.getMinutes() + "").padStart(2, "0");
const ss = (dt.getSeconds() + "").padStart(2, "0");
return `${y}-${m}-${d}`;
}
/**
* 时间切换
* @param {Object} e
*/
function changeTime(e) {
selected.value = e;
if (e == "custom") {
datePicker.value.toggle();
} else {
gettableData();
}
}
/**
* 自定义确认
* @param {Object} e
*/
function datePickerConfirm(e) {
console.log(e);
gettableData(e.start, e.end);
}
/**
* 更多
*/
function toUrl() {
go.to("PAGES_PRODUCT_SALES_RANKING", {
day: day.value,
});
}
</script>
<style>
page {
background: #f6f6f6;
}
</style>
<style lang="scss" scoped>
.fixed-top {
padding: 32rpx 28rpx;
z-index: 100;
}
.bottom {
background-color: transparent;
bottom: 84rpx;
left: 28rpx;
right: 28rpx;
}
.table {
border-radius: 12rpx 12rpx 0rpx 0rpx;
overflow: hidden;
font-size: 24rpx;
.constantbox {
.constantboxitem {
display: flex;
.head {
width: 220rpx;
padding: 32rpx 24rpx;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 24rpx;
color: #333333;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
}
.head:nth-child(4) {
width: 300rpx;
}
.head:nth-child(5) {
width: 300rpx;
}
}
.constantboxitem:nth-child(even) {
background: #fff;
}
.constantboxitem:nth-child(odd) {
background: #f7f6fb;
}
.constantboxitem:nth-child(1) {
background: #aebad2;
color: #fff;
font-size: 24rpx;
}
}
.item:nth-of-type(2n + 1) {
background-color: rgb(249, 249, 249);
}
}
</style>
<style scoped lang="less">
.time-wrapper {
display: flex;
justify-content: space-around;
padding-bottom: 16rpx;
padding-top: 16rpx;
background-color: #fff;
.timelistbox {
position: relative;
display: flex;
flex-direction: column;
align-items: center;
.time-item {
font-size: 28rpx;
text-align: center;
padding-bottom: 10rpx;
}
.xian {
width: 40rpx;
height: 3rpx;
background-color: #318afe;
// position: absolute;
// left: 16rpx;
// bottom: 0;
}
}
.time-selected {
color: #318afe;
font-size: 32rpx !important;
}
}
.pageSalesSummaryContent {
height: 320rpx;
margin: 20rpx 28rpx;
background-image: url("./svg/bgimg.svg");
background-size: 694rpx 320rpx;
padding: 48rpx 28rpx;
.df;
justify-content: space-between;
flex-wrap: wrap;
> view {
padding-right: 52rpx;
color: #fff;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 28rpx;
}
}
// 表格
.table-scroll {
// width: calc(100% - 5px);
overflow-x: scroll;
white-space: nowrap;
margin: 32rpx 28rpx;
margin-right: 30rpx;
border-radius: 30rpx 30rpx 0 0;
}
.table-scroll .table {
table-layout: fixed;
// width: calc(100% - 10rpx);
}
.table-scroll .thead {
display: table-row;
background-color: bisque;
font-size: 24rpx;
}
.table-scroll .tbody {
overflow-y: scroll;
overflow-x: hidden;
display: block;
// width: 1040rpx;
width: 100%;
// width: calc(100% );
}
// .table-scroll th,
// td {
// height: 82rpx;
// overflow: hidden;
// text-overflow: ellipsis;
// width: 250rpx;
// // border: 0.7rpx solid red;
// border: 0.7rpx solid rgba(126, 155, 212, 0.27);
// }
.bottombtn {
width: 694rpx;
height: 56rpx;
line-height: 56rpx;
text-align: center;
margin: 0rpx auto;
background: #f1f1f1;
font-size: 24rpx;
border-radius: 0rpx 0rpx 28rpx 28rpx;
}
.df() {
display: flex;
align-items: center;
}
</style>
<style>
.min-page {
height: 20vh;
}
</style>

11
pages.json
View File

@@ -401,7 +401,16 @@
"style": {
"navigationBarTitleText": "商品销售排行"
}
}]
},
{
"pageId": "PAGES_TABLE_SALES_RANKING",
"path": "table",
"style": {
"navigationBarTitleText": "桌台统计"
}
}
]
},
{
"root": "pageLineUp",

2
pages/appliccation/marketing.vue
View File

@@ -58,7 +58,7 @@ const menuList = ref([
{
title: '新客立减',
icon: '',
pageUrl: 'PAGES_ORDER_INDEX',
pageUrl: 'PAGES_MARKET_NEW_USER_DISCOUNT',
intro: '首单下单减免金额'
},
{

124
pages/index/components/Stats.vue
View File

@@ -3,8 +3,11 @@
<view class="index-selected">
<view class="index-time">
<block v-for="v in timeList" :key="v.value">
<view class="time-item flex-center" :class="{ 'time-active': vdata.timeSelected == v.value }"
@tap.stop="changeTimeFunc(v.value)">
<view
class="time-item flex-center"
:class="{ 'time-active': vdata.timeSelected == v.value }"
@tap.stop="changeTimeFunc(v.value)"
>
{{ v.title }}
</view>
</block>
@@ -34,11 +37,15 @@
<view class="money-list" v-if="vdata.memberIsShow">
<view class="money-item">
<text class="money-title">会员充值(元)</text>
<view class="money-num">{{ cal.cert2Dollar(memberData.payAmount) }}</view>
<view class="money-num">{{
cal.cert2Dollar(memberData.payAmount)
}}</view>
</view>
<view class="money-item">
<text class="money-title">会员消费(元)</text>
<view class="money-num">{{ cal.cert2Dollar(Math.abs(memberData.changeAmount)) }}</view>
<view class="money-num">{{
cal.cert2Dollar(Math.abs(memberData.changeAmount))
}}</view>
</view>
<view class="money-item">
@@ -53,82 +60,67 @@
</template>
<script setup>
import { ref, reactive, onMounted } from 'vue';
import { ref, reactive, onMounted } from "vue";
import cal from '@/commons/utils/cal.js';
import go from '@/commons/utils/go.js';
import ent from '@/commons/utils/ent.js';
import unionScan from '@/commons/utils/unionScan.js';
import storageManage from '@/commons/utils/storageManage.js';
import dayjs from 'dayjs' //时间格式库
import cal from "@/commons/utils/cal.js";
import go from "@/commons/utils/go.js";
import ent from "@/commons/utils/ent.js";
import unionScan from "@/commons/utils/unionScan.js";
import storageManage from "@/commons/utils/storageManage.js";
import dayjs from "dayjs"; //时间格式库
import { timeList } from '@/data/index.js'
import { getTrade } from '@/http/api/summary.js'
import { getTrade } from "@/http/api/summary.js";
onMounted(() => {
vdata.memberIsShow = ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt;
if (ent.has('ENT_MCH_MEMBER') && storageManage.userInfo().isHasMemberEnt) {
vdata.memberIsShow =
ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt;
if (ent.has("ENT_MCH_MEMBER") && storageManage.userInfo().isHasMemberEnt) {
getMemberData();
}
getList()
getList();
});
const emits = defineEmits(['click']);
const timeList = [{
title: '今天',
value: 'today'
},
{
title: '昨天',
value: 'yesterday'
},
{
title: '近7天',
value: 'circumference'
},
{
title: '近30天',
value: 'moon'
}
];
let list = ref()
const emits = defineEmits(["click"]);
let list = ref();
const vdata = reactive({
timeSelected: 'today', // 当前时间选择器的
timeSelected: "today", // 当前时间选择器的
payAmount: -1, // 实收金额
payCount: -1, // 交易笔数
refundAmount: -1, // 退款金额
refundCount: -1, // 退款笔数
memberIsShow: false //是否开启会员模块
memberIsShow: false, //是否开启会员模块
});
const memberData = reactive({});
function getList() {
let startTime, endTime;
if (vdata.timeSelected == 'today') {
startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
} else if (vdata.timeSelected == 'yesterday') {
startTime = formatTime() + ' 00:00:00'
endTime = formatTime() + ' 23:59:59'
} else if (vdata.timeSelected == 'circumference') {
startTime = dayjs().add(-7, 'day').format('YYYY-MM-DD 00:00:00')
endTime = dayjs().format('YYYY-MM-DD 23:59:59')
} else if (vdata.timeSelected == 'moon') {
startTime = dayjs().add(-30, 'day').format('YYYY-MM-DD 00:00:00')
endTime = dayjs().format('YYYY-MM-DD 23:59:59')
} else if (vdata.timeSelected == 'custom') {
startTime = start
endTime = end
if (vdata.timeSelected == "today") {
startTime = dayjs().format("YYYY-MM-DD") + " 00:00:00";
endTime = dayjs().format("YYYY-MM-DD") + " 23:59:59";
} else if (vdata.timeSelected == "yesterday") {
startTime = formatTime() + " 00:00:00";
endTime = formatTime() + " 23:59:59";
} else if (vdata.timeSelected == "circumference") {
startTime = dayjs().add(-7, "day").format("YYYY-MM-DD 00:00:00");
endTime = dayjs().format("YYYY-MM-DD 23:59:59");
} else if (vdata.timeSelected == "moon") {
startTime = dayjs().add(-30, "day").format("YYYY-MM-DD 00:00:00");
endTime = dayjs().format("YYYY-MM-DD 23:59:59");
} else if (vdata.timeSelected == "custom") {
startTime = start;
endTime = end;
}
getTrade({
shopId: uni.getStorageSync('shopId'),
shopId: uni.getStorageSync("shopId"),
startTime,
endTime,
}).then((res) => {
list.value = res
})
list.value = res;
});
}
// 切换 时间卡片
function changeTimeFunc(val) {
vdata.timeSelected = val;
getList()
getList();
// refData();
// if (vdata.memberIsShow) {
// getMemberData();
@@ -152,15 +144,15 @@
unionScan.scan(true).then((res) => {
// 登录类型
if (res.type == unionScan.QR_TYPE_LOGIN) {
return go.to('PAGES_SCAN_LOGIN', {
qrcodeNo: res.originQrVal
return go.to("PAGES_SCAN_LOGIN", {
qrcodeNo: res.originQrVal,
});
}
// 二维码
if (res.type == unionScan.QR_TYPE_QRC) {
return go.to('PAGES_APP_CODE_BIND', {
qrcId: res.bizValue
return go.to("PAGES_APP_CODE_BIND", {
qrcId: res.bizValue,
});
}
});
@@ -178,15 +170,15 @@
}
// 获取昨天时间
const formatTime = () => {
let strDate = getdate()
let strDate = getdate();
let dateFormat = new Date(strDate);
dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
dateFormat = new Date(dateFormat);
let y = dateFormat.getFullYear()
let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
let d = dateFormat.getDate().toString().padStart(2, '0')
return `${y}-${m}-${d}`
}
let y = dateFormat.getFullYear();
let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
let d = dateFormat.getDate().toString().padStart(2, "0");
return `${y}-${m}-${d}`;
};
const getMemberData = () => {
// $memberInfoCount({
// queryDateRange: vdata.timeSelected
@@ -197,7 +189,7 @@
// });
};
defineExpose({
refData
refData,
});
</script>

380
pages/index/components/my-date-pickerview.vue
View File

@@ -6,23 +6,33 @@
<view class="close" @tap="close">
<uni-icons type="closeempty" size="24"></uni-icons>
</view>
</view>
<!-- <view class="u-p-30 u-flex u-flex-wrap gap-20 fastTime">
<view class="item" v-for="(item,index) in fastTime" :key="index" @tap="changeTime(item.key)">
{{item.title}}
</view>
</view> -->
<picker-view :immediate-change="true" @pickend="pickend" :value="value" @change="bindChange"
class="picker-view">
<picker-view
:immediate-change="true"
@pickend="pickend"
:value="value"
@change="bindChange"
class="picker-view"
>
<picker-view-column>
<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
<view class="item" v-for="(item, index) in years" :key="index"
>{{ item }}年</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
<view class="item" v-for="(item, index) in months" :key="index"
>{{ item }}月</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}日</view>
<view class="item" v-for="(item, index) in days" :key="index"
>{{ item }}日</view
>
</picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
@@ -35,16 +45,27 @@
</picker-view-column> -->
</picker-view>
<view class="u-text-center color-999">至</view>
<picker-view :immediate-change="true" :value="value1" @pickend="pickend1" @change="bindChange1"
class="picker-view">
<picker-view
:immediate-change="true"
:value="value1"
@pickend="pickend1"
@change="bindChange1"
class="picker-view"
>
<picker-view-column>
<view class="item" v-for="(item,index) in years" :key="index">{{item}}年</view>
<view class="item" v-for="(item, index) in years" :key="index"
>{{ item }}年</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in months" :key="index">{{item}}月</view>
<view class="item" v-for="(item, index) in months" :key="index"
>{{ item }}月</view
>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days1" :key="index">{{item}}日</view>
<view class="item" v-for="(item, index) in days1" :key="index"
>{{ item }}日</view
>
</picker-view-column>
<!-- <picker-view-column>
<view class="item" v-for="(item,index) in hours" :key="index">{{item}}时</view>
@@ -58,188 +79,173 @@
</picker-view>
<!-- 站位 -->
<view style="height: 80px;"></view>
<view style="height: 80px"></view>
<view class="fixed_b">
<my-button shape="circle" @tap="confirm">确定</my-button>
</view>
</view>
</view>
</template>
<script setup>
import myButton from "@/components/my-components/my-button.vue"
import {
reactive,
ref
} from 'vue';
const $nowDate = new Date()
import myButton from "@/components/my-components/my-button.vue";
import { reactive, ref } from "vue";
const $nowDate = new Date();
const nowDate = {
year: $nowDate.getFullYear(),
month: $nowDate.getMonth() + 1,
day: $nowDate.getDate(),
hours: $nowDate.getHours(),
minutes: $nowDate.getMinutes(),
seconds: $nowDate.getSeconds()
}
const yearsLen = 30
const years = new Array(yearsLen).fill(1).map((v, index) => {
return nowDate.year - index
}).reverse()
seconds: $nowDate.getSeconds(),
};
const yearsLen = 30;
const years = new Array(yearsLen)
.fill(1)
.map((v, index) => {
return nowDate.year - index;
})
.reverse();
const months = new Array(12).fill(1).map((v, index) => {
return index + 1
return index + 1;
});
const days = ref(
new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
return index + 1;
})
const days = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
return index + 1
}))
const days1 = ref(new Array(getMonthArea($nowDate, 'end').getDate()).fill(1).map((v, index) => {
return index + 1
}))
);
const days1 = ref(
new Array(getMonthArea($nowDate, "end").getDate()).fill(1).map((v, index) => {
return index + 1;
})
);
const hours = new Array(24).fill(1).map((v, index) => {
return index
})
return index;
});
const minutes = new Array(60).fill(1).map((v, index) => {
return index
})
return index;
});
const seconds = new Array(60).fill(1).map((v, index) => {
return index
})
const fastTime = reactive([{
title: '今日',
key: 'now'
return index;
});
const fastTime = reactive([
{
title: "今日",
key: "now",
},
{
title: '昨日',
key: 'prve'
title: "昨日",
key: "prve",
},
{
title: '本月',
key: 'nowMonth'
title: "本月",
key: "nowMonth",
},
{
title: '上月',
key: 'prveMonth'
}
])
title: "上月",
key: "prveMonth",
},
]);
function setPrveDay() {}
function setNowMoneth() {}
function setPrveDay() {
}
function setNowMoneth() {
}
function setprveMoneth() {
}
function setprveMoneth() {}
function setDay(start, end) {
value.value = [
start.year,
start.month,
start.day,
0,
0,
0,
]
value1.value = [
end.year,
end.month,
end.day,
23,
59,
59,
]
value.value = [start.year, start.month, start.day, 0, 0, 0];
value1.value = [end.year, end.month, end.day, 23, 59, 59];
}
function changeTime(key) {
const yearIndex = years.findIndex(v => v == nowDate.year)
const prveyearIndex = years.findIndex(v => v == nowDate.year) - 1
const nowMonthIndex = nowDate.month - 1
const nowDayIndex = nowDate.day - 1
const yearIndex = years.findIndex((v) => v == nowDate.year);
const prveyearIndex = years.findIndex((v) => v == nowDate.year) - 1;
const nowMonthIndex = nowDate.month - 1;
const nowDayIndex = nowDate.day - 1;
const dataMap = {
now: function () {
return {
start: {
year: yearIndex,
month: nowMonthIndex,
day: nowDayIndex
day: nowDayIndex,
},
end: {
year: yearIndex,
month: nowMonthIndex,
day: nowDayIndex
}
}
day: nowDayIndex,
},
};
},
prve: function () {
const oneDay=1000*60*60*24
const date=new Date(new Date(nowDate.year,nowDate.month,nowDate.day,0,0,0).getTime()-oneDay)
const oneDay = 1000 * 60 * 60 * 24;
const date = new Date(
new Date(nowDate.year, nowDate.month, nowDate.day, 0, 0, 0).getTime() -
oneDay
);
return {
start: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
day: date.getDate()-1
day: date.getDate() - 1,
},
end: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth() - 1 < 0 ? 11 : date.getMonth() - 1,
day: date.getDate()-1
}
}
day: date.getDate() - 1,
},
};
},
nowMonth: function () {
return {
start: {
year: yearIndex,
month: nowMonthIndex,
day: 0
day: 0,
},
end: {
year: yearIndex,
month: nowMonthIndex,
day:new Date(nowDate.year, nowDate.month , 0).getDate() - 1
}
}
day: new Date(nowDate.year, nowDate.month, 0).getDate() - 1,
},
};
},
prveMonth: function () {
const oneDay=1000*60*60*24
const date=new Date(new Date(nowDate.year, nowDate.month-1,0,0,0).getTime()-oneDay)
const oneDay = 1000 * 60 * 60 * 24;
const date = new Date(
new Date(nowDate.year, nowDate.month - 1, 0, 0, 0).getTime() - oneDay
);
console.log(date.getMonth());
return {
start: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth(),
day: 0
day: 0,
},
end: {
year:years.findIndex(v=>v==date.getFullYear()),
year: years.findIndex((v) => v == date.getFullYear()),
month: date.getMonth(),
day: date.getDate()
}
}
}
}
const data = dataMap[key]()
setDay(data.start, data.end)
changeDays(false,value.value)
changeDays(true,value1.value)
day: date.getDate(),
},
};
},
};
const data = dataMap[key]();
setDay(data.start, data.end);
changeDays(false, value.value);
changeDays(true, value1.value);
console.log(value1.value);
const start = returnDateString(value.value)
const end = returnDateString(value1.value)
const start = returnDateString(value.value);
const end = returnDateString(value1.value);
emits('confirm', {
emits("confirm", {
text: `${start}——${end}`,
start,
end
})
close()
end,
});
close();
}
let value = ref([
years.length - 1,
@@ -248,7 +254,7 @@
0,
0,
0,
])
]);
let value1 = ref([
years.length - 1,
nowDate.month - 1,
@@ -256,52 +262,61 @@
23,
59,
59,
])
]);
let show = ref(false)
const emits = defineEmits('close', 'open', 'confirm')
let show = ref(false);
const emits = defineEmits("close", "open", "confirm");
function toggle() {
show.value = !show.value
show.value = !show.value;
if (show.value) {
emits('open', true)
emits("open", true);
} else {
emits('close', false)
emits("close", false);
}
}
function close() {
show.value = false
emits('close', false)
show.value = false;
emits("close", false);
}
function open() {
show.value = true
emits('open', true)
show.value = true;
emits("open", true);
}
function returnDateString(arr) {
const year = years[arr[0]]
const month = arr[1] + 1
const day = arr[2] + 1
const hour = ('0' + arr[3]).slice(-2)
const min = ('0' + arr[4]).slice(-2)
const sen = ('0' + arr[5]).slice(-2)
return `${year}-${month}-${day} ${hour}:${min}:${sen}`
const year = years[arr[0]];
const month = ("0" + (arr[1] + 1)).slice(-2);
const day = ("0" + (arr[2] + 1)).slice(-2);
const hour = ("0" + arr[3]).slice(-2);
const min = ("0" + arr[4]).slice(-2);
const sen = ("0" + arr[5]).slice(-2);
return `${year}-${month}-${day} ${hour}:${min}:${sen}`;
}
function confirm(e) {
const start = returnDateString(value.value)
const end = returnDateString(value1.value)
const start = returnDateString(value.value);
const end = returnDateString(value1.value);
console.log(start);
console.log(end);
emits('confirm', {
//如果结尾时间小于开始时间
if (new Date(start).getTime() > new Date(end).getTime()) {
return uni.showToast({
title: "结束时间不能小于开始时间",
icon: "none",
});
}
console.log(start);
console.log(end);
emits("confirm", {
text: `${start}——${end}`,
start,
end
})
close()
end,
});
close();
}
function returnMonthStart(arr) {
@@ -313,64 +328,79 @@
}
function changeDays(isDays1, arr) {
const end = returnMonthEnd(arr)
const end = returnMonthEnd(arr);
if (end) {
if (isDays1) {
days1.value= new Array(end).fill(1).map((v,
index) => {
return index + 1
})
days1.value = new Array(end).fill(1).map((v, index) => {
return index + 1;
});
} else {
days.value= new Array(end).fill(1).map((v,
index) => {
return index + 1
})
days.value = new Array(end).fill(1).map((v, index) => {
return index + 1;
});
}
}
}
function bindChange(e) {
value.value = e.detail.value
changeDays(false, e.detail.value)
value.value = e.detail.value;
changeDays(false, e.detail.value);
}
function bindChange1(e) {
value1.value = e.detail.value
changeDays(true, e.detail.value)
value1.value = e.detail.value;
changeDays(true, e.detail.value);
}
function getDayDate(date = new Date(), type) {
const now = date
if (type === 'start') {
const startOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate());
return startOfDay
const now = date;
if (type === "start") {
const startOfDay = new Date(
now.getFullYear(),
now.getMonth(),
now.getDate()
);
return startOfDay;
}
if (type === 'end') {
const endOfDay = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59, 999);
if (type === "end") {
const endOfDay = new Date(
now.getFullYear(),
now.getMonth(),
now.getDate(),
23,
59,
59,
999
);
return endOfDay;
}
}
function getMonthArea(date = new Date(), type) {
let now = date
let now = date;
let currentMonthStart = new Date(now.getFullYear(), now.getMonth(), 1);
let currentMonthEnd = new Date(now.getFullYear(), now.getMonth() + 1, 0, 23, 59, 59, 999);
if (type === 'start') {
return currentMonthStart
let currentMonthEnd = new Date(
now.getFullYear(),
now.getMonth() + 1,
0,
23,
59,
59,
999
);
if (type === "start") {
return currentMonthStart;
}
if (type === 'end') {
if (type === "end") {
return currentMonthEnd;
}
return {
start: currentMonthStart,
end: currentMonthEnd
end: currentMonthEnd,
};
}
function nullFunction() {
}
function nullFunction() {}
function pickend(e) {
console.log(e);
@@ -383,8 +413,8 @@
close,
open,
confirm,
toggle
})
toggle,
});
</script>
<style lang="scss">
@@ -414,7 +444,7 @@
right: 0;
bottom: 0;
top: 0;
background-color: rgba(0, 0, 0, .7);
background-color: rgba(0, 0, 0, 0.7);
z-index: 100;
.box {
position: absolute;

280
pages/index/components/statistics.vue
View File

@@ -6,53 +6,76 @@
<view class="statisticsBox">
<view class="time-wrapper u-m-l-10 u-m-r-10">
<view v-for="(v, i) in timeList" :key="i" class="timelistbox">
<view class="time-item" @tap="changeTime(v.value,i)" :class="{ 'time-selected':v.value==selected }">
<view
class="time-item"
@tap="changeTime(v.value, i)"
:class="[v.value == selected ? 'time-selected' : '']"
>
{{ v.label }}
</view>
<!-- <view class="xian" v-if="v.value==selected "> </view> -->
</view>
</view>
<view class="time_bootom_line">
<view class="block" :style="{
transform:'translateX('+comBlockX+'rpx) rotate(45deg) '
}"></view>
<view
class="block"
:style="{
transform: 'translateX(' + comBlockX + 'rpx) rotate(45deg) ',
}"
></view>
</view>
<view class="bottom"></view>
<div class="u-flex u-row-between u-font-28 color-333">
<div class="u-flex-1">
<view class="u-m-t-32">
<view class="">营业额</view>
<view class="u-m-t-16">
<up-text bold color="#318AFE" size="20" mode="price" :text="yingyeE"></up-text>
<up-text
bold
color="#318AFE"
size="20"
mode="price"
:text="yingyeE"
></up-text>
</view>
</view>
<view class="u-m-t-20">
<view class="">退款</view>
<view class="u-m-t-14">
<up-text color="#333" size="14" bold mode="price" :text="refundCount"></up-text>
<up-text
color="#333"
size="14"
bold
mode="price"
:text="refundCount"
></up-text>
</view>
</view>
</div>
<view class="line"></view>
<view class="payList u-flex-1 u-p-l-40">
<view class="li w-full u-flex u-row-between u-font-24 color-333" v-for="(item,index) in list"
:key="index">
<view
class="li w-full u-flex u-row-between u-font-24 color-333"
v-for="(item, index) in list"
:key="index"
>
<view class="u-flex">
<view :style="returnColorStyle(item,index)" class="circle"></view>
<view
:style="returnColorStyle(item, index)"
class="circle"
></view>
<view class="u-m-l-8">
{{ item.payType }}
</view>
</view>
<view style="text-align: center;" class="u-m-t-6">
<view style="text-align: center" class="u-m-t-6">
{{ item.payAmount }}
</view>
</view>
</view>
</div>
<!-- <view class="u-m-t-8 u-flex u-row-center u-font-24 u-col-center color-666">
<view class="u-flex" @click="toggleShowAll">
<view>{{!showAll?'展开全部':'收起全部' }}</view>
@@ -63,185 +86,147 @@
</view> -->
</view>
</view>
<datePickerview @confirm="datePickerConfirm" ref="datePicker" style="z-index: 999;"></datePickerview>
<datePickerview
@confirm="datePickerConfirm"
ref="datePicker"
style="z-index: 999"
></datePickerview>
</template>
<script setup>
import {
ref,
reactive,
computed
} from 'vue';
import {
onShow
} from '@dcloudio/uni-app';
import { ref, reactive, computed } from "vue";
import { onShow } from "@dcloudio/uni-app";
import { timeList } from "@/data/index.js";
import dayjs from "dayjs"; //时间格式库
import datePickerview from "./my-date-pickerview.vue";
import dayjs from 'dayjs' //时间格式库
import datePickerview from './my-date-pickerview.vue'
import { getTrade } from "@/http/api/summary.js";
import {
getTrade
} from '@/http/api/summary.js'
let selected = ref('today')
let selected = ref("today");
let showAll = ref(false);
let list = ref()
let list = ref();
const pageData = reactive({
list: [{
payType: '微信小程序',
key: 'wechatPayAmount',
list: [
{
payType: "微信小程序",
key: "wechatPayAmount",
payAmount: 0,
bgcolor: '#5AA25F'
bgcolor: "#5AA25F",
},
{
payType: '支付宝小程序',
key: 'aliPayAmount',
payType: "支付宝小程序",
key: "aliPayAmount",
payAmount: 0,
bgcolor: '#31ACFE'
bgcolor: "#31ACFE",
},
{
payType: '主扫收款',
key: 'scanPayAmount',
payType: "主扫收款",
key: "scanPayAmount",
payAmount: 0,
bgcolor: '#FF5C6D'
bgcolor: "#FF5C6D",
},
{
payType: '现金',
key: 'cashPayAmount',
payType: "现金",
key: "cashPayAmount",
payAmount: 0,
bgcolor: '#FC843F'
bgcolor: "#FC843F",
},
{
payType: '充值',
key: 'rechargeAmount',
payType: "充值",
key: "rechargeAmount",
payAmount: 0,
bgcolor: '#9090FF'
bgcolor: "#9090FF",
},
{
payType: '挂账',
key: 'creditPayAmount',
payType: "挂账",
key: "creditPayAmount",
payAmount: 0,
bgcolor: '#7BA7A4'
bgcolor: "#7BA7A4",
},
// {payType: '收款码收款', key:'', payAmount: 0,bgcolor:'#5AA25F'},
],
})
});
function returnColorStyle(item) {
return {
backgroundColor: item.bgcolor
}
backgroundColor: item.bgcolor,
};
}
function toggleShowAll() {
showAll.value = !showAll.value
setList()
showAll.value = !showAll.value;
setList();
}
function setList() {
// list.value = showAll.value ? pageData.list : pageData.list.slice(0, 4)
list.value = pageData.list
list.value = pageData.list;
}
const emit = defineEmits(["totalRevenue"]);
const emit = defineEmits(['totalRevenue'])
const timeList = [{
label: '今天',
value: 'today'
},
{
label: '昨天',
value: 'yesterday'
},
{
label: '本周',
value: 'circumference'
}, {
label: '本月',
value: 'moon'
},
{
label: '自定义',
value: 'custom'
}
]
const datePicker = ref()
const timeSleIndex = ref(0);
const datePicker = ref();
onShow((options) => {
let iToken = uni.getStorageSync('iToken').tokenValue
let iToken = uni.getStorageSync("iToken").tokenValue;
if (iToken) {
getlist()
getlist();
} else {
uni.redirectTo({
url: '/pages/login/index'
})
url: "/pages/login/index",
});
}
});
const yingyeE = ref(0)
const refundCount = ref(0)
const yingyeE = ref(0);
const refundCount = ref(0);
/**
* 获取统计数据
* @param {Object} start
* @param {Object} end
*/
function getlist(start, end) {
let startTime, endTime;
if (selected.value == 'today') {
startTime = dayjs().format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'yesterday') {
startTime = formatTime() + ' 00:00:00'
endTime = formatTime() + ' 23:59:59'
} else if (selected.value == 'circumference') {
var now = new Date();
var nowTime = now.getTime();
var day = now.getDay();
var oneDayTime = 24 * 60 * 60 * 1000;
//显示周一
var MondayTime = nowTime - (day - 1) * oneDayTime;
//显示周日
var SundayTime = nowTime + (7 - day) * oneDayTime;
startTime = dayjs(MondayTime).format('YYYY-MM-DD 00:00:00')
endTime = dayjs(SundayTime).format('YYYY-MM-DD 23:59:59')
} else if (selected.value == 'moon') {
startTime = dayjs().startOf('month').format('YYYY-MM-DD') + ' 00:00:00'
endTime = dayjs().endOf('month').format('YYYY-MM-DD') + ' 23:59:59'
} else if (selected.value == 'custom') {
let s = start.substring(0, start.indexOf(' '))
let e = end.substring(0, end.indexOf(' '))
startTime = s + ' 00:00:00'
endTime = e + ' 23:59:59'
let beginDate, endDate;
const rangeType = timeList[timeSleIndex.value].value;
if(rangeType == "custom"){
beginDate = start.split(" ")[0];
endDate = end.split(" ")[0];
}else{
beginDate = timeList[timeSleIndex.value].beginDate;
endDate = timeList[timeSleIndex.value].endDate;
}
getTrade({
beginDate: startTime,
endDate: endTime,
beginDate: beginDate,
endDate: endDate,
shopId: uni.getStorageSync("shopId"),
rangeType: rangeType,
}).then((res) => {
refundCount.value = res.refundCount
refundCount.value = res.refundCount;
for (var key in res) {
pageData.list.map(item => {
pageData.list.map((item) => {
if (item.key == key) {
item.payAmount = res[key]
item.payAmount = res[key];
}
})
});
}
setList()
setList();
let incomeAmountAll = 0;
pageData.list.map(item => {
incomeAmountAll += (item.payAmount || 0)
})
pageData.list.map((item) => {
incomeAmountAll += item.payAmount || 0;
});
yingyeE.value = incomeAmountAll
emit('totalRevenue', incomeAmountAll)
})
yingyeE.value = incomeAmountAll;
emit("totalRevenue", incomeAmountAll);
});
}
/**
* 日期筛选确认
* @param {Object} e
*/
function datePickerConfirm(e) {
getlist(e.start, e.end)
getlist(e.start, e.end);
}
// 获取当前时间
@@ -258,32 +243,30 @@
// 获取昨天时间
const formatTime = () => {
let strDate = getdate()
let strDate = getdate();
let dateFormat = new Date(strDate);
dateFormat = dateFormat.setDate(dateFormat.getDate() - 1);
dateFormat = new Date(dateFormat);
let y = dateFormat.getFullYear()
let m = (dateFormat.getMonth() + 1).toString().padStart(2, '0')
let d = dateFormat.getDate().toString().padStart(2, '0')
return `${y}-${m}-${d}`
}
const timeSleIndex = ref(0)
let y = dateFormat.getFullYear();
let m = (dateFormat.getMonth() + 1).toString().padStart(2, "0");
let d = dateFormat.getDate().toString().padStart(2, "0");
return `${y}-${m}-${d}`;
};
function changeTime(e, index) {
selected.value = e
timeSleIndex.value = index
if (e == 'custom') {
datePicker.value.toggle()
selected.value = e;
timeSleIndex.value = index;
if (e == "custom") {
datePicker.value.toggle();
} else {
getlist()
getlist();
}
}
const xArr=[0,134,262,390,532]
const xArr = [0, 134, 262, 390, 532];
const comBlockX = computed(() => {
return xArr[ timeSleIndex.value]
})
return xArr[timeSleIndex.value];
});
</script>
<style scoped lang="less">
ul,
@@ -311,20 +294,21 @@
font-size: 26rpx;
color: #fff;
text-align: center;
background: linear-gradient(109deg, #70B9FF 0%, #629FFA 100%);
background: linear-gradient(109deg, #70b9ff 0%, #629ffa 100%);
border-radius: 12rpx 12rpx 12rpx 0rpx;
top: -16px;
}
.statisticsBox {
width: 694rpx;
background: #FFFFFF;
background: #ffffff;
border-radius: 16rpx 16rpx 16rpx 16rpx;
padding: 48rpx 32rpx 32rpx;
box-sizing: border-box;
margin-top: 54rpx;
.bottom {}
.bottom {
}
.time-wrapper {
display: flex;
@@ -345,7 +329,7 @@
.xian {
width: 40rpx;
height: 3rpx;
background-color: #318AFE;
background-color: #318afe;
// position: absolute;
// left: 16rpx;
// bottom: 0;
@@ -362,7 +346,7 @@
.line {
width: 0rpx;
height: 170rpx;
border: 2rpx solid #EEE8E8;
border: 2rpx solid #eee8e8;
}
.payList {
@@ -395,7 +379,7 @@
.time_bootom_line {
height: 16rpx;
position: relative;
border-bottom: 1px solid #629FFA;
border-bottom: 1px solid #629ffa;
.block {
width: 18rpx;
@@ -403,13 +387,13 @@
box-sizing: border-box;
background: #fff;
position: absolute;
border-top: 0.5rpx solid #629FFA;
border-left: 0.5rpx solid #629FFA;
border-top: 0.5rpx solid #629ffa;
border-left: 0.5rpx solid #629ffa;
left: 30rpx;
top: 6rpx;
transform: rotate(45deg);
transform-origin: center;
transition: all .2s linear;
transition: all 0.2s linear;
}
}
</style>

2
pages/login/index.vue
View File

@@ -273,9 +273,11 @@
*/
async function loginFinishFunc(loginBizData) {
// 保存 token
console.log('loginBizData',loginBizData)
storageManage.setLogin(loginBizData)
storageManage.token(loginBizData.tokenInfo)
uni.setStorageSync("promission",loginBizData.promissionList)
uni.setStorageSync("shopId",loginBizData.shopInfo.id)
// var time1 = new Date();
// var time2 = new Date(loginBizData.expireDate);