卖家订单详情、买家订单中心

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

@@ -266,16 +266,17 @@
 	.operate-height {
 		height: 31px;
 		line-height: 31px;
+		position: relative;
 	}
 
 	.ship-notify {
 		position: absolute;
 		line-height: 20px;
-		left: 30px;
+		left: 0;
 		top: 32px;
 		z-index: 155;
 		width: 140px;
-		border: 2px solid #3A75E6;
+		border: 1px solid #3A75E6;
 		padding: 5px 10px;
 		color: #1C54CA;
 	}
@@ -290,8 +291,8 @@
 		-moz-transform: rotate(44deg);
 		-webkit-transform: rotate(44deg);
 		-o-transform: rotate(44deg);
-		top: -7px;
-		left: 82px;
+		top: -6px;
+		left: 113px;
 	}
 
 	.ship-notify .content {
@@ -574,6 +575,102 @@
 	.border-bt-16:nth-of-type(1){
 		border-top: none;
 	}
+
+	/*补充*/
+	.operate-height .ship-btn:hover + .ship-content,.operate-height .ship-btn:hover + .pay{
+		display: inline-block !important;
+	}
+	.ship-content,.pay{
+		display: none;
+		width: 165px;
+	}
+	.ship-content .content{
+		font-size: 12px;
+		color: #333;
+		padding: 5px;
+	}
+	.pay{
+		min-width: 275px;
+		right: 0;
+		left: inherit;
+		padding: 0;
+	}
+	.pay .arrow{
+		right: 34px;
+		left: inherit;
+	}
+	.pay .content{
+		padding: 0;
+		margin: 0;
+	}
+	.pay .content .title{
+		width: 100%;
+		height: 28px;
+		text-align: center;
+		line-height: 28px;
+		background: #f6f9ff;
+		font-size: 14px;
+	}
+	.pay .content .title em{
+		font-weight: bold;
+		color: #333;
+	}
+	.color999{
+		color: #999 !important;
+	}
+	.color333{
+		color: #333 !important;
+	}
+	.red{
+		color: #f00 !important;
+	}
+	.pay .content ul{
+		width: 100%;
+		margin: 0 auto;
+		display: inline-block;
+		padding-top: 5px;
+	}
+	.pay .content ul li{
+		width: 100%;
+		float: left;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+	}
+	.pay .content ul li em{
+		width: 14px;
+		height: 14px;
+		display: inline-block;
+		border-radius: 100%;
+		line-height: 14px;
+		color: #fff;
+		background: #5078cb;
+		float: left;
+		position: relative;
+		top: 3px;
+		margin-left: 20px;
+		text-align: left;
+		padding-left: 3px;
+	}
+	.pay .content ul li div{
+		float: left;
+		margin: 0 5px;
+	}
+	.pay .content ul li div.price{
+		color: #f00;
+		max-width: 105px;
+		text-align: left;
+	}
+	.pay .content ul li div.status{
+		color: #5078cb;
+	}
+	.pay .content .tip-01{
+		width: 100%;
+		height: 28px;
+		line-height: 28px;
+		background: #eff0f2;
+		font-size: 12px;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -742,9 +839,57 @@
                             <div ng-if="$index == 0">
                               <a class="operate-height" href="user#/order/pay/{{order.orderid | EncryptionFilter}}" ng-if="(order.status == 503 || order.status == 501) && order.auditPayFailReason == null" style="display: block;">
                                   <em class="order-operation">立即付款</em>
+								  <!--分期付款-->
+								  <div class="ship-btn seller-ship-tip">
+                                     <img src="static/img/common/notice-tip.png"/>
+                                  </div>
+                                  <div class="pay ship-content ship-notify">
+                                      <div class="arrow"></div>
+                                      <div class="content">
+										  <div class="title">货款共计
+											  <em>￥9000</em>
+											  &nbsp;&nbsp;&nbsp;&nbsp;分
+											  <em style="color: #5078cb;">5</em> 期
+										  </div>
+										  <ul>
+											  <li>
+												  <em>1</em>
+												  <div class="color333 price">￥13131</div>
+												  <div class="color999 time">2017-15-12前</div>
+												  <div class="color333 status">已付</div>
+											  </li>
+											  <li>
+												  <em>2</em>
+												  <div class="color333 price">￥13131</div>
+												  <div class="color999 time">2017-15-12前</div>
+												  <div class="color333 status">已付</div>
+											  </li>
+											  <li>
+												  <em>3</em>
+												  <div class="price">￥13131</div>
+												  <div class="time">2017-15-12前</div>
+												  <div class="status">代付</div>
+											  </li>
+											  <li>
+												  <em>4</em>
+												  <div class="price">￥13131</div>
+												  <div class="time">2017-15-12前</div>
+												  <div class="status">代付</div>
+											  </li>
+									  </ul>
+										<div class="tip-01"><em class="red">*</em> 若第一期款项逾期未付，卖家有权利取消订单</div>
+									 </div>
+                                  </div>
                               </a>
                               <a class="operate-height" href="user#/transfer/{{order.orderid | EncryptionFilter}}" ng-if="order.status == 503 && order.auditPayFailReason" style="display: block;">
                                   <em class="order-operation">重新上传</em>
+								  <div class="ship-btn seller-ship-tip">
+                                     <img src="static/img/common/notice-tip.png"/>
+                                  </div>
+                                  <div class="ship-content ship-notify">
+                                      <div class="arrow"></div>
+                                      <div class="content">若单据上传有误或不清晰，等情况，可重新上传。</div>
+                                  </div>
                               </a>
                               <div ng-if="order.status == 503" class="clock-mind">
                                   <i class="fa fa-clock-o" aria-hidden="true"></i>&nbsp; <em ng-bind="order.availabletime | restTime"></em>
@@ -832,6 +977,90 @@
 		</div>
 	</div>
 </div>
+<!--同意取消订单-->
+<div class="com-out-box">
+	<div class="title">
+		<a ng-click="">&times;</a>
+	</div>
+	<div class="content">
+		<p><i class="fa fa-exclamation-circle"></i>卖家请求取消此订单<br/>
+			取消原因：信息填写有误，重新购买
+		</p>
+		<p>请先联系卖家处理售后事宜，否则<br/>请勿点击【同意取消】</p>
+		<div class="deal-btn">
+			<a ng-click="">同意取消</a>
+			<a ng-click="">拒绝取消</a>
+		</div>
+	</div>
+</div>
+<style>
+	.com-out-box{
+		position: fixed;
+		z-index: 2;
+		height: 180px;
+		opacity: 1;
+		background-color: white;
+		width: 300px;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		margin: -150px 0 0 -90px;
+		top: 55%;
+		left: 50%;
+	}
+	.com-out-box .title{
+		height: 30px;
+		background-color: #5078cb;
+		text-align: right;
+		line-height: 30px;
+	}
+	.com-out-box .title a{
+		color: white;
+		font-size: 28px;
+		position: relative;
+		top: -2px;
+		right: 8px;
+	}
+	.com-out-box .content p{
+		font-size: 14px;
+		text-align: center;
+		line-height:20px;
+	}
+	.com-out-box .content p:first-child{
+		margin-top: 10px;
+		line-height: 24px;
+	}
+	.com-out-box .content p:nth-child(2){
+		font-size: 12px;
+		color: #f00;
+	}
+	.com-out-box .content p i{
+		color: #5078cb;
+		font-size: 18px;
+		margin-right: 8px;
+	}
+	.com-out-box .content div{
+		width: 100%;
+		margin: 0 auto;
+		text-align: center;
+		margin-top: 10px;
+	}
+	.com-out-box .content div a{
+		width: 78px;
+		display: inline-block;
+		height: 28px;
+		line-height: 28px;
+		text-align: center;
+		font-size: 14px;
+		color: #fff;
+		background: #5078cb;
+	}
+	.com-out-box .content div a:first-child{
+		margin-right: 10px;
+	}
+	.com-out-box .content div a:hover{
+		background: #337ab7;
+	}
+</style>
 <script>
 	$(function(){
 		//产品字数超过两行时改变样式

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

@@ -33,12 +33,12 @@
 		margin-left: 20px;
 	}
 	#oder-detail .oder_xq_list dl .change-price span{
-		width: 74px;
-		height: 30px;
+		width: 60px;
+		height: 26px;
 		display: inline-block;
 		text-align: center;
 		background: #5078cb;
-		line-height: 30px;
+		line-height: 26px;
 		color: #fff;
 		font-size: 14px;
 		/*margin-right: 5px;*/
@@ -612,8 +612,10 @@
 				}
 			</style>
 			<div class="direct-collection">
-				<div class="head">开通  <em>【直接收款】</em> 功能，无需等待商城结算<span><button></button></span></div>
-				<div class="content-box">
+				<div class="head">开通  <em>【直接收款】</em> 功能，无需等待商城结算
+					<span ng-click="open = !open"><button ng-class="{'active': !open}"></button></span>
+				</div>
+				<div class="content-box" ng-if="open">
 					<ul>
 						<li>
 							<span>第一期</span>