11

app.acss

-@import "./font/iconfont.acss";
+@import "./assests/font/iconfont.acss";
 page {
     font-family: PingFangSC-Regular;
     background: #F6F6F6;

components/meetingTimePicker/doc.txt

@@ -18,8 +18,7 @@
 <------------------js------------------>
 Page({
   data: {
-    show:false,
-    startTime: new Date()
+    show:false
   },
   showPop(){
     this.setData({

components/meetingTimePicker/meetingTimePicker.acss

@@ -22,8 +22,7 @@ picker-view .column {
 .tab {
     margin-top: 72rpx;
     display: flex;
-    border-bottom: 2rpx solid rgba(25, 31, 37, 0.12);
-    border-top: 2rpx solid rgba(25, 31, 37, 0.12);
+    padding-left: 24rpx;
 }
 
 .tab>view {
@@ -31,30 +30,34 @@ picker-view .column {
     display: flex;
     flex-direction: column;
     padding: 16rpx 34rpx;
+    background: rgba(10,10,10,0.06);
+    border-radius: 8rpx;
+    margin-right:24rpx;
 }
 
 .tab>view>text {
-    color: rgba(27, 38, 61, 0.49);
+    color: rgba(10,10,10,0.4);
     font-size: 28rpx;
 }
 
 .tab>view>text:nth-of-type(2) {
-    color: #1B263D;
+    color:  rgba(10,10,10,0.56);
     font-size: 34rpx;
     font-weight: bold;
     line-height: 48rpx;
 }
 
 .tab .active {
-    background: #3296FA;
+    background: #fff;
+    border: 2rpx solid rgb(10,10,10);
 }
 
 .tab .active>text {
-    color: rgba(255, 255, 255, 0.8);
+    color: rgba(10,10,10,0.8);
 }
 
 .tab>.active>text:nth-of-type(2) {
-    color: #fff;
+    color: rgb(10, 10, 10);
 }
 
 .coustom-end {
@@ -64,7 +67,7 @@ picker-view .column {
 }
 
 .coustom-end>text {
-    color: #3070F2;
+    color: rgb(10,10,10);
     position: absolute;
     font-size: 24rpx;
     right: 32rpx;
@@ -79,7 +82,7 @@ picker-view .column {
 
 .picker-complete {
     position: absolute;
-    color: #3070F2;
+    color: rgb(10,10,10);
     font-size: 32rpx;
     right: 32rpx;
     top: 32rpx;

components/meetingTimePicker/meetingTimePicker.js

-var currentDate = new Date();
+const currentDate = new Date();
 const weekList = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
 const durationList = [{ value: 60, label: '1小时' }, { value: 120, label: '2小时' }, { value: 30, label: '30分钟' }];
 const timeData = generateDate(365);
-const timeHour = generateTime(24);
-const timeMin = generateTime(60);
+const timeHour = generateHour(24);
+const timeMin = generateMin(60);
 
 function padZero(val) {
   return ("00" + val).slice(-2);
 }
-// 生成小时和分钟
-function generateTime(max) {
+// 生成分钟 每隔五分钟
+function generateMin(max) {
+  const time = [];
+  for (let i = 0; i < max; i+=5) {
+    time.push(padZero(i))
+  }
+  return time;
+}
+// 生成小时
+function generateHour(max) {
   const time = [];
   for (let i = 0; i < max; i++) {
     time.push(padZero(i))
@@ -28,7 +36,7 @@ function generateDate(max) {
   return timeData
 }
 function GetDateStr(AddDayCount) {
-  var time = new Date();
+  let time = new Date();
   time.setDate(time.getDate() + AddDayCount);
   const res = getYMDWHMIN(time);
   return res.y + '年' + res.m + "月" + res.d + "日 " + res.w;
@@ -51,6 +59,11 @@ function getShowTime(date) {
   const res = getYMDWHMIN(date);
   return res.m + "月" + res.d + "日 " + res.h + ':' + res.min;
 }
+// 时间格式转化为2019/2/2 16:00
+function getPostTimeByDate(date) {
+  const res = getYMDWHMIN(date);
+  return res.y + '/' + res.m + "/" + res.d + " " + res.h + ':' + res.min;
+}
 function getPickerValue(date) {
   const res = getYMDWHMIN(date);
   return [timeData.indexOf(res.y + "年" + res.m + "月" + res.d + "日 " + res.w), timeHour.indexOf(res.h), timeMin.indexOf(res.min)];
@@ -80,7 +93,7 @@ function getWeekDay(date) {
 // 根据开始时间和持续时间计算结束时间 2019/2/2 16:00
 function getEndTimeByDuration(startDate, duration) {
   const newDate = new Date(startDate); //新创建一个时间对象，以免改变startDate
-  var min = newDate.getMinutes();
+  const min = newDate.getMinutes();
   newDate.setMinutes(min + duration);
   const res = getYMDWHMIN(newDate);
   return res.y + '/' + res.m + '/' + res.d + ' ' + res.h + ':' + res.min;
@@ -99,12 +112,6 @@ function getDateByPickValue(pickValue) {
   return new Date(newD)
 }
 
-// 时间格式转化为2019/2/2 16:00
-function getPostTimeByDate(date) {
-  const res = getYMDWHMIN(date);
-  return res.y + '/' + res.m + "/" + res.d + " " + res.h + ':' + res.min;
-}
-
 // 获取持续时间 {value,lable,index}
 function getDuration(startDate, endDate) {
   const time = endDate.getTime() - startDate.getTime();
@@ -151,9 +158,9 @@ Component({
       showTime: '',
     },
     duration: {
-      pickValue: [1],
+      pickValue: [2],
       showTime: '',
-      label: '2小时',
+      label: '30分钟',
     },
     startPostTime: '',
     endPostTime: '',
@@ -171,10 +178,10 @@ Component({
     //设置初始值
     setInitialValue() {
       let startDate = new Date();
-      //结束日期默认+2小时
+      //结束日期默认+ 半小时
       let endDate = new Date();
-      var hour = endDate.getHours();
-      endDate.setHours(hour + 2);
+      const min = endDate.getMinutes();
+      endDate.setMinutes(min + 30);
       // 赋值
       if (this.props.startTime) {
         startDate = new Data(this.props.startTime);
@@ -190,7 +197,6 @@ Component({
       });
       // 如果持续时间不在范围内，需要改变默认显示结束时间的方式
       const durationData = getDuration(startDate, endDate);
-      // 在范围内
       if (durationData) {
         this.changeDuration(startDate, durationData);
       } else {
@@ -231,7 +237,7 @@ Component({
     },
     onChange(e) {
       const pickValue = e.detail.value;
-
+      console.log(pickValue)
       if (this.data.currentTab === 'start') {
         const startDate = getDateByPickValue(pickValue);
         this.changeStart(startDate, pickValue);
@@ -244,6 +250,7 @@ Component({
             endDurationPostTime: getEndTimeByDuration(startDate, durationValue)
           })
         } else {
+          // 实时校验
           this.checkValue(startDate, this.data.endPostTime);
         }
       }
@@ -271,10 +278,11 @@ Component({
         return this.setData({
           pickValue: this.data.duration.pickValue
         });
+      } else {
+        this.setData({
+          pickValue: this.data[`${currentTab}`].pickValue
+        });
       }
-      this.setData({
-        pickValue: this.data[`${currentTab}`].pickValue
-      });
     },
     changeWay() {
       this.setData({

components/popup/index.acss

@@ -66,7 +66,6 @@
 }
 
 .close-icon {
-  font-size: 64rpx;
   text-align: center;
 }
 
@@ -76,7 +75,6 @@
 }
 
 .popup-title {
-  font-family: PingFangSC-Regular;
   text-align: center;
   font-size: 24rpx;
   color: rgba(144, 161, 179, 0.56);