Commit 9c922a92 authored by Steven杜宇's avatar Steven杜宇

// 我的入口

parent 445973ae
...@@ -13,7 +13,8 @@ enum YHFunctionGroupType: Int { ...@@ -13,7 +13,8 @@ enum YHFunctionGroupType: Int {
case none = 0 case none = 0
case score = 1 case score = 1
case orderAndService = 2 case orderAndService = 2
case others = 3 case resource = 3
case others = 4
} }
class YHFunctionGroupInfo { class YHFunctionGroupInfo {
...@@ -63,6 +64,8 @@ class YHMyNewViewController: YHBaseViewController { ...@@ -63,6 +64,8 @@ class YHMyNewViewController: YHBaseViewController {
[weak self] in [weak self] in
guard let self = self else { return } guard let self = self else { return }
if !checkLogin() { return } if !checkLogin() { return }
enterMyNameCard()
// enterUserInfoEditPage() // enterUserInfoEditPage()
} }
...@@ -215,6 +218,7 @@ class YHMyNewViewController: YHBaseViewController { ...@@ -215,6 +218,7 @@ class YHMyNewViewController: YHBaseViewController {
var scoreGroupArr: [PersonalModuleItem] = [] var scoreGroupArr: [PersonalModuleItem] = []
var serviceGroupArr: [PersonalModuleItem] = [] var serviceGroupArr: [PersonalModuleItem] = []
var resourcesArr: [PersonalModuleItem] = []
var otherGroupArr: [PersonalModuleItem] = [] var otherGroupArr: [PersonalModuleItem] = []
// 我的名片 // 我的名片
...@@ -266,6 +270,20 @@ class YHMyNewViewController: YHBaseViewController { ...@@ -266,6 +270,20 @@ class YHMyNewViewController: YHBaseViewController {
serviceGroupArr.append(item) serviceGroupArr.append(item)
} }
// 社区资源
do {
let item = PersonalModuleItem(icon: "mine_item_card", title: "我的名片".local, type: .myCard)
resourcesArr.append(item)
let item2 = PersonalModuleItem(icon: "mine_item_friend", title: "我的好友".local, type: .myFriend)
resourcesArr.append(item2)
let item3 = PersonalModuleItem(icon: "mine_item_enterprise", title: "我的企业".local, type: .myEnterprise)
resourcesArr.append(item3)
}
// 其他功能 // 其他功能
do { do {
let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type: .myMessage) let item = PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type: .myMessage)
...@@ -289,11 +307,13 @@ class YHMyNewViewController: YHBaseViewController { ...@@ -289,11 +307,13 @@ class YHMyNewViewController: YHBaseViewController {
let scoreGroup = YHFunctionGroupInfo(type: .score, title: "", arr: scoreGroupArr) let scoreGroup = YHFunctionGroupInfo(type: .score, title: "", arr: scoreGroupArr)
let serviceGroup = YHFunctionGroupInfo(type: .orderAndService, title: "订单与服务", arr: serviceGroupArr) let serviceGroup = YHFunctionGroupInfo(type: .orderAndService, title: "订单与服务", arr: serviceGroupArr)
let resourceGroup = YHFunctionGroupInfo(type: .orderAndService, title: "社区资源", arr: resourcesArr)
let otherGroup = YHFunctionGroupInfo(type: .others, title: "其他功能", arr: otherGroupArr) let otherGroup = YHFunctionGroupInfo(type: .others, title: "其他功能", arr: otherGroupArr)
functionGroupArr.removeAll() functionGroupArr.removeAll()
functionGroupArr.append(scoreGroup) functionGroupArr.append(scoreGroup)
functionGroupArr.append(serviceGroup) functionGroupArr.append(serviceGroup)
functionGroupArr.append(resourceGroup)
functionGroupArr.append(otherGroup) functionGroupArr.append(otherGroup)
tableView.reloadData() tableView.reloadData()
......
...@@ -37,6 +37,8 @@ enum YHPersonalModuleItemType: Int { ...@@ -37,6 +37,8 @@ enum YHPersonalModuleItemType: Int {
case myOrder // 我的订单 双十一订单入口 case myOrder // 我的订单 双十一订单入口
case mycart // 我的订单 双十一订单入口 case mycart // 我的订单 双十一订单入口
case serviceStep case serviceStep
case myFriend
case myEnterprise
// case liveEntryTest //直播入口 // case liveEntryTest //直播入口
} }
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "mine_item_card@2x.png", "filename" : "Frame@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "mine_item_card@3x.png", "filename" : "Frame@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Frame@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Frame@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Frame@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Frame@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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