sale-client 3.6.216 → 3.6.217

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/components/charge/ChargeList.vue +1 -1
  3. package/src/components/revenue/Common/PaymentCode.vue +7 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.216",
3
+ "version": "3.6.217",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/ChargeList.vue CHANGED
@@ -162,7 +162,7 @@
162
162
  <td :class="{'bg-danger' : row.f_table_state === '停用' }"><nobr>
163
163
  {{row.f_userinfo_code}}
164
164
  </nobr> </td>
165
- <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }">
165
+ <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' || row.f_sellexp == '1'}">
166
166
  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_user_name}}&nbsp;&nbsp;{{row.f_user_phone}}&nbsp;&nbsp;{{row.f_address}}</a></span>
167
167
  </td>
168
168
  <td style="white-space: nowrap;" :class="{'bg-danger' : row.f_table_state === '停用' }">{{row.f_user_id}}&nbsp;&nbsp;{{row.f_gasproperties}}&nbsp;&nbsp;{{row.f_meter_brand}}
package/src/components/revenue/Common/PaymentCode.vue CHANGED
@@ -7,7 +7,7 @@
7
7
  <article slot="modal-body" class="modal-body">
8
8
  <div class="form-horizontal">
9
9
  <div class="form-group">
10
- <input type="text" class="form-control" @keyup.enter="ConfirmCode" @blur="paycodefocus"
10
+ <input type="text" class="form-control" id="paycode" @keyup.enter="ConfirmCode" @blur="paycodefocus"
11
11
  v-model="paymentCode" placeholder="请扫描用户付款码" v-el:paycode>
12
12
  </div>
13
13
  </div>
@@ -109,10 +109,16 @@
109
109
  self.closeTimer()
110
110
  return
111
111
  }
112
+ if (res1.result_msg == '支付失败') {
113
+ this.$showAlert(`支付失败, 请提醒用户重新付款`, 'danger')
114
+ this.closeTimer()
115
+ return
116
+ }
112
117
  if (times > 24) {
113
118
  self.$showAlert(`多次查询未成功，请重新扫描用户付款码`, 'danger')
114
119
  self.closeTimer()
115
120
  }
121
+
116
122
  }, 5000)
117
123
  } else {
118
124
  this.$showAlert(`${res.result_msg}, 请重新扫描用户付款码`, 'danger')