Merge remote-tracking branch 'origin/feature-201817-wangcz' into feature-201817-wangcz

src/main/java/com/uas/platform/b2c/prod/store/controller/StoreApplyController.java

@@ -165,6 +165,21 @@ public class StoreApplyController {
 		return storeApplyService.pageStoreApplications(pageInfo, status, type, keyword);
 	}
 
+	/**
+	 * 分页获取店铺审核信息
+	 *
+	 * @param params		分页参数
+	 * @param status		店铺审核状态
+	 * @param type			店铺类型
+	 * @param keyword		搜索关键字，审核人
+	 */
+	@RequestMapping(value = "/applications", method = RequestMethod.GET, params = "operate=authorPage")
+	public Page<StoreApply> pageStoreApplicationsByAuth(PageParams params, @RequestParam(value = "status", required = false) StoreApply.ApplyStatus status, @RequestParam(value = "type", required = false) StoreType type, @RequestParam(value = "keyword", required = false) String keyword) {
+		logger.info("Page store information");
+		PageInfo pageInfo = new PageInfo(params);
+		return storeApplyService.pageStoreApplicationsByAuthor(pageInfo, status, type, keyword);
+	}
+
 	/**
 	 * 获取当前店铺的待处理和已通过申请信息，应当有且只有一条记录
 	 */

src/main/java/com/uas/platform/b2c/prod/store/service/StoreApplyService.java

@@ -67,6 +67,15 @@ public interface StoreApplyService {
 	 */
 	Page<StoreApply> pageStoreApplications(PageInfo pageInfo, StoreApply.ApplyStatus status, StoreType type, String keyword);
 
+	/**
+	 * 分页获取待审核店铺信息
+	 *  @param pageInfo    	分页信息
+	 * @param status    	查询的店铺申请状态
+	 * @param type			店铺类型
+	 * @param keyword		搜索关键字
+	 */
+	Page<StoreApply> pageStoreApplicationsByAuthor(PageInfo pageInfo, StoreApply.ApplyStatus status, StoreType type, String keyword);
+
 	/**
 	 * 获取当前店铺的待处理和已通过申请信息，应当有且只有一条记录
 	 */

src/main/java/com/uas/platform/b2c/prod/store/service/impl/StoreApplyServiceImpl.java

@@ -28,6 +28,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
@@ -239,6 +240,28 @@ public class StoreApplyServiceImpl implements StoreApplyService {
 		}, pageInfo);
 	}
 
+	public Page<StoreApply> pageStoreApplicationsByAuthor(final PageInfo pageInfo, StoreApply.ApplyStatus status, StoreType type, String keyword) {
+		if (status != null) {
+			SimpleExpression expression = new SimpleExpression("status", status, CriterionExpression.Operator.EQ);
+			pageInfo.expression(expression);
+		}
+		if (type != null) {
+			SimpleExpression expression = new SimpleExpression("type", type, CriterionExpression.Operator.EQ);
+			pageInfo.expression(expression);
+		}
+		if (StringUtils.hasText(keyword)) {
+			SimpleExpression expression = new SimpleExpression("authPerson", keyword, CriterionExpression.Operator.LIKE);
+			pageInfo.expression(expression);
+		}
+		return storeApplyDao.findAll(new Specification<StoreApply>() {
+			@Override
+			public Predicate toPredicate(Root<StoreApply> root, CriteriaQuery<?> query, CriteriaBuilder builder) {
+				query.where(pageInfo.getPredicates(root, query, builder));
+				return null;
+			}
+		}, pageInfo);
+	}
+
 	@Override
 	public ResultMap findShopOwnerApplyByNormalStatus() {
 		User user = SystemSession.getUser();

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -52,6 +52,32 @@
 			<li class="nav-node"><a href="#trade/record_chart"><i
 					class="fa fa-th"></i><span> 交易记录表</span></a></li>
 
+			<li class="nav-header">财务结算中心</li>
+			<li class="nav-node"><a href="#check/check_vender"><i
+					class="fa fa-user"></i><span> 付款申请</span></a></li>
+			<li class="nav-node"><a href="#check/settlement"><i
+					class="fa fa-calculator"></i><span> 财务结算</span></a></li>
+			<li class="nav-node"><a href="#check/histTransfer"><i
+					class="fa fa-filter"></i><span> 历史转账查询</span></a></li>
+			<li class="nav-node"><a href="#check/accountQuery"><i
+					class="fa fa-fire"></i><span> 账户查询</span></a></li>
+			<li class="nav-node"><a href="#check/refund"><i
+					class="fa fa-fire"></i><span> 退款单管理</span></a></li>
+			<li class="nav-node"><a href="#order/bill/admin"><i
+					class="fa fa-fire"></i><span> 客户订单发票管理</span></a></li>
+			<li class="nav-node"><a href="#purchase/bill/admin"><i
+					class="fa fa-fire"></i><span> 平台采购单发票管理</span></a></li>
+			<li class="nav-node"><a href="#check/credit"><i
+					class="fa fa-fire"></i><span> 银行账户信息管理</span></a></li>
+			<li class="nav-node"><a href="#billInfo/admin"><i
+					class="fa fa-fire"></i><span> 平台发票信息管理</span></a></li>
+			<li class="nav-node"><a href="#pay/available"><i
+					class="fa fa-fire"></i><span> 买家付款有效时间</span></a></li>
+			<li class="nav-node"><a href="#pay/exchangerate"><i
+					class="fa fa-fire"></i><span> 汇率设置</span></a></li>
+			<li class="nav-node"><a href="#fa/loanApply"><i
+					class="fa fa-fire"></i><span> 贷款申请列表</span></a></li>
+
 			<li class="nav-header">售后服务管理</li>
 			<li class="nav-node"><a href="#trade/buyerExProcess"><i
 					class="fa fa-home"></i><span> 买家异常处理</span></a></li>
@@ -106,31 +132,6 @@
 			<li class="nav-node"><a href="#buyer/automaticReceiving"><i
 					class="fa fa-fire"></i><span>买家自动收货的时间</span></a></li>
 
-			<li class="nav-header">财务结算中心</li>
-			<li class="nav-node"><a href="#check/check_vender"><i
-					class="fa fa-user"></i><span> 付款申请</span></a></li>
-			<li class="nav-node"><a href="#check/settlement"><i
-					class="fa fa-calculator"></i><span> 财务结算</span></a></li>
-			<li class="nav-node"><a href="#check/histTransfer"><i
-					class="fa fa-filter"></i><span> 历史转账查询</span></a></li>
-			<li class="nav-node"><a href="#check/accountQuery"><i
-					class="fa fa-fire"></i><span> 账户查询</span></a></li>
-			<li class="nav-node"><a href="#check/refund"><i
-					class="fa fa-fire"></i><span> 退款单管理</span></a></li>
-			<li class="nav-node"><a href="#order/bill/admin"><i
-					class="fa fa-fire"></i><span> 客户订单发票管理</span></a></li>
-			<li class="nav-node"><a href="#purchase/bill/admin"><i
-					class="fa fa-fire"></i><span> 平台采购单发票管理</span></a></li>
-			<li class="nav-node"><a href="#check/credit"><i
-					class="fa fa-fire"></i><span> 银行账户信息管理</span></a></li>
-			<li class="nav-node"><a href="#billInfo/admin"><i
-					class="fa fa-fire"></i><span> 平台发票信息管理</span></a></li>
-			<li class="nav-node"><a href="#pay/available"><i
-					class="fa fa-fire"></i><span> 买家付款有效时间</span></a></li>
-			<li class="nav-node"><a href="#pay/exchangerate"><i
-					class="fa fa-fire"></i><span> 汇率设置</span></a></li>
-			<li class="nav-node"><a href="#fa/loanApply"><i
-					class="fa fa-fire"></i><span> 贷款申请列表</span></a></li>
 
 			<li class="nav-header">审批</li>
 			<li class="nav-node"><a href="#audit/brand"><i
@@ -246,6 +247,43 @@
 				<li><a class="muted">基础</a></li>
 				<li><a>快照</a></li>
 			</ul>
+			<!--消息-->
+			<div class="msg" style="display: none;">
+				<span class="message">待处理 <i class="fa fa-angle-double-down angle-hover-up"></i><span class="red-dot">99</span></span>
+				<div class="msg-show">
+					<table>
+						<thead>
+						<tr>
+							<th width="250" class="choose-type">
+								<span class="all-type dropdown-toggle">全部类型 <i class="fa fa-angle-double-down angle-hover-up"></i></span>
+								<ul class="dropdown-menu">
+									<li><a>确认收款</a></li>
+									<li><a>付款申请</a></li>
+									<li><a>财务结算</a></li>
+								</ul>
+							</th>
+							<th width="500"><b></b>任务描述</th>
+							<th width="400"><b></b>发起人</th>
+							<th width="auto"><b></b>发起时间</th>
+						</tr>
+						</thead>
+						<tbody>
+						<tr>
+							<td><span>确认收款</span></td>
+							<td><span>订单 <a href="">SS2018070500000035</a> 买家已付款成功，请确认是否收款成功！</span></td>
+							<td><span>深圳市华商龙科技商龙科技商龙科技有限公司（采购商名称）</span></td>
+							<td><span>2018/07/01  08:32:57</span></td>
+						</tr>
+						<tr>
+							<td><span>确认收款</span></td>
+							<td><span>订单 <a href="">SS2018070500000035</a> 买家已付款成功，请确认是否收款成功！</span></td>
+							<td><span>深圳市华商龙科技商龙科技商龙科技有限公司深圳市华商龙科技商龙科技商龙科技有限公司深圳市华商龙科技商龙科技商龙科技有限公司（采购商名称）</span></td>
+							<td><span>2018/07/01  08:32:57</span></td>
+						</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
 			<div ui-view></div>
 		</div>
 	</div>

src/main/webapp/resources/css/admin.css

@@ -57,8 +57,116 @@ select {
 
 .main-container {
 	min-width: 720px;
+	overflow: hidden;
 }
 
+.main-container .msg{
+	position: relative;
+}
+.main-container .message{
+	position: absolute;
+	top: -46px;
+	right: 45px;
+	width: 78px;
+	height: 26px;
+	line-height: 26px;
+	text-align: center;
+	font-size: 12px;
+	color: #fff;
+	background-color: #31a5e7;
+	border-radius: 4px;
+	cursor: pointer;
+}
+.main-container .message .red-dot {
+	position: absolute;
+	top: -2px;
+	right: -8px;
+	width: 18px;
+	height: 18px;
+	line-height: 18px;
+	font-size: 12px;
+	color: #fff;
+	border-radius: 50%;
+	background: #f00;
+}
+.main-container .message:hover .angle-hover-up{
+	-webkit-transform: rotateZ(180deg);
+	-moz-transform: rotateZ(180deg);
+	-o-transform: rotateZ(180deg);
+	-ms-transform: rotateZ(180deg);
+	transform: rotateZ(180deg);
+}
+.main-container .msg-show{
+	position: absolute;
+	top: -20px;
+	right: 42px;
+	z-index: 1000;
+	background-color: #ffffff;
+	border-radius: 4px;
+	border: solid 1px #31a5e7;
+}
+.main-container .msg-show table{
+	width: 1350px;
+	table-layout: fixed;
+}
+.main-container .msg-show table thead{
+	width: 100%;
+	height: 45px;
+	background-color: rgba(49, 165, 231, 0.1);
+	border-radius: 4px;
+}
+.main-container .msg-show table tr th{
+	height: 45px;
+}
+.main-container .msg-show table tr th,.main-container .msg-show table tr td{
+	vertical-align: middle;
+	font-weight: normal;
+	position:relative;
+	text-align: center;
+}
+.main-container .msg-show table tr th b{
+	position: absolute;
+	top: 13px;
+	left: 0;
+	width: 1px;
+	height: 20px;
+	border: solid 1px #bfbfbf;
+}
+.main-container .msg-show table tr th.choose-type .all-type {
+	cursor: pointer;
+}
+.main-container .msg-show table tr th.choose-type .dropdown-menu{
+	position: absolute;
+	top: 30px;
+	left: 45px;
+	z-index: 1000;
+	display: none;
+	float: left;
+	font-size: 14px;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,0.175);
+	box-shadow: 0 6px 12px rgba(0,0,0,0.175);
+	-webkit-background-clip: padding-box;
+	background-clip: padding-box;
+	width: 100px;
+	height: 78px;
+	background-color: #ffffff;
+	border: solid 1px #d2d2d2;
+}
+.main-container .msg-show table tr th.choose-type .dropdown-menu li{
+	width: 100%;
+	height: 25px;
+	line-height: 25px;
+	text-align: center;
+	font-size: 14px;
+	color: #333;
+}
+.main-container .msg-show table tbody tr{
+	border-bottom: 1px solid #dcdcdc;
+}
+.main-container .msg-show table tbody tr td{
+	padding: 10px 0;
+}
 .top-block {
 	font-size: 14px;
 	font-family: "Microsoft YaHei";

src/main/webapp/resources/js/admin/controllers/StoreApplicationCtrl.js

@@ -46,6 +46,14 @@ define([ 'app/app' ], function(app) {
 		// 保存查询店铺类型的状态
 		$scope.type = 'ALL_TYPE';
 
+		// 保存店铺搜索类型
+		$scope.search = 'STORE_NAME';
+
+		// 保存店铺搜索类型所传参数
+        $scope.searchParams = 'authPage';
+
+        $scope.showSearch = false
+
 		/**
 		 * 切换Tab
 		 *
@@ -66,6 +74,29 @@ define([ 'app/app' ], function(app) {
 		};
 
 
+        $scope.isShowSearch = function (flag) {
+            $scope.showSearch = flag
+		};
+        /**
+         * 切换搜索类型
+         *
+         * @param type	店铺类型
+		 *
+         */
+        $scope.placeValue = $scope.search === 'STORE_NAME' ? '请输入公司名称' : '请输入审核人姓名';
+
+        $scope.switchSearch = function (type, flag) {
+			if (type === 'STORE_NAME') {
+                $scope.search = 'STORE_NAME';
+                $scope.searchParams = 'authPage';
+			}
+            if (type === 'AUDITOR') {
+                $scope.search = 'AUDITOR';
+                $scope.searchParams = 'authorPage';
+            }
+            $scope.showSearch = flag
+            $scope.placeValue = $scope.search === 'STORE_NAME' ? '请输入公司名称' : '请输入审核人姓名';
+        };
 
 		$scope.applicationTableParams = new ngTableParams($scope.ngPageInfo, {
 			total : 0,
@@ -76,6 +107,7 @@ define([ 'app/app' ], function(app) {
 				param.status = $scope.status === 'ALL' ? null : $scope.status;
 				param.type = $scope.type === 'ALL_TYPE' ? null : $scope.type;
 				param.keyword = $scope.keyword && $scope.keyword !== '' ? $scope.keyword : null;
+				param.operate = $scope.searchParams;
 				StoreInfo.pageStoreApplications(param, function (data) {
 					console.log(data);
 					params.total(data.totalElements);

src/main/webapp/resources/js/admin/controllers/trade/TradeOrderDetailCtrl.js

@@ -21,7 +21,7 @@ define([ 'app/app' ], function(app) {
 				if(lgtid){
 					getLogistics();
 				}
-				
+
 				//控制流程状态样式
 				var scheduleStyle = function(){ 
 					var statusAttr =['501', '503', '504', '406', '403', '407', '408', '404', '405'];
@@ -182,5 +182,21 @@ define([ 'app/app' ], function(app) {
 			};
 		};
 		loadData();
+        //确认付款
+        $scope.ensurePay = function(order){
+            Order.ensurePay({orderid: order.orderid}, {}, function(data){
+                toaster.pop('success', '处理成功', '【' + data.orderid + '】' + '确认付款');
+                loadData()
+            }, function(response){
+                toaster.pop('error', '确认付款失败', response.data);
+            })
+        };
+        /**
+         * 当用户点击审核不通过时，弹出模态框
+         * @param order
+         */
+        $scope.showAuditFailureModal = function (order) {
+            order.dislayModal = true;
+        }
 	}]);
 });

src/main/webapp/resources/js/common/query/storeInfo.js

@@ -55,14 +55,11 @@ define([ 'ngResource' ], function() {
 			 * @param params		分页参数
 			 * @param status		店铺审核状态
 			 * @param type			店铺类型
-			 * @param keyword		搜索关键字，主要是公司名称
+			 * @param keyword		搜索关键字，主要是公司名称  或 审核人
 			 */
 			pageStoreApplications: {
             	url: 'store-service/applications',
-				method: 'GET',
-				params: {
-            		operate: 'authPage'
-				}
+				method: 'GET'
 			},
 			/**
 			 * 保存店铺申请信息

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

@@ -167,6 +167,7 @@ define(['app/app'], function (app) {
 				}
                 $scope.isSearch = false;
 				$scope.currenctOrders = data.content;
+        $scope.currenctOrdersList = data
 				angular.forEach($scope.currenctOrders, function(data){
                     data.ensurePrice = Number(NumberService.toCeil(data.ensurePrice, 2));
 					Rate.getRateBuyer({orderId:data.orderid},{},function (result) {

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

@@ -46,8 +46,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
               $scope.vendorType = 'all'
                 $scope.tab = tab;
               $scope.seekPurchaseTableParams = new ngTableParams({
-                pageNumber: 1,
-                pageSize: 10
+                page: 1,
+                count: 5
               }, {
                 total: 0,
                 getData: function ($defer, params) {
@@ -90,7 +90,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                         //     }
                         // }
                       $scope.seekListData = data;
-
+                      console.log($scope.seekListData)
                     }).error(function (response) {
                       toaster.pop('error', response);
                     });
@@ -157,11 +157,14 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $scope.bomSearch = {};
           $scope.bomTableParams = new ngTableParams({
             pageNumber: 1,
-            pageSize: 20
+            pageSize: 10,
+            page: 1,
+            count: 10
           }, {
             total: 0,
             getData: function ($defer, params) {
                 var param = BaseService.parseParams(params.url());
+                param.pageNumber = param.page
               if ($scope.userInfo.enterprise) {
                 param.enUU = $scope.userInfo.enterprise.uu;
               } else {
@@ -182,6 +185,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 params.total(data.totalElements);
                 $scope.bomTotal = data.totalElements;
                 $defer.resolve(data.content);
+                $scope.bomDataList = data
               }).error(function (response) {
                 toaster.pop('error', response);
               });

src/main/webapp/resources/js/vendor/controllers/cusPurchaseCtrl.js

@@ -172,6 +172,7 @@ define(['app/app'], function(app) {
 							$scope.counts = {};
 						}
 						$scope.purchases = page.content;
+
 						getExMsgState(); // 获取异常消息状态
 						getReturnByPurchaseIds(); // 获取退货单信息
 

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

@@ -5,6 +5,7 @@ define(['app/app'], function (app) {
         function ($scope, $location, $rootScope, $stateParams, $state, toaster,
            $modal, $http, Attendtion, ngTableParams, BaseService, toaster) {
           document.title = '商机关注-优软商城';
+          $rootScope.active = 'vendor_seek_purchase';
           $scope.keyWord = ''
           $scope.isSearch = false
           $scope.type = 'yes'

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

@@ -1,8 +1,9 @@
 define([ 'app/app' ], function(app) {
     // 器件审批
-    app.register.controller('vendorComponentApplyListCtrl', ['$scope', 'ngTableParams', 'ComponentsSubmit', 'BaseService', '$stateParams', 'AuthenticationService', 'toaster', function($scope, ngTableParams, ComponentsSubmit, BaseService, $stateParams, AuthenticationService, toaster) {
+    app.register.controller('vendorComponentApplyListCtrl', ['$scope', 'ngTableParams', 'ComponentsSubmit', 'BaseService', '$stateParams', 'AuthenticationService', 'toaster', '$rootScope', function($scope, ngTableParams, ComponentsSubmit, BaseService, $stateParams, AuthenticationService, toaster, $rootScope) {
         BaseService.scrollBackToTop();
         document.title = '器件申请-优软商城';
+        $rootScope.active = 'vendor_component_apply'
         var loadMyComponentsSubmit = function(){
             $scope.componentTableParams = new ngTableParams({
                 page : 1,

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

@@ -1,10 +1,10 @@
 define([ 'app/app' ], function(app) {
     // 器件审批
-    app.register.controller('vendorComponentBatchApplyListCtrl', ['$scope', 'ngTableParams', 'BaseService', 'ComponentSubmit', 'toaster', function($scope, ngTableParams, BaseService, ComponentSubmit, toaster) {
+    app.register.controller('vendorComponentBatchApplyListCtrl', ['$scope', 'ngTableParams', 'BaseService', 'ComponentSubmit', 'toaster', '$rootScope', function($scope, ngTableParams, BaseService, ComponentSubmit, toaster, $rootScope) {
         BaseService.scrollBackToTop();
         document.title = '器件申请-优软商城';
         $scope.active = 'all';
-
+        $rootScope.active = 'vendor_component_apply'
         $scope.setActive = function(result) {
             $scope.active = result;
             console.log($scope.active);
@@ -44,6 +44,7 @@ define([ 'app/app' ], function(app) {
                 ComponentSubmit[getStatus()].call(null, param, function(page) {
                     if (page) {
                         params.total(page.totalElements);
+                        $scope.allLength = page.totalElements
                         $defer.resolve(page.content);
                     }
                 }, function(err){

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

@@ -586,6 +586,7 @@ define(['app/app'], function (app) {
                         }
 
                         $scope.purchases = page.content;
+                        $scope.currenctOrdersList = page
                         angular.forEach($scope.purchases, function (data) {
                             if (data.installmentId && data.installment.status == 504) {
                                 angular.forEach(data.installment.installmentDetails, function (list) {

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

@@ -264,6 +264,11 @@ define([ 'app/app' ], function(app) {
                 }else{
                     $scope.goodsAll.start = 0 ;
                 }
+                if ($scope.param.currentPage === data.totalPages) {
+                    $scope.endNumber = data.totalElements;
+                } else {
+                    $scope.endNumber = data.number * data.size;
+                }
                 $scope.param.currentPage = data.number;
                 $scope.acculatePages(data.number, data.totalPages);
                 // 获取币别信息

src/main/webapp/resources/lib/angular/ng-table.js

@@ -726,6 +726,9 @@
              * @returns {Object|Number} Current page or `this`
              */
             this.page = function(page) {
+                if (page) {
+                  this.redirectPage = page
+                }
                 return angular.isDefined(page) ? this.parameters({
                     'page': page
                 }) : params.page;
@@ -1121,6 +1124,8 @@
                 });
             };
 
+
+            this.redirectPage = 1 // init redirectPge for 1
             /**
              * @ngdoc method
              * @name NgTableParams#hasErrorState
@@ -2291,7 +2296,7 @@ angular.module('ngTable').run(['$templateCache', function ($templateCache) {
 	$templateCache.put('ng-table/filters/text.html', '<input type="text" name="{{name}}" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" class="input-filter form-control" placeholder="{{getFilterPlaceholderValue(filter, name)}}"/> ');
 	$templateCache.put('ng-table/groupRow.html', '<tr ng-if="params.hasGroup()" ng-show="$groupRow.show" class="ng-table-group-header"> <th colspan="{{getVisibleColumns().length}}" class="sortable" ng-class="{ \'sort-asc\': params.hasGroup($selGroup, \'asc\'), \'sort-desc\':params.hasGroup($selGroup, \'desc\') }"> <a href="" ng-click="isSelectorOpen=!isSelectorOpen" class="ng-table-group-selector"> <strong class="sort-indicator">{{$selGroupTitle}}</strong> <button class="btn btn-default btn-xs ng-table-group-close" ng-click="$groupRow.show=false; $event.preventDefault(); $event.stopPropagation();"> <span class="glyphicon glyphicon-remove"></span> </button> <button class="btn btn-default btn-xs ng-table-group-toggle" ng-click="toggleDetail(); $event.preventDefault(); $event.stopPropagation();"> <span class="glyphicon" ng-class="{ \'glyphicon-resize-small\': params.settings().groupOptions.isExpanded, \'glyphicon-resize-full\': !params.settings().groupOptions.isExpanded }"></span> </button> </a> <div class="list-group" ng-if="isSelectorOpen"> <a href="" class="list-group-item" ng-repeat="group in getGroupables()" ng-click="groupBy(group)"> <strong>{{ getGroupTitle(group)}}</strong> <strong ng-class="isSelectedGroup(group) && \'sort-indicator\'"></strong> </a> </div> </th> </tr> ');
 	$templateCache.put('ng-table/header.html', '<ng-table-group-row></ng-table-group-row> <ng-table-sorter-row></ng-table-sorter-row> <ng-table-filter-row></ng-table-filter-row> ');
-	$templateCache.put('ng-table/pager.html', '<div class="ng-cloak ng-table-pager" ng-if="params.data.length"> <ul ng-if="pages.length" class="pagination ng-table-pagination" style="float:right;margin-left:20px;"><li><input type="text" class="page-number" ng-model="page.redirectPage"></li><li><a href="" class="page-a" ng-click="params.page(page.redirectPage)">GO</a></li></ul> <ul ng-if="pages.length" class="pagination ng-table-pagination" style="float: right;"> <li ng-class="{\'disabled\': !page.active && !page.current, \'active\': page.current}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">&laquo;</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">&raquo;</a> </li> </ul> </div> ');
+	$templateCache.put('ng-table/pager.html', '<div class="ng-cloak ng-table-pager" ng-if="params.data.length"> <ul ng-if="pages.length" class="pagination ng-table-pagination" style="float:right;margin-left:20px;"><li><input type="text" class="page-number" ng-model="params.redirectPage"></li><li><a href="" class="page-a" ng-click="params.page(params.redirectPage)">GO</a></li></ul> <ul ng-if="pages.length" class="pagination ng-table-pagination" style="float: right;"> <li ng-class="{\'disabled\': !page.active && !page.current, \'active\': page.current}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">&laquo;</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">&raquo;</a> </li> </ul> </div> ');
 	$templateCache.put('ng-table/sorterRow.html', '<tr class="ng-table-sort-header"> <th title="{{$column.headerTitle(this)}}" ng-repeat="$column in $columns" ng-class="{ \'sortable\': $column.sortable(this), \'sort-asc\': params.sorting()[$column.sortable(this)]==\'asc\', \'sort-desc\': params.sorting()[$column.sortable(this)]==\'desc\' }" ng-click="sortBy($column, $event)" ng-if="$column.show(this)" ng-init="template=$column.headerTemplateURL(this)" class="header {{$column.class(this)}}"> <div ng-if="!template" class="ng-table-header" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'div\'}"> <span ng-bind="$column.title(this)" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'span\'}"></span> </div> <div ng-if="template" ng-include="template"></div> </th> </tr> ');
 }]);
     return angular.module('ngTable');

src/main/webapp/resources/view/admin/store_application_maintenance.html

@@ -44,7 +44,7 @@
 		background: #229ee6;
 		margin: 0;
 		line-height: 40px;
-		overflow: hidden;
+		/*overflow: hidden;*/
 	}
 	.menu02{
 		width: 100%;
@@ -97,6 +97,45 @@
 		width: 270px;
 		height: 40px;
 	}
+	.menu .sreach-input .options{
+		position: absolute;
+		left: -58px;
+		top: 1px;
+		width: 60px;
+		height: 28px;
+		line-height: 28px;
+		text-align: center;
+		color: #666;
+		font-size: 14px;
+		background: #fff;
+		border-top-left-radius: 5px;
+		border-bottom-left-radius: 5px;
+		cursor: pointer;
+	}
+	.menu .sreach-input .options b{
+		position: absolute;
+		top: 6px;
+		right: -5px;
+		width: 2px;
+		height: 18px;
+		background: #dcdcdc;
+	}
+	.menu .sreach-input .options ul {
+		position: absolute;
+		top: 28px;
+		left: 0;
+		width: 60px;
+	}
+	.menu .sreach-input .options ul li{
+		width: 60px;
+		height: 30px;
+		line-height: 30px;
+		border-radius: 5px;
+		background: #666;
+		color: rgba(255, 255, 255, 0.89);
+		text-align: center;
+		font-size: 12px;
+	}
 	.menu .sreach-input .form-control{
 		height: 30px;
 		float: left;
@@ -176,7 +215,14 @@
 		</div>
 		<div class="col-sm-3">
 			<div class="sreach-input">
-				<input type="search" class="form-control" placeholder="请输入公司名称" ng-model="keyword" ng-search="refreshTableData()"/>
+				<div class="options">
+					<span ng-click="isShowSearch(true)">{{search === 'STORE_NAME' ? '店铺名' : '审核人'}} <i class="fa fa-angle-down"></i><b></b></span>
+					<ul ng-show="showSearch">
+						<li ng-hide="search === 'STORE_NAME'" ng-click="switchSearch('STORE_NAME', false)">店铺名</li>
+						<li ng-hide="search === 'AUDITOR'" ng-click="switchSearch('AUDITOR', false)">审核人</li>
+					</ul>
+				</div>
+				<input type="search" class="form-control" placeholder="{{placeValue}}" ng-model="keyword" ng-search="refreshTableData()"/>
 				<button ng-click="refreshTableData()">搜索</button>
 			</div>
 		</div>

src/main/webapp/resources/view/admin/trade/trade_buyer_order.html

@@ -233,7 +233,7 @@
 						<th class="th-normal" width="70">总数量</th>
 						<th class="th-normal" width="100">销售<br/>总金额</th>
 						<th class="th-normal" width="50">币种</th>
-						<th class="th-normal" width="50">税率</th>
+						<!--<th class="th-normal" width="50">税率</th>-->
 					</tr>
 				</thead>
 				<tbody>
@@ -310,7 +310,7 @@
 						<!-- 币别 -->
 						<td>{{order.currency}}</td>
 						<!-- 税率 -->
-						<td><span ng-if="order.taxRate">{{order.taxRate * 100}}%</span></td>
+						<!--<td><span ng-if="order.taxRate">{{order.taxRate * 100}}%</span></td>-->
 					</tr>
 					<tr ng-if="page.totalPages == 0">
 						<td colspan="18">
@@ -365,7 +365,7 @@
 						<th class="th-normal" width="70">订单<br/>总数量</th>
 						<th class="th-normal" width="100">订单<br/>总金额</th>
 						<th class="th-normal" width="50">币种</th>
-						<th class="th-normal" width="50">税率</th>
+						<!--<th class="th-normal" width="50">税率</th>-->
 					</tr>
 				</thead>
 				<tbody>
@@ -404,7 +404,7 @@
 						<!-- 币种 -->
 						<td>{{order.currency}}</td>
 						<!-- 税率 -->
-						<td><span ng-if="order.taxRate != null">{{order.taxRate * 100}}%</span></td>
+						<!--<td><span ng-if="order.taxRate != null">{{order.taxRate * 100}}%</span></td>-->
 					</tr>
 					<tr ng-if="page.totalPages == 0">
 						<td colspan="16">

src/main/webapp/resources/view/admin/trade/trade_order_detail.html

@@ -31,6 +31,14 @@
 	.orderid {
 		border: 1px solid #ddd;
 		padding: 5px;
+		overflow: hidden;
+	}
+	.orderid h3{
+		float: left;
+	}
+	.orderid .handle-btn {
+		float: right;
+		padding-top: 15px;
 	}
 	
 	.flow {
@@ -61,8 +69,84 @@
 	.row {
 		line-height: 30px;
 	}
+	/*审核不通过弹框*/
+	.audit-failure-modal {
+		display: block !important;
+		position: fixed;
+		background-color: white;
+		opacity: 1;
+		width: 300px;
+		height: 140px;
+		top: 250px;
+		left: 554px;
+		font-family: "microsoft yahei";
+		border: 1px solid #d9d5ce;
+		z-index: 10;
+	}
+
+	.audit-failure-modal .title {
+		line-height: 31px;
+		height: 31px;
+		font-size: 14px;
+		background-color: #3a76e4;
+		color: white;
+		text-align: left;
+		font-family: microsoft yahei;
+		padding-left: 15px;
+	}
+
+	.audit-failure-modal .content input {
+		width: 80%;
+		height: 31px;
+		line-height: 31px;
+		border-radius: 4px;
+		margin-top: 10px;
+		margin-left: 28px;
+		margin-bottom: 15px;
+	}
+
+	.audit-failure-modal  .footer{
+		margin: 0 auto;
+		text-align: center;
+	}
+
+	.audit-failure-modal  .footer .confirm {
+		width: 90px;
+		padding: 5px 10px;
+		background-color: #3A76E4;
+		border: none;
+		color: white;
+		font-size: 14px;
+	}
+
+	.audit-failure-modal .footer .cancle-button {
+		width: 90px;
+		padding: 5px 10px;
+		background-color: #D9D5CE;
+		border: none;
+		color: #333333;
+		font-size: 14px;
+	}
 </style>
-<div class="orderid"><h3>订单号：<span class="content" ng-bind="orderDetailInfo.orderid"></span></h3></div>
+<div class="orderid">
+	<h3>订单号：<span class="content" ng-bind="orderDetailInfo.orderid"></span></h3>
+	<div class="handle-btn">
+		<a ng-if="orderDetailInfo.status==504 || orderDetailInfo.status==503" style="position: relative;">
+			<button type="button" ng-if="(orderDetailInfo.status==504 && !orderDetailInfo.installmentId) || (orderDetailInfo.status==504 && orderDetailInfo.installmentId && orderDetailInfo.installment.status==503)" class="btn btn-default btn-sm" ng-click="ensurePay(orderDetailInfo)">确认收款</button>
+			<button ng-if="orderDetailInfo.status==504" type="button" class="btn btn-default btn-sm" ng-click="showAuditFailureModal(orderDetailInfo)">审核不通过</button>
+			<div class="audit-failure-modal" ng-if="orderDetailInfo.dislayModal">
+				<div class="title">审核不通过的原因</div>
+				<div class="content">
+					<input class="form-control" ng-model="orderDetailInfo.auditFailureReason" placeholder="请输入审核不通过的原因"/>
+				</div>
+				<div class="footer">
+					<button class="confirm" ng-click="auditFailure(orderDetailInfo)">确认</button>
+					<button class="cancle-button" ng-click="orderDetailInfo.dislayModal = false">取消</button>
+				</div>
+			</div>
+		</a>
+	</div>
+</div>
 <div class="row col-md-12">
 	<div class="col-md-1 {{styl0}}"><span>待确认</span></div>
 	<div class="col-md-1 {{styl1}}"><span>待付款</span></div>

src/main/webapp/resources/view/sso/staffManagement.html

@@ -425,6 +425,7 @@
         line-height: 32px;
         float: right;
         padding-left: 5px;
+        border: 1px solid #5078cb;
     }
     .auth-info-header .searchUser-group >div {
         background: #fff;

src/main/webapp/resources/view/usercenter/forstore/buyer_invoice_record.html

@@ -99,8 +99,8 @@
         width: 330px;
         height: 32px;
         line-height: 32px;
-        font-size: 12px;
-        border-radius: 0;
+        font-size: 14px;
+        border-radius: 2px;
         border: #5078cb 1px solid;
         background: #fff;
         float: left;
@@ -114,6 +114,7 @@
         font-size: 14px;
         color: #fff;
         float: right;
+        border-radius: 2px;
     }
     body div.ng-table-pager a.page-a {
         float: right;

src/main/webapp/resources/view/usercenter/forstore/buyer_no_invoice.html

@@ -129,8 +129,8 @@
     width: 330px;
     height: 32px;
     line-height: 32px;
-    font-size: 12px;
-    border-radius: 0;
+    font-size: 14px;
+    border-radius: 2px;
     border: #5078cb 1px solid;
     background: #fff;
     float: left;
@@ -144,6 +144,7 @@
     font-size: 14px;
     color: #fff;
     float: right;
+    border-radius: 2px;
 }
 body div.ng-table-pager a.page-a {
     float: right;

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -435,9 +435,8 @@
 	/*搜索时间筛选*/
 	.screen{
 		background: #fff;
-		padding-top: 16px;
-		padding-bottom: 16px;
-		height: 66px;
+		height: 40px;
+		padding-top: 4px;
 	}
 	.screen .sreach input{
 		border: #dfdfdf 1px solid;
@@ -462,18 +461,22 @@
 		margin: 0 5px;
 	}
 	.screen .sreach a.seek{
-		width: 80px;
-		height: 34px;
+		width: 70px;
+		height: 32px;
 		background: #5078cb;
 		color: #fff;
-		line-height: 34px;
+		line-height: 32px;
 		float: none;
+		border-radius: 2px;
 	}
 	.screen .sreach a.seek:hover{
 		background: #3f7ae3;
 	}
 	.screen .sreach .form-control{
-		border-radius: 1px;
+		border-radius: 2px;
+		border: 1px solid #5078cb;
+		height: 32px;
+		line-height: 32px;
 	}
 	.data-input{
 		float: left;
@@ -484,7 +487,7 @@
 		right: 1px;
 		top: 1px;
 		width: 20px;
-		height: 32px;
+		height: 30px;
 		background: url(static/img/user/images/xiala.png) right no-repeat #fff !important;
 		background-position-x: 100% !important;
 		border: none;
@@ -1030,6 +1033,9 @@
 						<b class="total">总金额：<em ng-bind="::order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency"></em></b>
 						<b>总共<em ng-bind="::order.batchQty || 0"></em>件产品</b></dd>
 				</div>
+				<div ng-if="currenctOrders.length > 0" class="text-right" style="margin: 20px 0 12px 0;padding-right:15px;" >
+					显示&nbsp;{{(currenctOrdersList.number - 1 ) * currenctOrdersList.tobepaid + 1}}-{{currenctOrdersList.totalElements >= 10 ? (currenctOrdersList.number * currenctOrdersList.tobepaid > currenctOrdersList.totalElements ? currenctOrdersList.totalElements : currenctOrdersList.number * currenctOrdersList.tobepaid) : currenctOrdersList.totalElements}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
+				</div>
 				<div ng-if="currenctOrders.length == 0" class="text-center">
 					<div class="col-xs-offset-3 col-xs-2" >
 						<img src="static/img/all/empty-cart.png">

src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -108,8 +108,8 @@
             <!--快速导航-->
             <div class="user_r_03">
                 <ul>
-                    <li><a ui-sref="componentCol"><img src="static/img/user/images/menu01.png"/><p>产品收藏</p></a></li>
-                    <li><a ui-sref="store_focus"><img src="static/img/user/images/menu02.png"/><p>店铺关注</p></a></li>
+                    <li><a ui-sref="componentCol"  target="_blank"><img src="static/img/user/images/menu01.png"/><p>产品收藏</p></a></li>
+                    <li><a ui-sref="store_focus" target="_blank"><img src="static/img/user/images/menu02.png"/><p>店铺关注</p></a></li>
                     <li><a href="news" target="_blank"><img src="static/img/user/images/menu05.png"/><p>优软快讯</p></a></li>
                     <li><a ui-sref="browsing_history"><img src="static/img/user/images/menu04.png"/><p>浏览历史</p></a></li>
                 </ul>

src/main/webapp/resources/view/usercenter/forstore/pay_center.html

@@ -348,12 +348,13 @@
 		color: #fff;
 		line-height: 32px;
 		float: none;
+		border-radius: 2px;
 	}
 	.screen .sreach a.seek:hover{
 		background: #3f7ae3;
 	}
 	.screen .sreach .form-control{
-		border-radius: 1px;
+		border-radius: 2px;
 	}
 	.data-input{
 		float: left;

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -141,7 +141,7 @@
         float: left;
     }
     .seek-purchase .screen .sreach input{
-        border: #4290f7 1px solid;
+        border: #5078cb 1px solid;
         height: 32px;
         width: 267px;
         box-shadow: none;
@@ -152,7 +152,7 @@
     .seek-purchase .screen .sreach .date input{
         width: 117px;
         text-align: left;
-        border: 1px solid #4290f7;
+        border: 1px solid #5078cb;
     }
     .seek-purchase .screen .sreach .date input:hover{
         cursor: pointer;
@@ -170,10 +170,11 @@
     .seek-purchase .screen .sreach a.seek{
         width: 58px;
         height: 32px;
-        background: #4290f7;
+        background: #5078cb;
         color: #fff;
         line-height: 32px;
         float: left;
+        border-radius: 2px;
     }
     .seek-purchase .screen .sreach a.seek:hover{
         background: #3f7ae3;
@@ -909,7 +910,7 @@
         margin-right: 20px;
         margin-left: 10px;
         text-align: center;
-        border: 1px solid #4290f7;
+        border: 1px solid #5078cb;
         color: #333;
     }
 </style>
@@ -1338,7 +1339,7 @@
                 <tr class="pager-row" ng-if="seekListData.totalElements > 0">
                 <td colspan="10">
                     <div>
-                        显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.totalElements >= 10 ? seekListData.number * seekListData.size : seekListData.totalElements}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
+                        显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.totalElements >= 10 ? (seekListData.number * seekListData.size > seekListData.totalElements ? seekListData.totalElements : seekListData.number * seekListData.size) : seekListData.totalElements}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
                     </div>
                 </td>
             </tr>
@@ -1414,14 +1415,24 @@
                     <a class="fr">查看详情</a>
                 </td>
             </tr>
-            <tr ng-if="!$data.length" class="empty">
-                <td>
-                    <div>
-                        <img src="static/img/all/empty-cart.png">
-                        <span class="f14">暂无求购信息</span>
-                    </div>
-                </td>
-            </tr>
+            </tbody>
+            <tbody class="pager-tbody">
+                <tr class="pager-row pager-row2" ng-if="$data.length > 0" style="height: auto;line-height: 24px;">
+                    <td>
+                        <div>
+                            显示&nbsp;{{(bomDataList.number - 1 ) * bomDataList.size + 1}}-{{bomDataList.totalElements >= 10 ? (bomDataList.number * bomDataList.size > bomDataList.totalElements ? bomDataList.totalElements : bomDataList.number * bomDataList.size) : bomDataList.totalElements}}&nbsp;条，共&nbsp;{{bomDataList.totalElements}}&nbsp;条
+                        </div>
+                        <div class="clear:both"></div>
+                    </td>
+                </tr>
+                <tr ng-if="!$data.length" class="empty">
+                    <td>
+                        <div>
+                            <img src="static/img/all/empty-cart.png">
+                            <span class="f14">暂无求购信息</span>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
         </table>
     </div>
@@ -1471,4 +1482,18 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<style>
+    .seek-purchase .bom-manage > table tbody tr.pager-row2:hover {
+        background: rgba(0,0,0,0);
+        border: 1px solid #fff;
+    }
+    .seek-purchase .bom-manage > table tbody tr.pager-row2 td > div {
+        font-size: 12px;
+        text-align: right;
+        padding-right: 15px;
+        margin: 20px 0 12px 0;
+        display: block;
+        cursor: auto;
+    }
+</style>

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

@@ -398,12 +398,13 @@
         color: #fff;
         line-height: 32px;
         float: none;
+        broder-radius: 2px;
     }
     .screen .sreach a.seek:hover{
         background: #3f7ae3;
     }
     .screen .sreach .form-control{
-        border-radius: 1px;
+        border-radius: 2px;
     }
     .data-input{
         float: left;

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

@@ -84,23 +84,27 @@
   .search-check .search .form-control{
     width: 340px;
     float: left;
-    height: 34px;
-    border-radius: 0;
+    height: 32px;
+    border-radius: 2px;
     box-shadow: none;
     border-right: none;
+    border: 1px solid #5078cb;
   }
   .search-check .search button,.search-check .search a{
     display: inline-block;
-    width: 94px;
-    height: 34px;
-    line-height: 34px;
+    width: 58px;
+    height: 32px;
+    line-height: 32px;
     text-align: center;
     font-size: 14px;
+    background: #5078cb;
+    border-radius: 2px;
+    color: #fff;
   }
   .search-check .search button{
-    background: #d3e1fc;
-    border-radius: 0;
-    border: #e2dbdb 1px solid;
+    background: #5078cb;
+    border-radius: 2px;
+    border: #5078cb 1px solid;
     border-left: none;
   }
   .search-check .search button:hover,.search-check .search a:hover{
@@ -109,10 +113,11 @@
   }
   .search-check .check{
     font-size: 14px;
-    line-height: 30px;
+    line-height: 32px;
     background: #5078cb;
     text-align: center;
     margin-right: 100px;
+    border-radius: 2px;
   }
   .search-check .check a{
     margin: 0 10px;
@@ -210,7 +215,7 @@
       </p>
     </div>
     <div class="record-line text-right ng-binding ng-scope" ng-if="totalElements > 0">
-      显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? seekListAll.number * seekListAll.size : seekListAll.totalElements}}&nbsp;条，共&nbsp;{{seekListAll.totalElements}}&nbsp;条
+      显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? (seekListAll.number * seekListAll.size > seekListAll.totalElements ? seekListAll.totalElements : seekListAll.number * seekListAll.size) : seekListAll.totalElements}}&nbsp;条，共&nbsp;{{seekListAll.totalElements}}&nbsp;条
     </div>
   </div>
 </div>

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

@@ -76,7 +76,7 @@
         float: left;
     }
     .seek-purchase .seek-purchase-content .screen .sreach input{
-        border: #4290f7 1px solid;
+        border: #5078cb 1px solid;
         height: 32px;
         width: 267px;
         box-shadow: none;
@@ -87,7 +87,7 @@
     .seek-purchase .seek-purchase-content .screen .sreach .date input{
         width: 117px;
         text-align: left;
-        border: 1px solid #4290f7;
+        border: 1px solid #5078cb;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date input:hover{
         cursor: pointer;
@@ -101,10 +101,11 @@
     .seek-purchase .seek-purchase-content .screen .sreach a.seek{
         width: 58px;
         height: 32px;
-        background: #4290f7;
+        background: #5078cb;
         color: #fff;
         line-height: 32px;
         float: left;
+        border-radius: 2px;
     }
     .seek-purchase .seek-purchase-content .screen .sreach a.seek:hover{
         background: #3f7ae3;
@@ -786,15 +787,24 @@
             </tr>
             -->
             </tbody>
+            <tbody class="pager-tbody" >
+                <tr class="pager-row" ng-if="$data.length > 0">
+                    <td colspan="10">
+                        <div style="text-align: right;margin: 20px 0 -10px 0px;padding-right: 11px;">
+                            显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.totalElements >= 10 ? (seekListData.number * seekListData.size > seekListData.totalElements ? seekListData.totalElements : seekListData.number * seekListData.size) : seekListData.totalElements}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
+                        </div>
+                    </td>
+                </tr>
+            </tbody>
             <tbody ng-if="$data.length == 0">
-            <tr class="empty">
-                <td colspan="10">
-                    <div>
-                        <img src="static/img/all/empty-cart.png">
-                        <span>暂无求购信息</span>
-                    </div>
-                </td>
-            </tr>
+                <tr class="empty">
+                    <td colspan="10">
+                        <div>
+                            <img src="static/img/all/empty-cart.png">
+                            <span>暂无求购信息</span>
+                        </div>
+                    </td>
+                </tr>
             </tbody>
         </table>
     </div>

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

@@ -555,7 +555,10 @@
 										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
 										手续费：
 									</strong>
-									<em ng-if="!isChange">{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i><i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" class="price-down-tag">$1.11</i>）</em>
+									<em ng-if="!isChange">{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00
+										（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i>
+										<i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" class="price-down-tag">$1.11</i>）
+									</em>
 									<em ng-if="isChange">{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i><i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" class="price-down-tag">$1.11</i>）</em>
 									<div class="remind-tag intro" ng-show="showRemindTagIntro">
 										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>

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

@@ -30,7 +30,7 @@
         float: left;
     }
     .seek-purchase .seek-purchase-content .screen .sreach input{
-        border: #4290f7 1px solid;
+        border: #5078cb 1px solid;
         height: 32px;
         width: 267px;
         box-shadow: none;
@@ -41,7 +41,7 @@
     .seek-purchase .seek-purchase-content .screen .sreach .date input{
         width: 117px;
         text-align: left;
-        border: 1px solid #4290f7;
+        border: #5078cb 1px solid;
     }
     .seek-purchase .seek-purchase-content .screen .sreach .date input:hover{
         cursor: pointer;
@@ -55,7 +55,7 @@
     .seek-purchase .seek-purchase-content .screen .sreach a.seek{
         width: 58px;
         height: 32px;
-        background: #4290f7;
+        background: #5078cb;
         color: #fff;
         line-height: 32px;
         float: left;
@@ -547,17 +547,17 @@
     }
     .seek-purchase .say-price-box .operate span {
         display: inline-block;
-        width: 64px;
-        height: 28px;
-        line-height: 28px;
+        width: 70px;
+        height: 30px;
+        line-height: 30px;
         text-align: center;
-        background: #4290f7;
+        background: #5078cb;
         color: #fff;
         cursor: pointer;
         border-radius: 2px;
     }
-    .seek-purchase .say-price-box .operate span:last-child {
-        margin-left: 15px;
+    .seek-purchase .say-price-box .operate span:first-child {
+        margin-right: 15px;
         background: #acabab;
     }
     .seek-purchase .link-saler-box {
@@ -619,7 +619,7 @@
         margin-right: 20px;
         margin-left: 10px;
         text-align: center;
-        border: 1px solid #4290f7;
+        border: 1px solid #5078cb ;
         color: #333;
     }
     .seek-purchase .seek-purchase-content >table tbody tr.default-row td.operate .is-say-price {
@@ -952,7 +952,7 @@
             </tbody>
         </table>
         <div style="text-align: right;margin-right: 20px;margin-top: -25px;" ng-if="seekListData.length != 0">
-            显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? seekListAll.number * seekListAll.size : seekListAll.totalElements}}&nbsp;条，共&nbsp;{{seekListAll.totalElements}}&nbsp;条
+            显示&nbsp;{{(seekListAll.number - 1 ) * seekListAll.size + 1}}-{{seekListAll.totalElements >=10 ? (seekListAll.number * seekListAll.size > seekListAll.totalElements ? seekListAll.totalElements : seekListAll.number * seekListAll.size) : seekListAll.totalElements}}&nbsp;条，共&nbsp;{{seekListAll.totalElements}}&nbsp;条
         </div>
     </div>
     <div class="com-modal-wrap" ng-show="isShowSayPriceBox">
@@ -1071,8 +1071,9 @@
         -->
             </div>
             <div class="operate">
-                <span ng-click="saveOffer()">确定</span>
                 <span ng-click="setSeekActive(seek, false, index)">取消</span>
+                <span ng-click="saveOffer()">确定</span>
+
             </div>
         </div>
     </div>

src/main/webapp/resources/view/vendor/forstore/vendor-invoice.html

@@ -226,8 +226,8 @@
         height: 32px;
         line-height: 32px;
         font-size: 12px;
-        border-radius: 0;
-        border: #5078cb 1px solid;
+        border-radius: 2px;
+        border:#5078cb 1px solid;
         background: #fff;
         float: left;
     }
@@ -240,6 +240,11 @@
         font-size: 14px;
         color: #fff;
         float: right;
+        border-radius: 2px;
+    }
+    .invoice-search button:hover {
+        background: #3f7ae3;
+        cursor: pointer;
     }
     body div.ng-table-pager a.page-a {
         float: right;

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

@@ -152,7 +152,7 @@
                         </tr>
                         </tbody>
                     </table>
-                    <div class="empty">
+                    <div class="empty" ng-if="allLength === 0">
                         <p class="empty-img">
                             <img src="static/img/all/empty-cart.png">
                         </p>

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

@@ -61,6 +61,9 @@
 	.com_tab ul li.active:after{
 		display: block
 	}
+	.modal-content .btn:hover {
+		border: 1px solid #5078cb
+	}
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">

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

@@ -269,6 +269,8 @@
 	}
 	.search-check .search .keyword-material {
 		width: 260px;
+		border: #5078cb 1px solid;
+		border-radius: 2px;
 	}
 	.search-check .search button,.search-check .search a{
 		display: inline-block;
@@ -279,10 +281,11 @@
 		font-size: 14px;
 	}
 	.search-check .search button{
-		background: #d3e1fc;
-		border-radius: 0;
+		background: #5078cb;
 		border: #e2dbdb 1px solid;
 		border-left: none;
+		border-radius: 2px;
+		color: #fff;
 	}
 	.search-check .search a{
 		background: #5078cb;
@@ -301,13 +304,14 @@
 		font-size: 14px;
 		margin-right: 20px;
 		color: #fff !important;
-		background: #5078cb;
+		background: #4290f7;
 		position: relative;
 		display: inline-block;
 		height: 30px;
 		line-height: 30px;
 		padding: 0 10px;
 		cursor: pointer;
+		border-radius: 2px;
 	}
 	.search-check .check > .operate-btn .expander {
 		position: absolute;
@@ -1963,6 +1967,12 @@
 	.ToforAdminLook:hover .forAdminLook {
 		display: block;
 	}
+	.com-mall-del-box .content div a {
+		width: 70px;
+		display: inline-block;
+		height: 30px;
+		line-height: 30px;
+	}
 
 </style>
 <div class="user_right fr">

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

@@ -211,9 +211,9 @@
 		width: 340px;
 		float: left;
 		height: 34px;
-		border-radius: 0;
+		border-radius: 2px;
 		box-shadow: none;
-		border-right: none;
+		border:1px solid #5078cb;
 	}
 	.search-check .search button,.search-check .search a{
 		display: inline-block;
@@ -224,10 +224,12 @@
 		font-size: 14px;
 	}
 	.search-check .search button{
-		background: #d3e1fc;
+		background: #5078cb;
 		border-radius: 0;
-		border: #e2dbdb 1px solid;
+		border: #5078cb 1px solid;
 		border-left: none;
+		color: #fff;
+		border-radius: 2px;
 	}
 	.search-check .search a{
 		background: #5078cb;

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

@@ -807,6 +807,7 @@
         text-align: center;
         display: inline-block;
         margin-left: 300px;
+        background: #5078cb
     }
     .search-check .check > .operate-btn.more-operate:hover .expander {
         display: block;
@@ -985,6 +986,24 @@
         display: block;
     }
 
+    .search-check .search .form-control{
+        width: 340px;
+        float: left;
+        height: 34px;
+        border-radius: 2px;
+        box-shadow: none;
+        border:1px solid #5078cb;
+    }
+
+    .search-check .search button{
+        background: #5078cb;
+        border-radius: 0;
+        border: #5078cb 1px solid;
+        border-left: none;
+        color: #fff;
+        border-radius: 2px;
+    }
+
 </style>
 <div class="user_right fr">
     <!--货品管理-->

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

@@ -382,8 +382,8 @@
 
 	/*搜索时间筛选*/
 	.screen .sreach input{
-		border: #dfdfdf 1px solid;
-		height: 34px;
+		border: 1px solid #5078cb;
+		height: 32px;
 		width: 300px;
 		box-shadow: none;
 	}
@@ -404,18 +404,19 @@
 		margin: 0 5px;
 	}
 	.screen .sreach a.seek{
-		width: 80px;
-		height: 34px;
+		width: 58px;
+		height: 32px;
 		background: #5078cb;
 		color: #fff;
 		line-height: 34px;
 		float: none;
+		border-radius: 2px;
 	}
 	.screen .sreach a.seek:hover{
 		background: #3f7ae3;
 	}
 	.screen .sreach .form-control{
-		border-radius: 1px;
+		border-radius: 2px;
 	}
 	.text-center{
 		text-align: center;
@@ -524,7 +525,7 @@
 		right: 1px;
 		top: 1px;
 		width: 20px;
-		height: 32px;
+		height: 30px;
 		background: url(static/img/user/images/xiala.png) right no-repeat #fff !important;
 		background-position-x: 100% !important;
 		border: none;
@@ -1186,9 +1187,9 @@
 	}
 	.screen{
 		background: #fff;
-		padding-top: 16px;
-		padding-bottom: 16px;
-		height: 66px;
+		height: 40px;
+		padding-right: 11px;
+		padding-top: 4px;
 	}
 </style>
 <div class="user_right fr">
@@ -1504,7 +1505,7 @@
 						</div>
 						<div class="content">
 							<p>您还未填写<a target="_blank" ng-click="goToSettle(purchase)">收款账户信息&nbsp;</a>，请进行完善,<br/>否则在交易完成后，商城无法给您打款。</p>
-							<p>前往卖家<a target="_blank" ng-click="goToSettle(purchase)">结算中心&nbsp;<i class="fa fa-arrow-right"></i></a></p>
+							<p>前往卖家<a target="_blank" ng-click="goToSettle(purchase)">财务对账&nbsp;<i class="fa fa-arrow-right"></i></a></p>
 						</div>
 					</div>
 				</div>
@@ -1516,6 +1517,9 @@
 						<!--<p class="grey f16">暂无订单信息2131</p>-->
 					<!--</div>-->
 				<!--</div>-->
+				<div ng-if="purchases.length > 0" class="text-right" style="margin: 20px 0 12px 0;padding-right:15px;" >
+					显示&nbsp;{{(currenctOrdersList.number - 1 ) * tableParams.count + 1}}-{{currenctOrdersList.all >= 10 ? (currenctOrdersList.number * tableParams.count > currenctOrdersList.all ? currenctOrdersList.all : currenctOrdersList.number * tableParams.count) : currenctOrdersList.all}}&nbsp;条，共&nbsp;{{currenctOrdersList.totalElements}}&nbsp;条
+				</div>
 				<div class="no-price" ng-if="purchases.length == 0 || !purchases">
 					<img src="static/img/all/empty-cart.png">
 					<p>

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

@@ -570,6 +570,28 @@
         background: #5078cb;
         color: #fff;
     }
+
+    .search-check .search .form-control{
+        width: 340px;
+        float: left;
+        height: 34px;
+        border-radius: 2px;
+        box-shadow: none;
+        border:1px solid #5078cb;
+    }
+
+    .search-check .search button{
+        background: #5078cb;
+        border-radius: 0;
+        border: #5078cb 1px solid;
+        border-left: none;
+        color: #fff;
+        border-radius: 2px;
+    }
+    .search-check .search a {
+        background: #5078cb;
+        border-radius: 2px
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -748,7 +770,7 @@
                         </tr>
                     </tbody>
                 </table>
-                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示<span ng-bind="goodsAll.start"></span>-<span ng-bind="goodsAll.numberOfElements"></span>个，共：<span ng-bind="goodsAll.totalElements" cl style="color: #5078cb;"></span>个</div>
+                <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示<span ng-bind="goodsAll.start"></span>-<span ng-bind="endNumber"></span>个，共：<span ng-bind="goodsAll.totalElements" cl style="color: #5078cb;"></span>个</div>
                 <div class="ng-cloak ng-table-pager" style="text-align: right;margin-right: 60px;" ng-if="goodsAll.totalPages>1">
                     <ul class="pagination ng-table-pagination">
                         <li ng-class="{'disabled': !page.active && !page.current, 'active': page.current}" ng-repeat="page in pages" ng-switch="page.type">

src/main/webapp/resources/view/vendor/modal/edit_goods_modal.html

@@ -166,7 +166,7 @@
                 </div>
                 <p>
                         <span style="left:40px;">
-                            <input type="file" image-upload class="uploadImage" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
+                            <input type="file" image-upload class="uploadImage" on-success="onUploadSuccess($data, $file)" non-preview="true">
                             <span>选择文件</span>
                         </span>
                     <a ng-click="confirm()" class="ok">确定</a>