fixbug

r

2025-08-29 24182a847205ad81c759a0d173cc0e12fcd5a149

fixbug

 WanPai.xcodeproj/project.pbxproj

@@ -2450,6 +2450,7 @@
                );
                INFOPLIST_FILE = WanPai/Info.plist;
                INFOPLIST_KEY_CFBundleDisplayName = "玩湃生活";
                INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
                INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
                INFOPLIST_KEY_NSCameraUsageDescription = "WanPai需要使用使用使用相机，来上传学员头像、评论图片、扫描二维码";
                INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "WanPai需要使用使用定位，来推荐、搜索您附近的门店";
@@ -2650,6 +2651,7 @@
                );
                INFOPLIST_FILE = WanPai/Info.plist;
                INFOPLIST_KEY_CFBundleDisplayName = "玩湃生活";
                INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
                INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.sports";
                INFOPLIST_KEY_NSCameraUsageDescription = "WanPai需要使用使用使用相机，来上传学员头像、评论图片、扫描二维码";
                INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "WanPai需要使用使用定位，来推荐、搜索您附近的门店";

 WanPai/Common/View/WorldCupListRankView.swift

@@ -93,7 +93,13 @@
        if dataSoure?.count == 0 {
            return
        }
        self.clouse(Int(dataSoure?[self.selectIndex].id ?? "0") ?? 0)
        self.clouse(dataSoure?[self.selectIndex].worldCupId  ?? 0)
        UIView.animate(withDuration: 0.4) {
            self.alpha = 0
            self.layoutIfNeeded()
        } completion: { _ in
            self.removeFromSuperview()
        }
    }
    
    @IBAction func searchAction(_ sender: Any) {

 WanPai/Info.plist

@@ -29,8 +29,6 @@
            <array/>
        </dict>
    </array>
    <key>ITSAppUsesNonExemptEncryption</key>
    <false/>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixin</string>

 WanPai/Root/Home/CCell/CouponCellThree.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" 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="23506"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
        <capability name="Safe area layout guides" 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"/>
@@ -49,14 +49,11 @@
                        </constraints>
                    </imageView>
                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Aw-8k-Wqd">
                        <rect key="frame" x="10" y="10" width="364" height="155"/>
                        <rect key="frame" x="10" y="10" width="364" height="201.66666666666666"/>
                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                        <constraints>
                            <constraint firstAttribute="height" constant="155" id="dw6-LL-Ndn"/>
                        </constraints>
                    </view>
                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="若已是会员，再次购买会员到期时间叠加" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Br8-sX-eZB">
                        <rect key="frame" x="20" y="175" width="215" height="14.333333333333343"/>
                        <rect key="frame" x="20" y="221.66666666666666" width="215" height="14.333333333333343"/>
                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
                        <nil key="textColor"/>
                        <nil key="highlightedColor"/>
@@ -77,6 +74,7 @@
                    <constraint firstItem="Br8-sX-eZB" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="f0E-EL-AaP"/>
                    <constraint firstItem="lw4-zS-j4w" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="guV-gL-coo"/>
                    <constraint firstItem="Br8-sX-eZB" firstAttribute="top" secondItem="6Aw-8k-Wqd" secondAttribute="bottom" constant="10" id="hjF-Ke-Vnw"/>
                    <constraint firstItem="lw4-zS-j4w" firstAttribute="top" secondItem="Br8-sX-eZB" secondAttribute="bottom" constant="20" id="i4T-k6-7nc"/>
                    <constraint firstItem="VcR-MK-LcK" firstAttribute="centerY" secondItem="cFe-QT-z6U" secondAttribute="centerY" id="kV4-ZP-2yb"/>
                    <constraint firstItem="6Aw-8k-Wqd" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="tgY-pz-LHi"/>
                    <constraint firstAttribute="trailing" secondItem="6Aw-8k-Wqd" secondAttribute="trailing" constant="10" id="xQb-1W-VVc"/>

 WanPai/Root/Home/Model/WorldCupCodeListModel.swift

@@ -19,7 +19,7 @@
    var name: String = ""
    var startTime: Int = 0
    var worldCupId: Int32 = 0
    var blue: [BlueModle] = []
    var red: [BlueModle] = []
    var blue: [WorldCupPeopleModel] = []
    var red: [WorldCupPeopleModel] = []
    var code: String = ""
}

 WanPai/Root/Home/Model/WorldCupModel.swift

@@ -20,13 +20,13 @@
                var name: String = ""
                var registrationClosingTime:String?
                var endTime:String = ""

                var worldCupId:Int = 0
}

struct GetWorldCupListFromRank:HandyJSON {
    var id : String?
    var name: String?
    var worldCupId:Int = 0
}

struct WorldCupDetailModel:HandyJSON{
@@ -35,6 +35,7 @@
                var cash:Double?
                var classHour:Int?
                var content: String = ""
                var contentOne: String = ""
                var endTime: String = ""
                var gender: Int = 0
                var heat: Int = 0

 WanPai/Root/Home/VC/JoinMemberVC.swift

@@ -53,6 +53,9 @@
    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
        
            if indexPath.row == 0 {
                if  (model?.vipList.count ?? 0) > 3 {
                    return 450
                }
                return 295
           
            }else if indexPath.row > 0 &&   indexPath.row <  ((model?.vipList[selectIndex].couponList.count ?? 0) + 1) {

 WanPai/Root/Search/VC/MatchDetailVC.swift

@@ -34,14 +34,19 @@
                @IBOutlet weak var blueStackView: UIStackView!
                @IBOutlet weak var btn_handle: UIButton!

                private var redTeamItems = [WorldCupPeopleModel]()
                private var blueTeamItems = [WorldCupPeopleModel]()
                 var redTeamItems = [WorldCupPeopleModel]()
                 var blueTeamItems = [WorldCupPeopleModel]()
                private var model:WorldCupJudgeModel!
                private var deviceModel:ActivityDetailStoreModel?
                private var deviceQRCode:String?
    private var startModel:SimpleModel?

                required init(model:WorldCupJudgeModel) {
    @IBOutlet weak var redAddBtn: UIButton!
    
    @IBOutlet weak var blueAddBtn: UIButton!
    
    var show: Bool = false;
    required init(model:WorldCupJudgeModel) {
                                super.init(nibName: nil, bundle: nil)
                                self.model = model
                }
@@ -56,6 +61,12 @@
                                view.backgroundColor = .white
                    if model.type == 2{
                        self.btn_handle.setTitle("开启比赛", for: .normal)
                    }
                    if show {
                        redAddBtn.isHidden = true
                        blueAddBtn.isHidden = true
                        btn_handle.isHidden = true
                        self.updateUserView()
                    }
                }

@@ -129,6 +140,9 @@
                }

                @IBAction func deleRedUserAction(_ sender: UIButton) {
                    if show {
                        return
                    }
                                let index = sender.tag - 10

                                if index > redTeamItems.count{
@@ -151,6 +165,9 @@
                }

                @IBAction func deleBlueUserAction(_ sender: UIButton) {
                    if show {
                        return
                    }
                                let index = sender.tag - 20
                                if index > blueTeamItems.count{
                                                blueTeamItems.removeLast()
@@ -170,7 +187,7 @@
                                }
                }

                private func updateUserView(){
                 func updateUserView(){

                                view_red1.isHidden = true
                                view_red2.isHidden = true
@@ -297,10 +314,12 @@
                                                                                                    weakSelf.startModel = m
                                                                                                                alert(msg: "比赛开始")
                                                                                                                sender.isSelected = true
                                                                                                                weakSelf.redTeamItems.removeAll()
                                                                                                                weakSelf.blueTeamItems.removeAll()
                                                                                                   
//                                                                                                                weakSelf.redTeamItems.removeAll()
//                                                                                                                weakSelf.blueTeamItems.removeAll()
                                                                                                    weakSelf.redAddBtn.isHidden = true
                                                                                                    weakSelf.blueAddBtn.isHidden = true
                                                                                                                weakSelf.updateUserView()
                                                                                                    weakSelf.show = true
                                                                                                    if weakSelf.model.type == 2{
                                                                                                        weakSelf.btn_handle.setTitle("结束比赛", for: .normal)
                                                                                                    }

 WanPai/Root/Search/VC/MatchDetailVC.xib

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" 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="22684"/>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
        <capability name="Named colors" minToolsVersion="9.0"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,11 +11,13 @@
    <objects>
        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MatchDetailVC" customModule="WanPai" customModuleProvider="target">
            <connections>
                <outlet property="blueAddBtn" destination="DWj-Io-Gyo" id="WX1-SL-8bi"/>
                <outlet property="blueStackView" destination="0Qm-bc-Lz6" id="QBR-Np-BZu"/>
                <outlet property="btn_handle" destination="Irm-Cr-MTn" id="iOo-2u-oB9"/>
                <outlet property="label_deviceTitle" destination="YhX-W2-lV6" id="N9W-o6-ZEk"/>
                <outlet property="label_matchPoint" destination="ohX-Ys-LLn" id="g0C-Lh-8yb"/>
                <outlet property="label_mathYard" destination="api-DT-2Ga" id="fhc-21-VAG"/>
                <outlet property="redAddBtn" destination="fgq-No-gPy" id="bue-RT-Jp6"/>
                <outlet property="redStackView" destination="IM3-iJ-n3i" id="rMz-jS-Vq6"/>
                <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
                <outlet property="view_blue1" destination="NC1-mI-zKx" id="tlf-qa-Zta"/>
@@ -43,19 +45,19 @@
                    <color key="backgroundColor" red="0.098039215686274508" green="0.18431372549019609" blue="0.44705882352941173" alpha="0.90000000000000002" colorSpace="custom" customColorSpace="sRGB"/>
                </view>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg_ad" translatesAutoresizingMaskIntoConstraints="NO" id="Mp4-s0-svz">
                    <rect key="frame" x="0.0" y="-100" width="453" height="918"/>
                    <rect key="frame" x="0.0" y="-100" width="453" height="884"/>
                </imageView>
                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg_footall" translatesAutoresizingMaskIntoConstraints="NO" id="UgK-2f-Czf">
                    <rect key="frame" x="0.0" y="59" width="393" height="548.66666666666663"/>
                    <rect key="frame" x="0.0" y="118" width="393" height="548.66666666666663"/>
                    <constraints>
                        <constraint firstAttribute="width" secondItem="UgK-2f-Czf" secondAttribute="height" multiplier="1:1.3958" id="Zc2-i4-vXc"/>
                    </constraints>
                </imageView>
                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="t22-L5-pNm">
                    <rect key="frame" x="0.0" y="607.66666666666663" width="393" height="210.33333333333337"/>
                    <rect key="frame" x="0.0" y="666.66666666666663" width="393" height="117.33333333333337"/>
                    <subviews>
                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Irm-Cr-MTn">
                            <rect key="frame" x="50" y="152.33333333333337" width="293" height="40"/>
                            <rect key="frame" x="50" y="59.333333333333371" width="293" height="40"/>
                            <color key="backgroundColor" name="FE6E0D"/>
                            <constraints>
                                <constraint firstAttribute="height" constant="40" id="G9D-9W-FOI"/>
@@ -75,19 +77,19 @@
                            </connections>
                        </button>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所属赛点：--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ohX-Ys-LLn">
                            <rect key="frame" x="50.000000000000007" y="47" width="84.666666666666686" height="17"/>
                            <rect key="frame" x="50" y="47" width="83" height="17"/>
                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                            <color key="textColor" red="0.95686274510000002" green="0.97254901959999995" blue="0.98431372549999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                            <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="YhX-W2-lV6">
                            <rect key="frame" x="50" y="20" width="57.333333333333343" height="17"/>
                            <rect key="frame" x="50" y="20" width="55.666666666666657" height="17"/>
                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                            <color key="textColor" red="0.95686274510000002" green="0.97254901959999995" blue="0.98431372549999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                            <nil key="highlightedColor"/>
                        </label>
                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所属场地：--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="api-DT-2Ga">
                            <rect key="frame" x="50.000000000000007" y="74" width="84.666666666666686" height="17"/>
                            <rect key="frame" x="50" y="74" width="83" height="17"/>
                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
                            <color key="textColor" red="0.95686274510000002" green="0.97254901959999995" blue="0.98431372549999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                            <nil key="highlightedColor"/>
@@ -106,19 +108,19 @@
                    </constraints>
                </view>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="蓝队" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PHe-Tf-02i">
                    <rect key="frame" x="182.33333333333334" y="560.66666666666663" width="28.666666666666657" height="17"/>
                    <rect key="frame" x="182.66666666666666" y="619.66666666666663" width="28" height="17"/>
                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                    <nil key="highlightedColor"/>
                </label>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BLUE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="30t-bC-Fho">
                    <rect key="frame" x="136.66666666666666" y="560.66666666666663" width="35.666666666666657" height="17"/>
                    <rect key="frame" x="137" y="619.66666666666663" width="35.666666666666657" height="17"/>
                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                    <nil key="highlightedColor"/>
                </label>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DWj-Io-Gyo">
                    <rect key="frame" x="221" y="554" width="30" height="30"/>
                    <rect key="frame" x="220.66666666666666" y="613" width="30" height="30"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="30" id="ERh-P5-3dc"/>
                        <constraint firstAttribute="width" constant="30" id="c8b-6H-Jve"/>
@@ -130,7 +132,7 @@
                    </connections>
                </button>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="红队" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J3j-Sw-JFA">
                    <rect key="frame" x="182.33333333333334" y="89" width="28.666666666666657" height="17"/>
                    <rect key="frame" x="182.33333333333334" y="148" width="28.666666666666657" height="17"/>
                    <constraints>
                        <constraint firstAttribute="width" constant="28.666666666666657" id="we1-a5-5EW"/>
                    </constraints>
@@ -139,13 +141,13 @@
                    <nil key="highlightedColor"/>
                </label>
                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RED" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ewM-XU-TUF">
                    <rect key="frame" x="144.66666666666666" y="89" width="27.666666666666657" height="17"/>
                    <rect key="frame" x="144.66666666666666" y="148" width="27.666666666666657" height="17"/>
                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                    <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                    <nil key="highlightedColor"/>
                </label>
                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fgq-No-gPy">
                    <rect key="frame" x="221" y="82.666666666666671" width="30" height="30"/>
                    <rect key="frame" x="221" y="141.66666666666666" width="30" height="30"/>
                    <constraints>
                        <constraint firstAttribute="height" constant="30" id="Fd3-ah-9BK"/>
                        <constraint firstAttribute="width" constant="30" id="HTZ-8V-Hze"/>
@@ -157,7 +159,7 @@
                    </connections>
                </button>
                <stackView opaque="NO" contentMode="scaleToFill" spacing="25" translatesAutoresizingMaskIntoConstraints="NO" id="IM3-iJ-n3i">
                    <rect key="frame" x="33.666666666666657" y="136" width="326" height="115"/>
                    <rect key="frame" x="33.666666666666657" y="195" width="326" height="115"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WaE-Ya-Qah">
                            <rect key="frame" x="0.0" y="0.0" width="92" height="115"/>
@@ -279,7 +281,7 @@
                    </constraints>
                </stackView>
                <stackView opaque="NO" contentMode="scaleToFill" spacing="25" translatesAutoresizingMaskIntoConstraints="NO" id="0Qm-bc-Lz6">
                    <rect key="frame" x="33.666666666666657" y="425.66666666666669" width="326" height="115.00000000000006"/>
                    <rect key="frame" x="33.666666666666657" y="484.66666666666674" width="326" height="115"/>
                    <subviews>
                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NC1-mI-zKx">
                            <rect key="frame" x="0.0" y="0.0" width="92" height="115"/>
@@ -298,7 +300,7 @@
                                    </userDefinedRuntimeAttributes>
                                </imageView>
                                <button opaque="NO" tag="20" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yU2-as-RQp">
                                    <rect key="frame" x="25.333333333333336" y="84" width="41.000000000000007" height="41"/>
                                    <rect key="frame" x="25.333333333333336" y="83.999999999999943" width="41.000000000000007" height="41"/>
                                    <constraints>
                                        <constraint firstAttribute="width" constant="41" id="L8A-7f-wll"/>
                                        <constraint firstAttribute="height" constant="41" id="nHl-J4-GPL"/>
@@ -336,7 +338,7 @@
                                    </userDefinedRuntimeAttributes>
                                </imageView>
                                <button opaque="NO" tag="21" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5su-M5-JoT">
                                    <rect key="frame" x="25.333333333333343" y="84" width="41" height="41"/>
                                    <rect key="frame" x="25.333333333333343" y="83.999999999999943" width="41" height="41"/>
                                    <constraints>
                                        <constraint firstAttribute="height" constant="41" id="c8G-QJ-ED7"/>
                                        <constraint firstAttribute="width" constant="41" id="mxs-9J-Jf9"/>
@@ -374,7 +376,7 @@
                                    </userDefinedRuntimeAttributes>
                                </imageView>
                                <button opaque="NO" tag="22" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ou-Zt-QxE">
                                    <rect key="frame" x="25.333333333333314" y="84" width="41" height="41"/>
                                    <rect key="frame" x="25.333333333333314" y="83.999999999999943" width="41" height="41"/>
                                    <constraints>
                                        <constraint firstAttribute="height" constant="41" id="jDJ-nk-oK0"/>
                                        <constraint firstAttribute="width" constant="41" id="rNx-RW-rlS"/>

 WanPai/Root/Search/VC/ProgressCompetitionVC.swift

@@ -27,8 +27,16 @@
    
    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
             
        let vc = WorldCupContentDetailVC(id: Int(dataSoure?[indexPath.row].worldCupId ?? 0))
                push(vc: vc)
//        let vc = WorldCupContentDetailVC(id: Int(dataSoure?[indexPath.row].worldCupId ?? 0))
//                push(vc: vc)
       
        let vc = MatchDetailVC(model:  WorldCupJudgeModel(name:dataSoure?[indexPath.row].name ?? ""))
        vc.redTeamItems = dataSoure?[indexPath.row].red ?? []
        vc.blueTeamItems =  dataSoure?[indexPath.row].blue ?? []
        vc.show = true
        push(vc: vc)
      
       
    }

    @IBOutlet weak var view_number: UIView!

 WanPai/Root/Search/VC/WorldCupContentApplyInputVC.swift

@@ -158,7 +158,7 @@
                }

                @IBAction func webAction(_ sender: Any) {
                    let webVC = CommonWebVC(type: .matchStore,customTitle: "参赛协议", content: "")
                    let webVC = CommonWebVC(type: .matchStore,customTitle: "参赛协议", content: detailModel.contentOne)
                                push(vc: webVC)
                }