Skip to content

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

1.5禅道bug修复

parent 86d819cb
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 17 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ f50a997f
......@@ -3523,7 +3523,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.24;
CURRENT_PROJECT_VERSION = 1.25;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3568,7 +3568,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
MARKETING_VERSION = 1.4;
MARKETING_VERSION = 1.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......@@ -3655,7 +3655,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1.24;
CURRENT_PROJECT_VERSION = 1.25;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -3700,7 +3700,7 @@
"$(PROJECT_DIR)/GeliBusinessPlatform/Define/融云",
"$(PROJECT_DIR)/GeliBusinessPlatform/Other/JPush/Lib",
);
MARKETING_VERSION = 1.4;
MARKETING_VERSION = 1.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
......
GeliBusinessPlatform/View/Cell/TilteAndTextViewCell.xib
View file @ f50a997f
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -10,7 +11,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TilteAndTextViewCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TilteAndTextViewCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="173.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
......@@ -29,7 +30,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g5v-ec-LNn">
<rect key="frame" x="15" y="39.5" width="345" height="119"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="简述品牌体征。" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfp-Va-GKb">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="简述品牌特征。" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jfp-Va-GKb">
<rect key="frame" x="15" y="10" width="320" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="07H-XO-7SO">
......
GeliBusinessPlatform/ViewController/新增、编辑品牌/PinPaiListViewController.swift
View file @ f50a997f
......@@ -230,6 +230,13 @@ class PinPaiListViewController: BaseViewController,UISearchBarDelegate,SearchBar
listView.mj_header?.beginRefreshing()
}
removeBlackBtnView()
if searchBar.text?.count == 0 && keyWord.count != 0{
keyWord = searchBar.text!
listView.mj_header?.beginRefreshing()
}
}
//MARK:--取消搜索代理
......
GeliBusinessPlatform/ViewController/新增、编辑品牌/XinZengPinPaiViewController.swift
View file @ f50a997f
......@@ -61,14 +61,14 @@ class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITa
HUD.flash(.label("请输入品牌名称"), delay: 1.2)
return
}
if iconUrl.count == 0 {
HUD.flash(.label("请选择图片"), delay: 1.2)
return
}
if pinPaiUrl.count == 0 {
HUD.flash(.label("请输入品牌链接"), delay: 1.2)
return
}
// if iconUrl.count == 0 {
// HUD.flash(.label("请选择图片"), delay: 1.2)
// return
// }
// if pinPaiUrl.count == 0 {
// HUD.flash(.label("请输入品牌链接"), delay: 1.2)
// return
// }
if commend.count == 0 {
HUD.flash(.label("请填写品牌描述"), delay: 1.2)
return
......@@ -124,7 +124,7 @@ class XinZengPinPaiViewController: BaseViewController,UITableViewDataSource,UITa
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TilteAndTextView") as! TilteAndTextViewCell
cell.titleLbl.text = titleArr[indexPath.row]
cell.holderLbl.text = "简述品牌体征。"
cell.holderLbl.text = "简述品牌特征。"
cell.holderLbl.isHidden = false
if commend.count > 0 {
cell.holderLbl.isHidden = true
......
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