handpos-client 1.0.2 → 1.0.4

package/src/service/PayWay.js

@@ -1,121 +1,121 @@
-import co from 'co'
-import Vue from 'vue'
-
-export default class PayWay {
-  constructor (components) {
-    console.log('PayWay.js被初始化')
-    this.self = components
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-  }
-
-  // 该服务为异步服务，故此doAction中只返回Promise对象,并不对其进行执行操作
-  doAction () {
-    this.self.$goto('pay-way', {
-      userInfo: this.self.userInfo,
-      cardInfo: this.self.cardInfo,
-      stairPrice: this.self.chargePrice,
-      obj: this
-    }, 'self', this.self.back)
-    return new Promise((resolve, reject) => {
-      // 只要不执行承诺或者拒绝函数该服务就永远不会切换到下一个服务
-      this.resolve = resolve
-      this.reject = reject
-    })
-  }
-
-  commit () {
-    console.log('PayWay.js被提交')
-  }
-
-  rollback () {
-    console.log('PayWay.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.f_userinfo_code = this.self.userInfo.f_userinfo_code
-    attach.f_userinfo_id = this.self.userInfo.f_userinfo_id
-    attach.f_userfiles_id = this.self.userInfo.f_userfiles_id
-    attach.f_user_name = this.self.userInfo.f_user_name
-    attach.f_address = this.self.userInfo.f_address
-    attach.f_pregas = this.self.stairPrice.f_pregas
-    // 应交金额
-    attach.f_preamount = this.self.stairPrice.f_preamount
-    attach.f_payment = this.self.stairPrice.f_payment
-    attach.f_terminal_num = Vue.PosUtil.Sn
-    // 实交金额
-    attach.f_collection = (this.self.stairPrice.f_collection - 0).toFixed(2)
-    // 实交金额（如果存在账户余额）
-    attach.f_totalcost = attach.f_collection
-
-    // 特殊参数
-    if (this.self.userInfo.f_meter_type === '机表') {
-      // 区分气表类型
-      attach.isHand = 1
-      // 实际缴纳滞纳金
-      attach.f_overdue = this.self.stairPrice.f_delaypay
-      // 抄表记录编号
-      attach.hand_ids = this.self.stairPrice.hand_ids
-    } else if (this.self.userInfo.f_meter_type === '物联网表') {
-      attach.isHand = -1
-    } else {
-      // 卡表
-      attach.isHand = 0
-      attach.isGasValue = this.self.userInfo.f_collection_type === '按金额' ? 1 : 0
-      attach.f_card_id = this.self.cardInfo.CardID
-      attach.f_times = this.self.cardInfo.Times + 1
-    }
-    return attach
-  }
-  // 支付下单
-  * generateScan (self, attach) {
-    // 支付金额元转分（测试环境支付金额统一改为1分）
-    let money = Vue.PosUtil.posParam.isTest ? 1 : Vue.PosUtil.yuan2fen(this.self.stairPrice.f_collection)
-    // 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.stairPrice.pay_way,
-      money: money + '',
-      attach: attach
-    }, {resolveMsg: null, rejectMsg: null}).then((ret) => {
-      // 下单成功
-      if (ret.data.code === 200) {
-        self.stairPrice.url = ret.data.url
-        self.stairPrice.f_serial_id = ret.data.f_out_trade_no
-        self.$goto('scannative', {
-          userInfo: self.userInfo,
-          cardInfo: self.cardInfo,
-          stairPrice: self.stairPrice,
-          obj: this.next
-        }, 'self', self.back)
-        // 设置下一个服务状态为扫码支付，开始需要去轮询数据库
-        this.next.isQR = true
-        this.resolve(true)
-      } else {
-        // 下单失败
-        self.$back('getBillError')
-        this.resolve(false)
-      }
-    }
-    ).catch((ret) => {
-      console.log('下单异常，异常返回==>', ret)
-      self.$back('getBillError')
-      this.resolve(false)
-    })
-  }
-}
+import co from 'co'
+import Vue from 'vue'
+
+export default class PayWay {
+  constructor (components) {
+    console.log('PayWay.js被初始化')
+    this.self = components
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+  }
+
+  // 该服务为异步服务，故此doAction中只返回Promise对象,并不对其进行执行操作
+  doAction () {
+    this.self.$goto('pay-way', {
+      userInfo: this.self.userInfo,
+      cardInfo: this.self.cardInfo,
+      stairPrice: this.self.chargePrice,
+      obj: this
+    }, 'self', this.self.back)
+    return new Promise((resolve, reject) => {
+      // 只要不执行承诺或者拒绝函数该服务就永远不会切换到下一个服务
+      this.resolve = resolve
+      this.reject = reject
+    })
+  }
+
+  commit () {
+    console.log('PayWay.js被提交')
+  }
+
+  rollback () {
+    console.log('PayWay.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.f_userinfo_code = this.self.userInfo.f_userinfo_code
+    attach.f_userinfo_id = this.self.userInfo.f_userinfo_id
+    attach.f_userfiles_id = this.self.userInfo.f_userfiles_id
+    attach.f_user_name = this.self.userInfo.f_user_name
+    attach.f_address = this.self.userInfo.f_address
+    attach.f_pregas = this.self.stairPrice.f_pregas
+    // 应交金额
+    attach.f_preamount = this.self.stairPrice.f_preamount
+    attach.f_payment = this.self.stairPrice.f_payment
+    attach.f_terminal_num = Vue.PosUtil.Sn
+    // 实交金额
+    attach.f_collection = (this.self.stairPrice.f_collection - 0).toFixed(2)
+    // 实交金额（如果存在账户余额）
+    attach.f_totalcost = attach.f_collection
+
+    // 特殊参数
+    if (this.self.userInfo.f_meter_type === '机表') {
+      // 区分气表类型
+      attach.isHand = 1
+      // 实际缴纳滞纳金
+      attach.f_overdue = this.self.stairPrice.f_delaypay
+      // 抄表记录编号
+      attach.hand_ids = this.self.stairPrice.hand_ids
+    } else if (this.self.userInfo.f_meter_type === '物联网表') {
+      attach.isHand = -1
+    } else {
+      // 卡表
+      attach.isHand = 0
+      attach.isGasValue = this.self.userInfo.f_collection_type === '按金额' ? 1 : 0
+      attach.f_card_id = this.self.cardInfo.CardID
+      attach.f_times = this.self.cardInfo.Times + 1
+    }
+    return attach
+  }
+  // 支付下单
+  * generateScan (self, attach) {
+    // 支付金额元转分（测试环境支付金额统一改为1分）
+    let money = Vue.PosUtil.posParam.isTest ? 1 : Vue.PosUtil.yuan2fen(this.self.stairPrice.f_collection)
+    // 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.stairPrice.pay_way,
+      money: money + '',
+      attach: attach
+    }, {resolveMsg: null, rejectMsg: null}).then((ret) => {
+      // 下单成功
+      if (ret.data.code === 200) {
+        self.stairPrice.url = ret.data.url
+        self.stairPrice.f_serial_id = ret.data.f_out_trade_no
+        self.$goto('scannative', {
+          userInfo: self.userInfo,
+          cardInfo: self.cardInfo,
+          stairPrice: self.stairPrice,
+          obj: this.next
+        }, 'self', self.back)
+        // 设置下一个服务状态为扫码支付，开始需要去轮询数据库
+        this.next.isQR = true
+        this.resolve(true)
+      } else {
+        // 下单失败
+        self.$back('getBillError')
+        this.resolve(false)
+      }
+    }
+    ).catch((ret) => {
+      console.log('下单异常，异常返回==>', ret)
+      self.$back('getBillError')
+      this.resolve(false)
+    })
+  }
+}

package/src/service/ScanNative.js

@@ -1,118 +1,118 @@
-import Vue from 'vue'
-
-/**
- *   @author GaoChengLong Waki
- *   @date 2018/12/10 18:12
- *   轮询数据库服务，默认不启用，直接跳过该服务
- */
-export default class ScanNative {
-  constructor () {
-    console.log('ScanNative.js被初始化')
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-    // 是否为扫码支付的方式进入该服务
-    this.isQR = false
-    // 计时器
-    this.timer1 = null
-    this.timer2 = null
-  }
-
-  doAction () {
-    console.log('ScanNative.js被启动')
-    // 在进入该服务之前，如果为扫码支付的话，需要在上一个服务把该服务的isQR值修改为true
-    if (this.isQR) {
-      return new Promise((resolve, reject) => {
-        this.resolve = resolve
-        this.reject = reject
-      })
-    } else {
-      return true
-    }
-  }
-
-  commit () {
-    console.log('ScanNative.js被提交')
-  }
-
-  rollback () {
-    console.log('ScanNative.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) {
-    let condition = 'f_serial_id = \'' + self.stairPrice.f_serial_id + '\''
-    // 查询语句参数
-    let param = {
-      condition: condition
-    }
-    self.$pospost(Vue.ProxyUrl + 'rs/sql/getSellGasInfo', {data: param}, {
-      resolveMsg: null, rejectMsg: null
-    }).then((ret) => {
-      if (ret.data.length === 1) {
-        self.stairPrice.id = ret.data[0].id
-        // 停止计时器
-        window.clearInterval(obj.timer1)
-        window.clearInterval(obj.timer2)
-        self.$goto('order-info', {
-          userInfo: self.userInfo,
-          cardInfo: self.cardInfo,
-          status: 3,
-          stairPrice: self.stairPrice,
-          obj: obj.next
-        }, 'self', self.callBack)
-      }
-    }
-    ).catch((ret) => {
-      self.hasError(ret)
-    })
-  }
-
-}
+import Vue from 'vue'
+
+/**
+ *   @author GaoChengLong Waki
+ *   @date 2018/12/10 18:12
+ *   轮询数据库服务，默认不启用，直接跳过该服务
+ */
+export default class ScanNative {
+  constructor () {
+    console.log('ScanNative.js被初始化')
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+    // 是否为扫码支付的方式进入该服务
+    this.isQR = false
+    // 计时器
+    this.timer1 = null
+    this.timer2 = null
+  }
+
+  doAction () {
+    console.log('ScanNative.js被启动')
+    // 在进入该服务之前，如果为扫码支付的话，需要在上一个服务把该服务的isQR值修改为true
+    if (this.isQR) {
+      return new Promise((resolve, reject) => {
+        this.resolve = resolve
+        this.reject = reject
+      })
+    } else {
+      return true
+    }
+  }
+
+  commit () {
+    console.log('ScanNative.js被提交')
+  }
+
+  rollback () {
+    console.log('ScanNative.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) {
+    let condition = 'f_serial_id = \'' + self.stairPrice.f_serial_id + '\''
+    // 查询语句参数
+    let param = {
+      condition: condition
+    }
+    self.$resetpost(Vue.ProxyUrl + 'rs/sql/getSellGasInfo', {data: param}, {
+      resolveMsg: null, rejectMsg: null
+    }).then((ret) => {
+      if (ret.data.length === 1) {
+        self.stairPrice.id = ret.data[0].id
+        // 停止计时器
+        window.clearInterval(obj.timer1)
+        window.clearInterval(obj.timer2)
+        self.$goto('order-info', {
+          userInfo: self.userInfo,
+          cardInfo: self.cardInfo,
+          status: 3,
+          stairPrice: self.stairPrice,
+          obj: obj.next
+        }, 'self', self.callBack)
+      }
+    }
+    ).catch((ret) => {
+      self.hasError(ret)
+    })
+  }
+
+}