Commit 7493d8a9 authored by David黄金龙's avatar David黄金龙

2处bug 修复

parent c8f9b263
...@@ -21,7 +21,7 @@ class YHActivityModel: YHBaseModel { ...@@ -21,7 +21,7 @@ class YHActivityModel: YHBaseModel {
private var beginTimeForUI : String = "" private var beginTimeForUI : String = ""
func getDateString(format : String = "MM-dd") -> String { func getDateString(format : String = "MM/dd") -> String {
if beginTimeForUI.isEmpty { if beginTimeForUI.isEmpty {
if let tttt = beginTime.double() { if let tttt = beginTime.double() {
...@@ -55,7 +55,13 @@ class YHActivityModel: YHBaseModel { ...@@ -55,7 +55,13 @@ class YHActivityModel: YHBaseModel {
let date2 = Date(timeIntervalSince1970: TimeInterval(tttt)) let date2 = Date(timeIntervalSince1970: TimeInterval(tttt))
let titmeString2 = dateFormatter.string(from: date2) let titmeString2 = dateFormatter.string(from: date2)
beginTimeForUI = dateString + " " + weekdayName + " " + titmeString + "-" + titmeString2 if titmeString.contains(titmeString2) {
beginTimeForUI = dateString + " " + weekdayName + " " + titmeString
} else {
beginTimeForUI = dateString + " " + weekdayName + " " + titmeString + "-" + titmeString2
}
} }
} }
......
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