Skip to content

G
GeliBusinessPlatform
Commit 5d6241ec authored by lujunye's avatar lujunye
Browse files
Options

1.6.10 build 3.8

parent 3f495093
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 5d6241ec
...@@ -4324,7 +4324,7 @@ ...@@ -4324,7 +4324,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.7; CURRENT_PROJECT_VERSION = 3.8;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -4374,7 +4374,7 @@ ...@@ -4374,7 +4374,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
); );
MARKETING_VERSION = 1.6.9; MARKETING_VERSION = 1.6.10;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
...@@ -4455,7 +4455,7 @@ ...@@ -4455,7 +4455,7 @@
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements; CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.7; CURRENT_PROJECT_VERSION = 3.8;
DEFINES_MODULE = NO; DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\""; DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH; DEVELOPMENT_TEAM = K48346UACH;
...@@ -4505,7 +4505,7 @@ ...@@ -4505,7 +4505,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK", "$(PROJECT_DIR)/GeliBusinessPlatform/Other/SDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
); );
MARKETING_VERSION = 1.6.9; MARKETING_VERSION = 1.6.10;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
......
GeliBusinessPlatform/ViewController/分销员管理/ADD_FXY_View.swift
View file @ 5d6241ec
...@@ -21,7 +21,7 @@ class ADD_FXY_View: UIView { ...@@ -21,7 +21,7 @@ class ADD_FXY_View: UIView {
} }
var temp = "" var temp = ""
// var temp2 = "" //var temp2 = ""
@objc func textChange(tf:UITextField){ @objc func textChange(tf:UITextField){
if tf == phoneTf { if tf == phoneTf {
if tf.text!.count <= 11 { if tf.text!.count <= 11 {
...@@ -36,12 +36,12 @@ class ADD_FXY_View: UIView { ...@@ -36,12 +36,12 @@ class ADD_FXY_View: UIView {
nameTf.text = "" nameTf.text = ""
nameTf.isUserInteractionEnabled = false nameTf.isUserInteractionEnabled = false
} }
// if tf.text?.containsEmoji { // if (tf.text!.containsEmoji) {
// HUD.flash(.label("请输入非表情符号"), delay: 1.2) // HUD.flash(.label("请输入非表情符号"), delay: 1.2)
// tf.text = temp2 // tf.text = temp2
// return // return
// }else{ // }else{
// temp2 = tf.text // temp2 = tf.text!
// } // }
delegate?.ADD_FXY_ViewTextInput(txt: nameTf.text!, type: 2,view:self) delegate?.ADD_FXY_ViewTextInput(txt: nameTf.text!, type: 2,view:self)
} }
......
GeliBusinessPlatform/ViewController/分销收益页/FXSY_Detail_ViewController.xib
View file @ 5d6241ec
...@@ -45,26 +45,29 @@ ...@@ -45,26 +45,29 @@
<color key="textColor" red="0.20392156862745098" green="0.20392156862745098" blue="0.20392156862745098" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.20392156862745098" green="0.20392156862745098" blue="0.20392156862745098" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="dotLine" translatesAutoresizingMaskIntoConstraints="NO" id="Yjh-m5-mcw">
<rect key="frame" x="15" y="105" width="399" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Uq1-Fq-tbu"/>
</constraints>
</imageView>
</subviews> </subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstItem="Yjh-m5-mcw" firstAttribute="leading" secondItem="5qb-dP-6Vx" secondAttribute="leading" constant="15" id="5uf-fi-VP9"/>
<constraint firstAttribute="trailing" secondItem="2Jj-t6-3Th" secondAttribute="trailing" id="8AR-PL-i9x"/> <constraint firstAttribute="trailing" secondItem="2Jj-t6-3Th" secondAttribute="trailing" id="8AR-PL-i9x"/>
<constraint firstItem="n76-uS-p91" firstAttribute="leading" secondItem="5qb-dP-6Vx" secondAttribute="leading" id="DfL-Sl-jMi"/> <constraint firstItem="n76-uS-p91" firstAttribute="leading" secondItem="5qb-dP-6Vx" secondAttribute="leading" id="DfL-Sl-jMi"/>
<constraint firstAttribute="height" constant="106" id="Gkh-52-fF6"/> <constraint firstAttribute="height" constant="106" id="Gkh-52-fF6"/>
<constraint firstItem="2Jj-t6-3Th" firstAttribute="top" secondItem="n76-uS-p91" secondAttribute="bottom" constant="15" id="SrL-k9-D3P"/> <constraint firstItem="2Jj-t6-3Th" firstAttribute="top" secondItem="n76-uS-p91" secondAttribute="bottom" constant="15" id="SrL-k9-D3P"/>
<constraint firstAttribute="trailing" secondItem="Yjh-m5-mcw" secondAttribute="trailing" id="VwH-Fi-Z8K"/>
<constraint firstAttribute="bottom" secondItem="Yjh-m5-mcw" secondAttribute="bottom" id="aap-OC-D2Y"/>
<constraint firstAttribute="trailing" secondItem="n76-uS-p91" secondAttribute="trailing" id="gQB-ba-uMC"/> <constraint firstAttribute="trailing" secondItem="n76-uS-p91" secondAttribute="trailing" id="gQB-ba-uMC"/>
<constraint firstItem="n76-uS-p91" firstAttribute="top" secondItem="5qb-dP-6Vx" secondAttribute="top" constant="26" id="wIs-cj-8Oc"/> <constraint firstItem="n76-uS-p91" firstAttribute="top" secondItem="5qb-dP-6Vx" secondAttribute="top" constant="26" id="wIs-cj-8Oc"/>
<constraint firstItem="2Jj-t6-3Th" firstAttribute="leading" secondItem="5qb-dP-6Vx" secondAttribute="leading" id="xsa-Qi-cHB"/> <constraint firstItem="2Jj-t6-3Th" firstAttribute="leading" secondItem="5qb-dP-6Vx" secondAttribute="leading" id="xsa-Qi-cHB"/>
</constraints> </constraints>
</view> </view>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="F36-9H-REp">
<rect key="frame" x="15" y="150" width="384" height="1"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="GdD-SE-LCP"/>
</constraints>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="zqx-vL-CGK"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="zqx-vL-CGK">
<rect key="frame" x="0.0" y="151" width="414" height="745"/> <rect key="frame" x="0.0" y="150" width="414" height="746"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections> <connections>
<outlet property="dataSource" destination="-1" id="jTY-48-V63"/> <outlet property="dataSource" destination="-1" id="jTY-48-V63"/>
...@@ -75,21 +78,19 @@ ...@@ -75,21 +78,19 @@
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/> <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints> <constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="F36-9H-REp" secondAttribute="trailing" constant="15" id="2Yq-oT-8J0"/> <constraint firstAttribute="bottom" secondItem="zqx-vL-CGK" secondAttribute="bottom" id="3ip-bt-D4T"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="zqx-vL-CGK" secondAttribute="trailing" id="CDF-ps-gQU"/>
<constraint firstItem="5qb-dP-6Vx" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="CKw-lG-wgE"/> <constraint firstItem="5qb-dP-6Vx" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="CKw-lG-wgE"/>
<constraint firstItem="zqx-vL-CGK" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="K1w-0e-9Wz"/>
<constraint firstItem="5qb-dP-6Vx" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LEC-3a-4Lr"/> <constraint firstItem="5qb-dP-6Vx" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LEC-3a-4Lr"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="5qb-dP-6Vx" secondAttribute="trailing" id="LiF-8V-2Pn"/> <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="5qb-dP-6Vx" secondAttribute="trailing" id="LiF-8V-2Pn"/>
<constraint firstItem="zqx-vL-CGK" firstAttribute="top" secondItem="F36-9H-REp" secondAttribute="bottom" id="MXs-r2-lEl"/> <constraint firstItem="zqx-vL-CGK" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="LpY-N0-nhk"/>
<constraint firstAttribute="bottom" secondItem="zqx-vL-CGK" secondAttribute="bottom" id="O9Z-Ga-u1j"/> <constraint firstItem="zqx-vL-CGK" firstAttribute="top" secondItem="5qb-dP-6Vx" secondAttribute="bottom" id="Mm6-3D-wHR"/>
<constraint firstItem="zqx-vL-CGK" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="ZBi-9f-ZQc"/>
<constraint firstItem="F36-9H-REp" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="15" id="q0J-A1-M9O"/>
<constraint firstItem="F36-9H-REp" firstAttribute="top" secondItem="5qb-dP-6Vx" secondAttribute="bottom" id="wuY-xh-IzH"/>
</constraints> </constraints>
<point key="canvasLocation" x="-200" y="60"/> <point key="canvasLocation" x="-200" y="60"/>
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="dotLine" width="330" height="0.5"/>
<namedColor name="多选按钮字体颜色"> <namedColor name="多选按钮字体颜色">
<color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.41176470588235292" green="0.41176470588235292" blue="0.41176470588235292" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment