apply-clients 4.1.10-weinan → 4.1.11-weinan

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "4.1.10-weinan",
3
+ "version": "4.1.11-weinan",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -142,7 +142,7 @@
142
142
 
143
143
  <modal :show.sync="showQrCode" v-ref:qrcodemodal :large="true" :backdrop="false" style="height: 100%">
144
144
  <header slot="modal-header" class="modal-header">
145
- <h4 class="modal-title">微信扫码支付</h4>
145
+ <h4 class="modal-title">{{title1}}扫码支付</h4>
146
146
  </header>
147
147
  <article slot="modal-body" class="modal-body clearfix">
148
148
  <div class="text-center">
@@ -199,7 +199,8 @@ export default {
199
199
  filiale:"",
200
200
  config: {
201
201
 
202
- }
202
+ },
203
+ title1:''
203
204
  }
204
205
  },
205
206
  ready () {
@@ -237,12 +238,10 @@ export default {
237
238
  // 查询订单状态
238
239
 
239
240
  let http = new HttpResetClass()
240
- let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
241
+ let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {
241
242
  data: {
242
- items: "id",
243
243
  tablename: "t_weixinreturnxml",
244
244
  condition: ` f_out_trade_no = '${this.order.f_out_trade_no}' and f_orde_state = '已支付' `,
245
- orderitem: "id"
246
245
  }
247
246
  }, {
248
247
  resolveMsg: null,
@@ -322,6 +321,12 @@ export default {
322
321
  })
323
322
  return
324
323
  }
324
+ if (this.charge.f_payment_method == '微信支付'){
325
+ this.title1 = '微信'
326
+ }
327
+ if (this.charge.f_payment_method == '支付宝支付'){
328
+ this.title1 = '支付宝'
329
+ }
325
330
  this.showCharge=false
326
331
  //this.$dispatch('changeShowfei','待付款')
327
332
  //this.saveCharge()