no message

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -47,6 +47,7 @@
 		A70EBBC022561179000AD74F /* Extension+UITableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A70EBBBF22561179000AD74F /* Extension+UITableView.swift */; };
 		A7146349228EFCE20066099B /* ORSKUDataFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = A7146347228EFCE20066099B /* ORSKUDataFilter.m */; };
 		A714634E228F020A0066099B /* ORSKUDataFilterSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = A714634D228F020A0066099B /* ORSKUDataFilterSwift.swift */; };
+		A715333E22980CC60017C861 /* ConfigModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A715333D22980CC60017C861 /* ConfigModel.swift */; };
 		A71738A622897892000AEA6A /* SwiftMoyaServiceShopApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A71738A522897892000AEA6A /* SwiftMoyaServiceShopApi.swift */; };
 		A71738A822897E96000AEA6A /* SwiftMoyaNetWorkServiceShop.swift in Sources */ = {isa = PBXBuildFile; fileRef = A71738A722897E96000AEA6A /* SwiftMoyaNetWorkServiceShop.swift */; };
 		A71738AB22898660000AEA6A /* ShopModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A71738AA22898660000AEA6A /* ShopModel.swift */; };
@@ -432,6 +433,7 @@
 		A7146347228EFCE20066099B /* ORSKUDataFilter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORSKUDataFilter.m; sourceTree = "<group>"; };
 		A7146348228EFCE20066099B /* ORSKUDataFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORSKUDataFilter.h; sourceTree = "<group>"; };
 		A714634D228F020A0066099B /* ORSKUDataFilterSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ORSKUDataFilterSwift.swift; sourceTree = "<group>"; };
+		A715333D22980CC60017C861 /* ConfigModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigModel.swift; sourceTree = "<group>"; };
 		A71738A522897892000AEA6A /* SwiftMoyaServiceShopApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceShopApi.swift; sourceTree = "<group>"; };
 		A71738A722897E96000AEA6A /* SwiftMoyaNetWorkServiceShop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceShop.swift; sourceTree = "<group>"; };
 		A71738AA22898660000AEA6A /* ShopModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ShopModel.swift; sourceTree = "<group>"; };
@@ -2229,6 +2231,7 @@
 		A79057032276D5FE0037F823 /* ConfigModel */ = {
 			isa = PBXGroup;
 			children = (
+				A715333D22980CC60017C861 /* ConfigModel.swift */,
 				A79057052276EA3D0037F823 /* OpenCityListModel.swift */,
 				A757C92F2274839900226355 /* SelfMentionAddressListModel.swift */,
 				BDD22F0A228FAA5B00D43BFB /* ImageUrlModel.swift */,
@@ -3445,6 +3448,7 @@
 				A7824B062271F25400ABA381 /* EditAddressTableViewCell.swift in Sources */,
 				A70B2C4C228845E800B2449F /* ProductDetailParameterTableViewCell.swift in Sources */,
 				A7FF156A228C6E3600A85748 /* OrderProductTableViewCell.swift in Sources */,
+				A715333E22980CC60017C861 /* ConfigModel.swift in Sources */,
 				A70EBBC022561179000AD74F /* Extension+UITableView.swift in Sources */,
 				A72A72B022321DE000B21995 /* CGView.swift in Sources */,
 				A7A98E0B227EBD04005306E9 /* CategorySearchView.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/View/OrderFinishPayFailureCell.swift

@@ -109,7 +109,6 @@ class OrderFinishPayFailureCell: UITableViewCell {
     
     private lazy var describeLabel: UILabel = {
         let describeLabel = UILabel()
-        describeLabel.text = "20秒未支付，系统自动判断失败"
         describeLabel.textColor = k666666Color
         describeLabel.font = kRegularFont13
         describeLabel.textAlignment = .center
@@ -132,4 +131,10 @@ class OrderFinishPayFailureCell: UITableViewCell {
         return jumpButton
     }()
     
+    var configModel: ConfigModel? {
+        didSet {
+            describeLabel.text = "\(configModel?.orderExpiredTime ?? "15")秒未支付，系统自动判断失败"
+        }
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/View/OrderFinishPayView.swift

@@ -29,6 +29,11 @@ class OrderFinishPayView: BaseView {
         }
     }
     
+    var configModel: ConfigModel? {
+        didSet {
+            self.tableView.reloadSections([0], with: UITableView.RowAnimation.none)
+        }
+    }
     override func setupViews() {
         self.backgroundColor = kf7f8faColor
         addSubview(tableView)
@@ -83,6 +88,7 @@ extension OrderFinishPayView : UITableViewDelegate, UITableViewDataSource {
             } else {
                 // 支付失败
                 let fCell = OrderFinishPayFailureCell.cellWith(tableView: tableView, indexPath: indexPath)
+                fCell.configModel = self.configModel
                 fCell.repayBlock = {
                     [weak self] in
                     if let repayTransBlock = self?.repayTransBlock {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderFinishPay/ViewController/OrderFinishPayController.swift

@@ -62,6 +62,10 @@ class OrderFinishPayController: BaseViewController {
     
     override func setupData() {
         
+        if !(payStatus ?? true) {
+           configPickupNodeIndexApi()
+        }
+        
         finishPayView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { [weak self] (page) in
             self?.productHotSaleApi(page: page)
         }
@@ -146,4 +150,10 @@ class OrderFinishPayController: BaseViewController {
         }
     }
     
+    func configPickupNodeIndexApi() {
+        SwiftMoyaNetWorkServiceConfig.shared().configPickupNodeIndexApi {
+            [weak self] (configModel) -> (Void) in
+            self?.finishPayView.configModel = configModel as? ConfigModel
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Service/Model/ConfigModel/ConfigModel.swift

@@ -0,0 +1,48 @@
+//
+//	ConfigModel.swift
+//	Model file generated using JSONExport: https://github.com/Ahmed-Ali/JSONExport
+
+import Foundation 
+import ObjectMapper
+
+
+class ConfigModel : NSObject, NSCoding, Mappable{
+
+	var orderExpiredTime : String?
+
+
+	class func newInstance(map: Map) -> Mappable?{
+		return ConfigModel()
+	}
+	required init?(map: Map){}
+	private override init(){}
+
+	func mapping(map: Map)
+	{
+		orderExpiredTime <- map["order_expired_time"]
+		
+	}
+
+    /**
+    * NSCoding required initializer.
+    * Fills the data from the passed decoder
+    */
+    @objc required init(coder aDecoder: NSCoder)
+	{
+         orderExpiredTime = aDecoder.decodeObject(forKey: "order_expired_time") as? String
+
+	}
+
+    /**
+    * NSCoding required method.
+    * Encodes mode properties into the decoder
+    */
+    @objc func encode(with aCoder: NSCoder)
+	{
+		if orderExpiredTime != nil{
+			aCoder.encode(orderExpiredTime, forKey: "order_expired_time")
+		}
+
+	}
+
+}

RainbowPlanet/RainbowPlanet/Service/Model/OrderModel/OrderApplyRefundModel.swift

@@ -23,7 +23,7 @@ class OrderApplyRefundModel : NSObject, Mappable{
     
     func mapping(map: Map)
     {
-        refundNo <- map["refund_no"]
+        refundNo <- map["purchase_no"]
         
     }
     

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -22,6 +22,21 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
     /// 数据回调
     typealias apiCallBack = (Any) -> (Void)
     
+
+    
+    /// 前端config配置
+    ///
+    /// - Parameter completion: 回调
+    func configPickupNodeIndexApi(completion: @escaping apiCallBack) {
+        let parameters = Dictionary<String,Any>()
+        
+        SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().request(ConfigModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) {(configModel) in
+            SwiftProgressHUD.shared().hide()
+            completion(configModel)
+        }
+    }
+    
     /// 自提点列表
     ///
     /// - Parameters:

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaServiceConfigApi.swift

@@ -25,6 +25,10 @@ public let kConfigUploadSingleImgApi = "/config/upload"
 /// 多图上传
 public let kConfigUploadMultiImgApi = "/config/multi_upload"
 
+// MARK: - 前端config配置
+/// 前端config配置
+public let kConfigConfigApi = "/config/config"
+
 
 /// 基础配置
 ///
@@ -33,6 +37,7 @@ public let kConfigUploadMultiImgApi = "/config/multi_upload"
 /// - configUploadSingleImg: 单图上传
 /// - configUploadMultiImg: 单图上传
 public enum SwiftMoyaServiceConfigApi {
+    case configConfig(parameters:Dictionary<String,Any>)
     case configPickupNodeIndex(parameters:Dictionary<String, Any>)
     case configCityManagementIndex(parameters:Dictionary<String, Any>)
     case configUploadSingleImg(parameters:Dictionary<String, Any>,dataArray:Array<Any>)
@@ -43,7 +48,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
     
     public var baseURL: URL {
         switch self {
-        case .configPickupNodeIndex,
+        case .configConfig,
+             .configPickupNodeIndex,
              .configCityManagementIndex,
              .configUploadSingleImg,
              .configUploadMultiImg
@@ -54,6 +60,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
     
     public var path: String {
         switch self {
+        case .configConfig:
+            return kConfigConfigApi
         case .configPickupNodeIndex:
             return kConfigPickupNodeIndexApi
         case .configCityManagementIndex:
@@ -67,7 +75,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
     
     public var method: Moya.Method {
         switch self {
-        case .configPickupNodeIndex,
+        case .configConfig,
+             .configPickupNodeIndex,
              .configCityManagementIndex
             :
             return .get
@@ -81,7 +90,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
     // MARK: - 请求任务事件（这里附带上参数）
     public var task: Task {
         switch self {
-        case .configPickupNodeIndex(var parameters),
+        case .configConfig(var parameters),
+             .configPickupNodeIndex(var parameters),
              .configCityManagementIndex(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
@@ -111,7 +121,8 @@ extension SwiftMoyaServiceConfigApi: TargetType {
     public var headers: [String : String]? {
         //同task，具体选择看后台 有application/x-www-form-urlencoded 、application/json
         switch self {
-        case .configPickupNodeIndex,
+        case .configConfig,
+             .configPickupNodeIndex,
              .configCityManagementIndex,
              .configUploadSingleImg,
              .configUploadMultiImg