Commit 5acdc77a authored by lujunye's avatar lujunye

字体颜色改变

parent 52bb20cb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"color" : { "color" : {
"color-space" : "srgb", "color-space" : "srgb",
"components" : { "components" : {
"alpha" : "0.690", "alpha" : "0.800",
"blue" : "0.463", "blue" : "0.463",
"green" : "0.639", "green" : "0.639",
"red" : "0.980" "red" : "0.980"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"color" : { "color" : {
"color-space" : "srgb", "color-space" : "srgb",
"components" : { "components" : {
"alpha" : "0.690", "alpha" : "0.800",
"blue" : "0.463", "blue" : "0.463",
"green" : "0.639", "green" : "0.639",
"red" : "0.980" "red" : "0.980"
......
...@@ -13,6 +13,7 @@ protocol GYS_FX_ProductCellDelegate { ...@@ -13,6 +13,7 @@ protocol GYS_FX_ProductCellDelegate {
} }
class GYS_FX_ProductCellTableViewCell: UITableViewCell { class GYS_FX_ProductCellTableViewCell: UITableViewCell {
@IBOutlet weak var color_lbl: UILabel!
var delegate:GYS_FX_ProductCellDelegate? var delegate:GYS_FX_ProductCellDelegate?
@IBAction func btnAction(_ sender: UIButton) { @IBAction func btnAction(_ sender: UIButton) {
......
...@@ -129,9 +129,17 @@ ...@@ -129,9 +129,17 @@
<constraint firstAttribute="height" constant="1" id="9xG-aS-jTC"/> <constraint firstAttribute="height" constant="1" id="9xG-aS-jTC"/>
</constraints> </constraints>
</view> </view>
<label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="okO-4P-1Ww">
<rect key="frame" x="15" y="80" width="90" height="25"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<color key="backgroundColor" name="白色背景色"/> <color key="backgroundColor" name="白色背景色"/>
<constraints> <constraints>
<constraint firstItem="okO-4P-1Ww" firstAttribute="centerY" secondItem="rhK-mv-sfb" secondAttribute="centerY" id="0zV-yq-hCS"/>
<constraint firstItem="okO-4P-1Ww" firstAttribute="centerX" secondItem="rhK-mv-sfb" secondAttribute="centerX" id="1nR-aO-x9x"/>
<constraint firstItem="kGs-Qz-GbO" firstAttribute="top" secondItem="io4-Mx-VZ7" secondAttribute="bottom" constant="8" id="2bi-hC-gxR"/> <constraint firstItem="kGs-Qz-GbO" firstAttribute="top" secondItem="io4-Mx-VZ7" secondAttribute="bottom" constant="8" id="2bi-hC-gxR"/>
<constraint firstItem="ugc-WK-r7L" firstAttribute="top" secondItem="z5k-CZ-aID" secondAttribute="top" constant="35.5" id="4Tt-au-IaX"/> <constraint firstItem="ugc-WK-r7L" firstAttribute="top" secondItem="z5k-CZ-aID" secondAttribute="top" constant="35.5" id="4Tt-au-IaX"/>
<constraint firstItem="tnU-5r-Jfg" firstAttribute="leading" secondItem="Bjz-wA-QCI" secondAttribute="leading" id="4la-xp-itU"/> <constraint firstItem="tnU-5r-Jfg" firstAttribute="leading" secondItem="Bjz-wA-QCI" secondAttribute="leading" id="4la-xp-itU"/>
...@@ -154,6 +162,8 @@ ...@@ -154,6 +162,8 @@
<constraint firstItem="N0T-3l-rU8" firstAttribute="bottom" secondItem="rhK-mv-sfb" secondAttribute="bottom" id="nWw-HI-LFc"/> <constraint firstItem="N0T-3l-rU8" firstAttribute="bottom" secondItem="rhK-mv-sfb" secondAttribute="bottom" id="nWw-HI-LFc"/>
<constraint firstItem="kGs-Qz-GbO" firstAttribute="leading" secondItem="io4-Mx-VZ7" secondAttribute="leading" id="oGw-y5-d27"/> <constraint firstItem="kGs-Qz-GbO" firstAttribute="leading" secondItem="io4-Mx-VZ7" secondAttribute="leading" id="oGw-y5-d27"/>
<constraint firstItem="Cae-xu-msI" firstAttribute="leading" secondItem="ugc-WK-r7L" secondAttribute="trailing" constant="8" id="oa0-Dd-Byp"/> <constraint firstItem="Cae-xu-msI" firstAttribute="leading" secondItem="ugc-WK-r7L" secondAttribute="trailing" constant="8" id="oa0-Dd-Byp"/>
<constraint firstItem="okO-4P-1Ww" firstAttribute="width" secondItem="rhK-mv-sfb" secondAttribute="width" id="ojS-PZ-N3p"/>
<constraint firstItem="okO-4P-1Ww" firstAttribute="height" secondItem="rhK-mv-sfb" secondAttribute="height" id="plL-rG-FL4"/>
<constraint firstItem="Bjz-wA-QCI" firstAttribute="trailing" secondItem="tnU-5r-Jfg" secondAttribute="trailing" id="qbA-7Z-RKC"/> <constraint firstItem="Bjz-wA-QCI" firstAttribute="trailing" secondItem="tnU-5r-Jfg" secondAttribute="trailing" id="qbA-7Z-RKC"/>
<constraint firstAttribute="trailing" secondItem="Cae-xu-msI" secondAttribute="trailing" constant="8" id="sA8-84-yMl"/> <constraint firstAttribute="trailing" secondItem="Cae-xu-msI" secondAttribute="trailing" constant="8" id="sA8-84-yMl"/>
<constraint firstAttribute="bottom" secondItem="ugc-WK-r7L" secondAttribute="bottom" constant="35.5" id="wOK-CV-7oB"/> <constraint firstAttribute="bottom" secondItem="ugc-WK-r7L" secondAttribute="bottom" constant="35.5" id="wOK-CV-7oB"/>
...@@ -196,6 +206,7 @@ ...@@ -196,6 +206,7 @@
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="app底色"/>
<connections> <connections>
<outlet property="FX_Percent_Lbl" destination="rhK-mv-sfb" id="2jQ-Xp-BSC"/> <outlet property="FX_Percent_Lbl" destination="rhK-mv-sfb" id="2jQ-Xp-BSC"/>
<outlet property="color_lbl" destination="okO-4P-1Ww" id="w3h-oa-1IJ"/>
<outlet property="item_Icon_Img" destination="WYJ-BO-wv9" id="vgb-ui-8ct"/> <outlet property="item_Icon_Img" destination="WYJ-BO-wv9" id="vgb-ui-8ct"/>
<outlet property="leftValue" destination="Hm5-HY-mc7" id="USY-ug-Pjx"/> <outlet property="leftValue" destination="Hm5-HY-mc7" id="USY-ug-Pjx"/>
<outlet property="left_btn" destination="qor-h2-doo" id="D95-B4-Mtj"/> <outlet property="left_btn" destination="qor-h2-doo" id="D95-B4-Mtj"/>
...@@ -215,7 +226,7 @@ ...@@ -215,7 +226,7 @@
<resources> <resources>
<image name="daixuan" width="19" height="19"/> <image name="daixuan" width="19" height="19"/>
<namedColor name="#FAA376"> <namedColor name="#FAA376">
<color red="0.98000001907348633" green="0.63899999856948853" blue="0.46299999952316284" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.98000001907348633" green="0.63899999856948853" blue="0.46299999952316284" alpha="0.68999999761581421" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="app底色"> <namedColor name="app底色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
...@@ -71,7 +71,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -71,7 +71,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
let vc = DistributorSettingAlertView(frame: self.view.bounds) let vc = DistributorSettingAlertView(frame: self.view.bounds)
vc.tag = idx vc.tag = idx
vc.data = datas[idx] vc.data = datas[idx]
print("abc = ",vc.data?.commission_type)
vc.delegate = self vc.delegate = self
self.view.addSubview(vc) self.view.addSubview(vc)
} }
...@@ -339,6 +338,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -339,6 +338,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
cell.old_price_Lbl.text = "¥" + model.price! cell.old_price_Lbl.text = "¥" + model.price!
if model.commission_type == 1{ if model.commission_type == 1{
cell.FX_Percent_Lbl.isHidden = false cell.FX_Percent_Lbl.isHidden = false
cell.FX_Percent_Lbl.text = "分销(" + StringByInt(number: model.commission_per!) + "%)" cell.FX_Percent_Lbl.text = "分销(" + StringByInt(number: model.commission_per!) + "%)"
}else if model.commission_type == 2{ }else if model.commission_type == 2{
cell.FX_Percent_Lbl.isHidden = false cell.FX_Percent_Lbl.isHidden = false
...@@ -358,7 +358,8 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat ...@@ -358,7 +358,8 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
if model.goods_thumb != nil { if model.goods_thumb != nil {
cell.item_Icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.goods_thumb!)) cell.item_Icon_Img.sd_setImage(with:URL(string:SERVERCE_ImageHost + model.goods_thumb!))
} }
cell.color_lbl.isHidden = cell.FX_Percent_Lbl.isHidden
cell.color_lbl.text = cell.FX_Percent_Lbl.text
return cell return cell
} }
var selectItem:Array<Int> = [] var selectItem:Array<Int> = []
......
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