三十期内容

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -69,8 +69,8 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// 身份认证
-	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http',
-		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http) {
+	app.controller('AuthenticationCtrl', ['$scope', '$window', 'AuthenticationService', '$rootScope', 'SessionService', 'collectionService', '$modal', 'toaster','$q', 'Cart', '$http', 'InternalMessage',
+		function($scope, $window, AuthenticationService, $rootScope, SessionService, collectionService, $modal, toaster, $q, Cart, $http, InternalMessage) {
 			$scope.user = {
 				j_username : "",
 				j_password : "",
@@ -238,11 +238,6 @@ define([ 'app/app' ], function(app) {
                 // 跳转账户中心
                 AuthenticationService.redirectRegister();
             };
-
-            //安全中心:
-
-
-
 		}]);
 
 	// 登录模态框
@@ -1662,10 +1657,10 @@ define([ 'app/app' ], function(app) {
 				toaster.pop('info', '提示', '请选择付款日期');
 				return ;
 			}
-			if(!$scope.image.src) {
-				toaster.pop('info', '提示', '请选择付款截图');
-				return ;
-			}
+			// if(!$scope.image.src) {
+			// 	toaster.pop('info', '提示', '请选择付款截图');
+			// 	return ;
+			// }
 			var buyAccount = angular.copy($scope.buyAccount);
 			var saleAccount = angular.copy($scope.saleAccount);
 			delete saleAccount.filterAccount;

src/main/webapp/resources/js/usercenter/controllers/forstore/buyer_transfer_ctrl.js

@@ -676,10 +676,14 @@ define([ 'app/app' ], function(app) {
 				}
 				return ;
 			}
-			if(!str || str == ''){
-				toaster.pop('info', '提示', '请选择付款截图');
-				return ;
-			}
+
+			/**
+			 * 上传水单选填非必填
+			 * */
+			// if(!str || str == ''){
+			// 	toaster.pop('info', '提示', '请选择付款截图');
+			// 	return ;
+			// }
 
 			if ($scope.type == "PAIDTOVENDOR") {
 				var firstItem = {};

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

@@ -14,11 +14,11 @@ define([ 'app/app' ], function(app) {
         // 更多操作数据和记录
         $scope.handleLink = [
             {name: '查看入库记录', tab: 'inBound', id: 0},
-            {name: '其它入库', tab: 'inBound', id: 1},
             {name: '采购入库', tab: 'inBound', id: 2},
+            {name: '其它入库', tab: 'inBound', id: 1},
             {name: '查看出库记录', tab: 'outBound', id: 0},
-            {name: '其它出库', tab: 'outBound', id: 1},
-            {name: '销售出库', tab: 'outBound', id: 2}];
+            {name: '销售出库', tab: 'outBound', id: 2},
+            {name: '其它出库', tab: 'outBound', id: 1}];
         $scope.handleItem = $stateParams.storage_tab ? 1 : ($scope.storage_tab === 'inBound'? $scope.handleLink[0].id : $scope.handleLink[3].id);
 
         // 销售方式数据

src/main/webapp/resources/view/common/site-nav.html

@@ -219,6 +219,7 @@
         <li ng-if="userInfo && !userInfo.enterprise" ><a href="./personalMaterial">卖家中心</a></li>
         <li ng-if="userInfo && userInfo.enterprise && userInfo.enterprise.isVendor != 313" ><a href="./register-saler">卖家中心</a></li>
         <li ng-if="userInfo" ><a href="sso#/index">帐户中心</a></li>
+        <li ng-if="userInfo.enterprise && userInfo.enterprise.isVendor == 313"><a href="user#/messagePersonal">消息 ({{unReadMessCount ? (unReadMessCount < 100 ? unReadMessCount : '99+') : 0}})</a></li>
         <li><a href="help/home" target="_blank">帮助中心</a></li>
         <!-- <li><a href="http://wpa.qq.com/msgrd?v=3&uin=3432892085&site=www.ubtoc.com&menu=yes" target="_blank">在线客服</a></li> -->
        <!-- <li><a href="javascript:void(0)">服务电话:400-830-1818</a></li>-->

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>-->

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1188,7 +1188,7 @@
 									</div>
 									<div ng-if="material.goods" ng-bind="(storeInfo.uuid != 'undefind' && material.goods.storeid == storeInfo.uuid && storeInfo.storeName.indexOf('优软测试二') < 0 && storeInfo.storeName.indexOf('优软商城') < 0) ? '自营': '寄售'">自营</div>
 									<div>{{material.goods.breakUp ? '可拆卖' : '不可拆卖'}}</div>
-									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '已下架' }}</div>
+									<div>{{material.goods.status === 601 || material.goods.status === 602 ? '已上架' : '未上架' }}</div>
 								</td>
 								<td class="edit">
 									<div style="text-align: center">