Browse Source

订单详情恢复

ouxq 8 years ago
parent
commit
77507ea13e
1 changed files with 32 additions and 15 deletions
  1. 32 15
      src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

+ 32 - 15
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -17,7 +17,7 @@
 		width: 14%;
 	}
 	#oder-detail .oder_xq_list dl span.wd01{
-		width: 16%;
+		width: 13%;
 	}
 	#oder-detail .oder_xq_list dl span.wd02{
 		width: 25%;
@@ -41,7 +41,7 @@
 		line-height: 30px;
 		color: #fff;
 		font-size: 14px;
-		/*margin-right: 5px;*/
+		margin-right: 5px;
 		float: right;
 	}
 	#oder-detail .oder_xq_list dl .change-price span:hover{
@@ -58,6 +58,7 @@
 	.oder_xq_list dl .change .change-price{
 		width: 100% !important;
 		margin-top: 0;
+		padding-right: 30px;
 	}
 	#oder-detail .oder_xq_list dl .change-price span:hover{
 		background: #3f7ae3;
@@ -65,7 +66,6 @@
 	}
 	#oder-detail .oder_xq_list dl .change-price span.off{
 		background: #fa5a02;
-		margin-right: 10px;
 	}
 	.oder_xq_list dl .price span i {
 		margin-right: 35px;
@@ -135,7 +135,7 @@
 		background: #f1f6ff;
 	}
 	.oder_xq_list dl .line60{
-		height: 50px;
+		height: 60px;
 		border-bottom: #5078cb 1px solid;
 	}
 	.oder-remark .form-control {
@@ -149,7 +149,7 @@
 	.oder-remark span em {
 		float: left;
 		color: #333 !important;
-		margin-left: 20px;
+		margin-left: 40px;
 	}
 	.oder_xq_list dl span.total-price{
 		float: right;
@@ -186,12 +186,6 @@
 		top: -23px;
 		background: #f1f6ff;
 	}
-	.oder_xq_list dl span.user-address i:nth-of-type(1){
-		margin-left: 20px;
-	}
-	.oder_xq_list dl span.user-address i:nth-of-type(2){
-		margin-left: 70px;
-	}
 	.open-more{
 		text-align: center;
 		background: #f6f9ff;
@@ -291,6 +285,29 @@
 		width: 60px;
 		height: 60px;
 	}
+	.color999{
+		color: #999 !important;
+	}
+	.log_menu span{
+		margin-left: 11px;
+	}
+	.text-area{
+		width: 120px;
+		height: 60px;
+		background: #fff;
+		margin-top: 15px;
+		overflow-y: auto;
+		text-align: left;
+		padding: 0 3px;
+		margin-left: 5px;
+	}
+	.text-area i{
+		text-align: left;
+		position: relative;
+		top: 4px;
+		font-size: 12px;
+		color: #666;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
@@ -318,7 +335,7 @@
 					<p ng-bind="steps.time4 | date : 'yyyy-MM-dd HH:mm:ss'">2017-03-12 15:12:30</p>
 				</li>
 				<li>
-					<p>评价</p>
+					<p>评价</p>No
 					<em><i ng-class="{ 'active' : steps.step5 }"><b>5</b></i></em>
 					<p ng-bind="steps.time5 | date : 'yyyy-MM-dd HH:mm:ss'"></p>
 				</li>
@@ -390,7 +407,7 @@
 								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌:
-								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.brName}}" target="_blank"></a>
+								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.branduuid}}" title="{{detail.brName}}" target="_blank"></a>
 							</p>
 						</span>
 							<span class="wd01">交期:
@@ -401,7 +418,7 @@
 							<em  ng-show="!isChange" ng-bind="detail.taxUnitPrice | formateNumber : 6 | currencySysmbol : detail.currencyName" style="color: #333;"></em>
 							<em ng-show="isChange" class="price-style">
 								<em  ng-bind="'' | currencySysmbol : detail.currencyName"></em>
-								<input ng-model="detail.currentTaxUnitPrice" type="number" ng-change="updateTotal(detail)"/>
+								<input ng-model="detail.currentTaxUnitPrice" type="number" ng-change="updateTotal()"/>
 							</em>
 						</span>
 							<span style="width: 10%;" ng-bind="detail.number">100</span>
@@ -437,7 +454,7 @@
 						</span>
 					</dd>
 					<dd class="line60">
-						<span class="wd02" style="width: 60%; text-align: left; margin-left: 20px; line-height: 30px;">配送方式:第三方配送
+						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式:第三方配送
 							<!--<i style="color: #666;">(满1000元包邮,未满足的订单收取运费20元)</i>-->
 						</span>
 						<span class="total-price">