Commit a35fa39b authored by lujunye's avatar lujunye

界面完成

parent 3a5cfddb
...@@ -12,6 +12,7 @@ import SwiftyJSON ...@@ -12,6 +12,7 @@ import SwiftyJSON
class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource, GeliAlertTextViewDelegate ,DZSH_Two_Btn_Cell_Delegate, Location_Cell_Delegate, DZSH_UPLOAD_IMG_CELL_Delegate, UIPickerViewDataSource, UIPickerViewDelegate, DZSH_Date_Cell_Delegate, GLAlertSelectViewDelegate, OnlyTimeSelectView_Delegate{ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource, GeliAlertTextViewDelegate ,DZSH_Two_Btn_Cell_Delegate, Location_Cell_Delegate, DZSH_UPLOAD_IMG_CELL_Delegate, UIPickerViewDataSource, UIPickerViewDelegate, DZSH_Date_Cell_Delegate, GLAlertSelectViewDelegate, OnlyTimeSelectView_Delegate{
var work_time_str = "09:00~18:00" var work_time_str = "09:00~18:00"
var get_time_str = "09:00~18:00"
func OnlyTimeSelectView_submitAction(view: OnlyTimeSelectView, sh: Int, sm: Int, eh: Int, em: Int) { func OnlyTimeSelectView_submitAction(view: OnlyTimeSelectView, sh: Int, sm: Int, eh: Int, em: Int) {
timeSelect_view!.removeFromSuperview() timeSelect_view!.removeFromSuperview()
timeSelect_view = nil timeSelect_view = nil
...@@ -35,8 +36,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -35,8 +36,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
if s4.count == 1 { if s4.count == 1 {
s4 = "0" + StringByInt(number: em) s4 = "0" + StringByInt(number: em)
} }
work_time_str = s1 + ":" + s2 + "~" + s3 + ":" + s4 work_time_str = s1 + ":" + s2 + "~" + s3 + ":" + s4
}else{
} }
list_view.reloadData() list_view.reloadData()
...@@ -181,17 +183,28 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -181,17 +183,28 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
var show_logo = true var show_logo = true
var phone_str = ""//电话 var phone_str = ""//电话
var size_str = ""//规模
var intro_str = ""//公司简介
var logo_url_str = ""//logo连接 var logo_url_str = ""//logo连接
var part2 = ["联系人选择","联系人姓名","负责人身份证"] var part2 = ["自提时间","联系电话","自提地址"]
var conect_num_str = ""//联系人选择 var connect_number = ""//联系人选择
var conect_name = "" //联系人 var get_product_adr = ""//自提地址
var conect_id_url_str = ""//联系人身份证连接 var conect_id_url_str = ""//联系人身份证连接
var part3 = ["营业执照号","法定经营范围","营业执照电子版","流通许可证"] var part3 = ["公司电话","公司规模","公司简介","联系人姓名","电子邮箱"]
var size_str = ""//规模
var company_phone = ""//公司电话
var intro_str = ""//公司简介
var connect_name = "" //联系人
var mail_str = ""//电子邮箱
var part4 = ["营业执照号","法定经营范围","负责人身份证","入驻协议","营业执照电子版","流通许可证"]
var zhizhao_str = ""//执照号 var zhizhao_str = ""//执照号
var jing_ying_fan_wei_str = ""//经营范围 var jing_ying_fan_wei_str = ""//经营范围
var zhizhao_url_str = ""//营业执照连接 var zhizhao_url_str = ""//营业执照连接
...@@ -296,10 +309,10 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -296,10 +309,10 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
size_str = (model?.shop_scale)! size_str = (model?.shop_scale)!
} }
if model?.contacts_phone != nil { if model?.contacts_phone != nil {
conect_num_str = (model?.contacts_phone)! connect_number = (model?.contacts_phone)!
} }
if model?.contacts_name != nil { if model?.contacts_name != nil {
conect_name = (model?.contacts_name)! connect_name = (model?.contacts_name)!
} }
if model?.identity_card_front != nil { if model?.identity_card_front != nil {
conect_id_url_str = (model?.identity_card_front)! conect_id_url_str = (model?.identity_card_front)!
...@@ -382,32 +395,21 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -382,32 +395,21 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
} }
} }
return 100 return 100
case 3:
if indexPath.row == 0 {
return 100
}
case 4:
if indexPath.row == 2 {
return UITableView.automaticDimension
}
case 5:
if indexPath.row > 1 {
return 183.5
}
default: default:
break break
} }
// switch indexPath.section {
// case 1:
// if indexPath.row == 4 {
// return UITableView.automaticDimension
// }
// if indexPath.row == 6 {
// return 237
// }
// case 2:
// if indexPath.row == 2 {
// return 183.5
// }
// case 3:
//// if indexPath.row == 1 {
//// return UITableView.automaticDimension
//// }
// if indexPath.row > 1 {
// return 183.5
// }
// default:
// return 183.5
// }
return 49 return 49
} }
...@@ -547,113 +549,117 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -547,113 +549,117 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.timeLbl.text = work_time_str cell.timeLbl.text = work_time_str
return cell return cell
} }
case 3:
if indexPath.row == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_Date_Cell") as! DZSH_Date_Cell
cell.nameLbl.text = part2[indexPath.row]
cell.tag = 32
cell.delegate = self
cell.indexPath = indexPath
cell.startDateLbl.text = date_arr[startDayIdx]
cell.endDateLbl.text = date_arr[endDayIdx]
cell.timeLbl.text = get_time_str
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.placeholder = "等待填写"
cell.nameLbl.text = part2[indexPath.row]
switch indexPath.row {
case 1:
cell.textTF.text = connect_number
break
case 2:
cell.textTF.text = get_product_adr
break
default:
break
}
return cell
case 4:
if indexPath.row == 2 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.imgRight.constant = 0
cell.nameLbl.text = part3[indexPath.row]
if intro_str.count == 0 {
cell.contentLbl.text = "等待填写"
cell.contentLbl.textColor = UIColor(named: "提示语字体颜色")
}else{
cell.contentLbl.text = intro_str
cell.contentLbl.textColor = UIColor(named: "标题字颜色")
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.placeholder = "等待填写"
cell.nameLbl.text = part3[indexPath.row]
switch indexPath.row {
case 0:
cell.textTF.text = company_phone
break
case 1:
cell.textTF.text = size_str
break
case 3:
cell.textTF.text = connect_name
break
case 4:
cell.textTF.text = mail_str
break
default: default:
break break
} }
return cell
case 5:
if indexPath.row > 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_Upload_Cer_Cell") as! DZSH_Upload_Cer_Cell
cell.nameLbl.text = part4[indexPath.row]
switch indexPath.row {
case 2:
if (conect_id_url_str.count > 0) {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + conect_id_url_str))
}else{
cell.img_view.image = UIImage(named: "upload_1")
}
break
case 3:
if ruzhu_url_str.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + ruzhu_url_str))
}else{
cell.img_view.image = UIImage(named: "upload_1")
}
break
case 4:
if zhizhao_url_str.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + zhizhao_url_str))
}else{
cell.img_view.image = UIImage(named: "upload_1")
}
break
default:
if xuke_url_str.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + xuke_url_str))
}else{
cell.img_view.image = UIImage(named: "upload_1")
}
break
}
return cell
}
default:
break
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.placeholder = "等待填写" cell.textTF.placeholder = "等待填写"
cell.nameLbl.text = part4[indexPath.row]
if indexPath.row == 0 {
cell.textTF.text = zhizhao_str
}else{
cell.textTF.text = jing_ying_fan_wei_str
}
return cell return cell
// switch indexPath.section {
// case 1://公司信息
// cell.nameLbl.text = part1[indexPath.row]
// switch indexPath.row {
// case 0:
// cell.textTF.text = name
// break
// case 1:
// cell.textTF.text = adr_str
// break
// case 2:
// cell.textTF.text = phone_str
// break
// case 3:
// cell.textTF.text = size_str
// break
// case 5:
// cell.textTF.text = type_str
// break
// default:
// break
// }
// if indexPath.row == 4 {
// let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
// cell.imgRight.constant = 0
// cell.nameLbl.text = part1[indexPath.row]
// if intro_str.count == 0 {
// cell.contentLbl.text = "等待填写"
// cell.contentLbl.textColor = UIColor(named: "提示语字体颜色")
// }else{
// cell.contentLbl.text = intro_str
// cell.contentLbl.textColor = UIColor(named: "标题字颜色")
// }
// return cell
// }
// if indexPath.row == 6 {
// let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_UPLOAD_IMG_CELL") as! DZSH_UPLOAD_IMG_CELL
// cell.nameLbl.text = part1[indexPath.row]
// cell.bottom_lbl.isHidden = false
// if logo_url_str.count > 0 {
// cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + logo_url_str))
// }else{
// cell.img_view.image = UIImage(named: "shangchuantupian")
// }
// return cell
// }
// case 2:
// cell.nameLbl.text = part2[indexPath.row]
// if indexPath.row == 0{
// cell.textTF.text = conect_num_str
// }
// if indexPath.row == 1{
// cell.textTF.text = conect_name
// }
// if indexPath.row == 2 {
// let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_Upload_Cer_Cell") as! DZSH_Upload_Cer_Cell
// cell.nameLbl.text = part2[indexPath.row]
// if (conect_id_url_str.count > 0) {
// cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + conect_id_url_str))
// }else{
// cell.img_view.image = UIImage(named: "upload_1")
// }
// return cell
// }
// break
// case 3:
// cell.nameLbl.text = part3[indexPath.row]
// if indexPath.row == 0 {
// cell.textTF.text = zhizhao_str
// }
// if indexPath.row == 1 {
// cell.textTF.text = jing_ying_fan_wei_str
// }
// if indexPath.row > 1 {
// let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_Upload_Cer_Cell") as! DZSH_Upload_Cer_Cell
// cell.nameLbl.text = part3[indexPath.row]
// var url = zhizhao_url_str
// if indexPath.row == 3 {
// url = xuke_url_str
// }
// if url.count > 0 {
// cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + url))
// }else{
// cell.img_view.image = UIImage(named: "upload_1")
// }
// return cell
// }
// break
// default:
// let cell = tableView.dequeueReusableCell(withIdentifier: "DZSH_Upload_Cer_Cell") as! DZSH_Upload_Cer_Cell
// cell.nameLbl.text = "商家入驻协议"
// if ruzhu_url_str.count > 0 {
// cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + ruzhu_url_str))
// }else{
// cell.img_view.image = UIImage(named: "upload_1")
// }
// return cell
// }
//
// return cell
} }
...@@ -669,6 +675,16 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -669,6 +675,16 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
if indexPath.row == 1 { if indexPath.row == 1 {
} }
break break
case 4:
if indexPath.row == 2 {
let alterView = GeliAlertTextView(frame: self.view.window!.bounds)
alterView.tag = 4
alterView.delegate = self
alterView.titleLbl.text = "请填写公司简介"
alterView.placerLbl.text = "请填写公司简介..."
alterView.content = intro_str
self.view.window?.addSubview(alterView)
}
default: default:
break break
} }
...@@ -784,7 +800,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -784,7 +800,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
"shop_tel":phone_str as Any, "shop_tel":phone_str as Any,
"shop_intro":intro_str as Any, "shop_intro":intro_str as Any,
"shop_scale":size_str as Any, "shop_scale":size_str as Any,
"contacts_name":conect_name as Any, "contacts_name":connect_name as Any,
"identity_card_front":conect_id_url_str as Any, "identity_card_front":conect_id_url_str as Any,
"agreement":ruzhu_url_str as Any, "agreement":ruzhu_url_str as Any,
"business_licence_number":zhizhao_str as Any, "business_licence_number":zhizhao_str as Any,
...@@ -822,9 +838,6 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -822,9 +838,6 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
case 4://公司简介 case 4://公司简介
intro_str = sender intro_str = sender
break break
// case 11:
// jing_ying_fan_wei_str = sender
// break
default: default:
break break
} }
...@@ -866,6 +879,27 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -866,6 +879,27 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
} }
} }
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if section == 3 {
let view = UIView(frame: CGRect(x: 0, y: 0, width: ScreenWidth, height: 36))
view.backgroundColor = UIColor.white
let lbl = UILabel(frame: CGRect(x: 15, y: 15, width: 100, height: 15))
lbl.text = "自提信息"
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont(name: "PingFangSC-Medium", size: 15)
view.addSubview(lbl)
return view
}
return UIView()
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
if section == 3 {
return 36
}
return 0.000001
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? { func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView() return UIView()
} }
......
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