Просмотр исходного кода

当前版本,因为审核不允许返利,关闭推广功能。

Steven 1 год назад
Родитель
Сommit
799f2650df

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "TEST"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

+ 9 - 3
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Controller/MineViewController.m

@@ -152,7 +152,13 @@
     }];
     
     self.normalFunctionView.isMember = isMember;
-    self.normalFunctionView.isSettlement = self.mineInfo.isSettlement;
+    if (isMember) {
+        self.normalFunctionView.isSettlement = self.mineInfo.isSettlement;
+    }
+    else {
+        self.normalFunctionView.isSettlement = NO;
+    }
+    
     [self.normalFunctionView configView];
     CGFloat functionHeight = [self.normalFunctionView getViewHeight];
     [self.normalFunctionView mas_updateConstraints:^(MASConstraintMaker *make) {
@@ -164,9 +170,9 @@
     [self.teachToolView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(toolViewHeight);
     }];
-
+    
     self.bottomView.isMember = isMember;
-    self.bottomView.isSettlement = self.mineInfo.isSettlement;
+    self.bottomView.isSettlement = NO; // 关闭推广功能
     CGFloat bottomViewHeight = [self.bottomView getViewHeight];
     [self.bottomView mas_updateConstraints:^(MASConstraintMaker *make) {
         make.height.mas_equalTo(bottomViewHeight);

+ 16 - 16
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineBottomView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -15,13 +15,13 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jxJ-0S-mtl">
-                    <rect key="frame" x="14" y="0.0" width="386" height="320"/>
+                    <rect key="frame" x="14" y="0.0" width="386" height="260"/>
                     <subviews>
-                        <view tag="1009" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fef-w6-G6G">
-                            <rect key="frame" x="0.0" y="10" width="386" height="60"/>
+                        <view hidden="YES" tag="1009" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fef-w6-G6G">
+                            <rect key="frame" x="0.0" y="10" width="386" height="0.0"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="酷乐秀推广计划" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rdd-Bg-DGd">
-                                    <rect key="frame" x="15" y="20.5" width="120" height="19.5"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rdd-Bg-DGd">
+                                    <rect key="frame" x="15" y="0.0" width="120" height="0.0"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="120" id="Ekb-PQ-MQU"/>
                                     </constraints>
@@ -30,14 +30,14 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="f3l-U4-ZG8">
-                                    <rect key="frame" x="362" y="24.5" width="6" height="11"/>
+                                    <rect key="frame" x="362" y="-5.5" width="6" height="11"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="11" id="KMo-3s-Ndb"/>
                                         <constraint firstAttribute="width" constant="6" id="gwS-rF-ofu"/>
                                     </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="R1A-TC-V7v">
-                                    <rect key="frame" x="298.5" y="22" width="53.5" height="16"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R1A-TC-V7v">
+                                    <rect key="frame" x="352" y="0.0" width="0.0" height="0.0"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
@@ -47,7 +47,7 @@
                             <gestureRecognizers/>
                             <constraints>
                                 <constraint firstAttribute="trailing" secondItem="f3l-U4-ZG8" secondAttribute="trailing" constant="18" id="088-hD-5ZV"/>
-                                <constraint firstAttribute="height" constant="60" id="5Hv-uN-ddI"/>
+                                <constraint firstAttribute="height" id="5Hv-uN-ddI"/>
                                 <constraint firstItem="f3l-U4-ZG8" firstAttribute="centerY" secondItem="R1A-TC-V7v" secondAttribute="centerY" id="BqP-Z7-xme"/>
                                 <constraint firstItem="Rdd-Bg-DGd" firstAttribute="leading" secondItem="Fef-w6-G6G" secondAttribute="leading" constant="15" id="IXw-Lp-i21"/>
                                 <constraint firstItem="f3l-U4-ZG8" firstAttribute="centerY" secondItem="Fef-w6-G6G" secondAttribute="centerY" id="VGS-gr-D60"/>
@@ -60,7 +60,7 @@
                             </connections>
                         </view>
                         <view tag="1010" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HBK-rs-rqI">
-                            <rect key="frame" x="0.0" y="70" width="386" height="60"/>
+                            <rect key="frame" x="0.0" y="10" width="386" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="银行卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Av9-03-vMn">
                                     <rect key="frame" x="15" y="20.5" width="120" height="19.5"/>
@@ -103,7 +103,7 @@
                             </connections>
                         </view>
                         <view tag="1020" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZIi-Ty-3ga">
-                            <rect key="frame" x="0.0" y="130" width="386" height="60"/>
+                            <rect key="frame" x="0.0" y="70" width="386" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="交易记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zjV-ll-Dbh">
                                     <rect key="frame" x="15" y="20.5" width="120" height="19.5"/>
@@ -136,7 +136,7 @@
                             </connections>
                         </view>
                         <view tag="1011" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fdO-bM-tF7">
-                            <rect key="frame" x="0.0" y="190" width="386" height="60"/>
+                            <rect key="frame" x="0.0" y="130" width="386" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="网络检测" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gP3-HT-sXM">
                                     <rect key="frame" x="15" y="20.5" width="120" height="19.5"/>
@@ -169,7 +169,7 @@
                             </connections>
                         </view>
                         <view tag="1012" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ONP-Ez-pDv">
-                            <rect key="frame" x="0.0" y="250" width="386" height="60"/>
+                            <rect key="frame" x="0.0" y="190" width="386" height="60"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="设备检测" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rIK-aM-lGG">
                                     <rect key="frame" x="15" y="20.5" width="120" height="19.5"/>
@@ -240,7 +240,7 @@
                     </userDefinedRuntimeAttributes>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vIt-8T-p6j">
-                    <rect key="frame" x="14" y="332" width="386" height="200"/>
+                    <rect key="frame" x="14" y="272" width="386" height="200"/>
                     <subviews>
                         <view tag="1013" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="440-4e-PTN">
                             <rect key="frame" x="0.0" y="10" width="386" height="60"/>