فهرست منبع

修复 categoryviewcontroller 选中时,category id 逻辑混乱的问题。
Homer 和 gatit 去掉 店铺登陆的价格设置菜单

Ray Zhang 8 سال پیش
والد
کامیت
ce91afad27

+ 7 - 7
RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -106,7 +106,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "537775682.168537"
+            timestampString = "537777448.287532"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "719"
@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/DetailViewController.m"
-            timestampString = "537775682.168614"
+            timestampString = "537777448.287652"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "759"
@@ -138,7 +138,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategorySearchFilterViewController.m"
-            timestampString = "537775682.1686881"
+            timestampString = "537777448.287726"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "56"
@@ -154,7 +154,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/MainViewController.m"
-            timestampString = "537775682.1687419"
+            timestampString = "537777448.287804"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "101"
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/category/CategoryViewController.m"
-            timestampString = "537775682.168799"
+            timestampString = "537777448.287877"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "2224"
-            endingLineNumber = "2224"
+            startingLineNumber = "2225"
+            endingLineNumber = "2225"
             landmarkName = "-collectionView:didSelectItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>

+ 5 - 5
RedAnt ERP Mobile/common/Functions/MainViewController.m

@@ -1758,11 +1758,11 @@
         
     }
  */
-    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
-        [map setValue:@"Price Setting" forKey:@"title"];
-        //        [map setValue:@"rect_market_news" forKey:@"img"];
-        [self.sideMenuItems addObject:map.copy];
-    }
+//    if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
+//        [map setValue:@"Price Setting" forKey:@"title"];
+//        //        [map setValue:@"rect_market_news" forKey:@"img"];
+//        [self.sideMenuItems addObject:map.copy];
+//    }
     if (appDelegate.user && appDelegate.user_type == USER_ROLE_CUSTOMER) {
         if ([Singleton sharedInstance].global_lock) {
             [map setValue:@"Unlock" forKey:@"title"];

+ 3 - 3
RedAnt ERP Mobile/common/Functions/category/CategoryViewController.m

@@ -2221,7 +2221,7 @@
     else
     {
         NSString* detail_id= [NSString stringWithFormat:@"%@",   [item valueForKey:@"product_id"] ] ;
-        NSString *item_category_id = [item valueForKey:@"item_category_id"];
+//        NSString *item_category_id = [item valueForKey:@"item_category_id"];
 //#ifndef BUILD_NPD
 //        item_category_id = self.categoryid;
 //#endif
@@ -2233,8 +2233,8 @@
 //#endif
 
         
-        item_category_id = self.categoryid;
-        [self showDetailat:detail_id category_id:item_category_id name:[item valueForKey:@"name"] index:indexPath.row];
+//        item_category_id = self.categoryid;
+        [self showDetailat:detail_id category_id:self.categoryid name:[item valueForKey:@"name"] index:indexPath.row];
        
     }