wangcz 7 rokov pred
rodič
commit
c1466ff6fb

+ 1 - 1
src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -608,7 +608,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                 // 控制订单确认页,直接购买不显示进度条
                 SessionService.set("buyNow", true);
                 // 2、跳转到订单确认页面,进行付款操作
-                window.open(rootPath + '/user#/order/pay/'+ enIdFilter(data.data.orderid));
+                window.location.href = rootPath + '/user#/order/pay/'+ enIdFilter(data.data.orderid);
               }, function(res){
                 toaster.pop('error', '警告', res.data);
               });

+ 14 - 0
src/main/webapp/resources/view/sso/b2b/enMenu.html

@@ -24,6 +24,20 @@
 		background: #5078cb;
 		color: #fff !important;
 	}
+	.tab-menu a.active:after {
+		display: block;
+	}
+	.tab-menu a::after {
+		background: url(static/img/vendor/images/downicon.png);
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
 </style>
 <div class="tab-first" ng-controller="RequestAmountCtrl">
 	<div class="row">

+ 1 - 1
src/main/webapp/resources/view/sso/b2b/myRequest.html

@@ -89,7 +89,7 @@
 	}
 
 	.order-table>tbody:hover {
-		border: #fff 1px solid;
+		/*border: #fff 1px solid;*/
 		border-bottom: 20px solid #f5f5f5;
 	}
 	.order-table .operates {

+ 1 - 1
src/main/webapp/resources/view/sso/b2b/newPartner.html

@@ -89,7 +89,7 @@
 	}
 
 	.order-table>tbody:hover {
-		border: #fff 1px solid;
+		/*border: #fff 1px solid;*/
 		border-bottom: 20px solid #f5f5f5;
 	}
 	.order-table .operates {

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -237,7 +237,7 @@
 	.pay_price div{
 		max-width: 490px;
 		width: auto;
-		min-height: 133px;
+		height:auto;
 		padding: 29px 10px;
 	}
 	.pay_price h4,.pay_price p{

+ 0 - 45
src/main/webapp/resources/view/vendor/b2b/sale_change.html

@@ -1,49 +1,4 @@
 <!--右侧主体部分-->
-<style>
-	.tab_top{
-		height: 40px;
-		margin-bottom:10px;
-	}
-	.tab_top ul{
-		margin: 0 auto;
-		height: 40px;
-		line-height: 40px;
-		background: #fff;
-	}
-	.tab_top ul li{
-		margin-left: 0;
-		position: relative;
-		height: 40px;
-		text-align: center;
-		float: left;
-	}
-	.tab_top ul li a {
-		font-size: 14px;
-		height: 40px;
-		min-width: 110px;
-		padding: 0 20px;
-		display: inline-block;
-	}
-	.tab_top ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff !important;
-	}
-	.tab_top ul li.active:after {
-		display:block;
-	}
-	.tab_top ul li::after {
-		background: url(static/img/vendor/images/downicon.png);
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-</style>
 <style>
 	.order-table {
 		background: #fff;

+ 0 - 67
src/main/webapp/resources/view/vendor/b2b/sale_maketodo.html

@@ -636,73 +636,6 @@
 	.oder_list dl b.total{
 		margin-right: 0;
 	}
-	.oder01 ul {
-		border-bottom: 1px solid #f15601
-	}
-	.oder01 ul li {
-		margin-left: 10px;
-	}
-	.oder01 ul li a {
-		font-size: 13px;
-		font-weight: bold;
-	}
-
-	.com_tab ul li {
-		margin-left: 0px;
-		position: relative;
-		min-width: 110px
-	}
-	.com_tab ul li a {
-		min-width: 110px
-	}
-
-	.com_tab ul li::after{
-		background: url('static/img/vendor/images/downicon.png');
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-	.com_tab ul li.active:after{
-		display: block
-	}
-	.com_tab ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff;
-	}
-	.oder01 ul li a{
-		border-top: 3px solid #fff;
-		/*padding: 0 8px*/
-		min-width: 110px;
-	}
-	.oder01 ul li:nth-child(1){
-		margin-left: 0px
-	}
-	.oder01 ul li.active a{
-		border-top: 3px solid #f15601;
-		border-left: 1px solid #f15601;
-		border-right: 1px solid #f15601;
-		border-bottom: 1px solid #fff;
-		/*padding: 0 8px;*/
-		color: #f15601
-	}
-	.oder01 ul li a em{
-		color: #323232
-	}
-	.oder01 ul li.active a em{
-		color: #f15601 !important;
-	}
-	.oder01 ul li:hover a em {
-		color: #5078cb !important;
-	}
-	.oder01 ul li.active:hover a em {
-		color: #f15601 !important;
-	}
 	.screen{
 		background: #fff;
 		height: 40px;

+ 0 - 45
src/main/webapp/resources/view/vendor/b2b/sale_notice.html

@@ -1,49 +1,4 @@
 <!--右侧主体部分-->
-<style>
-	.tab_top{
-		height: 40px;
-		margin-bottom:10px;
-	}
-	.tab_top ul{
-		margin: 0 auto;
-		height: 40px;
-		line-height: 40px;
-		background: #fff;
-	}
-	.tab_top ul li{
-		margin-left: 0;
-		position: relative;
-		height: 40px;
-		text-align: center;
-		float: left;
-	}
-	.tab_top ul li a {
-		font-size: 14px;
-		height: 40px;
-		min-width: 110px;
-		padding: 0 20px;
-		display: inline-block;
-	}
-	.tab_top ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff !important;
-	}
-	.tab_top ul li.active:after {
-		display:block;
-	}
-	.tab_top ul li::after {
-		background: url(static/img/vendor/images/downicon.png);
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-</style>
 <style>
 	.order-table {
 		background: #fff;

+ 0 - 45
src/main/webapp/resources/view/vendor/b2b/sale_send.html

@@ -1,49 +1,4 @@
 <!--右侧主体部分-->
-<style>
-	.tab_top{
-		height: 40px;
-		margin-bottom:10px;
-	}
-	.tab_top ul{
-		margin: 0 auto;
-		height: 40px;
-		line-height: 40px;
-		background: #fff;
-	}
-	.tab_top ul li{
-		margin-left: 0;
-		position: relative;
-		height: 40px;
-		text-align: center;
-		float: left;
-	}
-	.tab_top ul li a {
-		font-size: 14px;
-		height: 40px;
-		min-width: 110px;
-		padding: 0 20px;
-		display: inline-block;
-	}
-	.tab_top ul li.active a {
-		border-bottom: #fff;
-		background: #5078cb;
-		color: #fff !important;
-	}
-	.tab_top ul li.active:after {
-		display:block;
-	}
-	.tab_top ul li::after {
-		background: url(static/img/vendor/images/downicon.png);
-		width: 11px;
-		height: 6px;
-		position: absolute;
-		bottom: 0px;
-		left: 50%;
-		content: ' ';
-		margin-left: -5px;
-		display: none;
-	}
-</style>
 <style>
 	.order-table {
 		background: #fff;