Skip to content

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

修改预售价格按钮显示bug

parent 5aae080e
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 114 deletions
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @ 49d45d9c
......@@ -1097,10 +1097,11 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
func uploadImg (imge:UIImage,isOriginal:Bool,tag:Int){
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let upLoadImg = imge as! UIImage
HUD.show(.progress)
saveFile(image: upLoadImg, ["user_token":UserToken as Any], success: { (data) in
let dataM = data as! SaveFileModel
if dataM.code == 1 {
print("图片上传成功\(dataM.data?.url)")
if isOriginal {
self.original_img = dataM.data?.url!
......@@ -1118,6 +1119,7 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
})
}
self.listTbv.reloadData()
HUD.hide()
}
}) { (error) in
print("图片上传失败\(error)")
......
GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift
View file @ 49d45d9c
......@@ -39,7 +39,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
view.removeFromSuperview()
glSelectView = nil
}
let titleArr = ["商品信息","商品图片","商品规格","预售设置","其它信息","商品详情"]
let spxxArr = ["商品名称","商品类型","商品分类","品牌","起卖数量","是否清真","是否询价"]
var tishixxArr = ["请输入商品名称","请选择商品类型","请选择商品分类","请选择品牌","请输入起卖数量"]
......@@ -79,12 +79,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
var dj_time_end:Double? = 0
var wk_time_start:Double? = 0
var wk_time_end:Double? = 0
//MARK:--保存按钮
@IBAction func submitAction(_ sender: Any) {
print("保存按钮submitAction")
// print(itemTypeArr)//商品类型
// print(guiGeArr)//商品规格
// print(itemTypeArr)//商品类型
// print(guiGeArr)//商品规格
if itemName.count == 0 {
HUD.flash(.label("请输入商品名称"), delay: 1.2)
return
......@@ -101,17 +101,17 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
HUD.flash(.label("请选择品牌"), delay: 1.2)
return
}
if singleImgArr.count == 0 {
HUD.flash(.label("请选择商品封面图"), delay: 1.2)
return
}
if maxFiveImgsArr.count == 0 {
HUD.flash(.label("请选择商品主图"), delay: 1.2)
return
}
if guiGeArr.count == 0 {
HUD.flash(.label("请填写商品规格"), delay: 1.2)
return
......@@ -122,7 +122,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
return
}
}
if countrySelect == nil {
HUD.flash(.label("请选择国家"), delay: 1.2)
return
......@@ -131,7 +131,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
HUD.flash(.label("请选择商品状态"), delay: 1.2)
return
}
if yunShuType == nil {
HUD.flash(.label("请选择运输方式"), delay: 1.2)
return
......@@ -144,7 +144,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
alertView.rightBtn.tag = 1001
self.view.window?.addSubview(alertView)
}
func sureGeliAlertViewAction(sender: UIButton) {
......@@ -171,7 +171,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
}
var is_qz = 0
if shiFouQZ {
is_qz = 1
......@@ -182,7 +182,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
var is_adsale = 0
var need_check = 0
if isYuShouShangPin! {
is_adsale = 1
if shiFouSH {
......@@ -195,13 +195,13 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
wk_time_start = 0
wk_time_end = 0
}
var gs_id = 1
if self.shangPinStatusArr!.count > 0 {
let model = self.shangPinStatusArr![shangPinStatus!]
gs_id = model.gs_id!
}
let transportation = yunShuType! + 1
var lastGoodsBanner:Array<String> = []
......@@ -218,39 +218,39 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
getUpSkuInfoByData(dataArr: guiGeArr)
let dic = ["user_token":UserToken as Any, //验证token
"cat_id":selectGoodsClassModel?.cat_id as Any, //分类ID
"brand_id":selectPinPaiData?.brand_id as Any, // 品牌ID
"goods_name":itemName, //商品名称
"is_qz":is_qz as Any, //是否清真商品，1是0非
"goods_type":goods_type, //商品类型，普通2现货3期货4团购
"is_adsale":is_adsale as Any, //商品类型字段，预售专用，选定”预售”则值为1，否则值为0
"is_inquiry":is_inquiry as Any, //是否询价：1是0非
"origin_number":qiMaiShuLiang as Any, //起购数量
"need_check":need_check as Any, //付款是否需要审核， 1是0非
"dj_time_start":dj_time_start as Any, //预设预付定金开始时间，时间戳，预售专用
"dj_time_end":dj_time_end as Any, //预设预付定金结束时间，时间戳，预售专用
"wk_time_start":wk_time_start as Any, //预设预付尾款开始时间，时间戳，预售专用
"wk_time_end":wk_time_end as Any, //预设预付尾款结束时间，时间戳，预售专用
"set_time":faHuoTime as Any, //预付尾款后几天后发货
"keywords":keyWord as Any, //关键字
"logistics":wuLiuPrice as Any, //物流费用
"coun_id":"1", //国家id 1(中国）
"gs_id":gs_id as Any, //商品状态
"transportation":transportation as Any, //运输方式，1冷链，2常温，3热链
"goods_desc":goodsDesc as Any, //商品详情 html p标签
"specifications":specifications as Any, //默认规格，选sku中最低价格(需判定阶梯价)的 规格值
"shop_price":shop_price as Any, //默认售价，选sku中最低价格(需判定阶梯价)的价格
"goods_unit":goods_unit as Any, //默认商品单位，选sku中最低价格(需判定阶梯价)的单位
"original_img":original_img as Any, //商品封面图
"goods_banner":goods_bannerStr as Any, //商品副图，多张，最多5张，使用一维数组转json格式
"sku_info":sku_info as Any]
"cat_id":selectGoodsClassModel?.cat_id as Any, //分类ID
"brand_id":selectPinPaiData?.brand_id as Any, // 品牌ID
"goods_name":itemName, //商品名称
"is_qz":is_qz as Any, //是否清真商品，1是0非
"goods_type":goods_type, //商品类型，普通2现货3期货4团购
"is_adsale":is_adsale as Any, //商品类型字段，预售专用，选定”预售”则值为1，否则值为0
"is_inquiry":is_inquiry as Any, //是否询价：1是0非
"origin_number":qiMaiShuLiang as Any, //起购数量
"need_check":need_check as Any, //付款是否需要审核， 1是0非
"dj_time_start":dj_time_start as Any, //预设预付定金开始时间，时间戳，预售专用
"dj_time_end":dj_time_end as Any, //预设预付定金结束时间，时间戳，预售专用
"wk_time_start":wk_time_start as Any, //预设预付尾款开始时间，时间戳，预售专用
"wk_time_end":wk_time_end as Any, //预设预付尾款结束时间，时间戳，预售专用
"set_time":faHuoTime as Any, //预付尾款后几天后发货
"keywords":keyWord as Any, //关键字
"logistics":wuLiuPrice as Any, //物流费用
"coun_id":"1", //国家id 1(中国）
"gs_id":gs_id as Any, //商品状态
"transportation":transportation as Any, //运输方式，1冷链，2常温，3热链
"goods_desc":goodsDesc as Any, //商品详情 html p标签
"specifications":specifications as Any, //默认规格，选sku中最低价格(需判定阶梯价)的 规格值
"shop_price":shop_price as Any, //默认售价，选sku中最低价格(需判定阶梯价)的价格
"goods_unit":goods_unit as Any, //默认商品单位，选sku中最低价格(需判定阶梯价)的单位
"original_img":original_img as Any, //商品封面图
"goods_banner":goods_bannerStr as Any, //商品副图，多张，最多5张，使用一维数组转json格式
"sku_info":sku_info as Any]
print(dic)
//MARK:--新增商品接口
goodsAdd(dic, success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"), delay: 1.2)
self.navigationController?.popViewController(animated: true)
}) { (error) in
}
}
}
......@@ -296,7 +296,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
listTbv.register(UINib(nibName: "ShangPinGguiGeCell", bundle: nil), forCellReuseIdentifier: "ShangPinGguiGeCell")
// Do any additional setup after loading the view.
}
//MARK: - cell delegate
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
......@@ -438,7 +438,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
break
}
cell.textTF.placeholder = tishixxArr1[indexPath.row] as! String
cell.tag = indexPath.row
cell.delegate = self
return cell
......@@ -458,21 +458,21 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
if goodsDesc.count > 0 {
cell.webView.isHidden = false
let headerString : String = "<header><meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no'><style>img{max-width:100%}</style></header>"
let goodsDescHmtl = "<html>" + goodsDesc + "</html>"
cell.webView.loadHTMLString(goodsDescHmtl + headerString, baseURL: nil)
}
cell.imgBtn.setImage(UIImage(named: "tjxq"), for: .normal)
cell.btmH.constant = 25
return cell
}
}
func loadString(str:String){
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
}
......@@ -480,7 +480,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
@objc func editHtml(){
print("编辑软文")
let vc = LMNoteViewController()
vc.htmlStr = goodsDesc;
vc.delegatedata = self
self.navigationController?.pushViewController(vc, animated: true)
......@@ -584,7 +584,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
timeSelectV.delegate = self
self.view.window?.addSubview(timeSelectV)
isWeiTime = false
}
if cell.nameLbl.text == "预设预付尾款时间段" {
print("预付尾款时")
......@@ -596,7 +596,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
timeSelectV.titleLbl.text = "预设预付尾款时间段"
timeSelectV.delegate = self
let dijitime:TimeInterval = TimeInterval(exactly: (dj_time_start! + (24 * 60 * 60)))!
let beginDate = Date(timeIntervalSince1970: dijitime)
let beginDate = Date(timeIntervalSince1970: dijitime)
timeSelectV.beginDateByWork = beginDate
self.view.window?.addSubview(timeSelectV)
isWeiTime = true
......@@ -620,7 +620,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
dj_time_end = Double(timeIntervalEnd)
}
listTbv.reloadData()
}
//MARK:---选择商品分类返回数据
......@@ -654,9 +654,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
self.uploadImg(imge: image!, isOriginal: true, tag: 0)
})
}
self.listTbv.reloadData()
......@@ -672,11 +672,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
for asset in assets {
PHImageManager.default().requestImage(for: asset, targetSize: PHImageManagerMaximumSize , contentMode: .default , options: option, resultHandler: { (image, _: [AnyHashable : Any]?) in
// print("上传图片==\(image)")
// self.maxFiveImgsArr.append(image!)
// let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
// self.maxFiveImgsArr.append(image!)
// let index = Dollar.indexOf(self.maxFiveImgsArr, value: image!)
self.maxFiveImgsArr.append("insert")
self.uploadImg(imge: image!, isOriginal: false, tag: self.maxFiveImgsArr.count-1)
})
}
self.listTbv.reloadData()
......@@ -698,7 +698,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
// print("上传图片==\(image)")
self.singleImgArr.removeAll()
self.uploadImg(imge: image!, isOriginal: true, tag: 0)
})
}
self.listTbv.reloadData()
......@@ -726,10 +726,11 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
func uploadImg (imge:UIImage,isOriginal:Bool,tag:Int){
let UserToken = UserDefaults.standard.value(forKey: "user_token")
let upLoadImg = imge as! UIImage
HUD.show(.progress)
saveFile(image: upLoadImg, ["user_token":UserToken as Any], success: { (data) in
let dataM = data as! SaveFileModel
if dataM.code == 1 {
print("图片上传成功\(dataM.data?.url)")
if isOriginal {
self.original_img = dataM.data?.url!
......@@ -745,6 +746,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
})
}
self.listTbv.reloadData()
HUD.hide()
}
}) { (error) in
......@@ -981,7 +983,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
return 10
}
//MARK: - tableview header
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if section == 3 {
......@@ -1087,9 +1089,9 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
case 4:return 49
default:
if goodsDesc.count > 0 {
return 450*glscale
}
return 98
......@@ -1097,7 +1099,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
func YuShouWeiKuanFaHuoCellString(str: String) {
if isPurnInt(string: str) {
faHuoTime = formatShowNumber(value: str)
faHuoTime = formatShowNumber(value: str)
}else{
HUD.flash(.label("请输入正确的数据"), delay: 1.2)
}
......@@ -1105,8 +1107,8 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
override func backAction() {
self.navigationController?.popViewController(animated: true)
}
//MARK:--处理规格数据
var specifications = ""
var shop_price: Float = 0.0
......@@ -1132,12 +1134,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
//普通阶梯价
var is_tiered = 0
var tiered_pri:Dictionary<String, String> = [:]
if md.isJieTiOpen {
is_tiered = 1
md.jieTiArr.forEach { (obj) in
......@@ -1145,7 +1147,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
let arr = str.components(separatedBy: "_")
let priceStr = arr[0]
let coutStr = arr[1]
if isPurnNumber(str: priceStr) {
let specaP = Float(priceStr)!
if specaP < price {
......@@ -1158,8 +1160,8 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
}
//预售价
var is_adsale_tiered = 0
var adsale_tiered_pri:Dictionary<String, String> = [:]
......@@ -1180,7 +1182,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
let arr = str.components(separatedBy: "_")
let priceStr = arr[0]
let coutStr = arr[1]
if isPurnNumber(str: priceStr) {
let specaP = Float(priceStr)!
if specaP < price {
......@@ -1190,24 +1192,24 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
}
adsale_tiered_pri.updateValue(priceStr, forKey: coutStr)
}
}
}
let pack_attr = ["l":"0","w":"0","h":"0","wg":md.weight,"v":"0"]
var is_open_adsale = 0
var adsale_pri = ""
var adsale_inventory = ""
var pct = ""
if md.isOpenYSSetting {
is_open_adsale = 1
adsale_pri = md.yuShouPrice
adsale_inventory = md.ysKuCun
pct = md.DJBiLi
}
}
let packAttrStr = dictChangeString(sender: pack_attr)
var sku = ["sku_sn":"",
......@@ -1223,22 +1225,22 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
"adsale_inventory":adsale_inventory,
"pct":pct,
"is_adsale_tiered":is_adsale_tiered] as [String : Any]
if tiered_pri.keys.count > 0{
let tieredPriStr = dictChangeString(sender: tiered_pri)
sku.updateValue(tieredPriStr, forKey: "tiered_pri")
}else{
sku.updateValue("", forKey: "tiered_pri")
}
if adsale_tiered_pri.keys.count > 0 {
let adsaletieredPriStr = dictChangeString(sender: adsale_tiered_pri)
sku.updateValue(adsaletieredPriStr, forKey: "adsale_tiered_pri")
}else{
sku.updateValue("", forKey: "adsale_tiered_pri")
}
skuArr.append(sku)
}
......@@ -1250,16 +1252,16 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
specifications = model!.guiGe
goods_unit = model!.danWei
}
}
//MARK:---商品详情回调的数据
var goodsDesc = ""
func getHTMLByVc(_ model: String!) {
goodsDesc = model
listTbv.reloadData()
}
}
GeliBusinessPlatform/ViewController/订单管理/预售价格修改/XiuGaiYuShouJiaViewController.xib
View file @ 49d45d9c
......@@ -10,7 +10,6 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XiuGaiYuShouJiaViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="color" destination="af6-Wa-4Sy" id="gC1-9R-E1C"/>
<outlet property="countLbl" destination="nUd-42-xVV" id="HNp-gi-Qb7"/>
<outlet property="detailLbl" destination="I9g-lp-0v0" id="rHR-wj-lrt"/>
<outlet property="dingJinTF" destination="7wy-zh-JHv" id="ILI-Po-TUm"/>
......@@ -102,29 +101,6 @@
<constraint firstItem="pQu-JC-quJ" firstAttribute="leading" secondItem="1Eq-MP-yKq" secondAttribute="trailing" constant="9.5" id="x7Z-8k-G8P"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4mD-rm-kxf" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="LdC-FV-lYN"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
<color key="value" name="按钮渐变色上"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="gradientEndColor">
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitACTION:" destination="-1" eventType="touchUpInside" id="rH5-Yh-oFl"/>
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vi4-93-9FJ">
<rect key="frame" x="0.0" y="164" width="414" height="94"/>
<subviews>
......@@ -228,9 +204,24 @@
<constraint firstItem="7wy-zh-JHv" firstAttribute="leading" secondItem="oMs-bA-MjV" secondAttribute="trailing" constant="5" id="yvI-DZ-ESa"/>
</constraints>
</view>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="af6-Wa-4Sy" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="860" width="414" height="128"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xs5-Fe-lg4">
<rect key="frame" x="0.0" y="813" width="414" height="49"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="oVG-QE-HWg"/>
</constraints>
<attributedString key="attributedText">
<fragment content="确定">
<attributes>
<color key="NSColor" name="白色背景色"/>
<font key="NSFont" size="17" name="PingFangSC-Medium"/>
<paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4mD-rm-kxf" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="813" width="414" height="83"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
......@@ -241,17 +232,24 @@
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitACTION:" destination="-1" eventType="touchUpInside" id="rH5-Yh-oFl"/>
</connections>
</view>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="qeZ-zl-Yky" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="3eK-88-rxz"/>
<constraint firstItem="Xs5-Fe-lg4" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="94H-JR-UV2"/>
<constraint firstItem="4mD-rm-kxf" firstAttribute="top" secondItem="Xs5-Fe-lg4" secondAttribute="top" id="9hh-3N-y9F"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Vi4-93-9FJ" secondAttribute="trailing" id="Jww-ei-Or6"/>
<constraint firstAttribute="bottom" secondItem="4mD-rm-kxf" secondAttribute="bottom" id="KrG-KU-K0i"/>
<constraint firstAttribute="trailing" secondItem="4mD-rm-kxf" secondAttribute="trailing" id="Lad-vV-Us6"/>
<constraint firstItem="Vi4-93-9FJ" firstAttribute="top" secondItem="qeZ-zl-Yky" secondAttribute="bottom" id="MKb-PS-3Kw"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="4mD-rm-kxf" secondAttribute="bottom" id="Ol9-7H-BUb"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="4mD-rm-kxf" secondAttribute="trailing" id="Q9c-Ul-Xo5"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="Xs5-Fe-lg4" secondAttribute="bottom" id="SmJ-eN-bxi"/>
<constraint firstItem="qeZ-zl-Yky" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="hTX-bp-Cs4"/>
<constraint firstItem="4mD-rm-kxf" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="x4w-sI-21I"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Xs5-Fe-lg4" secondAttribute="trailing" id="mEh-nn-yWd"/>
<constraint firstItem="4mD-rm-kxf" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="p0f-zU-sUP"/>
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="qeZ-zl-Yky" secondAttribute="trailing" id="xbK-PQ-8Of"/>
<constraint firstItem="Vi4-93-9FJ" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="yYJ-7p-Dox"/>
</constraints>
......@@ -275,5 +273,8 @@
<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>
</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