完善

无故事王国

2023-10-11 f7e33a3255d9f87b20e4a06fc32012eaad77cad5

完善

 WanPai/Common/View/PaymentView.swift

@@ -26,7 +26,8 @@
    @IBOutlet weak var label_aliPayMoney: UILabel!
    @IBOutlet weak var label_coinMoney: UILabel!
    @IBOutlet weak var label_courseMoney: UILabel!

    @IBOutlet weak var btn_complete: UIButton!
	


    private var clouse:((PayType)->Void)?
@@ -69,6 +70,7 @@
    override func layoutSubviews() {
        super.layoutSubviews()
        view_container.jq_addCorners(corner: [.topLeft,.topRight], radius: 20)
        btn_complete.localGradientColor(cornerRadius: 20)
    }
    
    

 WanPai/Common/View/PaymentView.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -314,6 +314,7 @@
            <connections>
                <outlet property="btn_alipay" destination="WE2-FK-qOV" id="Keo-5R-2iV"/>
                <outlet property="btn_coin" destination="fBI-qy-chO" id="W1f-WZ-xIJ"/>
                <outlet property="btn_complete" destination="glt-oZ-fup" id="pHD-CI-P8j"/>
                <outlet property="btn_course" destination="SXc-6d-61u" id="zd6-Ee-k8H"/>
                <outlet property="btn_wechat" destination="iQH-s2-Sm4" id="pDO-q6-Iek"/>
                <outlet property="cons_bottom" destination="9AD-6H-0r8" id="9hQ-qM-ZMJ"/>

 WanPai/Model/CommonModels.swift

@@ -85,7 +85,7 @@
    var age: Int = 0
    var id: Int = 0
    var name = ""
    var phone:String?
    var phone:String = ""
}

struct StudentProfileModel:HandyJSON{

 WanPai/Root/Activity/View/StoresInfoView.swift

@@ -7,6 +7,7 @@

import UIKit
import JQTools
import QMUIKit

class StoresInfoView: UIView,JQNibView{
    @IBOutlet weak var view_container: UIView!
@@ -14,7 +15,8 @@
    @IBOutlet weak var label_title: UILabel!
    @IBOutlet weak var label_address: UILabel!
    @IBOutlet weak var label_distance: UILabel!

    @IBOutlet weak var btn_exchange: QMUIButton!
	
    private var clouse:((Bool)->Void)!
    
    override func awakeFromNib() {
@@ -22,13 +24,15 @@
        view_container.transform = .init(scaleX: 0.1, y: 0.1)
        alpha = 0
        layoutIfNeeded()
        btn_exchange.imagePosition = .top
        btn_exchange.spacingBetweenImageAndTitle = 8
    }
    
    static func show(_ detailModel:CourseDetailModel,clouse:@escaping (Bool)->Void){
        let storesView = StoresInfoView.jq_loadNibView()
        storesView.frame = sceneDelegate?.window?.frame ?? .zero

        storesView.img_logo.sd_setImage(with: URL(string: detailModel.coverDrawing))
        storesView.img_logo.sd_setImage(with: URL(string: detailModel.storeCoverDrawing))
        storesView.label_title.text = detailModel.name
        storesView.label_address.text = detailModel.storeAddress
        storesView.label_distance.text = String(format: "距你%.2lfkm", detailModel.distance)

 WanPai/Root/Activity/View/StoresInfoView.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -70,7 +70,7 @@
                            </connections>
                        </button>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jpw-FW-83z">
                            <rect key="frame" x="27" y="331.66666666666674" width="150.66666666666666" height="40"/>
                            <rect key="frame" x="27" y="331.66666666666674" width="145.66666666666666" height="40"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="40" id="bSW-Lk-o13"/>
                            </constraints>
@@ -95,7 +95,7 @@
                            </connections>
                        </button>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IaV-fx-oMR">
                            <rect key="frame" x="187.66666666666663" y="331.66666666666674" width="150.33333333333337" height="40"/>
                            <rect key="frame" x="192.66666666666663" y="331.66666666666674" width="145.33333333333337" height="40"/>
                            <color key="backgroundColor" name="FE6E0D"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="40" id="c1u-UD-dK1"/>
@@ -139,7 +139,7 @@
                        <constraint firstAttribute="trailing" secondItem="IaV-fx-oMR" secondAttribute="trailing" constant="27" id="faR-aU-yHl"/>
                        <constraint firstAttribute="trailing" secondItem="v0x-OI-j4x" secondAttribute="trailing" constant="117" id="gAD-QD-P9S"/>
                        <constraint firstItem="v0x-OI-j4x" firstAttribute="leading" secondItem="0wv-DE-XuG" secondAttribute="trailing" constant="13" id="hij-WZ-O5Q"/>
                        <constraint firstItem="IaV-fx-oMR" firstAttribute="leading" secondItem="Jpw-FW-83z" secondAttribute="trailing" constant="10" id="kTm-uC-Wme"/>
                        <constraint firstItem="IaV-fx-oMR" firstAttribute="leading" secondItem="Jpw-FW-83z" secondAttribute="trailing" constant="20" id="kTm-uC-Wme"/>
                        <constraint firstItem="OBY-uG-jKE" firstAttribute="top" secondItem="YPc-hT-wLG" secondAttribute="top" constant="17" id="oz7-FU-d5F"/>
                        <constraint firstItem="Jpw-FW-83z" firstAttribute="top" secondItem="ZUc-jP-D3A" secondAttribute="bottom" constant="23" id="sFO-Nd-YAs"/>
                        <constraint firstItem="ZUc-jP-D3A" firstAttribute="leading" secondItem="YPc-hT-wLG" secondAttribute="leading" constant="13" id="sgv-m2-qwz"/>
@@ -162,6 +162,7 @@
                <constraint firstItem="YPc-hT-wLG" firstAttribute="centerX" secondItem="vUN-kp-3ea" secondAttribute="centerX" id="chg-wY-k2g"/>
            </constraints>
            <connections>
                <outlet property="btn_exchange" destination="m3W-4D-SlY" id="TEa-WH-b68"/>
                <outlet property="img_logo" destination="OiY-s7-UjK" id="8ec-gh-7ta"/>
                <outlet property="label_address" destination="0wv-DE-XuG" id="s3a-3G-Ijd"/>
                <outlet property="label_distance" destination="ZUc-jP-D3A" id="EKG-km-ayN"/>

 WanPai/Root/Course/VC/AddStudentVC.swift

@@ -116,27 +116,25 @@
    }

    private func addStudent(){

        if type == .course{
            Services.addStudent(studentModel).subscribe(onNext: { [weak self] data in
                guard let weakSelf = self else { return }
                alertSuccess(msg: "添加成功")
                DispatchQueue.main.asyncAfter(deadline: .now()+1) {
                    weakSelf.navigationController?.popViewController()
                }
                self?.addStudentSuccess()
            }).disposed(by: disposeBag)
        }else{
            Services.addParticipant(studentModel).subscribe(onNext: {[weak self] data in
                guard let weakSelf = self else { return }
                alertSuccess(msg: "添加成功")
                DispatchQueue.main.asyncAfter(deadline: .now()+1) {
                    weakSelf.navigationController?.popViewController()
                    NotificationCenter.default.post(name: StudentUpdate_Nofi, object: nil)
                }
                self?.addStudentSuccess()
            }).disposed(by: disposeBag)
        }
    }

    private func addStudentSuccess(){
        alertSuccess(msg: "添加成功")
        DispatchQueue.main.asyncAfter(deadline: .now()+1) {
            self.navigationController?.popViewController()
            NotificationCenter.default.post(name: StudentUpdate_Nofi, object: nil)
        }
    }

    deinit{
        JQ_ImagePickerTool.destroy()
    }

 WanPai/Root/Course/VC/CourseDetailApplyVC.swift

@@ -55,7 +55,7 @@
        title = "课程详情"

        if let m = detailModel{
            img_cover.sd_setImage(with: URL(string: m.coverDrawing))
            img_cover.sd_setImage(with: URL(string: m.storeCoverDrawing))
            label_title.text = m.name
            label_listenWeek.text = "每" + m.weeks.joined(separator: "、")
            label_listenTime.text = m.times.joined(separator: "｜")
@@ -68,6 +68,7 @@
                case .vocation:
                    label_vaild.text = m.time
                    view_vaildTime.isHidden = false
                    view_packageList.isHidden = true
                case .experience:
                    label_vaild.text = "购买当天有效"
                    view_vaildTime.isHidden = false
@@ -125,6 +126,13 @@
        fatalError("init(coder:) has not been implemented")
    }

    override func setRx() {
        NotificationCenter.default.rx.notification(StudentUpdate_Nofi).take(until: self.rx.deallocated).subscribe {[weak self] noti in
            guard let weakSelf = self else { return }
            //重新唤起添加学生
            weakSelf.studentAction(weakSelf.btn_addStudent)
        }.disposed(by: disposeBag)
    }

    @IBAction func couponAction(_ sender: TapBtn) {
        CouponChooseView.show(couponModels,defaultModel: selectCouponModel) {[weak self] m in
@@ -354,13 +362,18 @@
        cell.studentModel = studentModels[indexPath.row]
        cell.deleClouse = { [weak self] index in
            guard let weakSelf = self else { return }
            tableView.beginUpdates()
            weakSelf.studentModels.remove(at: index)
            tableView.deleteRows(at: [IndexPath(row: index, section: 0)], with: .right)
            tableView.endUpdates()
            weakSelf.cons_tableHei.constant = CGFloat((weakSelf.studentModels.count) * 87)
            tableView.reloadData()
            weakSelf.changePrice(weakSelf.selectClassIndex)
            if weakSelf.studentModels.count > 1{
                tableView.beginUpdates()
                weakSelf.studentModels.remove(at: index)
                tableView.deleteRows(at: [IndexPath(row: index, section: 0)], with: .right)
                tableView.endUpdates()
                weakSelf.cons_tableHei.constant = CGFloat((weakSelf.studentModels.count) * 87)
                tableView.reloadData()
                weakSelf.changePrice(weakSelf.selectClassIndex)
            }else{
                alert(msg: "至少选择一位学员")
            }

        }
        return cell
    }

 WanPai/Root/Course/VC/CourseDetailApplyVC.xib

@@ -446,7 +446,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eP1-9j-rJC">
                    <rect key="frame" x="0.0" y="743" width="393" height="75"/>
                    <subviews>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O3i-VB-ddE">
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O3i-VB-ddE">
                            <rect key="frame" x="8" y="23.333333333333371" width="35.666666666666664" height="28.666666666666671"/>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="24"/>
                            <color key="textColor" name="FE6E0D"/>
@@ -476,11 +476,10 @@
                            </subviews>
                        </stackView>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dbs-38-o1O">
                            <rect key="frame" x="199" y="17.666666666666629" width="180" height="40"/>
                            <rect key="frame" x="131" y="17.666666666666629" width="248" height="40"/>
                            <color key="backgroundColor" name="FE6E0D"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="40" id="bwe-LL-VPf"/>
                                <constraint firstAttribute="width" constant="180" id="tXJ-g9-Dtf"/>
                            </constraints>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -506,7 +505,7 @@
                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                    <constraints>
                        <constraint firstItem="8n8-uF-nCb" firstAttribute="centerY" secondItem="O3i-VB-ddE" secondAttribute="centerY" id="518-bg-be6"/>
                        <constraint firstItem="Dbs-38-o1O" firstAttribute="leading" secondItem="8n8-uF-nCb" secondAttribute="trailing" priority="250" constant="10" id="DLb-0D-YZA"/>
                        <constraint firstItem="Dbs-38-o1O" firstAttribute="leading" secondItem="8n8-uF-nCb" secondAttribute="trailing" constant="21" id="DLb-0D-YZA"/>
                        <constraint firstItem="O3i-VB-ddE" firstAttribute="centerY" secondItem="eP1-9j-rJC" secondAttribute="centerY" id="FKw-bP-atp"/>
                        <constraint firstAttribute="trailing" secondItem="Dbs-38-o1O" secondAttribute="trailing" constant="14" id="Guv-Mo-58i"/>
                        <constraint firstItem="O3i-VB-ddE" firstAttribute="leading" secondItem="eP1-9j-rJC" secondAttribute="leading" constant="8" id="Wwu-vM-ndW"/>

 WanPai/Root/Course/VC/CourseDetailVC.swift

@@ -42,7 +42,7 @@
        didSet{

            if let m = detailModel{
                img_cover.sd_setImage(with: URL(string: m.coverDrawing))
                img_cover.sd_setImage(with: URL(string: m.storeCoverDrawing))
                label_title.text = m.name
                label_distance.text = String(format: "距离我%.2lfkm", m.distance)
                label_local.text = String(format: "%@(%@)", m.storeName,m.storeAddress)
@@ -73,7 +73,7 @@
                if let subM = m.list.first {
                    label_originPrice.isHidden = subM.originalPrice == nil || subM.originalPrice == 0
                    label_coin.isHidden = subM.playPaiCoin == nil || subM.playPaiCoin == 0
                    label_vipPrice.isHidden = subM.vipPrice == nil || subM.vipPrice == 0
                    label_vipPrice.isHidden =  subM.vipPrice == 0

                        //原价
                    if let originPrice =  subM.originalPrice{
@@ -101,10 +101,10 @@

                if m.type == .experience{
                    label_price.text = (m.list.first?.paymentPrice ?? 0).currency()
                    label_originPrice.isHidden = true
                    label_vipPrice.isHidden = true
                    label_vaildTime.text = "购买当天有效"
                    view_listen.isHidden = true
                    label_originPrice.alpha = 0
                    label_vipPrice.alpha = 0
                    view_listen.alpha = 0
                    label_price.isHidden = (m.list.first?.paymentPrice ?? 0) == 0
                }


 WanPai/Root/Course/VC/CourseDetailVC.xib

@@ -268,7 +268,7 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wnC-bp-nci">
                    <rect key="frame" x="0.0" y="743" width="393" height="75"/>
                    <subviews>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moa-lg-TqA">
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moa-lg-TqA">
                            <rect key="frame" x="8" y="23.333333333333371" width="35.666666666666664" height="28.666666666666671"/>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="24"/>
                            <color key="textColor" name="FE6E0D"/>
@@ -277,7 +277,7 @@
                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="AaO-wm-Phu">
                            <rect key="frame" x="52.666666666666657" y="10" width="57.333333333333343" height="55"/>
                            <subviews>
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原价" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pXk-ET-NAX">
                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pXk-ET-NAX">
                                    <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="17"/>
                                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                                    <color key="textColor" red="0.24705882352941178" green="0.24705882352941178" blue="0.24705882352941178" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -298,10 +298,9 @@
                            </subviews>
                        </stackView>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xz5-Ol-6OL">
                            <rect key="frame" x="199" y="17.666666666666629" width="180" height="40"/>
                            <rect key="frame" x="131" y="17.666666666666629" width="248" height="40"/>
                            <color key="backgroundColor" name="FE6E0D"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="180" id="J3c-Rt-gSY"/>
                                <constraint firstAttribute="height" constant="40" id="Sr1-FR-ZcT"/>
                            </constraints>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
@@ -332,7 +331,7 @@
                        <constraint firstAttribute="trailing" secondItem="xz5-Ol-6OL" secondAttribute="trailing" constant="14" id="Fun-i5-O3g"/>
                        <constraint firstItem="AaO-wm-Phu" firstAttribute="leading" secondItem="moa-lg-TqA" secondAttribute="trailing" constant="9" id="Ndw-RN-uID"/>
                        <constraint firstItem="AaO-wm-Phu" firstAttribute="centerY" secondItem="moa-lg-TqA" secondAttribute="centerY" id="aaB-iy-BB7"/>
                        <constraint firstItem="xz5-Ol-6OL" firstAttribute="leading" secondItem="AaO-wm-Phu" secondAttribute="trailing" priority="250" constant="10" id="cK4-AI-pio"/>
                        <constraint firstItem="xz5-Ol-6OL" firstAttribute="leading" secondItem="AaO-wm-Phu" secondAttribute="trailing" constant="21" id="cK4-AI-pio"/>
                        <constraint firstAttribute="trailing" secondItem="vLx-Ym-2BT" secondAttribute="trailing" id="icl-bN-3t0"/>
                        <constraint firstAttribute="height" constant="75" id="mg0-k1-0Lc"/>
                        <constraint firstItem="vLx-Ym-2BT" firstAttribute="top" secondItem="wnC-bp-nci" secondAttribute="top" id="qyC-hn-h5m"/>

 WanPai/Root/Other/TCell/StudentInfoTCell.swift

@@ -11,16 +11,20 @@

    var studentModel:CourseDetailStudentModel?{
        didSet{
            label_name.text = studentModel?.name ?? "--"
            label_phone.text = studentModel?.phone ?? "未填写"
            label_age.text = "\(studentModel?.age ?? 0)岁"
            if let m = studentModel{
                label_name.text = m.name
                label_phone.text = m.phone.isEmpty ? "未填写":m.phone
                label_age.text = "\(m.age)岁"
            }
        }
    }
    @IBOutlet weak var label_name: UILabel!
    @IBOutlet weak var label_phone: UILabel!
    @IBOutlet weak var label_age: UILabel!
    @IBOutlet weak var btn_handle: UIButton!

    @IBOutlet weak var view_container: UIView!
    @IBOutlet weak var cons_handleCenterY: NSLayoutConstraint!
	
    var indexPath: IndexPath!

    var deleClouse:((Int)->Void)?

 WanPai/Root/Other/TCell/StudentInfoTCell.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <objects>
@@ -17,7 +17,7 @@
                <autoresizingMask key="autoresizingMask"/>
                <subviews>
                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wux-IQ-y3O">
                        <rect key="frame" x="14" y="7" width="338" height="76"/>
                        <rect key="frame" x="0.0" y="7" width="366" height="76"/>
                        <subviews>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="姓名：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JeQ-E8-nRz">
                                <rect key="frame" x="10" y="13" width="43" height="20"/>
@@ -65,7 +65,11 @@
                                <nil key="highlightedColor"/>
                            </label>
                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UXK-s8-fn9">
                                <rect key="frame" x="314" y="12" width="16" height="22"/>
                                <rect key="frame" x="338" y="13" width="20" height="20"/>
                                <constraints>
                                    <constraint firstAttribute="height" constant="20" id="RLw-Ea-lnn"/>
                                    <constraint firstAttribute="width" constant="20" id="VQz-kM-HNG"/>
                                </constraints>
                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                <state key="normal" image="btn_delete"/>
                                <connections>
@@ -106,17 +110,19 @@
                    </view>
                </subviews>
                <constraints>
                    <constraint firstItem="wux-IQ-y3O" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="1H8-Rr-3vH"/>
                    <constraint firstItem="wux-IQ-y3O" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="1H8-Rr-3vH"/>
                    <constraint firstAttribute="bottom" secondItem="wux-IQ-y3O" secondAttribute="bottom" constant="7" id="F5V-jX-QYV"/>
                    <constraint firstAttribute="trailing" secondItem="wux-IQ-y3O" secondAttribute="trailing" constant="14" id="LxN-CC-xda"/>
                    <constraint firstAttribute="trailing" secondItem="wux-IQ-y3O" secondAttribute="trailing" id="LxN-CC-xda"/>
                    <constraint firstItem="wux-IQ-y3O" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="7" id="d2J-Ta-zpG"/>
                </constraints>
            </tableViewCellContentView>
            <connections>
                <outlet property="btn_handle" destination="UXK-s8-fn9" id="icG-R5-OUD"/>
                <outlet property="cons_handleCenterY" destination="qNj-oj-K5k" id="koZ-D9-8qw"/>
                <outlet property="label_age" destination="o0m-fp-glP" id="KJW-vV-H6Z"/>
                <outlet property="label_name" destination="0TW-3R-Kd5" id="Rxm-mg-OvM"/>
                <outlet property="label_phone" destination="A9b-WE-sPt" id="obG-aM-y0V"/>
                <outlet property="view_container" destination="wux-IQ-y3O" id="lXn-Ll-JDV"/>
            </connections>
            <point key="canvasLocation" x="74.809160305343511" y="45.422535211267608"/>
        </tableViewCell>

 WanPai/Root/Other/TCell/StudentInfo_2_TCell.swift

@@ -17,7 +17,8 @@
    @IBOutlet weak var label_idCard: UILabel!
    @IBOutlet weak var label_age: UILabel!
    @IBOutlet weak var label_phone: UILabel!

    @IBOutlet weak var view_container: UIView!
	
    var indexPath:IndexPath?

    var delClouse:((IndexPath)->Void)?

 WanPai/Root/Other/TCell/StudentInfo_2_TCell.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
@@ -156,6 +156,7 @@
                <outlet property="label_idCard" destination="YtF-LX-bzG" id="tut-IZ-HEr"/>
                <outlet property="label_name" destination="iDi-s9-qiA" id="XNd-oN-2fI"/>
                <outlet property="label_phone" destination="eQZ-Ha-dGW" id="OjX-8Q-n5g"/>
                <outlet property="view_container" destination="6Lm-Eu-daG" id="UnY-Qu-ewv"/>
            </connections>
            <point key="canvasLocation" x="79.389312977099237" y="41.549295774647888"/>
        </tableViewCell>

 WanPai/Root/Other/VC/PaymentResultVC.swift

@@ -23,7 +23,8 @@
    }
    
    
    @IBOutlet weak var img_paymentState: UIImageView!
    @IBOutlet weak var label_title: UILabel!
    @IBOutlet weak var img_paymentState: UIImageView!
    @IBOutlet weak var label_content: UILabel!
    @IBOutlet weak var collectionView: UICollectionView!
    @IBOutlet weak var btn_backHome: UIButton!
@@ -83,11 +84,13 @@
                }
            switch result {
            case .fail(let str):
                label_title.text = "支付失败"
                btn_again.setTitle("再次支付", for: .normal)
                btn_back.setTitle("返回", for: .normal)
                img_paymentState.image = UIImage(named: "icon_fail")
                label_content.text = str
            case .success:
                label_title.text = "支付成功"
                btn_again.setTitle("立即预约", for: .normal)
                btn_back.setTitle("返回首页", for: .normal)
                img_paymentState.image = UIImage(named: "icon_success")

 WanPai/Root/Other/VC/PaymentResultVC.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <device id="retina5_9" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22129"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -18,25 +18,30 @@
                <outlet property="collectionView" destination="6ci-0V-ZT4" id="BTE-zu-4xN"/>
                <outlet property="img_paymentState" destination="Fv7-HV-ioC" id="kvE-hr-cVH"/>
                <outlet property="label_content" destination="RK0-X7-xSS" id="lD8-Jd-A6o"/>
                <outlet property="label_title" destination="tQo-2S-36p" id="bfD-w2-Kel"/>
                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
            </connections>
        </placeholder>
        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
        <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT">
            <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
            <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
            <subviews>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_success" translatesAutoresizingMaskIntoConstraints="NO" id="Fv7-HV-ioC">
                    <rect key="frame" x="176.66666666666666" y="108" width="40" height="40"/>
                    <rect key="frame" x="167.66666666666666" y="99" width="40" height="40"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="40" id="crP-wS-sO8"/>
                        <constraint firstAttribute="width" constant="40" id="nbR-TE-irw"/>
                    </constraints>
                </imageView>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付成功，恭喜您成为玩湃会员！并获得优惠券！" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RK0-X7-xSS">
                    <rect key="frame" x="39.333333333333343" y="168" width="314.33333333333326" height="17"/>
                    <rect key="frame" x="30.333333333333343" y="159" width="314.33333333333326" height="17"/>
                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    <nil key="highlightedColor"/>
                </label>
                <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="6ci-0V-ZT4">
                    <rect key="frame" x="0.0" y="289" width="393" height="410"/>
                    <rect key="frame" x="0.0" y="280" width="375" height="379"/>
                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                    <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="7br-70-TUT">
                        <size key="itemSize" width="128" height="128"/>
@@ -46,7 +51,7 @@
                    </collectionViewFlowLayout>
                </collectionView>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="meY-wl-nNE">
                    <rect key="frame" x="149" y="709" width="95" height="38"/>
                    <rect key="frame" x="140" y="669" width="95" height="38"/>
                    <constraints>
                        <constraint firstAttribute="width" constant="95" id="5rh-Ui-gwV"/>
                        <constraint firstAttribute="height" constant="38" id="nHo-hR-hM3"/>
@@ -72,7 +77,7 @@
                    </connections>
                </button>
                <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="c1t-oI-xet">
                    <rect key="frame" x="42.666666666666657" y="239" width="308" height="40"/>
                    <rect key="frame" x="33.666666666666657" y="230" width="308" height="40"/>
                    <subviews>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lh5-H4-LBg">
                            <rect key="frame" x="0.0" y="0.0" width="144" height="40"/>
@@ -122,6 +127,12 @@
                        </button>
                    </subviews>
                </stackView>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付成功" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQo-2S-36p">
                    <rect key="frame" x="150.66666666666666" y="50" width="73.666666666666657" height="21.666666666666671"/>
                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                    <nil key="textColor"/>
                    <nil key="highlightedColor"/>
                </label>
            </subviews>
            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -133,11 +144,13 @@
                <constraint firstItem="6ci-0V-ZT4" firstAttribute="top" secondItem="c1t-oI-xet" secondAttribute="bottom" constant="10" id="LuL-yl-IA1"/>
                <constraint firstItem="c1t-oI-xet" firstAttribute="centerX" secondItem="fnl-2z-Ty3" secondAttribute="centerX" id="Pm4-Fl-Wha"/>
                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="meY-wl-nNE" secondAttribute="bottom" constant="71" id="UnI-Ey-Pc1"/>
                <constraint firstItem="tQo-2S-36p" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="topMargin" id="Vb5-4t-kwB"/>
                <constraint firstItem="RK0-X7-xSS" firstAttribute="centerX" secondItem="Fv7-HV-ioC" secondAttribute="centerX" id="XBX-DI-MSD"/>
                <constraint firstItem="meY-wl-nNE" firstAttribute="top" secondItem="6ci-0V-ZT4" secondAttribute="bottom" constant="10" id="Y9C-4j-R40"/>
                <constraint firstItem="Fv7-HV-ioC" firstAttribute="centerX" secondItem="fnl-2z-Ty3" secondAttribute="centerX" id="aaQ-gG-s1W"/>
                <constraint firstItem="6ci-0V-ZT4" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="gBF-6S-2xb"/>
                <constraint firstItem="c1t-oI-xet" firstAttribute="top" secondItem="RK0-X7-xSS" secondAttribute="bottom" constant="54" id="ike-m8-wcL"/>
                <constraint firstItem="tQo-2S-36p" firstAttribute="centerX" secondItem="fnl-2z-Ty3" secondAttribute="centerX" id="qcZ-jj-pkX"/>
            </constraints>
            <point key="canvasLocation" x="103.05343511450381" y="20.422535211267608"/>
        </view>

 WanPai/Root/Other/View/StudentChooseView.swift

@@ -31,11 +31,13 @@
    @IBOutlet weak var view_container: UIView!
    @IBOutlet weak var cons_bottom: NSLayoutConstraint!
    @IBOutlet weak var btn_add: QMUIButton!
    
    @IBOutlet weak var cons_tableHei: NSLayoutConstraint!
	
    private var clickClouse:(([Any])->Void)!
    private var needAddClouse:(()->Void)!
    private var itemType:ItemType!
    private var selectStudents = [Any]()
    private var disposeBag = DisposeBag()


    private lazy var stuViewModel:StudentViewModel = {
@@ -56,6 +58,7 @@
        tableView.separatorStyle = .none
        alpha = 0
        layoutIfNeeded()
        setRx()
    }
    
    static func show(itemType:ItemType,defaultStu:[Any]? = nil,clickClouse:@escaping ([Any])->Void,needAddClouse:@escaping ()->Void){
@@ -90,7 +93,26 @@
            studentChooseView.tableView.reloadData()
        }
    }
    

    private func setRx(){
        stuViewModel.dataSource.subscribe(onNext: {[weak self] data in

            let hei = min(360,Double(data.count) * 90.0)
            self?.cons_tableHei.constant = hei
            UIView.animate(withDuration: 0.4) {
                self?.layoutIfNeeded()
            }
        }).disposed(by: disposeBag)

        actViewModel.dataSource.subscribe(onNext: {[weak self] data in
            let hei = min(360,Double(data.count) * 90.0)
            self?.cons_tableHei.constant = hei
            UIView.animate(withDuration: 0.4) {
                self?.layoutIfNeeded()
            }
        }).disposed(by: disposeBag)
    }

    @IBAction func closeAction(_ sender: UIButton) {
        closeAction()
    }
@@ -133,7 +155,9 @@
               if self.selectStudents.count == 1{
                   alert(msg: "至少选择一位学员");return
               }
               self.selectStudents.remove(at: indexPath.row)
               if let index = self.selectStudents.firstIndex(where: {($0 as! CourseDetailStudentModel).id == item.id}){
                   self.selectStudents.remove(at: index)
               }
           }else{
               self.selectStudents.append(item)
           }
@@ -143,7 +167,9 @@
               if self.selectStudents.count == 1{
                   alert(msg: "至少选择一位参赛学员");return
               }
               self.selectStudents.remove(at: indexPath.row)
               if let index = self.selectStudents.firstIndex(where: {($0 as! ActivityDetailPartModel).id == item.id}){
                   self.selectStudents.remove(at: index)
               }
           }else{
               self.selectStudents.append(item)
           }
@@ -166,10 +192,13 @@
        if itemType == .course{
            let item = stuViewModel.dataSource.value[indexPath.row]
            let cell = tableView.dequeueReusableCell(withIdentifier: "_StudentInfoTCell") as! StudentInfoTCell
            cell.cons_handleCenterY.constant = -7
            if self.selectStudents.contains(where: {($0 as! CourseDetailStudentModel).id == item.id}){
                cell.btn_handle.setImage(UIImage(named: "btn_choose_s"), for: .normal)
                cell.view_container.borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
            }else{
                cell.btn_handle.setImage(nil, for: .normal)
                cell.view_container.borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
            }
            cell.studentModel = item
            return cell
@@ -181,8 +210,10 @@
            cell.activityDetailPartModel = item
            if self.selectStudents.contains(where: {($0 as! ActivityDetailPartModel).id == item.id}){
                cell.img_radio.image = UIImage(named: "btn_choose_s")
                cell.view_container.borderColor = UIColor(hexStr: "#FD7902").withAlphaComponent(0.28)
            }else{
                cell.img_radio.image = UIImage(named: "")
                cell.view_container.borderColor = UIColor(hexStr: "#ADADAD").withAlphaComponent(0.28)
            }
            return cell
        }

 WanPai/Root/Other/View/StudentChooseView.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,7 +19,7 @@
                    <rect key="frame" x="0.0" y="509" width="393" height="343"/>
                    <subviews>
                        <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="qk4-DP-KiI">
                            <rect key="frame" x="0.0" y="61" width="393" height="166"/>
                            <rect key="frame" x="14" y="61" width="365" height="166"/>
                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="166" id="fgN-xg-prK"/>
@@ -47,7 +47,7 @@
                            </constraints>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                            <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                            <state key="normal" title="确定">
                            <state key="normal" title="确认">
                                <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                            </state>
                            <userDefinedRuntimeAttributes>
@@ -64,13 +64,13 @@
                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                    <constraints>
                        <constraint firstAttribute="trailing" secondItem="yxv-pI-vBX" secondAttribute="trailing" constant="15" id="5X5-zz-lAO"/>
                        <constraint firstItem="qk4-DP-KiI" firstAttribute="leading" secondItem="7ap-MY-Ney" secondAttribute="leading" id="71u-e0-gHp"/>
                        <constraint firstItem="qk4-DP-KiI" firstAttribute="leading" secondItem="7ap-MY-Ney" secondAttribute="leading" constant="14" id="71u-e0-gHp"/>
                        <constraint firstItem="qk4-DP-KiI" firstAttribute="top" secondItem="yxv-pI-vBX" secondAttribute="bottom" constant="18" id="FvY-dc-tsl"/>
                        <constraint firstItem="q3h-WJ-5Om" firstAttribute="top" secondItem="qk4-DP-KiI" secondAttribute="bottom" constant="16" id="Mpj-WY-AmV"/>
                        <constraint firstAttribute="trailing" secondItem="q3h-WJ-5Om" secondAttribute="trailing" constant="100" id="Rkh-aY-Xql"/>
                        <constraint firstItem="q3h-WJ-5Om" firstAttribute="leading" secondItem="7ap-MY-Ney" secondAttribute="leading" constant="100" id="jx8-cU-9C3"/>
                        <constraint firstAttribute="bottomMargin" secondItem="q3h-WJ-5Om" secondAttribute="bottom" constant="18" id="lPQ-9s-M93"/>
                        <constraint firstAttribute="trailing" secondItem="qk4-DP-KiI" secondAttribute="trailing" id="txc-2I-Rlo"/>
                        <constraint firstAttribute="trailing" secondItem="qk4-DP-KiI" secondAttribute="trailing" constant="14" id="txc-2I-Rlo"/>
                        <constraint firstItem="yxv-pI-vBX" firstAttribute="top" secondItem="7ap-MY-Ney" secondAttribute="top" constant="23" id="vTH-12-aze"/>
                    </constraints>
                </view>
@@ -95,6 +95,7 @@
            <connections>
                <outlet property="btn_add" destination="yxv-pI-vBX" id="5Sm-2V-OfF"/>
                <outlet property="cons_bottom" destination="kSV-Gg-P7I" id="IdC-Sg-7gc"/>
                <outlet property="cons_tableHei" destination="fgN-xg-prK" id="YHx-Rk-5nD"/>
                <outlet property="tableView" destination="qk4-DP-KiI" id="YQX-20-evD"/>
                <outlet property="view_container" destination="7ap-MY-Ney" id="CmC-MB-qxC"/>
            </connections>

 WanPai/Root/Welfare/VC/WelfareFreeVC.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -30,7 +30,7 @@
                    </constraints>
                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                    <state key="normal" title="联系商家">
                    <state key="normal" title="联系我们">
                        <color key="titleColor" red="0.94901960784313721" green="0.97647058823529409" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    </state>
                    <connections>

 WanPai/Root/Welfare/VC/WelfareWeeklyDetailVC.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -42,7 +42,7 @@
                    <rect key="frame" x="0.0" y="59" width="393" height="684"/>
                    <subviews>
                        <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Idk-Wv-zLx">
                            <rect key="frame" x="0.0" y="0.0" width="393" height="672.66666666666663"/>
                            <rect key="frame" x="0.0" y="0.0" width="393" height="684.66666666666663"/>
                            <subviews>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9x3-OB-26n">
                                    <rect key="frame" x="0.0" y="0.0" width="393" height="221.66666666666666"/>
@@ -195,7 +195,7 @@
                                    </constraints>
                                </view>
                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hQc-bT-aln">
                                    <rect key="frame" x="0.0" y="398.66666666666669" width="393" height="74"/>
                                    <rect key="frame" x="0.0" y="398.66666666666669" width="393" height="86"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hrq-r5-1M6">
                                            <rect key="frame" x="13" y="72.999999999999943" width="380" height="1"/>
@@ -239,18 +239,18 @@
                                        <constraint firstItem="hrq-r5-1M6" firstAttribute="top" secondItem="gCN-9v-2nh" secondAttribute="bottom" constant="14" id="bKB-KY-57w"/>
                                        <constraint firstItem="oZw-he-MSe" firstAttribute="centerY" secondItem="zRt-B2-VxK" secondAttribute="centerY" id="iYG-Xo-prr"/>
                                        <constraint firstItem="gCN-9v-2nh" firstAttribute="leading" secondItem="oZw-he-MSe" secondAttribute="leading" id="j8e-7o-2ew"/>
                                        <constraint firstAttribute="bottom" secondItem="hrq-r5-1M6" secondAttribute="bottom" id="jab-HZ-SRd"/>
                                        <constraint firstAttribute="bottom" secondItem="hrq-r5-1M6" secondAttribute="bottom" constant="12" id="jab-HZ-SRd"/>
                                        <constraint firstItem="oZw-he-MSe" firstAttribute="leading" secondItem="zRt-B2-VxK" secondAttribute="trailing" constant="5" id="tV8-D0-IcO"/>
                                    </constraints>
                                </view>
                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9fb-wg-pcf">
                                    <rect key="frame" x="0.0" y="472.66666666666663" width="393" height="100"/>
                                    <rect key="frame" x="0.0" y="484.66666666666663" width="393" height="100"/>
                                    <constraints>
                                        <constraint firstAttribute="height" constant="100" id="LTT-Lg-ST4"/>
                                    </constraints>
                                </imageView>
                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rkq-O0-4a4">
                                    <rect key="frame" x="0.0" y="572.66666666666663" width="393" height="100"/>
                                    <rect key="frame" x="0.0" y="584.66666666666663" width="393" height="100"/>
                                    <constraints>
                                        <constraint firstAttribute="height" constant="100" id="XcJ-9a-vwU"/>
                                    </constraints>
@@ -269,17 +269,16 @@
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SAM-Wz-WfF">
                    <rect key="frame" x="0.0" y="743" width="393" height="75"/>
                    <subviews>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wps-ww-7sF">
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" text="¥ 0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wps-ww-7sF">
                            <rect key="frame" x="8" y="23.333333333333371" width="35.666666666666664" height="28.666666666666671"/>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="24"/>
                            <color key="textColor" name="FE6E0D"/>
                            <nil key="highlightedColor"/>
                        </label>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fo2-mD-30Z">
                            <rect key="frame" x="199" y="17.666666666666629" width="180" height="40"/>
                            <rect key="frame" x="130" y="17.666666666666629" width="249" height="40"/>
                            <color key="backgroundColor" name="FE6E0D"/>
                            <constraints>
                                <constraint firstAttribute="width" constant="180" id="6HZ-2D-OGt"/>
                                <constraint firstAttribute="height" constant="40" id="ShM-Pb-99W"/>
                            </constraints>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
@@ -339,6 +338,7 @@
                        <constraint firstItem="Wps-ww-7sF" firstAttribute="centerY" secondItem="SAM-Wz-WfF" secondAttribute="centerY" id="YhP-7v-38H"/>
                        <constraint firstAttribute="trailing" secondItem="EGS-sj-ZVm" secondAttribute="trailing" id="d9y-Pz-EC3"/>
                        <constraint firstItem="Wps-ww-7sF" firstAttribute="leading" secondItem="SAM-Wz-WfF" secondAttribute="leading" constant="8" id="mh0-7m-tNF"/>
                        <constraint firstItem="fo2-mD-30Z" firstAttribute="leading" secondItem="XPf-eZ-6Vv" secondAttribute="trailing" constant="21" id="wwv-Eh-Y0Z"/>
                    </constraints>
                </view>
            </subviews>