sale-client 3.5.102 → 3.5.103

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 (4) hide show
  1. package/build/dev-server.js +38 -12
  2. package/package.json +1 -1
  3. package/src/filiale/alashan/sale.js +4 -1
  4. package/src/plugins/CardService.js +11 -11
package/build/dev-server.js CHANGED
@@ -10,9 +10,10 @@ var compiler = webpack(config)
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- var bendi = 'http://127.0.0.1:8080', bendi1 = 'http://121.36.106.17:8400/'
13
+ var bendi = 'http://121.36.106.17:8400', bendi1 = 'http://121.36.106.17:8400/'
14
14
  // 公司测试服务
15
- var fuwu = 'http://192.168.50.4:8400'
15
+ // var fuwu = 'http://192.168.50.4:8400'
16
+ var fuwu = 'http://39.99.85.14:8400'
16
17
  // var fuwu = 'http://121.36.106.17:8400/'
17
18
  // 铜川正式
18
19
  // var fuwu = 'http://61.134.55.234:9999/'
@@ -30,15 +31,40 @@ var fuwu = 'http://192.168.50.4:8400'
30
31
  // var fuwu = 'http://139.214.92.34:8301/'
31
32
 
32
33
  var proxyTable = {
33
- '/rs/logic/saleExport': {
34
- target: fuwu
35
- },
36
- '/rs/logic/saleGetExportProgress': {
37
- target: fuwu
38
- },
39
- '/rs/logic/getWarningMsg': {
40
- target: 'http://localhost:8080/'
41
- },
34
+ // '/'
35
+ // '/rs/logic/stopBasicLivingNew':{
36
+ // target:'http://127.0.0.1:8080'
37
+ // },
38
+ // '/rs/logic/getBatchOperaPro':{
39
+ // target:'http://127.0.0.1:8080'
40
+ // },
41
+ // '/rs/sql/sale_getUser':{
42
+ // target:'http://127.0.0.1:8080'
43
+ // },
44
+ // '/rs/logic/getOperBtns':{
45
+ // target:'http://127.0.0.1:8080'
46
+ // },
47
+ // '/rs/file/uploadFile':{
48
+ // target:'http://127.0.0.1:8080'
49
+ // },
50
+ // '/rs/business/batchRunExcelDefault/filemanage_fileSave/newSettleFileImport':{
51
+ // target:'http://127.0.0.1:8080'
52
+ // },
53
+ // '/rs/business/batchRunNew/BatchmachineDownHand/machineDownHand':{
54
+ // target:'http:127.0.0.1:8080'
55
+ // },
56
+ // '/rs/sql/getDownPlan':{
57
+ // target:'http:127.0.0.1:8080'
58
+ // },
59
+ // '/rs/logic/saleExport': {
60
+ // target: fuwu
61
+ // },
62
+ // '/rs/logic/saleGetExportProgress': {
63
+ // target: fuwu
64
+ // },
65
+ // '/rs/logic/getWarningMsg': {
66
+ // target: 'http://localhost:8080/'
67
+ // },
42
68
  '/rs/file': {
43
69
  target: fuwu
44
70
  },
@@ -158,7 +184,7 @@ app.use(hotMiddleware)
158
184
  // serve pure static assets
159
185
  app.use('/static', express.static('./static'))
160
186
 
161
- module.exports = app.listen(8089, function (err) {
187
+ module.exports = app.listen(8085, function (err) {
162
188
  if (err) {
163
189
  console.log(err)
164
190
  return
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.5.102",
3
+ "version": "3.5.103",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/filiale/alashan/sale.js CHANGED
@@ -8,6 +8,9 @@ let specialComp = {
8
8
  // 卡表收费
9
9
  'card-meter-center': (resolve) => { require(['./business/CardMeterCenter'], resolve) },
10
10
  // 票据补打
11
- 'reissue-bill': (resolve) => { require(['./ReissueBill'], resolve) }
11
+ 'reissue-bill': (resolve) => { require(['./ReissueBill'], resolve) },
12
+
13
+ 'file-user-device-info': (resolve) => { require(['./UserDeviceInfoTest'], resolve) }
14
+
12
15
  }
13
16
  exports.specialComp = specialComp
package/src/plugins/CardService.js CHANGED
@@ -1671,19 +1671,19 @@ let sellgasGen = async function (model, row) {
1671
1671
  } else {
1672
1672
  // 调用读卡进行校验
1673
1673
  let readCardInfo = await Vue.resetpost('http://127.0.0.1:8003/ReadCard', {kmm: row.f_card_password}, {resolveMsg: null, rejectMsg: '读卡失败！！'})
1674
- if (readCardInfo.data) {
1674
+ if (readCardInfo.data && Vue.$login.r.includes('读卡2')) {
1675
1675
  console.log('读卡验证', readCardInfo.data, row)
1676
- if (row.f_collection_type === '按金额') {
1677
- if (readCardInfo.data.Money !== model.f_preamount || readCardInfo.data.Factory !== row.f_alias) {
1678
- Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
1679
- return
1680
- }
1681
- } else {
1682
- if (readCardInfo.data.Gas !== Number((model.f_pregas - 0).toFixed(2)) || readCardInfo.data.Factory !== row.f_alias) {
1683
- Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
1684
- return
1685
- }
1676
+ if (row.f_collection_type === '按金额') {
1677
+ if (readCardInfo.data.Money !== model.f_preamount || readCardInfo.data.Factory !== row.f_alias) {
1678
+ Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
1679
+ return result.data.id
1686
1680
  }
1681
+ } else {
1682
+ if (readCardInfo.data.Gas !== Number((model.f_pregas - 0).toFixed(2)) || readCardInfo.data.Factory !== row.f_alias) {
1683
+ Vue.showAlert('读卡参数和缴费参数不一致，请核实！！', 'warning', 2000)
1684
+ return result.data.id
1685
+ }
1686
+ }
1687
1687
  }
1688
1688
  // 更新卡密码
1689
1689
  await Vue.CommonService.updatePassword(row, cardRes)