From 59bd9f792891efa0d0d69f256e1a146c44c944db Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期三, 24 七月 2024 09:45:41 +0800
Subject: [PATCH] fix bug
---
DolphinEnglishLearnStudent/Models/CommonModel.swift | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/DolphinEnglishLearnStudent/Models/CommonModel.swift b/DolphinEnglishLearnStudent/Models/CommonModel.swift
index 5d57ffd..81da19e 100644
--- a/DolphinEnglishLearnStudent/Models/CommonModel.swift
+++ b/DolphinEnglishLearnStudent/Models/CommonModel.swift
@@ -91,14 +91,14 @@
var inventory: Int = 0
var isDelete: Int = 0
var name: String = ""
- var price: Int = 0
- var surplus: Int = 0
+ var price: Double = 0
+ var surplus: Int?
var total: Int = 0
var type: Int = 0
var typeIds: String = ""
var updateBy: String = ""
var updateTime: String = ""
- var userCount: Int = 0
+ var userCount: Int?
}
struct MarketTypeModel:HandyJSON,Hashable{
@@ -111,6 +111,7 @@
var good: MarketModel?
var goodTypes = [MarketTypeModel]()
var orderNumber: String = ""
+ var residueNumber:Int?
var recipient: MarketRecipientModel?
}
@@ -135,6 +136,7 @@
var updateBy: String = ""
var updateTime: String = ""
var userId: Int = 0
+ var orderId:Int = 0
}
struct AddressTreeModel:HandyJSON{
@@ -178,6 +180,7 @@
var insertTime: String = ""
var integral: Int = 0
var orderNumber: String = ""
+ var orderId:Int = 0
var state: Int = 0 //订单状态1待发货2已发货3已完成
var updateBy: String = ""
var updateTime: String = ""
@@ -195,14 +198,15 @@
struct StudyGamesRecordModel:HandyJSON{
var accuracy: Int = 0
var createBy: String = ""
- var createTime: String = ""
+ var time = ""
+// var createTime: String = ""
var disabled: Bool = false
var gameDifficulty: Int = 0
var gameId: Int = 0
var gameName: String = ""
var id: Int = 0
var updateBy: String = ""
- var updateTime: String = ""
+// var updateTime: String = ""
var userId: Int = 0
var useTime: Int = 0
}
@@ -237,6 +241,7 @@
var totalIntegral = 0
var type = 0
var week = 0
+ var canStudy = 0
}
class ListenNewModel:HandyJSON{
@@ -264,6 +269,16 @@
required init(){}
}
+
+struct TeamScheduleModel:HandyJSON{
+ var answerNumber = 0
+ var correctNumber = 0
+ var teamIds = [Int]() //题组ids
+ var topicIds = [Int]() //已回答正确的题目Id
+ var schedule = 0
+}
+
+
struct Listen1DataModel:HandyJSON{
var createBy: String = ""
var createTime: String = ""
@@ -283,6 +298,9 @@
var time = 0
var count = 0
var lookIntegral = 0
+
+ //custom
+ var playNow:Bool = false //立刻播放
}
@@ -323,6 +341,9 @@
//游戏类型2专用
var isOpen:Bool = false
+
+ // 自主学习1,3专用 (是否已回答)
+ var isAnster:Bool = false
}
@available(*,deprecated,message: "废弃")
@@ -348,7 +369,9 @@
var week: Int = 0
}
-struct StudyScheduleModel:HandyJSON{
+struct StudyScheduleModel:HandyJSON,Hashable{
+ init() {}
+
var answer: Int = 0
var day: Int = 0
var computeSchedule:Int = 0
@@ -364,6 +387,11 @@
var userId: Int = 0
var week: Int = 0
var weekStudy: Int = 0
+ var gameDifficulty:Int = 0
+
+ var hashValue: Int{
+ return answer+day+computeSchedule+induction+listen+look+monthStudy+pair+todayStudy+totalStudy+week+weekStudy+gameDifficulty
+ }
}
class SimpleListenDataModel:HandyJSON,Hashable{
@@ -403,3 +431,17 @@
var updateBy: String = ""
var updateTime: String = ""
}
+
+struct ShareInfoModel:HandyJSON{
+ var title = ""
+ var phone = ""
+ var img = ""
+}
+
+struct VIPInfoModel:HandyJSON{
+ var id = 0
+ var info = ""
+ var isVip = 0
+ var time = 0
+ var amount = 0
+}
--
Gitblit v1.7.1