交易记录

liushiyu
1 parent d61a0385
Showing 24 changed files with 395 additions and 51 deletions
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInputMessageView.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopTransListViewController.swift
metaCode/Classes/Main/ShopPage/Controller/CNLiveShopTransViewController.swift
metaCode/Classes/Main/ShopPage/Model/CNLiveShopBaseModel.swift
metaCode/Classes/Main/ShopPage/View/CNLiveShopBodyTransListView.swift
metaCode/Classes/Main/ShopPage/ViewModel/CNLiveShopViewModel.swift
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_wweixinzf.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_wweixinzf.imageset/tsq_wweixinzf@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_wweixinzf.imageset/tsq_wweixinzf@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_yinlianzf.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_yinlianzf.imageset/tsq_yinlianzf@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_yinlianzf.imageset/tsq_yinlianzf@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_zhifubaozf.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_zhifubaozf.imageset/tsq_zhifubaozf@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/tsq_zhifubaozf.imageset/tsq_zhifubaozf@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/ye_wjjzf.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/ye_wjjzf.imageset/ye_wjjzf@2x.png
@@ -36,10 +36,10 @@ extension NSString {
         return false;
     }
-    /// 时间戳转字符串
+    /// 字符串转秒数
     /// - Parameter dateFormat: 时间格式
     /// - Returns: 返回
-    func timeStrChangeTotimeInterval(dateFormat:String?) -> String {
+    func timeStrChangeTotimeInterval(_ dateFormat:String? = "yyyy-MM-dd HH:mm:ss") -> String {
         if !self.isNotBlank() {
             return ""
         }
@@ -57,6 +57,26 @@ extension NSString {
         return "\(Int(date!.timeIntervalSince1970))"
     }
+    /// 字符串转date
+    /// - Parameter dateFormat: 日期格式
+    /// - Returns: 返回
+    func timeStrChangeTotimedate(_ dateFormat:String? = "yyyy-MM-dd HH:mm:ss") -> NSDate {
+        if !self.isNotBlank() {
+            return NSDate()
+        }
+        let format = DateFormatter.init()
+        format.dateStyle = .medium
+        format.timeStyle = .short
+        format.locale = Locale(identifier: "zh_CN")
+        format.timeZone = TimeZone(abbreviation: "UTC+8:00")
+        if dateFormat == nil {
+            format.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        }else{
+            format.dateFormat = dateFormat
+        }
+        return format.date(from: self as String)! as NSDate
+    }
+    
     /// 保留2位小数
     /// - Returns: 返回
     func keepTwoDecimalPlaces() -> String {
@@ -45,9 +45,9 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
                                      ["name":"更多设置","icon":"mine_list_icon_set_more"]]
         dataArray.add(array03)
-        let array04 : [Dictionary] = [["name":"订单列表","icon":"mine_list_icon_help_feedback"],
-                                      ["name":"交易记录","icon":"mine_list_icon_help_feedback"]]
-        dataArray.add(array04)
+//        let array04 : [Dictionary] = [["name":"订单列表","icon":"mine_list_icon_help_feedback"],
+//                                      ["name":"交易记录","icon":"mine_list_icon_help_feedback"]]
+//        dataArray.add(array04)
         return dataArray
     }()
@@ -181,7 +181,7 @@ extension CNLiveMineViewController {
                 self.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: true)
             }
             if indexPath.row == 1 {
-                
+                self.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: true)
             }
         }
@@ -547,6 +547,7 @@ enum CNLiveStandListAlertShowType {
     case text
     case date
     case string
+    case custom_date
 }
 class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
@@ -584,7 +585,7 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         datePicker.locale = Locale(identifier: "zh_CN")
         datePicker.setValue(HexColor("#3C3C3C"), forKey: "textColor")
         datePicker.datePickerMode = .date
-        datePicker.isHidden = !(_show_type == .date)
+        datePicker.isHidden = !(_show_type == .date || _show_type == .custom_date)
         if #available(iOS 13.4, *) {
             datePicker.preferredDatePickerStyle = .wheels
         } else {
@@ -651,6 +652,14 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             text = infos.firstObject as? Dictionary<String, String>
         } else if _show_type == .string {
             text = infos.firstObject as? String
+        } else if _show_type == .custom_date {
+            let current_date = infos.firstObject as! Date
+            let formatter = DateFormatter()
+            formatter.locale = Locale.init(identifier: "zh_CN")
+            formatter.dateFormat = (infos.lastObject as! String)
+            datePicker.setDate(current_date as Date, animated: true)
+            datePicker.maximumDate = current_date
+            text = formatter.string(from: datePicker.date)
         }else{
             let formatter = DateFormatter()
             formatter.dateFormat = "yyyy-MM-dd"
@@ -364,7 +364,7 @@ class MineInputTextShopCustomView: UIView, UITextViewDelegate, UITextFieldDelega
         contentTextView.resignFirstResponder()
         MineStandListAlertView.showStandListView(infos: dataArray, name:String(title[index...]), show_type:dataArray.count == 0 ? .date : .text, result: { [self] text in
             if dataArray.count == 0 {
-                _dict.setObject((text as! NSString).timeStrChangeTotimeInterval(dateFormat: "yyyy-MM-dd"), forKey: "content" as NSCopying)
+                _dict.setObject((text as! NSString).timeStrChangeTotimeInterval("yyyy-MM-dd"), forKey: "content" as NSCopying)
                 moreBtn.setTitle(text as? String, for: .normal)
             } else {
                 let dict = text as! NSDictionary
@@ -27,27 +27,47 @@ class CNLiveShopTransListViewController: CNLiveBaseViewController, UITableViewDe
     let kShopBodyTransListViewCellIdentifier = "kShopBodyTransListViewCellIdentifier"
     lazy var tableView : UITableView = {
-        let tableView = UITableView(frame: .zero, style: .grouped)
+        let tableView = UITableView(frame: .zero, style: .plain)
         tableView.dataSource = self
         tableView.delegate = self
         tableView.emptyDataSetSource = self
         tableView.emptyDataSetDelegate = self
-        tableView.backgroundColor = .clear
+        tableView.backgroundColor = .white
         tableView.tableFooterView = UIView.init()
+        tableView.contentInset = UIEdgeInsets(top: adapt_length(length: 82), left: 0, bottom: 0, right: 0)
+        tableView.scrollIndicatorInsets = UIEdgeInsets(top: adapt_length(length: 82), left: 0, bottom: 0, right: 0)
         tableView.separatorInset = UIEdgeInsets(top: 0, left: adapt_length(length: 20), bottom: 0, right: adapt_length(length: 20))
         tableView.register(ShopBodyTransListViewCell.self, forCellReuseIdentifier: kShopBodyTransListViewCellIdentifier)
         return tableView
     }()
+    lazy var headerView: ShopBodyTransListHeaderView = {
+        let headerView = ShopBodyTransListHeaderView.init(frame: CGRect.zero)
+        headerView.clickBlcok = { [self] headerView in
+            MineStandListAlertView.showStandListView(infos: [currentDate!,"YYYY年MM月"], name:"选择月份", show_type:.custom_date, result: { [self] text in
+                currentDate = (text as! NSString).timeStrChangeTotimedate("YYYY-MM-dd")
+                current_string = (text as! String)
+                let array = (text as! NSString).components(separatedBy: "-") as NSArray
+                headerView.dateLab.text = "\(array[0])年\(array[1])月"
+                loadDataSourceAction()
+            })
+        }
+        return headerView
+    }()
+    
     lazy var dataArray: NSMutableArray = {
         let dataArray = NSMutableArray.init()
         return dataArray
     }()
-
-    var pageNum: NSInteger
+    
+    var currentDate: NSDate!
+    var current_string: String!
     var network_type: CNLiveMineResponseType!
-    init() {
-        self.pageNum = 1
+    var _show_type:CNLiveShopTransListShowType!
+    init(show_type: CNLiveShopTransListShowType) {
+        _show_type = show_type
+        currentDate = Date() as NSDate
+        current_string = NSDate.timeIntervalChangeToTimeStr(timeInterval: 0)
        super.init(nibName:nil, bundle:nil)
     }
@@ -59,27 +79,49 @@ class CNLiveShopTransListViewController: CNLiveBaseViewController, UITableViewDe
         super.viewDidLoad()
         view.backgroundColor = HexColor("#FAFAFA")
+        loadDataSourceAction()
+        
         view.addSubview(tableView)
         tableView.snp.makeConstraints { make in
             make.top.equalToSuperview()
             make.bottom.left.right.equalToSuperview()
         }
+        view.addSubview(headerView)
+        headerView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(adapt_length(length: 82))
+        }
     }
-    func loadDataSourceAction(page: NSInteger) {
-        
+    func loadDataSourceAction() {
+        showLoading(message: "")
+        CNLiveShopViewModel.requestAccount(date: current_string, type: _show_type) { [weak self] result, respStatue in
+            if respStatue == .success {
+                let baseModel = (result as! ShopOrderTransBaseDataModel)
+                self!.dataArray.addObjects(from: (result as! ShopOrderTransBaseDataModel).list)
+                self!.tableView.reloadData()
+                if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                    self!.addRefreshView()
+                }
+                self!.headerView.priceLab.text = "支出 ¥\(baseModel.payment ?? "0.00") 收入 ¥\(baseModel.income ?? "0.00")"
+            }else if (respStatue == .noNetwork) {
+                self!.network_type = .noNetwork
+                self!.tableView.reloadEmptyDataSet()
+            } else {
+                self!.network_type = .failed
+                self!.tableView.reloadEmptyDataSet()
+            }
+        }
     }
-    
     func addRefreshView() {
         tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
-            self!.pageNum = 1
-            self!.loadDataSourceAction(page: 1)
+            self!.tableView.mj_header?.endRefreshing()
         })
         tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
-            self!.pageNum = self!.pageNum + 1
-            self!.loadDataSourceAction(page: self!.pageNum)
+            self!.tableView.mj_footer?.endRefreshing()
+            self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
         })
     }
@@ -98,15 +140,24 @@ extension CNLiveShopTransListViewController {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kShopBodyTransListViewCellIdentifier) as? ShopBodyTransListViewCell else {
             return ShopBodyTransListViewCell()
         }
+        cell.setupWithDataSource(listModel: dataArray[indexPath.row] as! ShopOrderTransListDataModel)
         return cell
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return adapt_length(length: 110)
+        return adapt_length(length: 75)
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-
+        let listModel = self.dataArray[indexPath.row] as! ShopOrderTransListDataModel
+        if listModel.type == "1" {
+            if listModel.title == "order" {
+                self.navigationController?.pushViewController(CNLiveShopOrderDetailViewController.init(orderId: listModel.order_id!, show_type: .order, form_type: .afterSale), animated: true)
+            }
+            if listModel.title == "foods_order" {
+                
+            }
+        }
     }
 }
@@ -150,7 +201,7 @@ extension CNLiveShopTransListViewController {
     func emptyDataSet(_ scrollView: UIScrollView, didTapView view: UIView) {
         if network_type == .failed || network_type == .noNetwork  {
-            loadDataSourceAction(page: 1)
+            loadDataSourceAction()
         }
     }
 }
@@ -13,14 +13,15 @@ class CNLiveShopTransViewController: CNLiveBaseViewController {
     lazy var viewControllers: NSMutableArray = {
         let viewControllers = NSMutableArray.init()
-        viewControllers.add(CNLiveShopTransListViewController.init())
-        viewControllers.add(CNLiveShopTransListViewController.init())
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .all))
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .income))
+        viewControllers.add(CNLiveShopTransListViewController.init(show_type: .outcome))
         return viewControllers
     }()
     lazy var dataSource: JXSegmentedNumberDataSource = {
         let dataSource = JXSegmentedNumberDataSource()
-        dataSource.titles = ["达人","电商"]
+        dataSource.titles = ["全部","收入","支出"]
         dataSource.numbers = [0,0,0,0]
         dataSource.isTitleColorGradientEnabled = true
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
@@ -49,18 +50,7 @@ class CNLiveShopTransViewController: CNLiveBaseViewController {
         return categoryView
     }()
-    
-    lazy var screenButton: UIButton = {
-        let screenButton = UIButton.init(type: .custom)
-        screenButton.frame = CGRect(x: KSreenWidth - adapt_length(length: 40), y: (get_system_nav_height() - (get_system_statusBar_height() + adapt_length(length: 30)))/2 + get_system_statusBar_height(), width: adapt_length(length: 30), height: adapt_length(length: 30))
-        screenButton.setImage(UIImage(named: "DS_order_search"), for: .normal)
-        screenButton.backgroundColor = .clear
-        screenButton.layer.masksToBounds  = true
-        screenButton.layer.cornerRadius = 5
-        screenButton.addTarget(self, action: #selector(screenButtonClick), for: .touchUpInside)
-        return screenButton
-    }()
-    
+        
     lazy var listContainerView: JXSegmentedListContainerView! = {
         return JXSegmentedListContainerView(dataSource: self)
     }()
@@ -85,9 +75,6 @@ class CNLiveShopTransViewController: CNLiveBaseViewController {
         categoryView.listContainer = listContainerView
         view.addSubview(listContainerView)
-        
-        topNavView.addSubview(screenButton)
-        
     }
     override func viewDidLayoutSubviews() {
@@ -96,12 +83,6 @@ class CNLiveShopTransViewController: CNLiveBaseViewController {
         categoryView.frame = CGRect(x: 0, y: KNavigationHeight, width: view.bounds.size.width, height: CGFloat(kCNLiveShopOrderListSectionTitleHeight))
         listContainerView.frame = CGRect(x: 0, y: KNavigationHeight+CGFloat(kCNLiveShopOrderListSectionTitleHeight), width: view.bounds.size.width, height: view.bounds.size.height - CGFloat(kCNLiveShopOrderListSectionTitleHeight) - KNavigationHeight)
     }
-    
-    @objc func screenButtonClick() {
-
-    }
-    
-    
 }
 extension CNLiveShopTransViewController: JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
@@ -249,5 +249,39 @@ class ShopOrderExpressDetailDateModel: BaseModel {
             })
     }
 }
+//!!!: 电商流水数据
+class ShopOrderTransBaseDataModel: BaseModel {
+    var payment: String? = ""// 支出
+    var income: String? = ""// 收入
+    var list = [ShopOrderTransListDataModel]()// 电商流水
+}
+class ShopOrderTransListDataModel: BaseModel {
+    var id: String? = ""//  id
+    var uid: String? = ""//  用户id
+    var price: String? = ""//  金钱
+    var addtime: String? = ""//  时间戳
+    var type: String? = ""// 1 收入 2 支出
+    var title: String? = ""//   order电商 foods_order美食
+    var order_id: String? = ""// 订单id
+    var payment: String? = ""//  1支付宝 2微信 3银联 4钱包
+    var img: String? = ""//  头像
+    var username: String? = ""//  昵称
+    
+    override func mapping(mapper: HelpingMapper) {
+        mapper <<<
+            self.addtime <-- TransformOf(fromJSON: { (raw) -> String in
+                if raw!.count > 0 {
+                    let date = NSDate(timeIntervalSince1970: TimeInterval(raw!)!)
+                    let dateFormatter = DateFormatter()
+                    dateFormatter.locale = Locale.init(identifier: "zh_CN")
+                    dateFormatter.dateFormat = "YYYY-MM-dd hh:mm:SS"
+                    return dateFormatter.string(from: date as Date)
+                }
+                return raw!
+            }, toJSON: { (tuple) -> String? in
+                return tuple
+            });
+    }
+}
@@ -6,6 +6,74 @@
 //
 import Foundation
+import Kingfisher
+
+typealias clickTransListHeaderCallBack = (_ headerView: ShopBodyTransListHeaderView) -> Void
+class ShopBodyTransListHeaderView: UIView {
+    
+    lazy var dateLab: UILabel = {
+        let dateLab = UILabel.init()
+        dateLab.textColor = HexColor("#333333")
+        dateLab.font = medium_adapt_font(pointSize: 16)
+        dateLab.text = NSDate.timeIntervalChangeToTimeStr(timeInterval: NSDate().timeIntervalSince1970, "YYYY年M月")
+        return dateLab
+    }()
+    
+    lazy var downArrowImageView: UIImageView = {
+        let downArrowImageView = UIImageView.init(image: UIImage(named: "ye_xl"))
+        downArrowImageView.contentMode = .scaleAspectFit
+        downArrowImageView.clipsToBounds = true
+        return downArrowImageView
+    }()
+    
+    lazy var priceLab: UILabel = {
+        let priceLab = UILabel.init()
+        priceLab.textColor = HexColor("#9d9d9d")
+        priceLab.font = medium_adapt_font(pointSize: 14)
+        priceLab.text = "支出 ¥0.00 收入 ¥0.00"
+        return priceLab
+    }()
+    
+    var clickBlcok: clickTransListHeaderCallBack!
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = HexColor("#f6f6f6")
+        
+        addSubview(dateLab)
+        dateLab.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(adapt_length(length: 20))
+            make.height.equalTo(adapt_length(length: 23))
+            make.width.lessThanOrEqualTo(adapt_length(length: 300))
+        }
+        addSubview(downArrowImageView)
+        downArrowImageView.snp.makeConstraints { make in
+            make.left.equalTo(dateLab.snp.right).offset(adapt_length(length: 5))
+            make.centerY.equalTo(dateLab)
+            make.size.equalTo(CGSize(width: adapt_length(length: 10), height: adapt_length(length: 10)))
+        }
+        addSubview(priceLab)
+        priceLab.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(adapt_length(length: 20))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
+            make.top.equalTo(dateLab.snp.bottom).offset(adapt_length(length: 5))
+            make.height.equalTo(adapt_length(length: 20))
+        }
+        
+        isUserInteractionEnabled = true
+        let tap = UITapGestureRecognizer(target: self, action: #selector(selfTap))
+        addGestureRecognizer(tap)
+    }
+    
+    @objc func selfTap() {
+        if (clickBlcok != nil) {
+            clickBlcok(self)
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
 class ShopBodyTransListViewCell: UITableViewCell {
@@ -71,19 +139,38 @@ class ShopBodyTransListViewCell: UITableViewCell {
         }
         addSubview(payTypeImageView)
         payTypeImageView.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
             make.top.equalToSuperview().offset(adapt_length(length: 17))
             make.size.equalTo(payTypeImageView.size)
         }
         addSubview(priceLab)
         priceLab.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-adapt_length(length: 15))
+            make.right.equalToSuperview().offset(-adapt_length(length: 20))
             make.left.equalTo(timeLabel.snp.right).offset(adapt_length(length: 15))
             make.top.equalTo(payTypeImageView.snp.bottom).offset(4)
             make.height.equalTo(adapt_length(length: 25))
         }
     }
+    func setupWithDataSource(listModel: ShopOrderTransListDataModel) {
+        iconImageView.kf.setImage(with: URL(string: listModel.img!), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: adapt_length(length: 40), height: adapt_length(length: 40))))
+        titleLabel.text = listModel.username
+        timeLabel.text = listModel.addtime
+        if listModel.payment == "1" {
+            payTypeImageView.image = UIImage(named: "tsq_zhifubaozf")
+        }
+        if listModel.payment == "2" {
+            payTypeImageView.image = UIImage(named: "tsq_wweixinzf")
+        }
+        if listModel.payment == "3" {
+            payTypeImageView.image = UIImage(named: "tsq_yinlianzf")
+        }
+        if listModel.payment == "4" {
+            payTypeImageView.image = UIImage(named: "ye_wjjzf")
+        }
+        priceLab.text = listModel.price
+    }
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -538,7 +538,6 @@ class CNLiveShopViewModel: NSObject {
         if networkType == .refundExpress {
             url = "/api/v1/getRefundExpress"
         }
-
         let custom_param = NSMutableDictionary()
         custom_param.setValue(APPId_wjj, forKey: "appId")
         custom_param.setValue(APPKey_wjj, forKey: "appKey")
@@ -575,4 +574,57 @@ class CNLiveShopViewModel: NSObject {
         }
     }
+    ///  电商商家流水
+    /// - Parameters:
+    ///   - date: 时间
+    ///   - type: 0 全部 1 收入 2 支出
+    ///   - resultBlock: 返回
+    static func requestAccount(date: String, type:CNLiveShopTransListShowType, resultBlock: @escaping resultShopBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "uid")
+        param.setValue(date, forKey: "date")
+        if type == .all {
+            param.setValue("0", forKey: "type")
+        }
+        if type == .income {
+            param.setValue("1", forKey: "type")
+        }
+        if type == .outcome {
+            param.setValue("2", forKey: "type")
+        }
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(APPId_wjj, forKey: "appId")
+        custom_param.setValue(APPKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseWjjBUrl+"/api/v1/getShopAccount", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["code"] ?? "0")"
+                if (errorCode == "200") {
+                    if resp["data"] is NSNull {
+                        resultBlock(NSNull(),.failed)
+                    } else {
+                        let model = dictionaryToModel(resp as! [String : Any], ShopOrderTransBaseDataModel.self,"data") as! ShopOrderTransBaseDataModel
+                        resultBlock(model,.success)
+                    }
+                } else {
+                    showMessage(message: resp["message"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "请求失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
 }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_wweixinzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_wweixinzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_yinlianzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_yinlianzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "tsq_zhifubaozf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "tsq_zhifubaozf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ye_wjjzf@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ye_wjjzf@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "ye_xl@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "ye_xl@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}