no message

RainbowPlanet/RainbowPlanet/Modules/MineModule/EditSelfMentionContacts/View/EditAddressTableViewCell.swift

@@ -99,9 +99,6 @@ class EditAddressTableViewCell: UITableViewCell {
         editTextField.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in
             switch self?.indexPath!.row {
-            case 0:
-                self?.editTextField.text = String(describing: text.prefix(10))
-                break
             case 1:
                 self?.editTextField.text = String(describing: text.prefix(11))
                 break

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallView.swift

@@ -28,7 +28,6 @@ class ShoppingMallView: BaseView {
     }
     
     func setupView() {
-        addSubview(scrollView)
         addSubview(segmentedView)
         addSubview(listContainerView)
         
@@ -49,9 +48,6 @@ class ShoppingMallView: BaseView {
     }
 
     func setupLayout() {
-        scrollView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-        }
         segmentedView.snp.makeConstraints { (make) in
             make.top.left.right.equalToSuperview()
             if segmentedDataSource.titles.count > 1 {
@@ -70,12 +66,6 @@ class ShoppingMallView: BaseView {
         }
     }
     
-    lazy var scrollView : UIScrollView = {
-        let scrollView = UIScrollView()
-        scrollView.contentSize = self.bounds.size
-        return scrollView
-    }()
-    
     //1.初始化JXSegmentedView
     lazy var segmentedView: JXSegmentedView = {
         let segmentedView = JXSegmentedView()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/ViewController/ShoppingMallViewController.swift

@@ -24,7 +24,12 @@ class ShoppingMallViewController: BaseViewController {
     override func setupViews() {
         super.setupViews()
         navigationBar.addSubview(navigationBarView)
-        view.addSubview(shoppingMallView)
+//        let emptyView =  EmptyView.shared.diyCustomEmptyViewStyle1(iconStr: "page06", titleStr: "网络有误,请重新加载", buttonStr: "重新加载", buttonActionBlock: {
+//            [weak self] in
+//            self?.cmsTemplateSetTemplateNameApi()
+//        })
+//        emptyView.contentViewY = kScaleValue(value: 100) + kNavBarTotalHeight
+//        view.ly_emptyView = emptyView
         
     }
 
@@ -33,10 +38,6 @@ class ShoppingMallViewController: BaseViewController {
             make.top.equalToSuperview().offset(kSafeStatusBarHeight)
             make.left.right.bottom.equalToSuperview()
         }
-        shoppingMallView.snp.makeConstraints { (make) in
-            make.bottom.left.right.equalToSuperview()
-            make.top.equalTo(kNavBarTotalHeight)
-        }
     }
     
     override func setupData() {
@@ -82,10 +83,8 @@ class ShoppingMallViewController: BaseViewController {
             self?.navigationController?.pushViewController(vc, animated: true)
         }).disposed(by: disposeBag)
         
-        shoppingMallView.scrollView.addHeaderWithHeader(withBeginRefresh: true, animation: false) { (page) in
-            //请求模板
-            self.cmsTemplateSetTemplateNameApi()
-        }
+        /// 请求模板
+        self.cmsTemplateSetTemplateNameApi()
     }
     
     func pushVCCMSRule(cmsRuleModel:CMSRuleModel?,areaType:String) {
@@ -114,18 +113,25 @@ class ShoppingMallViewController: BaseViewController {
     }()
 
     private lazy var shoppingMallView: ShoppingMallView = {
-         let shoppingMallView = ShoppingMallView()
+        let shoppingMallView = ShoppingMallView()
+        view.addSubview(shoppingMallView)
         return shoppingMallView
     }()
     
     /// 请求模板
      private func cmsTemplateSetTemplateNameApi() {
-        SwiftMoyaNetWorkServiceCMS.shared().cmsTemplateSetTemplateNameApi {
+        SwiftMoyaNetWorkServiceCMS.shared().cmsTemplateSetTemplateNameApi(completion: {
             [weak self] (cmsTemplateModels) -> (Void) in
             let cmsTemplateModels = cmsTemplateModels as! Array<CMSTemplateModel>
+//            self?.view.ly_hideEmpty()
+            self?.shoppingMallView.snp.makeConstraints { (make) in
+                make.bottom.left.right.equalToSuperview()
+                make.top.equalTo(kNavBarTotalHeight)
+            }
             self?.shoppingMallView.cmsTemplateModels = cmsTemplateModels
+        }) { [weak self] () -> (Void) in
+//            self?.view.ly_showEmpty()
         }
     }
-
 }
 

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift

@@ -25,15 +25,21 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
     /// 数据回调
     typealias apiCallBack = (Any) -> (Void)
     
+    /// 数据回调
+    typealias apiFalseCallBack = () -> (Void)
+    
     /// 获取模板名称
     ///
     /// - Parameter completion: 完成
-    func cmsTemplateSetTemplateNameApi(completion: @escaping apiCallBack) {
+    func cmsTemplateSetTemplateNameApi(completion: @escaping apiCallBack,falseCompletion: @escaping apiFalseCallBack) {
         var parameters = Dictionary<String,Any>()
         let loacationModel = LocationModel.shared().getLocationModel()
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         SwiftProgressHUD.shared().showWait()
+        SwiftMoyaNetWorkManager.shared().falseCallback = {
+            falseCompletion()
+        }
         SwiftMoyaNetWorkManager.shared().requestArray(CMSTemplateModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetTemplateName(parameters: parameters))) {
             (cmsTemplateModels) in
             SwiftProgressHUD.shared().hide()

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -18,7 +18,7 @@ public func kApiDataPrefix() -> String {
     if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com"
     } else if kTestSever /** 接口前缀-测试服务器*/{
-        return ""
+        return "https://api.dev.caihongxingqiu.com/beta"
     }else if kProductSever /** 接口前缀-生产服务器*/ {
         return ""
     }else {

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -168,6 +168,9 @@ public class SwiftMoyaNetWorkManager: NSObject {
         //判断是否链接网络
         if !isNetworkConnect{
             SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
+            if let falseCallback = self.falseCallback  {
+                falseCallback()
+            }
             return
         }
         
@@ -252,7 +255,9 @@ public class SwiftMoyaNetWorkManager: NSObject {
         //判断是否链接网络
         if !isNetworkConnect{
             SwiftProgressHUD.shared().showText("网络链接失败,请检查网络")
-
+            if let falseCallback = self.falseCallback  {
+                falseCallback()
+            }
             return
         }
 

RainbowPlanet/RainbowPlanet/Tools/EmptyView/EmptyView.swift

@@ -24,6 +24,7 @@ class EmptyView: NSObject {
         let vertLayout = TGLinearLayout(.vert)
         vertLayout.tg_height.equal(.wrap)
         vertLayout.tg_width.equal(kScreenWidth-kScaleValue(value: 40))
+        vertLayout.isUserInteractionEnabled = true
 
         let iconImageView = UIImageView(image: UIImage(named: iconStr))
         iconImageView.tg_centerX.equal(0)
@@ -49,6 +50,7 @@ class EmptyView: NSObject {
         button.masksToBounds = true
         button.titleLabel?.font = kScaleRegularFont16
         button.setTitle(buttonStr, for: UIControl.State.normal)
+        button.isUserInteractionEnabled = false
         button.tg_top.equal(kScaleValue(value: 30))
         button.tg_height.equal(kScaleValue(value: 36))
         button.tg_centerX.equal(0)
@@ -59,6 +61,7 @@ class EmptyView: NSObject {
         vertLayout.addSubview(button)
 
         let emptyView = LYEmptyView.emptyView(withCustomView: vertLayout)
+        emptyView?.isUserInteractionEnabled = true
         return emptyView!        
     }