From fa3470f48ebd003ff97eed1340483da7833c0832 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 15 七月 2020 09:29:23 +0800
Subject: [PATCH] 2020-07-15

---
 src/views/pay/index.jsx                                |   24 +++++++++++++++++++-----
 src/tabviews/zshare/actionList/newpagebutton/index.jsx |    7 +++----
 src/utils/utils.js                                     |    6 ++++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/tabviews/zshare/actionList/newpagebutton/index.jsx b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
index c6b298a..b95ad28 100644
--- a/src/tabviews/zshare/actionList/newpagebutton/index.jsx
+++ b/src/tabviews/zshare/actionList/newpagebutton/index.jsx
@@ -42,6 +42,7 @@
    */
   actionTrigger = (record) => {
     const { setting, btn, selectedData } = this.props
+    const _this = this
     let data = []
 
     if (record) { // 琛ㄦ牸涓Е鍙戞寜閽�
@@ -88,9 +89,8 @@
     } else if (btn.pageTemplate === 'pay') {
       let _p = `ID=${Id}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID')}&logo=${window.GLOB.doclogo}&name=${sessionStorage.getItem('Full_Name')}&suid=${sessionStorage.getItem('SessionUid')}&icp=${window.GLOB.ICP}&copyRight=${window.GLOB.copyRight}`
       let url = '#/pay/' +  window.btoa(window.encodeURIComponent(_p))
-      let _this = this
-
-      _this.props.updateStatus('start')
+      
+      this.props.updateStatus('start')
       confirm({
         title: '璇峰湪浠樻椤甸潰瀹屾垚璁㈠崟鏀粯銆�',
         content: '',
@@ -102,7 +102,6 @@
         },
         onCancel() {
           _this.props.updateStatus('refresh', 'grid')
-          // _this.props.updateStatus('over')
         },
       })
       window.open(url)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index c8c2796..715db52 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -962,7 +962,8 @@
         
         aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-      if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+      // if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+      if (window.GLOB.systemType !== 'production') {
         let fsql = `
         ${_sql}
         ${_sqlInsert}
@@ -1592,7 +1593,8 @@
     _sql += `
         aaa: select @ErrorCode as ErrorCode,@retmsg as retmsg`
 
-    if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+    // if (window.GLOB.systemType !== 'production' && options.sysType !== 'cloud') {
+    if (window.GLOB.systemType !== 'production') {
       _sql = _sql.replace(/\n\s{8}/ig, '\n')
       console.log(_sql)
     }
diff --git a/src/views/pay/index.jsx b/src/views/pay/index.jsx
index 30c32d2..d759fcd 100644
--- a/src/views/pay/index.jsx
+++ b/src/views/pay/index.jsx
@@ -2,7 +2,7 @@
 import moment from 'moment'
 import md5 from 'md5'
 import QRCode from 'qrcode.react'
-import { notification, Tabs } from 'antd'
+import { notification, Tabs, Modal } from 'antd'
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
@@ -70,8 +70,7 @@
   getOrder = (Id) => {
     let param = {
       func: 's_get_weixin_pay_native',
-      ID: Id,
-      // sandbox: 'Y'
+      ID: Id
     }
 
     param.LTextOut = md5(param.ID + window.GLOB.appkey)
@@ -99,6 +98,14 @@
         if (res.pay_status) {
           this.setState({
             overdone: true
+          })
+          Modal.success({
+            title: '鏀粯鎴愬姛锛�',
+            content: '璇峰埛鏂拌鍗曢〉闈紝鏌ョ湅璁㈠崟鐘舵�併��',
+            okText: '鐭ラ亾浜�',
+            onOk() {
+              window.close()
+            }
           })
           return
         }
@@ -163,8 +170,7 @@
       if ((second - 1) % 5 === 0) {
         let param = {
           func: 's_get_weixin_pay_native_status',
-          out_trade_no: orderNo,
-          // sandbox: 'Y'
+          out_trade_no: orderNo
         }
 
         param.LTextOut = md5(orderNo + window.GLOB.appkey)
@@ -176,6 +182,14 @@
             this.setState({
               overdone: true
             })
+            Modal.success({
+              title: '鏀粯鎴愬姛锛�',
+              content: '璇峰埛鏂拌鍗曢〉闈紝鏌ョ湅璁㈠崟鐘舵�併��',
+              okText: '鐭ラ亾浜�',
+              onOk() {
+                window.close()
+              }
+            })
           }
         })
       }

--
Gitblit v1.8.0