Эхлэл Бүгдийг харах Тусламж
Нэвтрэх
qmx
/
jy
14
0
Салаа 0
Файлууд Асуудлууд 2 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

fix: 数据包支付成功页面按钮显示问题

cuiyalong 4 жил өмнө
parent
c1f04dc54e
commit
dce0d91c12
6 өөрчлөгдсөн 134 нэмэгдсэн , 45 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 13 1
      src/jfw/modules/app/src/web/staticres/jyapp/commonPay/css/paySuccess.css
  2. 9 2
      src/jfw/modules/app/src/web/templates/commonPay/checkout.html
  3. 26 1
      src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html
  4. 13 1
      src/web/staticres/wxCommonPay/css/pay_success.css
  5. 48 40
      src/web/templates/weixin/commonPay/checkout.html
  6. 25 0
      src/web/templates/weixin/commonPay/paySuccess.html

+ 13 - 1
src/jfw/modules/app/src/web/staticres/jyapp/commonPay/css/paySuccess.css
Файл харах 

@@ -30,7 +30,7 @@ body{
 
   justify-content: space-between;
 
   align-items: center;
 
   width: 100%;
 
-  height: .94rem;
 
+  min-height: .94rem;
 
   position: fixed;
 
   bottom: 0;
 
 }
 
@@ -317,3 +317,15 @@ body{
 
   color: #9B9CA3;
 
   font-size: .28rem;
 
 }
 
+
 
+.info-box {
 
+  padding-bottom: .8rem;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  background-color: #fff;
 
+  color: #5f5e64;
 
+  font-size: .26rem;
 
+  line-height: .4rem;
 
+}
 
+.info-box .info-item {}

+ 9 - 2
src/jfw/modules/app/src/web/templates/commonPay/checkout.html
Файл харах 

@@ -298,7 +298,6 @@
 
                         data: {
 
                             code: checkout.orderInfo.ordercode
 
                         },
 
-                        contentType: 'application/x-www-form-urlencoded',
 
                         success: function (res) {
 
                             if (res.success) {
 
                                 // 直到找到支付完成订单，关闭定时器
 
@@ -310,12 +309,19 @@
 
                                     duration: 1500,
 
                                     callback: function () {
 
                                         // 埋点请求
 
-                                        _this.buryingPoint()
 
+                                        var productType = checkout.orderInfo.productType
 
+                                        checkout.buryingPoint()
 
                                         var  bigmemberBid = checkout.getUrlParam("b");
 
                                         var href="/jyapp/{{.T.doType}}/paySuccess?orderCode=" + res.orderCode + "&email=" + res.email + "&payTime=" + res.payTime + "&pay_way=" + res.pay_way + "&price=" + res.price + "&t={{.T.t}}"
 
+
 
                                         if (bigmemberBid==="1"){
 
                                            href = "/jyapp/aiForecastPack/paySuccess?orderCode=" + res.orderCode + "&email=" + res.email + "&payTime=" + res.payTime + "&pay_way=" + res.pay_way + "&price=" + res.price + "&t={{.T.t}}"
 
                                         }
 
+                                        // 数据流量包定制
 
+                                        if (productType === 'dataPack') {
 
+                                            href = href + '&header=充值数据流量包&filter=' + res.filter
 
+                                        }
 
+
 
                                         var docsId=checkout.getUrlParam("docId");
 
                                         if (docsId!=null){
 
                                           href +="&docsId="+docsId
 
@@ -380,6 +386,7 @@
 
             }
 
         }
 
         checkout.init()
 
+        window.checkout = checkout
 
     })
 
 </script>
 
 {{include "/common/baiducc.html"}}

+ 26 - 1
src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html
Файл харах 

@@ -11,6 +11,7 @@
 
     <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/commonPay/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
+    <link rel="stylesheet" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/css/public.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" type="text/css"
 
           href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/commonPay/css/paySuccess.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" type="text/css" href="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/layout.css"/>
 
@@ -20,7 +21,7 @@
 
 <body>
 
 <div class="app-layout-header jy-app-header">
 
     <span class="app-back jyapp-icon jyapp-icon-zuojiantou"></span>
 
-    {{.T.title}}
 
+    <span class="header-title">{{.T.title}}</span>
 
     <span></span></div>
 
 <div class="app-layout-content-b">
 
     <div class="vip_pay_success layout_top-bottom">
 
@@ -33,6 +34,9 @@
 
                     <em></em>
 
                 </p>
 
             </div>
 
+            <div class="info-box">
 
+                <div class="info-item"></div>
 
+            </div>
 
             <div class="info_box">
 
                 <div class="pay_mode">
 
                     <span>支付方式</span>
 
@@ -91,6 +95,12 @@
 
                     继续浏览
 
                 </button>
 
             </div>
 
+        {{else if eq .T.doType "dataPack"}}
 
+            <div class="bottom_button j-button-group">
 
+                <button id ="order" class="j-button-confirm" onclick="window.location.href = '/jyapp/common/dataPack/orderDetail?order_code={{.T.orderCode}}'">
 
+                    查看订单
 
+                </button>
 
+            </div>
 
         {{end}}
 
     </div>
 
 </div>
 
@@ -109,6 +119,21 @@
 
         var payTime = {{.T.payTime}}
 
         var price ={{.T.price}}
 
         var payway ={{.T.pay_way}}
 
+        var productType = {{.T.doType}}
 
+
 
+        var headerTitle = decodeURIComponent(vTools.getParam('header'))
 
+        var orderFilter = decodeURIComponent(vTools.getParam('filter'))
 
+        if (headerTitle) {
 
+          document.title = headerTitle
 
+          $('.header-title').text(headerTitle)
 
+        }
 
+        if (orderFilter) {
 
+            orderFilter = JSON.parse(orderFilter)
 
+            // 数据包展示
 
+            if (productType === 'dataPack') {
 
+                $('.info-box .info-item').text('数据流量包：+' + orderFilter.pNum)
 
+            }
 
+        }
 
 
         var payData = ""
 
         if (payTime) {

+ 13 - 1
src/web/staticres/wxCommonPay/css/pay_success.css
Файл харах 

@@ -30,7 +30,7 @@ body{
 
   justify-content: space-between;
 
   align-items: center;
 
   width: 100%;
 
-  height: .94rem;
 
+  min-height: .94rem;
 
   position: fixed;
 
   bottom: 0;
 
 }
 
@@ -317,3 +317,15 @@ body{
 
   color: #9B9CA3;
 
   font-size: .28rem;
 
 }
 
+
 
+.info-box {
 
+  padding-bottom: .8rem;
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  background-color: #fff;
 
+  color: #5f5e64;
 
+  font-size: .26rem;
 
+  line-height: .4rem;
 
+}
 
+.info-box .info-item {}

+ 48 - 40
src/web/templates/weixin/commonPay/checkout.html
Файл харах 

@@ -209,7 +209,6 @@
 
                             orderCode: checkout.orderInfo.ordercode,
 
                             payway: checkout.mode,
 
                         },
 
-                        contentType: 'application/x-www-form-urlencoded',
 
                         success: function (res) {
 
                             checkout.loading.hide(function () {
 
                                 checkout.loading = null
 
@@ -280,6 +279,10 @@
 
                                     window.location.replace("/front/wxMyOrder/integraldetail/" + orderCode)
 
                                     break
 
                                 }
 
+                                case 'dataPack': {
 
+                                    window.location.replace("/weixin/common/dataPack/orderDetail?order_code=" + orderCode)
 
+                                    break
 
+                                }
 
                             }
 
                         } else {
 
                             EasyAlert.show("系统异常，请稍微再试", "", 3000);
 
@@ -306,50 +309,22 @@
 
                                     iconHide: true,
 
                                     duration: 1500,
 
                                     callback: function () {
 
-                                      // 支付成功 判断有没有引流语id,有 需要埋点
 
-                                      if (checkout.getUrlParam('mid')) {
 
-                                        try {
 
-                                          $.ajax({
 
-                                            type: "POST",
 
-                                            url: "/publicapply/drainage/bmt/" + checkout.getUrlParam('mid'),
 
-                                            data: {
 
-                                              p: 'Paid'
 
-                                            },
 
-                                            success: function(r) {
 
-                                              console.log(r)
 
-                                            }
 
-                                          })
 
-                                        } catch (error) {
 
-                                          console.log(error)
 
-                                        }
 
-                                      }
 
-                                      // 采购单位画像引流过来的埋点
 
-                                      if (checkout.getUrlParam('bid')) {
 
-                                        try {
 
-                                          var params = {
 
-                                            mold: 'isPaid'
 
-                                          }
 
-                                          $.ajax({
 
-                                            type: 'POST',
 
-                                            url: '/publicapply/drainage/buyerunit',
 
-                                            contentType: "application/json",
 
-                                            data: JSON.stringify(params),
 
-                                            success: function (res) {
 
-                                              console.log(res)
 
-                                            },
 
-                                            error: function (error) {
 
-                                              console.log(error)
 
-                                            }
 
-                                          })
 
-                                        } catch (error) {
 
-                                          console.log(error)
 
-                                        }
 
-                                      }
 
+                                        // 支付成功 判断有没有引流语id,有 需要埋点
 
+                                        var productType = checkout.orderInfo.productType
 
+                                        checkout.buryingPoint()
 
+
 
                                         var  bigmemberBid=checkout.getUrlParam("b");
 
                                         var href ="/weixin/{{.T.doType}}/paySuccess?orderCode=" + res.orderCode + "&email=" + res.email + "&payTime=" + res.payTime + "&price=" + res.price + "&t={{.T.t}}"
 
+
 
                                         if(bigmemberBid==="1"){
 
                                           href="/weixin/aiForecastPack/paySuccess?orderCode=" + res.orderCode + "&email=" + res.email + "&payTime=" + res.payTime + "&price=" + res.price + "&t={{.T.t}}"
 
                                         }
 
+
 
+                                        // 数据流量包定制
 
+                                        if (productType === 'dataPack') {
 
+                                            href = href + '&header=充值数据流量包&filter=' + res.filter
 
+                                        }
 
+
 
                                         var docsId=checkout.getUrlParam("docId")
 
                                         if (docsId!=null){
 
                                           href +="&docsId="+docsId
 
@@ -446,9 +421,42 @@
 
                 if (r != null)
 
                     return unescape(r[2]);
 
                 return null;
 
+            },
 
+            // 埋点
 
+            buryingPoint: function () {
 
+                if (checkout.getUrlParam('mid')) {
 
+                    try {
 
+                        $.ajax({
 
+                            type: "POST",
 
+                            url: "/publicapply/drainage/bmt/" + checkout.getUrlParam('mid'),
 
+                            data: {
 
+                                p: 'Paid'
 
+                            }
 
+                        })
 
+                    } catch (error) {
 
+                        console.log(error)
 
+                    }
 
+                }
 
+                    // 采购单位画像引流过来的埋点
 
+                if (checkout.getUrlParam('bid')) {
 
+                    try {
 
+                        var params = {
 
+                            mold: 'isPaid'
 
+                        }
 
+                        $.ajax({
 
+                            type: 'POST',
 
+                            url: '/publicapply/drainage/buyerunit',
 
+                            contentType: "application/json",
 
+                            data: JSON.stringify(params)
 
+                        })
 
+                    } catch (error) {
 
+                        console.log(error)
 
+                    }
 
+                }
 
             }
 
         }
 
         checkout.init()
 
+        window.checkout = checkout
 
     })
 
 </script>
 
 {{include "/common/baiducc.html"}}

+ 25 - 0
src/web/templates/weixin/commonPay/paySuccess.html
Файл харах 

@@ -9,6 +9,7 @@
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/base.css?v={{Msg "seo" "version"}}"/>
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/weui.min.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
 
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/public.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wxCommonPay/css/pay_success.css?v={{Msg "seo" "version"}}">
 
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/css/wxbutton.css?v={{Msg "seo" "version"}}">
 
 </head>
 
@@ -23,6 +24,9 @@
 
                 <em></em>
 
             </p>
 
         </div>
 
+        <div class="info-box">
 
+            <div class="info-item"></div>
 
+        </div>
 
         <div class="info_box">
 
             <div class="pay_mode">
 
                 <span>支付方式</span>
 
@@ -75,6 +79,12 @@
 
             继续浏览
 
         </button>
 
     </div>
 
+    {{else if eq .T.doType "dataPack"}}
 
+        <div class="bottom_button j-button-group">
 
+            <button id ="order" class="j-button-confirm" onclick="window.location.href = '/weixin/common/dataPack/orderDetail?order_code={{.T.orderCode}}'">
 
+                查看订单
 
+            </button>
 
+        </div>
 
     {{end}}
 
 </div>
 
 </body>
 
@@ -83,6 +93,21 @@
 
     $(function () {
 
         var payTime = {{.T.payTime}}
 
         var price ={{.T.price}}
 
+        var productType = {{.T.doType}}
 
+
 
+        var headerTitle = decodeURIComponent(getParam('header'))
 
+        var orderFilter = decodeURIComponent(getParam('filter'))
 
+        if (headerTitle) {
 
+          document.title = headerTitle
 
+        }
 
+        if (orderFilter) {
 
+            orderFilter = JSON.parse(orderFilter)
 
+            // 数据包展示
 
+            if (productType === 'dataPack') {
 
+                $('.info-box .info-item').text('数据流量包：+' + orderFilter.pNum)
 
+            }
 
+        }
 
+
 
         var payData = ""
 
         if (payTime) {
 
             payData = new Date(parseInt(payTime) * 1000)