Merge remote-tracking branch 'origin/function_vendor_modify' into function_vendor_modify

# Conflicts:
#	src/main/webapp/resources/view/usercenter/forstore/order_pay.html

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

@@ -247,6 +247,7 @@
 		top: 4px;
 		font-size: 12px;
 		color: #666;
+		word-break: break-all;
 	}
 	.oder_xq_list dl span.user-address{
 		width: 100% !important;
@@ -385,19 +386,17 @@
 							<span class="wd01 red" ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 							<!--物料编码-->
 							<span class="wd01" style="line-height: 18px;">
-							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
-							<em ng-if="!detail.goodsnumber">&nbsp;</em>
-							<div class="text-area">
-								<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
-							</div>
-						</span>
+								<em ng-if="!detail.goodsnumber">&nbsp;</em>
+								<div class="text-area" ng-if="detail.goodsnumber">
+									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+							</span>
 							<span class="wd01" style="line-height: 18px;">
-							<!--<textarea placeholder="可填写产品备注！例如物料编号"></textarea>-->
-							<em ng-if="!detail.remark">&nbsp;</em>
-							<div class="text-area" ng-if="detail.remark">
-								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
-							</div>
-						</span>
+								<em ng-if="!detail.remark">&nbsp;</em>
+								<div class="text-area" ng-if="detail.remark">
+									<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+							</span>
 						</dd>
 					</div>
 					<div class="open-more row" ng-class="{'none': order.orderDetails.length <= 3}">
@@ -443,7 +442,7 @@
 			</div>
 		</div>
 		<!--物流信息-->
-		<div class="logistics_list01">
+		<div class="logistics_list01" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<div class="log_menu">
 				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.status]">（暂无物流信息）</em>
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName.companyName || logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>

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

@@ -292,6 +292,9 @@
 		line-height: 20px;
 		margin-top: 36px;
 	}
+	.oder_xq_list dl span.price-step.none{
+		margin-top: 28px;
+	}
 	.oder_xq_list dl .price-step p{
 		text-align: center !important;
 		font-size: 12px;
@@ -336,6 +339,7 @@
 	}
 	.sure_oder .btn-wrap .number input{
 		height: 29px;
+		padding-bottom: 1px;
 	}
 	.sure_oder .btn-wrap .number{
 		width: 124px;
@@ -447,6 +451,7 @@
 		top: 4px;
 		font-size: 12px;
 		color: #666;
+		word-break: break-all;
 	}
 </style>
 <!--右侧主体部分-->
@@ -581,7 +586,7 @@
 							<span ng-if="order.status != 501" ng-bind="detail.number" class="number" style="border: none;"></span>
                             </div>
                         </span>
-							<span class="price-step"  style="width: 10%">
+							<span class="price-step"  style="width: 10%" ng-class="{'none': detail.goodsHistory.prices.length > 1}">
 								<em ng-bind="detail.ensurePrice | formateNumber : 6 | currencySysmbol : detail.currencyName" class="red"></em>
 								<p>
 									<a name="{{detail.id}}" ng-click="togglePrice(detail)" ng-if="detail.goodsHistory.prices.length > 1" ng-blur="togglePriceBlur(detail)" style="font-size: 12px">价格梯度</a>
@@ -600,17 +605,19 @@
 								</p>
 							</span>
 							<span style="line-height: 18px;">
-                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" ng-model="detail.goodsnumber" maxlength="20"></textarea>
-                        		<div class="text-area" ng-if="order.status!=501">
+                            	<textarea ng-if="order.status==501" placeholder="可填写物料编码" maxlength="10" ng-model="detail.goodsnumber"></textarea>
+                        		<div class="text-area" ng-if="order.status!=501 && detail.goodsnumber">
 									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
 								</div>
+								<em ng-if="order.status!=501 && !detail.goodsnumber">&nbsp;</em>
 								<!--<em ng-if="order.status!=501" ng-bind="detail.goodsnumber" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
 							</span>
 							<span style="line-height: 18px;">
                             	<textarea ng-if="order.status==501" placeholder="可填写产品备注" ng-model="detail.remark" maxlength="200"></textarea>
-								<div class="text-area" ng-if="order.status!=501">
+								<div class="text-area" ng-if="order.status!=501 && detail.remark">
 									<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
 								</div>
+								<em ng-if="order.status!=501 && !detail.remark">&nbsp;</em>
                         		<!--<em ng-if="order.status!=501" ng-bind="detail.remark" style="color: #333; line-height: 20px; display: inline-block; padding-top: 10px;"></em>-->
 							</span>
 						</dd>
@@ -618,7 +625,7 @@
 							<span style="width: 100%;">
 								<em style="margin-left: 40px;">订单备注：</em>
 								<input ng-if="order.status==501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]" maxlength="200"/>
-								<em ng-if="order.status!=501" style="margin-left: 0px" ng-bind="remarkList[details[0].storeid] || '无'"></em>
+								<em ng-if="order.status!=501" style="margin-left: 0px">{{order.orderRemark}}</em>
 							</span>
 						</dd>
 						<dd class="line60">

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

@@ -308,6 +308,7 @@
 		top: 4px;
 		font-size: 12px;
 		color: #666;
+		word-break: break-all;
 	}
 	#oder-detail .contact_btn:hover{
 		color: #fff !important;
@@ -430,17 +431,17 @@
 							<span ng-show="isChange" class="wd01 red" ng-bind="detail.currentTaxUnitPrice * detail.number | formateNumber : 6 | currencySysmbol : detail.currencyName"></span>
 							<!--物料编码-->
 							<span class="wd01" style="line-height: 18px;">
-							<em ng-if="!detail.goodsnumber">&nbsp;</em>
-							<div class="text-area" ng-if="detail.goodsnumber">
-								<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
-							</div>
-						</span>
+								<em ng-if="!detail.goodsnumber">&nbsp;</em>
+								<div class="text-area" ng-if="detail.goodsnumber">
+									<i ng-bind="detail.goodsnumber">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+							</span>
 							<span class="wd01" style="line-height: 18px;">
-							<em ng-if="!detail.remark">&nbsp;</em>
-							<div class="text-area" ng-if="detail.remark">
-								<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
-							</div>
-						</span>
+								<em ng-if="!detail.remark">&nbsp;</em>
+								<div class="text-area" ng-if="detail.remark">
+									<i ng-bind="detail.remark">金石为开取数据五块钱叫稍微亲上加亲</i>
+								</div>
+							</span>
 						</dd>
 					</div>
 					<div class="open-more row" ng-class="{'none': purchase.purchaseDetails.length <= 3}">
@@ -494,7 +495,7 @@
 			</div>
 		</div>
 		<!--物流信息-->
-		<div class="logistics_list01">
+		<div class="logistics_list01" ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">
 			<div class="log_menu">
 				<span>物流信息<em ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603" class="color666">（暂无物流信息）</em>
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>

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

@@ -445,6 +445,7 @@
         top: 4px;
         font-size: 12px;
         color: #666;
+        word-break: break-all;
     }
 
     #oder-detail .line60.logistic-input{