handpos-client 1.0.2 → 1.0.4

package/src/service/CheckCard.js

@@ -1,103 +1,111 @@
-import Vue from 'vue'
-
-/**
- *   @author GaoChengLong
- *   @date 2018/12/7 16:38
- *   轮询检测卡并且读卡获取卡信息
- */
-export default class CheckCard {
-
-  constructor(components) {
-    this.self = components
-    // 助记执行次数
-    this.count = 0
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-    // 计时器
-    this.timeOut = null
-  }
-
-  doAction() {
-    return new Promise((resolve, reject) => {
-      this.resolve = resolve
-      this.reject = reject
-      let obj = this
-      this.timeOut = window.setInterval(() => {
-        obj.checkCard(obj)
-      }, 1000)
-    })
-  }
-
-  commit() {
-
-  }
-
-  rollback() {
-    this.self.cardInfo = {}
-    this.self.userInfo = {}
-  }
-
-  // 检测是否有卡
-  async checkCard(obj) {
-    if (obj.count === 0) {
-      obj.self.$showAlert('正在检查卡槽是否有卡', 'success', 2000)
-    }
-    if (obj.count % 10 === 0 && obj.count !== 0) {
-      // 关闭定时器
-      clearInterval(obj.timeOut)
-      // 弹出框，如果点确定则退出到主界面，如果点取消则继续轮询
-      obj.errorInfo('未检测到卡,请检查卡槽是否有卡或异物！', obj.resolve)
-    } else if (obj.count % 2 === 0) {
-      this.self.$closeAlert()
-      let ret = await Vue.AndroidPlugin.hasCard(obj.count)
-      if (ret) {
-        // 关闭定时器
-        clearInterval(obj.timeOut)
-        obj.readCard()
-      }
-      obj.count++
-    } else {
-      obj.count++
-    }
-  }
-
-  async readCard() {
-    // this指针被指向CheckCard
-    this.self.$showAlert('正在读卡，请稍后', 'success', 1000)
-    // 清空cardInfo缓存
-    this.self.cardInfo = {}
-    this.self.userInfo = {}
-    let jo = await Vue.AndroidPlugin.read()
-    this.self.$closeAlert()
-    if (jo.code === 200) {
-      this.self.cardInfo = jo.msg
-      // 读卡成功，已成功拿到卡信息，现在开始执行下一个服务
-      this.resolve(true)
-    } else if (jo.code === 500) {
-      this.errorInfo(jo.msg + ',请检查卡是否插好！')
-    } else {
-      this.errorInfo('调用读卡器失败,请联系管理员！')
-    }
-  }
-
-  /**
-   * 错误提示框，点确定则返回到主界面，点取消则继续执行轮询
-   * */
-  errorInfo(msg) {
-    this.count = 0
-    this.self.$showNewMessage('错误', msg + '(点击\'确定\'返回主页,点击\'取消\'继续读卡)', ['confirm', 'cancel'], 'newmgs')
-      .then((res) => {
-        if (res === 'confirm') {
-          this.self.back()
-          this.resolve(false)
-        } else {
-          let obj = this
-          this.timeOut = window.setInterval(() => {
-            obj.checkCard(obj)
-          }, 1000)
-        }
-      })
-  }
-}
+import Vue from 'vue'
+
+/**
+ *   @author GaoChengLong
+ *   @date 2018/12/7 16:38
+ *   轮询检测卡并且读卡获取卡信息
+ */
+export default class CheckCard {
+
+  constructor(components) {
+    this.self = components
+    // 助记执行次数
+    this.count = 0
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+    // 计时器
+    this.timeOut = null
+  }
+
+  doAction() {
+    return new Promise((resolve, reject) => {
+      this.resolve = resolve
+      this.reject = reject
+      let obj = this
+      this.timeOut = window.setInterval(() => {
+        obj.checkCard(obj)
+      }, 1000)
+    })
+  }
+
+  commit() {
+
+  }
+
+  rollback() {
+    this.self.cardInfo = {}
+    this.self.userInfo = {}
+  }
+
+  // 检测是否有卡
+  async checkCard(obj) {
+    if (obj.count === 0) {
+      if (Vue.phoneBuild){
+        obj.self.$showMessage('正在检查卡槽是否有卡', 'success', 1000)
+      }else {
+        obj.self.$showAlert('正在检查卡槽是否有卡', 'success', 2000)
+      }
+    }
+    if (obj.count % 10 === 0 && obj.count !== 0) {
+      // 关闭定时器
+      clearInterval(obj.timeOut)
+      // 弹出框，如果点确定则退出到主界面，如果点取消则继续轮询
+      obj.errorInfo('未检测到卡,请检查卡槽是否有卡或异物！', obj.resolve)
+    } else if (obj.count % 2 === 0) {
+      this.self.$closeAlert()
+      let ret = await Vue.AndroidPlugin.hasCard(obj.count)
+      if (ret) {
+        // 关闭定时器
+        clearInterval(obj.timeOut)
+        obj.readCard()
+      }
+      obj.count++
+    } else {
+      obj.count++
+    }
+  }
+
+  async readCard() {
+    // this指针被指向CheckCard
+    if (Vue.phoneBuild){
+      this.self.$showMessage('正在读卡，请稍后', 'success', 1000)
+    }else {
+      this.self.$showAlert('正在读卡，请稍后', 'success', 1000)
+    }
+    // 清空cardInfo缓存
+    this.self.cardInfo = {}
+    this.self.userInfo = {}
+    let jo = await Vue.AndroidPlugin.read()
+    this.self.$closeAlert()
+    if (jo.code === 200) {
+      this.self.cardInfo = jo.msg
+      // 读卡成功，已成功拿到卡信息，现在开始执行下一个服务
+      this.resolve(true)
+    } else if (jo.code === 500) {
+      this.errorInfo(jo.msg + ',请检查卡是否插好！')
+    } else {
+      this.errorInfo('调用读卡器失败,请联系管理员！')
+    }
+  }
+
+  /**
+   * 错误提示框，点确定则返回到主界面，点取消则继续执行轮询
+   * */
+  errorInfo(msg) {
+    this.count = 0
+    this.self.$showNewMessage('错误', msg + '(点击\'确定\'返回主页,点击\'取消\'继续读卡)', ['confirm', 'cancel'], 'newmgs')
+      .then((res) => {
+        if (res === 'confirm') {
+          this.self.back()
+          this.resolve(false)
+        } else {
+          let obj = this
+          this.timeOut = window.setInterval(() => {
+            obj.checkCard(obj)
+          }, 1000)
+        }
+      })
+  }
+}

package/src/service/GarbagePayWay.js

@@ -1,101 +1,101 @@
-import co from 'co'
-import Vue from 'vue'
-
-export default class GarbagePayWay {
-  constructor (components) {
-    console.log('GarbagePayWay.js被初始化')
-    this.self = components
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-  }
-
-  // 该服务为异步服务，故此doAction中只返回Promise对象,并不对其进行执行操作
-  doAction () {
-    this.self.$goto('garbage-pay-way', {
-      garbage: this.self.garbage,
-      userInfo: this.self.userInfo,
-      obj: this
-    }, 'self', this.self.back)
-    return new Promise((resolve, reject) => {
-      // 只要不执行承诺或者拒绝函数该服务就永远不会切换到下一个服务
-      this.resolve = resolve
-      this.reject = reject
-    })
-  }
-
-  commit () {
-    console.log('GarbagePayWay.js被提交')
-  }
-
-  rollback () {
-    console.log('GarbagePayWay.js被回滚')
-  }
-
-  setComponents (components) {
-    this.self = components
-  }
-
-  getQR () {
-    let attach = this.getAttach()
-    let gen = this.generateScan(this.self, attach)
-    return co(gen)
-  }
-
-  // 组织attach - 垃圾费专用
-  getAttach () {
-      let attach = {}
-      // 用户编号
-      attach[Vue.PosUtil.posParam.userCondition] = this.self.userInfo[Vue.PosUtil.posParam.userCondition]
-      attach.f_terminal_num = Vue.PosUtil.Sn
-      // 实交金额
-      attach.f_collection = this.self.garbage.money
-      attach.f_user_name = this.self.userInfo.f_user_name
-      attach.f_address = this.self.userInfo.f_address
-      attach.f_pay_type = '垃圾费'
-      // 实交金额（如果存在账户余额）
-      attach.f_totalcost = attach.f_collection
-      attach.number = this.self.garbage.list.length
-      attach.isHand = 2
-      return attach
-  }
-
-  // 支付下单 - 垃圾费专用
-  * generateScan (self, attach) {
-    // 支付金额元转分（测试环境支付金额统一改为1分）
-    let money = Vue.PosUtil.posParam.isTest ? 1 : Vue.PosUtil.yuan2fen(this.self.garbage.money)
-
-    // post去后台给微信下单并生成二维码和流水号
-      self.$pospost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.module + 'GetCode', {
-      config: self.$PosUtil.posParam.config,
-      f_revenue: Vue.PosUtil.posParam.revenue,
-      pay_way: self.payInfo.pay_way,
-      money: money + '',
-      attach: attach
-    }, {resolveMsg: null, rejectMsg: null}).then((ret) => {
-      // 下单成功
-      if (ret.data.code === 200) {
-        self.payInfo.url = ret.data.url
-        self.payInfo.f_serial_id = ret.data.f_out_trade_no
-        self.$goto('garbage-scan-native', {
-          payInfo: self.payInfo,
-          garbageInfo: self.garbage,
-          userInfo: self.userInfo,
-          obj: this.next
-        }, 'self', self.back)
-        // 设置下一个服务状态为扫码支付，开始需要去轮询数据库
-        this.next.isQR = true
-        this.resolve(true)
-      } else {
-        // 下单失败
-        self.$back('下单失败,请重新下单')
-        this.resolve(false)
-      }
-    }).catch((ret) => {
-      console.log('垃圾费下单异常，异常返回==>', ret)
-      self.$back('下单失败,请重新下单')
-      this.resolve(false)
-    })
-  }
-}
+import co from 'co'
+import Vue from 'vue'
+
+export default class GarbagePayWay {
+  constructor (components) {
+    console.log('GarbagePayWay.js被初始化')
+    this.self = components
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+  }
+
+  // 该服务为异步服务，故此doAction中只返回Promise对象,并不对其进行执行操作
+  doAction () {
+    this.self.$goto('garbage-pay-way', {
+      garbage: this.self.garbage,
+      userInfo: this.self.userInfo,
+      obj: this
+    }, 'self', this.self.back)
+    return new Promise((resolve, reject) => {
+      // 只要不执行承诺或者拒绝函数该服务就永远不会切换到下一个服务
+      this.resolve = resolve
+      this.reject = reject
+    })
+  }
+
+  commit () {
+    console.log('GarbagePayWay.js被提交')
+  }
+
+  rollback () {
+    console.log('GarbagePayWay.js被回滚')
+  }
+
+  setComponents (components) {
+    this.self = components
+  }
+
+  getQR () {
+    let attach = this.getAttach()
+    let gen = this.generateScan(this.self, attach)
+    return co(gen)
+  }
+
+  // 组织attach - 垃圾费专用
+  getAttach () {
+      let attach = {}
+      // 用户编号
+      attach[Vue.PosUtil.posParam.userCondition] = this.self.userInfo[Vue.PosUtil.posParam.userCondition]
+      attach.f_terminal_num = Vue.PosUtil.Sn
+      // 实交金额
+      attach.f_collection = this.self.garbage.money
+      attach.f_user_name = this.self.userInfo.f_user_name
+      attach.f_address = this.self.userInfo.f_address
+      attach.f_pay_type = '垃圾费'
+      // 实交金额（如果存在账户余额）
+      attach.f_totalcost = attach.f_collection
+      attach.number = this.self.garbage.list.length
+      attach.isHand = 2
+      return attach
+  }
+
+  // 支付下单 - 垃圾费专用
+  * generateScan (self, attach) {
+    // 支付金额元转分（测试环境支付金额统一改为1分）
+    let money = Vue.PosUtil.posParam.isTest ? 1 : Vue.PosUtil.yuan2fen(this.self.garbage.money)
+
+    // post去后台给微信下单并生成二维码和流水号
+      self.$resetpost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.module + 'GetCode', {
+      config: self.$PosUtil.posParam.config,
+      f_revenue: Vue.PosUtil.posParam.revenue,
+      pay_way: self.payInfo.pay_way,
+      money: money + '',
+      attach: attach
+    }, {resolveMsg: null, rejectMsg: null}).then((ret) => {
+      // 下单成功
+      if (ret.data.code === 200) {
+        self.payInfo.url = ret.data.url
+        self.payInfo.f_serial_id = ret.data.f_out_trade_no
+        self.$goto('garbage-scan-native', {
+          payInfo: self.payInfo,
+          garbageInfo: self.garbage,
+          userInfo: self.userInfo,
+          obj: this.next
+        }, 'self', self.back)
+        // 设置下一个服务状态为扫码支付，开始需要去轮询数据库
+        this.next.isQR = true
+        this.resolve(true)
+      } else {
+        // 下单失败
+        self.$back('下单失败,请重新下单')
+        this.resolve(false)
+      }
+    }).catch((ret) => {
+      console.log('垃圾费下单异常，异常返回==>', ret)
+      self.$back('下单失败,请重新下单')
+      this.resolve(false)
+    })
+  }
+}

package/src/service/GarbageScanNative.js

@@ -1,116 +1,116 @@
-import Vue from 'vue'
-
-/**
- *   @author System
- *   @date 2024/01/26
- *   垃圾费轮询数据库服务，默认不启用，直接跳过该服务
- */
-export default class GarbageScanNative {
-  constructor () {
-    console.log('GarbageScanNative.js被初始化')
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-    // 是否为扫码支付的方式进入该服务
-    this.isQR = false
-    // 计时器
-    this.timer1 = null
-    this.timer2 = null
-  }
-
-  doAction () {
-    console.log('GarbageScanNative.js被启动')
-    // 在进入该服务之前，如果为扫码支付的话，需要在上一个服务把该服务的isQR值修改为true
-    if (this.isQR) {
-      return new Promise((resolve, reject) => {
-        this.resolve = resolve
-        this.reject = reject
-      })
-    } else {
-      return true
-    }
-  }
-
-  commit () {
-    console.log('GarbageScanNative.js被提交')
-  }
-
-  rollback () {
-    console.log('GarbageScanNative.js被回滚')
-    window.clearInterval(this.timer1)
-    window.clearInterval(this.timer2)
-  }
-
-  setComponents (components) {
-    this.self = components
-  }
-
-  startService () {
-    this.timer1 = window.setInterval(() => {
-      this.outOfPage(this, this.self)
-    }, 1000)
-    this.timer2 = window.setInterval(() => {
-      this.setRemainTime(this, this.self)
-    }, 5000)
-  }
-
-  outOfPage (obj, components) {
-    // 调用定时器
-    if (components.countDown > 16 && !components.isTimeout && components.second > 0) {
-      --components.second
-      --components.countDown
-      components.isTimeout = false
-    } else if (components.countDown > 1 && !components.isTimeout) {
-      --components.countDown
-      --components.second
-      components.isTimeout = true
-      components.setAddress()
-    } else if (components.countDown > 0 && components.isTimeout) {
-      --components.countDown
-      --components.second
-      window.clearInterval(obj.timer2)
-    } else {
-      // 超时 停止计时器
-      window.clearInterval(obj.timer1)
-      if (components.iserro) {
-        obj.resolve(false)
-        components.$back('error')
-      } else {
-        obj.resolve(false)
-        components.$back('timeOut')
-      }
-    }
-  }
-
-  setRemainTime (obj, components) {
-    obj.getOrderInfo(obj, components)
-  }
-
-    getOrderInfo(obj, self) {
-        // if (!Vue.AndroidPlugin.isAndroid && !Vue.AndroidPlugin.isPc) {
-        //   self.$showNewMessage('提示', '缴费完成，点击"确认"返回主界面重新读卡购气', ['confirm'], 'newmgs').then(() => {
-        //      window.setInterval(self.callBack('toMain'),6000)
-        //   })
-        //   this.resolve(true)
-        // }
-
-        let data = {
-            f_serial_id: self.payInfo.f_serial_id
-        }
-
-        self.$pospost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.revenue + 'getSellGasInfo', { data: data }, {
-            resolveMsg: null, rejectMsg: null
-        }).then((ret) => {
-            if (ret.data.length === 1) {
-                self.$showNewMessage('提示', '缴费完成，点击"确认"返回主界面重新读卡购气', ['confirm'], 'newmgs').then(() => {
-                    self.callBack('toMain')
-                })
-                this.resolve(true)
-            }
-        }
-        ).catch((ret) => {
-            self.hasError(ret)
-        })
-    }
-}
+import Vue from 'vue'
+
+/**
+ *   @author System
+ *   @date 2024/01/26
+ *   垃圾费轮询数据库服务，默认不启用，直接跳过该服务
+ */
+export default class GarbageScanNative {
+  constructor () {
+    console.log('GarbageScanNative.js被初始化')
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+    // 是否为扫码支付的方式进入该服务
+    this.isQR = false
+    // 计时器
+    this.timer1 = null
+    this.timer2 = null
+  }
+
+  doAction () {
+    console.log('GarbageScanNative.js被启动')
+    // 在进入该服务之前，如果为扫码支付的话，需要在上一个服务把该服务的isQR值修改为true
+    if (this.isQR) {
+      return new Promise((resolve, reject) => {
+        this.resolve = resolve
+        this.reject = reject
+      })
+    } else {
+      return true
+    }
+  }
+
+  commit () {
+    console.log('GarbageScanNative.js被提交')
+  }
+
+  rollback () {
+    console.log('GarbageScanNative.js被回滚')
+    window.clearInterval(this.timer1)
+    window.clearInterval(this.timer2)
+  }
+
+  setComponents (components) {
+    this.self = components
+  }
+
+  startService () {
+    this.timer1 = window.setInterval(() => {
+      this.outOfPage(this, this.self)
+    }, 1000)
+    this.timer2 = window.setInterval(() => {
+      this.setRemainTime(this, this.self)
+    }, 5000)
+  }
+
+  outOfPage (obj, components) {
+    // 调用定时器
+    if (components.countDown > 16 && !components.isTimeout && components.second > 0) {
+      --components.second
+      --components.countDown
+      components.isTimeout = false
+    } else if (components.countDown > 1 && !components.isTimeout) {
+      --components.countDown
+      --components.second
+      components.isTimeout = true
+      components.setAddress()
+    } else if (components.countDown > 0 && components.isTimeout) {
+      --components.countDown
+      --components.second
+      window.clearInterval(obj.timer2)
+    } else {
+      // 超时 停止计时器
+      window.clearInterval(obj.timer1)
+      if (components.iserro) {
+        obj.resolve(false)
+        components.$back('error')
+      } else {
+        obj.resolve(false)
+        components.$back('timeOut')
+      }
+    }
+  }
+
+  setRemainTime (obj, components) {
+    obj.getOrderInfo(obj, components)
+  }
+
+    getOrderInfo(obj, self) {
+        // if (!Vue.AndroidPlugin.isAndroid && !Vue.AndroidPlugin.isPc) {
+        //   self.$showNewMessage('提示', '缴费完成，点击"确认"返回主界面重新读卡购气', ['confirm'], 'newmgs').then(() => {
+        //      window.setInterval(self.callBack('toMain'),6000)
+        //   })
+        //   this.resolve(true)
+        // }
+
+        let data = {
+            f_serial_id: self.payInfo.f_serial_id
+        }
+
+        self.$resetpost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.revenue + 'getSellGasInfo', { data: data }, {
+            resolveMsg: null, rejectMsg: null
+        }).then((ret) => {
+            if (ret.data.length === 1) {
+                self.$showNewMessage('提示', '缴费完成，点击"确认"返回主界面重新读卡购气', ['confirm'], 'newmgs').then(() => {
+                    self.callBack('toMain')
+                })
+                this.resolve(true)
+            }
+        }
+        ).catch((ret) => {
+            self.hasError(ret)
+        })
+    }
+}