apply-clients 3.3.110-236 → 3.3.110-237
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": "3.3.110-
|
|
3
|
+
"version": "3.3.110-237",
|
|
4
4
|
"description": "报建前端模块",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
"style": "0.0.3",
|
|
94
94
|
"style-loader": "^0.20.3",
|
|
95
95
|
"system-clients": "3.1.87",
|
|
96
|
-
"system-phone": "1.2.
|
|
96
|
+
"system-phone": "1.2.96",
|
|
97
97
|
"url-loader": "^0.5.7",
|
|
98
98
|
"vue-client": "1.24.33",
|
|
99
99
|
"vue-hot-reload-api": "^1.2.0",
|
|
@@ -245,10 +245,9 @@ export default {
|
|
|
245
245
|
let data = {
|
|
246
246
|
apply: this.selectdata,
|
|
247
247
|
charge: this.charge,
|
|
248
|
-
user: Vue.user
|
|
249
|
-
|
|
248
|
+
user: Vue.user,
|
|
249
|
+
f_out_trade_no:this.order.f_out_trade_no
|
|
250
250
|
}
|
|
251
|
-
|
|
252
251
|
let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/appaddApplyChargeRecord`, {data:data}, {
|
|
253
252
|
resolveMsg: null,
|
|
254
253
|
rejectMsg: '缴费失败！！！'
|
|
@@ -361,26 +360,39 @@ export default {
|
|
|
361
360
|
resolveMsg: null,
|
|
362
361
|
rejectMsg: '订单生成失败！！！'
|
|
363
362
|
})
|
|
364
|
-
|
|
365
363
|
console.log('=================================')
|
|
366
364
|
console.log(JSON.stringify(res.data))
|
|
367
365
|
this.order = res.data
|
|
366
|
+
let info = {
|
|
367
|
+
apply: this.selectdata,
|
|
368
|
+
charge: this.charge,
|
|
369
|
+
user: Vue.user,
|
|
370
|
+
f_out_trade_no:this.order.f_out_trade_no
|
|
371
|
+
}
|
|
372
|
+
http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/beforeAddChargeRecord`,{data:info},{
|
|
373
|
+
resolveMsg: null,
|
|
374
|
+
rejectMsg: null
|
|
375
|
+
}).then(ress=>{
|
|
376
|
+
console.log('ress',ress)
|
|
377
|
+
if(ress.data.code == '200'){
|
|
378
|
+
this.showQrCode = true
|
|
379
|
+
this.$nextTick(()=>{
|
|
380
|
+
this.qrcode()
|
|
381
|
+
})
|
|
382
|
+
// 剩余支付时间
|
|
383
|
+
this.paymentInterval = setInterval(() => {
|
|
384
|
+
this.timeLeft = this.timeLeft - 1
|
|
385
|
+
},1000)
|
|
368
386
|
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
387
|
+
// 3秒查询一次订单支付信息
|
|
388
|
+
this.orderInterval = setInterval(() => {
|
|
389
|
+
this.getOrderInformation()
|
|
390
|
+
},3000)
|
|
391
|
+
}else{
|
|
392
|
+
this.$showMessage('订单生成失败')
|
|
393
|
+
}
|
|
373
394
|
})
|
|
374
395
|
|
|
375
|
-
// 剩余支付时间
|
|
376
|
-
this.paymentInterval = setInterval(() => {
|
|
377
|
-
this.timeLeft = this.timeLeft - 1
|
|
378
|
-
},1000)
|
|
379
|
-
|
|
380
|
-
// 3秒查询一次订单支付信息
|
|
381
|
-
this.orderInterval = setInterval(() => {
|
|
382
|
-
this.getOrderInformation()
|
|
383
|
-
},3000)
|
|
384
396
|
|
|
385
397
|
},
|
|
386
398
|
accMul(arg1,arg2) {
|