handpos-client 1.0.1 → 1.0.2

package/package.json

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

package/src/aotePos-android.js

@@ -0,0 +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) })
+
+}

package/src/components/Init.vue

@@ -1,208 +1,212 @@
-<template>
-  <div >
-    <div class="mhead">
-      <ul>
-        <li>
-          <text>自助缴费机</text>
-        </li>
-      </ul>
-    </div>
-    <div class="loadview">
-      <div class="auto">
-        <div class="loading-text-style">
-          <span class="text-style span-height-center">{{loading_text}}{{dots}}</span>
-        </div>
-        <div class="ErrorBtnLocation">
-          <button class="InitErrorBtn btn btn-danger" v-if="errorShow" @click="start">重试</button>
-        </div>
-      </div>
-    </div>
-    <div class="foot">
-      <text >返回</text>
-    </div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-let getConfig = self => {
-  console.group('getConfigParam')
-  let param = {
-    device_num: self.$PosUtil.Sn
-  }
-  console.log('getConfigParam参数: ', param)
-  self.$resetpost(Vue.ProxyUrl +'rs/logic/getConfigParam', param, {resolveMsg: null, rejectMsg: null}).then(res => {
-    self.loading_text = "初始化成功"
-    self.clearThisInterval()
-    // 设置从后台拿过来的参数值
-    Object.assign(self.$PosUtil.posParam, res.data)
-
-    console.log(self.$PosUtil.posParam)
-
-    // 验证通过
-    self.$goto('main', {}, 'self')
-  }).catch(res => {
-    console.log('res.status:', res.status)
-    if (res.status === 501) {
-      self.loading_text = "该设备未注册，请注册后点击重试"
-    } else if (res.status === 404) {
-      self.loading_text = "设备网络故障或连接服务器异常"
-    } else if (res.status === 500) {
-      self.loading_text = "服务器内部错误"
-    } else {
-      self.loading_text = "未知错误"
-    }
-    self.errorShow = true
-    self.clearThisInterval()
-  })
-  console.groupEnd()
-}
-export default {
-  title: '初始化',
-  name: "Init",
-  data() {
-    return {
-      loading_text: '正在对机器进行初始化操作,请稍等',
-      dots: '',
-      timeOut: undefined,
-      timeIndex: 0,
-      errorShow: false
-    }
-  },
-  ready() {
-    this.start()
-  },
-  methods: {
-    //判断当前运行环境
-    isAndroidDevice() {
-      try {
-        console.log('android环境')
-        HostApp
-        this.$AndroidPlugin.isAndroid = true
-        Vue.ProxyUrl = this.$AndroidPlugin.getProxyURL() + '/'
-      } catch (e) {
-        console.log('PC测试环境')
-        Vue.AndroidPlugin.isAndroid = false
-        //如果是非安卓环境，config中配置的链接地址肯定是不能用的，所以改成空的即可
-        Vue.ProxyUrl = ''
-      }
-    },
-    back(){
-      this.$back()
-    },
-    getSn() {
-      this.Sn = this.$AndroidPlugin.getSN()
-      Vue.PosUtil.Sn = this.Sn
-    },
-    home() {
-      this.$AndroidPlugin.back_home()
-    },
-    /**
-     * 给等待条添加一个点
-     * */
-    addDots() {
-      this.timeIndex++
-      this.dots += '.'
-    },
-    /**
-     * 结束本组件内的计时器
-     * */
-    clearThisInterval() {
-      window.clearInterval(this.timeOut)
-      this.initDots()
-    },
-    /**
-     * 清空等待条中的点
-     * */
-    initDots() {
-      this.timeIndex = 0
-      this.dots = ''
-    },
-    /**
-     * 启动计时器
-     * */
-    async start() {
-      await this.isAndroidDevice()
-      await this.getSn()
-      this.errorShow = false
-      this.loading_text = '正在进行初始化操作,请稍等...'
-      this.timeOut = window.setInterval(this.setTimeOutMethod, 1000)
-      getConfig(this)
-    },
-    // 判断增加一个点还是清空点
-    setTimeOutMethod() {
-      this.timeIndex >= 3 ? this.initDots() : this.addDots()
-    }
-  }
-}
-</script>
-<style>
-  .span-height-center {
-    position: relative;
-    top: 35%;
-  }
-
-  .text-style {
-    font-size: 30px;
-    color: black;
-    font-weight: bolder;
-  }
-
-  .div-height10 {
-    height: 10%
-  }
-
-  .div-height20 {
-    height: 20%
-  }
-
-  .div-height30 {
-    height: 30%
-  }
-
-  .div-height40 {
-    height: 40%
-  }
-
-  .div-height50 {
-    height: 50%
-  }
-
-  .div-height60 {
-    height: 60%
-  }
-
-  .div-height70 {
-    height: 70%
-  }
-
-  .div-height80 {
-    height: 80%
-  }
-
-  .div-height90 {
-    height: 90%
-  }
-
-  .div-height100 {
-    height: 100%
-  }
-
-  .loading-text-style {
-    margin: 0 10% 0 10%;
-    height: 30%;
-    border-radius: 10px;
-    text-align: center
-  }
-
-  .InitErrorBtn {
-    width: 150px;
-    height: 60px;
-    font-size: 20px;
-  }
-
-  .ErrorBtnLocation {
-    position: relative;
-    height: 0;
-  }
-</style>
+<template>
+  <div >
+    <div class="mhead">
+      <ul>
+        <li>
+          <text>自助缴费机</text>
+        </li>
+      </ul>
+    </div>
+    <div class="loadview">
+      <div class="auto">
+        <div class="loading-text-style">
+          <span class="text-style span-height-center">{{loading_text}}{{dots}}</span>
+        </div>
+        <div class="ErrorBtnLocation">
+          <button class="InitErrorBtn btn btn-danger" v-if="errorShow" @click="start">重试</button>
+        </div>
+      </div>
+    </div>
+    <div class="foot">
+      <text >返回</text>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+let getConfig = self => {
+  console.group('getConfigParam')
+  let param = {
+    device_num: self.$PosUtil.Sn
+  }
+  console.log('getConfigParam参数: ', param)
+  self.$resetpost(Vue.ProxyUrl +'rs/logic/getConfigParam', param, {resolveMsg: null, rejectMsg: null}).then(res => {
+    self.loading_text = "初始化成功"
+    self.clearThisInterval()
+    // 设置从后台拿过来的参数值
+    Object.assign(self.$PosUtil.posParam, res.data)
+
+    console.log(self.$PosUtil.posParam)
+
+    // 验证通过
+    self.$goto('main', {}, 'self')
+  }).catch(res => {
+    console.log('res.status:', res.status)
+    if (res.status === 501) {
+      self.loading_text = "该设备未注册，请注册后点击重试"
+    } else if (res.status === 404) {
+      self.loading_text = "设备网络故障或连接服务器异常"
+    } else if (res.status === 500) {
+      self.loading_text = "服务器内部错误"
+    } else {
+      self.loading_text = "未知错误"
+    }
+    self.errorShow = true
+    self.clearThisInterval()
+  })
+  console.groupEnd()
+}
+export default {
+  title: '初始化',
+  name: "Init",
+  data() {
+    return {
+      loading_text: '正在对机器进行初始化操作,请稍等',
+      dots: '',
+      timeOut: undefined,
+      timeIndex: 0,
+      errorShow: false
+    }
+  },
+  ready() {
+    this.start()
+  },
+  methods: {
+    //判断当前运行环境
+    isAndroidDevice() {
+      try {
+        console.log('android环境')
+        HostApp
+        this.$AndroidPlugin.isAndroid = true
+        let url = this.$AndroidPlugin.getProxyURL() + '/'
+        if (Vue.phoneBuild){
+          url = this.$AndroidPlugin.getProxyURL() + '/pos/'
+        }
+        Vue.ProxyUrl = url
+      } catch (e) {
+        console.log('PC测试环境')
+        Vue.AndroidPlugin.isAndroid = false
+        //如果是非安卓环境，config中配置的链接地址肯定是不能用的，所以改成空的即可
+        Vue.ProxyUrl = ''
+      }
+    },
+    back(){
+      this.$back()
+    },
+    getSn() {
+      this.Sn = this.$AndroidPlugin.getSN()
+      Vue.PosUtil.Sn = this.Sn
+    },
+    home() {
+      this.$AndroidPlugin.back_home()
+    },
+    /**
+     * 给等待条添加一个点
+     * */
+    addDots() {
+      this.timeIndex++
+      this.dots += '.'
+    },
+    /**
+     * 结束本组件内的计时器
+     * */
+    clearThisInterval() {
+      window.clearInterval(this.timeOut)
+      this.initDots()
+    },
+    /**
+     * 清空等待条中的点
+     * */
+    initDots() {
+      this.timeIndex = 0
+      this.dots = ''
+    },
+    /**
+     * 启动计时器
+     * */
+    async start() {
+      await this.isAndroidDevice()
+      await this.getSn()
+      this.errorShow = false
+      this.loading_text = '正在进行初始化操作,请稍等...'
+      this.timeOut = window.setInterval(this.setTimeOutMethod, 1000)
+      getConfig(this)
+    },
+    // 判断增加一个点还是清空点
+    setTimeOutMethod() {
+      this.timeIndex >= 3 ? this.initDots() : this.addDots()
+    }
+  }
+}
+</script>
+<style>
+  .span-height-center {
+    position: relative;
+    top: 35%;
+  }
+
+  .text-style {
+    font-size: 30px;
+    color: black;
+    font-weight: bolder;
+  }
+
+  .div-height10 {
+    height: 10%
+  }
+
+  .div-height20 {
+    height: 20%
+  }
+
+  .div-height30 {
+    height: 30%
+  }
+
+  .div-height40 {
+    height: 40%
+  }
+
+  .div-height50 {
+    height: 50%
+  }
+
+  .div-height60 {
+    height: 60%
+  }
+
+  .div-height70 {
+    height: 70%
+  }
+
+  .div-height80 {
+    height: 80%
+  }
+
+  .div-height90 {
+    height: 90%
+  }
+
+  .div-height100 {
+    height: 100%
+  }
+
+  .loading-text-style {
+    margin: 0 10% 0 10%;
+    height: 30%;
+    border-radius: 10px;
+    text-align: center
+  }
+
+  .InitErrorBtn {
+    width: 150px;
+    height: 60px;
+    font-size: 20px;
+  }
+
+  .ErrorBtnLocation {
+    position: relative;
+    height: 0;
+  }
+</style>

package/src/components/main/CardMain.vue

@@ -1,47 +1,47 @@
-<template>
-  <div>
-      <div class="mhead">
-        <ul>
-          <li>
-            <text>自助缴费机</text>
-          </li>
-        </ul>
-      </div>
-      <div class="body" style="background: #f0f0f0;padding: 20%;margin: 0 auto">
-        <div>
-          <h5>请插好燃气卡,等待自动读卡</h5>
-          <img src="../image/readCard.gif">
-        </div>
-      </div>
-      <div class="foot" @click="back('toMain')">
-        <text>返回</text>
-      </div>
-  </div>
-</template>service
-
-<script>
-import CheckCard from '../../service/CheckCard'
-import GetCardInfo from '../../service/GetCardInfo'
-import Vue from 'vue'
-export default {
-  title: '读卡',
-  name: 'CardMain',
-  data () {
-    return {
-    }
-  },
-  methods: {
-    back(param) {
-      this.$back(param)
-    }
-  },
-  ready () {
-    // 用户进入该组件后，轮询检查卡，如果检查到卡就读卡并查询卡信息后返回用户档案
-    let service = [new CheckCard(this), new GetCardInfo(this)]
-    service = this.$PosUtil.buildLinked(service)
-    Vue.eventBack(service)
-  }
-}
-</script>
-<style>
-</style>
+<template>
+  <div>
+      <div class="mhead">
+        <ul>
+          <li>
+            <text>自助缴费机</text>
+          </li>
+        </ul>
+      </div>
+      <div class="body" style="background: #f0f0f0;padding: 20%;margin: 0 auto">
+        <div>
+          <h5>请插好燃气卡,等待自动读卡</h5>
+          <img src="../image/readCard.gif">
+        </div>
+      </div>
+      <div class="foot" @click="back('toMain')">
+        <text>返回</text>
+      </div>
+  </div>
+</template>
+
+<script>
+import CheckCard from '../../service/CheckCard'
+import GetCardInfo from '../../service/GetCardInfo'
+import Vue from 'vue'
+export default {
+  title: '读卡',
+  name: 'CardMain',
+  data () {
+    return {
+    }
+  },
+  methods: {
+    back(param) {
+      this.$back(param)
+    }
+  },
+  ready () {
+    // 用户进入该组件后，轮询检查卡，如果检查到卡就读卡并查询卡信息后返回用户档案
+    let service = [new CheckCard(this), new GetCardInfo(this)]
+    service = this.$PosUtil.buildLinked(service)
+    Vue.eventBack(service)
+  }
+}
+</script>
+<style>
+</style>

package/src/service/GetCardInfo.js

@@ -1,88 +1,88 @@
-import Vue from 'vue'
-
-/**
- *   @author GaoChengLong
- *   @date 2018/12/7 16:56
- *   通过HTTP请求获取属于该卡的用户信息档案后跳转到index页面中去
- */
-
-export default class GetCardInfo {
-  constructor(components) {
-    this.self = components
-    // 承诺函数助记符
-    this.resolve = null
-    // 拒绝函数助记符
-    this.reject = null
-  }
-
-  doAction() {
-    return new Promise((resolve, reject) => {
-      this.resolve = resolve
-      this.reject = reject
-      this.getInfoGen(this.self)
-    })
-  }
-
-  commit() {
-    this.self.$goto('card-user-info', {
-      cardInfo: this.self.cardInfo,
-      userInfo: this.self.userInfo,
-      stairPrices: this.self.stairPrices
-      , garbage: this.self.garbage
-    }, 'self', this.self.back)
-  }
-
-  rollback() {
-  }
-
-  async getInfoGen (self) {
-    let condition = `f_card_id = '${self.cardInfo.CardID}' and f_alias = '${self.cardInfo.Factory}'`
-    if (Vue.PosUtil.posParam.filiale.hasFiliale) {
-      condition = condition + Vue.PosUtil.posParam.filiale.condition
-    }
-    let param = {
-      condition: condition
-    }
-    console.log('logic: getUserfile传入的参数为: ', param)
-    await self.$pospost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.revenue + 'getUserfile', param, {
-      resolveMsg: null,
-      rejectMsg: null
-    }).then((ret) => {
-      console.log('logic: getUserfile返回的数据为: ', ret.data)
-      if (ret.data.userInfo.f_alias !== self.cardInfo.Factory) {
-        self.$back('卡信息与档案不符不能购气,请核对燃气卡或联系工作人员')
-        this.resolve(false)
-      } else if (ret.data.userInfo.f_user_state && ret.data.userInfo.f_user_state !== '正常') {
-        self.$back('该用户状态为"' + ret.data.userInfo.f_user_state + '"不能购气,请联系工作人员')
-        this.resolve(false)
-      } else if (ret.data.userInfo.f_table_state !== '正常') {
-        self.$back('该表状态为"' + ret.data.userInfo.f_table_state + '"不能购气,请联系工作人员')
-        this.resolve(false)
-      } else {
-        // 该用户为正常可用状态，开始进入跳转页面
-        self.userInfo = ret.data.userInfo
-        // 预写卡信息
-        self.stairPrices = ret.data.sells
-
-        self.garbage = ret.data.garbage
-        console.log('self.stairPrices:', self.stairPrices)
-        this.resolve(true)
-      }
-    }).catch((ret) => {
-      console.log(ret)
-        let msg
-        if (ret.status === 404) {
-          msg = '连接后台服务失败,请检查网络连接或联系工作人员！'
-        } else if (ret.status === 501) {
-          msg = ret.data + '，请确认是否为正确的燃气卡！'
-        } else if (ret.status === 611) {
-          msg = ret.data + '，请检查网络连接或联系工作人员！'
-        } else {
-          msg = '查询不到该档案,请联系工作人员！'
-        }
-        self.$back(msg)
-        this.resolve(false)
-      }
-    )
-  }
-}
+import Vue from 'vue'
+
+/**
+ *   @author GaoChengLong
+ *   @date 2018/12/7 16:56
+ *   通过HTTP请求获取属于该卡的用户信息档案后跳转到index页面中去
+ */
+
+export default class GetCardInfo {
+  constructor(components) {
+    this.self = components
+    // 承诺函数助记符
+    this.resolve = null
+    // 拒绝函数助记符
+    this.reject = null
+  }
+
+  doAction() {
+    return new Promise((resolve, reject) => {
+      this.resolve = resolve
+      this.reject = reject
+      this.getInfoGen(this.self)
+    })
+  }
+
+  commit() {
+    this.self.$goto('card-user-info', {
+      cardInfo: this.self.cardInfo,
+      userInfo: this.self.userInfo,
+      stairPrices: this.self.stairPrices
+      , garbage: this.self.garbage
+    }, 'self', this.self.back)
+  }
+
+  rollback() {
+  }
+
+  async getInfoGen (self) {
+    let condition = `f_card_id = '${self.cardInfo.CardID}' and f_alias = '${self.cardInfo.Factory}'`
+    if (Vue.PosUtil.posParam.filiale.hasFiliale) {
+      condition = condition + Vue.PosUtil.posParam.filiale.condition
+    }
+    let param = {
+      condition: condition
+    }
+    console.log('logic: getUserfile传入的参数为: ', param)
+    await self.$resetpost(Vue.ProxyUrl + 'rs/logic/' + Vue.PosUtil.posParam.revenue + 'getUserfile', param, {
+      resolveMsg: null,
+      rejectMsg: null
+    }).then((ret) => {
+      console.log('logic: getUserfile返回的数据为: ', ret.data)
+      if (ret.data.userInfo.f_alias !== self.cardInfo.Factory) {
+        self.$back('卡信息与档案不符不能购气,请核对燃气卡或联系工作人员')
+        this.resolve(false)
+      } else if (ret.data.userInfo.f_user_state && ret.data.userInfo.f_user_state !== '正常') {
+        self.$back('该用户状态为"' + ret.data.userInfo.f_user_state + '"不能购气,请联系工作人员')
+        this.resolve(false)
+      } else if (ret.data.userInfo.f_table_state !== '正常') {
+        self.$back('该表状态为"' + ret.data.userInfo.f_table_state + '"不能购气,请联系工作人员')
+        this.resolve(false)
+      } else {
+        // 该用户为正常可用状态，开始进入跳转页面
+        self.userInfo = ret.data.userInfo
+        // 预写卡信息
+        self.stairPrices = ret.data.sells
+
+        self.garbage = ret.data.garbage
+        console.log('self.stairPrices:', self.stairPrices)
+        this.resolve(true)
+      }
+    }).catch((ret) => {
+        console.log(ret)
+        let msg
+        if (ret.status === 404) {
+          msg = '连接后台服务失败,请检查网络连接或联系工作人员！'
+        } else if (ret.status === 501) {
+          msg = ret.data + '，请确认是否为正确的燃气卡！'
+        } else if (ret.status === 611) {
+          msg = ret.data + '，请检查网络连接或联系工作人员！'
+        } else {
+          msg = '查询不到该档案,请联系工作人员！'
+        }
+        self.$back(msg)
+        this.resolve(false)
+      }
+    )
+  }
+}