apply-clients 4.1.8-weinan → 4.1.11-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -142,7 +142,7 @@
 
     <modal  :show.sync="showQrCode" v-ref:qrcodemodal :large="true" :backdrop="false" style="height: 100%">
       <header slot="modal-header" class="modal-header">
-        <h4 class="modal-title">微信扫码支付</h4>
+        <h4 class="modal-title">{{title1}}扫码支付</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
         <div class="text-center">
@@ -199,7 +199,8 @@ export default {
       filiale:"",
       config: {
 
-      }
+      },
+      title1:''
     }
   },
   ready () {
@@ -237,12 +238,10 @@ export default {
       // 查询订单状态
 
       let http = new HttpResetClass()
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
         data: {
-          items: "id",
           tablename: "t_weixinreturnxml",
           condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_orde_state = '已支付' `,
-          orderitem: "id"
         }
       }, {
         resolveMsg: null,
@@ -322,12 +321,18 @@ export default {
         })
         return
       }
+      if (this.charge.f_payment_method == '微信支付'){
+        this.title1 = '微信'
+      }
+      if (this.charge.f_payment_method == '支付宝支付'){
+        this.title1 = '支付宝'
+      }
       this.showCharge=false
       //this.$dispatch('changeShowfei','待付款')
       //this.saveCharge()
       // 接口金额 单位为：分
       let data = {
-        money: this.accMul(this.getTotalAmount() ,1),
+        money: this.accMul(this.getTotalAmount() ,1) + '',
         attach: {
           "f_apply_num": this.selectdata.f_apply_num,
           "f_user": Vue.user.id
@@ -341,13 +346,17 @@ export default {
       console.log('下单信息')
       console.log(JSON.stringify(data))
       // 下订单
-      let res = await 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: '订单生成失败！！！'
-      })
-      console.log('=================================')
-      console.log(JSON.stringify(res.data))
-      this.order = res.data
+      }).then(
+        res=>{
+          console.log('=================================')
+          console.log("数据测试"+JSON.stringify(res.data))
+          this.order = res.data
+          console.log("数据测试"+this.order)
+        }
+      )
       let info = {
         apply: this.selectdata,
         charge: this.charge,