商机管理首页分抢商机和分配商机

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header1.imageset/.svn/entries

@@ -2,13 +2,13 @@
 
 dir
 1812
-svn://root@113.105.74.141:3690/usoft_ios/shiku/shiku_im/shiku_im/Images.xcassets/%E5%95%86%E6%9C%BA%E7%AE%A1%E7%90%86/crm_main_header1.imageset
+svn://root@113.105.74.141:3690/usoft_ios/shiku/shiku_im/shiku_im/Images.xcassets/%E5%95%86%E6%9C%BA%E7%AE%A1%E7%90%86/crm_main_header2.imageset
 svn://root@113.105.74.141:3690/usoft_ios
 
 
 
-2018-09-11T09:45:24.336989Z
-1664
+2018-10-12T09:49:40.262690Z
+1728
 huangyp
 
 
@@ -32,10 +32,10 @@ file
 
 
 
-2019-02-14T01:24:08.000000Z
-560512cbf567ab4dc523217d8e1a6ab0
-2018-09-11T09:45:24.336989Z
-1664
+2019-02-14T01:24:09.000000Z
+0c886fa73cdf31bd5eace34bd3a01ef5
+2018-10-12T09:49:40.262690Z
+1728
 huangyp
 
 
@@ -60,16 +60,16 @@ huangyp
 
 408
 
-crm_main_header1@1x.png
+crm_main_header2@1x.png
 file
 
 
 
 
-2019-02-14T01:24:08.000000Z
-b051449bcc94809160877dfc40b47277
-2018-09-11T09:45:24.336989Z
-1664
+2019-02-14T01:24:09.000000Z
+8f46d47b50e931a73c81c42f06725576
+2018-10-12T09:49:40.262690Z
+1728
 huangyp
 has-props
 
@@ -92,18 +92,18 @@ has-props
 
 
 
-2905
+2105
 
-crm_main_header1@2x.png
+crm_main_header2@2x.png
 file
 
 
 
 
-2019-02-14T01:24:08.000000Z
-e1f3b161cb777a2b3e29d2b12a90bda0
-2018-09-11T09:45:24.336989Z
-1664
+2019-02-14T01:24:09.000000Z
+73f7248e835bc2c7fe3ef0e9dc6331ad
+2018-10-12T09:49:40.262690Z
+1728
 huangyp
 has-props
 
@@ -126,18 +126,18 @@ has-props
 
 
 
-9019
+6873
 
-crm_main_header1@3x.png
+crm_main_header2@3x.png
 file
 
 
 
 
-2019-02-14T01:24:08.000000Z
-1d1c2cf7725207c37bbfa4b244b89fa3
-2018-09-11T09:45:24.336989Z
-1664
+2019-02-14T01:24:09.000000Z
+452fd77b2e61f4f63e47d58112aee6a8
+2018-10-12T09:49:40.262690Z
+1728
 huangyp
 has-props
 
@@ -160,5 +160,5 @@ has-props
 
 
 
-17219
+14308
 

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header1.imageset/.svn/text-base/Contents.json.svn-base

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@1x.png",
+      "filename" : "crm_main_header2@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@2x.png",
+      "filename" : "crm_main_header2@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@3x.png",
+      "filename" : "crm_main_header2@3x.png",
       "scale" : "3x"
     }
   ],

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header1.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@1x.png",
+      "filename" : "crm_main_header2@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@2x.png",
+      "filename" : "crm_main_header2@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header1@3x.png",
+      "filename" : "crm_main_header2@3x.png",
       "scale" : "3x"
     }
   ],

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header2.imageset/.svn/entries

@@ -2,13 +2,13 @@
 
 dir
 1812
-svn://root@113.105.74.141:3690/usoft_ios/shiku/shiku_im/shiku_im/Images.xcassets/%E5%95%86%E6%9C%BA%E7%AE%A1%E7%90%86/crm_main_header2.imageset
+svn://root@113.105.74.141:3690/usoft_ios/shiku/shiku_im/shiku_im/Images.xcassets/%E5%95%86%E6%9C%BA%E7%AE%A1%E7%90%86/crm_main_header1.imageset
 svn://root@113.105.74.141:3690/usoft_ios
 
 
 
-2018-10-12T09:49:40.262690Z
-1728
+2018-09-11T09:45:24.336989Z
+1664
 huangyp
 
 
@@ -32,10 +32,10 @@ file
 
 
 
-2019-02-14T01:24:09.000000Z
-0c886fa73cdf31bd5eace34bd3a01ef5
-2018-10-12T09:49:40.262690Z
-1728
+2019-02-14T01:24:08.000000Z
+560512cbf567ab4dc523217d8e1a6ab0
+2018-09-11T09:45:24.336989Z
+1664
 huangyp
 
 
@@ -60,16 +60,16 @@ huangyp
 
 408
 
-crm_main_header2@1x.png
+crm_main_header1@1x.png
 file
 
 
 
 
-2019-02-14T01:24:09.000000Z
-8f46d47b50e931a73c81c42f06725576
-2018-10-12T09:49:40.262690Z
-1728
+2019-02-14T01:24:08.000000Z
+b051449bcc94809160877dfc40b47277
+2018-09-11T09:45:24.336989Z
+1664
 huangyp
 has-props
 
@@ -92,18 +92,18 @@ has-props
 
 
 
-2105
+2905
 
-crm_main_header2@2x.png
+crm_main_header1@2x.png
 file
 
 
 
 
-2019-02-14T01:24:09.000000Z
-73f7248e835bc2c7fe3ef0e9dc6331ad
-2018-10-12T09:49:40.262690Z
-1728
+2019-02-14T01:24:08.000000Z
+e1f3b161cb777a2b3e29d2b12a90bda0
+2018-09-11T09:45:24.336989Z
+1664
 huangyp
 has-props
 
@@ -126,18 +126,18 @@ has-props
 
 
 
-6873
+9019
 
-crm_main_header2@3x.png
+crm_main_header1@3x.png
 file
 
 
 
 
-2019-02-14T01:24:09.000000Z
-452fd77b2e61f4f63e47d58112aee6a8
-2018-10-12T09:49:40.262690Z
-1728
+2019-02-14T01:24:08.000000Z
+1d1c2cf7725207c37bbfa4b244b89fa3
+2018-09-11T09:45:24.336989Z
+1664
 huangyp
 has-props
 
@@ -160,5 +160,5 @@ has-props
 
 
 
-14308
+17219
 

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header2.imageset/.svn/text-base/Contents.json.svn-base

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@1x.png",
+      "filename" : "crm_main_header1@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@2x.png",
+      "filename" : "crm_main_header1@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@3x.png",
+      "filename" : "crm_main_header1@3x.png",
       "scale" : "3x"
     }
   ],

shiku_im/shiku_im/Images.xcassets/商机管理/crm_main_header2.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@1x.png",
+      "filename" : "crm_main_header1@1x.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@2x.png",
+      "filename" : "crm_main_header1@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "crm_main_header2@3x.png",
+      "filename" : "crm_main_header1@3x.png",
       "scale" : "3x"
     }
   ],

shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/NicheManageVC.m

@@ -18,6 +18,7 @@
 #import "QiangShangjiVC.h"
 #import "ShangjiViewController.h"
 #import "CustomMyPickerView.h"
+#import "QiangShangjiVC.h"
 
 static NSString *cellID = @"cellID";
 
@@ -138,7 +139,7 @@ static NSString *cellID = @"cellID";
     
     _headerTitle = @[@"商机看板",@"商机转换率排行",@"最新销售记录",@"超时未跟进商机"];
     _headerDTitle = @[self.dateStr,@"查看全部",@"查看全部",@"查看全部"];
-    _mainButton = @[@"我的商机",@"公共商机",@"商机漏斗"];
+    _mainButton = @[@"我的商机",@"商机漏斗",@"抢占商机",@"分配商机"];
 
     f.dateFormat = @"yyyy-MM-dd HH:mm";
     NSString *currentTime = [NSString stringWithFormat:@"%@",[f stringFromDate:[NSDate date]]];
@@ -571,19 +572,29 @@ static NSString *cellID = @"cellID";
             [self.navigationController pushViewController:vc animated:YES];
         
             break;}
-        case 1://公司商机库
+        case 1://销售漏斗
         {
-            CompanyNicheVC *vc = [CompanyNicheVC new];
-            [self.navigationController pushViewController:vc animated:YES];
-            
+//            CompanyNicheVC *vc = [CompanyNicheVC new];
+//            [self.navigationController pushViewController:vc animated:YES];
+            [self pushWhichFunnelFromServerData];
             break;}
         
-        case 2://销售漏斗
+        case 2://抢占商机
         {
-            [self pushWhichFunnelFromServerData];
+            QiangShangjiVC *qiangShangVC = [QiangShangjiVC new];
+            qiangShangVC.headerTitle = Localized(@"UU_work_CRM_raceBusinessOpportunity");
+            [self.navigationController pushViewController:qiangShangVC animated:YES];
             break;}
+        case 3://分配商机
+        {
+            QiangShangjiVC *shangJiFenVC = [QiangShangjiVC new];
+            shangJiFenVC.headerTitle = Localized(@"UU_work_CRM_assignBusinessOpportunity");
+            [self.navigationController pushViewController:shangJiFenVC animated:YES];
+            break;}
+            
         default:
             break;
+        
     }
 }