Skip to content

X
xzf_uniapp-wechat-web
Commit 6eaace67 authored by 袁玲利's avatar 袁玲利
Browse files
Options

校园报告暂存

parent 213e139a
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 34 deletions
src/components/canlendar.vue
View file @ 6eaace67
......@@ -6,11 +6,11 @@
<div class="calendar-inner">
<div class="calendar-item" v-for="(item, index) of calendarList" :key="index"
:class="[item.disable ? 'disabled' : '',item.value=='2023-08-23'||item.value=='2023-08-18'||item.value=='2023-08-28'?'signdate':'',item.value===currentDay?'today':'']">
<div v-if="item.value=='2023-08-23'||item.value=='2023-08-18'||item.value=='2023-08-28'" class="icons">
<!-- <div v-if="item.value=='2023-08-23'||item.value=='2023-08-18'||item.value=='2023-08-28'" class="icons">
<span v-if="item.value=='2023-08-23'">早中</span>
<span v-else-if="item.value=='2023-08-18'">早中晚</span>
<span v-else>晚</span>
</div>
</div> -->
<div class="show">{{ item.date }}</div>
</div>
</div>
......@@ -19,12 +19,27 @@
<script>
export default {
props: {
currentDate: {
type: Object,
default: function() {
return {
year: '',
month: ''
};
}
},
shareDate_: {
type: String,
default: ""
},
},
data() {
return {
current: {}, // 当前时间
weekList: ['一', '二', '三', '四', '五', '六', '日'],
calendarList: [], // 用于遍历显示
shareDate: new Date()
shareDate: new Date()
}
},
computed: {
......@@ -34,22 +49,27 @@
year,
month
} = this.current;
return `${year}年${this.pad(month + 1)}月`;
return `${year}年${this.pad(month)}月`;
}
},
mounted() {
this.init();
},
computed: {
currentDay(){
let month=(this.current.month+1)<10?'0'+(this.current.month+1):(this.current.month+1);
return this.current.year+'-'+month+'-'+this.current.date;
currentDay() {
let month = (this.current.month + 1) < 10 ? '0' + (this.current.month + 1) : (this.current.month + 1);
return this.current.year + '-' + month + '-' + this.current.date;
}
},
methods: {
init() {
console.log(this.shareDate_,)
this.shareDate = new Date(this.shareDate_);
this.current = this.currentDate;
// this.shareDate = new Date('2023-05-01')
console.log(this.shareDate, 'shareDate11111')
// 初始化当前时间
this.setCurrent();
// this.setCurrent();
this.calendarCreator();
},
// 判断当前月有多少天
......@@ -87,6 +107,8 @@
},
// 设置或初始化 current
setCurrent(d = new Date()) {
let t = new Date(this.current.year)
console.log(d, 'setCurrent')
let year = d.getFullYear();
let month = d.getMonth();
let date = d.getDate();
......@@ -110,7 +132,7 @@
let instance = new Date(year, month, date);
this.setCurrent(instance);
},
// 生成日期
calendarCreator() {
......@@ -149,13 +171,21 @@
disable: curMonth !== month,
value: this.stringify(year, curMonth, date)
});
begin += oneDayMS;
begin += oneDayMS;
}
this.calendarList = list;
console.log(list, 'calendarList')
}
},
watch: {
currentDate(val) {
this.current = val
},
shareDate_(val) {
this.shareDate = new Date(val)
}
},
}
</script>
......@@ -177,17 +207,18 @@
font-size: 26rpx;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: rgba(0,0,0,0.85);
color: rgba(0, 0, 0, 0.85);
line-height: 37rpx
}
.calendar-week .week-item {
flex: 1;
}
.calendar-week .week-item:first-child,.week-item:last-child {
color: rgba(0,0,0,0.25);
}
.calendar-week .week-item:first-child,
.week-item:last-child {
color: rgba(0, 0, 0, 0.25);
}
.calendar-inner {
display: flex;
......@@ -235,7 +266,7 @@
line-height: 28rpx;
margin-bottom: 4rpx;
}
.today {
background: rgba(0, 0, 0, 0.1);
}
......
src/pages/ApplyConsumption/campusReport/campusReport.vue
View file @ 6eaace67
......@@ -133,7 +133,7 @@
</view>
<!-- 日历 -->
<view class="canlendar">
<Canlendar></Canlendar>
<Canlendar :currentDate="currentDate" :shareDate_="shareDate"></Canlendar>
</view>
<!-- 底部 -->
<view class="dining_footer">
......@@ -291,6 +291,11 @@
name: 'campusReport',
data() {
return {
shareDate: "",
currentDate: {
year: '',
month: ''
},
// 是否为会员
isVip: false,
// 是否展示消费明细
......@@ -344,6 +349,11 @@
},
async mounted() {
console.log(this.dataRangeArr, 'dataRangeArr')
this.currentDate.month = moment(this.dataRangeArr[this.dataRangeIndex].startDate).month()
this.currentDate.year = moment(this.dataRangeArr[this.dataRangeIndex].startDate).year()
this.currentDate.date = moment(this.dataRangeArr[this.dataRangeIndex].startDate).date()
this.shareDate = moment(this.dataRangeArr[this.dataRangeIndex].startDate).format('YYYY-MM-DD 00:00:00')
console.log(this.currentDate, 'currentDate1111111111111', this.shareDate)
this.columns = this.dataRangeArr.map(x => x.month)
console.log(this.columns, 'columns')
await this.getCampusConsumerReport()
......@@ -358,6 +368,10 @@
async confrimDate(date) {
console.log(date, 'date')
const self = this;
this.currentDate.month = moment(this.dataRangeArr[this.dataRangeIndex].startDate).month()
this.currentDate.year = moment(this.dataRangeArr[this.dataRangeIndex].startDate).year()
this.currentDate.date = moment(this.dataRangeArr[this.dataRangeIndex].startDate).date()
this.shareDate = moment(this.dataRangeArr[this.dataRangeIndex].startDate).format('YYYY-MM-DD 00:00:00')
let obj = this.dataRangeArr.filter((x, idx) => (x.month == date) && (self.dataRangeIndex = idx))
console.log(obj, 'obj', this.dataRangeIndex)
await this.getCampusConsumerReport()
......@@ -501,25 +515,8 @@
}
return
},
// 获取当前日期
getNowFormatDate() {
var date = new Date()
var seperator = '-'
var year = date.getFullYear()
var month = date.getMonth() + 1
var day = date.getDate()
if (month >= 1 && month <= 9) {
month = '0' + month
}
if (day >= 1 && day <= 9) {
day = '0' + day
}
var currentdate = year + seperator + month + seperator + day
return currentdate
},
// 获取日期范围列表
getDataRangeArr() {
// console.log(this.getNowFormatDate())
console.log(this.dataRangeArr, 'dataRangeArr')
},
init() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment