瀏覽代碼

订单调试

wangshan 4 年之前
父節點
當前提交
1991d282cd

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/vip_order_detail.js

@@ -28,7 +28,7 @@ $(function () {
                 $(".productType").text("超级订阅(试用)");
             }
             //价格
-            $(".price").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
+            $(".price").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100));
             $(".totalPrice").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
             if (!r.data.order.isLiveActive) {
                 $(".origin-price-container").hide();

+ 3 - 6
src/jfw/modules/app/src/web/templates/commonPay/integral/integralDetail.html

@@ -182,16 +182,14 @@
                 }
                 //价格
                 var priceText = "¥ " + formatMoney((r.data.order_money / 100));
-                $(".price").text(priceText);
-                //if (r.data.order_status == 1) {
-                //   priceText = "¥ " + formatMoney((r.data.pay_money / 100));
-                //}
                 $(".order_price").text(priceText);
+                priceText = priceText + "元";
+                $(".price").text(priceText);
                 if (r.data.order_status === 1) {
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").addClass("status")
                     $("#pageTitle").text("已完成");
-                    priceText = "¥ " + formatMoney((r.data.pay_money / 100));
+                    priceText = "¥ " + formatMoney((r.data.pay_money / 100)) + "元";
                     //有效周期
                     $(".line_cycle").css("display", "");
                     console.log(r.data.pay_way, r.data.course_status, r.data.pay_way === "transferAccounts", r.data.course_status === 4)
@@ -230,7 +228,6 @@
                     }
     
                     $(".l-item.paymoney").css("display", "");
-                    $(".totalprice").text(priceText)
                     if (r.data.discount_price&&r.data.discount_price>0){
                       var totalmoney = Number(r.data.pay_money)+Number(r.data.discount_price)
                       priceText = "¥ " + formatMoney(totalmoney / 100) + "元";

+ 1 - 1
src/jfw/modules/app/src/web/templates/dataExport/dataExport_toOrderDetail.html

@@ -496,7 +496,7 @@
                         <p class="o-name">数据导出</p>
                         <p class="o-price">¥
                             <script>
-                                document.write(FormatNum({{.T.o.order_money}}) + "元")
+                                document.write(FormatNum({{.T.o.order_money}}))
                             </script>
                         </p>
                     </div>

+ 3 - 1
src/jfw/modules/subscribepay/src/service/orderListDetails.go

@@ -569,7 +569,9 @@ func (o *OrderListDetails) SetRes(res []map[string]interface{}, queryM map[strin
 				v["order_money"] = float64(qutil.Int64All(v["pay_money"])) / 100
 			} else {
 				v["order_money"] = float64(orderMoney.(int64)) / 100
-				v["discount_price"] = float64(discount_price.(int64)) / 100
+				if discount_price != nil {
+					v["discount_price"] = float64(discount_price.(int64)) / 100
+				}
 			}
 		}
 		/*if v["id"] != nil && v["order_money"] != nil && v["order_code"] != nil {

+ 3 - 2
src/web/templates/weixin/commonPay/integral/integralDetail.html

@@ -175,15 +175,16 @@
                 }
                 //价格
                 var priceText = "¥ " + formatMoney((r.data.order_money / 100))
-                $(".price").text(priceText);
                 $(".order_price").text(priceText);
                 $(".count_value").text(formatMoney(filterObj.score) + "枚");
+                priceText = priceText + "元";
+                $(".price").text(priceText);
                 //
                 if (r.data.order_status == 1) {
                     $("#card-header-bg").addClass("bg finish-bg")
                     $("#pageTitle").addClass("status")
                     $("#pageTitle").text("已完成");
-                    priceText = "¥ " + formatMoney((r.data.pay_money / 100));
+                    priceText = "¥ " + formatMoney((r.data.pay_money / 100)) + "元";
                     //有效周期
                     $(".line_cycle").css("display", "");
     

+ 1 - 1
src/web/templates/weixin/dataExport/dataExport_toOrderDetail.html

@@ -342,7 +342,7 @@
                         <p class="o-name">数据导出</p>
                         <p class="o-price">¥
                             <script>
-                                document.write(FormatNum({{.T.o.order_money}}) + "元")
+                                document.write(FormatNum({{.T.o.order_money}}))
                             </script>
                         </p>
                     </div>

+ 1 - 1
src/web/templates/weixin/vipsubscribe/vip_order_detail.html

@@ -215,7 +215,7 @@
                     $(".productType").text("超级订阅(试用)");
                 }
                 //价格
-                $(".price").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
+                $(".price").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100));
                 $(".totalPrice").text("¥ " + formatMoney(parseFloat(r.data.order.original_price) / 100) + "元");
 
                 //优惠码