shish 2 tuần trước cách đây
mục cha
commit
2b2f8f7d3e

+ 1 - 3
ghsApp/src/admin/billing/toPay.vue

@@ -89,7 +89,6 @@ export default {
 			typescan: 'scan-listener',
 			typescan: 'scan-listener',
       remindText:'',
       remindText:'',
       returnCode:'',
       returnCode:'',
-      authCode:'', // 存储付款码数字
       pollingTimer:null, // 后台自动复查定时器
       pollingTimer:null, // 后台自动复查定时器
       pollingCount:0, // 自动复查次数
       pollingCount:0, // 自动复查次数
       isPaymentProcessing:false // 防重复扫码标志
       isPaymentProcessing:false // 防重复扫码标志
@@ -233,7 +232,6 @@ export default {
         this.isPaymentProcessing = true
         this.isPaymentProcessing = true
         this.remindText = ''
         this.remindText = ''
         this.returnCode = ''
         this.returnCode = ''
-        this.authCode = authCode // 记录当前支付码
         this.clearPolling()
         this.clearPolling()
 
 
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
@@ -291,7 +289,7 @@ export default {
 
 
             that.remindText = `正在自动复查支付结果 (${that.pollingCount}/4)...`
             that.remindText = `正在自动复查支付结果 (${that.pollingCount}/4)...`
 
 
-            codePayVerify({id:that.orderId,authCode:that.authCode}).then(res=>{
+            codePayVerify({id:that.orderId}).then(res=>{
                 if(res.code == 1){
                 if(res.code == 1){
                     if(res.data && res.data.returnStatus == 'SUCCESS'){
                     if(res.data && res.data.returnStatus == 'SUCCESS'){
                         that.clearPolling()
                         that.clearPolling()

+ 1 - 1
ghsApp/src/api/order/index.js

@@ -268,7 +268,7 @@ export const codePay = data => https.get("/order/code-pay", data);
 //微信和支付宝付款码支付复查
 //微信和支付宝付款码支付复查
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 
 
-//微信和支付宝付款码支付验证(带付款码)
+//微信和支付宝付款码支付验证
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 
 
 //收款语音播报
 //收款语音播报

+ 1 - 1
ghsPad/src/api/order/index.js

@@ -198,7 +198,7 @@ export const codePay = data => https.get("/order/code-pay", data);
 //微信和支付宝付款码支付复查
 //微信和支付宝付款码支付复查
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 
 
-//微信和支付宝付款码支付验证(带付款码)
+//微信和支付宝付款码支付验证
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 
 
 //收款语音播报
 //收款语音播报

+ 3 - 5
ghsPad/src/pages/home/components/toPay.vue

@@ -70,7 +70,6 @@ export default {
             goPay:0, // 0: 未支付,1: 支付请求中/自动复查中,2: 支付失败或异常提示
             goPay:0, // 0: 未支付,1: 支付请求中/自动复查中,2: 支付失败或异常提示
             remindText:'',
             remindText:'',
             returnCode:'',
             returnCode:'',
-            authCode:'', // 存储付款码数字
             cancelText:'确认要取消?',
             cancelText:'确认要取消?',
             isCancelDialogOpen:false,
             isCancelDialogOpen:false,
             isPaymentProcessing:false, // 标志位:防重复扫码
             isPaymentProcessing:false, // 标志位:防重复扫码
@@ -164,9 +163,8 @@ export default {
             this.isPaymentProcessing = true
             this.isPaymentProcessing = true
             this.remindText = ''
             this.remindText = ''
             this.returnCode = ''
             this.returnCode = ''
-            this.authCode = authCode // 记录支付码
             this.clearPolling() // 每次开始扫码前,确保清除旧的定时器
             this.clearPolling() // 每次开始扫码前,确保清除旧的定时器
-            
+
             codePay({id:this.orderId,authCode:authCode}).then(res=>{
             codePay({id:this.orderId,authCode:authCode}).then(res=>{
                 if(res.code == 1){
                 if(res.code == 1){
                     if(res.data.returnStatus == 'SUCCESS'){
                     if(res.data.returnStatus == 'SUCCESS'){
@@ -225,8 +223,8 @@ export default {
                 
                 
                 // 界面上展示当前自动复查的进度,提升收银员体验
                 // 界面上展示当前自动复查的进度,提升收银员体验
                 that.remindText = `正在自动复查支付结果 (第 ${that.pollingCount}/4 次)...`
                 that.remindText = `正在自动复查支付结果 (第 ${that.pollingCount}/4 次)...`
-                
-                codePayVerify({id:that.orderId,authCode:that.authCode}).then(res=>{
+
+                codePayVerify({id:that.orderId}).then(res=>{
                     if(res.code == 1){
                     if(res.code == 1){
                         if(res.data && res.data.returnStatus == 'SUCCESS'){
                         if(res.data && res.data.returnStatus == 'SUCCESS'){
                             // 复查确认成功,停止轮询并显示成功界面
                             // 复查确认成功,停止轮询并显示成功界面

+ 1 - 3
hdApp/src/admin/billing/toPay.vue

@@ -77,7 +77,6 @@ export default {
 			typescan: 'scan-listener',
 			typescan: 'scan-listener',
       remindText:'',
       remindText:'',
       returnCode:'',
       returnCode:'',
-      authCode:'', // 存储付款码数字
       pollingTimer:null, // 后台自动复查定时器
       pollingTimer:null, // 后台自动复查定时器
       pollingCount:0, // 自动复查次数
       pollingCount:0, // 自动复查次数
       isPaymentProcessing:false // 防重复扫码标志
       isPaymentProcessing:false // 防重复扫码标志
@@ -161,7 +160,6 @@ export default {
         this.isPaymentProcessing = true
         this.isPaymentProcessing = true
         this.remindText = ''
         this.remindText = ''
         this.returnCode = ''
         this.returnCode = ''
-        this.authCode = authCode // 记录支付码
         this.clearPolling()
         this.clearPolling()
 
 
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
         codePay({id:this.orderId,authCode:authCode}).then(res=>{
@@ -219,7 +217,7 @@ export default {
 
 
             that.remindText = `正在自动复查支付结果 (${that.pollingCount}/4)...`
             that.remindText = `正在自动复查支付结果 (${that.pollingCount}/4)...`
 
 
-            codePayVerify({id:that.orderId,authCode:that.authCode}).then(res=>{
+            codePayVerify({id:that.orderId}).then(res=>{
                 if(res.code == 1){
                 if(res.code == 1){
                     if(res.data && res.data.returnStatus == 'SUCCESS'){
                     if(res.data && res.data.returnStatus == 'SUCCESS'){
                         that.clearPolling()
                         that.clearPolling()

+ 1 - 1
hdApp/src/api/order/index.js

@@ -10,7 +10,7 @@ export const codePay = data => https.get("/order/code-pay", data);
 //微信和支付宝付款码支付复查
 //微信和支付宝付款码支付复查
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 
 
-//微信和支付宝付款码支付验证(带付款码)
+//微信和支付宝付款码支付验证
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 
 
 export const updateOrder = data => {
 export const updateOrder = data => {

+ 1 - 1
hdPad/src/api/order/index.js

@@ -198,7 +198,7 @@ export const codePay = data => https.get("/order/code-pay", data);
 //微信和支付宝付款码支付复查
 //微信和支付宝付款码支付复查
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 export const codePayCheck = data => https.get("/order/code-pay-check", data);
 
 
-//微信和支付宝付款码支付验证(带付款码)
+//微信和支付宝付款码支付验证
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 export const codePayVerify = data => https.get("/order/code-pay-verify", data);
 
 
 //收款语音播报
 //收款语音播报

+ 3 - 5
hdPad/src/pages/home/components/toPay.vue

@@ -59,7 +59,6 @@ export default {
             goPay:0, // 0: 未支付,1: 支付请求中/复查中,2: 支付失败或异常提示
             goPay:0, // 0: 未支付,1: 支付请求中/复查中,2: 支付失败或异常提示
             remindText:'',
             remindText:'',
             returnCode:'',
             returnCode:'',
-            authCode:'', // 存储付款码数字
             cancelText:'确认要取消?',
             cancelText:'确认要取消?',
             isCancelDialogOpen:false,
             isCancelDialogOpen:false,
             isPaymentProcessing:false, // 标志位:防重复扫码
             isPaymentProcessing:false, // 标志位:防重复扫码
@@ -145,9 +144,8 @@ export default {
             this.isPaymentProcessing = true
             this.isPaymentProcessing = true
             this.remindText = ''
             this.remindText = ''
             this.returnCode = ''
             this.returnCode = ''
-            this.authCode = authCode // 记录支付码
             this.clearPolling() // 每次开始扫码前,确保清除旧的定时器
             this.clearPolling() // 每次开始扫码前,确保清除旧的定时器
-            
+
             codePay({id:this.orderId,authCode:authCode,version:2}).then(res=>{
             codePay({id:this.orderId,authCode:authCode,version:2}).then(res=>{
                 if(res.code == 1){
                 if(res.code == 1){
                     if(res.data.returnStatus == 'SUCCESS'){
                     if(res.data.returnStatus == 'SUCCESS'){
@@ -206,8 +204,8 @@ export default {
                 
                 
                 // 界面展示当前自动复查的进度,提升收银员体验
                 // 界面展示当前自动复查的进度,提升收银员体验
                 that.remindText = `正在自动复查支付结果 (第 ${that.pollingCount}/4 次)...`
                 that.remindText = `正在自动复查支付结果 (第 ${that.pollingCount}/4 次)...`
-                
-                codePayVerify({id:that.orderId,authCode:that.authCode}).then(res=>{
+
+                codePayVerify({id:that.orderId}).then(res=>{
                     if(res.code == 1){
                     if(res.code == 1){
                         if(res.data && res.data.returnStatus == 'SUCCESS'){
                         if(res.data && res.data.returnStatus == 'SUCCESS'){
                             // 复查确认成功,停止轮询并显示成功界面
                             // 复查确认成功,停止轮询并显示成功界面