Merge branch 'consignment_aggree' of ssh://10.10.101.21/source/platform-b2c into consignment_aggree

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

@@ -1,49 +1,135 @@
-<style type="text/css">
-	.modal-body {
-		width: 942px;
-		background-color: #E0E2E1;
-		padding-bottom: 1px;
-	}
-	.modal-body .agreement-content {
-		min-height: 300px;
-		height: 400px;
-		background-color: #FFFFFF;
-		overflow-y: auto;
-	}
-	.modal-body .content-read {
+<style>
+	.modal {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin-left: -425px;
+		margin-top: -290px;
+	}
+	.modal-dialog{
+		width: 850px;
+		height: 580px;
+		background: #f2f2f2;
+		border-radius: 8px;
+		overflow: hidden;
+	}
+	.modal-dialog .modal-content{
+		border: none;
+		box-shadow: none;
+		background: #f2f2f2;
+	}
+	.agreement-list{
+		width: 100%;
+		margin: 0 auto;
+		padding-top: 25px;
+	}
+	.agreement-list .content{
+		width: 800px;
+		height: 430px;
+		overflow-y: hidden;
+		margin: 0 20px 0 20px;
+		background: #fff;
+		font-size: 14px;
+		line-height: 30px;
+	}
+	/*.agreement-list .content h3{*/
+	/*line-height: 40px;*/
+	/*font-size: 16px;*/
+	/*text-align: center;*/
+	/*}*/
+	.agreement-list .agreement-agreen{
+		width: 100%;
+		height: 45px;
+		line-height: 45px;
+		font-size: 12px;
+		color: #666;
+		margin: 0 auto;
+		text-align: center;
+	}
+	.agreement-list .agreement-agreen a{
+		color: #5078cb;
+	}
+	.agreement-list .bottom{
+		width: 100%;
+		height: 80px;
+		background: #fff;
+		margin: 0 auto;
+	}
+	.agreement-list .bottom p{
+		line-height: 40px;
+		font-size: 12px;
+		padding-left: 20px;
+		color: #666;
+	}
+	.agreement-list .bottom p strong{
+		color: #f00;
+	}
+	.agreement-list .bottom .bottom-bot div{
+		float: right;
+		margin-right: 25px;
+	}
+	.agreement-list .bottom .bottom-bot .check-active span{
+		color: #999;
+		font-size: 12px;
+		margin-right: 16px;
+	}
+	.agreement-list .bottom .bottom-bot button{
+		width: 70px;
+		height: 30px;
+		display: inline-block;
 		text-align: center;
+		line-height: 30px;
+		border: none;
+		font-size: 14px;
+	}
+	.agreement-list .bottom .bottom-bot button.off{
+		background: #cdcccc;
+		color: #666;
+		margin-right: 8px;
 	}
-	.modal-body .content-read a {
-		color: #0000FF;
+	.agreement-list .bottom .bottom-bot button.ok{
+		background: #5078cb;
+		color: #fff;
 	}
-
-	.modal-footer {
-		width: 942px;
-		background-color: #FFFFFF;
+	.agreement-list .bottom .bottom-bot button:hover{
+		background: #337ab7;
+		color: #fff;
 	}
-	.modal-footer .action-tip {
-		text-align: left;
+	.agreement-list .bottom .bottom-bot button[disabled]{
+		cursor: not-allowed;
 	}
-	.modal-footer .action-tip em {
-		color: #FF0000;
+	.agreement-list .check-active label{
+		margin-right: 0 !important;
+	}
+	.ql-container.ql-snow{
+		border: none !important;
 	}
 </style>
-<div class="modal-body">
-    <div class="agreement-content" ng-bind-html="article">
-		《优软商城买卖条例》
+<link rel="stylesheet" href="static/lib/quill/quill.snow.css" />
+<div class="agreement-list">
+	<div class="content">
+		<!--<h3>《优软商城买卖条例》</h3>-->
+		<di ng-bind-html="article" class="ql-container ql-snow"></di>
 	</div>
-	<div class="checkbox content-read">
-		<label>
-			<input type="checkbox" ng-model="agreement"> 我已阅读并同意，《<a href="http://www.usoftmall.com/help#/issue/16" target="_blank">优软商城买卖条例</a>》关于库存寄售的全部条款。
+	<div class="agreement-agreen">
+		<label class="check-active">
+			<input type="checkbox" ng-model="agreement" id="1" class="ng-pristine ng-untouched ng-valid">
+			<label for="1"></label>
 		</label>
+		<span>我已阅读并同意<a href="http://www.usoftmall.com/help#/issue/16" TARGET="_blank">《优软商城买卖条例》</a> 关于库存寄售的全部条款.</span>
 	</div>
-</div>
-<div class="modal-footer">
-	<div class="action-tip">
-		<em>*</em>您在使用库存寄售的服务前，请认真阅读《优软商城买卖条例》；若您是误操作，请点击”取消“按钮进行返回操作。
-	</div>
-	<div class="action-operate">
-		<button class="btn btn-default" ng-click="cancel()" type="button">取消</button>
-		<button class="btn btn-success" ng-click="confirm()" type="button" ng-disabled="!agreement">确定</button>
+	<div class="bottom">
+		<p><strong>* </strong>您在使用库存寄售的服务前，请认真阅读 《优软商城买卖条例》：若您是误操作，请点击“取消”按钮进行返回操作.</p>
+		<div class="bottom-bot">
+			<div>
+				<!--<label class="check-active">
+					<input type="checkbox" id="2" class="ng-pristine ng-untouched ng-valid">
+					<label for="2"></label>
+					<span>不再提醒</span>
+				</label>-->
+				<button ng-click="cancel()" class="off">取消</button>
+				<button ng-click="confirm()" class="ok" ng-disabled="!agreement">确认</button>
+			</div>
+		</div>
 	</div>
-</div>
+</div>