Skip to content

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

1.6.9,build3.7上架版本

parent 941e08eb
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 43 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ c768492d
......@@ -4188,7 +4188,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.5;
CURRENT_PROJECT_VERSION = 3.7;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......@@ -4319,7 +4319,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = GeliBusinessPlatform/GeliBusinessPlatform.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3.5;
CURRENT_PROJECT_VERSION = 3.7;
DEFINES_MODULE = NO;
DEVELOPMENT_ASSET_PATHS = "\"GeliBusinessPlatform/Preview Content\"";
DEVELOPMENT_TEAM = K48346UACH;
......
GeliBusinessPlatform/AppDelegate.swift
View file @ c768492d
......@@ -30,7 +30,7 @@ wx26b371b279064098
测试账号&密码
Liangyuepf
zxcvbnm
*/
*/
import UIKit
import ESTabBarController_swift
......
GeliBusinessPlatform/Info.plist
View file @ c768492d
......@@ -57,7 +57,7 @@
<key>NSBluetoothPeripheralUsageDescription</key>
<string>我们需要通过您同意使用蓝牙,才能连接打印机</string>
<key>NSCameraUsageDescription</key>
<string>我们需要通过您同意使用相机,才能使用相机功能</string>
<string>我们需要通过您同意使用相机,才能拍摄商品、发票图片</string>
<key>NSContactsUsageDescription</key>
<string>我们需要通过您同意使用通讯录,才能访问您的好友列表</string>
<key>NSLocationAlwaysUsageDescription</key>
......@@ -72,9 +72,9 @@
<key>NSMicrophoneUsageDescription</key>
<string>我们需要通过您同意使用麦克风，才能与你进行语音交流</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>我们需要通过您同意使用相册,才能使用您的相册数据</string>
<string>我们需要通过您同意使用相册,才能上传相关商品、发票图片</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>我们需要通过您同意使用相册,才能使用您的相册数据</string>
<string>我们需要通过您同意使用相册,才能上传相关商品、发票图片</string>
<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
<true/>
<key>UIBackgroundModes</key>
......
GeliBusinessPlatform/Model/OrderManageModel/GetGoodsInfoModel.swift
View file @ c768492d
......@@ -42,6 +42,8 @@ class GetGoodsInfoDataModel: Mappable {
var price:String?//售价
var tiered_pri:String?//阶梯价
var adsale_tiered_pri:String?//预售阶梯价
var adsale_pri:String? //预售价格
var pct : Float? //定金比例（百分比） 例如填12即是定金比例为12%
var target_Count:Int?//目标数量
var target_Price:String?//目标价格
......@@ -68,6 +70,8 @@ class GetGoodsInfoDataModel: Mappable {
price <- map["price"]
tiered_pri <- map["tiered_pri"]
adsale_tiered_pri <- map["adsale_tiered_pri"]
adsale_pri <- map["adsale_pri"]
pct <- map["pct"]
target_Count <- map["target_Count"]
target_Price <- map["target_Price"]
pog_id <- map["pog_id"]
......
GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.swift
View file @ c768492d
......@@ -48,7 +48,6 @@ class XuanZeShangPinCell: UITableViewCell{
let maxStr = StringByInt(number: maxNum!)
HUD.flash(.label("不可超过最大数量" + maxStr),delay: 1.2)
countTF.text = StringByInt(number: maxNum!)
}else{
countTF.text = "\(str.integerValue + 1)"
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ c768492d
......@@ -554,7 +554,17 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
func XuanZeShangPinViewControllerYuShou(YuShouData:Array<GetGoodsInfoDataModel>) {
cellDataArr.removeAll()
cellDataArr = YuShouData
print(cellDataArr.count)
let model = cellDataArr.first
let price = Float((model?.target_Price)!)
let count = Float((model?.target_Count)!)
var percent:Float = 20
if model?.pct != nil {
if model?.pct != 0 {
percent = Float((model?.pct)!)
}
}
djTFstr = String(format: "%.2f", price! * percent / 100 * count)
wkTFstr = String(format: "%.2f", price! * (100 - percent) / 100 * count)
listView.reloadData()
}
......
GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift
View file @ c768492d
......@@ -42,6 +42,12 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
}else{
if isYuShou {
if selectArr.count != 0 {
let model = selectArr.first
if model?.target_Count == 0 {
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
return
}
delegate?.XuanZeShangPinViewControllerYuShou(YuShouData: selectArr)
self.navigationController?.popViewController(animated: true)
}else{
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.xib
View file @ c768492d
<?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="17126"/>
<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/分销订单管理/RetailManageViewController.swift
View file @ c768492d
......@@ -194,12 +194,19 @@ class RetailManageViewController: BaseViewController,UITableViewDelegate,UITable
if model.dbt_type == 2 {
dbt_typeStr = "自动结算"
}
if model.pay_status == 2 {
switch model.pay_status {
case 2:
contentV.stateLbl.text = "已付款/" + dbt_typeStr
}else{
break
case 10:
contentV.stateLbl.text = "月结/" + dbt_typeStr
break
case 11:
contentV.stateLbl.text = "已退款/" + dbt_typeStr
break
default:
contentV.stateLbl.text = "未付款/" + dbt_typeStr
break
}
return headerV
......
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageViewController.xib
View file @ c768492d
<?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/分销订单管理/View/RetailManageFooterView.xib
View file @ c768492d
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17505"/>
<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/分销订单管理/View/RetailManageViewCell.xib
View file @ c768492d
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="17505"/>
<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/商品详情/EPViewController.xib
View file @ c768492d
<?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/新增规格/CreatNewSpecsViewController.swift
View file @ c768492d
......@@ -28,7 +28,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
selectView = nil
}
var ysKuCun:String = ""//预售库存
var DJBiLi:String = ""//定金比例
var DJBiLi:String = ""//定金比例（最低1%，最高20%）
var yuShouPrice:String = ""//预售价格
var layout = UICollectionViewFlowLayout()
var delegate:CreatNewSpecsViewControllerDelegate?
......@@ -179,7 +179,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
return
}
if isPurnNumber(str: ysKuCun) == false {
HUD.flash(.label("请输入正确的库存"), delay: 1.2)
HUD.flash(.label("请输入正确的预售库存"), delay: 1.2)
return
}
}
......@@ -208,6 +208,16 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
}
if DJBiLi.count == 0 {
HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
DJBiLi = "20"
let idx = IndexPath(row: 0, section: 1)
let cell = listTbv.cellForRow(at: idx) as! YuShouCell
cell.inputTF3.text = "20"
return
}
dataModel.originalPrice = originalPrice
dataModel.originNumberSku = originNumberSku
......@@ -225,9 +235,7 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
dataModel.tempSelect = tempSelect
dataModel.isJieTiOpen = isJieTiOpen
dataModel.isOpenYSSetting = isYuShouSetting
if DJBiLi.count == 0 {
DJBiLi = "0"
}
dataModel.DJBiLi = DJBiLi
dataModel.ysKuCun = ysKuCun
if barTitle?.contains("编辑") == true {
......
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
View file @ c768492d
......@@ -41,10 +41,18 @@ class YuShouCell: UITableViewCell,UITextFieldDelegate {
if textField == inputTF3{
let str = textField.text as! NSString
if str.floatValue > 20{
HUD.flash(.label("预售定金比例不高于20%"), delay: 1.2)
HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
inputTF3.text = "20"
}
if str.floatValue < 1 {
HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
inputTF3.text = "1"
}
}
// if inputTF3.text?.count == 0 {
// HUD.flash(.label("默认定金范围(1~20%)"), delay: 1.2)
// inputTF3.text = "20"
// }
delegate?.YuShouCellTFContent?(Price:"\(inputTF1.text!)_\(inputTF2.text!)_\(inputTF3.text!)" as NSString)
}
......
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.xib
View file @ c768492d
<?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="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<deployment identifier="iOS"/>
<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="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -67,7 +68,7 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预售库存：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gt2-Bp-s7f">
<rect key="frame" x="15" y="96.5" width="70" height="18.5"/>
<rect key="frame" x="16" y="96.5" width="70" height="18.5"/>
<constraints>
<constraint firstAttribute="width" constant="70" id="Bee-fq-cM2"/>
<constraint firstAttribute="height" constant="18.5" id="VoT-c2-rAv"/>
......@@ -77,7 +78,7 @@
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售库存" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Qb7-aM-usa">
<rect key="frame" x="100" y="89" width="205" height="34"/>
<rect key="frame" x="101" y="89" width="204" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="JmO-9y-uwH"/>
</constraints>
......@@ -92,18 +93,18 @@
<constraint firstAttribute="height" constant="1" id="jGo-VL-q8Q"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="定金比例：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="65l-Cs-6yM">
<rect key="frame" x="16" y="149" width="67" height="16"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="定金比例(%)：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="65l-Cs-6yM">
<rect key="frame" x="16" y="149" width="90" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="nUL-ID-Cgd"/>
<constraint firstAttribute="width" constant="67" id="x2l-e6-9vz"/>
<constraint firstAttribute="width" constant="90" id="x2l-e6-9vz"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入预售定金比例" textAlignment="right" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mht-f5-qwh">
<rect key="frame" x="98" y="140" width="207" height="34"/>
<rect key="frame" x="121" y="140" width="184" height="34"/>
<constraints>
<constraint firstAttribute="height" constant="34" id="57U-zx-suF"/>
</constraints>
......@@ -132,11 +133,11 @@
<constraint firstItem="gDh-Mx-qdQ" firstAttribute="top" secondItem="XRF-Gv-9pf" secondAttribute="bottom" constant="19" id="d5y-FH-bLa"/>
<constraint firstItem="gt2-Bp-s7f" firstAttribute="top" secondItem="7Ri-WT-Tkw" secondAttribute="bottom" constant="15.5" id="fQi-BQ-7wO"/>
<constraint firstItem="mht-f5-qwh" firstAttribute="centerY" secondItem="65l-Cs-6yM" secondAttribute="centerY" id="ksq-Bc-vQ2"/>
<constraint firstItem="gt2-Bp-s7f" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="lF6-cU-DsU"/>
<constraint firstItem="Qb7-aM-usa" firstAttribute="leading" secondItem="gt2-Bp-s7f" secondAttribute="trailing" constant="15" id="m64-af-emt"/>
<constraint firstAttribute="trailing" secondItem="COH-zY-OUo" secondAttribute="trailing" constant="15" id="qNF-VN-Dps"/>
<constraint firstItem="7Ri-WT-Tkw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="r1R-iT-mAW"/>
<constraint firstAttribute="trailing" secondItem="mht-f5-qwh" secondAttribute="trailing" constant="15" id="un4-dj-TW4"/>
<constraint firstItem="gt2-Bp-s7f" firstAttribute="leading" secondItem="gDh-Mx-qdQ" secondAttribute="leading" id="yHZ-m6-5nA"/>
<constraint firstAttribute="trailing" secondItem="XRF-Gv-9pf" secondAttribute="trailing" id="yYn-Z0-kdm"/>
<constraint firstItem="65l-Cs-6yM" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="zjC-cY-SUm"/>
</constraints>
......@@ -152,9 +153,6 @@
</tableViewCell>
</objects>
<resources>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
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