handpos-client 1.0.5 → 1.0.7-lekai

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handpos-client",
-  "version": "1.0.5",
+  "version": "1.0.7-lekai",
   "description": "手持POS",
   "main": "src/index.js",
   "directories": {

package/src/aotePos-android.js

@@ -1,49 +1,49 @@
-import Vue from 'vue'
-
-export default function (filiale) {
-// 参数加载页面
-  Vue.component('init', (resolve) => { require(['./components/Init'], resolve) })
-// 主页面
-  Vue.component('main', (resolve) => { require(['./components/Main'], resolve) })
-
-// 卡表收费
-  Vue.component('card-main', (resolve) => { require(['./components/main/CardMain'], resolve) })
-// 无卡收费
-  Vue.component('machine-main', (resolve) => { require(['./components/main/MachineMain'], resolve) })
-
-// 垃圾费相关
-// 垃圾费信息
-  Vue.component('garbage-info', (resolve) => { require(['./components/garbage/GarbageInfo'], resolve) })
-// 垃圾费支付方式选择
-  Vue.component('garbage-pay-way', (resolve) => { require(['./components/garbage/GarbagePayWay'], resolve) })
-// 垃圾费二维码扫描
-  Vue.component('garbage-scan-native', (resolve) => { require(['./components/garbage/GarbageScanNative'], resolve) })
-
-// 卡表用户信息
-  Vue.component('card-user-info', (resolve) => { require(['./components/sellgas/CardSellGas'], resolve) })
-// 物联网表信息
-  Vue.component('iot-user-info', (resolve) => { require(['./components/sellgas/IotSellGas'], resolve) })
-// 机表用户信息-gas
-  Vue.component('machine-user-info-gas', (resolve) => { require(['./components/sellgas/MachineSellGasGas'], resolve) })
-// 机表用户信息-money(常用)
-  Vue.component('machine-user-info', (resolve) => { require(['./components/sellgas/MachineSellGasMoney'], resolve) })
-
-// 支付
-// 选择支付方式
-  Vue.component('pay-way', (resolve) => { require(['./components/pay/PayWay'], resolve) })
-// 二维码展示界面
-  Vue.component('scannative', (resolve) => { require(['./components/pay/ScanNative'], resolve) })
-// 写卡界面
-  Vue.component('order-info', (resolve) => { require(['./components/pay/WriteCard'], resolve) })
-
-
-
-// 公共组件
-// 历史收费记录
-  Vue.component('history-sell-list', (resolve) => { require(['./components/public/HistorySellList'], resolve) })
-// 预写卡信息
-  Vue.component('write-card-info', (resolve) => { require(['./components/public/WritecardInfo'], resolve) })
-// 购气
-  Vue.component('buy-gas', (resolve) => { require(['./components/public/BuyGas'], resolve) })
-
-}
+import Vue from 'vue'
+
+export default function (filiale) {
+// 参数加载页面
+  Vue.component('init', (resolve) => { require(['./components/Init'], resolve) })
+// 主页面
+  Vue.component('main', (resolve) => { require(['./components/Main'], resolve) })
+
+// 卡表收费
+  Vue.component('card-main', (resolve) => { require(['./components/main/CardMain'], resolve) })
+// 无卡收费
+  Vue.component('machine-main', (resolve) => { require(['./components/main/MachineMain'], resolve) })
+
+// 垃圾费相关
+// 垃圾费信息
+  Vue.component('garbage-info', (resolve) => { require(['./components/garbage/GarbageInfo'], resolve) })
+// 垃圾费支付方式选择
+  Vue.component('garbage-pay-way', (resolve) => { require(['./components/garbage/GarbagePayWay'], resolve) })
+// 垃圾费二维码扫描
+  Vue.component('garbage-scan-native', (resolve) => { require(['./components/garbage/GarbageScanNative'], resolve) })
+
+// 卡表用户信息
+  Vue.component('card-user-info', (resolve) => { require(['./components/sellgas/CardSellGas'], resolve) })
+// 物联网表信息
+  Vue.component('iot-user-info', (resolve) => { require(['./components/sellgas/IotSellGas'], resolve) })
+// 机表用户信息-gas
+  Vue.component('machine-user-info-gas', (resolve) => { require(['./components/sellgas/MachineSellGasGas'], resolve) })
+// 机表用户信息-money(常用)
+  Vue.component('machine-user-info', (resolve) => { require(['./components/sellgas/MachineSellGasMoney'], resolve) })
+
+// 支付
+// 选择支付方式
+  Vue.component('pay-way', (resolve) => { require(['./components/pay/PayWay'], resolve) })
+// 二维码展示界面
+  Vue.component('scannative', (resolve) => { require(['./components/pay/ScanNative'], resolve) })
+// 写卡界面
+  Vue.component('order-info', (resolve) => { require(['./components/pay/WriteCard'], resolve) })
+
+
+
+// 公共组件
+// 历史收费记录
+  Vue.component('history-sell-list', (resolve) => { require(['./components/public/HistorySellList'], resolve) })
+// 预写卡信息
+  Vue.component('write-card-info', (resolve) => { require(['./components/public/WritecardInfo'], resolve) })
+// 购气
+  Vue.component('buy-gas', (resolve) => { require(['./components/public/BuyGas'], resolve) })
+
+}

package/src/components/Init.vue

@@ -79,9 +79,9 @@ export default {
         console.log('android环境')
         HostApp
         this.$AndroidPlugin.isAndroid = true
-        let url = this.$AndroidPlugin.getProxyURL() + '/'
+        let url = Vue.AndroidPlugin.getProxyURL()  + '/'
         if (Vue.phoneBuild){
-          url = this.$AndroidPlugin.getProxyURL() + '/pos/'
+          url = Vue.AndroidPlugin.getProxyURL()  + '/pos/'
         }
         Vue.ProxyUrl = url
       } catch (e) {

package/src/components/garbage/GarbagePayWay.vue

@@ -1,233 +1,233 @@
-<template>
-  <div>
-    <div class="mhead">
-      <ul>
-        <li>
-          <text>垃圾费缴费</text>
-        </li>
-      </ul>
-    </div>
-    <div class="body">
-      <div class="container contentpanel auto">
-        <div class="row buypanel">
-          <div class="buyform">
-            <h3 style="color: red;">订单信息</h3>
-            <div>
-              <h4>缴费类型：垃圾费</h4>
-            </div>
-            <div>
-              <h4>账期：{{garbageInfo.accountperiod}}</h4>
-            </div>
-            <div>
-              <h4>支付金额：{{garbageInfo.money}} &nbsp;&nbsp;元</h4>
-            </div>
-          </div>
-          <div class="horizontal" height="auto">
-            <h3 style="color: red;">请选择支付方式</h3>
-            <table width="60%" border="0" cellspacing="0" cellpadding="0" align="center">
-              <tbody>
-                <tr>
-                  <td align="center" v-if='payBtn1.show' class="col-xs-4  weixin">
-                    <div @click='pay("1")'>
-                      <img :src="btn1Path" alt=""/>
-                    </div>
-                  </td>
-                  <td align="center" v-if='payBtn2.show' class="col-xs-4  alipay" >
-                    <div @click='pay("2")'>
-                      <img :src="btn2Path " alt=""/>
-                    </div>
-                  </td>
-                  <td align="center" v-if='payBtn3.show' class="col-xs-4  unionpay">
-                    <div @click='pay("3")'>
-                      <img :src="btn3Path" alt=""/>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="foot" @click="back('toMain')">
-      <text>返回</text>
-    </div>
-  </div>
-</template>
-<script>
-import Vue from 'vue'
-import * as util from '../../service/util.js'
-export default {
-  title: '选择支付方式',
-  data() {
-    return {
-      btn1Path: '',
-      btn2Path: '',
-      btn3Path: '',
-      payBtn1: {
-        show: false,
-        path: "",
-        method: "",
-        pay_way: "",
-        payment: ""
-      },
-      payBtn2: {
-        show: false,
-        path: "",
-        method: "",
-        pay_way: "",
-        payment: ""
-      },
-      payBtn3: {
-        show: false,
-        path: "",
-        method: "",
-        pay_way: "",
-        payment: ""
-      },
-      garbageInfo: {
-        accountperiod: '',
-        money: 0,
-        list: []
-      },
-      payInfo: {
-        pay_way: '',
-        f_payment: '',
-        url: '',
-        f_serial_id: ''
-      },
-      resolve: undefined,
-      reject: undefined,
-      obj: undefined
-    }
-  },
-  methods: {
-    // 格式化日期显示
-    formatDate(dateStr) {
-      if (!dateStr) return ''
-      const parts = dateStr.split('-')
-      if (parts.length === 2) {
-        return `${parts[0]}年${parts[1]}月`
-      }
-      return dateStr
-    },
-
-    back(para) {
-      this.obj.resolve(false)
-      this.$back(para)
-    },
-
-    getQR() {
-      this.obj.getQR()
-    },
-
-    async pay (str) {
-      if (!this.handClick) {
-        this.handClick = true
-
-        // 垃圾费不需要读卡验证，直接进行支付
-        if (str === '1') {
-          this.payInfo.pay_way = this.payBtn1.pay_way
-          this.payInfo.f_payment = this.payBtn1.payment
-          this.payMethod(this.payBtn1.unionPayAlias, this.payBtn1.method)
-        } else if (str === '2') {
-          this.payInfo.pay_way = this.payBtn2.pay_way
-          this.payInfo.f_payment = this.payBtn2.payment
-          this.payMethod(this.payBtn2.unionPayAlias, this.payBtn2.method)
-        } else {
-          this.payInfo.pay_way = this.payBtn3.pay_way
-          this.payInfo.f_payment = this.payBtn3.payment
-          this.payMethod(this.payBtn3.unionPayAlias, this.payBtn3.method)
-        }
-      }
-    },
-
-    payMethod(unionPayAlias, payMethod) {
-      if (payMethod === 'qrcode') {
-        this.getQR()
-      } else if (payMethod === 'card') {
-        this.cardPay(unionPayAlias)
-      } else {
-        this.$showNewMessage('提示', `未知支付方式:${payMethod}，请联系管理员`, ['confirm'], 'newmgs')
-      }
-    },
-
-    cardPay(unionPayAlias) {
-      let attach = this.obj.getAttach()
-      let money = Vue.PosUtil.yuan2fen(this.garbageInfo.money)
-      //测试环境支付金额统一改为1分
-      if (Vue.PosUtil.posParam.isTest) {
-        money = 1
-      }
-      attach.f_revenue = Vue.PosUtil.posParam.revenue
-      attach.money = money
-      try {
-        HostApp.__this__ = this
-        HostApp.pay({
-          data: attach,
-          callback: 'javascript:HostApp.__this__.toSuccess();'
-        }, unionPayAlias)
-      } catch (e) {
-        console.log('e', e)
-      }
-    },
-    print(){
-      try {
-        let num = 0.00
-        this.garbage.list.forEach(item=>{
-          num += item.f_money
-        })
-        let bigNum = util.numberToChinese(num)
-        let date = util.getDate()
-        let printContent = []
-        let textHead = {type: 3, text: '山西华新科莱天然气有限公司垃圾费收费单', fontsize: 3, isbold: true, align: 'center'}
-        printContent.push(textHead)
-        printContent.push({type: 4, value: 2, unit: 'line'})
-        printContent.push({type: 3, text: '收费日期：' + date, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '用户编号：' + this.userInfo.f_userinfo_code, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '用户姓名：' + this.userInfo.f_user_name, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '用气地址：' + this.userInfo.f_address, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '收费项目：' + '垃圾费', fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '垃圾处理费：' + num, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '实收金额(大写)：' + bigNum, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '打票时间：' + date, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 3, text: '收费员：' + Vue.user.name || Vue.PosUtil.Sn, fontsize: 2, isbold: false, align: 'left'})
-        printContent.push({type: 4, value: 4, unit: 'line'})
-        this.$AndroidPlugin.print(printContent)
-      }catch (e) {
-        this.$showNewMessage('错误', '收费打印单失败。')
-      }
-      this.$back('toMain')
-    },
-
-    // 垃圾费支付成功处理
-    toSuccess() {
-      this.$showNewMessage('错误', '垃圾费缴费成功！是否打印收费单？', ['confirm', 'cancel'], 'newmgs')
-        .then((res) => {
-          if (res === 'confirm') {
-            this.print()
-          } else {
-            this.$back('toMain')
-          }
-        })
-    }
-  },
-
-  ready() {
-    // 从路由参数获取垃圾费信息
-    this.garbageInfo = this.garbage
-
-    // 设置服务对象里的组件对象
-    if (this.obj) {
-      this.obj.setComponents(this)
-    }
-
-    this.payBtn1 = this.$PosUtil.posParam.PayBtn1
-    this.payBtn2 = this.$PosUtil.posParam.PayBtn2
-    this.payBtn3 = this.$PosUtil.posParam.PayBtn3
-    this.btn1Path = require(`../image/${this.payBtn1.path}`)
-    this.btn2Path = require(`../image/${this.payBtn2.path}`)
-    this.btn3Path = require(`../image/${this.payBtn3.path}`)
-  }
-}
-</script>
+<template>
+  <div>
+    <div class="mhead">
+      <ul>
+        <li>
+          <text>垃圾费缴费</text>
+        </li>
+      </ul>
+    </div>
+    <div class="body">
+      <div class="container contentpanel auto">
+        <div class="row buypanel">
+          <div class="buyform">
+            <h3 style="color: red;">订单信息</h3>
+            <div>
+              <h4>缴费类型：垃圾费</h4>
+            </div>
+            <div>
+              <h4>账期：{{garbageInfo.accountperiod}}</h4>
+            </div>
+            <div>
+              <h4>支付金额：{{garbageInfo.money}} &nbsp;&nbsp;元</h4>
+            </div>
+          </div>
+          <div class="horizontal" height="auto">
+            <h3 style="color: red;">请选择支付方式</h3>
+            <table width="60%" border="0" cellspacing="0" cellpadding="0" align="center">
+              <tbody>
+                <tr>
+                  <td align="center" v-if='payBtn1.show' class="col-xs-4  weixin">
+                    <div @click='pay("1")'>
+                      <img :src="btn1Path" alt=""/>
+                    </div>
+                  </td>
+                  <td align="center" v-if='payBtn2.show' class="col-xs-4  alipay" >
+                    <div @click='pay("2")'>
+                      <img :src="btn2Path " alt=""/>
+                    </div>
+                  </td>
+                  <td align="center" v-if='payBtn3.show' class="col-xs-4  unionpay">
+                    <div @click='pay("3")'>
+                      <img :src="btn3Path" alt=""/>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="foot" @click="back('toMain')">
+      <text>返回</text>
+    </div>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import * as util from '../../service/util.js'
+export default {
+  title: '选择支付方式',
+  data() {
+    return {
+      btn1Path: '',
+      btn2Path: '',
+      btn3Path: '',
+      payBtn1: {
+        show: false,
+        path: "",
+        method: "",
+        pay_way: "",
+        payment: ""
+      },
+      payBtn2: {
+        show: false,
+        path: "",
+        method: "",
+        pay_way: "",
+        payment: ""
+      },
+      payBtn3: {
+        show: false,
+        path: "",
+        method: "",
+        pay_way: "",
+        payment: ""
+      },
+      garbageInfo: {
+        accountperiod: '',
+        money: 0,
+        list: []
+      },
+      payInfo: {
+        pay_way: '',
+        f_payment: '',
+        url: '',
+        f_serial_id: ''
+      },
+      resolve: undefined,
+      reject: undefined,
+      obj: undefined
+    }
+  },
+  methods: {
+    // 格式化日期显示
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      const parts = dateStr.split('-')
+      if (parts.length === 2) {
+        return `${parts[0]}年${parts[1]}月`
+      }
+      return dateStr
+    },
+
+    back(para) {
+      this.obj.resolve(false)
+      this.$back(para)
+    },
+
+    getQR() {
+      this.obj.getQR()
+    },
+
+    async pay (str) {
+      if (!this.handClick) {
+        this.handClick = true
+
+        // 垃圾费不需要读卡验证，直接进行支付
+        if (str === '1') {
+          this.payInfo.pay_way = this.payBtn1.pay_way
+          this.payInfo.f_payment = this.payBtn1.payment
+          this.payMethod(this.payBtn1.unionPayAlias, this.payBtn1.method)
+        } else if (str === '2') {
+          this.payInfo.pay_way = this.payBtn2.pay_way
+          this.payInfo.f_payment = this.payBtn2.payment
+          this.payMethod(this.payBtn2.unionPayAlias, this.payBtn2.method)
+        } else {
+          this.payInfo.pay_way = this.payBtn3.pay_way
+          this.payInfo.f_payment = this.payBtn3.payment
+          this.payMethod(this.payBtn3.unionPayAlias, this.payBtn3.method)
+        }
+      }
+    },
+
+    payMethod(unionPayAlias, payMethod) {
+      if (payMethod === 'qrcode') {
+        this.getQR()
+      } else if (payMethod === 'card') {
+        this.cardPay(unionPayAlias)
+      } else {
+        this.$showNewMessage('提示', `未知支付方式:${payMethod}，请联系管理员`, ['confirm'], 'newmgs')
+      }
+    },
+
+    cardPay(unionPayAlias) {
+      let attach = this.obj.getAttach()
+      let money = Vue.PosUtil.yuan2fen(this.garbageInfo.money)
+      //测试环境支付金额统一改为1分
+      if (Vue.PosUtil.posParam.isTest) {
+        money = 1
+      }
+      attach.f_revenue = Vue.PosUtil.posParam.revenue
+      attach.money = money
+      try {
+        HostApp.__this__ = this
+        HostApp.pay({
+          data: attach,
+          callback: 'javascript:HostApp.__this__.toSuccess();'
+        }, unionPayAlias)
+      } catch (e) {
+        console.log('e', e)
+      }
+    },
+    print(){
+      try {
+        let num = 0.00
+        this.garbage.list.forEach(item=>{
+          num += item.f_money
+        })
+        let bigNum = util.numberToChinese(num)
+        let date = util.getDate()
+        let printContent = []
+        let textHead = {type: 3, text: '山西华新科莱天然气有限公司垃圾费收费单', fontsize: 3, isbold: true, align: 'center'}
+        printContent.push(textHead)
+        printContent.push({type: 4, value: 2, unit: 'line'})
+        printContent.push({type: 3, text: '收费日期：' + date, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '用户编号：' + this.userInfo.f_userinfo_code, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '用户姓名：' + this.userInfo.f_user_name, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '用气地址：' + this.userInfo.f_address, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '收费项目：' + '垃圾费', fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '垃圾处理费：' + num, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '实收金额(大写)：' + bigNum, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '打票时间：' + date, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 3, text: '收费员：' + Vue.user.name || Vue.PosUtil.Sn, fontsize: 2, isbold: false, align: 'left'})
+        printContent.push({type: 4, value: 4, unit: 'line'})
+        this.$AndroidPlugin.print(printContent)
+      }catch (e) {
+        this.$showNewMessage('错误', '收费打印单失败。')
+      }
+      this.$back('toMain')
+    },
+
+    // 垃圾费支付成功处理
+    toSuccess() {
+      this.$showNewMessage('错误', '垃圾费缴费成功！是否打印收费单？', ['confirm', 'cancel'], 'newmgs')
+        .then((res) => {
+          if (res === 'confirm') {
+            this.print()
+          } else {
+            this.$back('toMain')
+          }
+        })
+    }
+  },
+
+  ready() {
+    // 从路由参数获取垃圾费信息
+    this.garbageInfo = this.garbage
+
+    // 设置服务对象里的组件对象
+    if (this.obj) {
+      this.obj.setComponents(this)
+    }
+
+    this.payBtn1 = this.$PosUtil.posParam.PayBtn1
+    this.payBtn2 = this.$PosUtil.posParam.PayBtn2
+    this.payBtn3 = this.$PosUtil.posParam.PayBtn3
+    this.btn1Path = require(`../image/${this.payBtn1.path}`)
+    this.btn2Path = require(`../image/${this.payBtn2.path}`)
+    this.btn3Path = require(`../image/${this.payBtn3.path}`)
+  }
+}
+</script>