Merge branch 'develop' into feature/nanxinlin

RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/ViewController/SelfMentionContactsListViewController.swift

@@ -58,7 +58,19 @@ class SelfMentionContactsListViewController: BaseViewController {
         selfMentionContactsListView.didSelectRowClosure = {
             [weak self] indexPath in
             let selfMentionContactsModel = self?.selfMentionContactsModels?[indexPath.row]
-            self?.userSetExpreesContactsDefaultApi(id: selfMentionContactsModel?.id ?? 0)
+            
+            // 当前选中的为默认，不进行请求
+            if selfMentionContactsModel?.isDefault == 1 {
+                if self!.isFromOrderPay {
+                    self?.navigationController?.popViewController(animated: true)
+                } else {
+                    self?.userExpreesContactsListApi()
+                }
+            }
+            
+            if selfMentionContactsModel?.isDefault == 0 {
+                self?.userSetExpreesContactsDefaultApi(id: selfMentionContactsModel?.id ?? 0)
+            }
         }
         return selfMentionContactsListView
     }()

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/ViewController/ShoppingCartViewController.swift

@@ -121,6 +121,7 @@ class ShoppingCartViewController: BaseViewController {
             if productSearchListModel?.pagination?.currentPage ?? 1  <= productSearchListModel?.pagination?.totalPages ?? 1 {
                 if productSearchListModel?.pagination?.currentPage == 1{
                     self?.productSearchModelArray.removeAll()
+                    self?.shoppingCartView.tableView.resetNoMoreData()
                 }
                 self?.productSearchModelArray = (self?.productSearchModelArray)! + (productSearchListModel?.data!)!
 
@@ -128,6 +129,7 @@ class ShoppingCartViewController: BaseViewController {
 
             } else {
                 self?.shoppingCartView.hotSaleModelArr = self?.productSearchModelArray
+                self?.shoppingCartView.tableView.endFooterNoMoreData()
             }
         }
     }