Skip to content

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

去掉数字逗号分隔符

parent 2406e766
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 58 deletions
GeliBusinessPlatform/Define/Define.swift
View file @ 8b98a9e3
......@@ -305,19 +305,19 @@ func dateConvertString(date:Date, dateFormat:String="yyyy-MM-dd") -> String {
}
//MARK: -- 格式化数字
func formatShowNumber(value:String) -> String {
if value.isEmpty {
return "0"
}
//保留位数
let interceptValue = String(format: "%.2f", (value as NSString).doubleValue)
//添加分隔符
let format = NumberFormatter()
format.numberStyle = .decimal
let formatValue = format.string(from: NSNumber(value: (interceptValue as NSString).doubleValue))
return formatValue!
}
//func formatShowNumber(value:String) -> String {
// if value.isEmpty {
// return "0"
// }
//
// //保留位数
// let interceptValue = String(format: "%.2f", (value as NSString).doubleValue)
// //添加分隔符
// let format = NumberFormatter()
// format.numberStyle = .decimal
// let formatValue = format.string(from: NSNumber(value: (interceptValue as NSString).doubleValue))
// return formatValue!
//}
//MARK:--数组转字符串
func dataChangeString(sender:Array<Any>) -> String{
var str = ""
......
GeliBusinessPlatform/View/Cell/YuShouWeiKuanFaHuoCell.swift
View file @ 8b98a9e3
......@@ -24,7 +24,7 @@ class YuShouWeiKuanFaHuoCell: UITableViewCell,UITextFieldDelegate{
func textFieldDidEndEditing(_ textField: UITextField) {
if isPurnInt(string: textField.text!) {
delegate?.YuShouWeiKuanFaHuoCellString(str: formatShowNumber(value: textField.text!))
delegate?.YuShouWeiKuanFaHuoCellString(str: textField.text!)
}else{
HUD.flash(.label("请输入正确的数据"), delay: 1.2)
textField.text = "0"
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift
View file @ 8b98a9e3
......@@ -884,13 +884,12 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
}
//运费费用金额格式化
func textFieldDidEndEditing(_ textField: UITextField) {
let content = formatShowNumber(value: textField.text!)
if textField.tag == 1001 {
logistics_price = content
textField.text = content
logistics_price = textField.text!
textField.text = textField.text!
}else if textField.tag == 1002 {
other_price = content
textField.text = content
other_price = textField.text!
textField.text = textField.text!
}
}
}
GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift
View file @ 8b98a9e3
......@@ -22,7 +22,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
var is_adsale:Int?
//XuanZeShangPinCell
@IBAction func submitAction(_ sender: Any) {
print("submit")
print("submit111")
// for item in selectArr{
// if item.priceTF.text!.count == 0 {
......@@ -35,6 +35,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
{
if selectArr.count != 0 {
delegate?.XuanZeShangPinViewControllerEdit(selectArr:selectArr)
self.navigationController?.popViewController(animated: true)
}else{
HUD.flash(.label("请选择商品"), delay: 1.2)
return
......@@ -182,8 +183,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
model.target_Count = cell.maxNum!
textField.text = "\(cell.maxNum!)"
}else{
model.target_Count = Int(textField.text!.replacingOccurrences(of: ",", with: ""))
textField.text = formatShowNumber(value: textField.text!)
model.target_Count = Int(textField.text!)
}
}else if Int(textField.text!) == 0{
HUD.flash(.label("数量不小于1"), delay: 1.2)
......@@ -191,8 +191,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
textField.text = "1"
}else{
model.target_Count = Int(textField.text!.replacingOccurrences(of: ",", with: ""))
textField.text = formatShowNumber(value: textField.text!)
model.target_Count = Int(textField.text!)
}
}else{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
......@@ -201,8 +200,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
}
}else{//价格
if isPurnNumber(str: textField.text!){
model.target_Price = formatShowNumber(value: textField.text!)
textField.text = formatShowNumber(value: textField.text!)
model.target_Price = textField.text!
}else{
HUD.flash(.label("请输入正确的价格"), delay: 1.2)
textField.text = model.price!
......@@ -222,17 +220,14 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
cell.model!.target_Count = cell.maxNum!
textField.text = "\(cell.maxNum!)"
}else{
textField.text = formatShowNumber(value: textField.text!)
cell.model?.target_Count = Int(textField.text!.replacingOccurrences(of: ",", with: ""))
cell.model?.target_Count = Int(textField.text!)
}
}else if Int(textField.text!) == 0{
HUD.flash(.label("数量不小于1"), delay: 1.2)
cell.model!.target_Count = 1
textField.text = "1"
}else{
textField.text = formatShowNumber(value: textField.text!)
cell.model?.target_Count = Int(textField.text!.replacingOccurrences(of: ",", with: ""))
cell.model?.target_Count = Int(textField.text!)
}
}else{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
......@@ -241,8 +236,7 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
}
}else{//价格
if isPurnNumber(str: textField.text!){
cell.model?.target_Price = formatShowNumber(value: textField.text!)
textField.text = formatShowNumber(value: textField.text!)
cell.model?.target_Price = textField.text!
}else{
HUD.flash(.label("请输入正确的价格"), delay: 1.2)
textField.text = cell.model?.price!
......@@ -465,18 +459,14 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
model.target_Count = sender.maxNum!
senderTF.text = "\(sender.maxNum!)"
}else{
senderTF.text = formatShowNumber(value: senderTF.text!)
model.target_Count = Int(senderTF.text!.replacingOccurrences(of: ",", with: ""))
print("model 1= ",model.target_Count)
model.target_Count = Int(senderTF.text!)
}
}else if Int(senderTF.text!) == 0{
HUD.flash(.label("数量不小于1"), delay: 1.2)
model.target_Count = 1
senderTF.text = "1"
}else{
model.target_Count = Int(senderTF.text!.replacingOccurrences(of: ",", with: ""))
senderTF.text = formatShowNumber(value: senderTF.text!)
print("model2= ",model.target_Count)
model.target_Count = Int(senderTF.text!)
}
}else{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
......@@ -491,16 +481,14 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
sender.model!.target_Count = sender.maxNum!
senderTF.text = "\(sender.maxNum!)"
}else{
senderTF.text = formatShowNumber(value: senderTF.text!)
sender.model?.target_Count = Int(senderTF.text!.replacingOccurrences(of: ",", with: ""))
sender.model?.target_Count = Int(senderTF.text!)
}
}else if Int(senderTF.text!) == 0{
HUD.flash(.label("数量不小于1"), delay: 1.2)
sender.model!.target_Count = 1
senderTF.text = "1"
}else{
senderTF.text = formatShowNumber(value: senderTF.text!)
sender.model?.target_Count = Int(senderTF.text!.replacingOccurrences(of: ",", with: ""))
sender.model?.target_Count = Int(senderTF.text!)
}
}else{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
......
GeliBusinessPlatform/ViewController/新增规格/CreatNewSpecsViewController.swift
View file @ 8b98a9e3
......@@ -255,7 +255,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
switch textField.tag {
case 0:
if isPurnNumber(str: textField.text!) {
textField.text = formatShowNumber(value: textField.text!)
price = textField.text!
if isYuShouSetting && firstTimeSetting{
yuShouPrice = price
......@@ -274,7 +273,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
guiGe = textField.text!
case 2:
if isPurnNumber(str: textField.text!) {
textField.text = formatShowNumber(value: textField.text!)
weight = textField.text!
}else{
HUD.flash(.label("请输入正确的重量"), delay: 1.2)
......@@ -284,7 +282,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
break
case 5:
if isPurnNumber(str: textField.text!) {
textField.text = formatShowNumber(value: textField.text!)
originalPrice = textField.text!
}else{
HUD.flash(.label("请输入正确的价格"), delay: 1.2)
......@@ -294,7 +291,6 @@ class CreatNewSpecsViewController: BaseViewController,UITableViewDelegate,UITabl
break
case 6:
if isPurnInt(string: textField.text!) {
textField.text = formatShowNumber(value: textField.text!)
originNumberSku = textField.text!
}else{
......
GeliBusinessPlatform/ViewController/新增规格/PuTongJieTiCell.swift
View file @ 8b98a9e3
......@@ -43,14 +43,14 @@ class PuTongJieTiCell: UITableViewCell,UITextFieldDelegate {
textField.text = "0"
return
}
priceTF.text = formatShowNumber(value: textField.text!)
// priceTF.text = formatShowNumber(value: textField.text!)
}else{//数量
if isPurnInt(string: textField.text!) == false{
HUD.flash(.label("请输入正确的数量"), delay: 1.2)
textField.text = "1"
return
}
countTF.text = formatShowNumber(value: textField.text!)
// countTF.text = formatShowNumber(value: textField.text!)
}
if isYuShou! {
delegate?.PuTongJieTiContentSp?(price: priceTF.text!, count: countTF.text!, cell: self)
......
GeliBusinessPlatform/ViewController/新增规格/YuShouCell.swift
View file @ 8b98a9e3
......@@ -37,7 +37,7 @@ class YuShouCell: UITableViewCell,UITextFieldDelegate {
}
func textFieldDidEndEditing(_ textField: UITextField) {
textField.text = formatShowNumber(value: textField.text!)
// textField.text = formatShowNumber(value: textField.text!)
if textField == inputTF3{
let str = textField.text as! NSString
if str.floatValue > 20{
......
GeliBusinessPlatform/ViewController/订单管理/普通商品修改价格/ChangeGoodsPriceVC.swift
View file @ 8b98a9e3
......@@ -100,11 +100,12 @@ class ChangeGoodsPriceVC: BaseViewController , UITableViewDelegate, UITableView
if i == textField.tag {
let md = dataArr![i]
if isPurnNumber(str: textField.text!) {
md.goods_price = formatShowNumber(value: textField.text!)
md.goods_price = textField.text
// md.goods_price = formatShowNumber(value: textField.text!)
//记录哪个更改了
md.is_edit = 1
}
let p = md.goods_price as! NSString
let p = md.goods_price! as! NSString
total += Float(md.cart_number!) * p.floatValue
}else{
let md = dataArr![i]
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 8b98a9e3
......@@ -13,6 +13,7 @@ protocol OrderDViewControllerDelegate {
}
class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndBtnCellDelegate,GuanLianKehuVCDelegate,OrderDViewFooterViewDelegate,TitleAndTFCellDelegate,GeliAlertViewDelegate,GLAlertSelectViewDelegate,XiuGaiYuShouJiaViewControllerDelegate,ChangeGoodsPriceVCDelegate,GeliAlertTextFiledDelegate,GeliAlertTextViewDelegate,UpBillDataTableViewCellDelegate{
var lmIdx = 100
func GLASClose(view: GLAlertSelectView, selectnum: Int, selectArr: Array<Int>) {
if selectnum != 10086 {
......@@ -66,6 +67,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
var wuLiuSelect:Int?//物流选择
@IBOutlet weak var btmOffset: NSLayoutConstraint!
@IBOutlet weak var btmViewH: NSLayoutConstraint!
@IBOutlet weak var bottomView: UIView!
@IBOutlet weak var listView: UITableView!
......@@ -89,9 +91,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.isYuShou = true
}else{
self.isYuShou = false
}
self.btmBtnsTitleArr.removeAll()
self.bottomView.subviews.forEach { (view) in
view.removeFromSuperview()
......@@ -102,12 +102,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.btmViewH.constant = 0
self.bottomView.isHidden = true
self.bottomBgView.isHidden = true
self.btmOffset.constant = 0
}else{
self.bottomView.isHidden = false
self.bottomBgView.isHidden = false
for i in 0 ..< self.btmBtnsTitleArr.count{
for i in 0 ..< self.btmBtnsTitleArr.count{
let title = self.btmBtnsTitleArr[i]
let width = fullScreenWidth / CGFloat(self.btmBtnsTitleArr.count)
......@@ -695,6 +695,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.arrowImg.isHidden = true
cell.contentRight.constant = 15
}
if cell.contentLbl.text?.count == 0 {
cell.contentLbl.text = "-"
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.xib
View file @ 8b98a9e3
......@@ -14,6 +14,7 @@
<connections>
<outlet property="bottomBgView" destination="n9R-tn-hVY" id="eSi-Ty-uFr"/>
<outlet property="bottomView" destination="uzE-Ha-UZM" id="KNM-2q-cr7"/>
<outlet property="btmOffset" destination="Yvj-Fx-h8y" id="fEh-6w-eF9"/>
<outlet property="btmViewH" destination="Scu-he-Peb" id="6AX-79-BBC"/>
<outlet property="listView" destination="Ynh-hV-MLH" id="c3b-QY-jsW"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
......@@ -50,7 +51,7 @@
<constraint firstItem="uzE-Ha-UZM" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LYs-Mt-nSg"/>
<constraint firstAttribute="bottom" secondItem="n9R-tn-hVY" secondAttribute="bottom" id="Lif-Zf-Cls"/>
<constraint firstItem="n9R-tn-hVY" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="OgR-oi-ZTA"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="uzE-Ha-UZM" secondAttribute="bottom" id="Yvj-Fx-h8y"/>
<constraint firstAttribute="bottom" secondItem="uzE-Ha-UZM" secondAttribute="bottom" constant="34" id="Yvj-Fx-h8y"/>
<constraint firstItem="uzE-Ha-UZM" firstAttribute="top" secondItem="Ynh-hV-MLH" secondAttribute="bottom" id="aBi-DY-zuS"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="uzE-Ha-UZM" secondAttribute="trailing" id="b3t-oO-8b1"/>
<constraint firstItem="n9R-tn-hVY" firstAttribute="top" secondItem="uzE-Ha-UZM" secondAttribute="top" id="fhn-O9-EKN"/>
......@@ -59,7 +60,7 @@
<constraint firstItem="Ynh-hV-MLH" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="sSR-ql-biJ"/>
<constraint firstItem="Ynh-hV-MLH" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="sgr-ja-cQ2"/>
</constraints>
<point key="canvasLocation" x="131.8840579710145" y="138.61607142857142"/>
<point key="canvasLocation" x="133" y="141"/>
</view>
</objects>
<resources>
......
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