Administrator 2 years ago
parent
commit
2a13e45955
2 changed files with 20 additions and 16 deletions
  1. 1 0
      package.json
  2. 19 16
      src/views/date.vue

+ 1 - 0
package.json

@@ -63,6 +63,7 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
+    "vant": "^3.6.1",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",

+ 19 - 16
src/views/date.vue

@@ -3,13 +3,13 @@
     <!-- 月份变换区 -->
     <div class="header rowJcAc" v-if="headerBar">
       <div class="arrowIcon rowJcAc" @click="changeMonth('pre')" v-if="monthOpen">
-        <van-icon name="arrow-left" color="#9EA8BA" size="12px"/>
+        上个月
       </div>
-      
+
       <!-- <div class="pre " @click="changeMonth('pre')">上个月</div> -->
       <div class="yearMonth">{{y+'-'+formatNum(m)}}</div>
       <div class="arrowIcon rowJcAc" @click="changeMonth('next')" v-if="monthOpen">
-        <van-icon name="arrow" color="#9EA8BA" size="12px"/>
+        下个月
       </div>
       <!-- <div class="next" @click="changeMonth('next')">下个月</div> -->
     </div>
@@ -33,17 +33,20 @@
               today:isToday(item.year,item.month,item.date),
           }"
           >
-          <div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)" 
-          :class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']"></div>
-          {{Number(item.date)}}</div>
-          
+          <div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)"
+          :class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']">
+          </div>
+
+            <p>{{Number(item.date)}}@</p>
+          </div>
+
         </div>
       </div>
     </div>
     <!-- 伸缩按钮:待定 -->
-    <div class="bottomLine rowJcAc" v-if="collapsible" @click="toggle">
-      <div></div>
-    </div>
+    <!--<div class="bottomLine rowJcAc" v-if="collapsible" @click="toggle">-->
+      <!--<div></div>-->
+    <!--</div>-->
     <!-- 伸缩按钮:待定 -->
     <!-- <img
       src="https://i.loli.net/2020/07/16/2MmZsucVTlRjSwK.png"
@@ -105,7 +108,7 @@ export default {
       m: new Date().getMonth() + 1, // 月
       dates: [], // 当前月的日期数据
       positionTop: 0,
-      monthOpen: true,
+      monthOpen: false,
       choose: "",
       isCurM: true,
     };
@@ -130,8 +133,8 @@ export default {
           this.positionTop = -((Math.ceil((index + 1) / 7) || 1) - 1) * 42;
         }
       }
-      
-      
+
+
     },
     m() {
       this.$emit('changeMonth',{year: this.y,month: this.m})
@@ -149,7 +152,7 @@ export default {
       this.choose = this.getToday().date;
     }
     this.toggle()
-    
+
   },
   computed: {
     // 顶部星期栏
@@ -383,7 +386,7 @@ export default {
       margin: 0 32px;
     }
 
-    
+
   }
 
   .week {
@@ -442,7 +445,7 @@ export default {
           }
 
         }
-        
+
 
         .notSigned {
           font-style: normal;