From f646fbebad928833d15546a36e37768d00fe6173 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期三, 16 四月 2025 16:39:18 +0800
Subject: [PATCH] fix

---
 WanPai/Model/CommonModels.swift |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/WanPai/Model/CommonModels.swift b/WanPai/Model/CommonModels.swift
index e29f94c..3e83ec8 100644
--- a/WanPai/Model/CommonModels.swift
+++ b/WanPai/Model/CommonModels.swift
@@ -102,16 +102,16 @@
 				var birthday = ""
 				var headImg = ""
 				var height:Double = 0
-				var idCard:String?
+				var idCard:String = ""
 				var name = ""
-				var phone:String?
+				var phone:String = ""
 				var sex:GenderType = .man
 				var weight:Double = 0
 
 				var stuId:Int?
 }
 
-struct StudentProfile1Model:HandyJSON{
+struct StudentProfile1Model:HandyJSON,Hashable{
 				var birthday = ""
 				var isNot = 2 //1. 是默认 2. 不是默认
 				var stuAge:Int = 0
@@ -245,7 +245,7 @@
 				var storeCoverDrawing = ""
 }
 
-struct ActivityDetailPartModel:HandyJSON{
+struct ActivityDetailPartModel:HandyJSON,Hashable{
 				var age = 0
 				var id = 0
 				var idcard = ""
@@ -980,5 +980,101 @@
 				var isBind = 0
 }
 
+struct HuiminCardModel:HandyJSON{
+    var cardList = [HuiminCardItemModel]()
+    var introduce:String = ""
+    var showType = 0 //1展示富文本内容 2展示惠民卡列表
+}
+
+struct HuiminCardItemModel:HandyJSON{
+    var cover = ""
+    var id = 0
+    var isBuy = 0
+}
+
+struct HuiminCardDetailModel:HandyJSON{
+    var agreementSettings = [HuiminCardDetailAgreementModel]()
+    var banner: String = ""
+    var buyCover: String = ""
+    var buyRemark: String = ""
+    var endTime: String = ""
+    var grantCount: Int = 0
+    var huiMinName: String = ""
+    var huiMinType: Int = 0
+    var id: Int = 0
+    var introduce: String = ""
+    var qrCode:String = ""
+    var isBuy: Int = 0
+    var limitCount: Int = 0
+    var salesMoney: Double = 0
+    var sort: String = ""
+    var startTime: String = ""
+    var status: Int = 0
+    var storeId: Int = 0
+    var unBuyCover: String = ""
+    var unBuyRemark: String = ""
+    var unUseTimes: String = ""
+    var useIds: String = ""
+    var useScope: Int = 0
+    var useTimes: String = ""
+    var useWeeks: String = ""
+}
+
+struct HuiminCardDetailAgreementModel:HandyJSON {
+    var agreementContent: String = ""
+    var agreementId: Int = 0
+    var agreementName: String = ""
+    var id: Int = 0
+}
+
+struct HuiminCardMyItemModel:HandyJSON{
+    var cardId: Int = 0
+    var cover = ""
+    var endTime = ""
+    var id: Int = 0
+    var isExpire: Int = 0 //是否过期 0否1是
+    var isRefund: Int = 0 //是否可以退款 0否1是2退款中
+    var paymentTime = ""
+    var status: Int = 0 //状态1待支付2使用中3已退款
+    var salesMoney:Double = 0
+    var studentId = ""
+    var studentList = [HuiminCardItemStuModel]()
+}
+
+struct HuiminCardItemStuModel:HandyJSON{
+    var appUserId: Int = 0
+    var birthday:String = ""
+    var bmi: Int = 0
+    var headImg:String = ""
+    var height: Int = 0
+    var id: Int = 0
+    var idCard:String = ""
+    var insertTime:String = ""
+    var isDefault: Int = 0
+    var lateralSurface:String = ""
+    var name:String = ""
+    var phone:String = ""
+    var sex: Int = 0
+    var state: Int = 0
+    var weight: Int = 0
+}
+
+struct HuiminCardDetail_1_Model:HandyJSON{
+    var cardId: Int = 0
+    var endTime: String = ""
+    var huiminCard: HuiminCardDetailModel?
+    var introduce: String = ""
+    var qrCode: String = ""
+    var studentList = [HuiminCardItemStuModel]()
+}
+
+struct HuiminCardRuleInfoModel:HandyJSON{
+    var addUserRemark = ""
+    var id = 0
+    var selectUserRemark = ""
+    var storeNoHuiminCardIntro = ""
+}
+
+
 
 

--
Gitblit v1.7.1