Merge branch 'feature/nanxinlin' into develop

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -1393,13 +1393,6 @@
 			path = SwiftMoyaNetWorkManager;
 			sourceTree = "<group>";
 		};
-		A7284A6B2253BE57000BAEC4 /* Reactor */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Reactor;
-			sourceTree = "<group>";
-		};
 		A7284A7122546441000BAEC4 /* SwiftMoyaServicePay */ = {
 			isa = PBXGroup;
 			children = (
@@ -1923,7 +1916,6 @@
 		A7778CC32246030200C7C47A /* PhoneCountryArea */ = {
 			isa = PBXGroup;
 			children = (
-				A7284A6B2253BE57000BAEC4 /* Reactor */,
 				A7778CE022461DA300C7C47A /* Model */,
 				A7778CD322460CED00C7C47A /* View */,
 				A7778CCC224608EA00C7C47A /* ViewController */,

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -16,13 +16,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         //初始化窗口
         initWindow()
-        //初始化友盟
-        UMManager.shared().initUM(launchOptions: launchOptions)
+        
         DispatchQueue.global(qos: .default).async {
             //初始化百度地图
             BaiduMapManager.shared.initBaiduMap()
             //初始化键盘
-            IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+            DispatchQueue.main.async {
+                //初始化友盟
+                UMManager.shared().initUM(launchOptions: launchOptions)
+                IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
+            }
         }
     
         return true

RainbowPlanet/RainbowPlanet/Manager/PayManager/PayManagerPay/PayManagerPay.swift

@@ -18,7 +18,10 @@ class PayManagerPay: NSObject {
         // 弹出支付方式View
         AlertSheetView.payAlertSheetView(paymentAmount:orderPayModel.money ?? "",cancelClosure: {
             [weak self] in
-            self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
+            
+                if orderFinishPayVCType == .cart || orderFinishPayVCType == .productDetail {
+                    self?.pushVC(payStatus: false,orderFinishPayVCType: orderFinishPayVCType, vc: vc)
+                }
             }, sureClosure: { [weak self] (payType) in
                 switch payType {
                 case .wechatPay:
@@ -58,6 +61,9 @@ class PayManagerPay: NSObject {
         orderFinishPayVC.reloadClosure = {
             [weak self] in
             if let reloadClosure = self?.reloadClosure {
+                if orderFinishPayVCType == .order || orderFinishPayVCType == .orderDetail {
+                    kOrderVCTypeAlliSRefresh = true
+                }
                 reloadClosure()
             }
         }

RainbowPlanet/RainbowPlanet/Modules/MineModule/AccountSecurity/ViewController/AccountSecurityViewController.swift

@@ -98,7 +98,7 @@ class AccountSecurityViewController: BaseViewController {
                 })
             }
         }else { //解绑微信
-            SwiftMoyaNetWorkServiceUser.shared().userIsBindWeixinUnBindApi(completion: { [weak self] (data) -> (Void) in
+            SwiftMoyaNetWorkServiceUser.shared().userUnbindWeixinApi(completion: { [weak self] (data) -> (Void) in
                 self?.accountSecurityView.tableView.reloadData()
             })
         }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -10,7 +10,16 @@ import UIKit
 import JXSegmentedView
 import RxSwift
 
+public var kOrderVCTypeAlliSRefresh : Bool = false 
+
 class OrderListViewController: UIViewController {
+    
+    deinit {
+        if observe != nil {
+            NotificationCenter.default.removeObserver(observe!)
+        }
+    }
+    weak var observe : NSObjectProtocol?
 
     let disposeBag = DisposeBag()
     
@@ -64,6 +73,9 @@ class OrderListViewController: UIViewController {
             self?.orderPurchaseOrderListApi(page: page)
         }
         
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("OrderListVCAll"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
+            self?.orderPurchaseOrderListApi(page: 1)
+        }
     }
     
     
@@ -365,6 +377,38 @@ extension OrderListViewController : UITableViewDelegate, UITableViewDataSource {
 
 extension OrderListViewController : JXSegmentedListContainerViewListDelegate {
     func listView() -> UIView {
+        
         return view
     }
+    
+    func listDidAppear() {
+        if self.orderVCType == .all && kOrderVCTypeAlliSRefresh {
+            orderPurchaseOrderListApiAll()
+        }
+    }
+    
+    /// 订单列表
+    ///
+    /// - Parameter page: <#page description#>
+    func orderPurchaseOrderListApiAll(page:Int = 1) {
+        
+        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseOrderListApi(page: page, status: -1) {
+            [weak self] (orderListModel) -> (Void) in
+            let orderListModel = orderListModel as? OrderListModel
+            if orderListModel?.pagination?.currentPage ?? 1  <= orderListModel?.pagination?.totalPages ?? 1 {
+                if orderListModel?.pagination?.currentPage == 1{
+                    self?.orderModelArray.removeAll()
+                    self?.orderListView.tableView.resetNoMoreData()
+                }
+                self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
+                self?.orderListView.tableView.reloadData()
+                if self?.orderModelArray.isEmpty ?? true {
+                    self?.orderListView.tableView.isHiddenFooter(true)
+                }
+            }else {
+                self?.orderListView.tableView.endFooterNoMoreData()
+            }
+            kOrderVCTypeAlliSRefresh = false
+        }
+    }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -52,6 +52,7 @@ class OrderViewController: BaseViewController {
     }
     
     override func setupLayouts() {
+        
         segmentedView.snp.makeConstraints { (make) in
             make.left.right.equalToSuperview()
             make.height.equalTo(44)
@@ -69,7 +70,6 @@ class OrderViewController: BaseViewController {
             [weak self] (notification) in
             self?.orderListViewController?.orderPurchaseOrderListApi(page: 1)
         }
-
     }
     
     //1.初始化JXSegmentedView
@@ -209,12 +209,14 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = orderModel.refundNo
             vc.orderRefunddetailsVCType = .order
+            vc.orderStatus = orderModel.status
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {            
             let vc1 = OrderCommentController()
             vc1.orderDetailModel = orderModel
             vc1.commentSuccessedBlock = {
+                kOrderVCTypeAlliSRefresh = true
                 vc.orderPurchaseOrderListApi(page: 1)
             }
             self.navigationController?.pushViewController(vc1, animated: true)
@@ -233,15 +235,23 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
     
     /// 取消订单
     func orderPurchaseCloseApi(orderModel:OrderModel,vc: OrderListViewController) {
-        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: orderModel.patchNum ?? "") { (data) -> (Void) in
-            vc.orderPurchaseOrderListApi(page: 1)
+        
+        AlertSheetView.alert(title: "是否取消订单", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { (popupView, index, str) in
+            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: orderModel.patchNum ?? "") { (data) -> (Void) in
+                kOrderVCTypeAlliSRefresh = true
+                vc.orderPurchaseOrderListApi(page: 1)
+            }
         }
+        
     }
     
     /// 确认收货
     func orderPurchaseConfirmApi(orderModel:OrderModel,vc: OrderListViewController) {
-        SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: orderModel.id ?? 0) { (data) -> (Void) in
-            vc.orderPurchaseOrderListApi(page: 1)
+        AlertSheetView.alert(title: "是否确认收货", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { (popupView, index, str) in
+            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: orderModel.id ?? 0) { (data) -> (Void) in
+                kOrderVCTypeAlliSRefresh = true
+                vc.orderPurchaseOrderListApi(page: 1)
+            }
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailBottomView.swift

@@ -169,13 +169,11 @@ class OrderDetailBottomView: BaseView {
                     }else {
                         if orderModel?.isComment == 0 {
                             setButton( button: oneButton, title: "去评价", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton( button: twoButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton(button: threeButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                            setButton(button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                             setIsButtonHidden(leftHidden: true, oneHidden: false, twoHidden: false, threeHidden: false)
 
                         }else {
-                            setButton(button: oneButton, title: "退款详情", titleColor: kffffffColor, backgroundColor: kFFA42FColor, borderColor: kFFA42FColor)
-                            setButton(button: twoButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
+                            setButton(button: oneButton, title: "再次购买", titleColor: k333333Color, backgroundColor: UIColor.white, borderColor: kbfbfbfColor)
                             setIsButtonHidden(leftHidden: true, oneHidden: false, twoHidden: false, threeHidden: true)
 
                         }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/View/OrderDetailInfoTableViewCell.swift

@@ -114,4 +114,11 @@ class OrderDetailInfoTableViewCell: UITableViewCell {
         }
     }
     
+    var refundContents : [String]? {
+        didSet {
+            copyButton.isHidden = true
+            contentLabel.text = refundContents?[(indexPath?.row)!]
+        }
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -121,17 +121,25 @@ class OrderDetailViewController: BaseViewController {
             PayManagerPay.shared.payAlertView(orderPayModel: orderPayModel, orderFinishPayVCType: .orderDetail,vc: self)
         }
         if button.titleLabel?.text == "取消订单" {
-            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: self.orderDetailModel?.patchNum ?? "") {
-                [weak self] (data) -> (Void) in
-                self?.isChange = true
-                self?.orderPurchaseDetailApi()
+
+            AlertSheetView.alert(title: "是否取消订单", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { [weak self] (popupView, index, str) in
+                SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseCloseApi(patchNum: self?.orderDetailModel?.patchNum ?? "") {
+                    [weak self] (data) -> (Void) in
+                    self?.isChange = true
+                    kOrderVCTypeAlliSRefresh = true
+                    self?.orderPurchaseDetailApi()
+                }
             }
         }
         if button.titleLabel?.text == "确认收货" {
-            SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: self.orderDetailModel?.id ?? 0) {
-                 [weak self] (data) -> (Void) in
-                self?.orderPurchaseDetailApi()
+            AlertSheetView.alert(title: "是否确认收货", cancelTitle: "取消", sureTitle: "确定", cancelBlock: nil) { [weak self] (popupView, index, str) in
+                SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseConfirmApi(purchaseId: self?.orderDetailModel?.id ?? 0) {
+                    [weak self] (data) -> (Void) in
+                    kOrderVCTypeAlliSRefresh = true
+                    self?.orderPurchaseDetailApi()
+                }
             }
+ 
         }
         if button.titleLabel?.text == "查看物流" {
             let vc = OrderLogisticsController()
@@ -141,6 +149,7 @@ class OrderDetailViewController: BaseViewController {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = self.orderDetailModel?.refundNo
             vc.orderRefunddetailsVCType = .orderDetail
+            vc.orderStatus = self.orderDetailModel?.status
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {
@@ -148,6 +157,7 @@ class OrderDetailViewController: BaseViewController {
             vc.orderDetailModel = self.orderDetailModel
             vc.commentSuccessedBlock = {
                 [weak self] in
+                kOrderVCTypeAlliSRefresh = true
                 self?.orderPurchaseDetailApi()
             }
             self.navigationController?.pushViewController(vc, animated: true)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/View/OrderRefunddetailsStatusTableViewCell.swift

@@ -84,7 +84,7 @@ class OrderRefunddetailsStatusTableViewCell: UITableViewCell {
             }
             if orderRefundDetailModel?.status == 3 {
                 statusButton.setImage(kImage(name: "order_no"), for: UIControl.State.normal)
-                statusButton.setTitle("拒绝退款", for: UIControl.State.normal)
+                statusButton.setTitle("退款失败", for: UIControl.State.normal)
             }
             let str = "退款金额 \(priceConversion(price: orderRefundDetailModel?.showRefundPrice ?? 0))"
             if orderRefundDetailModel?.showRefundPrice != nil {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/ViewController/OrderRefunddetailsViewController.swift

@@ -20,6 +20,7 @@ class OrderRefunddetailsViewController: BaseViewController {
     var contents = ["","","","",""]
     
     var refundNo : String?
+    var orderStatus : Int?
     var orderRefundDetailModel : OrderRefundDetailModel?
     var orderRefunddetailsVCType : OrderRefunddetailsVCType?
     
@@ -72,29 +73,32 @@ class OrderRefunddetailsViewController: BaseViewController {
     }()
     
     override func setupData() {
+        if self.orderStatus == 1 {
+            self.contents[2] = "待发货"
+        }
+        if self.orderStatus == 2 {
+            self.contents[2] = "待收货"
+        }
+        if self.orderStatus == 3 {
+            self.contents[2] = "配送中"
+        }
+        if self.orderStatus == 4 {
+            self.contents[2] = "待自提"
+        }
+       
         tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.orderPurchaseRefundDetail()
         }
+        
     }
     
     func orderPurchaseRefundDetail() {
         SwiftMoyaNetWorkServiceOrder.shared().orderPurchaseRefundDetailApi(refundNo: refundNo ?? "") { [weak self] (orderRefundDetailModel) -> (Void) in
             self?.orderRefundDetailModel = orderRefundDetailModel as? OrderRefundDetailModel
+            
             self?.contents[0] = self?.orderRefundDetailModel?.refundNo ?? ""
             self?.contents[1] = self?.orderRefundDetailModel?.createdAt ?? ""
-            if self?.orderRefundDetailModel?.status == 0 {
-                 self?.contents[2] = "待处理"
-            }
-            if self?.orderRefundDetailModel?.status == 1 {
-                self?.contents[2] = "退款中"
-            }
-            if self?.orderRefundDetailModel?.status == 2 {
-                self?.contents[2] = "退款完成"
-            }
-            if self?.orderRefundDetailModel?.status == 3 {
-                self?.contents[2] = "拒绝退款"
-            }
             self?.contents[3] = self?.orderRefundDetailModel?.refundReason ?? ""
             self?.contents[4] = "\(priceConversionNone(price: self?.orderRefundDetailModel?.showRefundPrice ?? 0))元"
             self?.tableView.reloadData()
@@ -135,7 +139,7 @@ extension OrderRefunddetailsViewController : UITableViewDelegate, UITableViewDat
         default:
             let cell = OrderDetailInfoTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             cell.titles = titles
-            cell.contents = contents
+            cell.refundContents = contents
             return cell
         }
     }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailHotSell/ProductDetailHotSellTableViewCell.swift

@@ -97,7 +97,15 @@ extension ProductDetailHotSellTableViewCell: UICollectionViewDelegateFlowLayout,
     }
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return productSearchListModel?.data?.isEmpty ?? true ? 0 : productSearchListModel?.data?.count ?? 0
+        if productSearchListModel?.data?.isEmpty ?? true {
+            return 0
+        }else {
+            if productSearchListModel?.data?.count ?? 0 > 10 {
+                return productSearchListModel?.data?.prefix(10).count ?? 0
+            }else {
+                return productSearchListModel?.data?.count ?? 0
+            }
+        }
     }
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/ProductDetailView.swift

@@ -56,6 +56,8 @@ class ProductDetailView: BaseView {
                 if productDetailModel?.commentNumber != 0 && productDetailModel?.commentNumber != nil {
                     titles[2] = "商品评价" + "(" + "\(productDetailModel?.commentNumber ?? 0)" + ")"
                     
+                }else {
+                    titles[2] = "商品评价" + "(" + "0" + ")"
                 }
                 if productDetailModel?.imgs?.isEmpty ?? true {
                     tableView.tableHeaderView = nil

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/ViewController/ProductDetailViewController.swift

@@ -138,7 +138,7 @@ class ProductDetailViewController: BaseViewController {
     
     /// 获取商家商品列表
     private func productListApi() {
-        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: shopId ?? 0,desc: 2, fieldOrder: 1) {
+        SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: 1, shopId: shopId ?? 0,desc: 1, fieldOrder: 0) {
             [weak self] (productListModel) -> (Void) in
             let productSearchListModel = productListModel as? ProductSearchListModel
             self?.productDetailView.productSearchListModel = productSearchListModel

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopSectionHeaderModel.swift

@@ -12,4 +12,5 @@ class ShopSectionHeaderModel: NSObject {
     var priceState : Int = 0 // 0默认,1down,2up
     var salesState : Int = 0 // 0默认,1down,2up
     var state : Int = 0 // 0默认,1down,2up
+    var fieldOrder : Int = 0 // 默认,1.销量,2,价格
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/View/ShopSectionHeaderView.swift

@@ -45,14 +45,19 @@ class ShopSectionHeaderView: BaseView {
 
             if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 1
+                self?.shopSectionHeaderModel?.fieldOrder = 2
+
             }else if self?.shopSectionHeaderModel?.priceState == 1 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 2
+                self?.shopSectionHeaderModel?.fieldOrder = 2
+
             }else if self?.shopSectionHeaderModel?.priceState == 2 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.priceState = 0
+                self?.shopSectionHeaderModel?.fieldOrder = 0
             }
             self?.shopSectionHeaderModel?.state = (self?.shopSectionHeaderModel?.priceState)!
 
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.priceState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":2])
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.priceState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":self?.shopSectionHeaderModel?.fieldOrder as Any])
 
         }).disposed(by: disposeBag)
         return priceButton
@@ -70,14 +75,17 @@ class ShopSectionHeaderView: BaseView {
 
             if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 0 {
                 self?.shopSectionHeaderModel?.salesState = 1
+                self?.shopSectionHeaderModel?.fieldOrder = 1
             } else if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 1 {
                 self?.shopSectionHeaderModel?.salesState = 2
+                self?.shopSectionHeaderModel?.fieldOrder = 1
             } else if self?.shopSectionHeaderModel?.priceState == 0 && self?.shopSectionHeaderModel?.salesState == 2 {
                 self?.shopSectionHeaderModel?.salesState = 0
+                self?.shopSectionHeaderModel?.fieldOrder = 0
             }
             self?.shopSectionHeaderModel?.state = (self?.shopSectionHeaderModel?.salesState)!
             
-            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.salesState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":1])
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ShopVCDesc"), object: self?.shopSectionHeaderModel?.salesState, userInfo: ["desc":self?.shopSectionHeaderModel as Any,"field_order":self?.shopSectionHeaderModel?.fieldOrder as Any])
         }).disposed(by: disposeBag)
         return salesVolumeButton
     }()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/ViewController/ShopViewController.swift

@@ -13,7 +13,7 @@ class ShopViewController: BaseViewController {
     var shopId : Int?
     var productSearchModelArray = Array<ProductSearchModel>()
     
-    var fieldOrder : Int = 2
+    var fieldOrder : Int = 0
     var shopSectionHeaderModel = ShopSectionHeaderModel()
     
     override func viewDidLoad() {

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -150,37 +150,6 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         }
     }
     
-    // MARK: - 检查是否绑定微信 解绑
-    /// 检查是否绑定微信 解绑
-    ///
-    /// - Parameters:
-    ///   - umLoginModel: UMLoginModel
-    ///   - completion: 回调
-    func userIsBindWeixinUnBindApi(completion: @escaping apiCallBack) {
-        let userModel = UserModel.shared().getModel()
-
-        var parameters = Dictionary<String,Any>()
-        parameters.updateValue(userModel!.unionId! as Any, forKey: "union_id")
-        parameters.updateValue(userModel!.openId! as Any, forKey: "open_id")
-        if userModel?.mobile == nil ||  userModel?.mobile == "" {
-            SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
-        }else {
-            SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
-                [weak self] (rootModel) in
-                SwiftProgressHUD.shared().hide()
-                if rootModel.code == 0 {
-                    SwiftProgressHUD.shared().hide()
-                    self?.userUnbindWeixinApi(completion: completion)
-                } else {
-                    SwiftProgressHUD.shared().showText(rootModel.msg!)
-                }
-            }
-        }
-        
-        
-    }
-    
     // MARK: - 检查是否绑定微信 绑定
     /// 检查是否绑定微信 绑定
     ///
@@ -260,12 +229,15 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         let userModel = UserModel.shared().getModel()
         parameters.updateValue(userModel!.unionId! as Any, forKey: "union_id")
         parameters.updateValue(userModel!.openId! as Any, forKey: "open_id")
-        
-        SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
-            UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
-            completion("")
+        if userModel?.mobile == nil ||  userModel?.mobile == "" {
+            SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
+        }else {
+            SwiftProgressHUD.shared().showWait()
+            SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
+                UserModel.shared().setModel(model: userModel as! UserModel)
+                SwiftProgressHUD.shared().hide()
+                completion("")
+            }
         }
     }
 

RainbowPlanet/RainbowPlanet/Tools/AlertSheetView/AlertSheetView.swift

@@ -100,7 +100,7 @@ class AlertSheetView: NSObject {
         vProperty.maskViewColor = UIColor(white: 0, alpha: 0.5)
         vProperty.touchWildToHide = "0"
         vProperty.popupViewEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
-        vProperty.animationDuration = 0.5
+        vProperty.animationDuration = 0.3
         payView.vProperty = vProperty
         payView.show()
         payView.disTransBlock = {