日志

CommonFrame/MachineLogListCell.swift

@@ -0,0 +1,36 @@
+//
+//  MachineLogListCell.swift
+//  xingchuangke
+//
+//  Created by 刘惠萍 on 2023/5/21.
+//
+
+import UIKit
+
+class MachineLogListCell: UITableViewCell {
+
+    @IBOutlet weak var bgView: UIView!                  // 背景
+    @IBOutlet weak var snLbl: UILabel!       // sn
+    @IBOutlet weak var snCodeLbl: UILabel!               // 品牌
+    @IBOutlet weak var timeLbl: UILabel!                // 活动时间
+
+    @IBOutlet weak var earnTitleLbl: UILabel!           // 金额标题
+    @IBOutlet weak var earnLbl: UILabel!                // 金额
+    @IBOutlet weak var rewardTitleLbl: UILabel!         // 奖励标题
+    @IBOutlet weak var rewardLbl: UILabel!              // 奖励
+
+    @IBOutlet var oldLbl: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+}
+

CommonFrame/MachineLogListCell.xib

@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="174" id="KGk-i7-Jjw" customClass="MachineLogListCell" customModule="xingchuangke" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="348" height="174"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="348" height="174"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wjz-oK-awV">
+                        <rect key="frame" x="15" y="7" width="318" height="160"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sn" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A7R-mP-pdh">
+                                <rect key="frame" x="15" y="25" width="17" height="18"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gUF-2W-fOn">
+                                <rect key="frame" x="15" y="66.5" width="288" height="60"/>
+                                <subviews>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="现用户" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XIk-X3-zpk">
+                                        <rect key="frame" x="15" y="4" width="40" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="陈雅新" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="95a-jY-F6R">
+                                        <rect key="frame" x="15" y="44" width="40" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" red="0.48290830849999999" green="0.52876102920000001" blue="0.57647734880000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="操作员" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oo5-jN-UKM">
+                                        <rect key="frame" x="233" y="4" width="40" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文员1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wo2-6a-7bo">
+                                        <rect key="frame" x="240.5" y="44" width="32.5" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" red="0.48290830849999999" green="0.52876102920000001" blue="0.57647734880000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原用户" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cu0-hg-wHY">
+                                        <rect key="frame" x="124" y="4" width="40" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="陈雅新" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cz8-kF-OV5">
+                                        <rect key="frame" x="124" y="44" width="40" height="16"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                        <color key="textColor" red="0.48290830849999999" green="0.52876102920000001" blue="0.57647734880000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" red="0.80000001190000003" green="0.80000001190000003" blue="0.80000001190000003" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <constraints>
+                                    <constraint firstItem="XIk-X3-zpk" firstAttribute="leading" secondItem="gUF-2W-fOn" secondAttribute="leading" constant="15" id="0GI-o1-lnU"/>
+                                    <constraint firstItem="95a-jY-F6R" firstAttribute="leading" secondItem="XIk-X3-zpk" secondAttribute="leading" id="2LM-Xz-VjB"/>
+                                    <constraint firstAttribute="trailing" secondItem="oo5-jN-UKM" secondAttribute="trailing" constant="15" id="3Oz-er-Qbr"/>
+                                    <constraint firstItem="95a-jY-F6R" firstAttribute="bottom" secondItem="gUF-2W-fOn" secondAttribute="bottom" id="5Pa-u3-2fz"/>
+                                    <constraint firstItem="wo2-6a-7bo" firstAttribute="top" secondItem="95a-jY-F6R" secondAttribute="top" id="7BZ-ns-ee9"/>
+                                    <constraint firstItem="XIk-X3-zpk" firstAttribute="top" secondItem="gUF-2W-fOn" secondAttribute="top" constant="4" id="Dja-as-JMO"/>
+                                    <constraint firstItem="cu0-hg-wHY" firstAttribute="top" secondItem="XIk-X3-zpk" secondAttribute="top" id="FbN-Ag-0Mi"/>
+                                    <constraint firstItem="oo5-jN-UKM" firstAttribute="top" secondItem="XIk-X3-zpk" secondAttribute="top" id="Jld-dl-QlP"/>
+                                    <constraint firstItem="wo2-6a-7bo" firstAttribute="trailing" secondItem="oo5-jN-UKM" secondAttribute="trailing" id="Lf4-g6-rT5"/>
+                                    <constraint firstItem="cu0-hg-wHY" firstAttribute="centerX" secondItem="gUF-2W-fOn" secondAttribute="centerX" id="YDA-9a-DP6"/>
+                                    <constraint firstItem="Cz8-kF-OV5" firstAttribute="top" secondItem="95a-jY-F6R" secondAttribute="top" id="YTJ-ag-v5O"/>
+                                    <constraint firstAttribute="height" constant="60" id="bYQ-mJ-53A"/>
+                                    <constraint firstItem="wo2-6a-7bo" firstAttribute="bottom" secondItem="gUF-2W-fOn" secondAttribute="bottom" id="meg-e0-i7e"/>
+                                    <constraint firstItem="Cz8-kF-OV5" firstAttribute="centerX" secondItem="cu0-hg-wHY" secondAttribute="centerX" id="zyM-Oo-5yd"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="5"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2023-05-17 16:54:44" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rda-Su-GMt">
+                                <rect key="frame" x="15" y="136.5" width="114" height="13.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                <color key="textColor" red="0.60000008339999999" green="0.60000008339999999" blue="0.60000008339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HKKP000000005800" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mq2-cA-vZb">
+                                <rect key="frame" x="42" y="27" width="123.5" height="14.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <color key="textColor" red="0.60000008339999999" green="0.60000008339999999" blue="0.60000008339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="划拨" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zog-jS-WFH">
+                                <rect key="frame" x="278" y="26.5" width="25" height="15"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <color key="textColor" red="0.60000008339999999" green="0.60000008339999999" blue="0.60000008339999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="0.92941170930000006" green="0.92941176889999999" blue="0.92941176889999999" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                        <constraints>
+                            <constraint firstItem="Rda-Su-GMt" firstAttribute="top" secondItem="gUF-2W-fOn" secondAttribute="bottom" constant="10" id="6E1-OS-Gk0"/>
+                            <constraint firstItem="Rda-Su-GMt" firstAttribute="bottom" secondItem="Wjz-oK-awV" secondAttribute="bottom" constant="-10" id="GUa-E9-hco"/>
+                            <constraint firstItem="gUF-2W-fOn" firstAttribute="leading" secondItem="Wjz-oK-awV" secondAttribute="leading" constant="15" id="RTw-s6-Av6"/>
+                            <constraint firstItem="Zog-jS-WFH" firstAttribute="trailing" secondItem="gUF-2W-fOn" secondAttribute="trailing" id="UTP-2B-a6Q"/>
+                            <constraint firstItem="A7R-mP-pdh" firstAttribute="leading" secondItem="Wjz-oK-awV" secondAttribute="leading" constant="15" id="XX1-hT-P7A"/>
+                            <constraint firstItem="Mq2-cA-vZb" firstAttribute="centerY" secondItem="A7R-mP-pdh" secondAttribute="centerY" id="Xvy-rg-wAY"/>
+                            <constraint firstItem="gUF-2W-fOn" firstAttribute="centerX" secondItem="Wjz-oK-awV" secondAttribute="centerX" id="bv3-4R-Hrl"/>
+                            <constraint firstItem="Zog-jS-WFH" firstAttribute="centerY" secondItem="Mq2-cA-vZb" secondAttribute="centerY" id="hhv-js-G6R"/>
+                            <constraint firstItem="Rda-Su-GMt" firstAttribute="leading" secondItem="Wjz-oK-awV" secondAttribute="leading" constant="15" id="uav-d2-SoV"/>
+                            <constraint firstItem="Mq2-cA-vZb" firstAttribute="leading" secondItem="A7R-mP-pdh" secondAttribute="trailing" constant="10" id="x7q-DX-Hr7"/>
+                            <constraint firstItem="A7R-mP-pdh" firstAttribute="top" secondItem="Wjz-oK-awV" secondAttribute="top" constant="25" id="yaX-Zn-vYc"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="10"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Wjz-oK-awV" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="HgG-0B-hZH"/>
+                    <constraint firstItem="Wjz-oK-awV" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailing" constant="-15" id="Wbo-yS-fXc"/>
+                    <constraint firstItem="Wjz-oK-awV" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="7" id="WyL-p4-Tr5"/>
+                    <constraint firstItem="Wjz-oK-awV" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="gsU-UI-gUw"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="bgView" destination="Wjz-oK-awV" id="wFr-Sf-J4N"/>
+                <outlet property="earnLbl" destination="95a-jY-F6R" id="PPR-WH-DOf"/>
+                <outlet property="earnTitleLbl" destination="XIk-X3-zpk" id="1Cm-OD-GV0"/>
+                <outlet property="oldLbl" destination="Cz8-kF-OV5" id="jvv-AN-hdE"/>
+                <outlet property="rewardLbl" destination="wo2-6a-7bo" id="VoF-BY-kOz"/>
+                <outlet property="rewardTitleLbl" destination="oo5-jN-UKM" id="isF-Dy-liL"/>
+                <outlet property="snCodeLbl" destination="Mq2-cA-vZb" id="l6L-OA-qni"/>
+                <outlet property="snLbl" destination="A7R-mP-pdh" id="VuR-g6-cat"/>
+                <outlet property="timeLbl" destination="Rda-Su-GMt" id="K7R-hR-wS8"/>
+            </connections>
+            <point key="canvasLocation" x="155.07246376811597" y="135.9375"/>
+        </tableViewCell>
+    </objects>
+</document>

CommonFrame/MachineLogListViewController.swift

@@ -0,0 +1,103 @@
+//
+//  MachineLogListViewController.swift
+//  xingchuangke
+//
+//  Created by 刘惠萍 on 2023/5/21.
+//
+
+import UIKit
+
+class MachineLogListViewController: BaseViewController, UITableViewDelegate, UITableViewDataSource {
+
+    let tableView: UITableView = {
+        let tab = UITableView.init(frame: CGRect.zero, style: .plain)
+        tab.tableFooterView = UIView.init()
+        return tab
+    }()
+
+    var selectedActivityId: String = ""
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        appDelegate.setNavigationBarHidden(isHidden: false)
+        self.title = "调拨日志"
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = UIColor.white
+        initNavLeftBackButton()
+
+        tableView.frame = self.view.bounds
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.separatorStyle = .none
+        tableView.register(UINib(nibName: "MachineLogListCell", bundle: nil), forCellReuseIdentifier: "MachineLogListCell")
+        self.view.addSubview(tableView)
+        tableView.tableFooterView = UIView.init()
+        tableView.showsVerticalScrollIndicator = false
+        tableView.estimatedRowHeight = 100
+        tableView.mj_header = MJRefreshNormalHeader(refreshingBlock: {[weak self] in
+            self!.currentPage = 1
+            self!.loadData()
+        })
+        tableView.mj_header?.lastUpdatedTimeKey = "ShowTableViewCell"
+        loadData()
+    }
+
+    // MARK: request
+    func loadData() {
+        let url = RequestURL.machineAllocationLog
+        let params = NSMutableDictionary()
+        params.setValue(CommonValue.getUserId(), forKey: "userId")
+//        params.setValue("0002", forKey: "code")
+        loadDataList(url: url, params: params, tableView: self.tableView, tag: 1001)
+    }
+
+    override func returnData(tag: Int) {
+        tableView.reloadData()
+    }
+
+    override func returnError(tag: Int, type: String) {
+
+    }
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    // MARK: delegate
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.arrData.count
+    }
+
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 174
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: "MachineLogListCell", for: indexPath as IndexPath) as! MachineLogListCell
+        cell.selectionStyle = .none
+        let activDic = arrData[indexPath.row] as! NSDictionary
+        cell.snCodeLbl.text = (activDic["sn_code"] as! String)
+        cell.timeLbl.text = getString(current: indexPath.row, key: "allocation_time")
+        cell.earnLbl.text = getString(current: indexPath.row, key: "real_name")
+        cell.rewardLbl.text = getString(current: indexPath.row, key: "created_by")
+        cell.oldLbl.text = getString(current: indexPath.row, key: "old_real_name")
+        return cell
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+    }
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
+

CommonFrame/PosTransferVC.swift

@@ -28,7 +28,11 @@ class PosTransferVC: BaseViewController, UITableViewDataSource, UITableViewDeleg
             if index == 0 {
                 self!.handleBack()
             }
+            if index == 1 {
+                self?.navigationController?.pushViewController(MachineLogListViewController(), animated: true)
+            }
         }
+        viewNav.initRightBtn(title: "日志")
         self.view.addSubview(viewNav)
         viewNav.marginTop(top: 0)
         searchView.marginTop(top: viewNav.bottom())

CommonFrame/RequestURL.swift

@@ -84,6 +84,8 @@ class RequestURL: NSObject {
 
     static let machineListAllot = "\(baseHost)user/machineListAllot"
 
+    static let machineAllocationLog = "\(baseHost)user/machineAllocationLog"
+
     static let machineList = "http://data.xingchuangke.net:8889/phoneMobile/machineList"
 
     static let machineAllocation = "\(hostMain)machineAllocation"

CommonFrame/SelectPayBrandViewController.swift

@@ -35,6 +35,11 @@ class SelectPayBrandViewController: BaseViewController, UITableViewDataSource, U
         let params = NSMutableDictionary()
         params.setValue(CommonValue.getUserId(), forKey: "userId")
         loadDataList(url: url, params: params, tableView: self.tableView, tag: 1001)
+        let url1 = RequestURL.activityAuth
+        let params1 = NSMutableDictionary()
+        params1.setValue(CommonValue.getUserId(), forKey: "userId")
+        params1.setValue("0001", forKey: "code")
+        loadDataListPost(url: url1, params: params1, tag: 1002)
     }
     let arrProductType = NSMutableArray()
     var isLoadProductType = false

Pods/Pods.xcodeproj/xcuserdata/liuhuiping.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -11,6 +11,11 @@
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
+		<key>BetterSegmentedControl.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>27</integer>
+		</dict>
 		<key>Bugly.xcscheme</key>
 		<dict>
 			<key>isShown</key>

Virgil/Virgil.xcodeproj/xcuserdata/liuhuiping.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Virgil.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>26</integer>
 		</dict>
 	</dict>
 </dict>

xingchuangke.xcodeproj/project.pbxproj

@@ -9,11 +9,11 @@
 /* Begin PBXBuildFile section */
 		BDF83860654F2F322F0205B3 /* libPods-xingchuangke.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D1C6C197E3715E640E97F79F /* libPods-xingchuangke.a */; };
 		C698F1B329718EB500CE6A1F /* AVCaptureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C6A824D62945A063007EE9D8 /* AVCaptureViewController.m */; };
+		C6A010162A1A034600963C27 /* MachineLogListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6A010152A1A034600963C27 /* MachineLogListCell.xib */; };
+		C6A010182A1A086600963C27 /* MachineLogListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A010172A1A086600963C27 /* MachineLogListCell.swift */; };
 		C6A35028298E3F7C00861A2F /* WithdrawalRuleVC.m in Sources */ = {isa = PBXBuildFile; fileRef = C6A35027298E3F7C00861A2F /* WithdrawalRuleVC.m */; };
 		C6A3502A298E6C0100861A2F /* PosTransferVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A35029298E6C0100861A2F /* PosTransferVC.swift */; };
 		C6A3502C298E6D1A00861A2F /* PosTransferVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6A3502B298E6D1A00861A2F /* PosTransferVC.xib */; };
-		C6A3502D298FA95000861A2F /* libbankcard.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A825402945A064007EE9D8 /* libbankcard.a */; };
-		C6A3502E298FA97700861A2F /* libexidcardios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A825302945A064007EE9D8 /* libexidcardios.a */; };
 		C6A5FD8E2989232F00E87724 /* CommonRightMenuHSF.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A5FD8D2989232F00E87724 /* CommonRightMenuHSF.swift */; };
 		C6A5FD922989241E00E87724 /* CommonRightMenuHSF.xib in Resources */ = {isa = PBXBuildFile; fileRef = C6A5FD912989241E00E87724 /* CommonRightMenuHSF.xib */; };
 		C6A8221E29459FA7007EE9D8 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A8221D29459FA7007EE9D8 /* AppDelegate.swift */; };
@@ -680,6 +680,7 @@
 		C6A828AE2945A06B007EE9D8 /* QualificationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6A8266D2945A066007EE9D8 /* QualificationsViewController.swift */; };
 		C6A829392945A363007EE9D8 /* Virgil.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A829382945A363007EE9D8 /* Virgil.framework */; };
 		C6A8293A2945A363007EE9D8 /* Virgil.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C6A829382945A363007EE9D8 /* Virgil.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		C6AA25472A19FA43001E7A6C /* MachineLogListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6AA25462A19FA43001E7A6C /* MachineLogListViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -699,6 +700,8 @@
 /* Begin PBXFileReference section */
 		0FD4BAF6ED0C7DE074D16ED3 /* Pods-xingchuangke.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xingchuangke.debug.xcconfig"; path = "Target Support Files/Pods-xingchuangke/Pods-xingchuangke.debug.xcconfig"; sourceTree = "<group>"; };
 		9E508ED40E21ABD2FF00B06C /* Pods-xingchuangke.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-xingchuangke.release.xcconfig"; path = "Target Support Files/Pods-xingchuangke/Pods-xingchuangke.release.xcconfig"; sourceTree = "<group>"; };
+		C6A010152A1A034600963C27 /* MachineLogListCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MachineLogListCell.xib; sourceTree = "<group>"; };
+		C6A010172A1A086600963C27 /* MachineLogListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MachineLogListCell.swift; sourceTree = "<group>"; };
 		C6A35026298E3F7C00861A2F /* WithdrawalRuleVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WithdrawalRuleVC.h; sourceTree = "<group>"; };
 		C6A35027298E3F7C00861A2F /* WithdrawalRuleVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WithdrawalRuleVC.m; sourceTree = "<group>"; };
 		C6A35029298E6C0100861A2F /* PosTransferVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PosTransferVC.swift; sourceTree = "<group>"; };
@@ -1620,6 +1623,7 @@
 		C6A8266C2945A066007EE9D8 /* NewsListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewsListViewController.swift; sourceTree = "<group>"; };
 		C6A8266D2945A066007EE9D8 /* QualificationsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QualificationsViewController.swift; sourceTree = "<group>"; };
 		C6A829382945A363007EE9D8 /* Virgil.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Virgil.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C6AA25462A19FA43001E7A6C /* MachineLogListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MachineLogListViewController.swift; sourceTree = "<group>"; };
 		D1C6C197E3715E640E97F79F /* libPods-xingchuangke.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-xingchuangke.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -1629,7 +1633,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				C6A828432945A06A007EE9D8 /* libWeChatSDK.a in Frameworks */,
-				C6A3502D298FA95000861A2F /* libbankcard.a in Frameworks */,
 				C6A828A92945A06B007EE9D8 /* AlipaySDK.framework in Frameworks */,
 				C6A827F92945A069007EE9D8 /* libSocialQQ.a in Frameworks */,
 				C6A827F22945A069007EE9D8 /* UMSocialCore.framework in Frameworks */,
@@ -1639,7 +1642,6 @@
 				C6A827F72945A069007EE9D8 /* libSocialSina.a in Frameworks */,
 				C6A827F02945A069007EE9D8 /* UMSocialNetwork.framework in Frameworks */,
 				C6A829392945A363007EE9D8 /* Virgil.framework in Frameworks */,
-				C6A3502E298FA97700861A2F /* libexidcardios.a in Frameworks */,
 				C6A828222945A06A007EE9D8 /* libTalkingData.a in Frameworks */,
 				C6A826C92945A067007EE9D8 /* jcore-ios-1.0.0.a in Frameworks */,
 				C6A8281E2945A06A007EE9D8 /* libUMSocialLog.a in Frameworks */,
@@ -2288,6 +2290,7 @@
 				C6A823B72945A062007EE9D8 /* WXMediaMessage+messageConstruct.h */,
 				C6A823B82945A062007EE9D8 /* AddressSelectedTableViewCell.swift */,
 				C6A823B92945A062007EE9D8 /* ActiveListCell.xib */,
+				C6A010152A1A034600963C27 /* MachineLogListCell.xib */,
 				C6A823BA2945A062007EE9D8 /* 照片选择器 */,
 				C6A823DA2945A062007EE9D8 /* CALayer+Category.m */,
 				C6A823DB2945A062007EE9D8 /* TestCommon.swift */,
@@ -2422,6 +2425,7 @@
 				C6A8245F2945A062007EE9D8 /* OrderDetailTableViewCell.swift */,
 				C6A824602945A062007EE9D8 /* md5.h */,
 				C6A824612945A062007EE9D8 /* ActiveListViewController.swift */,
+				C6AA25462A19FA43001E7A6C /* MachineLogListViewController.swift */,
 				C6A824622945A062007EE9D8 /* ShoppingMallDetailViewController.swift */,
 				C6A824632945A062007EE9D8 /* ApplyCardAgentViewController.xib */,
 				C6A824642945A062007EE9D8 /* StudyCollectionReusableView.xib */,
@@ -2727,6 +2731,7 @@
 				C6A825DA2945A065007EE9D8 /* WechatAuthSDK.h */,
 				C6A825DB2945A065007EE9D8 /* BJBusinessViewController.swift */,
 				C6A825DC2945A065007EE9D8 /* ActiveListCell.swift */,
+				C6A010172A1A086600963C27 /* MachineLogListCell.swift */,
 				C6A825DD2945A065007EE9D8 /* seed.h */,
 				C6A825DF2945A065007EE9D8 /* MyDelegateViewController.xib */,
 				C6A825E02945A065007EE9D8 /* BJHKPhoneViewController.swift */,
@@ -3490,6 +3495,7 @@
 				C6A823542945A05A007EE9D8 /* XG_AlbumCell.xib in Resources */,
 				C6A8278A2945A069007EE9D8 /* RankingListTableViewCell.xib in Resources */,
 				C6A827362945A068007EE9D8 /* CalcResultView.xib in Resources */,
+				C6A010162A1A034600963C27 /* MachineLogListCell.xib in Resources */,
 				C6A827F62945A069007EE9D8 /* OpenDetailTableViewCell.xib in Resources */,
 				C6A827A82945A069007EE9D8 /* PosListTableViewCell.xib in Resources */,
 				C6A826EA2945A068007EE9D8 /* ApplyCardViewController.xib in Resources */,
@@ -3650,7 +3656,9 @@
 				C6A5FD8E2989232F00E87724 /* CommonRightMenuHSF.swift in Sources */,
 				C6A826CC2945A067007EE9D8 /* HomeTableViewCell.swift in Sources */,
 				C6A827152945A068007EE9D8 /* WalletMainViewController.swift in Sources */,
+				C6A010182A1A086600963C27 /* MachineLogListCell.swift in Sources */,
 				C6A827992945A069007EE9D8 /* WXMediaMessage+messageConstruct.m in Sources */,
+				C6AA25472A19FA43001E7A6C /* MachineLogListViewController.swift in Sources */,
 				C6A823322945A059007EE9D8 /* ReturnAttributeStr.m in Sources */,
 				C6A827952945A069007EE9D8 /* ApplyCardWebViewController.swift in Sources */,
 				C6A8267E2945A067007EE9D8 /* QuickOpenViewController.swift in Sources */,

xingchuangke.xcodeproj/xcuserdata/liuhuiping.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>xingchuangke.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>25</integer>
 		</dict>
 	</dict>
 </dict>