Эх сурвалжийг харах

ninggege。提交了新的 CRUD

openlockPPP 1 жил өмнө
parent
commit
0805390fc9

+ 2 - 2
JiaPeiManage.xcodeproj/project.pbxproj

@@ -1467,7 +1467,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071403;
+				CURRENT_PROJECT_VERSION = 1202023071701;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1507,7 +1507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071403;
+				CURRENT_PROJECT_VERSION = 1202023071701;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;

+ 4 - 0
JiaPeiManage/Info.plist

@@ -14,5 +14,9 @@
 	</dict>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>NSContactsUsageDescription</key>
+	<string>建议允许</string>
+	<key>NSUserTrackingUsageDescription</key>
+	<string>此App需要您允许访问广告标识符权限,向您提供更优质、安全的个性化服务及内容,未经同意我们不会用于其他目的;开启后,您也可以前往系统“设置-隐私 ”中随时关闭</string>
 </dict>
 </plist>

+ 9 - 0
JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.swift

@@ -20,7 +20,10 @@ final class HomeViewController: BaseViewController {
     //在校学员-action
     @IBOutlet weak var onSchoolAction_button: UIButton!
     //生成二维码-action
+    @IBOutlet weak var codeQrView: UIView!
     @IBOutlet weak var codeQrAction_button: UIButton!
+    @IBOutlet weak var codeQr_layout: NSLayoutConstraint!
+    
     //绑定学员-action
     @IBOutlet weak var biandAction_button: UIButton!
     //个人中心-action
@@ -48,6 +51,12 @@ final class HomeViewController: BaseViewController {
         self.meStu_button.spacingBetweenImageAndTitle = 5
         self.meMine_button.imagePosition = .right
         self.meMine_button.spacingBetweenImageAndTitle = 5
+        self.codeQr_layout.constant = 0
+        self.codeQrView.isHidden = true
+        if LocalManager.userInfo.userAccount != "350211196508204525" {
+            self.codeQr_layout.constant = 150
+            self.codeQrView.isHidden = false
+        }
     }
     //绑定-rx
     func biandView(){

+ 7 - 5
JiaPeiManage/Sources/Modulars/Home/Controllers/HomeViewController.xib

@@ -12,6 +12,8 @@
             <connections>
                 <outlet property="biandAction_button" destination="jyp-62-CcY" id="ZRE-cu-Yx5"/>
                 <outlet property="codeQrAction_button" destination="q4X-SH-Odp" id="tGd-Tt-0XK"/>
+                <outlet property="codeQrView" destination="Jve-BG-5J7" id="zxI-pP-ckq"/>
+                <outlet property="codeQr_layout" destination="dIh-hM-FWy" id="d6H-Zb-VRL"/>
                 <outlet property="meMine_button" destination="ZiT-fi-dat" id="8Me-fQ-83B"/>
                 <outlet property="meStuAction_button" destination="8jf-BA-Yzd" id="k8a-Kx-85C"/>
                 <outlet property="meStu_button" destination="cfT-vy-eYx" id="ccD-4b-eRr"/>
@@ -181,8 +183,8 @@
                                         </userDefinedRuntimeAttribute>
                                     </userDefinedRuntimeAttributes>
                                 </view>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jve-BG-5J7" userLabel="View-生成二维码">
-                                    <rect key="frame" x="190" y="325" width="170" height="150"/>
+                                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jve-BG-5J7" userLabel="View-生成二维码">
+                                    <rect key="frame" x="190" y="325" width="170" 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="cux-Ed-DRL">
                                             <rect key="frame" x="20" y="21" width="122" height="30"/>
@@ -202,7 +204,7 @@
                                             </constraints>
                                         </imageView>
                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q4X-SH-Odp">
-                                            <rect key="frame" x="20" y="20" width="130" height="110"/>
+                                            <rect key="frame" x="20" y="20" width="130" height="34"/>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                         </button>
@@ -214,7 +216,7 @@
                                         <constraint firstItem="td7-Yx-epc" firstAttribute="centerX" secondItem="Jve-BG-5J7" secondAttribute="centerX" id="S40-NC-vxk"/>
                                         <constraint firstAttribute="trailing" secondItem="q4X-SH-Odp" secondAttribute="trailing" constant="20" id="Sac-Lw-tRg"/>
                                         <constraint firstAttribute="bottom" secondItem="q4X-SH-Odp" secondAttribute="bottom" constant="20" id="bsl-38-Hpx"/>
-                                        <constraint firstAttribute="height" constant="150" id="dIh-hM-FWy"/>
+                                        <constraint firstAttribute="height" id="dIh-hM-FWy"/>
                                         <constraint firstItem="td7-Yx-epc" firstAttribute="top" secondItem="cux-Ed-DRL" secondAttribute="bottom" constant="12" id="iX8-DD-2JT"/>
                                         <constraint firstItem="cux-Ed-DRL" firstAttribute="leading" secondItem="Jve-BG-5J7" secondAttribute="leading" constant="20" id="qDO-LW-N75"/>
                                         <constraint firstItem="q4X-SH-Odp" firstAttribute="top" secondItem="Jve-BG-5J7" secondAttribute="top" constant="20" id="ugL-UD-TL0"/>
@@ -314,7 +316,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6eJ-gf-jfD" userLabel="View-个人中心">
-                                    <rect key="frame" x="190" y="480" width="170" height="211"/>
+                                    <rect key="frame" x="190" y="330" width="170" height="211"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="个人中心" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3bj-Vm-uCl">
                                             <rect key="frame" x="20" y="21" width="100" height="30"/>

+ 5 - 1
JiaPeiManage/Sources/Modulars/Statistics/Controllers/StatisticsPageController.swift

@@ -201,7 +201,11 @@ final class StatisticsPageController: BaseGroupTableViewController {
         if(isIphoneX){
             tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
         }else {
-            tableView.contentInset = UIEdgeInsets(top: -25, left: 0, bottom: -25, right: 0)
+            if #available(iOS 13.0, *) {
+                tableView.contentInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+            }else {
+                tableView.contentInset = UIEdgeInsets(top: -25, left: 0, bottom: -25, right: 0)
+            }
         }
         setupRefreshHeader(tableView) {[unowned self] in
             self.statisticsPageViewModel!.getStatisticsList(isLoading: false)