b2bfactory增加前缀

src/main/webapp/resources/css/common.css

@@ -1235,7 +1235,7 @@ select {
 	position: relative;
 	min-width: 110px
 }
-.com_tab ul li a {
+.com_tab ul li > a {
 	min-width: 110px
 }
 
@@ -1253,7 +1253,7 @@ select {
 .com_tab ul li.active:after{
 	display: block
 }
-.com_tab ul li.active a {
+.com_tab ul li.active > a {
 	border-bottom: #fff;
 	background: #5078cb;
 	color: #fff;
@@ -1374,4 +1374,8 @@ select {
 	color:#fff;
 	background: #15b262;
 	cursor:pointer;
+}
+
+.base-blue {
+	color: #5078cb;
 }

src/main/webapp/resources/css/vendor/sell.css

@@ -3445,21 +3445,21 @@ body {
     float: left;
     margin-left: 25px;
 }
-.com_tab ul li a {
+.com_tab ul li > a {
     font-size: 14px;
     height:40px;
     padding: 0 20px;
     display: inline-block;
 }
-.com_tab ul li.active a {
+.com_tab ul li.active > a {
     color: #f15601;
     border-bottom: 3px #5078cb solid;
 }
-.com_tab ul li:hover a {
+.com_tab ul li:hover > a {
     color: #5078cb;
     /*border-bottom: 3px #5078cb solid;*/
 }
-.com_tab ul li a em {
+.com_tab ul li > a em {
     color: #e64040;
 }
 .com_tab ul li.active a,.oder01 ul li.active a em {
@@ -3470,7 +3470,7 @@ body {
     margin-left: 0px;
     position: relative;
 }
-.com_tab:nth-of-type(1) ul li.active a{
+.com_tab:nth-of-type(1) ul li.active > a{
     border-bottom: #fff;
     background: #5078cb;
     color: #fff !important;
@@ -3489,22 +3489,22 @@ body {
 .com_tab ul li.active::after{
     display: block;
 }
-.com_tab:nth-of-type(1) ul li.active:hover a{
+.com_tab:nth-of-type(1) ul li.active:hover > a{
     color: #fff !important;
 }
 .com_tab:nth-of-type(2) ul li a {
     color: #666 !important;
 }
-.com_tab:nth-of-type(2) ul li.active a,.com_tab:nth-of-type(2) ul li.active a em{
+.com_tab:nth-of-type(2) ul li.active a,.com_tab:nth-of-type(2) ul li.active > a em{
     color: #f15601 !important;
 }
-.com_tab:nth-of-type(2) ul li:hover a,.com_tab:nth-of-type(2) ul li:hover a em{
+.com_tab:nth-of-type(2) ul li:hover a,.com_tab:nth-of-type(2) ul li:hover > a em{
     color: #f15601 !important;
 }
-.com_tab:nth-of-type(2) ul li a{
+.com_tab:nth-of-type(2) ul li > a{
     border-top: 3px solid #fff;
 }
-.com_tab:nth-of-type(2) ul li.active a{
+.com_tab:nth-of-type(2) ul li.active > a{
     border-top: 3px solid #f15601;
     border-left: 1px solid #f15601;
     border-right: 1px solid #f15601;

src/main/webapp/resources/js/common/b2bServices.js

@@ -1,7 +1,7 @@
 define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular, utils) {
     'use strict';
     angular.module('common.b2bServices', [ 'common.utils', 'ngResource' ])
-        .factory('SearchFilter', function() {
+        .factory('B2bSearchFilter', function() {
             return {
                 /**
                  * 改变单据日期范围
@@ -91,7 +91,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 }
             });
         }])
-        .factory('VendorService', ['$http', '$resource', 'BaseService', function($http, $resource, BaseService) {
+        .factory('B2bVendorService', ['$http', '$resource', 'BaseService', function($http, $resource, BaseService) {
             var rootPath = BaseService.getRootPath();
             var b2bPath = BaseService.getB2bUrl();
             return {
@@ -108,7 +108,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 exportXls: $resource(b2bPath + '/vendor/customer/xls/permission', {})
             };
         }])
-        .factory('Vendor', ['$resource', 'BaseService', function($resource, BaseService){
+        .factory('B2bVendor', ['$resource', 'BaseService', function($resource, BaseService){
             var b2bPath = BaseService.getB2bUrl();
             return $resource(b2bPath + '/purc/vendor/:id', {}, {
                 getServe: {
@@ -185,7 +185,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 }
             });
         }])
-        .factory('AccountUser', ['$resource', 'BaseService', function($resource, BaseService) {
+        .factory('B2bAccountUser', ['$resource', 'BaseService', function($resource, BaseService) {
             var b2bPath = BaseService.getB2bUrl();
             return $resource('/account/user/:uu', {}, {
                 getAll: {
@@ -285,7 +285,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
                 }
             });
         }])
-        .factory('CurrentRole', ['$resource', 'BaseService', function($resource, BaseService) {
+        .factory('B2bCurrentRole', ['$resource', 'BaseService', function($resource, BaseService) {
             var b2bPath = BaseService.getB2bUrl();
             return $resource('/account/role', {}, {
                 //当前企业对应的角色是否是销售经理或管理员

src/main/webapp/resources/js/vendor/app.js

@@ -669,13 +669,18 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             templateUrl: 'static/view/vendor/b2b/sale_send.html',
             controller: 'saleSendCtrl',
             controllerUrl: 'app/controllers/b2b/saleSendCtrl'
-		})).state('vendorBaseInfo', angularAMD.route({
-			url: '/baseInfo',
+		})).state('sale_customer', angularAMD.route({
+			url: '/customer',
 			title: 'b2b客户资料',
 			templateUrl: 'static/view/vendor/b2b/sale/customer.html',
 			controller: 'CustomerCtrl',
 			controllerUrl: 'app/controllers/b2b/sale/saleCustomerCtrl'
-		}));
+		})).state('sale_customer_detail', {
+			url: "/customer/:id",
+			templateUrl: "static/view/vendor/b2b/sale/customer_detail.html",
+			controller: 'CustomerDetailCtrl',
+			controllerUrl: 'app/controllers/b2b/sale/saleCustomerDetailCtrl'
+		});
 	}]);
 
 	// 状态码  -> 描述

src/main/webapp/resources/js/vendor/controllers/b2b/sale/saleCustomerCtrl.js

@@ -1,8 +1,9 @@
 define(['app/app'], function (app) {
     "use strict";
 // 客户
-    app.register.controller('CustomerCtrl', ['$scope', 'VendorService', 'BaseService', 'AuthenticationService', 'ngTableParams', '$modal', 'toaster', 'Vendor', 'AccountUser', 'CurrentRole', function ($scope, VendorService, BaseService, AuthenticationService, ngTableParams, $modal, toaster, Vendor, AccountUser, CurrentRole) {
+    app.register.controller('CustomerCtrl', ['$scope', '$rootScope', 'B2bVendorService', 'BaseService', 'AuthenticationService', 'ngTableParams', '$modal', 'toaster', 'B2bVendor', 'B2bAccountUser', 'B2bCurrentRole', function ($scope, $rootScope, VendorService, BaseService, AuthenticationService, ngTableParams, $modal, toaster, Vendor, AccountUser, CurrentRole) {
         BaseService.scrollBackToTop();
+        $rootScope.active = 'sale_customer';
         $scope.userInfoResult = true;
         AuthenticationService.getAuthentication().success(function (data) {
             $scope.loading = false;
@@ -185,7 +186,7 @@ define(['app/app'], function (app) {
         $scope.exportXls = function () {
             VendorService.exportXls.get({}, {}, function (data) {
                 if (data.success){
-                    window.location.href = 'vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
+                    window.location.href = BaseService.getB2bUrl() + '/vendor/customer/xls?keyword='+ ($scope.keywordXls || '');
                 }
             }, function (response) {
                 toaster.pop('error', '数据加载失败', response.data);

src/main/webapp/resources/js/vendor/controllers/b2b/sale/saleCustomerDetailCtrl.js

@@ -0,0 +1,189 @@
+define(['app/app'], function (app) {
+    "use strict";
+    // 客户详情
+    app.register.controller('CustomerDetailCtrl', ['$scope', 'toaster', '$stateParams', 'B2bVendor', '$modal', 'B2bProduct', 'ngTableParams', 'BaseService', '$rootScope', 'B2bVendorService', 'AuthenticationService', function ($scope, toaster, $stateParams, Vendor, $modal, Product, ngTableParams, BaseService, $rootScope, VendorService, AuthenticationService) {
+        BaseService.scrollBackToTop();
+        $scope.userInfoResult = true;
+        AuthenticationService.getAuthentication().success(function (data) {
+            $scope.loading = false;
+            $scope.thisUser = data;
+        });
+        $scope.vendorContacts = [];
+        var loadData = function () {
+            Vendor.getCustomerDetail({id: $stateParams.id}, {}, function (data) {
+                $scope.customer = data.myEnterprise;
+                $scope.customerInfo = data;
+                Vendor.custContacts({enuu: $scope.customer.uu}, {}, function (data) {
+                    $scope.Contacts = data;
+                });
+
+                // 查看已分配人员
+                VendorService.userInfo.query({uu: $scope.customer.uu}, null, function (data) {
+                    $scope.custInfos = data;
+                    var getPage = function (page, size) {
+                        if ($scope.custInfos) {
+                            var result = {};
+                            result.totalCount = $scope.custInfos.length;
+                            result.content = $scope.custInfos.slice((page - 1) * size, page * size);
+                            if ($scope.custInfos.length % size == 0) {
+                                result.totalPage = ($scope.custInfos.length - $scope.custInfos.length % size) / size;
+                            } else {
+                                result.totalPage = ($scope.custInfos.length - $scope.custInfos.length % size) / size + 1;
+                            }
+                            result.first = page == 1;
+                            result.last = page == result.totalPage;
+                            result.page = page;
+                            result.next = page - 0 + 1;
+                            result.pre = page - 1;
+                            return result;
+                        }
+                    }
+                    $scope.userdata = getPage(1, 4);
+                    $scope.first = function () {
+                        $scope.userdata = getPage($scope.userdata.pre, 4);
+                    }
+                    $scope.last = function () {
+                        $scope.userdata = getPage($scope.userdata.next, 4);
+                    }
+                }, function (response) {
+                    $scope.loading = false;
+                    toaster.pop('error', '数据加载失败', response.data);
+                });
+            }, function (response) {
+                $scope.loading = false;
+                toaster.pop('error', '数据加载失败', response.data);
+            });
+        };
+        loadData();
+
+        // 新增客户联系人
+        $scope.addContact = function (uu) {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/tpl/index/sale/contact_person_modal.html',
+                controller: 'AddContacCtrl',
+                resolve: {}
+            });
+            modalInstance.result.then(function (data) {
+                $scope.contact = data;
+                $scope.contact.myenuu = uu;
+                Vendor.saveCustContact({}, $scope.contact, function (data) {
+                    toaster.pop('success', '提示', '联系人保存成功');
+                    $scope.Contacts.push(data);
+                }, function (response) {
+                    toaster.pop('error', '失败', response.data);
+                });
+            });
+        }
+
+        // 编辑客户联系人
+        $scope.edit = function (contact) {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: 'static/tpl/index/sale/contact_person_modal.html',
+                controller: 'EditContacCtrl',
+                resolve: {
+                    contact: function () {
+                        return contact;
+                    }
+                }
+            });
+            modalInstance.result.then(function (data) {
+                Vendor.saveContact({}, data, function (data) {
+                    loadData();
+                    toaster.pop('success', '提示', '联系人修改成功');
+                }, function (response) {
+                    toaster.pop('error', '失败', response.data);
+                });
+            });
+        }
+
+        // 删除客户联系人
+        $scope.deleteById = function (id, index) {
+            $scope.Contacts.splice(index, 1);
+            Vendor.deleteContact({id: id}, {}, function (data) {
+                toaster.pop('success', '提示', '客户联系人删除成功');
+                loadData();
+            }, function (response) {
+                toaster.pop('error', '提示', response.data);
+            });
+        }
+
+        // 供应商物料信息
+        $scope.viewProdList = function (uu) {
+            $scope.uu = uu;
+            $scope.tableParams.page(1);
+            $scope.tableParams.reload();
+        };
+
+        // 搜索框回车
+        $scope.onSearch = function (keyword) {
+            $scope.keyword = keyword;
+            $scope.tableParams.page(1);
+            $scope.tableParams.reload();
+        };
+
+        // 供应商物料信息
+        $scope.tableParams = new ngTableParams({
+            page: 1,
+            count: 20
+        }, {
+            total: 0,
+            counts: [5, 10, 25, 50],
+            getData: function ($defer, params) {
+                $scope.loading = true;
+                var pageParams = params.url();
+                pageParams.custUU = $scope.uu;
+                pageParams.keyword = $scope.keyword;
+                $scope.tip = $scope.keyword;
+                Product.get.call(null, BaseService.parseParams(pageParams), function (page) {
+                    $scope.loading = false;
+                    if (page) {
+                        params.total(page.totalElement);
+                        $scope.total = page.totalElement;
+                        $defer.resolve(page.content);
+                        $scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
+                    }
+                }, function (response) {
+                    $scope.loading = false;
+                    toaster.pop('error', '数据加载失败', response.data);
+                });
+            }
+        });
+
+        $scope.addUserInfo = function () {
+            //TODO
+            if ($scope.thisUser.sys) {
+                var modalInstance = $modal.open({
+                    animation: true,
+                    templateUrl: 'static/tpl/index/account/add_userInfo.html',
+                    controller: 'AddUserInfoCtrl',
+                    resolve: {
+                        customer: function () {
+                            return $scope.customerInfo;
+                        }
+                    }
+                });
+                modalInstance.result.then(function (changed, checked) {
+                    loadData();
+                    if (changed) {
+                        if (checked) {
+                            $scope.newUser.roles = checked;
+                        } else {
+                            loadUsers();
+                        }
+                    }
+                });
+
+            } else {
+                toaster.pop('error', '您不是管理员，无权限分配用户！');
+            }
+        }
+
+        $scope.Quotation = function (uu, id) {
+            $rootScope.custuu = uu;
+            $rootScope.prodId = id;
+            window.location.hash = "#/sale/quotation/new";
+        }
+    }]);
+});

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

@@ -774,7 +774,7 @@
     margin-left: 0px;
     position: relative;
   }
-  .com_tab ul li.active a{
+  .com_tab ul li.active > a{
     border-bottom: #fff;
     background: #5078cb;
     color: #fff;

src/main/webapp/resources/view/vendor/b2b/sale/customer.html

@@ -19,12 +19,12 @@
 	border: none;
 }
 #customer-tab .pane-body{
-	padding: 0;
+	padding: 0 14px;
 }
 #customer-tab tbody tr{
 	background: none;
 	height: 80px;
-	border-top: #e8e8e8 1px solid;
+	border-top: #dae5fd 1px solid;
 }
 #customer-tab tbody tr td{
 	text-align: center;
@@ -33,7 +33,7 @@
 	font-size: 14px;
 }
 #customer-tab tbody tr:hover{
-	border: #3f84f6 2px solid;
+	background: #f5f8fe;
 }
 #customer-tab .form-horizontal .form-control{
 	height: 36px;
@@ -44,7 +44,6 @@
 }
 #customer-tab .form-horizontal .form-group{
 	margin: 0;
-	padding: 10px 0;
 }
 #customer-tab .form-horizontal .form-group .input-group-addon{
 	width: 70px;
@@ -59,7 +58,7 @@
 	border: none;
 	border-radius: 0;
 	position: absolute;
-	top: 10px;
+	top: 0;
 	right: 0;
 }
 #customer-tab table tr td a{
@@ -69,8 +68,8 @@
 	color: #d32526 !important;
 }
 .form-horizontal #topSearch{
-	font-size: 16px;
-	line-height: 55px;
+	font-size: 12px;
+	color: #999;
 }
 #customer-tab table tr td a.color32{
 	color: #323232;
@@ -78,88 +77,115 @@
 #customer-tab table thead th:hover{
 	background: none;
 }
+#customer-tab .com_tab li.export {
+	float: right;
+}
+#customer-tab .com_tab li.export a {
+	color: #5078cb;
+}
+#customer-tab .body-wrap {
+	background: #fff;
+	padding: 10px 0;
+}
+#customer-tab .form-horizontal {
+	background: #f5f8fe;
+	height: 52px;
+	line-height: 52px;
+	margin-bottom: 10px;
+}
+#customer-tab .form-horizontal .has-feedback {
+	margin-top: 8px;
+}
+#customer-tab .pane-body table {
+	border: 1px solid #dae5fd;
+}
+#customer-tab .pane-body table thead {
+	height: 38px;
+	line-height: 38px;
+	background: #89aefa;
+}
+#customer-tab .pane-body table thead tr th {
+	color: #fff;
+	font-weight: normal;
+}
 </style>
-<div class="loading in" ng-class="{'in': loading}">
-	<!--<i></i>-->
-	<div class="wrap">
-		<div class="outer"></div>
-	</div>
-</div>
-<div class="pane base-info" style="/*max-height: 900px;overflow-y: auto; overflow-x: hidden;*/" id="customer-tab">
-	<!--<div class="pane-header">
-		客户资料 （共{{::totalCount}}个）
-		<div class="pull-right">
-			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-text fa-fw"></i>导出</a>
+<div class="user_right fr">
+	<div class="pane base-info" style="/*max-height: 900px;overflow-y: auto; overflow-x: hidden;*/" id="customer-tab">
+		<div class="com_tab" style="margin-bottom: 10px">
+			<ul class="fl">
+				<li class="active">
+					<a>客户资料</a>
+				</li>
+				<li class="export">
+					<a ng-click="exportXls()"><i class="fa fa-file-text fa-fw"></i>导出Excel</a>
+				</li>
+			</ul>
 		</div>
-	</div>-->
-	<div class="pub-com_head">
-		<span>客户资料</span>
-		<div class="p-right">
-			<a ng-click="exportXls()" target="_self" class="text-simple bule"><i class="fa fa-file-text fa-fw"></i>导出</a>
-		</div>
-	</div>
-	<form class="form-horizontal">
-		<div class="form-group">
-			<div class="col-md-6 col-sm-6">
-				<div id="topSearch" style="float: left">
-					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
-					单据{{customerParams.total()}}条
+		<div class="body-wrap">
+			<form class="form-horizontal">
+				<div class="form-group">
+					<div class="col-md-6 col-sm-6">
+						<div id="topSearch" style="float: left">
+							搜索"{{tip}}",为您找到结果:
+							单据{{customerParams.total()}}条
+						</div>
+					</div>
+					<div class="col-md-6 col-sm-6">
+						<div class="form-group form-group-sm has-feedback">
+							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称搜索" />
+							<a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
 				</div>
-			</div>
-			<div class="col-md-6 col-sm-6">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称搜索" />
-               	 	<a class="btn  input-group-addon" ng-click="onSearch()">搜索</a>
-                </div>
-			</div>
-		</div>
-	</form>
-	<div class="pane-body">
-		<table class="table table-bordered table-striped table-hover"
-			ng-table="customerParams">
-			<thead>
-				<tr class="header">
-					<th width="80">UU</th>
-					<th width="180">客户名称</th>
-					<th width="180">地址</th>
-					<th width="80">客户联系人</th>
-					<th width="100">联系人电话</th>
-					<th width="80">我方联系人</th>
-					<th width="110">用户分配</th>
-				</tr>
-			</thead>
-			<tbody ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
+			</form>
+			<div class="pane-body">
+				<table class="table table-bordered table-striped table-hover"
+					   ng-table="customerParams">
+					<thead>
+					<tr class="header">
+						<th width="80">UU</th>
+						<th width="180">客户名称</th>
+						<th width="180">地址</th>
+						<th width="80">客户联系人</th>
+						<th width="100">联系人电话</th>
+						<th width="80">我方联系人</th>
+						<th width="110">用户分配</th>
+					</tr>
+					</thead>
+					<tbody ng-repeat="customer in $data" ng-mouseenter="showUserInfo(customer,true)" ng-mouseleave="showUserInfo(customer,false)">
 					<tr>
 						<td class="text-center" ng-bind="::customer.myEnterprise.uu"></td>
-						<td class="text-center"><a ng-click="viewDetail(customer.id)" title="查看客户资料" ng-bind="::customer.myEnterprise.enName" class="color32 order-detail"></a></td>
+						<td class="text-center"><a ng-click="viewDetail(customer.id)" title="查看客户资料" ng-bind="::customer.myEnterprise.enName" class="base-blue order-detail"></a></td>
 						<td class="text-center" ng-bind="::customer.myEnterprise.enAddress"></td>
 						<td class="text-center" ng-bind="::customer.myUser.userName"></td>
 						<td ng-bind="::customer.myUser.userTel"></td>
 						<td class="text-center" ng-bind="::customer.vendorUser.userName"></td>
 						<td class="text-center">
-								<!--<a title="展开" class="text-muted" ng-click="open(customer,$index)"><i class="fa fa-toggle-down fa-lg"></i></a>-->
-								<!--<a ng-click="viewDetail(customer.id)">查看详情</a><br/>-->
-								<div><a style="color: #3f84f6;" title="被分配的用户享有查看和操作权限" ng-click="addUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->分配</i></a></div>
+							<!--<a title="展开" class="text-muted" ng-click="open(customer,$index)"><i class="fa fa-toggle-down fa-lg"></i></a>-->
+							<!--<a ng-click="viewDetail(customer.id)">查看详情</a><br/>-->
+							<div><a style="color: #3f84f6;" title="被分配的用户享有查看和操作权限" ng-click="addUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->分配</i></a></div>
 							<div><a style="color: #3f84f6;" title="被转移权限的用户可以分配权限给其他用户" ng-click="transferUserInfo(customer)"><!--<i class="fa fa-plus-circle fa-lg">-->转移</a></div>
 						</td>
 					</tr>
-			</tbody>
-			<tbody ng-if="$data.length === 0">
-			<tr>
-				<td colspan="7">
-					<div id="empty">
-						<div class="left_img">
-							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-							<a href="#/index" title="B2B商务首页">B2B 商务</a>
-						</div>
-						<div class="right_link">
-							<p>暂无对应的单据</p>
-							<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
-						</div>
-					</div>
-				</td>
-			</tr>
-			</tbody>
-		</table>
+					</tbody>
+					<tbody ng-if="$data.length === 0">
+					<tr>
+						<td colspan="7">
+							<div id="empty">
+								<div class="left_img">
+									<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+									<a href="#/index" title="B2B商务首页">B2B 商务</a>
+								</div>
+								<div class="right_link">
+									<p>暂无对应的单据</p>
+									<a href="javascript:location.reload()">点击重新加载<i class="load_icon"></i></a>
+								</div>
+							</div>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
 	</div>
 </div>

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

@@ -774,7 +774,7 @@
     margin-left: 0px;
     position: relative;
   }
-  .com_tab ul li.active a{
+  .com_tab ul li.active > a{
     border-bottom: #fff;
     background: #5078cb;
     color: #fff;

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

@@ -103,7 +103,7 @@
         margin-left: 0px;
         position: relative;
     }
-    .com_tab ul li.active a{
+    .com_tab ul li.active > a{
         border-bottom: #fff;
         background: #5078cb;
         color: #fff;

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

@@ -70,7 +70,7 @@
         margin-left: 0px;
         position: relative;
     }
-    .com_tab ul li.active a{
+    .com_tab ul li.active > a{
         border-bottom: #fff;
         background: #5078cb;
         color: #fff;

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

@@ -102,7 +102,7 @@
         margin-left: 0px;
         position: relative;
     }
-    .com_tab ul li.active a{
+    .com_tab ul li.active > a{
         border-bottom: #fff;
         background: #5078cb;
         color: #fff;

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

@@ -39,7 +39,7 @@
         margin-left: 0px;
         position: relative;
     }
-    .com_tab ul li.active a{
+    .com_tab ul li.active > a{
         border-bottom: #fff;
         background: #5078cb;
         color: #fff;
@@ -61,7 +61,7 @@
     .com_tab2 ul li:nth-child(1){
         margin-left:0px
     }
-    .com_tab2 ul li a,.com_tab2 ul li a:active{
+    .com_tab2 ul li a,.com_tab2 ul li > a:active{
         border-top: 3px solid #fff;
     }
     .com_tab ul li.active:after{
@@ -70,17 +70,17 @@
     .com_tab2 ul li::after{
         background: url('');
     }
-    .com_tab2 ul li a:hover{
+    .com_tab2 ul li > a:hover{
         color: #f15601
     }
-    .com_tab2 ul li.active a{
+    .com_tab2 ul li.active > a{
         border-top: 3px solid #f15601;
         border-left: 1px solid #f15601;
         border-right: 1px solid #f15601;
         background: #fff;
         color: #f15601
     }
-    .com_tab2 ul li.active:hover a{
+    .com_tab2 ul li.active:hover > a{
         color: #f15601;
     }
     .com_tab2 ul{

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

@@ -30,7 +30,7 @@
         margin-left: 0px;
         position: relative;
     }
-    .com_tab ul li.active a{
+    .com_tab ul li.active > a{
         border-bottom: #fff;
         background: #5078cb;
         color: #fff;
@@ -52,20 +52,20 @@
     .com_tab2 ul li::after{
         background: url('');
     }
-    .com_tab2 ul li.active a{
+    .com_tab2 ul li.active > a{
         border-top: 3px solid #fff;
     }
     .com_tab2 ul li a:hover{
         color: #f15601
     }
-    .com_tab2 ul li.active a{
+    .com_tab2 ul li.active > a{
         border-top: 3px solid #f15601;
         border-left: 1px solid #f15601;
         border-right: 1px solid #f15601;
         background: #fff;
         color: #f15601
     }
-    .com_tab2 ul li.active:hover a{
+    .com_tab2 ul li.active:hover > a{
         color: #f15601;
     }
     .com_tab2 ul{
@@ -78,7 +78,7 @@
     .com_tab2 ul li:nth-child(1){
         margin-left:0px
     }
-    .com_tab2 ul li a{
+    .com_tab2 ul li > a{
         border-top: 3px solid #fff
     }
 </style>

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

@@ -473,7 +473,7 @@
 		margin-left: 0px;
 		position: relative;
 	}
-	.com_tab ul li.active a{
+	.com_tab ul li.active > a{
 		border-bottom: #fff;
 		background: #5078cb;
 		color: #fff;

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

@@ -42,7 +42,7 @@
 		margin-left: 0px;
 		position: relative;
 	}
-	.com_tab ul li.active a{
+	.com_tab ul li.active > a{
 		border-bottom: #fff;
 		background: #5078cb;
 		color: #fff;

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

@@ -234,7 +234,7 @@
     .match-menu > i:hover {
         cursor: pointer;
     }
-    .com_tab ul li.active a:focus{
+    .com_tab ul li.active > a:focus{
         text-decoration: none;
     }
 </style>

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

@@ -239,7 +239,7 @@
 		margin-left: 0px;
 		position: relative;
 	}
-	.com_tab ul li.active a{
+	.com_tab ul li.active > a{
 		border-bottom: #fff;
 		background: #5078cb;
 		color: #fff;

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

@@ -44,7 +44,7 @@
 	<span  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></span>
 	<ul>
 		<div>
-			<li ng-class="{'active' : active == 'base_info'}"><span ui-sref="vendorBaseInfo">基础资料</span></li>
+			<li ng-class="{'active' : active == 'sale_customer'}"><span ui-sref="sale_customer">基础资料</span></li>
 			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">商机管理</span></li>
 			<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">销售订单</span></li>
 			<li ng-class="{'active' : active == 'vendor_logistics'}">