Skip to content

G
GeliBusinessPlatform
Commit d1a6a0b4 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

569 iOS：各内容列表，补充“暂无内容”的提示，如订单管理列表为空时。不要显示只显示“点击或上拉加载更多” 

611 ios：商品管理，商品卡片增加展示规格字段，以区分同属于一个spu的sku。
parent 991e22d2
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 4 deletions
GeliBusinessPlatform/BaseView/BaseViewController.swift
View file @ d1a6a0b4
......@@ -36,6 +36,7 @@ class BaseViewController: UIViewController ,NavBarViewDelegate{
}
self.view.backgroundColor = UIColor(named: "app底色")
footerMJ.setTitle("暂无内容", for: .noMoreData)
}
override func didReceiveMemoryWarning() {
......
GeliBusinessPlatform/Model/GoodsManageMoel/GoodsListModel.swift
View file @ d1a6a0b4
......@@ -46,6 +46,7 @@ class GoodsResModel: Mappable {
var goods_thumb : String? //商品缩略图
var is_show : Int? //上、下架状态，0下架，1上架
var price : String? //价格
var spec_str : String? //商品规格字符串
required init?( map: Map) {
......@@ -58,6 +59,7 @@ class GoodsResModel: Mappable {
goods_thumb <- map["goods_thumb"]
is_show <- map["is_show"]
price <- map["price"]
spec_str <- map["spec_str"]
}
......
GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.swift
View file @ d1a6a0b4
......@@ -17,6 +17,7 @@ class GoodsCollectionViewCell: UICollectionViewCell {
var delegate : GoodsCollectionViewCellDelegate?
@IBOutlet weak var speatrr: UILabel!
@IBOutlet weak var goodsImgV: UIImageView!
@IBOutlet weak var codeBtn: UIButton!
@IBOutlet weak var rightBtn: UIButton!
......
GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.xib
View file @ d1a6a0b4
<?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"/>
<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"/>
......@@ -121,8 +121,8 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHK-Kt-m55">
<rect key="frame" x="10" y="175" width="145" height="36.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHK-Kt-m55">
<rect key="frame" x="10" y="175" width="145" height="18.5"/>
<attributedString key="attributedText">
<fragment content="六和川香鸡柳2.5kg*多发点嘎嘎大放送公司的嘎嘎搭嘎">
<attributes>
......@@ -147,12 +147,39 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihF-4k-oNH">
<rect key="frame" x="10" y="198.5" width="145" height="15.5"/>
<attributedString key="attributedText">
<fragment content="六和川香鸡柳2.5kg*多发点嘎嘎大放送公司的嘎嘎搭嘎">
<attributes>
<color key="NSColor" name="灰色字体颜色"/>
<font key="NSFont" size="11" name="PingFangSC-Medium"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="lastLineFillPercent">
<integer key="value" value="20"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="number" keyPath="linesCornerRadius">
<integer key="value" value="3"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdapterFont" value="YES"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="isSkeletonable" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="skeletonLineSpacing">
<real key="value" value="2"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<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"/>
<constraint firstItem="p8r-r3-3OB" firstAttribute="leading" secondItem="w99-DC-tI2" secondAttribute="trailing" id="6Hf-Yf-TPI"/>
<constraint firstAttribute="trailing" secondItem="ihF-4k-oNH" secondAttribute="trailing" constant="10" id="74v-PW-qgy"/>
<constraint firstAttribute="bottom" secondItem="zEv-lz-wzj" secondAttribute="bottom" constant="30" id="9hh-F4-uqi">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
......@@ -180,8 +207,10 @@
<constraint firstItem="T8c-YA-14K" firstAttribute="leading" secondItem="DBH-ay-Cni" secondAttribute="leading" id="fjv-pJ-i1E"/>
<constraint firstItem="zEv-lz-wzj" firstAttribute="leading" secondItem="DBH-ay-Cni" secondAttribute="leading" id="gEC-JS-t6n"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="50H-P6-uG6" secondAttribute="trailing" constant="10" id="iNx-8b-Qi3"/>
<constraint firstItem="ihF-4k-oNH" firstAttribute="top" secondItem="tHK-Kt-m55" secondAttribute="bottom" constant="5" id="iQD-Yj-HnV"/>
<constraint firstItem="w99-DC-tI2" firstAttribute="top" secondItem="zEv-lz-wzj" secondAttribute="bottom" id="uId-Iz-MlZ"/>
<constraint firstItem="MEL-J8-S3c" firstAttribute="leading" secondItem="DBH-ay-Cni" secondAttribute="leading" id="zKf-Kd-6MK"/>
<constraint firstItem="ihF-4k-oNH" firstAttribute="leading" secondItem="DBH-ay-Cni" secondAttribute="leading" constant="10" id="zqC-rq-15p"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
......@@ -207,6 +236,7 @@
<outlet property="lgBtn" destination="MEL-J8-S3c" id="Ja4-8M-q7d"/>
<outlet property="priceLbl" destination="50H-P6-uG6" id="xc3-mC-m3H"/>
<outlet property="rightBtn" destination="Ygg-2c-Pm9" id="lzi-pe-PQm"/>
<outlet property="speatrr" destination="ihF-4k-oNH" id="TDw-Hf-SqU"/>
</connections>
<point key="canvasLocation" x="-325.36231884057975" y="123.21428571428571"/>
</collectionViewCell>
......@@ -225,6 +255,9 @@
<namedColor name="灰色字体颜色">
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift
View file @ d1a6a0b4
......@@ -393,6 +393,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
cell.delegate = self
cell.goodsName.text = rowModel.goods_name
cell.speatrr.text = rowModel.spec_str
cell.priceLbl.text = "￥" + rowModel.price!
cell.goodsImgV.sd_setImage(with: URL(string: SERVERCE_ImageHost + rowModel.goods_thumb!))
......
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