Merge remote-tracking branch 'origin/feature/v4.9.79' into feature/v4.9.79

src/web/templates/common/returnMoney/wxReturnMoney.html

@@ -123,9 +123,16 @@
 <script src='{{Msg "seo" "cdn"}}/big-member/js/utils.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/appPay/js/popup.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/appPay/js/appPay.js?v={{Msg "seo" "version"}}'></script>
+<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
+<script>new VConsole()</script>
 <script>
     $(function () {
         var checkout = {
+            data: {
+                token: '',
+                noLogin: false, // 是否免登陆支付
+                orderPrice: ''
+            },
             modeMap: {
                 'weixin': 'wx_js',
             },
@@ -135,12 +142,31 @@
                 1: '操作成功'
             },
             mode: 'wx_js',
+            orderInfo: {
+                ordercode: {{.T.orderCode}},
+                productType:{{.T.doType}}
+            },
             loading: null,
             init: function () {
+              this.getParams()
               this.show()
               this.clickEventsWithPayMode()
               this.confirmPayEvent()
             },
+            getParams: function () {
+                var orderPrice = utils.getParam('order_price')
+                var noLogin= utils.getParam('no_login')
+                var token= utils.getParam('token')
+                if (orderPrice) {
+                    this.data.orderPrice = orderPrice
+                }
+                if (noLogin) {
+                    this.data.noLogin = noLogin
+                }
+                if (token) {
+                    this.data.token = token
+                }
+            },
             show: function () {
               $(".price-container .price").text(checkout.formatMoney({{.T.data.return_money}} / 100));
             },
@@ -265,6 +291,7 @@
                                           href +="&docsId="+docsId
                                         }
                                         setTimeout(function() {
+                                          alert('href', href)
                                           location.replace(href);
                                         }, 300)
                                     }