@@ -288,7 +288,7 @@
if(self.edit_icon)
[items addObject:self.btn_edit];
- if (appDelegate.user_type == USER_ROLE_CUSTOMER && appDelegate.order_code.length > 0 && ![Singleton sharedInstance].currentOrderIsMerged) {
+ if ((appDelegate.user_type == USER_ROLE_CUSTOMER && appDelegate.customer_type == CustomerTypeStore) && appDelegate.order_code.length > 0 && ![Singleton sharedInstance].currentOrderIsMerged) {
// shop order 隐藏assign
} else {
if(self.assig_icon)