Skip to content

G
GeliBusinessPlatform
Commit 429a0789 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

订单详情，个人中心，支付，商品管理流程完善中

parent d62a8206
Show whitespace changes
Inline Side-by-side
Showing with 370 additions and 222 deletions
GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.swift
View file @ 429a0789
...@@ -48,6 +48,6 @@ class GoodsCollectionViewCell: UICollectionViewCell { ...@@ -48,6 +48,6 @@ class GoodsCollectionViewCell: UICollectionViewCell {
} }
@IBAction func codeAction(_ sender: UIButton) { @IBAction func codeAction(_ sender: UIButton) {
print("点击二维码按钮\(sender.tag)") print("点击二维码按钮\(sender.tag)")
HUD.flash(.label("分享功能开发中"),delay: 1.2)
} }
} }
GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift
View file @ 429a0789
...@@ -25,7 +25,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable ...@@ -25,7 +25,7 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
adminInfo(["user_token":UserToken as Any], success: { (data) in adminInfo(["user_token":UserToken as Any], success: { (data) in
self.dataModel = (data as! AdminInfoModel) self.dataModel = (data as! AdminInfoModel)
// self.iconImg.kf.setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.shop_img)!)) self.iconImg.sd_setImage(with: URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.shop_img)!))
self.shopNameLbl.text = self.dataModel?.data?.stall_name self.shopNameLbl.text = self.dataModel?.data?.stall_name
self.nameLbl.text = self.dataModel?.data?.admin_name self.nameLbl.text = self.dataModel?.data?.admin_name
}) { (error) in }) { (error) in
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 429a0789
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import UIKit import UIKit
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,DZGLViewControllerDelegate,XuanZeShangPinViewControllerDelegate,DaiKeXiaDanGouWuCellDelegate,GuanLianKehuVCDelegate,XiuGaiYuShouJiaViewControllerDelegate,TitleAndTFCellDelegate{ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,UITableViewDelegate,DaiKeXiaDanFooterViewDelegate,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,DZGLViewControllerDelegate,XuanZeShangPinViewControllerDelegate,DaiKeXiaDanGouWuCellDelegate,GuanLianKehuVCDelegate,XiuGaiYuShouJiaViewControllerDelegate,TitleAndTFCellDelegate, GeliAlertViewDelegate{
let ddTypeArr = ["普通订单","预售下单"] let ddTypeArr = ["普通订单","预售下单"]
let zfTypeArr = ["未付款","欠款","月结","已付款"] let zfTypeArr = ["未付款","欠款","月结","已付款"]
...@@ -89,17 +89,34 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U ...@@ -89,17 +89,34 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
"goods_info":goods_info as Any, "goods_info":goods_info as Any,
"order_info":order_info as Any] as [String : Any] "order_info":order_info as Any] as [String : Any]
print(order) print(order)
// HUD.flash(.progress) orderData = order
// addOrder(order, success: { (data) in let alertView = GeliAlertView(frame: self.view.window!.bounds)
// let dataM = data as! UpDataModel alertView.delegate = self;
// if dataM.code == 1 { alertView.tishiLbl.text = ""
// HUD.flash(.label("提交成功"), delay: 1.2) alertView.titileLbl.text = "是否立即下单？"
// }else{ alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
// HUD.hide() alertView.rightBtn.tag = 1001
// } self.view.window?.addSubview(alertView)
// }) { (error) in
// }
// } var orderData:[String:Any]? = nil
func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001 {
HUD.flash(.progress)
addOrder(orderData!, success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}else{
HUD.hide()
}
}) { (error) in
}
}
} }
override func viewDidLoad() { override func viewDidLoad() {
......
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ 429a0789
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import UIKit import UIKit
import ViewAnimator import ViewAnimator
class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollectionViewDataSource ,UICollectionViewDelegateFlowLayout,HeaderSelectViewDelegate,SelectContentViewDelegate,UISearchBarDelegate, SearchBarViewDelegate, GoodsCollectionViewCellDelegate,ProductDetailViewControllerDelegate{ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollectionViewDataSource ,UICollectionViewDelegateFlowLayout,HeaderSelectViewDelegate,SelectContentViewDelegate,UISearchBarDelegate, SearchBarViewDelegate, GoodsCollectionViewCellDelegate,ProductDetailViewControllerDelegate, GeliAlertViewDelegate{
var collection : UICollectionView? = nil var collection : UICollectionView? = nil
var layout = UICollectionViewFlowLayout() var layout = UICollectionViewFlowLayout()
...@@ -430,20 +430,10 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect ...@@ -430,20 +430,10 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
//MARK:-- cell delegate 上下架，入库 //MARK:-- cell delegate 上下架，入库
func changeGoodsIsShow(isTrue: Bool, byIndex: Int) { func sureGeliAlertViewAction(sender: UIButton) {
//左按钮为false 右按钮为true if sender.tag == 1001{
let rowModel = self.items[byIndex]
//添加提示
if rowModel.is_show == 1 {
if isTrue {
print("入库哦哦")
let vc = RuKuViewController()
vc.barTitle = "入库"
self.navigationController?.pushViewController(vc, animated: true)
}else{
print("下架啦")
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
editField(["user_token":UserToken as Any,"function_id":"15","prval":rowModel.goods_id as Any,"value":0,], success: { (data) in editField(["user_token":UserToken as Any,"function_id":"15","prval":changeGoodsResModel!.goods_id as Any,"value":0,], success: { (data) in
let dataM = data as! UpDataModel let dataM = data as! UpDataModel
if dataM.code == 1 { if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2) HUD.flash(.label("提交成功"), delay: 1.2)
...@@ -453,12 +443,10 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect ...@@ -453,12 +443,10 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}) { (erro) in }) { (erro) in
} }
} }else if sender.tag == 1002 {
}else{
if isTrue {
print("赶紧上架")
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
editField(["user_token":UserToken as Any,"function_id":"15","prval":rowModel.goods_id as Any,"value":1,], success: { (data) in editField(["user_token":UserToken as Any,"function_id":"15","prval":changeGoodsResModel!.goods_id as Any,"value":1,], success: { (data) in
let dataM = data as! UpDataModel let dataM = data as! UpDataModel
if dataM.code == 1 { if dataM.code == 1 {
HUD.flash(.label("提交成功"), delay: 1.2) HUD.flash(.label("提交成功"), delay: 1.2)
...@@ -468,6 +456,43 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect ...@@ -468,6 +456,43 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
}) { (erro) in }) { (erro) in
} }
}
}
var changeGoodsResModel: GoodsResModel? = nil
func changeGoodsIsShow(isTrue: Bool, byIndex: Int) {
//左按钮为false 右按钮为true
let rowModel = self.items[byIndex]
changeGoodsResModel = rowModel
//添加提示
if rowModel.is_show == 1 {
if isTrue {
print("入库哦哦")
let vc = RuKuViewController()
vc.barTitle = "入库"
self.navigationController?.pushViewController(vc, animated: true)
}else{
print("下架啦")
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否下架商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
}
}else{
if isTrue {
print("赶紧上架")
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否上架商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1002
self.view.window?.addSubview(alertView)
}else{ }else{
print("入库哦哦") print("入库哦哦")
let vc = RuKuViewController() let vc = RuKuViewController()
......
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 429a0789
...@@ -97,19 +97,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -97,19 +97,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
var isAllEditing = false var isAllEditing = false
func sureGeliAlertViewAction(sender: UIButton) { func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001 {
}
@objc func btmBtnClick(sender:UIButton){
switch sender.titleLabel!.text {
case "编辑":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否确认编辑订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
self.view.window?.addSubview(alertView)
///XXXXX
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
GeneralInfo(["user_token":UserToken as Any], success: { (data) in GeneralInfo(["user_token":UserToken as Any], success: { (data) in
HUD.hide(animated: true) HUD.hide(animated: true)
...@@ -121,84 +109,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -121,84 +109,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}) { (error) in }) { (error) in
} }
break }else if sender.tag == 1002 {
case "保存":
print("保存按钮submitAction")
if itemName.count == 0 {
HUD.flash(.label("请输入商品名称"), delay: 1.2)
return
}
if itemTypeArr == [] || itemTypeArr == [99,99,99,99] {
HUD.flash(.label("请选择商品类型"), delay: 1.2)
return
}
//待补充
if itemName.count == 0 {
HUD.flash(.label("请输入商品名称"), delay: 1.2)
return
}
if itemTypeArr == [99,99,99,99] {
HUD.flash(.label("请选择商品类型"), delay: 1.2)
return
}
if selectGoodsClassModel.cat_id == nil {
HUD.flash(.label("请选择商品分类"), delay: 1.2)
return
}
if pinPai.count == 0 {
HUD.flash(.label("请选择品牌"), delay: 1.2)
return
}
if qiMaiShuLiang.count == 0 {
HUD.flash(.label("请输入起卖数量"), delay: 1.2)
return
}
if singleImgArr.count == 0 {
HUD.flash(.label("请选择商品封面图"), delay: 1.2)
return
}
if maxFiveImgsArr.count == 0 {
HUD.flash(.label("请选择商品主图"), delay: 1.2)
return
}
//
if guiGeArr.count == 0 {
HUD.flash(.label("请填写商品规格"), delay: 1.2)
return
}
if isYuShouShangPin! {
if faHuoTime.count == 0 {
HUD.flash(.label("请输入尾款发货时间"), delay: 1.2)
return
}
}
if keyWord.count == 0 {
HUD.flash(.label("请输入关键字"), delay: 1.2)
return
}
if wuLiuPrice.count == 0 {
HUD.flash(.label("请输入物流费用"), delay: 1.2)
return
}
if countrySelect == nil {
HUD.flash(.label("请选择国家"), delay: 1.2)
return
}
if shangPinStatus == nil {
HUD.flash(.label("请选择商品状态"), delay: 1.2)
return
}
if yunShuType == nil {
HUD.flash(.label("请选择运输方式"), delay: 1.2)
return
}
//MARK:---新增商品接口 //MARK:---新增商品接口
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
...@@ -222,7 +133,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -222,7 +133,6 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
} }
} }
var is_qz = 0 var is_qz = 0
if shiFouQZ { if shiFouQZ {
is_qz = 1 is_qz = 1
...@@ -305,18 +215,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -305,18 +215,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}) { (error) in }) { (error) in
} }
break }else if sender.tag == 1003 {
case "入库":
let vc = RuKuViewController()
vc.barTitle = "入库"
self.navigationController?.pushViewController(vc, animated: true)
break
case "出库":
let vc = ChuKuViewController()
self.navigationController?.pushViewController(vc, animated: true)
break
case "上架":
//提示是否上架
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":1,], success: { (data) in editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":1,], success: { (data) in
...@@ -328,10 +227,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -328,10 +227,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}) { (erro) in }) { (erro) in
} }
break }else if sender.tag == 1004 {
case "下架":
//提示是否下架
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":0,], success: { (data) in editField(["user_token":UserToken as Any,"function_id":"15","prval":goods_id as Any,"value":0,], success: { (data) in
let dataM = data as! UpDataModel let dataM = data as! UpDataModel
...@@ -343,9 +239,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -343,9 +239,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}) { (erro) in }) { (erro) in
} }
break }else if sender.tag == 1005 {
case "删除":
//提示是否删除
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
editField(["user_token":UserToken as Any,"function_id":"16","prval":goods_id as Any,"value":1,], success: { (data) in editField(["user_token":UserToken as Any,"function_id":"16","prval":goods_id as Any,"value":1,], success: { (data) in
let dataM = data as! UpDataModel let dataM = data as! UpDataModel
...@@ -356,6 +250,147 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo ...@@ -356,6 +250,147 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
}) { (erro) in }) { (erro) in
} }
}
}
@objc func btmBtnClick(sender:UIButton){
switch sender.titleLabel!.text {
case "编辑":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否打开编辑？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
break
case "保存":
print("保存按钮submitAction")
if itemName.count == 0 {
HUD.flash(.label("请输入商品名称"), delay: 1.2)
return
}
if itemTypeArr == [] || itemTypeArr == [99,99,99,99] {
HUD.flash(.label("请选择商品类型"), delay: 1.2)
return
}
//待补充
if itemName.count == 0 {
HUD.flash(.label("请输入商品名称"), delay: 1.2)
return
}
if itemTypeArr == [99,99,99,99] {
HUD.flash(.label("请选择商品类型"), delay: 1.2)
return
}
if selectGoodsClassModel.cat_id == nil {
HUD.flash(.label("请选择商品分类"), delay: 1.2)
return
}
if pinPai.count == 0 {
HUD.flash(.label("请选择品牌"), delay: 1.2)
return
}
if qiMaiShuLiang.count == 0 {
HUD.flash(.label("请输入起卖数量"), delay: 1.2)
return
}
if singleImgArr.count == 0 {
HUD.flash(.label("请选择商品封面图"), delay: 1.2)
return
}
if maxFiveImgsArr.count == 0 {
HUD.flash(.label("请选择商品主图"), delay: 1.2)
return
}
//
if guiGeArr.count == 0 {
HUD.flash(.label("请填写商品规格"), delay: 1.2)
return
}
if isYuShouShangPin! {
if faHuoTime.count == 0 {
HUD.flash(.label("请输入尾款发货时间"), delay: 1.2)
return
}
}
if keyWord.count == 0 {
HUD.flash(.label("请输入关键字"), delay: 1.2)
return
}
if wuLiuPrice.count == 0 {
HUD.flash(.label("请输入物流费用"), delay: 1.2)
return
}
if countrySelect == nil {
HUD.flash(.label("请选择国家"), delay: 1.2)
return
}
if shangPinStatus == nil {
HUD.flash(.label("请选择商品状态"), delay: 1.2)
return
}
if yunShuType == nil {
HUD.flash(.label("请选择运输方式"), delay: 1.2)
return
}
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否保存编辑？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1002
self.view.window?.addSubview(alertView)
break
case "入库":
let vc = RuKuViewController()
vc.barTitle = "入库"
self.navigationController?.pushViewController(vc, animated: true)
break
case "出库":
let vc = ChuKuViewController()
self.navigationController?.pushViewController(vc, animated: true)
break
case "上架":
//提示是否上架
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否上架商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1003
self.view.window?.addSubview(alertView)
break
case "下架":
//提示是否下架
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否下架商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1004
self.view.window?.addSubview(alertView)
break
case "删除":
//提示是否删除
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否删除商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1005
self.view.window?.addSubview(alertView)
break break
default: default:
break break
......
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ 429a0789
...@@ -16,7 +16,7 @@ protocol ProductDetailViewControllerDelegate { ...@@ -16,7 +16,7 @@ protocol ProductDetailViewControllerDelegate {
func reloadDataByProductDetailViewController() func reloadDataByProductDetailViewController()
} }
class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,GoodsClassViewControllerDelegate,PinPaiListViewControllerDelegate,AddImgCellDelegate,AddGuiGeCellDelegate,CreatNewSpecsViewControllerDelegate,ShangPinGguiGeCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,TitleAndSwitchCellDelegate,TitleAndTFCellDelegate,YuShouWeiKuanFaHuoCellDelegate,UITextFieldDelegate,ShowTimeSelectViewDelegate,LMNoteViewControllerDelegate{ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GLAlertSelectViewDelegate,GoodsClassViewControllerDelegate,PinPaiListViewControllerDelegate,AddImgCellDelegate,AddGuiGeCellDelegate,CreatNewSpecsViewControllerDelegate,ShangPinGguiGeCellDelegate,UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,TitleAndSwitchCellDelegate,TitleAndTFCellDelegate,YuShouWeiKuanFaHuoCellDelegate,UITextFieldDelegate,ShowTimeSelectViewDelegate,LMNoteViewControllerDelegate, GeliAlertViewDelegate{
var delegate :ProductDetailViewControllerDelegate? var delegate :ProductDetailViewControllerDelegate?
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) { func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
...@@ -136,7 +136,19 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -136,7 +136,19 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
HUD.flash(.label("请选择运输方式"), delay: 1.2) HUD.flash(.label("请选择运输方式"), delay: 1.2)
return return
} }
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否提交商品？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
}
func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001 {
//MARK:---新增商品接口 //MARK:---新增商品接口
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
...@@ -160,7 +172,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -160,7 +172,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
} }
} }
var is_qz = 0 var is_qz = 0
if shiFouQZ { if shiFouQZ {
is_qz = 1 is_qz = 1
...@@ -241,7 +252,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -241,7 +252,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}) { (error) in }) { (error) in
} }
}
} }
@IBOutlet weak var submitBtn: LGButton! @IBOutlet weak var submitBtn: LGButton!
@IBOutlet weak var listTbv: UITableView! @IBOutlet weak var listTbv: UITableView!
...@@ -475,8 +486,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl ...@@ -475,8 +486,6 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
func AddGuiGeCellClick(cell: AddGuiGeCell) { func AddGuiGeCellClick(cell: AddGuiGeCell) {
let vc = LMNoteViewController() let vc = LMNoteViewController()
vc.htmlStr = goodsDesc; vc.htmlStr = goodsDesc;
vc.delegatedata = self vc.delegatedata = self
......
GeliBusinessPlatform/ViewController/商家信息/ShopInfoViewController.swift
View file @ 429a0789
...@@ -39,7 +39,7 @@ class ShopInfoViewController: BaseViewController { ...@@ -39,7 +39,7 @@ class ShopInfoViewController: BaseViewController {
//MARK:--需要计算高度，也可以根据行数确定 //MARK:--需要计算高度，也可以根据行数确定
self.compInfoLbl.text = self.dataModel?.data?.shop_intro self.compInfoLbl.text = self.dataModel?.data?.shop_intro
print("简介\(self.compInfoLbl.numberOfLines)") print("简介\(self.compInfoLbl.numberOfLines)")
self.scrollHeight.constant = 950*glscale + CGFloat(self.compInfoLbl.numberOfLines) * 15*glscale self.scrollHeight.constant = 1031 + CGFloat(self.compInfoLbl.numberOfLines) * 15*glscale
self.stallNameLbl.text = self.dataModel?.data?.stall_name self.stallNameLbl.text = self.dataModel?.data?.stall_name
self.accoutLbl.text = self.dataModel?.data?.contacts_name self.accoutLbl.text = self.dataModel?.data?.contacts_name
self.emailLbl.text = self.dataModel?.data?.shop_email self.emailLbl.text = self.dataModel?.data?.shop_email
......
GeliBusinessPlatform/ViewController/换绑支付账号（绑定，换绑）/BindViewController.swift
View file @ 429a0789
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
import UIKit import UIKit
import LGButton import LGButton
class BindViewController: BaseViewController { class BindViewController: BaseViewController, GeliAlertViewDelegate {
@IBOutlet weak var submitBtn: LGButton! @IBOutlet weak var submitBtn: LGButton!
@IBOutlet weak var accountTF: UITextField! @IBOutlet weak var accountTF: UITextField!
...@@ -83,6 +83,38 @@ class BindViewController: BaseViewController { ...@@ -83,6 +83,38 @@ class BindViewController: BaseViewController {
@IBAction func submitBindingAction(_ sender: Any) { @IBAction func submitBindingAction(_ sender: Any) {
print("确认绑定账号") print("确认绑定账号")
if accountTF.text?.count == 0 {
HUD.flash(.label("请填写换绑的格利支付账号"),delay: 1.2)
return
} }
if codeTF.text?.count == 0 {
HUD.flash(.label("请填写验证码"),delay: 1.2)
return
}
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "确定更绑格利支付账号？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
}
func sureGeliAlertViewAction(sender: UIButton) {
if sender.tag == 1001 {
HUD.flash(.progress)
let UserToken = UserDefaults.standard.value(forKey: "user_token")
bindGeliPay(["user_token":UserToken as Any,"geli_pay_user":accountTF.text as Any], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1{
HUD.flash(.label("修改成功"),delay: 1.2)
self.navigationController?.popToRootViewController(animated: true)
}else{
HUD.hide()
}
}) { (error) in
}
}
}
} }
GeliBusinessPlatform/ViewController/换绑支付账号（绑定，换绑）/BindViewController.xib
View file @ 429a0789
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_5" orientation="portrait" appearance="light"/> <device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/> <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BindViewController" customModule="GeliBusinessPlatform" customModuleProvider="target"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BindViewController" customModule="TestClass" customModuleProvider="target">
<connections> <connections>
<outlet property="accountTF" destination="ffm-Wf-cTs" id="OqY-l4-wn0"/> <outlet property="accountTF" destination="ffm-Wf-cTs" id="OqY-l4-wn0"/>
<outlet property="codeBtn" destination="CmK-Hc-fnD" id="Vvl-l9-psO"/> <outlet property="codeBtn" destination="CmK-Hc-fnD" id="Vvl-l9-psO"/>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</connections> </connections>
</button> </button>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3oP-hI-HAZ"> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3oP-hI-HAZ">
<rect key="frame" x="224.33333333333334" y="16.333333333333343" width="79.666666666666657" height="17.333333333333329"/> <rect key="frame" x="244.33333333333334" y="16.333333333333343" width="79.666666666666657" height="17.333333333333329"/>
<color key="textColor" name="标题字颜色"/> <color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits"/>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints> <constraints>
<constraint firstItem="SjA-bd-foE" firstAttribute="leading" secondItem="bCp-kS-a0t" secondAttribute="leading" constant="15" id="8cF-XK-Uuh"/> <constraint firstItem="SjA-bd-foE" firstAttribute="leading" secondItem="bCp-kS-a0t" secondAttribute="leading" constant="15" id="8cF-XK-Uuh"/>
<constraint firstAttribute="trailing" secondItem="3oP-hI-HAZ" secondAttribute="trailing" constant="110" id="Fsg-8Y-iXz"/> <constraint firstAttribute="trailing" secondItem="3oP-hI-HAZ" secondAttribute="trailing" constant="90" id="Fsg-8Y-iXz"/>
<constraint firstItem="SjA-bd-foE" firstAttribute="centerY" secondItem="bCp-kS-a0t" secondAttribute="centerY" id="bYi-7O-cb0"/> <constraint firstItem="SjA-bd-foE" firstAttribute="centerY" secondItem="bCp-kS-a0t" secondAttribute="centerY" id="bYi-7O-cb0"/>
<constraint firstItem="3oP-hI-HAZ" firstAttribute="centerY" secondItem="bCp-kS-a0t" secondAttribute="centerY" id="dR0-TZ-WdO"/> <constraint firstItem="3oP-hI-HAZ" firstAttribute="centerY" secondItem="bCp-kS-a0t" secondAttribute="centerY" id="dR0-TZ-WdO"/>
<constraint firstAttribute="height" constant="50" id="hua-5S-NOW"/> <constraint firstAttribute="height" constant="50" id="hua-5S-NOW"/>
......
GeliBusinessPlatform/ViewController/订单管理/查看全部/ShowAlGoodsViewController.swift
View file @ 429a0789
...@@ -46,6 +46,7 @@ class ShowAlGoodsViewController: BaseViewController , UITableViewDelegate, UITa ...@@ -46,6 +46,7 @@ class ShowAlGoodsViewController: BaseViewController , UITableViewDelegate, UITa
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
cell.selectBtn.isHidden = true cell.selectBtn.isHidden = true
cell.priceLbl.isHidden = false
let rowModel = order_goods![indexPath.row] let rowModel = order_goods![indexPath.row]
cell.nameLbl.text = rowModel.goods_name cell.nameLbl.text = rowModel.goods_name
cell.detailLbl.text = rowModel.goods_attr cell.detailLbl.text = rowModel.goods_attr
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 429a0789
...@@ -161,69 +161,56 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -161,69 +161,56 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case "打印": case "打印":
//暂无 //暂无
print("暂无") print("暂无")
HUD.flash(.label("打印功能开发中"),delay: 1.2)
break break
case "确认订单": case "确认订单":
isSrueOrder = true
let alertView = GeliAlertView(frame: self.view.window!.bounds) let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self; alertView.delegate = self;
alertView.tishiLbl.text = "" alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否确认订单？" alertView.titileLbl.text = "是否确认订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal) alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView) self.view.window?.addSubview(alertView)
break break
case "取消订单": case "取消订单":
isSrueOrder = false
let alertView = GeliAlertView(frame: self.view.window!.bounds) let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self; alertView.delegate = self;
alertView.tishiLbl.text = "" alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否确认取消订单？" alertView.titileLbl.text = "是否确认取消订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal) alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1002
self.view.window?.addSubview(alertView) self.view.window?.addSubview(alertView)
break break
case "直接发货": case "直接发货":
HUD.flash(.progress)
if isYuShou {
sendOutAd(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
} let alertView = GeliAlertView(frame: self.view.window!.bounds)
}else{ alertView.delegate = self;
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in alertView.tishiLbl.text = ""
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2) alertView.titileLbl.text = "是否发货订单？"
self.loadData() alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
}) { (error) in alertView.rightBtn.tag = 1003
self.view.window?.addSubview(alertView)
}
}
break break
case "退款": case "退款":
HUD.flash(.progress) let alertView = GeliAlertView(frame: self.view.window!.bounds)
orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in alertView.delegate = self;
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2) alertView.tishiLbl.text = ""
self.loadData() alertView.titileLbl.text = "是否退款？"
}) { (error) in alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1004
self.view.window?.addSubview(alertView)
}
break break
case "退货": case "退货":
HUD.flash(.progress) let alertView = GeliAlertView(frame: self.view.window!.bounds)
if isYuShou { alertView.delegate = self;
orderReturnedGoodsAd(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in alertView.tishiLbl.text = ""
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2) alertView.titileLbl.text = "是否退货？"
self.loadData() alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
}) { (error) in alertView.rightBtn.tag = 1005
self.view.window?.addSubview(alertView)
}
}else{
orderReturnedGoods(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}
break break
default: default:
break break
...@@ -507,6 +494,25 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -507,6 +494,25 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = false cell.arrowImg.isHidden = false
cell.contentRight.constant = 32 cell.contentRight.constant = 32
if indexPath.row == 9 {
if self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}else if indexPath.row == 7 {
if isYuShou {
if self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}else{
if self.dataMdoel?.order_res?.pay_type == 11 || self.dataMdoel?.order_res?.pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}
}
switch indexPath.row { switch indexPath.row {
case 4: case 4:
cell.contentLbl.text = self.dataMdoel?.order_res?.lc_name cell.contentLbl.text = self.dataMdoel?.order_res?.lc_name
...@@ -529,6 +535,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -529,6 +535,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
} }
cell.arrowImg.isHidden = true cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
break break
case 8: case 8:
if isYuShou { if isYuShou {
...@@ -540,6 +547,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -540,6 +547,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 9: case 9:
cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn cell.contentLbl.text = self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn
cell.arrowImg.isHidden = true cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
break break
default: default:
break break
...@@ -549,28 +557,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -549,28 +557,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if !isCaneditLatsData { if !isCaneditLatsData {
cell.arrowImg.isHidden = true cell.arrowImg.isHidden = true
cell.contentRight.constant = 15 cell.contentRight.constant = 15
}else{
cell.arrowImg.isHidden = false
cell.contentRight.constant = 32
if indexPath.row == 9 {
if self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.wk_pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}else if indexPath.row == 7 {
if isYuShou {
if self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 11 || self.dataMdoel?.order_res?.sale_res?.dj_pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}else{
if self.dataMdoel?.order_res?.pay_type == 11 || self.dataMdoel?.order_res?.pay_type == 12 {
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
}
}
} }
return cell return cell
} }
...@@ -1078,22 +1064,20 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -1078,22 +1064,20 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
} }
//MARK:--确认和取消订单 //MARK:--确认和取消订单
var isSrueOrder = false
//MARK:--弹窗代理 --还有其他弹窗，根据tag分类 //MARK:--弹窗代理 --还有其他弹窗，根据tag分类
func sureGeliAlertViewAction(sender: UIButton) { func sureGeliAlertViewAction(sender: UIButton) {
if isSrueOrder {
HUD.flash(.progress)
let UserToken = UserDefaults.standard.value(forKey: "user_token") let UserToken = UserDefaults.standard.value(forKey: "user_token")
if sender.tag == 1001 {
HUD.flash(.progress)
orderConfirm(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in orderConfirm(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2) HUD.flash(.labeledSubSuccess(subtitle: "确认成功"),delay: 1.2)
self.loadData() self.loadData()
}) { (error) in }) { (error) in
} }
}else{ }else if sender.tag == 1002{
HUD.flash(.progress) HUD.flash(.progress)
let UserToken = UserDefaults.standard.value(forKey: "user_token")
orderCancel(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in orderCancel(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "取消成功"),delay: 1.2) HUD.flash(.labeledSubSuccess(subtitle: "取消成功"),delay: 1.2)
self.loadData() self.loadData()
...@@ -1101,6 +1085,48 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa ...@@ -1101,6 +1085,48 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}) { (error) in }) { (error) in
} }
}else if sender.tag == 1003 {
HUD.flash(.progress)
if isYuShou {
sendOutAd(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}else{
sendOut(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}
}else if sender.tag == 1004 {
HUD.flash(.progress)
orderRefund(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}else if sender.tag == 1005 {
HUD.flash(.progress)
if isYuShou {
orderReturnedGoodsAd(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}else{
orderReturnedGoods(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
self.loadData()
}) { (error) in
}
}
} }
} }
......
GeliBusinessPlatform/ViewController/账号信息/AccountViewController.swift
View file @ 429a0789
...@@ -21,14 +21,17 @@ class AccountViewController: BaseViewController{ ...@@ -21,14 +21,17 @@ class AccountViewController: BaseViewController{
super.viewDidLoad() super.viewDidLoad()
navbar.title = "账号信息" navbar.title = "账号信息"
self.view.addSubview(navbar) self.view.addSubview(navbar)
print(dataModel)
// Do any additional setup after loading the view. // Do any additional setup after loading the view.
firstView?.snp.makeConstraints({ (make) in firstView?.snp.makeConstraints({ (make) in
make.top.equalTo(NavCGRect.height) make.top.equalTo(NavCGRect.height)
make.left.right.equalTo(0) make.left.right.equalTo(0)
make.height.equalTo(50) make.height.equalTo(50)
}) })
if dataModel?.data?.admin_name?.count == 0 {
nameLbl.text = "-"
}else{
nameLbl.text = dataModel?.data?.admin_name nameLbl.text = dataModel?.data?.admin_name
}
accountLbl.text = dataModel?.data?.user_name accountLbl.text = dataModel?.data?.user_name
phoneLbl.text = dataModel?.data?.phone phoneLbl.text = dataModel?.data?.phone
} }
......
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