Skip to content

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

asdfasdfasf434254dsgsf

parent e2a2c910
Show whitespace changes
Inline Side-by-side
Showing with 100 additions and 10 deletions
GeliBusinessPlatform/Model/UpDataModel.swift
View file @ 25509395
......@@ -8,7 +8,7 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,支付操作,
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,取消运单,支付运费,选定地址添加收发货历史,取消货拉拉订单，货拉拉二次支付，货拉拉格利支付，发票消息短信通知,修改电子发票链接地址,分销分账设置,供应商新增店铺,标记已人工结算,铺货与取消铺货,终止合作,分销商品管理,分销商新增供应商,审核操作（通过和不通过）,删除客户,新增分销员,删除分销员,修改不二制油订单打印,店长审核通过、审核通过待补齐资料、不通过,保存店长审核信息（商家信息）,拼拼货取消订单,
class UpDataModel: Mappable {
......
GeliBusinessPlatform/Model/getVehicleType_InterFace.swift
View file @ 25509395
......@@ -138,7 +138,7 @@ func stateJudge(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture
pwd 支付密码
*/
func pphPayment(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("支付操作", params, { (rep:DataResponse<UpDataModel>) in
NetworkRequest.sharedInstance.postRequest("支付操作", params, { (rep:DataResponse<pphPayment_model>) in
}, success: { (data) in
success(data)
}) { (error) in
......
GeliBusinessPlatform/Model/pph/getVehicleType_model.swift
View file @ 25509395
......@@ -45,7 +45,6 @@ class addPinPinOrder_adrInfo: Mappable {
note <- map["note"]
}
}
//MARK: - 查询是否开通格利支付和余额是否足够
class stateJudge_model: Mappable {
var code:Int?
......@@ -61,7 +60,33 @@ class stateJudge_model: Mappable {
data <- map["data"]
}
}
//MARK: - 支付操作
class pphPayment_model: Mappable {
var code:Int?
var message : String?
var data :pphPaymentData_model?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class pphPaymentData_model: Mappable {
var create_time:String?
var pay_time : String?
required init?( map: Map) {
}
func mapping(map: Map) {
create_time <- map["create_time"]
pay_time <- map["pay_time"]
}
}
class stateJudgeData_model: Mappable {
var res:Int? //1是未开通格利支付，2是未设置支付密码，3是资金不足额，4是资金足额（只有等于4，才能继续走支付流程）
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 25509395
......@@ -25,10 +25,15 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
HUD.flash(.progress)
pphPayment(["user_token":UserToken as Any,"wb_no":pph_wb_no as Any,"pwd":fullpass as Any]) {[self] (data) in
HUD.hide()
let model = data as! pphPayment_model
let vc = PPH_SUC_VC()
vc.sendArr = pph_send_arr
vc.receiveArr = pph_receive_arr
vc.add_order_time = (model.data?.create_time)!
vc.wb_no = pph_wb_no
vc.car_type = pphCarTypesArr[pph_selectCarType].name!
vc.price = totalPrice
vc.pay_time = (model.data?.pay_time)!
self.navigationController?.pushViewController(vc, animated: true)
} failture: { (err) in
......@@ -2447,10 +2452,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
cell.name_lbl.text = ""
cell.commend_lbl.text = ""
cell.adr_lbl.text = ""
cell.link_lbl.text = ""
}else{
cell.holder_lbl.isHidden = true
let model = pph_send_arr[indexPath.row]
cell.name_lbl.text = model.shopName
cell.link_lbl.text = model.linkman! + " " + model.mobile!
cell.adr_lbl.text = "\(model.province_name!)\(model.city_name!)\(model.district_name!)\(model.street_name!)"
cell.commend_lbl.text = "-"
if model.note?.count != 0 {
......@@ -2477,11 +2484,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
cell.name_lbl.text = ""
cell.commend_lbl.text = ""
cell.adr_lbl.text = ""
cell.link_lbl.text = ""
cell.holder_lbl.text = "添加卸货点"
}else{
cell.holder_lbl.isHidden = true
let model = pph_receive_arr[indexPath.row]
cell.name_lbl.text = model.shopName
cell.link_lbl.text = model.linkman! + " " + model.mobile!
cell.adr_lbl.text = "\(model.province_name!)\(model.city_name!)\(model.district_name!)\(model.street_name!)"
cell.commend_lbl.text = "-"
if model.note?.count != 0 {
......
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/PPH_SUC_VC.swift
View file @ 25509395
......@@ -27,11 +27,16 @@ class PPH_SUC_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "Suc_Top_Cell") as! Suc_Top_Cell
cell.wb_no_lbl.text = wb_no
cell.order_time_lbl.text = add_order_time
return cell
}
if indexPath.section == 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "PPH_D_Cell") as! PPH_D_Cell
cell.carType_lbl.text = car_type
cell.time_lbl.text = pay_time
cell.cost_lbl.text = price
return cell
}
......@@ -42,6 +47,16 @@ class PPH_SUC_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
if indexPath.row == 0 {
cell.top_line.isHidden = true
}
let model = sendArr![indexPath.row]
cell.holder_lbl.isHidden = true
cell.name_lbl.text = model.shopName
cell.link_lbl.text = model.linkman! + " " + model.mobile!
cell.adr_lbl.text = "\(model.province_name!)\(model.city_name!)\(model.district_name!)\(model.street_name!)"
cell.commend_lbl.text = "-"
if model.note?.count != 0 {
cell.commend_lbl.text = model.note
}
}
if indexPath.section == 2 {
cell.status_lbl.text = "卸"
......@@ -49,6 +64,15 @@ class PPH_SUC_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
if indexPath.row == receiveArr!.count - 1 {
cell.btm_line.isHidden = true
}
let model = receiveArr![indexPath.row]
cell.holder_lbl.isHidden = true
cell.name_lbl.text = model.shopName
cell.link_lbl.text = model.linkman! + " " + model.mobile!
cell.adr_lbl.text = "\(model.province_name!)\(model.city_name!)\(model.district_name!)\(model.street_name!)"
cell.commend_lbl.text = "-"
if model.note?.count != 0 {
cell.commend_lbl.text = model.note
}
}
return cell
}
......@@ -77,6 +101,11 @@ class PPH_SUC_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
}
return 5
}
var add_order_time = ""
var wb_no = ""
var car_type = ""
var price = ""
var pay_time = ""
@IBOutlet weak var top_view_height: NSLayoutConstraint!
@IBOutlet weak var list_view: UITableView!
......
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.swift
View file @ 25509395
......@@ -12,6 +12,7 @@ protocol Suc_LOG_Cell_Delegate {
}
class Suc_LOG_Cell: UITableViewCell {
@IBOutlet weak var holder_lbl: UILabel!
@IBOutlet weak var link_lbl: UILabel!
var delegate:Suc_LOG_Cell_Delegate?
@IBAction func add_action(_ sender: UIButton) {
if add_btn.isHidden == false {
......
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.xib
View file @ 25509395
......@@ -72,7 +72,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tIb-8c-DIc">
<rect key="frame" x="47" y="72.5" width="326" height="82.5"/>
<rect key="frame" x="47" y="98" width="326" height="57"/>
<attributedString key="attributedText">
<fragment content="备注：-">
<attributes>
......@@ -127,14 +127,34 @@
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UfL-8G-UaB">
<rect key="frame" x="47" y="74.5" width="396" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="hU0-TA-8rN"/>
</constraints>
<attributedString key="attributedText">
<fragment content="姓名-电话">
<attributes>
<color key="NSColor" red="0.38823529411764707" green="0.38823529411764707" blue="0.38823529411764707" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="tIb-8c-DIc" firstAttribute="top" secondItem="UfL-8G-UaB" secondAttribute="bottom" constant="5" id="2Yd-hY-9ax"/>
<constraint firstAttribute="trailing" secondItem="tIb-8c-DIc" secondAttribute="trailing" constant="85" id="4g2-P3-h1V"/>
<constraint firstAttribute="bottom" secondItem="AAn-aO-nFM" secondAttribute="bottom" id="4jk-Ha-udl"/>
<constraint firstItem="pyx-jS-ztN" firstAttribute="leading" secondItem="ZYP-Oa-jcS" secondAttribute="trailing" constant="10" id="6uP-xR-y2L"/>
<constraint firstItem="Irg-02-L3a" firstAttribute="centerY" secondItem="ZYP-Oa-jcS" secondAttribute="centerY" id="8t9-4b-JtR"/>
<constraint firstAttribute="trailing" secondItem="htU-bv-LVR" secondAttribute="trailing" constant="85" id="96I-s0-3LU"/>
<constraint firstItem="tIb-8c-DIc" firstAttribute="leading" secondItem="UfL-8G-UaB" secondAttribute="leading" id="A4k-h3-mDe"/>
<constraint firstItem="ulV-iw-bED" firstAttribute="centerX" secondItem="ymi-Cs-n6W" secondAttribute="centerX" id="E8f-Zm-uoA"/>
<constraint firstItem="ZYP-Oa-jcS" firstAttribute="top" secondItem="iGa-XE-p4p" secondAttribute="bottom" id="GQA-Vt-fJM"/>
<constraint firstItem="UfL-8G-UaB" firstAttribute="top" secondItem="htU-bv-LVR" secondAttribute="bottom" constant="5" id="Jht-VX-qIi"/>
<constraint firstItem="htU-bv-LVR" firstAttribute="leading" secondItem="Irg-02-L3a" secondAttribute="leading" id="KcI-I9-mI8"/>
<constraint firstItem="AAn-aO-nFM" firstAttribute="centerX" secondItem="ZYP-Oa-jcS" secondAttribute="centerX" id="O1N-El-j5M"/>
<constraint firstItem="iGa-XE-p4p" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="PTt-Rc-oJG"/>
......@@ -144,15 +164,14 @@
<constraint firstItem="pyx-jS-ztN" firstAttribute="centerY" secondItem="ZYP-Oa-jcS" secondAttribute="centerY" id="cl8-mm-0y0"/>
<constraint firstItem="Irg-02-L3a" firstAttribute="leading" secondItem="ZYP-Oa-jcS" secondAttribute="trailing" constant="10" id="dVV-dx-wbl"/>
<constraint firstItem="AAn-aO-nFM" firstAttribute="top" secondItem="ZYP-Oa-jcS" secondAttribute="bottom" id="dVv-uQ-60l"/>
<constraint firstItem="tIb-8c-DIc" firstAttribute="top" secondItem="htU-bv-LVR" secondAttribute="bottom" constant="3" id="fEk-iJ-Pbj"/>
<constraint firstAttribute="trailing" secondItem="UfL-8G-UaB" secondAttribute="trailing" constant="15" id="gQB-hf-3w8"/>
<constraint firstAttribute="trailing" secondItem="ymi-Cs-n6W" secondAttribute="trailing" constant="15" id="glA-bw-n7d"/>
<constraint firstItem="tIb-8c-DIc" firstAttribute="width" secondItem="htU-bv-LVR" secondAttribute="width" id="hY9-LV-DPT"/>
<constraint firstItem="ZYP-Oa-jcS" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hwW-mK-R4F"/>
<constraint firstItem="htU-bv-LVR" firstAttribute="top" secondItem="Irg-02-L3a" secondAttribute="bottom" constant="3" id="iq3-yz-Pa6"/>
<constraint firstItem="tIb-8c-DIc" firstAttribute="leading" secondItem="htU-bv-LVR" secondAttribute="leading" id="jIP-Sm-oiG"/>
<constraint firstAttribute="bottom" secondItem="UzE-pS-esW" secondAttribute="bottom" id="p7a-fw-Aj9"/>
<constraint firstItem="ymi-Cs-n6W" firstAttribute="top" secondItem="htU-bv-LVR" secondAttribute="top" id="rHW-7f-zhX"/>
<constraint firstItem="UzE-pS-esW" firstAttribute="top" secondItem="tIb-8c-DIc" secondAttribute="bottom" constant="10" id="xfA-kn-n81"/>
<constraint firstItem="UzE-pS-esW" firstAttribute="top" secondItem="tIb-8c-DIc" secondAttribute="bottom" constant="10" id="u6s-ok-ste"/>
<constraint firstItem="UfL-8G-UaB" firstAttribute="leading" secondItem="htU-bv-LVR" secondAttribute="leading" id="vMb-Ze-5j6"/>
<constraint firstItem="ulV-iw-bED" firstAttribute="centerY" secondItem="ymi-Cs-n6W" secondAttribute="centerY" id="yBB-ff-eFP"/>
<constraint firstItem="UzE-pS-esW" firstAttribute="leading" secondItem="htU-bv-LVR" secondAttribute="leading" id="yaV-g7-PQO"/>
</constraints>
......@@ -164,6 +183,7 @@
<outlet property="btm_line" destination="AAn-aO-nFM" id="CWs-Su-zWN"/>
<outlet property="commend_lbl" destination="tIb-8c-DIc" id="sp4-pO-uhO"/>
<outlet property="holder_lbl" destination="pyx-jS-ztN" id="0wg-zG-wR4"/>
<outlet property="link_lbl" destination="UfL-8G-UaB" id="U6S-hc-OPo"/>
<outlet property="name_lbl" destination="Irg-02-L3a" id="0tX-bY-XaX"/>
<outlet property="status_lbl" destination="ZYP-Oa-jcS" id="9T0-8D-9Se"/>
<outlet property="top_line" destination="iGa-XE-p4p" id="hwo-Tt-Efg"/>
......
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_Top_Cell.swift
View file @ 25509395
......@@ -10,6 +10,8 @@ import UIKit
class Suc_Top_Cell: UITableViewCell {
@IBOutlet weak var wb_no_lbl: UILabel!
@IBOutlet weak var order_time_lbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
......
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_Top_Cell.xib
View file @ 25509395
......@@ -76,6 +76,10 @@
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="order_time_lbl" destination="yrp-xZ-8Q9" id="g7w-pW-qz6"/>
<outlet property="wb_no_lbl" destination="A6X-Ju-dRw" id="PtO-Dt-WMj"/>
</connections>
<point key="canvasLocation" x="-196" y="81"/>
</tableViewCell>
</objects>
......
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