处理BUG

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

@@ -1488,12 +1488,12 @@ i.must {
 }
 
 /*开关按钮*/
-.checkbox{
+.switch .checkbox{
 	width:54px;
 	margin:0px auto;
 	text-align: center;
 }
-.checkbox span{
+.switch .checkbox span{
 	width: 38px;
 	height: 19px;
 	display: inline-block;
@@ -1505,7 +1505,7 @@ i.must {
 	box-shadow: 1px 1px 5px #eee;
 	transition: background-color .1s ease-out;
 }
-.checkbox span:after{
+.switch .checkbox span:after{
 	content: "";
 	position: absolute;
 	width: 19px;
@@ -1521,12 +1521,12 @@ i.must {
 	color: #666;
 	font-size: 12px;
 }
-.checkbox span.off{
+.switch .checkbox span.off{
 	background-color: #4bd562;
 	transition: background-color .1s ease-in;
 	border: #4bd562 1px solid;
 }
-.checkbox span.off:after{
+.switch .checkbox span.off:after{
 	content: "";
 	left: 20px;
 	transition: left .1s ease-in;

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

@@ -1583,7 +1583,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
             }
           });
         }]).factory('B2bSnapshotService', ['$http', 'BaseService', function($http, BaseService) {
-          var rootPath = BaseService.getB2bUrl();
+          var rootPath = BaseService.getRootPath();
           return {
             getTodo: function(success) {
               var request = $http.get(rootPath + '/snapshot/todo', {cache: true});

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/CartDetailController.js

@@ -38,7 +38,7 @@ define(['app/app'], function(app) {
             getToken();
 
             // 获取地址信息
-            $http.get('resources/js/prod/data/city.json', {
+            $http.get('static/js/prod/data/city.json', {
                 "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
             }).then(function (response) {
                 $scope.provinces = response.data;

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcInquiryNewCtrl.js

@@ -76,7 +76,7 @@ define(['app/app'], function(app) {
         loadShipAddress();
 
         // 获取地址信息
-        $http.get('resources/citydata/city.json', {
+        $http.get('static/js/prod/data/city.json', {
             "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
         }).then(function (response) {
             $scope.provinces = response.data;

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/PurcNewOrderCtrl.js

@@ -14,7 +14,7 @@ define(['app/app'], function(app) {
             });
 
             // 获取地址信息
-            $http.get('resources/js/prod/data/city.json', {
+            $http.get('static/js/prod/data/city.json', {
                 "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
             }).then(function (response) {
                 $scope.provinces = response.data;

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/tender.js

@@ -83,7 +83,7 @@ define(['app/app'], function(app) {
     };
     loadShipAddress();
     // 获取地址信息
-    $http.get('resources/js/prod/data/city.json', {
+    $http.get('static/js/prod/data/city.json', {
       "Accept": "application/json;charset=utf-8", "Accept-Charset": "charset=utf-8"
     }).then(function (response) {
       $scope.provinces = response.data;

src/main/webapp/resources/view/sso/b2b/customersInfo.html

@@ -202,7 +202,7 @@
 				<tbody ng-repeat="customer in $data" ng-if="customerParams.total() > 0">
 				<tr class="customer-hd">
 					<td colspan="4" class="text-left"><span ng-bind="::customer.myEnterprise.enName"></span></td>
-					<td>
+					<td class="switch">
 							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
 								<span class="off" ng-if="customer.custswitch == 1 " ng-click="disableCust(customer.id)" title="已启用"></span>
 								<span class="" ng-if="customer.custswitch == 0 " ng-click="activeCust(customer.id)" title="已禁用"></span>

src/main/webapp/resources/view/sso/b2b/servicerInfo.html

@@ -223,7 +223,7 @@
 				<tbody ng-repeat="vendor in $data">
 				<tr class="customer-hd">
 					<td colspan="4" class="text-left"><span><img src="static/img/user/images/shop_home.png"><span ng-bind="::vendor.vendorEnterprise.enName" style="margin-left: 3px;"></span></span></td>
-					<td>
+					<td class="switch">
 							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
 								<span class="off" ng-if="vendor.servicerswitch == 1" ng-click="relieveServicer(vendor.id)" title="已启用"></span>
 								<span class="" ng-if="vendor.servicerswitch == 0" ng-click="activeServicer(vendor.id)" title="已禁用"></span>

src/main/webapp/resources/view/sso/b2b/vendorsInfo.html

@@ -223,7 +223,7 @@
 				<tbody ng-repeat="vendor in $data">
 				<tr class="customer-hd">
 					<td colspan="4" class="text-left"><span><img src="static/img/user/images/shop_home.png"><span ng-bind="::vendor.vendorEnterprise.enName" style="margin-left: 3px;"></span></span></td>
-					<td>
+					<td class="switch">
 							<span class="checkbox" style="width: 100%; margin: 0; height: 26px;">
 								<span class="off" ng-if="vendor.vendswitch == 1" ng-click="relieve(vendor.id)" title="已启用"></span>
 								<span class="" ng-if="vendor.vendswitch == 0" ng-click="activeVend(vendor.id)" title="已禁用"></span>

src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -17,7 +17,6 @@
 		margin-right: 3px;
 	}
 
-	/*sssssssssssssssssssssssssssssssss*/
 	.order-table .header>th {
 		height: 38px;
 		text-align: center;
@@ -645,8 +644,8 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
-				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
 			</div>
 		</div>
 	</div>