Browse Source

Merge branch 'master' of http://git.iamberry.com/wangxiaoming/iamberry-aiberle

wangxiaoming 7 years ago
parent
commit
bfafb482f6
1 changed files with 18 additions and 14 deletions
  1. 18 14
      iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

+ 18 - 14
iamberry-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -87,20 +87,24 @@
 			  	<td><fmt:formatNumber type="number" value="${order.salesYetAmount/100}" pattern="0.00" maxFractionDigits="2"/></td>
 			  	<td  class="f-14" style="font-weight: bold;">快递公司:</td>
 			  	<td>
-			  		<c:choose>
-					  	<c:when test="${order.salesPostFirm == 'shentong' }">
-					  		申通快递
-					  	</c:when>
-					  	<c:when test="${order.salesPostFirm == 'yuantong' }">
-					  		圆通快递
-					  	</c:when>
-					  	<c:when test="${order.salesPostFirm == 'shunfeng' }">
-					  		顺丰快递
-					  	</c:when>
-					  	<c:when test="${order.salesPostFirm == 'longbanwuliu' }">
-					  		龙邦快递
-					  	</c:when>
-				  	</c:choose>
+					<c:choose>
+						<c:when test="${order.salesPostFirm == 'sto' }">申通快递</c:when>
+						<c:when test="${order.salesPostFirm == 'yto' }">圆通快递</c:when>
+						<c:when test="${order.salesPostFirm == 'sf' }">顺丰快递</c:when>
+						<c:when test="${order.salesPostFirm == 'ems' }">邮政EMS</c:when>
+						<c:when test="${order.salesPostFirm == 'zto' }">中通快递</c:when>
+						<c:when test="${order.salesPostFirm == 'zjs' }">宅急送</c:when>
+						<c:when test="${order.salesPostFirm == 'yunda' }">韵达快递</c:when>
+						<c:when test="${order.salesPostFirm == 'cces' }">cces快递</c:when>
+						<c:when test="${order.salesPostFirm == 'pick' }">上门提货</c:when>
+						<c:when test="${order.salesPostFirm == 'htky' }">汇通快递</c:when>
+						<c:when test="${order.salesPostFirm == 'ttkdex' }">天天快递</c:when>
+						<c:when test="${order.salesPostFirm == 'stars' }">星晨急便</c:when>
+						<c:when test="${order.salesPostFirm == 'jd' }">京东快递</c:when>
+						<c:when test="${order.salesPostFirm == 'dbkd' }">德邦快递</c:when>
+						<c:when test="${order.salesPostFirm == '01' }">其他</c:when>
+						<c:when test="${order.salesPostFirm == '02' }">上门送货</c:when>
+					</c:choose>
 			  	</td>
 			  	<td  class="f-14" style="font-weight: bold;">快递单号:</td>
 			  	<td>${order.salesPostNum }</td>