Merge remote-tracking branch 'origin/release-201827-wangcz' into release-201827-wangcz

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_storageCtrl.js

@@ -118,7 +118,7 @@ define([ 'app/app' ], function(app) {
                 enName: '',
                 detail: []
             }
-            $scope.newDate = _formatDate(new Date(), 'yyyy-MM-dd hh-mm-ss')
+            $scope.newDate = _formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss')
             $scope.otherData = [];
             if($stateParams.ids){
                 Goods.findAllProduct({ids: $stateParams.ids}, function(data) {

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

@@ -41,7 +41,7 @@
                     <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
                     <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
                     <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
-                    <li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="personage && !isPcbStore"><a  ui-sref="vendor_upload">产品导入</a></li>
+                    <!--<li ng-class="{'active' : active == 'vendor_productOn'}" ng-if="personage && !isPcbStore"><a  ui-sref="vendor_upload">产品导入</a></li>-->
                 </div>
                 <!--<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion &&  userInfo.emailValidCode && userInfo.emailValidCode == 2)">-->
                     <!--<li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>-->