apply-clients 4.1.58-weinan → 4.1.60-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.58-weinan",
+  "version": "4.1.60-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppChargeManagement.vue

@@ -235,14 +235,14 @@ export default {
       this.$dispatch('breakControl')
     },*/
     // 获取订单信息
-    async getOrderInformation () {
+     getOrderInformation () {
       this.state = '开始'
       // 查询订单信息
       console.log('查询订单信息！！！')
       // 查询订单状态
       try {
         let http = new HttpResetClass()
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
+        let res =  http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
           data: {
             tablename: "t_weixinreturnxml",
             condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_order_state = '已支付' `,
@@ -317,13 +317,13 @@ export default {
           tablename: 't_userinfo',
           condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
         }
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'}).then(res1=>{
+        await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'}).then(res1=>{
           this.$showMessage( `确认对${res1.data[0].f_user_name}进行${this.charge.f_payment_method}收费?`,['confirm', 'cancel']).then((res)=>{
             if (res=='confirm'){
               http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
                 resolveMsg: null,
                 rejectMsg: null
-              }).then(res=>{
+              }).then(async (res)=>{
                 console.log(res.data)
                 if (res.data.code == '200') {
                   this.$showMessage('缴费成功！')
@@ -362,7 +362,7 @@ export default {
       console.log('下单信息')
       console.log(JSON.stringify(data))
       // 下订单
-       await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/jsApiPay`, data, {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/jsApiPay`, data, {
         resolveMsg: null,
         rejectMsg: '订单生成失败！！！'
       }).then(
@@ -371,42 +371,40 @@ export default {
           console.log("数据测试"+JSON.stringify(res.data))
           this.order = res.data
           console.log("数据测试"+this.order)
-        }
-      )
-      let info = {
-        apply: this.selectdata,
-        charge: this.charge,
-        user: Vue.user,
-        f_out_trade_no:this.order.f_out_trade_no
-      }
-      http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
-        resolveMsg: null,
-        rejectMsg: null
-      }).then(ress=>{
-        console.log('ress',ress)
-        if(ress.data.code == '200'){
-          this.f_charge_number = ress.data.f_charge_number
-          this.showQrCode = true
-          this.$nextTick(()=>{
-            this.qrcode()
-          })
-          // 剩余支付时间
-          this.paymentInterval = setInterval(() => {
-            this.timeLeft = this.timeLeft - 1
-          },1000)
+          let info = {
+            apply: this.selectdata,
+            charge: this.charge,
+            user: Vue.user,
+            f_out_trade_no:this.order.f_out_trade_no
+          }
+          http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
+            resolveMsg: null,
+            rejectMsg: null
+          }).then(ress=>{
+            console.log('ress',ress)
+            if(ress.data.code == '200'){
+              this.f_charge_number = ress.data.f_charge_number
+              this.showQrCode = true
+              this.$nextTick(()=>{
+                this.qrcode()
+              })
+              // 剩余支付时间
+              this.paymentInterval = setInterval(() => {
+                this.timeLeft = this.timeLeft - 1
+              },1000)
 
-          // 3秒查询一次订单支付信息
-          this.orderInterval = setInterval(() => {
-            if(this.state == '结束'){
-              this.getOrderInformation()
+              // 3秒查询一次订单支付信息
+              this.orderInterval = setInterval(() => {
+                if(this.state == '结束'){
+                  this.getOrderInformation()
+                }
+              },3000)
+            }else{
+              this.$showMessage('订单生成失败')
             }
-          },3000)
-        }else{
-          this.$showMessage('订单生成失败')
+          })
         }
-      })
-
-
+      )
     },
     accMul(arg1,arg2) {
       let m = 0, s1 = arg1.toString(), s2 = arg2.toString();
@@ -653,7 +651,7 @@ export default {
         "f_collection":this.selectdata.f_cost_sum,
         "f_comments":"",
         "f_payment":this.charge.f_payment_method,
-        "f_voucher_number":"",
+        "f_voucher_number":this.order.f_out_trade_no,
         "f_bill_style":"普通收据",
         "f_userinfo_id":res.data[0].f_userinfo_id,
         "f_service_person":Vue.user.name,