Commit 0a764438 authored by lujunye's avatar lujunye

去掉二维码,改文案

parent 76a360b2
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" 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="16087"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -22,7 +24,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MEL-J8-S3c" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="0.0" width="165" height="165"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<accessibility key="accessibilityConfiguration">
<accessibilityTraits key="traits" notEnabled="YES"/>
</accessibility>
......@@ -48,7 +50,7 @@
<constraint firstAttribute="width" secondItem="T8c-YA-14K" secondAttribute="height" multiplier="1:1" id="hU7-HF-s5b"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Xi-Jf-NQw">
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Xi-Jf-NQw">
<rect key="frame" x="121" y="-1" width="46" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="46" id="53T-yQ-mQh">
......@@ -81,7 +83,7 @@
<constraint firstAttribute="width" constant="1" id="9Yh-da-gGa"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w99-DC-tI2">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w99-DC-tI2">
<rect key="frame" x="0.0" y="253" width="82" height="30"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="下架">
......@@ -91,7 +93,7 @@
<action selector="leftAction:" destination="gTV-IL-0wX" eventType="touchUpInside" id="cT0-Pg-v8j"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ygg-2c-Pm9">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ygg-2c-Pm9">
<rect key="frame" x="83" y="253" width="82" height="30"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/>
<state key="normal" title="入库"/>
......@@ -174,7 +176,7 @@
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="T8c-YA-14K" secondAttribute="trailing" id="0aE-7k-Jte"/>
<constraint firstItem="4Xi-Jf-NQw" firstAttribute="top" secondItem="T8c-YA-14K" secondAttribute="top" constant="-1" id="5dP-Ts-A7R"/>
......@@ -220,13 +222,13 @@
</view>
</subviews>
</view>
<viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="DBH-ay-Cni" secondAttribute="trailing" id="2Ib-xS-oEI"/>
<constraint firstItem="DBH-ay-Cni" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="9tM-Hc-12B"/>
<constraint firstItem="DBH-ay-Cni" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="K9V-iI-jJZ"/>
<constraint firstAttribute="bottom" secondItem="DBH-ay-Cni" secondAttribute="bottom" id="i1X-rG-cG4"/>
</constraints>
<viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
<size key="customSize" width="136" height="281"/>
<connections>
<outlet property="codeBtn" destination="4Xi-Jf-NQw" id="ORF-0T-7hL"/>
......@@ -241,6 +243,11 @@
<point key="canvasLocation" x="-325.36231884057975" y="123.21428571428571"/>
</collectionViewCell>
</objects>
<designables>
<designable name="MEL-J8-S3c">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<image name="二维码" width="45.5" height="30"/>
<namedColor name="商品图背景渐变底色">
......@@ -264,5 +271,8 @@
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
......@@ -10,9 +10,7 @@ import UIKit
class GYS_FX_Product_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource{
@IBOutlet weak var center_select_btn: UIButton!
@IBOutlet weak var count_lbl: UILabel!//已铺货/可铺货 数量
@IBOutlet weak var bottom_title_lbl: UILabel!
@IBOutlet weak var rightBtn: UIButton!
......
......@@ -476,7 +476,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
self.setBtmBtnUi()
let contentArr = ["预售","普通","期货","团购"]
let contentArr = ["预售","现货","期货","团购"]
let titles = NSMutableArray()
titles.removeAllObjects()
for num in self.itemTypeArr! {
......@@ -817,16 +817,16 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
dict = guiGeArr.first
}
cell.tempLbl.text = "温藏:-"
cell.tempLbl.text = "温藏:未记录"
if dict.wenDu.count > 0 {
cell.tempLbl.text = "温藏:\(dict.wenDu)"
}
cell.weightLbl.text = "重量(kg):- kg"
cell.weightLbl.text = "重量(kg):未记录"
if dict.weight.count > 0 {
cell.weightLbl.text = "重量(kg):\(dict.weight)kg"
}
cell.guiGeLbl.text = "规格:\(dict.guiGe)"
cell.danWeiLbl.text = "单位:-"
cell.danWeiLbl.text = "单位:未记录"
if dict.danWei.count > 0 {
cell.danWeiLbl.text = "单位:\(dict.danWei)"
}
......@@ -979,7 +979,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
view.isShangPinType = true
view.titleLbl.text = "请选择商品类型"
view.delegate = self
view.dataArr = ["预售","普通","期货","团购"]
view.dataArr = ["预售","现货","期货","团购"]
if itemTypeArr?.count == 0 {
for _ in view.dataArr {
itemTypeArr?.append(99)
......@@ -1306,7 +1306,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
itemTypeArr = sender
let contentArr = ["预售","普通","期货","团购"]
let contentArr = ["预售","现货","期货","团购"]
let titles = NSMutableArray()
titles.removeAllObjects()
for num in itemTypeArr! {
......
......@@ -38,7 +38,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
view.removeFromSuperview()
glSelectView = nil
}
let leiXingArr = ["预售","普通","期货","团购"]
let leiXingArr = ["预售","现货","期货","团购"]
let titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
var tishixxArr = ["请输入商品名称","普通","请选择商品分类","请选择品牌","请输入起卖数量"]
......@@ -412,16 +412,16 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
dict = guiGeArr.first
}
cell.tempLbl.text = "温藏:-"
cell.tempLbl.text = "温藏:未记录"
if dict.wenDu.count > 0 {
cell.tempLbl.text = "温藏:\(dict.wenDu)"
}
cell.weightLbl.text = "重量(kg):- kg"
cell.weightLbl.text = "重量(kg):未记录"
if dict.weight.count > 0 {
cell.weightLbl.text = "重量(kg):\(dict.weight)kg"
}
cell.guiGeLbl.text = "规格:\(dict.guiGe)"
cell.danWeiLbl.text = "单位:-"
cell.danWeiLbl.text = "单位:未记录"
if dict.danWei.count > 0 {
cell.danWeiLbl.text = "单位:\(dict.danWei)"
}
......@@ -875,7 +875,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
//MARK: - GLAlertView(多选)下的页面
func GLAlertMoreSelectViewClick(sender: Array<Int>, view:UIView) {
itemTypeArr = sender
let contentArr = ["预售","普通","期货","团购"]
let contentArr = ["预售","现货","期货","团购"]
let titles = NSMutableArray()
titles.removeAllObjects()
for num in itemTypeArr! {
......
......@@ -91,7 +91,7 @@ class YingFuZKListViewController: BaseViewController,UISearchBarDelegate,SearchB
listView.separatorStyle = .none
SetTopFrame(view: topView, height: 44)
leftBtnTitle.text = "全部"
rightBtnTitle.text = "欠款"
rightBtnTitle.text = "由多到少"
if barTitle == "应收账款" {
titleLbl.text = "当前应收款余额总计:"
rightBtnTitle.text = "余额"
......
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -32,7 +33,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VZN-z6-bLS">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="EOT-q2-wCt"/>
</constraints>
......@@ -71,7 +72,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="BV0-0O-Gee" firstAttribute="leading" secondItem="W3g-9a-ZWc" secondAttribute="leading" constant="15" id="2MB-ao-ZK4"/>
<constraint firstItem="nKi-IO-Opl" firstAttribute="top" secondItem="4b4-r4-1bV" secondAttribute="bottom" id="2iL-2e-HA9"/>
......@@ -91,7 +92,7 @@
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="csq-EP-8sj">
<rect key="frame" x="0.0" y="181" width="414" height="681"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="4vW-wg-iIE"/>
<outlet property="delegate" destination="-1" id="4jR-Ve-rbW"/>
......@@ -114,13 +115,13 @@
<constraint firstAttribute="width" constant="1" id="NqH-ZI-sWV"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bkh-it-kCE">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bkh-it-kCE">
<rect key="frame" x="0.0" y="0.0" width="206.5" height="43"/>
<connections>
<action selector="topBtnClick:" destination="-1" eventType="touchUpInside" id="al3-mg-2HJ"/>
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ugH-C2-gdX">
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ugH-C2-gdX">
<rect key="frame" x="207.5" y="0.0" width="206.5" height="43"/>
<connections>
<action selector="topBtnClick:" destination="-1" eventType="touchUpInside" id="Ysd-C1-G1r"/>
......@@ -153,7 +154,7 @@
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="fKc-xi-DP9" secondAttribute="bottom" id="48L-Me-POb"/>
<constraint firstAttribute="bottom" secondItem="Mg4-CC-MwW" secondAttribute="bottom" constant="7" id="6q7-pT-e0x"/>
......@@ -180,7 +181,7 @@
<constraint firstItem="Mg4-CC-MwW" firstAttribute="top" secondItem="DyX-Tr-WIm" secondAttribute="top" constant="7" id="yOC-IW-Xlv"/>
</constraints>
</view>
<button hidden="YES" opaque="NO" alpha="0.40000000000000002" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2hj-Pi-lJ9">
<button hidden="YES" opaque="NO" alpha="0.40000000000000002" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2hj-Pi-lJ9">
<rect key="frame" x="0.0" y="181" width="414" height="715"/>
<color key="backgroundColor" name="标题字颜色"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
......@@ -190,7 +191,7 @@
</button>
<tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="a6h-za-J0s">
<rect key="frame" x="0.0" y="181" width="414" height="98"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="height" constant="98" id="HnM-IS-8JA"/>
</constraints>
......@@ -200,6 +201,7 @@
</connections>
</tableView>
</subviews>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="VZN-z6-bLS" secondAttribute="trailing" id="5O0-Js-8sE"/>
......@@ -223,7 +225,6 @@
<constraint firstItem="csq-EP-8sj" firstAttribute="top" secondItem="DyX-Tr-WIm" secondAttribute="bottom" id="oZu-CT-fAc"/>
<constraint firstItem="csq-EP-8sj" firstAttribute="bottom" secondItem="fnl-2z-Ty3" secondAttribute="bottom" id="x6B-Nu-ATn"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="131.91964285714286"/>
</view>
</objects>
......@@ -241,5 +242,8 @@
<namedColor name="灰色字体颜色">
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -113,7 +114,7 @@
<constraint firstAttribute="height" constant="1" id="mtv-Wr-puz"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aK8-v9-yu2">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aK8-v9-yu2">
<rect key="frame" x="248" y="150" width="82" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="82" id="KTL-4d-LMk"/>
......@@ -148,7 +149,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="aK8-v9-yu2" secondAttribute="bottom" constant="15" id="18b-Pe-E5d"/>
<constraint firstItem="RGB-nZ-T7S" firstAttribute="centerX" secondItem="lYj-2P-xvL" secondAttribute="centerX" id="1kR-AP-uSK"/>
......@@ -229,5 +230,8 @@
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
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