From 6f7f02d5c8880ff670b2c694fe61f5af5a6e3e36 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期四, 06 六月 2024 18:56:52 +0800
Subject: [PATCH] fix

---
 DolphinEnglishLearnStudent/Models/CommonModel.swift |   85 +++++++++++++++++++++++++++++++++++++-----
 1 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/DolphinEnglishLearnStudent/Models/CommonModel.swift b/DolphinEnglishLearnStudent/Models/CommonModel.swift
index b41fefc..f9b7941 100644
--- a/DolphinEnglishLearnStudent/Models/CommonModel.swift
+++ b/DolphinEnglishLearnStudent/Models/CommonModel.swift
@@ -173,14 +173,17 @@
 				var expressNumber: String = ""
 				var expressTime: String = ""
 				var goodsId: Int = 0
+				var goodsName: String = ""
 				var id: Int = 0
 				var insertTime: String = ""
 				var integral: Int = 0
 				var orderNumber: String = ""
-				var state: Int = 0
+				var state: Int = 0 //订单状态1待发货2已发货3已完成
 				var updateBy: String = ""
 				var updateTime: String = ""
 				var userId: Int = 0
+				var goodsType = [String]()
+				var coverImg:String = ""
 }
 
 struct StudyGamesModel:HandyJSON{
@@ -191,23 +194,23 @@
 
 struct StudyGamesRecordModel:HandyJSON{
 				var accuracy: Int = 0
-				var createBy: String?
-				var createTime: String?
+				var createBy: String = ""
+				var createTime: String = ""
 				var disabled: Bool = false
 				var gameDifficulty: Int = 0
 				var gameId: Int = 0
-				var gameName: String?
+				var gameName: String = ""
 				var id: Int = 0
-				var updateBy: String?
-				var updateTime: String?
+				var updateBy: String = ""
+				var updateTime: String = ""
 				var userId: Int = 0
 				var useTime: Int = 0
 }
 
 struct StudyDataRecordModel:HandyJSON{
 				var answer: Int = 0
-				var createBy: String?
-				var createTime: String?
+				var createBy: String = ""
+				var createTime: String = ""
 				var day: Int = 0
 				var disabled: Bool = false
 				var id: Int = 0
@@ -219,8 +222,8 @@
 				var surplus: Int = 0
 				var todayStudy: Int = 0
 				var totalStudy: Int = 0
-				var updateBy: String?
-				var updateTime: String?
+				var updateBy: String = ""
+				var updateTime: String = ""
 				var userId: Int = 0
 				var week: Int = 0
 				var weekStudy: Int = 0
@@ -235,3 +238,65 @@
 				var type = 0
 				var week = 0
 }
+
+class Listen1Model:HandyJSON{
+				var data:Listen1DataModel?
+				var subjectList = [Listen1SubModel]()
+
+				required init(){}
+}
+struct Listen1DataModel:HandyJSON{
+				var createBy: String = ""
+				var createTime: String = ""
+				var day: Int = 0
+				var disabled: Bool = false
+				var id: Int = 0
+				var integral: Int = 0
+				var isVip: Int = 0
+				var studyId: Int = 0
+				var subject: String = ""
+				var updateBy: String = ""
+				var updateTime: String = ""
+				var week: Int = 0
+}
+
+class Listen1SubModel:HandyJSON{
+
+				required init() {}
+
+				var correct: String = ""
+				var createBy: String = ""
+				var createTime: String = ""
+				var disabled: Bool = false
+				var english: String = ""
+				var error: String = ""
+				var id: Int = 0
+				var img: String = ""
+				var name: String = ""
+				var state: Int = 0
+				var type: String = ""
+				var updateBy: String = ""
+				var updateTime: String = ""
+}
+
+struct Listen4Model:HandyJSON{
+				var data = [Listen4DataModel]()
+}
+
+struct Listen4DataModel:HandyJSON{
+				var answerSubject: Int = 0
+				var createBy: String = ""
+				var createTime: String = ""
+				var day: Int = 0
+				var disabled: Bool = false
+				var id: Int = 0
+				var integral: Int = 0
+				var isAnswer: Int = 0
+				var isVip: Int = 0
+				var studyId: Int = 0
+				var subject: Int = 0
+				var subjectList = [Listen1SubModel]()
+				var updateBy: String = ""
+				var updateTime: String = ""
+				var week: Int = 0
+}

--
Gitblit v1.7.1