删除了无用的图片,详情页面优化

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductDetail/View/Cell/ProductDetailProductLabel/ProductDetailProductLabelIconCollectionViewCell.swift

@@ -58,7 +58,6 @@ class ProductDetailProductLabelIconCollectionViewCell: UICollectionViewCell {
     
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "海外严选"
         titleLabel.textColor = k333333Color
         titleLabel.font = kRegularFont13
         return titleLabel

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

@@ -299,7 +299,6 @@ class ProductDetailView: BaseView {
                 cartImageView.pp.addBadge(number: productCartCount)
             }
             self.productDetailSkuView.hide()
-            self.tableView.reloadData()
         }
     }
     var productCartCountModel : ProductCartCountModel? {

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

@@ -38,6 +38,7 @@ class ProductDetailViewController: BaseViewController {
     }
     
     override func setupViews() {
+        self.navigationBar.wr_setLeftButton(image: kImage(name: "nav_back_black_mask")!)
         navigationBar.wr_setBackgroundAlpha(alpha: 0)
         view.addSubview(productDetailView)
         view.insertSubview(navigationBar, aboveSubview: productDetailView)
@@ -62,9 +63,11 @@ class ProductDetailViewController: BaseViewController {
             if offset.y <= 0  {
                 self?.segmentedView.isHidden = true
                 self?.navigationBar.wr_setBackgroundAlpha(alpha: 0)
+                self?.navigationBar.wr_setLeftButton(image: kImage(name: "nav_back_black_mask")!)
             }else {
                 self?.segmentedView.isHidden = false
                 self?.navigationBar.wr_setBackgroundAlpha(alpha: 1)
+                self?.navigationBar.wr_setLeftButton(image: kImage(name: "navbar_back_black")!)
             }
         }
         
@@ -254,7 +257,8 @@ extension ProductDetailViewController : JXSegmentedViewDelegate {
     func segmentedView(_ segmentedView: JXSegmentedView, didClickSelectedItemAt index: Int) {
         if index == 0 {
             self.segmentedView.isHidden = true
-            navigationBar.wr_setBackgroundAlpha(alpha: 0)
+            self.navigationBar.wr_setBackgroundAlpha(alpha: 0)
+            self.navigationBar.wr_setLeftButton(image: kImage(name: "nav_back_black_mask")!)
         }
 
         productDetailView.index = index

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductDetailHotSell/ProductDetailHotSellCollectionViewCell.swift

@@ -96,7 +96,6 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
     
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "海南冰糖心木瓜 1个装"
         titleLabel.textColor = k333333Color
         titleLabel.font = kMediumFont15
         titleLabel.textAlignment = .left
@@ -106,7 +105,6 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
     
     private lazy var detailTitleLabel: UILabel = {
         let detailTitleLabel = UILabel()
-        detailTitleLabel.text = "酸甜可口营养无限"
         detailTitleLabel.textColor = k999999Color
         detailTitleLabel.font = kRegularFont12
         detailTitleLabel.textAlignment = .left
@@ -151,7 +149,7 @@ class ProductDetailHotSellCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = productSearchModel?.saleName
-            detailTitleLabel.text = productSearchModel?.saleName
+            detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)
             if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallBarChart/ProductMallBarChartCollectionViewCell.swift

@@ -176,7 +176,7 @@ class ProductMallBarChartCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productModel?.bigImg ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = productModel?.saleName
-            detailTitleLabel.text = productModel?.saleName
+            detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"
             sellPriceLabel.text = priceConversion(price: productModel?.price ?? 0)
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productModel?.originPrice ?? 0))

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallRightSideleftPicture/ProductRightSideleftPictureCollectionViewCell.swift

@@ -152,7 +152,7 @@ class ProductRightSideleftPictureCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = productModel?.saleName
-            detailTitleLabel.text = productModel?.saleName
+            detailTitleLabel.text = productModel?.subtitle
             sellNumberLabel.text = "已售\(productModel?.totalCount ?? 0)件"
             sellPriceLabel.text = priceConversion(price: productModel?.price ?? 0)
             let attributeString = NSMutableAttributedString(string:priceConversion(price: productModel?.originPrice ?? 0))

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductMallSlidingLeftRight/ProductSlidingLeftRightCollectionViewCell.swift

@@ -145,7 +145,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = productModel?.saleName
-            detailTitleLabel.text = productModel?.saleName
+            detailTitleLabel.text = productModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productModel?.price ?? 0)
             if productModel?.stock == 0 {
                 self.plusButton.isHidden = true
@@ -159,7 +159,7 @@ class ProductSlidingLeftRightCollectionViewCell: UICollectionViewCell {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
             titleLabel.text = productSearchModel?.saleName
-            detailTitleLabel.text = productSearchModel?.saleName
+            detailTitleLabel.text = productSearchModel?.subtitle
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)
             if productSearchModel?.stock == 0 {
                 self.plusButton.isHidden = true

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/CollectionViewCell/ProductSlidingTopBottom/ProductSlidingTopBottomCollectionViewCell.swift

@@ -13,23 +13,6 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
     
     let disposeBag = DisposeBag()
     
-    var productSearchModel: ProductSearchModel? {
-        didSet {
-            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
-            titleLabel.text = productSearchModel?.saleName
-            sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
-            sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)                        
-            let attrString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
-            attrString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
-            markPriceLabel.attributedText = attrString
-            if productSearchModel?.stock == 0 {
-                self.plusButton.isHidden = true
-            }else {
-                self.plusButton.isHidden = false
-            }
-        }
-    }
-    
     typealias PlusClosure = (_ productSearchModel: ProductSearchModel?,_ indexPath:IndexPath?) -> Void
      var plusClosure : PlusClosure?
     
@@ -155,4 +138,21 @@ class ProductSlidingTopBottomCollectionViewCell: UICollectionViewCell {
         return plusButton
     }()
     
+    var productSearchModel: ProductSearchModel? {
+        didSet {
+            iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
+            titleLabel.text = productSearchModel?.saleName
+            sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
+            sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)
+            let attrString = NSMutableAttributedString(string:priceConversion(price: productSearchModel?.originPrice ?? 0))
+            attrString.changeStrikethrough(atAllStyle: NSUnderlineStyle.single, color: kbbbbbbColor)
+            markPriceLabel.attributedText = attrString
+            if productSearchModel?.stock == 0 {
+                self.plusButton.isHidden = true
+            }else {
+                self.plusButton.isHidden = false
+            }
+        }
+    }
+    
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHBigTableViewCell.swift

@@ -159,8 +159,8 @@ class ProductHBigTableViewCell: UITableViewCell {
     var productSearchModel: ProductSearchModel? {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
-            titleLabel.text = productSearchModel?.name
-            detailTitleLabel.text = productSearchModel?.saleName
+            titleLabel.text = productSearchModel?.saleName
+            detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
             
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/TableViewCell/ProductHSmallTableViewCell.swift

@@ -149,8 +149,8 @@ class ProductHSmallTableViewCell: UITableViewCell {
     var productSearchModel: ProductSearchModel? {
         didSet {
             iconImagView.kf.setImage(with: kURLImage(name: productSearchModel?.img ?? "pic_preload"), placeholder: kImage(name: "pic_preload"))
-            titleLabel.text = productSearchModel?.name
-            detailTitleLabel.text = productSearchModel?.saleName
+            titleLabel.text = productSearchModel?.saleName
+            detailTitleLabel.text = productSearchModel?.subtitle
             sellNumberLabel.text = "已售\(productSearchModel?.totalCount ?? 0)件"
             
             sellPriceLabel.text = priceConversion(price: productSearchModel?.price ?? 0)            

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

@@ -97,12 +97,12 @@ class ShopSectionHeaderView: BaseView {
             }
             
             if shopSectionHeaderModel?.salesState == 1 {
-                salesVolumeButton.setImage(kImage(name: "common_store_arrow_up"), for: UIControl.State.normal)
+                salesVolumeButton.setImage(kImage(name: "common_store_arrow_down"), for: UIControl.State.normal)
                 
             }
             
             if  shopSectionHeaderModel?.salesState == 2 {
-                salesVolumeButton.setImage(kImage(name: "common_store_arrow_down"), for: UIControl.State.normal)
+                salesVolumeButton.setImage(kImage(name: "common_store_arrow_up"), for: UIControl.State.normal)
                 
             }
             
@@ -112,12 +112,12 @@ class ShopSectionHeaderView: BaseView {
             }
             
             if shopSectionHeaderModel?.priceState == 1 {
-                priceButton.setImage(kImage(name: "common_store_arrow_up"), for: UIControl.State.normal)
+                priceButton.setImage(kImage(name: "common_store_arrow_down"), for: UIControl.State.normal)
                 
             }
             
             if  shopSectionHeaderModel?.priceState == 2 {
-                priceButton.setImage(kImage(name: "common_store_arrow_down"), for: UIControl.State.normal)
+                priceButton.setImage(kImage(name: "common_store_arrow_up"), for: UIControl.State.normal)
                 
             }
         }

RainbowPlanet/RainbowPlanet/Service/Model/ProductModel/ProductSearchModel.swift

@@ -37,6 +37,7 @@ class ProductSearchModel : NSObject, Mappable{
     var totalStock : Int?
     var upStatus : Int?
     var isSelect : Int?
+    var subtitle : String?
     
     
     class func newInstance(map: Map) -> Mappable?{
@@ -72,6 +73,6 @@ class ProductSearchModel : NSObject, Mappable{
         totalCount <- map["total_count"]
         totalStock <- map["total_stock"]
         upStatus <- map["up_status"]
-        
+        subtitle <- map["subtitle"]
     }
 }

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/Arrows/my_arrows_unfold.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "my_arrows_unfold.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_goods_pic_soldout.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_goods_pic_soldout.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_jiancebaogao.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_jiancebaogao.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_share_link.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_share_link.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_share_moments.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_share_moments.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_share_qq.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_share_qq.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_share_qzone.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_share_qzone.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_share_wechat.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_share_wechat.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_sku_cancel.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_sku_cancel.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_store_arrow_down.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_store_arrow_down.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_store_arrow_normal.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_store_arrow_normal.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_store_arrow_up.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_store_arrow_up.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_word_packup.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_word_packup.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/CommonIcon/common_word_unfold.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "common_word_unfold.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page01.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page01.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page02.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page02.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page03.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page03.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page04.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page04.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page05.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page05.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/page06.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "page06.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/DefaultPage/pic_preload.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "pic_preload.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/nav_back_black_mask.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "nav_back_black_mask.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_address.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_address.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_back_black.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_back_black.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_back_white.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_back_white.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_class.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_class.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_message_entrance.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_message_entrance.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_refresh.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_refresh.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_search.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_search.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_set_entrance.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_set_entrance.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_shopping.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_shopping.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/NavigationBarIcons/navbar_shopping_white.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "navbar_shopping_white.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/StarRating/star_rating_empty.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "star_rating_empty.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/StarRating/star_rating_filled.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "star_rating_filled.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/StarRating/star_rating_half.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "star_rating_half.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tab_top_line.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tab_top_line.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_home.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_home.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_home_pre.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_home_pre.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_my.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_my.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_my_pre.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_my_pre.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_shopping.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_shopping.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/TabbarIcons/tabbar_shopping_pre.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "tabbar_shopping_pre.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/login_express.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "login_express.png",
       "scale" : "1x"
     },
     {

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/login_show.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "login_show.png",
       "scale" : "1x"
     },
     {