Skip to content

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

样式调整完成

parent abd517a0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 30 deletions
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ 822010b7
......@@ -286,6 +286,7 @@ class OrderDetailGoodsModel: Mappable {
var warehouse_inventory : Int? //商品库存
var is_edit : Int? = 0 //订单商品是否有修改，1是0非--前端自主添加的字段
var commission_val:String? //这个商品的总佣金
var remark:String?//商品备注
required init?( map: Map) {
}
......@@ -302,6 +303,7 @@ class OrderDetailGoodsModel: Mappable {
goods_thumb <- map["goods_thumb"]
warehouse_inventory <- map["warehouse_inventory"]
is_edit <- map["is_edit"]
remark <- map["remark"]
}
}
......
GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.xib
View file @ 822010b7
<?xml version="1.0" encoding="UTF-8"?>
<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">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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="17125"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<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"/>
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift
View file @ 822010b7
......@@ -26,12 +26,16 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
@IBOutlet weak var titleLbl: UILabel!
@IBOutlet weak var diLbl: UILabel!
@IBOutlet weak var yu_shou_img: UIImageView!
var isDetail = false{
didSet{
if isDetail {
bz_lbl.isHidden = false
content_tv.isUserInteractionEnabled = false
edit_img.isHidden = true
delImg.isHidden = true
delBtn.isHidden = true
holder_lbl.isHidden = true
}
}
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 822010b7
......@@ -191,9 +191,11 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
cell.totalPriceLbl.text = "\(totalP)"
if orderType == 1 {
cell.yu_shou_img.isHidden = false
cell.diLbl.isHidden = false
cell.priceLbl.isHidden = false
cell.diLbl.text = "定金:￥" + djTFstr
cell.totalPriceLbl.text = "尾款:￥" + wkTFstr
cell.priceLbl.text = "尾款:￥" + wkTFstr
}else {
// cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)"
......@@ -683,7 +685,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 1 {
return 243
return 260
}
if indexPath.section == 2 {//新增预售
if orderType == 1 {
......
GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift
View file @ 822010b7
......@@ -16,6 +16,7 @@ protocol XuanZeShangPinViewControllerDelegate {
class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,XuanZeShangPinCellDelegate,UISearchBarDelegate,SearchBarViewDelegate,UITextFieldDelegate{
@IBOutlet weak var holder_view: UIView!
var isCG = false
var searchV : SearchBarView? = nil
var delegate:XuanZeShangPinViewControllerDelegate?
......@@ -137,7 +138,14 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
let UserToken = UserDefaults.standard.value(forKey: "user_token")
getGoodsInfo(["user_token":UserToken,"is_adsale":is_adsale], success: { (data) in
let model = data as! GetGoodsInfoModel
self.datas = model.data!
self.datas.removeAll()
model.data?.forEach({ (item) in
self.datas.append(item)
})
self.holder_view.isHidden = true
if self.datas.count == 0 {
self.holder_view.isHidden = false
}
self.listView.reloadData()
self.listView.mj_header?.endRefreshing()
}) { (error) in
......
GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.xib
View file @ 822010b7
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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="17703"/>
<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>
......@@ -24,7 +25,7 @@
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1yh-oh-zJe" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
......@@ -56,14 +57,15 @@
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Cs6-iU-pYN">
<rect key="frame" x="0.0" y="44" width="414" height="768"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<connections>
<outlet property="dataSource" destination="-1" id="4d1-os-XKU"/>
<outlet property="delegate" destination="-1" id="juZ-cO-vTy"/>
</connections>
</tableView>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="1yh-oh-zJe" secondAttribute="bottom" id="6tb-Es-vOW"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Cs6-iU-pYN" secondAttribute="trailing" id="7d6-BN-QIg"/>
......@@ -80,10 +82,14 @@
<constraint firstAttribute="trailing" secondItem="cSW-1R-48s" secondAttribute="trailing" id="wzu-wi-iLA"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="0WX-TF-5sE" secondAttribute="trailing" id="z4Z-Wl-qhJ"/>
</constraints>
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
<point key="canvasLocation" x="131.8840579710145" y="91.741071428571431"/>
</view>
</objects>
<designables>
<designable name="1yh-oh-zJe">
<size key="intrinsicContentSize" width="10" height="10"/>
</designable>
</designables>
<resources>
<namedColor name="按钮渐变色上">
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -97,5 +103,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>
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 822010b7
......@@ -187,7 +187,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
listView.separatorStyle = .none
listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
listView.register(UINib(nibName: "XuanZeShangPinCell", bundle: nil), forCellReuseIdentifier: "XuanZeShangPinCell")
listView.register(UINib(nibName: "DaiKeXiaDanGouWuCell", bundle: nil), forCellReuseIdentifier: "DaiKeXiaDanGouWuCell")
listView.register(UINib(nibName: "PingLunCell", bundle: nil), forCellReuseIdentifier: "PingLunCell")
listView.register(UINib(nibName: "GLKHCell", bundle: nil), forCellReuseIdentifier: "GLKHCell")
......@@ -429,29 +429,32 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
return cell
case 1:
//MARK:--商品cell
let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
cell.priceLbl.isHidden = false
cell.selectBtn.isHidden = true
if isYuShou {
cell.yuShouImg.isHidden = false
}
if indexPath.row == 1 {
cell.lineView.isHidden = true
}
let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
// cell.priceLbl.isHidden = false
cell.isDetail = true
// cell.selectBtn.isHidden = true
let rowModel = self.dataMdoel?.order_goods![indexPath.row]
cell.iconImg?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
cell.nameLbl.text = rowModel?.goods_name
let rowModel = self.dataMdoel?.order_goods![indexPath.row]
cell.imgView?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
cell.content_tv.text = rowModel?.remark
cell.titleLbl.text = rowModel?.goods_name
if rowModel?.goods_attr != nil {
cell.detailLbl.text = (rowModel?.goods_attr)!
cell.detailLbl.text = "规格:" + (rowModel?.goods_attr)!
}else{
cell.detailLbl.text = "-"
cell.detailLbl.text = "规格:-"
}
if isYuShou {
cell.diLbl.isHidden = false
cell.priceLbl.isHidden = false
cell.yu_shou_img.isHidden = false
cell.diLbl.text = "定金:￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)!
cell.priceLbl.text = "尾款:￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)!
}
cell.priceLbl.text = "￥" + (self.dataMdoel?.order_res?.goods_amount)!
cell.detailLbl2.text = "x" + StringByInt(number: (rowModel?.cart_number!)!)
cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
cell.detailLbl2.text = "小计:￥" + (self.dataMdoel?.order_res?.goods_amount)!
return cell
case 2:
......@@ -1135,7 +1138,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
switch indexPath.section {
case 1://商品展示heightrow
return 120
return 260
case 4://发票信息heightrow
if segmentIndex == 0 {
return 180
......
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