Merge remote-tracking branch 'origin/feature-201815-liusw' into feature-201815-liusw

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductServiceImpl.java

@@ -2107,6 +2107,11 @@ public class ProductServiceImpl implements ProductService {
                 ProductPrivate productPrivate = privates.get(0);
                 productPrivate.setAttach(component.getAttach());
                 productPrivateDao.save(productPrivate);
+            } else {
+                ProductPrivate productPrivate = new ProductPrivate();
+                productPrivate.setAttach(component.getAttach());
+                productPrivate.setPrId(product.getId());
+                productPrivateDao.save(productPrivate);
             }
         }
         Product product1 = productDao.save(product);
@@ -2137,6 +2142,11 @@ public class ProductServiceImpl implements ProductService {
                             ProductPrivate productPrivate = productPrivates.get(0);
                             productPrivate.setAttach(component.getAttach());
                             productPrivatelist.add(productPrivate);
+                        } else {
+                            ProductPrivate productPrivate = new ProductPrivate();
+                            productPrivate.setAttach(component.getAttach());
+                            productPrivate.setPrId(product.getId());
+                            productPrivatelist.add(productPrivate);
                         }
                     }
 

src/main/webapp/resources/view/usercenter/left_nav.html

@@ -67,7 +67,7 @@
                 <!--<li ng-class="{'active' : active == 'after_sale'}" class="undo">-->
                     <!--<a  ui-sref="after_sale">申请售后</a>-->
                 <!--</li>-->
-                <li ng-class="{'active' : active == 'account_manager'}"><a  ui-sref="account_manager">账户管理</a></li>
+                <!--<li ng-class="{'active' : active == 'account_manager'}"><a  ui-sref="account_manager">账户管理</a></li>-->
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -113,6 +113,6 @@
 
 
 		<!--</div>-->
-		<li ng-class="{'active' : active == 'vendor_account_management'}"><span  ui-sref="vendor_account_management">账户管理</span></li>
+		<!--<li ng-class="{'active' : active == 'vendor_account_management'}"><span  ui-sref="vendor_account_management">账户管理</span></li>-->
 	</ul>
 </div>