Skip to content

A
ALand
Commit ed13299c authored by Sandy's avatar Sandy
Browse files
Options

bug fix

parent d52d86df
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 32 deletions
ALand/CodeClass/Home/View/Commodity/CommodityListCollectionViewCell.xib
View file @ ed13299c
......@@ -8,40 +8,40 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="CommodityListCollectionViewCell">
<rect key="frame" x="0.0" y="0.0" width="200" height="407"/>
<rect key="frame" x="0.0" y="0.0" width="200" height="340"/>
<autoresizingMask key="autoresizingMask"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
<rect key="frame" x="0.0" y="0.0" width="200" height="407"/>
<rect key="frame" x="0.0" y="0.0" width="200" height="340"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="commodityImage" translatesAutoresizingMaskIntoConstraints="NO" id="cBw-zL-p9z">
<rect key="frame" x="0.0" y="0.0" width="200" height="247"/>
<rect key="frame" x="0.0" y="0.0" width="200" height="200"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bloem天然草本更年期综合营养胶囊100粒" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vlk-5l-QDd" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="10" y="255" width="180" height="41"/>
<rect key="frame" x="10" y="204" width="180" height="41"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.066666666666666666" green="0.066666666666666666" blue="0.066666666666666666" alpha="1" colorSpace="calibratedRGB"/>
<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="FUs-8c-aeb">
<rect key="frame" x="5" y="309" width="26" height="24"/>
<rect key="frame" x="5" y="253" width="26" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="1" green="0.39215686274509803" blue="0.39215686274509803" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="239" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ig6-43-sUi">
<rect key="frame" x="31" y="309" width="37" height="24"/>
<rect key="frame" x="31" y="253" width="37" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="1" green="0.3921568627" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥239ddfdfd" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JDW-37-wfV">
<rect key="frame" x="75" y="313" width="94" height="20"/>
<rect key="frame" x="75" y="257" width="94" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pU7-bv-8QS" userLabel="bottom">
<rect key="frame" x="0.0" y="363" width="200" height="44"/>
<rect key="frame" x="0.0" y="305" width="200" height="35"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IC1-ZB-9GI">
<rect key="frame" x="0.0" y="0.0" width="200" height="1"/>
......@@ -51,7 +51,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dLe-Tm-qm6">
<rect key="frame" x="166" y="11" width="22" height="23"/>
<rect key="frame" x="166" y="6" width="22" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="23" id="0Qy-LF-bxd"/>
<constraint firstAttribute="width" constant="22" id="yua-IV-f6J"/>
......@@ -61,20 +61,20 @@
<action selector="shareAction:" destination="gTV-IL-0wX" eventType="touchUpInside" id="uXk-3N-njR"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 佣金:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i9h-vh-UNx">
<rect key="frame" x="1" y="12" width="45" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="佣金:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i9h-vh-UNx" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="14" y="9" width="33" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥4.88" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dmy-Qd-kYj" customClass="MBLabelWithFontAdapter">
<rect key="frame" x="46" y="12" width="50" height="20"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" red="0.2666666667" green="0.2666666667" blue="0.2666666667" alpha="1" colorSpace="calibratedRGB"/>
<rect key="frame" x="47" y="9" width="44" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.60138541670000001" green="0.60138541670000001" blue="0.60138541670000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jQe-Fs-DSQ">
<rect key="frame" x="157" y="1" width="1" height="43"/>
<rect key="frame" x="157" y="1" width="1" height="34"/>
<color key="backgroundColor" red="0.91271875000000002" green="0.91271875000000002" blue="0.91271875000000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="c7w-gt-9yw"/>
......@@ -84,7 +84,7 @@
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="jQe-Fs-DSQ" secondAttribute="bottom" id="3nM-vQ-8cc"/>
<constraint firstAttribute="height" constant="44" id="92V-hY-tjv"/>
<constraint firstAttribute="height" constant="35" id="92V-hY-tjv"/>
<constraint firstItem="i9h-vh-UNx" firstAttribute="centerY" secondItem="pU7-bv-8QS" secondAttribute="centerY" id="9om-3B-esf"/>
<constraint firstItem="IC1-ZB-9GI" firstAttribute="top" secondItem="pU7-bv-8QS" secondAttribute="top" id="Bup-dM-Axi"/>
<constraint firstAttribute="trailing" secondItem="dLe-Tm-qm6" secondAttribute="trailing" constant="12" id="DMY-ta-tB1"/>
......@@ -98,14 +98,14 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DLG-sh-uU2">
<rect key="frame" x="75" y="324" width="94" height="1"/>
<rect key="frame" x="75" y="268" width="94" height="1"/>
<color key="backgroundColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="xRA-b9-Nsa"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" text="销量：120" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4sA-5e-zpi">
<rect key="frame" x="14" y="337" width="75" height="22"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="249" text="销量：120" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4sA-5e-zpi">
<rect key="frame" x="14" y="277" width="75" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
......@@ -115,19 +115,21 @@
</view>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="i9h-vh-UNx" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="leading" constant="-4" id="09G-JC-AXp"/>
<constraint firstItem="i9h-vh-UNx" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="leading" id="09G-JC-AXp"/>
<constraint firstItem="i9h-vh-UNx" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="leading" constant="2" id="0za-eJ-0pr"/>
<constraint firstItem="cBw-zL-p9z" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="1Yu-wi-HgC"/>
<constraint firstItem="4sA-5e-zpi" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="14" id="4L0-Gu-xfw"/>
<constraint firstItem="ig6-43-sUi" firstAttribute="centerY" secondItem="FUs-8c-aeb" secondAttribute="centerY" id="5JQ-Rz-YcG"/>
<constraint firstAttribute="bottom" secondItem="pU7-bv-8QS" secondAttribute="bottom" id="6nt-pW-mCL"/>
<constraint firstItem="FUs-8c-aeb" firstAttribute="top" secondItem="vlk-5l-QDd" secondAttribute="bottom" constant="13" id="6o1-q3-rPs"/>
<constraint firstItem="FUs-8c-aeb" firstAttribute="top" secondItem="vlk-5l-QDd" secondAttribute="bottom" constant="8" id="6o1-q3-rPs"/>
<constraint firstAttribute="trailing" secondItem="vlk-5l-QDd" secondAttribute="trailing" constant="10" id="9iV-bh-YX2"/>
<constraint firstItem="JDW-37-wfV" firstAttribute="width" secondItem="DLG-sh-uU2" secondAttribute="width" id="ABU-DF-D10"/>
<constraint firstItem="pU7-bv-8QS" firstAttribute="top" secondItem="4sA-5e-zpi" secondAttribute="bottom" constant="4" id="AKU-zp-dNe"/>
<constraint firstItem="4sA-5e-zpi" firstAttribute="top" secondItem="JDW-37-wfV" secondAttribute="bottom" constant="4" id="CNr-5k-ogc"/>
<constraint firstItem="4sA-5e-zpi" firstAttribute="top" secondItem="JDW-37-wfV" secondAttribute="bottom" id="CNr-5k-ogc"/>
<constraint firstItem="FUs-8c-aeb" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="5" id="Gap-ae-3qZ"/>
<constraint firstItem="JDW-37-wfV" firstAttribute="bottom" secondItem="ig6-43-sUi" secondAttribute="bottom" id="I9c-HN-6Vj"/>
<constraint firstItem="FUs-8c-aeb" firstAttribute="leading" secondItem="vlk-5l-QDd" secondAttribute="leading" id="IdZ-yI-Aba"/>
<constraint firstItem="i9h-vh-UNx" firstAttribute="leading" secondItem="4sA-5e-zpi" secondAttribute="leading" id="Ji2-Tc-SFb"/>
<constraint firstAttribute="trailing" secondItem="cBw-zL-p9z" secondAttribute="trailing" id="LMr-oe-Zgo"/>
<constraint firstItem="DLG-sh-uU2" firstAttribute="centerY" secondItem="FUs-8c-aeb" secondAttribute="centerY" constant="3" id="Lk7-4I-6zG"/>
<constraint firstItem="ig6-43-sUi" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="trailing" constant="7" id="ORt-QK-sOe"/>
......@@ -135,21 +137,27 @@
<constraint firstItem="JDW-37-wfV" firstAttribute="leading" secondItem="DLG-sh-uU2" secondAttribute="leading" id="QAj-TL-HVc"/>
<constraint firstItem="4sA-5e-zpi" firstAttribute="leading" secondItem="vlk-5l-QDd" secondAttribute="leading" id="U8z-Bp-PqG"/>
<constraint firstItem="ig6-43-sUi" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="trailing" id="Ywz-KP-UiI"/>
<constraint firstAttribute="bottom" secondItem="cBw-zL-p9z" secondAttribute="bottom" constant="160" id="Z6c-Ut-Ydg"/>
<constraint firstAttribute="bottom" secondItem="cBw-zL-p9z" secondAttribute="bottom" constant="140" id="Z6c-Ut-Ydg"/>
<constraint firstItem="i9h-vh-UNx" firstAttribute="leading" secondItem="4sA-5e-zpi" secondAttribute="leading" id="a7f-kD-RnP"/>
<constraint firstItem="cBw-zL-p9z" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="cVC-4e-gej"/>
<constraint firstItem="pU7-bv-8QS" firstAttribute="top" secondItem="4sA-5e-zpi" secondAttribute="bottom" constant="4" id="dF4-a7-1u8"/>
<constraint firstAttribute="trailing" secondItem="pU7-bv-8QS" secondAttribute="trailing" id="gwZ-Qn-3Pe"/>
<constraint firstItem="vlk-5l-QDd" firstAttribute="top" secondItem="cBw-zL-p9z" secondAttribute="bottom" constant="8" id="hkZ-oc-k8v"/>
<constraint firstItem="vlk-5l-QDd" firstAttribute="top" secondItem="cBw-zL-p9z" secondAttribute="bottom" constant="4" id="hkZ-oc-k8v"/>
<constraint firstItem="ig6-43-sUi" firstAttribute="leading" secondItem="FUs-8c-aeb" secondAttribute="trailing" constant="7" id="jQQ-3k-JFb"/>
<constraint firstItem="JDW-37-wfV" firstAttribute="leading" secondItem="ig6-43-sUi" secondAttribute="trailing" constant="7" id="s3y-5a-urj"/>
<constraint firstItem="vlk-5l-QDd" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="10" id="vLH-Ea-wpS"/>
</constraints>
<size key="customSize" width="200" height="407"/>
<size key="customSize" width="200" height="350"/>
<variation key="default">
<mask key="constraints">
<exclude reference="IdZ-yI-Aba"/>
<exclude reference="ORt-QK-sOe"/>
<exclude reference="jQQ-3k-JFb"/>
<exclude reference="U8z-Bp-PqG"/>
<exclude reference="AKU-zp-dNe"/>
<exclude reference="09G-JC-AXp"/>
<exclude reference="0za-eJ-0pr"/>
<exclude reference="a7f-kD-RnP"/>
</mask>
</variation>
<connections>
......@@ -162,7 +170,7 @@
<outlet property="labelSalesVolume" destination="4sA-5e-zpi" id="B4d-u6-bO0"/>
<outlet property="labelTitle" destination="vlk-5l-QDd" id="FAQ-2a-zdq"/>
</connections>
<point key="canvasLocation" x="-105" y="369.5"/>
<point key="canvasLocation" x="-105" y="341"/>
</collectionViewCell>
</objects>
<resources>
......
ALand/CodeClass/Home/View/CommodityTableViewCell.h
View file @ ed13299c
......@@ -9,6 +9,7 @@
#import <UIKit/UIKit.h>
#import "CommotityListModel.h"
@interface CommodityTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UIImageView *imgView;
- (void)cellWithModel:(CommotityListModel *)model;
@end
ALand/CodeClass/Home/View/CommodityTableViewCell.xib
View file @ ed13299c
......@@ -48,7 +48,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥9.8" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eSJ-Pe-NgQ">
<rect key="frame" x="218" y="69" width="50" height="24"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.60138541670000001" green="0.60138541670000001" blue="0.60138541670000001" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销量：19" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WH8-2u-i8A">
......@@ -86,6 +86,7 @@
<color key="tintColor" red="0.48627450980392156" green="0.76470588235294112" blue="0.14509803921568626" alpha="1" colorSpace="calibratedRGB"/>
<inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
<connections>
<outlet property="imgView" destination="f2b-xv-2mY" id="Mcy-VO-86s"/>
<outlet property="imgViewCommodity" destination="f2b-xv-2mY" id="FGQ-WA-scQ"/>
<outlet property="labelBrokerageRate" destination="eSJ-Pe-NgQ" id="pic-rX-Z9U"/>
<outlet property="labelPrice" destination="exC-Ji-hHu" id="KTN-qN-5Vb"/>
......
ALand/CodeClass/Home/ViewController/Commodity/CommodityListViewController.m
View file @ ed13299c
......@@ -196,7 +196,7 @@
- (void)setUpCollectionView {
UICollectionViewFlowLayout *layOut = [[UICollectionViewFlowLayout alloc] init];
layOut.minimumLineSpacing = 10;
layOut.itemSize = CGSizeMake((ScreenSize.width - 30)/2, ScreenSize.height / 2.2);
layOut.itemSize = CGSizeMake((ScreenSize.width - 30)/2, 340);
_collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layOut];
[self.view addSubview:_collectionView];
......
ALand/CodeClass/Home/ViewController/Commodity/CommoditySearchViewController.m
View file @ ed13299c
......@@ -52,6 +52,7 @@
UIColor *color = self.navigationController.navigationBar.barTintColor;
[titleView setBackgroundColor:color];
UISearchBar *searchBar = [[UISearchBar alloc] init];
searchBar.delegate = self;
searchBar.frame = CGRectMake(0, 0, 260, 35);
searchBar.centerX = titleView.centerX;
......
ALand/CodeClass/Home/ViewController/CommodityManagementViewController.m
View file @ ed13299c
......@@ -14,7 +14,7 @@
#import "CommodityListModel/CommotityListModel.h"
#import "ManagementViewController.h"
#import "Conditions.h"
#import "CommodityDetailViewController.h"
#import "JavenSortView.h"
#define kCellID @"commodityCell"
#define kPageSize @999
......@@ -56,7 +56,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
// [self resetReloadData];
[self resetReloadData];
}
- (void)setUpSearchBar {
......@@ -282,9 +282,16 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
CommodityDetailViewController *detailVC = [[CommodityDetailViewController alloc] init];
detailVC.model = self.arrItemDatas[indexPath.row];
CommodityTableViewCell *cell = (CommodityTableViewCell *)[tableView cellForRowAtIndexPath:indexPath];
detailVC.image = cell.imgView.image;
[self.navigationController pushViewController:detailVC animated:YES];
}
#pragma mark =========== searchBar Delegate ===========
- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
......
ALand/Third/MBFontAdapter/util/MBFontAdapter.m
View file @ ed13299c
......@@ -10,7 +10,7 @@
@implementation MBFontAdapter
+(UIFont *)adjustFont:(UIFont *)font{
+ (UIFont *)adjustFont:(UIFont *)font{
UIFont *newFont=nil;
if (IS_IPHONE_6){
newFont = [UIFont fontWithName:font.fontName size:font.pointSize+IPHONE6_INCREMENT];
......
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