老登陆,经营分析,被挤掉提示

This commit is contained in:
xk_guohonglei
2020-09-05 11:53:19 +08:00
parent 395ebd432d
commit a5fe20c721
14 changed files with 1065 additions and 329 deletions

View File

@@ -4,6 +4,9 @@
<block slot="backText">返回</block>
<block slot="content">列表</block>
</cu-custom>
<view class="">
<analysis-card />
</view>
<view class="margin bg-white radius">
<view class="margin">
<area-time />
@@ -15,9 +18,10 @@
<script>
import areaTime from '@/components/area-time.vue'
import analysisCard from '@/components/analysis-card/analysis-card.vue'
export default {
components: {
areaTime
areaTime,analysisCard
},
data() {
return {

View File

@@ -1,8 +1,179 @@
// 昨日经营分析
<template>
<view class="page-content my-bg">
<cu-custom bgColor="bg-main-oil" :isBack="true">
<block slot="backText">返回</block>
<block slot="content">日报</block>
</cu-custom>
<view class="card-container">
<view class="cu-capsule-container">
<view class="cu-capsule round bg-white solid line-gray" @tap="showModal">
<view class='cu-tag bg-white'>
{{selDate}}
</view>
<view class="cu-tag bg-white">
<text class='cuIcon-usefullfill rr90 padding-left-xs'></text>
</view>
</view>
</view>
<analysis-card @showModal="showModal" :basicData="basicData" />
</view>
<view class="margin bg-white radius">
<view class="margin">
<area-time :chartData="detailData" />
</view>
</view>
<view class="cu-modal bottom-modal" :class="dialogModal">
<view class="cu-dialog">
<view class="cu-bar bg-white ">
<view class="action text-blue" @tap="hideModal">取消</view>
<view class="content">选择日期</view>
<view class="action text-green" @tap="onConfirm">确定</view>
</view>
<picker-view :value="value" style="min-height: 250upx;width: 100%;" @change="bindChange">
<picker-view-column>
<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>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}</view>
</picker-view-column>
</picker-view>
</view>
</view>
</view>
</template>
<script>
import areaTime from '@/components/area-time.vue'
import analysisCard from '@/components/analysis-card/analysis-card.vue'
import cloudSiteApi from '@/api/cloud-site.js'
export default {
components: {
areaTime,
analysisCard
},
data: function() {
const date = new Date()
const years = []
const year = date.getFullYear()
const months = []
const month = date.getMonth() + 1
const days = []
const day = date.getDate() - 1
for (let i = 2020; i <= date.getFullYear(); i++) {
years.push(i)
}
for (let i = 1; i <= month; i++) {
months.push(i)
}
for (let i = 1; i <= 31; i++) {
days.push(i)
}
return {
title: 'picker-view',
years: [2020],
year: 2020,
months: months,
dialogModal: '',
month: month,
days: days,
day: day,
// value: [9999, month - 1, day - 1],
value: [0, month - 1, day - 1],
selDate: year + '-' + month + '-' + day,
detailData: [],
basicData: {
totalAccount: 0,
totalAmout: 0,
totalCount: 0
}
}
},
onPullDownRefresh() {
this.onConfirm()
// this.getUserInfo()
// uni.stopPullDownRefresh();
},
onShow() {
this.formatDate()
this.getDaily()
},
methods: {
getDaily() {
cloudSiteApi.getAnyDay(this.selDate).then(res => {
uni.stopPullDownRefresh();
if (res.code === 20000) {
this.basicData = res.data.basicData
this.detailData = res.data.detailData
}
})
},
onConfirm() {
this.hideModal()
this.formatDate()
this.getDaily()
},
formatDate() {
var m = ''
var d = ''
if (this.month < 10) {
m = '0' + this.month
} else {
m = this.month
}
if (this.day < 10) {
d = '0' + this.day
} else {
d = this.day
}
this.selDate = this.year + '-' + m + '-' + d
this.selDate = this.selDate.toString()
console.log(this.selDate)
},
showModal(e) {
this.dialogModal = 'show'
},
hideModal(e) {
this.dialogModal = null
},
bindChange: function(e) {
const val = e.detail.value
this.year = this.years[val[0]]
this.month = this.months[val[1]]
this.day = this.days[val[2]]
console.log('年鱼儿', this.year, this.month, this.day)
}
}
}
</script>
<style>
<style scoped>
.card-container {
position: relative;
}
.card-container .cu-capsule {
margin: auto;
margin-bottom: -40px;
}
.cu-capsule-container {
min-width: 100%;
text-align: center;
}
.rr90 {
rotate: 180deg;
}
</style>

View File

@@ -1,8 +1,193 @@
// 昨日经营分析
<template>
<view class="page-content my-bg">
<cu-custom bgColor="bg-main-oil" :isBack="true">
<block slot="backText">返回</block>
<block slot="content">月报</block>
</cu-custom>
<view class="card-container">
<view class="cu-capsule-container">
<view class="cu-capsule round bg-white solid line-gray" @tap="showModal">
<view class='cu-tag bg-white'>
{{selDate}}
</view>
<view class="cu-tag bg-white">
<text class='cuIcon-usefullfill rr90 padding-left-xs'></text>
</view>
</view>
</view>
<analysis-card @showModal="showModal" :basicData="basicData" />
<view class="margin bg-white radius">
<view class="margin">
<area-month :chartData="detailData" />
</view>
</view>
<view class="cu-modal bottom-modal" :class="dialogModal">
<view class="cu-dialog">
<view class="cu-bar bg-white ">
<view class="action text-blue" @tap="hideModal">取消</view>
<view class="content">选择日期</view>
<view class="action text-green" @tap="onConfirm">确定</view>
</view>
<picker-view :value="value" style="min-height: 250upx;width: 100%;" @change="bindChange">
<picker-view-column>
<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>
</picker-view-column>
<picker-view-column>
<view class="item" v-for="(item,index) in days" :key="index">{{item}}</view>
</picker-view-column>
</picker-view>
<view class="cu-bar bg-white justify-end">
<view class="action">
<button class="cu-btn line-green text-green" @tap="hideModal">取消</button>
<button class="cu-btn bg-green margin-left" @tap="onConfirm">确定</button>
</view>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import areaMonth from '@/components/area-month.vue'
import analysisCard from '@/components/analysis-card/analysis-card.vue'
import cloudSiteApi from '@/api/cloud-site.js'
export default {
components: {
areaMonth,
analysisCard
},
data: function() {
const date = new Date()
const years = []
const year = date.getFullYear()
const months = []
const month = date.getMonth() + 1
const days = []
const day = date.getDate() - 1
for (let i = 2020; i <= date.getFullYear(); i++) {
years.push(i)
}
for (let i = 1; i <= month; i++) {
months.push(i)
}
for (let i = 1; i <= 31; i++) {
days.push(i)
}
return {
title: 'picker-view',
years: [2020],
year: 2020,
months: months,
dialogModal: '',
month: month,
days: days,
day: day,
// value: [9999, month - 1, day - 1],
value: [0, month - 1, day - 1],
selDate: year + '-' + month + '-' + day,
detailData: [],
basicData: {
totalAccount: 0,
totalAmout: 0,
totalCount: 0
}
}
},
onPullDownRefresh() {
this.onConfirm()
// this.getUserInfo()
// uni.stopPullDownRefresh();
},
onShow() {
this.formatDate()
this.getMonthly()
var date = '2019-9-5';
date = date.substring(0, 19);
date = date.replace(/-/g, '/');
var timestamp = new Date(date).getTime();
console.log(timestamp)
},
methods: {
getMonthly() {
cloudSiteApi.getAnyMonth(this.selDate).then(res => {
uni.stopPullDownRefresh()
if (res.code === 20000) {
this.basicData = res.data.basicData
res.data.detailData.forEach(item=>{
var date = item[0]
date = date.substring(0, 19);
date = date.replace(/-/g, '/');
item[0] = new Date(date).getTime();
})
this.detailData = res.data.detailData
}
})
},
onConfirm() {
this.hideModal()
this.formatDate()
this.getMonthly()
},
formatDate() {
var m = ''
var d = ''
if (this.month < 10) {
m = '0' + this.month
} else {
m = this.month
}
if (this.day < 10) {
d = '0' + this.day
} else {
d = this.day
}
this.selDate = this.year + '-' + m + '-' + d
console.log(this.selDate)
},
showModal(e) {
this.dialogModal = 'show'
},
hideModal(e) {
this.dialogModal = null
},
bindChange: function(e) {
const val = e.detail.value
this.year = this.years[val[0]]
this.month = this.months[val[1]]
this.day = this.days[val[2]]
console.log('年鱼儿', this.year, this.month, this.day)
}
}
}
</script>
<style>
<style scoped>
.card-container {
position: relative;
}
.card-container .cu-capsule {
margin: auto;
margin-bottom: -40px;
}
.cu-capsule-container {
min-width: 100%;
text-align: center;
}
.rr90 {
rotate: 180deg;
}
</style>

View File

@@ -2,15 +2,16 @@
<view class="page-content my-bg">
<cu-custom class="main-topbar bg-main-oil" bgColor="bg-main-oil" :isBack="true">
<block slot="content">经营分析</block>
<block slot="backText">返回</block>
<block slot="backText" class="back-text">返回</block>
</cu-custom>
<view class="main-money bg-main-oil">
<view class="padding-xs flex align-center">
<view class="flex-sub text-center padding-top-lg">
<view class="txet-xxs">
<text class="text-white">昨日交易金额()</text>
</view>
<view class=" text-sl padding padding-top-xs"><text class="text-white">{{userAccount.totalMoney|numberFilter}}</text></view>
<view class=" text-sl padding padding-top-xs"><text class="text-white">{{basicData.totalAmout|numberFilter}}</text></view>
</view>
</view>
</view>
@@ -23,7 +24,7 @@
<view class="padding text-center flex-sub" @tap="routerTo('/pages/orderList/dailyOrder/dailyOrder')">
<text>交易笔数</text>
<view class="padding-sm">
<text class="oil-main-color">{{userAccount.totalCount}}</text>
<text class="oil-main-color">{{basicData.totalCount}}</text>
</view>
<!-- <button class="cu-btn bg-main-oil text-white text-sm ">
查看明细
@@ -32,7 +33,7 @@
<view class="padding text-center flex-sub">
<text>顾客数</text>
<view class="padding-sm">
<text class="oil-main-color">{{userAccount.totalMoney|numberFilter}}</text>
<text class="oil-main-color">{{basicData.totalAccount|numberFilter}}</text>
</view>
<!-- <button class="cu-btn bg-main-oil text-white text-sm ">
查看明细
@@ -42,26 +43,26 @@
</view>
<view class="margin">
<view class="cu-list menu-avatar radius">
<view class="cu-item">
<view class="cu-item" @tap="routerTo('/pages/operation-analysis/analysis/daily')">
<view class="cu-avatar round lg" :style="'background-image: url('+mainURL+'default-avator.png)'">
</view>
<view class="content ">
<text>经营分析日报</text>
</view>
<view class="action">
<button class="cu-btn padding-left-xs padding-right-xs bg-white" @tap="routerTo('/pages/operation-analysis/analysis/analysis')">
<button class="cu-btn padding-left-xs padding-right-xs bg-white">
<text class="cuIcon-right"></text>
</button>
</view>
</view>
<view class="cu-item">
<view class="cu-item" @tap="routerTo('/pages/operation-analysis/analysis/monthly')">
<view class="cu-avatar round lg" :style="'background-image: url('+mainURL+'default-avator.png)'">
</view>
<view class="content">
<text> 经营分析月报</text>
</view>
<view class="action solid-left">
<view class="action ">
<button class="cu-btn padding-left-xs padding-right-xs bg-white" @tap="routerTo('path')">
<text class="cuIcon-right"></text>
</button>
@@ -81,9 +82,10 @@
return {
mainURL: this.global.mainURL,
userAccount: {
totalCount: 0,
totalMoney: 0.00
basicData: {
totalAccount: 0,
totalAmout: 0,
totalCount: 0
},
scanUrl: '',
userMenu: uni.getStorageSync('userMenu'),
@@ -92,19 +94,15 @@
cuIconList: []
};
},
onLoad() {
uni.showShareMenu()
uni.navigateTo({
url:''
})
},
onShow() {
onShow() {
this.getYesterday()
},
onPullDownRefresh() {
this.getUserInfo()
this.getYesterday()
},
filters: {
numberFilter(value) {
if (value) {
value = value - 1 + 1
@@ -128,16 +126,13 @@
}
})
},
getUserInfo() {
cloudSiteApi.getSiteBasicData().then(res => {
console.log('用户资料', res)
uni.stopPullDownRefresh();
if (res.code === 20000) {
this.userAccount = res.data
getYesterday() {
cloudSiteApi.getYesterday().then(res => {
uni.stopPullDownRefresh()
if(res.code===20000){
this.basicData = res.data
}
})
},
scanQr() {
var that = this
@@ -191,15 +186,6 @@
margin-top: 0;
}
.main-topbar>>>.cu-bar {
height: 380rpx !important;
z-index: 0 !important;
}
.main-topbar>>>.cu-bar .content {
padding-bottom: 300rpx;
}
.bottom-bar-fixed {
position: fixed;
bottom: 0;