Преглед изворни кода

Merge branch 'dev2.10.9' of http://192.168.3.207:10080/qmx/jy into dev2.10.9

xuzhiheng пре 5 година
родитељ
комит
cdca962346

+ 17 - 19
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toMyOrder.html

@@ -2,7 +2,7 @@
 	<head>
 		{{include "/common/meta.html"}}
 		<title>我的订单</title>
-        <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css">
+    <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.css">
 		<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/myorder/base.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/myorder/iconfont.css?v={{Msg "seo" "version"}}" />
 		<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/myorder/order_list.css?v={{Msg "seo" "mod_version"}}">
@@ -12,8 +12,8 @@
 		<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
 		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/jquery.min.js"></script>
 		<script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/dropload.js"></script>
-   	    <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
-        <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
+    <script src="//cdn.bootcss.com/jquery-confirm/3.1.0/jquery-confirm.min.js"></script>
+    <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/weui.min.js"></script>
 		{{include "/common/js.html"}}
 		<!--2.8.8-->
 		<link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/course/css/base.css?v={{Msg "seo" "version"}}" />
@@ -1850,18 +1850,17 @@
 															+'<p class="item-ifo ellipsis">行业:'+ industry_vip +'</p>'
 															+'<p class="item-ifo ellipsis">订阅周期:'+effectiveduration_vip+'</p>'
 														+'</div>'
-													+'</a>'
+                          +'</a>'
+                  listhtml+= '<div class="price">'
 									if(isLiveActive){
-                                        var activeDiscount = {{Msg "seo" "activeDiscount"}};
-                                        var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
-										listhtml+= '<div class="price">'
-														+ '<span class="origin-price-container">'
+                    var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                    var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
+										listhtml+= '<span class="origin-price-container">'
 														+ '<span>原价:¥</span>'
 														+ '<span class="origin-price">' + originPrice + '</span>'
-														+ '</span></div>'
+														+ '</span>'
 									}
-									listhtml+= '<div class="price">'
-												+'<strong class="current">¥'+orderMoney_vip+'</strong>'
+									listhtml+= '<strong class="current">¥'+orderMoney_vip+'</strong>'
 												+'</div>'
 												+'</div>'
 												+iconHtml
@@ -1890,18 +1889,17 @@
 																	+'<p class="item-ifo ellipsis">订阅周期:'+effectiveduration_vip+'</p>'
 																	+'<p class="item-ifo ellipsis">有效日期:'+effectivetime_vip+'</p>'
 																+'</div>'
-															+'</a>'
+                              +'</a>'
+                      listhtml+= '<div class="price">'
 											if(isLiveActive){
-                                                var activeDiscount = {{Msg "seo" "activeDiscount"}};
-                                                var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
-												listhtml+= '<div class="price">'
-																+ '<span class="origin-price-container">'
+                              var activeDiscount = {{Msg "seo" "activeDiscount"}};
+                              var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
+												listhtml+= '<span class="origin-price-container">'
 																+ '<span>原价:¥</span>'
 																+ '<span class="origin-price">' + originPrice + '</span>'
-																+ '</span></div>'
+																+ '</span>'
 											}
-											listhtml+= '<div class="price">'
-																+'<strong class="current">¥'+orderMoney_vip+'</strong>'
+											listhtml+= '<strong class="current">¥'+orderMoney_vip+'</strong>'
 															+'</div>'
 														+'</div>'
 														+iconHtml

+ 9 - 10
src/web/templates/weixin/dataExport/dataExport_toMyOrder.html

@@ -32,6 +32,7 @@
         .origin-price-container {
             color: #9B9CA3;
             font-size: .22rem;
+            margin-right: 0.1rem;
         }
         .origin-price-container .origin-price {
             text-decoration: line-through;
@@ -1193,17 +1194,16 @@
                         + '<p class="item-ifo ellipsis">订阅周期:' + effectiveduration_vip + '</p>';
                     //}
                     listhtml += '</div></a>'
+                    listhtml += '<div class="price">'
 					if(isLiveActive){
                         var activeDiscount = {{Msg "seo" "activeDiscount"}};
 						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
-						listhtml += '<div class="price">'
-						+ '<span class="origin-price-container">'
+						listhtml += '<span class="origin-price-container">'
 						+ '<span>原价:¥</span>'
 						+ '<span class="origin-price">' + originPrice + '</span>'
-						+ '</span></div>'
+						+ '</span>'
 					}
-                    listhtml += '<div class="price">'
-                        + '<strong class="current">¥' + orderMoney_vip + '</strong>'
+                    listhtml += '<strong class="current">¥' + orderMoney_vip + '</strong>'
                         + '</div>'
                         + '</div>'
                         + iconHtml
@@ -1233,17 +1233,16 @@
                         + '<p class="item-ifo ellipsis">有效日期:' + effectivetime_vip + '</p>';
                     //}
                     listhtml += '</div></a>'
+                    listhtml += '<div class="price">'
                     if(isLiveActive){
 						var activeDiscount = {{Msg "seo" "activeDiscount"}};
 						var originPrice = (parseFloat(orderMoney_vip) / parseFloat(activeDiscount)).toFixed(2);
-                    	listhtml += '<div class="price">'
-                    	+ '<span class="origin-price-container">'
+                      listhtml += '<span class="origin-price-container">'
                     	+ '<span>原价:¥</span>'
                     	+ '<span class="origin-price">' + originPrice + '</span>'
-                    	+ '</span></div>'
+                    	+ '</span>'
                     }
-                    listhtml += '<div class="price">'
-                        + '<strong class="current">¥' + orderMoney_vip + '</strong>'
+                    listhtml += '<strong class="current">¥' + orderMoney_vip + '</strong>'
                         + '</div>'
                         + '</div>'
                         + iconHtml