Skip to content

G
GeliBusinessPlatform
Commit 3fcb1bbd authored by lujunye's avatar lujunye
Browse files
Options

asdf/als,dfasdf',

parent 9996f131
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 201 deletions
GeliBusinessPlatform/ViewController/店长审核/DZSH_Date_Cell.xib
View file @ 3fcb1bbd
......@@ -85,8 +85,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="l45-ay-mKC">
<rect key="frame" x="247.5" y="43" width="110" height="37"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="09:00~18:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCZ-bO-MXw">
<rect key="frame" x="18.5" y="9.5" width="73.5" height="18.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="09:00-18:00" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vCZ-bO-MXw">
<rect key="frame" x="17.5" y="9.5" width="75" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
......
GeliBusinessPlatform/ViewController/店长审核/DZSH_Detail_ViewController.swift
View file @ 3fcb1bbd
......@@ -11,19 +11,70 @@ import Photos
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,DZSH_Upload_Cer_Cell_Delegate, TitleAndTFCellDelegate, CLLocationManagerDelegate{
var shop_id = -1
var user_token = ""
var part0 = ["是否清真","用户类型","店铺类型",""]
var is_qz = false
var kd = true
var shop_type = 9//类型
var type_arr:Array<String> = []
var shop_longitude = ""
var shop_latitude = ""
var part1 = ["公司名称","公司简称","关联专区展示","公司所在地","公司详细地址"]
var shop_name = ""//公司名
var adr_str = ""//地址
var show_abbre = true//显示简称 1是 0否
var abbreviation = ""//简称1
var sparea_ids = ""//关联专区
var show_logo = true
var logo_word = ""//简称2
var business_week_start = 1
var business_week_end = 5
var pickup_start_day = 1
var pickup_end_day = 5
var shop_img = ""//logo连接
var part2 = ["自提时间","联系电话","自提地址"]
var pickup_phone = ""//联系人选择
var pickup_address = ""//自提地址
var part3 = ["公司电话","公司规模","公司简介","联系人姓名","电子邮箱"]
var shop_scale = ""//规模
var shop_tel = ""//公司电话
var shop_intro = ""//公司简介
var contacts_name = "" //联系人
var shop_email = ""//电子邮箱
var part4 = ["营业执照号","法定经营范围","负责人身份证","入驻协议","营业执照电子版","流通许可证"]
var business_licence_number = ""//执照号
var identity_card_front = ""//联系人身份证连接
var business_sphere = ""//经营范围
var zhizhao = ""//营业执照连接
var food_production_license = ""//流通许可连接
var agreement = ""//入驻连接
var action = -1 //1为审核通过，2为审核不通过，3为审核通过待补齐资料
var manger:CLLocationManager = CLLocationManager()
func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
manger.stopUpdatingLocation()
let location = locations.last
let coo = JZLocationConverter.wgs84(toGcj02: CLLocationCoordinate2D(latitude: (location?.coordinate.latitude)!, longitude: (location?.coordinate.longitude)!))
lat = "\(coo.latitude)"
lng = "\(coo.longitude)"
shop_latitude = "\(coo.latitude)"
shop_longitude = "\(coo.longitude)"
list_view.reloadData()
}
var work_time_str = "09:00~18:00"
var get_time_str = "09:00~18:00"
var business_hours = "09:00-18:00"
var pickup_hours = "09:00-18:00"
func OnlyTimeSelectView_submitAction(view: OnlyTimeSelectView, sh: Int, sm: Int, eh: Int, em: Int) {
timeSelect_view!.removeFromSuperview()
timeSelect_view = nil
......@@ -47,9 +98,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
s4 = "0" + StringByInt(number: em)
}
if view.tag == 99 {//营业时间
work_time_str = s1 + ":" + s2 + "~" + s3 + ":" + s4
business_hours = s1 + ":" + s2 + "-" + s3 + ":" + s4
}else{
get_time_str = s1 + ":" + s2 + "~" + s3 + ":" + s4
pickup_hours = s1 + ":" + s2 + "-" + s3 + ":" + s4
}
list_view.reloadData()
......@@ -64,19 +115,19 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
print(view.tag)
switch view.tag {
case 0:
type_num = selectNum
shop_type = selectNum
break
case 22:
startDayIdx = selectNum
business_week_start = selectNum
break
case 23:
endDayIdx = selectNum
business_week_end = selectNum
break
case 30:
getProdutStart = selectNum
pickup_start_day = selectNum
break
case 31:
getProductEnd = selectNum
pickup_end_day = selectNum
default:
break
}
......@@ -87,11 +138,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
var date_arr = ["星期天","星期一","星期二","星期三","星期四","星期五","星期六"]
var glSelectView:GLAlertSelectView?
var startDayIdx = 1
var endDayIdx = 5
var getProdutStart = 1
var getProductEnd = 5
var timeSelect_view:OnlyTimeSelectView?
func DZSH_Date_Cell_SelectAction(sender: UIButton, cell: DZSH_Date_Cell) {
......@@ -106,9 +153,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
view.dataArr = date_arr
view.is_center_select = true
if cell.tag < 30 {
view.selectNum = startDayIdx
view.selectNum = business_week_start
}else{
view.selectNum = getProdutStart
view.selectNum = pickup_start_day
}
self.view.addSubview(view)
glSelectView = view
......@@ -123,9 +170,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
view.dataArr = date_arr
view.is_center_select = true
if cell.tag < 30 {
view.selectNum = endDayIdx
view.selectNum = business_week_end
}else{
view.selectNum = getProductEnd
view.selectNum = pickup_end_day
}
self.view.addSubview(view)
glSelectView = view
......@@ -153,18 +200,18 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
}
func DZSH_UPLOAD_IMG_CELL_Input(str: String, cell: DZSH_UPLOAD_IMG_CELL) {
if cell.tag == 11 {
short_name = str
abbreviation = str
}
if cell.tag == 21 {//公司简称/logo
short_name = str
abbreviation = str
}
}
func DZSH_UPLOAD_IMG_CELL_Btn_Action(select: Int, cell: DZSH_UPLOAD_IMG_CELL) {
if cell.tag == 11 {
is_show = false
show_abbre = false
if select == 1 {
is_show = true
show_abbre = true
}
}
......@@ -184,78 +231,29 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
func Location_Cell_input_tf(idx: Int, str: String) {
if idx == 0 {
lat = str
shop_latitude = str
}else{
lng = str
shop_longitude = str
}
}
func DZSH_Two_Btn_Cell_Click_Action(select: Int, cell: DZSH_Two_Btn_Cell) {
if cell.tag == 0 {
is_Qing_Zhen = true
is_qz = true
if select == 0 {
is_Qing_Zhen = false
is_qz = false
}
}else{
is_Personal = true
kd = true
if select == 0 {
is_Personal = false
kd = false
}
}
}
var shop_id = -1
var user_token = ""
var part0 = ["是否清真","用户类型","店铺类型",""]
var is_Qing_Zhen = false
var is_Personal = true
var type_num = 9//类型
var type_arr = ["扶贫商店","其他类型","生产基地合作社","扶贫基地","社区生鲜店/菜市场档口","餐饮店","生产基地","批发商店","工厂","批零中心"]
var lng = ""
var lat = ""
var part1 = ["公司名称","公司简称","关联专区展示","公司所在地","公司详细地址"]
var name = ""//公司名
var adr_str = ""//地址
var is_show = true
var short_name = ""//简称
var show_logo = true
var phone_str = ""//电话
var logo_url_str = ""//logo连接
var part2 = ["自提时间","联系电话","自提地址"]
var connect_number = ""//联系人选择
var get_product_adr = ""//自提地址
var conect_id_url_str = ""//联系人身份证连接
var part3 = ["公司电话","公司规模","公司简介","联系人姓名","电子邮箱"]
var size_str = ""//规模
var company_phone = ""//公司电话
var intro_str = ""//公司简介
var connect_name = "" //联系人
var mail_str = ""//电子邮箱
var part4 = ["营业执照号","法定经营范围","负责人身份证","入驻协议","营业执照电子版","流通许可证"]
var zhizhao_str = ""//执照号
var jing_ying_fan_wei_str = ""//经营范围
var zhizhao_url_str = ""//营业执照连接
var xuke_url_str = ""//流通许可连接
var ruzhu_url_str = ""//入驻连接
var action = -1 //1为审核通过，2为审核不通过，3为审核通过待补齐资料
@IBAction func submit_action(_ sender: Any) {
print("submit")
}
......@@ -338,58 +336,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
let dataModel = data as! storeInfo_model
let model = dataModel.data
if model?.shop_name != nil {
name = (model?.shop_name)!
}
if model?.shop_img != nil {
logo_url_str = (model?.shop_img)!
}
if model?.addr_str != nil {
adr_str = (model?.addr_str)!
}
if model?.shop_tel != nil {
phone_str = (model?.shop_tel)!
}
if model?.shop_intro != nil {
intro_str = (model?.shop_intro)!
}
if model?.shop_scale != nil {
size_str = (model?.shop_scale)!
}
if model?.contacts_phone != nil {
connect_number = (model?.contacts_phone)!
}
if model?.contacts_name != nil {
connect_name = (model?.contacts_name)!
}
if model?.identity_card_front != nil {
conect_id_url_str = (model?.identity_card_front)!
}
if model?.business_licence_number != nil {
zhizhao_str = (model?.business_licence_number)!
}
if model?.business_sphere != nil {
jing_ying_fan_wei_str = (model?.business_sphere)!
}
if model?.zhizhao != nil {
zhizhao_url_str = (model?.zhizhao)!
}
if model?.food_production_license != nil {
xuke_url_str = (model?.food_production_license)!
}
if model?.agreement != nil {
ruzhu_url_str = (model?.agreement)!
}
if model?.province != nil {
provinceIndex = (model?.province)!
}
if model?.city != nil {
cityIndex = (model?.city)!
}
if model?.district != nil {
areaIndex = (model?.district)!
}
getIndex()
self.list_view.reloadData()
......@@ -430,7 +377,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
break
case 1:
if indexPath.row == 1 {
if is_show {
if show_abbre {
return 95
}
}
......@@ -476,7 +423,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.leftBtn.setTitle(" 是", for: .normal)
cell.rightBtn.setTitle(" 否", for: .normal)
if is_Qing_Zhen {
if is_qz {
cell.leftBtn.isSelected = true
cell.rightBtn.isSelected = false
}else{
......@@ -486,7 +433,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
}else{
cell.leftBtn.setTitle(" 个人", for: .normal)
cell.rightBtn.setTitle(" 企业", for: .normal)
if is_Personal {
if kd {
cell.leftBtn.isSelected = true
cell.rightBtn.isSelected = false
}else{
......@@ -498,14 +445,14 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
case 2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
cell.nameLbl.text = part0[indexPath.row]
cell.contentLbl.text = type_arr[type_num]
cell.contentLbl.text = type_arr[shop_type]
cell.btn.isUserInteractionEnabled = false
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "Location_Cell") as! Location_Cell
cell.delegate = self
cell.lng_tf.text = lng
cell.lat_tf.text = lat
cell.lng_tf.text = shop_longitude
cell.lat_tf.text = shop_latitude
return cell
}
case 1:
......@@ -523,12 +470,12 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.titleLbl.text = "公司简称"
cell.leftBtn.isSelected = false
cell.rightBtn.isSelected = true
if is_show {
if show_abbre {
cell.leftBtn.isSelected = true
cell.rightBtn.isSelected = false
}
cell.input_tf.placeholder = "请输入公司简称"
cell.input_tf.text = short_name
cell.input_tf.text = abbreviation
return cell
case 2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
......@@ -551,7 +498,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
}else{
if indexPath.row == 0 {
cell.textTF.placeholder = "等待填写"
cell.textTF.text = name
cell.textTF.text = shop_name
}else{
cell.textTF.placeholder = "等待填写"
cell.textTF.text = adr_str
......@@ -579,14 +526,14 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.input_tf.isHidden = true
cell.bottom_lbl.isHidden = false
cell.img_view.isHidden = false
if logo_url_str.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + logo_url_str))
if shop_img.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + shop_img))
}else{
cell.img_view.image = UIImage(named: "shangchuantupian")
}
}
cell.input_tf.placeholder = "请输入店铺简称"
cell.input_tf.text = short_name
cell.input_tf.text = abbreviation
return cell
}
if indexPath.row == 1 {
......@@ -595,9 +542,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.tag = 22
cell.delegate = self
cell.indexPath = indexPath
cell.startDateLbl.text = date_arr[startDayIdx]
cell.endDateLbl.text = date_arr[endDayIdx]
cell.timeLbl.text = work_time_str
cell.startDateLbl.text = date_arr[business_week_start]
cell.endDateLbl.text = date_arr[business_week_end]
cell.timeLbl.text = business_hours
return cell
}
case 3:
......@@ -607,9 +554,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.tag = 30
cell.delegate = self
cell.indexPath = indexPath
cell.startDateLbl.text = date_arr[getProdutStart]
cell.endDateLbl.text = date_arr[getProductEnd]
cell.timeLbl.text = get_time_str
cell.startDateLbl.text = date_arr[pickup_start_day]
cell.endDateLbl.text = date_arr[pickup_end_day]
cell.timeLbl.text = pickup_hours
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
......@@ -620,10 +567,10 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.nameLbl.text = part2[indexPath.row]
switch indexPath.row {
case 1:
cell.textTF.text = connect_number
cell.textTF.text = pickup_phone
break
case 2:
cell.textTF.text = get_product_adr
cell.textTF.text = pickup_address
break
default:
break
......@@ -634,11 +581,11 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.imgRight.constant = 0
cell.nameLbl.text = part3[indexPath.row]
if intro_str.count == 0 {
if shop_intro.count == 0 {
cell.contentLbl.text = "等待填写"
cell.contentLbl.textColor = UIColor(named: "提示语字体颜色")
}else{
cell.contentLbl.text = intro_str
cell.contentLbl.text = shop_intro
cell.contentLbl.textColor = UIColor(named: "标题字颜色")
}
return cell
......@@ -651,16 +598,16 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.nameLbl.text = part3[indexPath.row]
switch indexPath.row {
case 0:
cell.textTF.text = company_phone
cell.textTF.text = shop_tel
break
case 1:
cell.textTF.text = size_str
cell.textTF.text = shop_scale
break
case 3:
cell.textTF.text = connect_name
cell.textTF.text = contacts_name
break
case 4:
cell.textTF.text = mail_str
cell.textTF.text = shop_email
break
default:
break
......@@ -675,29 +622,29 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
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))
if (identity_card_front.count > 0) {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + identity_card_front))
}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))
if agreement.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + agreement))
}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))
if zhizhao.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + zhizhao))
}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))
if food_production_license.count > 0 {
cell.img_view?.sd_setImage(with: URL(string:SERVERCE_ImageHost + food_production_license))
}else{
cell.img_view.image = UIImage(named: "upload_1")
}
......@@ -712,9 +659,9 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
cell.textTF.isUserInteractionEnabled = true
cell.nameLbl.text = part4[indexPath.row]
if indexPath.row == 0 {
cell.textTF.text = zhizhao_str
cell.textTF.text = business_licence_number
}else{
cell.textTF.text = jing_ying_fan_wei_str
cell.textTF.text = business_sphere
}
return cell
......@@ -740,7 +687,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
view.delegate = self
view.dataArr = type_arr
view.is_center_select = true
view.selectNum = type_num
view.selectNum = shop_type
self.view.addSubview(view)
glSelectView = view
}
......@@ -758,7 +705,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
alterView.delegate = self
alterView.titleLbl.text = "请填写公司简介"
alterView.placerLbl.text = "请填写公司简介..."
alterView.content = intro_str
alterView.content = shop_intro
self.view.window?.addSubview(alterView)
}
default:
......@@ -787,19 +734,19 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
let shops = [
"shop_id":shop_id as Any,
"shop_name":name as Any,
"shop_img":logo_url_str as Any,
"shop_name":shop_name as Any,
"shop_img":shop_img as Any,
"address":adr_str as Any,
"shop_tel":phone_str as Any,
"shop_intro":intro_str as Any,
"shop_scale":size_str as Any,
"contacts_name":connect_name as Any,
"identity_card_front":conect_id_url_str as Any,
"agreement":ruzhu_url_str as Any,
"business_licence_number":zhizhao_str as Any,
"business_sphere":jing_ying_fan_wei_str as Any,
"zhizhao":zhizhao_url_str as Any,
"food_production_license":xuke_url_str as Any
"shop_tel":shop_tel as Any,
"shop_intro":shop_intro as Any,
"shop_scale":shop_scale as Any,
"contacts_name":contacts_name as Any,
"identity_card_front":identity_card_front as Any,
"agreement":agreement as Any,
"business_licence_number":business_licence_number as Any,
"business_sphere":business_sphere as Any,
"zhizhao":zhizhao as Any,
"food_production_license":food_production_license as Any
]
let shops_info = dictChangeString(sender:shops)
let dic = ["user_token":user_token as Any,
......@@ -829,7 +776,7 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
}
return
case 4://公司简介
intro_str = sender
shop_intro = sender
break
default:
break
......@@ -848,19 +795,19 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
print("图片上传成功\(dataM.data?.url)")
switch tag {
case 21:
self.logo_url_str = (dataM.data?.url)!
self.shop_img = (dataM.data?.url)!
break
case 52:
self.conect_id_url_str = (dataM.data?.url)!
self.identity_card_front = (dataM.data?.url)!
break
case 53:
self.ruzhu_url_str = (dataM.data?.url)!
self.agreement = (dataM.data?.url)!
break
case 54:
self.zhizhao_url_str = (dataM.data?.url)!
self.zhizhao = (dataM.data?.url)!
break
case 55:
self.xuke_url_str = (dataM.data?.url)!
self.food_production_license = (dataM.data?.url)!
break
default:
break
......@@ -1224,37 +1171,34 @@ class DZSH_Detail_ViewController: BaseViewController,UITableViewDelegate,UITable
func textFieldContent(content: String, cell: TitleAndTFCell) {
switch cell.tag {
case 10:
name = content
shop_name = content
break
case 14:
adr_str = content
break
case 31:
connect_number = content
pickup_phone = content
break
case 32:
get_product_adr = content
break
case 33:
phone_str = content
pickup_address = content
break
case 40:
company_phone = content
shop_tel = content
break
case 41:
size_str = content
shop_scale = content
break
case 43:
connect_name = content
contacts_name = content
break
case 44:
mail_str = content
shop_email = content
break
case 50:
zhizhao_str = content
business_licence_number = content
break
case 51:
jing_ying_fan_wei_str = content
business_sphere = content
break
default:
break
......
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