Merge branch 'develop' of http://git.quyaqu.com/youngliu/CAISHEN into develop

CAISHEN/SellFlowers/Main/controllers/KXSFSubmitOrderViewController.swift

@@ -153,7 +153,12 @@ class KXSFSubmitOrderViewController: KXBaseViewController ,UITableViewDataSource
             mutabArr.add(dict)
         }
         
-        KXHTTP.post(urlString, params: ["product_data":mutabArr,"address_id":self.addressId], success: { (json) in
+        let data : NSData! = try? JSONSerialization.data(withJSONObject: mutabArr, options: []) as NSData
+        let JSONString = NSString(data:data as Data,encoding: String.Encoding.utf8.rawValue)
+        
+        let params = ["product_data":JSONString as Any,"address_id":self.addressId] as [String : Any]
+        
+        KXHTTP.post(urlString, params: params, success: { (json) in
             self.navigationController?.popViewController(animated: true)
             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(Int64(1*NSEC_PER_SEC))/Double(NSEC_PER_SEC)) {
                 MBProgressHUD.showTip("提交订单成功！")

CAISHEN/SellFlowers/Main/controllers/KXSellFlowersMainViewController.swift

@@ -189,7 +189,8 @@ extension KXSellFlowersMainViewController{
                 reusableView = (collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: collectionSupplementTopHeaderID, for: indexPath))
                 let bannerView : CollectionViewBannerView = reusableView as! CollectionViewBannerView
                 bannerView.bannerDelegate = self
-                bannerView.imageArray = ["SF_Main_banner1","SF_Main_banner2","SF_Main_banner1"]
+                bannerView.imageArray = ["SF_Main_banner1","SF_Main_banner2"]
+                bannerView.cyclePageView.reloadData()
                 return bannerView
             }
             else{
@@ -234,7 +235,6 @@ class CollectionViewBannerView: UICollectionReusableView ,TYCyclePagerViewDelega
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.addSubview(cyclePageView)
-        cyclePageView.reloadData()
     }
     
     lazy var cyclePageView:TYCyclePagerView = {