更换电商icon

张旭
1 parent fb00b797
Showing 62 changed files with 32 additions and 126 deletions
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailBtnsCell.swift
metaCode/Classes/Main/HomePage/View/CNLiveShopDetailOrderAssetCell.swift
metaCode/Supporting Files/Assets.xcassets/Temp/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_DDGL.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DDGL.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DDGL.imageset/订单管理@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DDGL.imageset/订单管理@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_DPFL.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DPFL.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DPFL.imageset/店铺分类管理@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DPFL.imageset/店铺分类管理@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_DTGL.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DTGL.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DTGL.imageset/动态管理@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_DTGL.imageset/动态管理@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_FBDT.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_FBDT.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_FBDT.imageset/发布动态@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_FBDT.imageset/发布动态@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_GLYHQ.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_GLYHQ.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_GLYHQ.imageset/优惠券管理@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_GLYHQ.imageset/优惠券管理@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/DS_WB_JYJL.imageset/Contents.json → metaCode/Supporting Files/Assets.xcassets/Home/Console/DS_WB_JYJL.imageset/Contents.json
@@ -6,7 +6,8 @@
 //
  
 import Foundation
-
+//临时我的订单和我的资产高度
+let tempOrderZiChanHeight = CGFloat(128-55)
 class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
  
     let kCNLiveShopDetailDefaultCellID = "kCNLiveShopDetailDefaultCellID"
@@ -187,9 +188,9 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 case 1://btn
                     return CGSize(width: KSreenWidth, height: 10+45+5+17+15)
                 case 2://我的订单
-                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: 128-55)+15)
+                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
                 case 3://我的资产
-                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: 128-55)+15)
+                    return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
                 case 4://
                     return CGSize(width: KSreenWidth, height: 50)
                 default:
@@ -35,13 +35,13 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         self.backgroundColor = .white
         var titlesArr:Array<String> = []
         if DSUserInfoManager.shared.dsUserInfo.type != "3" {
-            titlesArr = [ "商品管理", "订单管理"]
+            titlesArr = [ "商品管理", "订单管理", "交易记录"]
 //            titlesArr = ["发布动态", "商品管理", "订单管理", "交易记录"]
         }else{
             //健康餐桌 不处理
         }
         //替换icon
-        let icons = ["ds_Up_Btn", "ds_Up_Btn"]
+        let icons = ["DS_WB_SPGL", "DS_WB_DDGL", "DS_WB_JYJL"]
 //        let icons = ["ds_Up_Btn", "ds_Up_Btn", "ds_Up_Btn", "ds_Up_Btn"]
         if titlesArr.count > 0 {
             for i in 0..<titlesArr.count {
@@ -78,6 +78,9 @@ class CNLiveShopDetailBtnsCell: UICollectionViewCell {
         }else if tag == 101 {
             //订单管理
             currentViewController()?.navigationController?.pushViewController(CNLiveShopOrderViewController.init(), animated: false)
+        }else if tag == 102 {
+            //交易记录
+            currentViewController()?.navigationController?.pushViewController(CNLiveShopTransViewController.init(), animated: false)
         }
 //        if tag == 100 {
 //            //发布动态
@@ -80,7 +80,7 @@ class CNLiveShopDetailOrderAssetCell:UICollectionViewCell{
         }else if self.displayType == .CNLiveShopDetailDisplayTypeAsset{
             imgName = "homepage_detail_asset_bg"
         }
-        let imageView = UIImageView(frame: CGRect(x: 15, y: self.navTitle.bottom + 15, width: self.contentView.width - 30, height: CNLiveAdaptTool.adaptLength(length: 128)))
+        let imageView = UIImageView(frame: CGRect(x: 15, y: self.navTitle.bottom + 15, width: self.contentView.width - 30, height: CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)))
         imageView.image = UIImage(named: imgName)
         self.bgImageView = imageView
         self.contentView.addSubview(self.bgImageView)
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_DDGL@2x.png",
+      "filename" : "订单管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "订单管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_DPFL@2x.png",
+      "filename" : "店铺分类管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "店铺分类管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_DTGL@2x.png",
+      "filename" : "动态管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "动态管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_FBDT@2x.png",
+      "filename" : "发布动态@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "发布动态@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_GLYHQ@2x.png",
+      "filename" : "优惠券管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "优惠券管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_JYJL@2x.png",
+      "filename" : "交易记录@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "交易记录@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_NO_Management@2x.png",
+      "filename" : "直播管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "直播管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_SJPZ_REPAST@2x.png",
+      "filename" : "创建店铺分类@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "创建店铺分类@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_SPGL@2x.png",
+      "filename" : "商品管理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "商品管理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_XZSP@2x.png",
+      "filename" : "新增商品@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "新增商品@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "DS_WB_XZYHQ@2x.png",
+      "filename" : "新增优惠券@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "新增优惠券@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "ds_Up_Btn@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "temp_quest_list_img01@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "temp_quest_list_img01@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "temp_quest_list_img02@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "temp_quest_list_img02@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "temp_quest_list_img03@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "temp_quest_list_img03@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "temp_quest_list_img04@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "temp_quest_list_img04@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}