From 6df96b3e7a7da1985ee875e84711e9f15c5fbff0 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 24 十二月 2024 18:25:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageCourse/pages/course/detail/index.js | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/packageCourse/pages/course/detail/index.js b/packageCourse/pages/course/detail/index.js
index bdb935c..0e7815d 100644
--- a/packageCourse/pages/course/detail/index.js
+++ b/packageCourse/pages/course/detail/index.js
@@ -15,6 +15,7 @@
startTime: '',
endTime: '',
className: '',
+ isShow: "",
count: null,
classList: [],
searchKey: '',
@@ -179,13 +180,15 @@
// 鎵撳紑閫夋嫨鏃ユ湡
openDateStart() {
this.setData({
- visibleStart: true
+ visibleStart: true,
+ isShow: 'none',
})
},
openDateEnd() {
this.setData({
- visibleEnd: true
+ visibleEnd: true,
+ isShow: 'none'
})
},
@@ -197,6 +200,7 @@
const dateStr = moment(value).format('YYYY-MM-DD')
this.setData({
startTime: dateStr,
+ isShow: ''
});
},
@@ -207,6 +211,7 @@
const dateStr = moment(value).format('YYYY-MM-DD')
this.setData({
endTime: dateStr,
+ isShow: ''
});
},
@@ -219,6 +224,8 @@
// 鐢宠鎻愪氦鐝骇
submitClass() {
+ const bTime = moment(this.data.startTime).valueOf()
+ const eTime = moment(this.data.endTime).valueOf()
if (!this.data.className) {
wx.showToast({
title: '璇峰～鍐欒绋嬪悕绉�',
@@ -238,6 +245,14 @@
if (!this.data.startTime || !this.data.endTime) {
wx.showToast({
title: '璇烽�夋嫨鐝骇鏈夋晥鏈�',
+ duration: 1000,
+ icon: 'none',
+ })
+ return false
+ }
+ if (bTime && eTime && eTime < bTime) {
+ wx.showToast({
+ title: '璇烽�夋嫨鐝纭殑鐝骇鏈夋晥鏈�',
duration: 1000,
icon: 'none',
})
@@ -273,7 +288,7 @@
wx.showToast({
title: '鐢宠寮�鐝嚭閿�',
duration: 1000,
- icon: 'err',
+ icon: 'none',
})
this.setData({
visible: false
--
Gitblit v1.9.1