Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/agentMachineList.jsp

@@ -64,6 +64,7 @@
 				<option value="ttkdex">天天快递</option>
 				<option value="stars">星晨急便</option>
 				<option value="jd">京东快递</option>
+				<option value="dbkd">德邦快递</option>
 				<option value="01">其他</option>
 				<option value="02">上门送货</option>
 			</select>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/giftCard/list.jsp

@@ -57,6 +57,7 @@
 				<option value="ttkdex">天天快递</option>
 				<option value="stars">星晨急便</option>
 				<option value="jd">京东快递</option>
+				<option value="dbkd">德邦快递</option>
 				<option value="01">其他</option>
 				<option value="02">上门送货</option>
 			</select>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -101,6 +101,7 @@
 					  	<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>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -53,6 +53,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/order/probationOrderInfo.jsp

@@ -86,6 +86,7 @@
 					  	<c:when test="${pOrder.probationPostFirm == 'ttkdex' }">天天快递</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == 'stars' }">星晨急便</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == 'jd' }">京东快递</c:when>
+					  	<c:when test="${pOrder.probationPostFirm == 'dbkd' }">德邦快递</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == '01' }">其他</c:when>
 					  	<c:when test="${pOrder.probationPostFirm == '02' }">上门送货</c:when>
 				  	</c:choose>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/machine/filterInfo.jsp

@@ -78,6 +78,7 @@
                                 <c:when test="${logs.logsPostFirm == 'ttkdex' }">天天快递</c:when>
                                 <c:when test="${logs.logsPostFirm == 'stars' }">星晨急便</c:when>
                                 <c:when test="${logs.logsPostFirm == 'jd' }">京东快递</c:when>
+                                <c:when test="${logs.logsPostFirm == 'dbkd' }">德邦快递</c:when>
                                 <c:when test="${logs.logsPostFirm == '01' }">其他</c:when>
                                 <c:when test="${logs.logsPostFirm == '02' }">上门送货</c:when>
                             </c:choose>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/machine/filterList.jsp

@@ -52,6 +52,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

wateroPF-wechat-web/src/main/webapp/WEB-INF/views/admin/rent/order/list.jsp

@@ -52,6 +52,7 @@
 					<option value="ttkdex">天天快递</option>
 					<option value="stars">星晨急便</option>
 					<option value="jd">京东快递</option>
+					<option value="dbkd">德邦快递</option>
 					<option value="01">其他</option>
 					<option value="02">上门送货</option>
 				</select>

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -173,6 +173,10 @@ mui
 												$('#salesPostFirm')
 														.html('龙邦快递')
 											}
+                                            if (bannerdata.salesPostFirm == 'dbkd') {
+                                                $('#salesPostFirm')
+                                                    .html('德邦快递')
+                                            }
 											$('#salesPostNum').html(
 													bannerdata.salesPostNum)
 										} else {

wateroPF-wechat-web/src/main/webapp/common/shop/js/page/order_list.js

@@ -229,6 +229,9 @@ function pullupRefresh() {
 						if(this.salesPostFirm == 'longbanwuliu') {
                             salesPostFirm = '龙邦快递';
 						}
+						if(this.salesPostFirm == 'dbkd') {
+                            salesPostFirm = '德邦快递';
+						}
 						if(this.salesPostNum == null || this.salesPostNum == "") {
 							this.salesPostNum = ""
 						} else {

wateroPF-wechat-web/src/main/webapp/view/rent/lease_order_details.html

@@ -432,6 +432,9 @@
 				case 'jd':
 					return '京东快递';
 					break;
+				case 'dbkd':
+					return '德邦快递';
+					break;
 				case '01':
 					return '其他';
 					break;

wateroPF-wechat-web/src/main/webapp/view/view_logistics.html

@@ -219,6 +219,9 @@
                         case "jd":
                             name= "京东快递";
                             break;
+                        case "dbkd":
+                            name= "德邦快递";
+                            break;
                         case "01":
                             name= "其他";
                             break;