up

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 = 1202023071401;
+				CURRENT_PROJECT_VERSION = 1202023071402;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1490,10 +1490,13 @@
 				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "${SRCROOT}/JiaPeiManage/JSJP-Brigding-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1504,7 +1507,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1202023071401;
+				CURRENT_PROJECT_VERSION = 1202023071402;
 				DEVELOPMENT_TEAM = K7T6CU5SW5;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = JiaPeiManage/Info.plist;
@@ -1527,10 +1530,13 @@
 				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.kestrel.JSJPCoach;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "${SRCROOT}/JiaPeiManage/JSJP-Brigding-Header.h";
 				SWIFT_VERSION = 5.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

JiaPeiManage/Sources/Main/App/CompositionRoot.swift

@@ -85,9 +85,12 @@ final class CompositionRoot {
 
         //打开app次数
         LocalManager.userInfo.openTimes += 1
-
         //设置环境  --默认是线上环境
+        Defaults.currentEnvironment = .res
+#if DEBUG || _DEBUG
+        //设置环境
         Defaults.currentEnvironment = .dev
+#endif
 
         //ToastView
         ToastView.appearance().font = NYFont.SysFont.sys_15

JiaPeiManage/Sources/Modulars/Login/Controllers/LoginViewController.swift

@@ -104,12 +104,12 @@ final class LoginViewController: BaseViewController {
         //用户协议
         userprotocol_button.rx.tap.subscribe ({ [unowned self] (_)  in
             //跳web
-            navigator.push("https://ys.zzxcx.net/xy_jsjp.html")
+            navigator.push("https://ys.zzxcx.net/xy_jlgj.html")
         }).disposed(by: disposeBag)
         //隐私
         userprivacy_button.rx.tap.subscribe ({ [unowned self] (_)  in
             //跳web
-            navigator.push("https://ys.zzxcx.net/xy_jsjp.html")
+            navigator.push("https://ys.zzxcx.net/xy_jlgj.html")
         }).disposed(by: disposeBag)
         //显示密码
         pwdshow_button.rx.tap.subscribe ({ [unowned self] (_)  in

JiaPeiManage/Sources/Modulars/Mine/Controllers/MineViewController.xib

@@ -309,20 +309,20 @@
                                     </constraints>
                                 </view>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vUj-bc-Qkc" userLabel="View-cell">
-                                    <rect key="frame" x="0.0" y="319" width="375" height="40"/>
+                                    <rect key="frame" x="0.0" y="319" width="375" height="60"/>
                                     <subviews>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="福建省连江县长龙镇丘祠村邱储77号1单元" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJC-Qf-3Nv">
-                                            <rect key="frame" x="94" y="10" width="266" height="20"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CCCCCCCCCC111111111111111111111111111" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fJC-Qf-3Nv">
+                                            <rect key="frame" x="94" y="10" width="266" height="40"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="266" id="vFh-Rq-OQI"/>
-                                                <constraint firstAttribute="height" constant="20" id="xgp-uz-MCG"/>
+                                                <constraint firstAttribute="height" constant="40" id="xgp-uz-MCG"/>
                                             </constraints>
                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                             <color key="textColor" red="0.83137254900000002" green="0.86666666670000003" blue="0.90196078430000004" 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="BNF-9j-eLW">
-                                            <rect key="frame" x="15" y="10" width="70" height="20"/>
+                                            <rect key="frame" x="15" y="20" width="70" height="20"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="70" id="N5v-g8-kao"/>
                                                 <constraint firstAttribute="height" constant="20" id="Rxe-Xz-lr2"/>
@@ -335,8 +335,8 @@
                                     <color key="backgroundColor" red="0.043137254901960784" green="0.16862745098039217" blue="0.30196078431372547" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <constraints>
                                         <constraint firstItem="BNF-9j-eLW" firstAttribute="leading" secondItem="vUj-bc-Qkc" secondAttribute="leading" constant="15" id="4OE-nd-e5n"/>
-                                        <constraint firstItem="BNF-9j-eLW" firstAttribute="top" secondItem="vUj-bc-Qkc" secondAttribute="top" constant="10" id="6JO-em-vb2"/>
-                                        <constraint firstAttribute="height" constant="40" id="aQg-hC-jua"/>
+                                        <constraint firstItem="BNF-9j-eLW" firstAttribute="top" secondItem="vUj-bc-Qkc" secondAttribute="top" constant="20" id="6JO-em-vb2"/>
+                                        <constraint firstAttribute="height" constant="60" id="aQg-hC-jua"/>
                                         <constraint firstItem="fJC-Qf-3Nv" firstAttribute="top" secondItem="vUj-bc-Qkc" secondAttribute="top" constant="10" id="fHE-fJ-IdK"/>
                                         <constraint firstAttribute="trailing" secondItem="fJC-Qf-3Nv" secondAttribute="trailing" constant="15" id="k6R-Se-Qw2"/>
                                     </constraints>