apply-clients 4.1.65-weinan → 4.1.66-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -236,14 +236,14 @@ export default {
       this.$dispatch('breakControl')
     },*/
     // 获取订单信息
-     getOrderInformation () {
+    async getOrderInformation () {
       this.state = '开始'
       // 查询订单信息
       console.log('查询订单信息！！！')
       // 查询订单状态
       try {
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
+        await 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 = '已支付' `,
@@ -252,6 +252,7 @@ export default {
           resolveMsg: null,
           rejectMsg: '订单查询失败！！！'
         }).then(res=>{
+          this.state = '结束'
           console.log('8888888888')
           console.log(this.order.f_out_trade_no)
           console.log(JSON.stringify(res))
@@ -274,7 +275,6 @@ export default {
       }catch (e){
         this.state = '结束'
       }
-      this.state = '结束'
     },
     checkApplyModel(){
       console.log(this.charge.payment_terms)
@@ -366,11 +366,11 @@ export default {
       console.log('下单信息')
       console.log(JSON.stringify(data))
       // 下订单
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/jsApiPay`, data, {
+     await http.load('POST', `${this.$androidUtil.getProxyUrl()}/wx/rs/pay/jsApiPay`, data, {
         resolveMsg: null,
         rejectMsg: '订单生成失败！！！'
       }).then(
-        res=>{
+        async res=>{
           console.log('=================================')
           console.log("数据测试"+JSON.stringify(res.data))
           this.order = res.data
@@ -381,10 +381,10 @@ export default {
             user: Vue.user,
             f_out_trade_no:this.order.f_out_trade_no
           }
-          http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
+         await http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
             resolveMsg: null,
             rejectMsg: null
-          }).then(ress=>{
+          }).then( async ress=>{
             console.log('ress',ress)
             if(ress.data.code == '200'){
               this.f_charge_number = ress.data.f_charge_number
@@ -398,9 +398,9 @@ export default {
               },1000)
 
               // 3秒查询一次订单支付信息
-              this.orderInterval = setInterval(() => {
+              this.orderInterval = setInterval(async() => {
                 if(this.state == '结束'){
-                  this.getOrderInformation()
+                 await this.getOrderInformation()
                 }
               },3000)
             }else{