|
|
@@ -10,17 +10,7 @@
|
|
|
<view class="dd" v-for="(item,index) in week" :key="index">{{item}}</view>
|
|
|
</view>
|
|
|
<swiper :style="{height:(retract ? 2 * 80 : (week_list.length + 1) * 80 ) + 'rpx'}" :current="current" @change="change_date">
|
|
|
- <swiper-item>
|
|
|
-
|
|
|
- <view class="date_dl" v-show="!retract || index == to_prev_week_index" v-for="(item,index) in week_list_prev_co" :key="index">
|
|
|
- <view class="dd" @click="item_click(vo,index,key)" v-for="(vo,key) in item" :key="key">
|
|
|
- <!-- <view class="num" :class="[vo.today ? 'today' : '',vo.type == 'month' ? 'month' : (retract ? '' : 'disabled')]">{{vo.day}}</view> -->
|
|
|
- <view class="num" :class="[vo.today ? 'today' : '', vo.dot ? '' : 'disabled']">{{vo.day}}</view>
|
|
|
- <view v-show="vo.dot && (vo.type == 'month' || retract)" class="dot"></view>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view @click="open" class="retract icon" v-show="false"><text class="iconfont next icon-fanhui" :class="[retract ? '' : 'retract_icon']" /></view>
|
|
|
- </swiper-item>
|
|
|
+
|
|
|
<swiper-item>
|
|
|
|
|
|
<view class="date_dl" v-show="!retract || index == to_week_index" v-for="(item,index) in week_list" :key="index">
|
|
|
@@ -85,7 +75,7 @@ export default {
|
|
|
to_next_week_index:0,
|
|
|
nowTime:0,
|
|
|
dot_list:[],
|
|
|
- current:1,
|
|
|
+ current:0,
|
|
|
date:'',
|
|
|
}
|
|
|
},
|
|
|
@@ -257,16 +247,17 @@ export default {
|
|
|
let current = e.detail.current;
|
|
|
|
|
|
this.current = current;
|
|
|
-
|
|
|
- /*uni.showToast({
|
|
|
+ /*
|
|
|
+ uni.showToast({
|
|
|
title: primary_current + ' ' + current,
|
|
|
icon:'none'
|
|
|
});
|
|
|
*/
|
|
|
+
|
|
|
//return;
|
|
|
|
|
|
|
|
|
- if(primary_current - current == -1 || primary_current - current == 2){
|
|
|
+ if(primary_current - current == -1){
|
|
|
|
|
|
if(this.retract){
|
|
|
|
|
|
@@ -279,13 +270,17 @@ export default {
|
|
|
}
|
|
|
|
|
|
}else{
|
|
|
+
|
|
|
this.get_date(this.get_month('next'));
|
|
|
this.update_month();
|
|
|
+ /*
|
|
|
if(primary_current - current == -1 && current != 1){
|
|
|
this.change_date_month('prev')
|
|
|
}else if(primary_current - current == 2){
|
|
|
this.change_date_month('next')
|
|
|
}
|
|
|
+ */
|
|
|
+ this.change_date_month('prev');
|
|
|
}
|
|
|
}else{
|
|
|
if(this.retract){
|
|
|
@@ -301,11 +296,15 @@ export default {
|
|
|
}else{
|
|
|
this.get_date(this.get_month('prev'));
|
|
|
this.update_month();
|
|
|
- if(primary_current - current == 1 && current != 1){
|
|
|
+ /*
|
|
|
+ if(primary_current - current == 1 && current != 0){
|
|
|
this.change_date_month('next')
|
|
|
- }else if(primary_current - current == -2){
|
|
|
+ }else{
|
|
|
this.change_date_month('prev')
|
|
|
}
|
|
|
+ */
|
|
|
+
|
|
|
+ //this.change_date_month('prev');
|
|
|
}
|
|
|
}
|
|
|
|