Skip to content

O
Opple-iOS
Commit b60e4aea authored by 曹云霄's avatar 曹云霄
Browse files
Options

发布2.0.6正式版

parent 9714aa24
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 53 deletions
Class/LearningCenter/ComprehensiveDiscussion/Cells/CommentTagTableViewCell.m
View file @ b60e4aea
......@@ -24,7 +24,7 @@
self.essenceLayoutConstraint.constant = topicModel.bestTopic?5:0;
self.managerLayoutConstraint.constant = topicModel.backEnd?5:0;
self.contentLabel.text = topicModel.title;
self.backgroundColor = topicModel.isRead?RGB(255, 250, 250, 1):[UIColor whiteColor];
self.contentLabel.textColor = topicModel.isRead?[UIColor grayColor]:[UIColor blackColor];
}
@end
Class/LearningCenter/ComprehensiveDiscussion/Cells/ForumItemTableViewCell.m
View file @ b60e4aea
......@@ -24,7 +24,8 @@
*/
- (void)refreshCell:(NSIndexPath *)indexPath withTopicEntity:(CustomTOForumTopicEntity *)topicEntity withDelegate:(id<TapClickImageViewDelegate>)delegate
{
self.contentBackView.backgroundColor = topicEntity.isRead?RGB(255, 250, 250, 1):[UIColor whiteColor];
self.contentLabel.textColor = topicEntity.isRead?[UIColor grayColor]:[UIColor blackColor];
self.titleLabel.textColor = topicEntity.isRead?[UIColor grayColor]:[UIColor blackColor];
self.titleLabel.text = topicEntity.title;
self.contentLabel.text = topicEntity.content;
self.userNameLabel.text = topicEntity.posterName;
......
Class/LearningCenter/SkillsAssessment/Controllers/EmigratedMainViewController.m
View file @ b60e4aea
......@@ -38,6 +38,7 @@
- (void)uiConfigAction
{
self.throughHistoryFlowLayout.itemSize = CGSizeMake(130, 150);
self.throughHistoryCollectionView.alwaysBounceVertical = YES;
self.throughHistoryFlowLayout.minimumInteritemSpacing = 30;
self.throughHistoryCollectionView.alpha = 0;
}
......
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @ b60e4aea
......@@ -580,7 +580,8 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
// 我知道了
}else if (indexPath.row == 0)
{
[SHARED_APPDELEGATE.tabBarController switchSelectedIndex:3];
[SHARED_APPDELEGATE.tabBarController switchSelectedIndex:103];
[SHARED_APPDELEGATE.tabBarController setSelectedIndex:4];
}
}];
success.preferredContentSize = CGSizeMake(315, 320);
......
Class/XXuserController/MyLuckyDraw/LuckyDrawDetailsViewController.m
View file @ b60e4aea
......@@ -77,11 +77,7 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
if (self.drawValue) {
[self.drawDetailsTableView.mj_header beginRefreshing];
}else {
[self getDrawDatas:YES];
}
[self.drawDetailsTableView.mj_header beginRefreshing];
}
- (void)viewDidLoad {
......
Class/XXuserController/RebateVC/RebateViewController.m
View file @ b60e4aea
......@@ -134,7 +134,7 @@
// 我的抽奖
LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass]instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
[self addChildViewController:draw];
draw.drawValue = ZERO;
draw.drawValue = ALLDRAW;
[self.drawBackgroundView addSubview:draw.view];
}
......
Lighting/LearningCenter.storyboard
View file @ b60e4aea
......@@ -437,7 +437,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="90"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0">
<rect key="frame" x="0.0" y="0.0" width="830" height="89.5"/>
<rect key="frame" x="0.0" y="0.0" width="830" height="89"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
......@@ -717,6 +717,12 @@
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="success" translatesAutoresizingMaskIntoConstraints="NO" id="MnZ-fr-ZFi">
<rect key="frame" x="60" y="100" width="52" height="20"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="剩余机会(3)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sFX-gr-pug">
<rect key="frame" x="59" y="88" width="56" height="12"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="10"/>
<color key="textColor" red="0.50980392159999999" green="0.36862745099999999" blue="0.33725490200000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="第一期" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="u08-Ky-Uru">
<rect key="frame" x="0.0" y="50" width="112" height="24"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
......@@ -729,6 +735,7 @@
<constraint firstItem="7Je-Ba-Exg" firstAttribute="top" secondItem="wmi-6l-1hb" secondAttribute="top" id="41w-n7-exp"/>
<constraint firstItem="MnZ-fr-ZFi" firstAttribute="centerY" secondItem="6A2-ER-iZr" secondAttribute="centerY" id="6dR-RS-9kK"/>
<constraint firstAttribute="trailing" secondItem="Lzc-Dz-TEX" secondAttribute="trailing" id="80f-Nf-AUr"/>
<constraint firstItem="MnZ-fr-ZFi" firstAttribute="top" secondItem="sFX-gr-pug" secondAttribute="bottom" id="Iug-eu-dwy"/>
<constraint firstAttribute="bottom" secondItem="Lzc-Dz-TEX" secondAttribute="bottom" constant="12" id="Waf-h8-QiB"/>
<constraint firstAttribute="trailingMargin" secondItem="MnZ-fr-ZFi" secondAttribute="trailing" constant="10" id="XWL-Ga-L9H"/>
<constraint firstAttribute="bottom" secondItem="7Je-Ba-Exg" secondAttribute="bottom" id="Zsz-6z-dYx"/>
......@@ -740,10 +747,12 @@
<constraint firstItem="Lzc-Dz-TEX" firstAttribute="top" secondItem="6A2-ER-iZr" secondAttribute="bottom" constant="5" id="luK-we-vXc"/>
<constraint firstItem="u08-Ky-Uru" firstAttribute="leading" secondItem="wmi-6l-1hb" secondAttribute="leading" id="twn-RM-pbC"/>
<constraint firstItem="6A2-ER-iZr" firstAttribute="leading" secondItem="wmi-6l-1hb" secondAttribute="leadingMargin" constant="10" id="vaZ-kf-Zqr"/>
<constraint firstAttribute="trailing" secondItem="sFX-gr-pug" secondAttribute="trailing" constant="15" id="yCN-2W-Rwg"/>
</constraints>
<size key="customSize" width="130" height="150"/>
<connections>
<outlet property="endDateLabel" destination="Lzc-Dz-TEX" id="kcQ-9Y-MJY"/>
<outlet property="remainingOpportunityLabel" destination="sFX-gr-pug" id="0Zi-Nc-6AK"/>
<outlet property="stateImageView" destination="MnZ-fr-ZFi" id="rjK-3b-Fi0"/>
<outlet property="titleLabel" destination="u08-Ky-Uru" id="dmd-K4-d5O"/>
</connections>
......@@ -1105,7 +1114,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="460" height="44"/>
<rect key="frame" x="0.0" y="56" width="460" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
<rect key="frame" x="0.0" y="0.0" width="460" height="44"/>
......@@ -1131,7 +1140,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="99.5" width="460" height="52"/>
<rect key="frame" x="0.0" y="100" width="460" height="52"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
<rect key="frame" x="0.0" y="0.0" width="460" height="52"/>
......@@ -1177,7 +1186,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
<rect key="frame" x="0.0" y="151.5" width="460" height="112"/>
<rect key="frame" x="0.0" y="152" width="460" height="112"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
<rect key="frame" x="0.0" y="0.0" width="460" height="112"/>
......@@ -1823,7 +1832,7 @@
<rect key="frame" x="0.0" y="28" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Qnm-0r-wEL" id="VAA-bT-OlF">
<rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB">
......@@ -1855,7 +1864,7 @@
<rect key="frame" x="0.0" y="128" width="1024" height="130"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
<rect key="frame" x="0.0" y="0.0" width="1024" height="129.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf">
......@@ -1912,7 +1921,7 @@
<rect key="frame" x="0.0" y="258" width="1024" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
<rect key="frame" x="0.0" y="0.0" width="1024" height="99.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="99"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
......@@ -2385,7 +2394,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
<rect key="frame" x="0.0" y="55.5" width="1024" height="60"/>
<rect key="frame" x="0.0" y="56" width="1024" height="60"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
<rect key="frame" x="0.0" y="0.0" width="1024" height="60"/>
......@@ -2411,7 +2420,7 @@
</connections>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
<rect key="frame" x="0.0" y="115.5" width="1024" height="50"/>
<rect key="frame" x="0.0" y="116" width="1024" height="50"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
<rect key="frame" x="0.0" y="0.0" width="1024" height="50"/>
......@@ -2762,7 +2771,7 @@
<rect key="frame" x="0.0" y="228" width="1024" height="84"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
<rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/>
<rect key="frame" x="0.0" y="0.0" width="1024" height="83"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
......
Lighting/OppleMain.storyboard
View file @ b60e4aea
......@@ -1695,72 +1695,87 @@
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="产品名称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h8u-yI-hKS">
<rect key="frame" x="125" y="27" width="66.5" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="66.5" id="B6y-at-08C"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" 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="f7a-Yr-f8v">
<rect key="frame" x="125" y="57" width="80" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="80" id="n8f-GJ-cOA"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" 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="PqW-IT-CmS">
<rect key="frame" x="383.5" y="57" width="66.5" height="16"/>
<rect key="frame" x="383" y="57" width="66.5" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="66.5" id="Qkk-Pv-S8F"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" 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="IjM-GC-nAD">
<rect key="frame" x="635.5" y="57" width="40" height="16"/>
<rect key="frame" x="635" y="57" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" 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="hFB-Yz-WaK">
<rect key="frame" x="383.5" y="27" width="57" height="16"/>
<rect key="frame" x="383" y="27" width="57" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="57" id="WwD-1H-N88"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V5K-83-oB8">
<rect key="frame" x="201.5" y="35" width="0.0" height="0.0"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="V5K-83-oB8">
<rect key="frame" x="201" y="34.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="g12-w9-iMi">
<rect key="frame" x="215" y="65" width="0.0" height="0.0"/>
<rect key="frame" x="215" y="64.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="水电费水电费" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cl-Js-ZxA">
<rect key="frame" x="450.5" y="26.5" width="86" height="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2cl-Js-ZxA">
<rect key="frame" x="450" y="34.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9bG-DV-do3">
<rect key="frame" x="450.5" y="65" width="0.0" height="0.0"/>
<rect key="frame" x="450" y="65" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" 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="ZgW-ab-vSu">
<rect key="frame" x="635.5" y="27" width="53.5" height="16"/>
<rect key="frame" x="635" y="27" width="53.5" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="53.5" id="MIY-oa-V2u"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我去恶趣味" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gO5-86-sRf">
<rect key="frame" x="699" y="26.5" width="71.5" height="17"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gO5-86-sRf">
<rect key="frame" x="699" y="34.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2gs-pY-x0s">
<rect key="frame" x="685.5" y="65" width="0.0" height="0.0"/>
<rect key="frame" x="685" y="65" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -1771,6 +1786,7 @@
<constraint firstItem="gO5-86-sRf" firstAttribute="leading" secondItem="ZgW-ab-vSu" secondAttribute="trailing" constant="10" id="1MM-aM-tcc"/>
<constraint firstItem="hFB-Yz-WaK" firstAttribute="centerY" secondItem="h8u-yI-hKS" secondAttribute="centerY" id="6bO-43-uS1"/>
<constraint firstItem="hFB-Yz-WaK" firstAttribute="centerX" secondItem="e8t-Pc-QPv" secondAttribute="centerX" constant="-100" id="9wb-nS-jow"/>
<constraint firstItem="ZgW-ab-vSu" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2cl-Js-ZxA" secondAttribute="trailing" constant="10" id="At7-lT-Tfd"/>
<constraint firstItem="PqW-IT-CmS" firstAttribute="centerY" secondItem="f7a-Yr-f8v" secondAttribute="centerY" id="ETK-DN-c4G"/>
<constraint firstItem="PqW-IT-CmS" firstAttribute="leading" secondItem="hFB-Yz-WaK" secondAttribute="leading" id="M1S-iZ-XUt"/>
<constraint firstItem="IjM-GC-nAD" firstAttribute="leading" secondItem="ZgW-ab-vSu" secondAttribute="leading" id="OBk-8d-CQK"/>
......@@ -1782,6 +1798,8 @@
<constraint firstItem="f7a-Yr-f8v" firstAttribute="leading" secondItem="h8u-yI-hKS" secondAttribute="leading" id="YX7-LO-7RA"/>
<constraint firstItem="2gs-pY-x0s" firstAttribute="centerY" secondItem="IjM-GC-nAD" secondAttribute="centerY" id="bDo-Sm-MsR"/>
<constraint firstItem="ZgW-ab-vSu" firstAttribute="centerX" secondItem="e8t-Pc-QPv" secondAttribute="centerX" constant="150" id="cTc-83-MKw"/>
<constraint firstItem="PqW-IT-CmS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="g12-w9-iMi" secondAttribute="trailing" constant="10" id="fch-5v-li2"/>
<constraint firstItem="hFB-Yz-WaK" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="V5K-83-oB8" secondAttribute="trailing" constant="10" id="hXS-uA-tNi"/>
<constraint firstItem="2cl-Js-ZxA" firstAttribute="centerY" secondItem="hFB-Yz-WaK" secondAttribute="centerY" id="mfa-cw-l6r"/>
<constraint firstItem="2cl-Js-ZxA" firstAttribute="leading" secondItem="hFB-Yz-WaK" secondAttribute="trailing" constant="10" id="oEf-k9-gfc"/>
<constraint firstItem="IjM-GC-nAD" firstAttribute="centerY" secondItem="f7a-Yr-f8v" secondAttribute="centerY" id="oRh-qu-REn"/>
......@@ -2248,17 +2266,21 @@
<constraint firstAttribute="width" constant="90" id="bdT-TV-EWt"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hky-AF-07L">
<rect key="frame" x="195" y="5" width="150" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="hky-AF-07L">
<rect key="frame" x="195" y="5" width="150" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Gab-6P-6yJ"/>
<constraint firstAttribute="width" constant="150" id="TcV-jt-15D"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="phB-Ga-t3s">
<rect key="frame" x="195" y="32" width="150" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="phB-Ga-t3s">
<rect key="frame" x="195" y="30" width="150" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="ngV-3s-kyC"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -2289,7 +2311,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i5D-XC-Vep">
<rect key="frame" x="709" y="31.5" width="50" height="17"/>
<rect key="frame" x="709" y="31" width="50" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="T45-ke-aWO"/>
</constraints>
......@@ -2298,7 +2320,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥5500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EWn-0L-DXF">
<rect key="frame" x="824" y="29.5" width="150" height="20.5"/>
<rect key="frame" x="824" y="29" width="150" height="20.5"/>
<constraints>
<constraint firstAttribute="width" constant="150" id="Cnu-Qf-gq9"/>
</constraints>
......@@ -2337,14 +2359,17 @@
<constraint firstAttribute="trailing" secondItem="Q7k-hi-4Ks" secondAttribute="trailing" id="nXb-DB-GBy"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代码" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cqm-Pg-F3M">
<rect key="frame" x="195" y="59" width="150" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代码" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="Cqm-Pg-F3M">
<rect key="frame" x="195" y="55" width="150" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="d0H-NT-neN"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥5500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I7J-2T-5Gr">
<rect key="frame" x="392" y="31.5" width="100" height="17"/>
<rect key="frame" x="392" y="31" width="100" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="e4F-dv-NBG"/>
</constraints>
......@@ -6742,23 +6767,27 @@
<constraint firstAttribute="width" constant="90" id="m1e-mA-dMA"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hV3-WW-RhX">
<rect key="frame" x="180" y="5" width="100" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="名称" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="hV3-WW-RhX">
<rect key="frame" x="180" y="5" width="100" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Hgw-3W-vTJ"/>
<constraint firstAttribute="width" constant="100" id="zBr-lX-TnU"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eQ1-ab-oCl">
<rect key="frame" x="180" y="32" width="100" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="规格" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="eQ1-ab-oCl">
<rect key="frame" x="180" y="30" width="100" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="9aZ-g8-jTN"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥5500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6S3-kx-Umm">
<rect key="frame" x="330" y="31.5" width="49" height="17"/>
<rect key="frame" x="330" y="31" width="49" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......@@ -6789,7 +6818,7 @@
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LCn-vB-Gkk">
<rect key="frame" x="554" y="31.5" width="30" height="17"/>
<rect key="frame" x="554" y="31" width="30" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="A37-gf-3J6"/>
</constraints>
......@@ -6798,7 +6827,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥5500" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZXB-7t-nrM">
<rect key="frame" x="639" y="29.5" width="100" height="20.5"/>
<rect key="frame" x="639" y="29" width="100" height="20.5"/>
<constraints>
<constraint firstAttribute="width" constant="100" id="jvv-1T-Pue"/>
</constraints>
......@@ -6829,8 +6858,11 @@
<constraint firstAttribute="height" constant="30" id="D5S-1B-J5z"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代码" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DCT-vD-ifE">
<rect key="frame" x="180" y="59" width="100" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代码" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="DCT-vD-ifE">
<rect key="frame" x="180" y="55" width="100" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="W2C-WE-2pk"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
......
Lighting/Supporting Files/Info.plist
View file @ b60e4aea
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>2.0.5</string>
<string>2.0.6</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......
Tools/CYConst/CYConstManager.h
View file @ b60e4aea
......@@ -96,7 +96,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/**
* 服务器开发地址
*///http://139.196.195.30:8090
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/**
* 服务器测试地址
......@@ -106,7 +106,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
//**
// * 服务器正式地址
// */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/*****************************************接口地址*****************************************/
......
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