diff --git a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate index b810c30a60430553ffbc7554f63dfb3e5a40382b..719a05438fb8554b9db778de83d55d52ac239875 100644 Binary files a/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate and b/GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/GeliBusinessPlatform/Model/UpDataModel.swift b/GeliBusinessPlatform/Model/UpDataModel.swift index f600c6cbd084867f4f52b9074d7c0ae491744a92..8791073155aede5957cdbde44cfc7970e314a611 100644 --- a/GeliBusinessPlatform/Model/UpDataModel.swift +++ b/GeliBusinessPlatform/Model/UpDataModel.swift @@ -8,7 +8,7 @@ import Foundation import ObjectMapper -//å‘é€éªŒè¯ç ,验è¯çŸä¿¡éªŒè¯ç ,修改登录密ç ,ç»‘å®šã€æ›´æ¢ç»‘å®šæ ¼åˆ©æ”¯ä»˜è´¦å·,简å•通用æ“作接å£,普通订å•å‘è´§,预售订å•å‘è´§,订å•绑定/æ›´æ¢ç»‘定客户,确认订å•,订å•å–æ¶ˆ,修改订å•商å“ä»·æ ¼,订å•退款,普通订å•退货,预售订å•退货,ä¿®æ”¹è®¢å•æ”¯ä»˜æ–¹å¼(状æ€),å•†å®¶ä»“åº“æ·»åŠ ,商家仓库修改,å•†å®¶ä»“åº“åˆ é™¤,æäº¤ä¸‹å•,商å“å…¥åº“å®¡æ ¸,商å“入库,商å“入库申请,商å“出库,商å“申请出库,商å“å®¡æ ¸å‡ºåº“,å‡ºåº“å…¥åº“å®¡æ ¸ä¸é€šè¿‡,编辑地å€,åˆ é™¤åœ°å€,新增采è´å•,å®¡æ ¸é‡‡è´å•,撤销入库,采è´å•修改支付状æ€,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,å–æ¶ˆé‡‡è´å•,修改采è´è®¢å•,新增å“牌,æ‹’ç»é€€æ¬¾,确认用户退款到账,æ‹’ç»æŽ¥å•,å®¡æ ¸åŒæ„退货退款,å–æ¶ˆè®¢å•å®¡æ ¸,确认收到退货,å®¡æ ¸åŒæ„退货或退款,订å•确认收货,å–æ¶ˆè¿å•,支付è¿è´¹,é€‰å®šåœ°å€æ·»åŠ æ”¶å‘货历å²,å–æ¶ˆè´§æ‹‰æ‹‰è®¢å•ï¼Œè´§æ‹‰æ‹‰äºŒæ¬¡æ”¯ä»˜ï¼Œè´§æ‹‰æ‹‰æ ¼åˆ©æ”¯ä»˜ï¼Œå‘票消æ¯çŸä¿¡é€šçŸ¥,修改电åå‘票链接地å€,分销分账设置,供应商新增店铺,æ ‡è®°å·²äººå·¥ç»“ç®—,é“ºè´§ä¸Žå–æ¶ˆé“ºè´§,终æ¢åˆä½œ,分销商å“管ç†,分销商新增供应商,å®¡æ ¸æ“作(通过和ä¸é€šè¿‡ï¼‰,åˆ é™¤å®¢æˆ·,新增分销员,åˆ é™¤åˆ†é”€å‘˜,修改ä¸äºŒåˆ¶æ²¹è®¢å•打å°,åº—é•¿å®¡æ ¸é€šè¿‡ã€å®¡æ ¸é€šè¿‡å¾…è¡¥é½èµ„æ–™ã€ä¸é€šè¿‡,ä¿å˜åº—é•¿å®¡æ ¸ä¿¡æ¯ï¼ˆå•†å®¶ä¿¡æ¯ï¼‰,æ‹¼æ‹¼è´§å–æ¶ˆè®¢å•,支付æ“作, +//å‘é€éªŒè¯ç ,验è¯çŸä¿¡éªŒè¯ç ,修改登录密ç ,ç»‘å®šã€æ›´æ¢ç»‘å®šæ ¼åˆ©æ”¯ä»˜è´¦å·,简å•通用æ“作接å£,普通订å•å‘è´§,预售订å•å‘è´§,订å•绑定/æ›´æ¢ç»‘定客户,确认订å•,订å•å–æ¶ˆ,修改订å•商å“ä»·æ ¼,订å•退款,普通订å•退货,预售订å•退货,ä¿®æ”¹è®¢å•æ”¯ä»˜æ–¹å¼(状æ€),å•†å®¶ä»“åº“æ·»åŠ ,商家仓库修改,å•†å®¶ä»“åº“åˆ é™¤,æäº¤ä¸‹å•,商å“å…¥åº“å®¡æ ¸,商å“入库,商å“入库申请,商å“出库,商å“申请出库,商å“å®¡æ ¸å‡ºåº“,å‡ºåº“å…¥åº“å®¡æ ¸ä¸é€šè¿‡,编辑地å€,åˆ é™¤åœ°å€,新增采è´å•,å®¡æ ¸é‡‡è´å•,撤销入库,采è´å•修改支付状æ€,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,å–æ¶ˆé‡‡è´å•,修改采è´è®¢å•,新增å“牌,æ‹’ç»é€€æ¬¾,确认用户退款到账,æ‹’ç»æŽ¥å•,å®¡æ ¸åŒæ„退货退款,å–æ¶ˆè®¢å•å®¡æ ¸,确认收到退货,å®¡æ ¸åŒæ„退货或退款,订å•确认收货,å–æ¶ˆè¿å•,支付è¿è´¹,é€‰å®šåœ°å€æ·»åŠ æ”¶å‘货历å²,å–æ¶ˆè´§æ‹‰æ‹‰è®¢å•ï¼Œè´§æ‹‰æ‹‰äºŒæ¬¡æ”¯ä»˜ï¼Œè´§æ‹‰æ‹‰æ ¼åˆ©æ”¯ä»˜ï¼Œå‘票消æ¯çŸä¿¡é€šçŸ¥,修改电åå‘票链接地å€,分销分账设置,供应商新增店铺,æ ‡è®°å·²äººå·¥ç»“ç®—,é“ºè´§ä¸Žå–æ¶ˆé“ºè´§,终æ¢åˆä½œ,分销商å“管ç†,分销商新增供应商,å®¡æ ¸æ“作(通过和ä¸é€šè¿‡ï¼‰,åˆ é™¤å®¢æˆ·,新增分销员,åˆ é™¤åˆ†é”€å‘˜,修改ä¸äºŒåˆ¶æ²¹è®¢å•打å°,åº—é•¿å®¡æ ¸é€šè¿‡ã€å®¡æ ¸é€šè¿‡å¾…è¡¥é½èµ„æ–™ã€ä¸é€šè¿‡,ä¿å˜åº—é•¿å®¡æ ¸ä¿¡æ¯ï¼ˆå•†å®¶ä¿¡æ¯ï¼‰,æ‹¼æ‹¼è´§å–æ¶ˆè®¢å•, class UpDataModel: Mappable { diff --git a/GeliBusinessPlatform/Model/getVehicleType_InterFace.swift b/GeliBusinessPlatform/Model/getVehicleType_InterFace.swift index 282ffa6dbeb5d696643b8d1502e80f4178e6e8d7..dd52512c91809fca2e2dbf4906bd1e107df57cb2 100644 --- a/GeliBusinessPlatform/Model/getVehicleType_InterFace.swift +++ b/GeliBusinessPlatform/Model/getVehicleType_InterFace.swift @@ -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 diff --git a/GeliBusinessPlatform/Model/pph/getVehicleType_model.swift b/GeliBusinessPlatform/Model/pph/getVehicleType_model.swift index 69f6cf18e7f8f97bf11bfc96cf9691d158914cef..e61243bbabcf67b7157370dac145f531ae1fb92a 100644 --- a/GeliBusinessPlatform/Model/pph/getVehicleType_model.swift +++ b/GeliBusinessPlatform/Model/pph/getVehicleType_model.swift @@ -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,æ‰èƒ½ç»§ç»èµ°æ”¯ä»˜æµç¨‹ï¼‰ diff --git "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" index 8a1b95123cf3fa9988010216e6dcfe87a52b33e1..ff1e84a8730647ee3908e34234df6bec30502517 100644 --- "a/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" +++ "b/GeliBusinessPlatform/ViewController/\344\273\243\345\256\242\344\270\213\345\215\225\357\274\210\350\264\247\350\277\220\357\274\211/\344\270\213\350\277\220\345\215\225/XiaYunDanViewController.swift" @@ -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 { diff --git "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/PPH_SUC_VC.swift" "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/PPH_SUC_VC.swift" index 6b4713e43076c4b67977653fa51c9b7e7e40b2c8..228f59fca66cd12cf2f5b2eb86491ea4552c274e 100644 --- "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/PPH_SUC_VC.swift" +++ "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/PPH_SUC_VC.swift" @@ -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! diff --git "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.swift" "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.swift" index 68820d3edbdbc3e60b03b5f60e37edae4a10717a..e38f192d17857b915d66cf047c95d464c873ca6d 100644 --- "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.swift" +++ "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.swift" @@ -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 { diff --git "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.xib" "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.xib" index fcb97ac5ce25313f914a0a611f773fb7f0040017..3b5e49f5a3a1e7b4b2305398024917405623d28e 100644 --- "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.xib" +++ "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_LOG_Cell.xib" @@ -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"/> diff --git "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.swift" "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.swift" index 548d249bd7c4105cae6519b3d339b27743774d92..84bfe9e94268e12e22399e1368db7939557c5498 100644 --- "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.swift" +++ "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.swift" @@ -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 diff --git "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.xib" "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.xib" index 5bdeb0ddfef02879fccad5f2dc45757aa4189dc4..d526fd1dfdf76ee47c9b726705cc5d3d4b3afed9 100644 --- "a/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.xib" +++ "b/GeliBusinessPlatform/ViewController/\346\213\274\346\213\274\350\264\247group/\344\270\213\345\215\225\346\210\220\345\212\237/Suc_Top_Cell.xib" @@ -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>