Commit b951351f authored by Sandy's avatar Sandy

修改提成金额改为工分

parent 40aa3b8c
......@@ -1525,8 +1525,8 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u1q-fg-pu6">
<rect key="frame" x="0.0" y="441" width="375" height="60"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提成金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9cF-8x-InV">
<rect key="frame" x="16" y="18.5" width="78" height="23"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="工分" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9cF-8x-InV">
<rect key="frame" x="16" y="18.5" width="39" height="23"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
......
......@@ -36,7 +36,7 @@
@property (weak, nonatomic) IBOutlet UILabel *labelVoucher;
/** 实付金额 */
@property (weak, nonatomic) IBOutlet UILabel *labelRealPrice;
/** 提成金额 */
/** 工分 */
@property (weak, nonatomic) IBOutlet UILabel *labelDeduct;
/** 是否开票 */
@property (weak, nonatomic) IBOutlet UILabel *labelIsInvoice;
......@@ -71,9 +71,11 @@
self.labelPayment.text = kStrPrefix(self.model.paymentString, @"支付方式:");
self.labelPayTime.text = kStrPrefix(self.model.payTime, @"支付时间:");
self.labelPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.total], @"¥");
self.labelVoucher.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.deduct], @"¥");
//抵用券金额
NSDecimalNumber *voucher = [CalculateHelper sub:self.model.total num2:self.model.realPayTotal];
self.labelVoucher.text = kStrPrefix([CalculateHelper getMoneyStringFrom:voucher], @"¥");
self.labelRealPrice.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.realPayTotal], @"¥");
self.labelDeduct.text = kStrPrefix([CalculateHelper getMoneyStringFrom:self.model.deduct], @"¥");
self.labelDeduct.text = [self.model.deduct stringValue];
self.labelIsInvoice.text = kStrPrefix(self.model.invoiceString, @"是否开票:");
self.labelIsPrint.text = kStrPrefix(self.model.printStateString, @"是否打印:");
self.labelLatestPrintTime.text = kStrPrefix(self.model.lstPrintedTime, @"最后一次打印时间:");
......
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