sale-client 4.2.139 → 4.2.140

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/filiale/ronghao/PaymentCode.vue +8 -7
  3. package/src/filiale/yangchun/BlackList/BlackList.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "4.2.139",
3
+ "version": "4.2.140",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/ronghao/PaymentCode.vue CHANGED
@@ -139,19 +139,20 @@
139
139
  res.flag = 'microPayRongHaoJsbc'
140
140
  }
141
141
  let res1 = await self.$resetpost(this.$login.f.dir === 'tianchang' ? 'api/af-revenue/logic/WeiXinPayStatus' : 'weixin2/rs/pay/microPayOrderStatus', res, {resolveMsg: null, rejectMsg: '付款码支付查询出错,'})
142
- this.paymentCodeReturnData = res1.data
142
+ console.log('self.paymentCodeReturnData', self.paymentCodeReturnData)
143
+ self.paymentCodeReturnData = res1.data
143
144
  res1 = res1.data
144
145
  // 支付成功关闭定时器
145
146
  if (this.$login.f.dir === 'tianchang') {
146
147
  if (res1.result_msg == '支付确认成功') {
147
- this.paymentCodeReturnData.f_out_trade_no = res1.data.transactionId
148
+ self.paymentCodeReturnData.f_out_trade_no = res1.transactionId
148
149
  self.paycoderesolve({msg: '支付完成', result: true})
149
150
  self.closeTimer()
150
151
  return
151
152
  }
152
153
  if (res1.result_msg == '支付失败') {
153
- this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
154
- this.closeTimer()
154
+ self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
155
+ self.closeTimer()
155
156
  return
156
157
  }
157
158
  } else {
@@ -161,9 +162,9 @@
161
162
  return
162
163
  }
163
164
  if (res1.result_msg == '扣款失败') {
164
- this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
165
- this.closeTimer()
166
- this.paymentCodeShow = false
165
+ self.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
166
+ self.closeTimer()
167
+ self.paymentCodeShow = false
167
168
  return
168
169
  }
169
170
  }
package/src/filiale/yangchun/BlackList/BlackList.vue CHANGED
@@ -279,7 +279,7 @@
279
279
  isBlackList: false,
280
280
  f_filialeid: '', // 所属公司
281
281
  f_filialename: '', // 所属公司名称
282
- f_limit: '限购气量',
282
+ f_limit: '限购金额',
283
283
  limites: [{label: '限购气量', value: '限购气量'}, {label: '限购金额', value: '限购金额'}],
284
284
  fstate: [{label: '移入', value: '移入'}, {label: '移出', value: '移出'}],
285
285
  flevel: [{label: '高', value: '高'}, {label: '中', value: '中'}, {label: '低', value: '低'}],