Bladeren bron

代码提交;

Handy_Cao 4 jaren geleden
bovenliggende
commit
56f82d87e5

+ 1 - 1
MTP_iOS/MTP2_iOS/BusinessCore/Bank/BankAdapter.swift

@@ -182,7 +182,7 @@ class BankAdapter: BaseAdapter {
             callback(true , nil, bankCancel)
             
         } catch {
-            //对象装箱失败
+            /// 对象装箱失败
             callback(false, ErrorInfo(retCode: -60000, retMsg: nil),nil)
         }
     }

+ 4 - 3
MTP_iOS/MTP2_iOS/BusinessCore/Global/BaseAdapter.swift

@@ -22,12 +22,13 @@ class BaseAdapter {
             $0.funCode = UInt32(funCode)
             $0.uuid = MTP2BusinessCore.shared.uuid+clinettype+String(timeStamp)
             
-            // 登录后报文需要
-            if let accountManager = MTP2BusinessCore.shared.accountManager, let loginRsp = accountManager.loginRsp {
+            /// 登录后报文需要
+            if let accountManager = MTP2BusinessCore.shared.accountManager,
+               let loginRsp = accountManager.loginRsp {
                 $0.userID = loginRsp.userID
             }
             
-            // 下单报文需要
+            /// 下单报文需要
             $0.accountID = UInt64(accountID == 0 ? MTP2BusinessCore.shared.accountManager?.getCurrentTAAccountInfo()?.accountId ?? 0 : accountID)
             if goodsID != Int.max { $0.goodsID = UInt32(goodsID) }
             if marketID != Int.max { $0.marketID = UInt32(marketID) }

+ 1 - 1
MTP_iOS/MTP2_iOS/Resource/PlistFiles/Config.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>appVersion</key>
-	<string>LYB</string>
+	<string>LYB_171</string>
 </dict>
 </plist>

+ 0 - 1
MTP_iOS/MTP2_iOS/UserInterface/Coupon/ChooseCouponViewController.swift

@@ -66,7 +66,6 @@ class ChooseCouponViewController: BaseViewController {
             guard let _ = takeInfo as? MoGoodsInfo else { return }
             /// 查询数据
             reloadData(0)
-            reloadData(1)
         }
     }
     /// 付款金额

+ 2 - 0
MTP_iOS/MTP2_iOS/UserInterface/Message/MessageViewController.swift

@@ -171,6 +171,8 @@ class MessageViewController: BaseViewController {
                     if noticeCount != 0 { self.noticeCount.text = "\(noticeCount)" }
                     self.msgCount.isHidden = msgCount == 0
                     self.noticeCount.isHidden = noticeCount == 0
+                    /// tabbar badgeValue
+                    self.tabBarItem.badgeValue = msgCount+noticeCount != 0 ? "\(msgCount+noticeCount)" : nil
                 }
             }
         }

+ 5 - 1
MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/SigningTerminationViewController.swift

@@ -48,7 +48,7 @@ class SigningTerminationViewController: BaseTableViewController<MoBankAccountSig
                         self.tableCellModels = results.bankSign
                     }
                     self.tableView.reloadData()
-                }else {
+                } else {
                     self.showErrorMessgae(error: errorInfo)
                 }
             }
@@ -64,6 +64,10 @@ class SigningTerminationViewController: BaseTableViewController<MoBankAccountSig
         }
     }
     
+    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 188.0
+    }
+    
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         let cell = sender as! SigningTerminationTableViewCell
         let viewController = segue.destination as! SigningDetailViewController

+ 1 - 1
MTP_iOS/MTP2_iOS/UserInterface/Quote/SpecialSaleViewController.swift

@@ -272,7 +272,7 @@ class SpecialGoodsCell: UICollectionViewCell {
             /// 商品名称
             goodsName.text = obj.goodsname
             /// 抢购价
-            price.attributedText = (("\(obj.currencysign) ".withFont(.font_12))+("\((MTP2BusinessCore.shared.getLoginStatus() ? obj.orderprice : obj.goodsprice))".withFont(.font_16))).withTextColor(.red)
+            price.attributedText = (("\(obj.currencysign) ".withFont(.font_12))+("\(obj.goodsprice.toDownString(reserve: obj.decimalplace))".withFont(.font_16))).withTextColor(.red)
             /// 是否有优惠券
             score.isHidden = !obj.hascoupon
             

+ 16 - 14
MTP_iOS/MTP2_iOS/UserInterface/Trade/PaymentOrderViewController.swift

@@ -149,19 +149,21 @@ class PaymentOrderViewController: BaseViewController {
         guard let url = StringUtils.getImageUrl(obj.picurls) else { return }
         goodsImage.sd_setImage(with: url, placeholderImage: UIImage(named: "placeholder_image"), options: .queryDiskDataSync, context: nil)
         
-        /// 查询资金信息
-        accountManager.loginQueryReq(queryItem: "1,2") { (isComplete, error) in
-            DispatchQueue.main.async {
-                /// 期末余额
-                let blance = taAccountInfo.currentBalance-(taAccountInfo.freezeMargin+taAccountInfo.otherFreezeMargin+taAccountInfo.freezeCharge)
-                /// 最大可用数量
-                self.qtyField.maxIntNum = obj.buymaxqty == 0 ? (obj.orderqty-obj.tradeqty) : min((obj.orderqty-obj.tradeqty), obj.buymaxqty)
-                /// 最大可用数量
-                self.maxQty.text = "最大可购买数量:\(self.qtyField.maxIntNum)"
-                /// 余额
-                self.blance.text = "可用余额:\(blance.toString(reserve: 2))"
-                /// 请求优惠券
-                self.requestQueryMyCoupons(Double(self.qtyField.currentIntNumbers)*obj.orderprice*obj.agreeUnit)
+        DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()+0.5) {
+            /// 查询资金信息
+            accountManager.loginQueryReq(queryItem: "1,2") { (isComplete, error) in
+                DispatchQueue.main.async {
+                    /// 期末余额
+                    let blance = taAccountInfo.currentBalance-(taAccountInfo.freezeMargin+taAccountInfo.otherFreezeMargin+taAccountInfo.freezeCharge)
+                    /// 最大可用数量
+                    self.qtyField.maxIntNum = obj.buymaxqty == 0 ? (obj.orderqty-obj.tradeqty) : min((obj.orderqty-obj.tradeqty), obj.buymaxqty)
+                    /// 最大可用数量
+                    self.maxQty.text = "最大可购买数量:\(self.qtyField.maxIntNum)"
+                    /// 余额
+                    self.blance.text = "可用余额:\(blance.toString(reserve: 2))"
+                    /// 请求优惠券
+                    self.requestQueryMyCoupons(Double(self.qtyField.currentIntNumbers)*obj.orderprice*obj.agreeUnit)
+                }
             }
         }
     }
@@ -319,7 +321,7 @@ class PaymentOrderViewController: BaseViewController {
                 self._anim?.stopAnimating()
                 /// 查询成功
                 if isComplete {
-                    if objs?.count != 0 { self.couponHold = objs?.first }
+                    if objs?.count != 0 { self.couponHold = objs?.first } else { self.couponHold = nil }
                     self.rowNum = 0
                 } else {
                     /// showError