zhijiezhao 3 роки тому
батько
коміт
7a25c0638a

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopCheck.jsp

@@ -339,7 +339,7 @@
                     </td>
                     <td>${s.income}</td>
                     <td>
-                        <label class="clubFreight">
+                        <label class="clubFreight"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
                                     <fmt:formatNumber value="${s.freight}"/>
@@ -378,7 +378,7 @@
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>
-                        <label class="discountFee">
+                        <label class="discountFee"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopDetail.jsp

@@ -118,7 +118,7 @@
 						</td>
 						<td>${s.income}</td>
 						<td>
-							<label class="clubFreight">
+							<label class="clubFreight"  style="display: none">
 								<c:choose>
 									<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
 										<fmt:formatNumber value="${s.freight}"/>
@@ -157,7 +157,7 @@
 							   style="text-decoration: underline">${s.receiptTotalFee}</a>
 						</td>
 						<td>
-							<label class="discountFee">
+							<label class="discountFee"  style="display: none">
 								<c:choose>
 									<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
 										<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopEdit.jsp

@@ -107,7 +107,7 @@
                         </td>
                         <td>${s.income}</td>
                         <td>
-                            <label class="clubFreight">
+                            <label class="clubFreight"  style="display: none">
                                 <c:choose>
                                     <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
                                         <fmt:formatNumber value="${s.freight}"/>
@@ -146,7 +146,7 @@
                                style="text-decoration: underline">${s.receiptTotalFee}</a>
                         </td>
                         <td>
-                            <label class="discountFee">
+                            <label class="discountFee"  style="display: none">
                                 <c:choose>
                                     <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                         <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -439,7 +439,7 @@
                         </td>
                         <td>${s.income}</td>
                         <td>
-                            <label class="clubFreight">
+                            <label class="clubFreight"  style="display: none">
                                 <c:choose>
                                     <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
                                         <fmt:formatNumber value="${s.freight}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopOtherCheck.jsp

@@ -362,7 +362,7 @@
                     </td>
                     <td>${s.income}</td>
                     <td>
-                        <label class="clubFreight">
+                        <label class="clubFreight"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
                                     <fmt:formatNumber value="${s.freight}"/>
@@ -401,7 +401,7 @@
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>
-                        <label class="discountFee">
+                        <label class="discountFee"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmPayShopPrintDetail.jsp

@@ -120,7 +120,7 @@
 						</td>
 						<td>${s.income}</td>
 						<td>
-							<label class="clubFreight">
+							<label class="clubFreight" style="display: none">
 								<c:choose>
 									<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
 										<fmt:formatNumber value="${s.freight}"/>
@@ -159,7 +159,7 @@
 							   style="text-decoration: underline">${s.receiptTotalFee}</a>
 						</td>
 						<td>
-							<label class="discountFee">
+							<label class="discountFee" style="display: none">
 								<c:choose>
 									<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
 										<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmRefundShopDetail.jsp

@@ -311,7 +311,7 @@
                         </c:forEach></td>
                     <td>${s.income}</td>
                     <td>
-                        <label class="clubFreight">
+                        <label class="clubFreight"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
                                     <fmt:formatNumber value="${s.freight}"/>
@@ -350,7 +350,7 @@
                            style="text-decoration: underline">${s.receiptTotalFee}</a>
                     </td>
                     <td>
-                        <label class="discountFee">
+                        <label class="discountFee"  style="display: none">
                             <c:choose>
                                 <c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
                                     <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/order/cmRefundShopForm.jsp

@@ -114,7 +114,7 @@
 						</td>
 						<td>${s.income}</td>
 						<td>
-							<label class="clubFreight">
+							<label class="clubFreight"  style="display: none">
 								<c:choose>
 									<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
 										<fmt:formatNumber value="${s.freight}"/>
@@ -153,7 +153,7 @@
 							   style="text-decoration: underline">${s.receiptTotalFee}</a>
 						</td>
 						<td>
-							<label class="discountFee">
+							<label class="discountFee"  style="display: none">
 								<c:choose>
 									<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
 										<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>