sale-client 4.2.139-1 → 4.2.139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.139-1",
+  "version": "4.2.139",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/filiale/ronghao/PaymentCode.vue

@@ -139,20 +139,19 @@
               res.flag = 'microPayRongHaoJsbc'
             }
             let res1 = await self.$resetpost(this.$login.f.dir === 'tianchang' ? 'api/af-revenue/logic/WeiXinPayStatus' : 'weixin2/rs/pay/microPayOrderStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
-            console.log('self.paymentCodeReturnData', self.paymentCodeReturnData)
-            self.paymentCodeReturnData = res1.data
+            this.paymentCodeReturnData = res1.data
             res1 = res1.data
             // 支付成功关闭定时器
             if (this.$login.f.dir === 'tianchang') {
               if (res1.result_msg == '支付确认成功') {
-                self.paymentCodeReturnData.f_out_trade_no = res1.transactionId
+                this.paymentCodeReturnData.f_out_trade_no = res1.data.transactionId
                 self.paycoderesolve({msg: '支付完成', result: true})
                 self.closeTimer()
                 return
               }
               if (res1.result_msg == '支付失败') {
-                self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
-                self.closeTimer()
+                this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+                this.closeTimer()
                 return
               }
             } else {
@@ -162,9 +161,9 @@
                 return
               }
               if (res1.result_msg == '扣款失败') {
-                self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
-                self.closeTimer()
-                self.paymentCodeShow = false
+                this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
+                this.closeTimer()
+                this.paymentCodeShow = false
                 return
               }
             }