handpos-client 1.0.6-lekai → 1.0.8-lekai

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handpos-client",
-  "version": "1.0.6-lekai",
+  "version": "1.0.8-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/GarbageInfo.vue

@@ -1,212 +1,241 @@
-<template>
-  <div style="overflow: hidden">
-    <div class="mhead" style="height: 8%;padding-top: 2%;">
-      <ul>
-        <li>
-          <text>垃圾费信息</text>
-        </li>
-      </ul>
-    </div>
-
-    <div class="body">
-      <div class="searchview auto">
-        <!-- 垃圾费信息显示 -->
-        <div class="form-group row auto" style="margin-top:10px;">
-          <div class="col-xs-12">
-            <div class="panel panel-default">
-              <div class="panel-heading">
-                <h4 class="panel-title">垃圾费详情</h4>
-              </div>
-              <div class="panel-body">
-                <!-- 用户信息展示（两行，地址单独一行） -->
-                <div class="garbage-userinfo">
-                  <div class="row">
-                    <div class="col-xs-6">
-                      <strong>用户编号：</strong>{{ userInfo.f_userinfo_code }}
-                    </div>
-                    <div class="col-xs-6">
-                      <strong>用户名称：</strong>{{ userInfo.f_user_name }}
-                    </div>
-                  </div>
-                  <div class="row" style="margin-top: 6px;">
-                    <div class="col-xs-12">
-                      <strong>用户地址：</strong>{{ userInfo.f_address || userInfo.address }}
-                    </div>
-                  </div>
-                </div>
-
-                <div class="row" style="margin-top: 10px;">
-                  <div class="col-xs-6">
-                    <strong>账期：</strong>{{ garbage.accountperiod }}
-                  </div>
-                  <div class="col-xs-6">
-                    <strong>总金额：</strong><span style="color: red;">¥{{ garbage.money }}</span>
-                  </div>
-                </div>
-
-                <div class="row" style="margin-top: 15px;">
-                  <div class="col-xs-12">
-                    <strong>缴费明细：</strong>
-                    <div class="garbage-detail-table">
-                      <table class="table table-striped table-bordered" style="margin-top: 10px;">
-                        <thead>
-                          <tr>
-                            <th style="text-align: center;">月份</th>
-                            <th style="text-align: center;">金额(元)</th>
-                          </tr>
-                        </thead>
-                        <tbody>
-                          <tr v-for="item in garbage.list" :key="item.f_hand_date">
-                            <td style="text-align: center;">{{ formatDate(item.f_hand_date) }}</td>
-                            <td style="text-align: center; color: red;">¥{{ item.f_money }}</td>
-                          </tr>
-                        </tbody>
-                      </table>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 操作按钮 -->
-        <div class="form-group row auto" style="margin-top: 20px;">
-          <div class="col-xs-6 col-xs-offset-3">
-            <button type="button" class="btn btn-success btn-lg btn-block" @click="payGarbageFee()">
-              <i class="fa fa-credit-card"></i> 缴费
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 返回按钮 -->
-    <div class="foot" @click="back('toMain')">
-      <text>返回</text>
-    </div>
-  </div>
-</template>
-
-<script>
-import Vue from 'vue'
-import GarbagePayWay from '../../service/GarbagePayWay'
-import GarbageScanNative from '../../service/GarbageScanNative'
-
-export default {
-  title: '垃圾费信息',
-  name: 'GarbageInfo',
-  data () {
-    return {
-      userInfo: {},
-      garbage: {}
-    }
-  },
-  methods: {
-    // 格式化日期显示
-    formatDate(dateStr) {
-      if (!dateStr) return ''
-      // 假设日期格式为 "2025-10"，转换为 "2025年10月"
-      const parts = dateStr.split('-')
-      if (parts.length === 2) {
-        return `${parts[0]}年${parts[1]}月`
-      }
-      return dateStr
-    },
-
-    // 缴费功能
-    payGarbageFee() {
-      // 跳转到垃圾费专用支付页面
-      this.$showNewMessage('确认', `确认支付垃圾费 ¥${this.garbage.money} 元？`, [ 'confirm'], 'newmgs').then((res) => {
-        console.log('result', res)
-        if (res === 'confirm') {
-          // 创建垃圾费支付服务链
-          let services = [new GarbagePayWay(this), new GarbageScanNative()]
-          //    构建服务引用链
-          this.$PosUtil.buildLinked(services)
-          // 开启事务
-          Vue.eventBack(services)
-        }
-      }).catch((res) => {
-        console.log('res', res)
-      })
-    },
-
-    // 返回主页
-    back(param) {
-      this.$back(param)
-    },
-
-    // 回调函数
-    callBack(param) {
-      if (param === 'success') {
-        this.$showNewMessage('提示', '垃圾费缴费成功！', ['confirm'], 'newmgs')
-        this.back('toMain')
-      } else if (param === 'fail') {
-        this.$showNewMessage('提示', '缴费失败，请重试', ['confirm'], 'newmgs')
-      }
-    }
-  },
-
-  ready () {
-    // 从路由参数或全局状态获取用户信息中的垃圾费信息
-    // 这里假设用户信息已经通过某种方式传递过来
-    this.userInfo = this.userInfo
-    this.garbage = this.garbage
-    console.log('this.userInfo', this.userInfo)
-    console.log('this.garbage', this.garbage)
-  }
-}
-</script>
-
-<style scoped>
-.panel {
-  border: 1px solid #ddd;
-  border-radius: 4px;
-}
-
-.panel-heading {
-  background-color: #f5f5f5;
-  border-bottom: 1px solid #ddd;
-  padding: 10px 15px;
-}
-
-.panel-title {
-  margin: 0;
-  font-size: 16px;
-  text-align: center;
-}
-
-.panel-body {
-  padding: 15px;
-}
-
-.garbage-userinfo {
-  margin-bottom: 10px;
-  font-size: 14px;
-}
-
-.garbage-detail-table {
-  max-height: 220px;
-  overflow-y: auto;
-}
-
-.table {
-  margin-bottom: 0;
-}
-
-.btn-lg {
-  padding: 12px 24px;
-  font-size: 16px;
-}
-
-.btn-success {
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-
-.btn-success:hover {
-  background-color: #449d44;
-  border-color: #398439;
-}
-</style>
+<template>
+  <div style="overflow: hidden">
+    <div class="mhead" style="height: 8%;padding-top: 2%;">
+      <ul>
+        <li>
+          <text>垃圾费信息</text>
+        </li>
+      </ul>
+    </div>
+
+    <div class="body">
+      <div class="searchview auto">
+        <!-- 垃圾费信息显示 -->
+        <div class="form-group row auto" style="margin-top:10px;">
+          <div class="col-xs-12">
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <h4 class="panel-title">垃圾费详情</h4>
+              </div>
+              <div class="panel-body">
+                <!-- 用户信息展示（两行，地址单独一行） -->
+                <div class="garbage-userinfo">
+                  <div class="row">
+                    <div class="col-xs-6">
+                      <strong>用户编号：</strong>{{ userInfo.f_userinfo_code }}
+                    </div>
+                    <div class="col-xs-6">
+                      <strong>用户名称：</strong>{{ userInfo.f_user_name }}
+                    </div>
+                  </div>
+                  <div class="row" style="margin-top: 6px;">
+                    <div class="col-xs-12">
+                      <strong>用户地址：</strong>{{ userInfo.f_address || userInfo.address }}
+                    </div>
+                  </div>
+                </div>
+
+                <div class="row" style="margin-top: 10px;">
+                  <div class="col-xs-6">
+                    <strong>账期：</strong>{{ garbage.accountperiod }}
+                  </div>
+                  <div class="col-xs-6">
+                    <strong>总金额：</strong><span style="color: red;">¥{{ garbage.money }}</span>
+                  </div>
+                </div>
+
+                <div class="row" style="margin-top: 15px;">
+                  <div class="col-xs-12">
+                    <strong>缴费明细：</strong>
+                    <div class="garbage-detail-table">
+                      <table class="table table-striped table-bordered" style="margin-top: 10px;">
+                        <thead>
+                          <tr>
+                            <th style="text-align: center;">月份</th>
+                            <th style="text-align: center;">金额(元)</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <tr v-for="item in garbage.list" :key="item.f_hand_date">
+                            <td style="text-align: center;">{{ formatDate(item.f_hand_date) }}</td>
+                            <td style="text-align: center; color: red;">¥{{ item.f_money }}</td>
+                          </tr>
+                        </tbody>
+                      </table>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 操作按钮 -->
+        <div class="form-group row auto" style="margin-top: 20px;">
+          <div class="col-xs-6 col-xs-offset-3">
+            <button type="button" class="btn btn-success btn-lg btn-block" @click="payGarbageFee()">
+              <i class="fa fa-credit-card"></i> 缴费
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 返回按钮 -->
+    <div class="foot" @click="back('toMain')">
+      <text>返回</text>
+    </div>
+  </div>
+</template>
+
+<script>
+import Vue from 'vue'
+import GarbagePayWay from '../../service/GarbagePayWay'
+import GarbageScanNative from '../../service/GarbageScanNative'
+import * as util from "../../service/util";
+import {getDate} from "../../service/util";
+
+export default {
+  title: '垃圾费信息',
+  name: 'GarbageInfo',
+  data () {
+    return {
+      userInfo: {},
+      garbage: {}
+    }
+  },
+  methods: {
+    // 格式化日期显示
+    formatDate(dateStr) {
+      if (!dateStr) return ''
+      // 假设日期格式为 "2025-10"，转换为 "2025年10月"
+      const parts = dateStr.split('-')
+      if (parts.length === 2) {
+        return `${parts[0]}年${parts[1]}月`
+      }
+      return dateStr
+    },
+
+    // 缴费功能
+    payGarbageFee() {
+      // 跳转到垃圾费专用支付页面
+      this.$showNewMessage('确认', `确认支付垃圾费 ¥${this.garbage.money} 元？`, [ 'confirm'], 'newmgs').then((res) => {
+        console.log('result', res)
+        if (res === 'confirm') {
+          // 创建垃圾费支付服务链
+          let services = [new GarbagePayWay(this), new GarbageScanNative()]
+          //    构建服务引用链
+          this.$PosUtil.buildLinked(services)
+          // 开启事务
+          Vue.eventBack(services)
+        }
+      }).catch((res) => {
+        console.log('res', res)
+      })
+    },
+
+    // 返回主页
+    back(param) {
+      this.$back(param)
+    },
+    print() {
+      let printContent = []
+      let templatename = '山西华新科莱天然气有限公司垃圾费收费单'
+      printContent.push({type: 3, text: templatename, fontsize: 3, isbold: true, align: 'center'})
+      printContent.push({type: 4, value: 2, unit: 'line'})
+      printContent.push({type: 3, text: '收费日期:' + Vue.PosUtil.getNowDate('yyyy-MM-dd'), 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: '垃圾处理费:' + this.garbage.money, fontsize: 2, isbold: false, align: 'left'})
+      printContent.push({type: 3, text: '实收金额(大写):' + util.numberToChinese(this.garbage.money), fontsize: 2, isbold: false, align: 'left'})
+      printContent.push({type: 3, text: '打票时间:' + util.getDate(), fontsize: 2, isbold: false, align: 'left'})
+      printContent.push({type: 3, text: '收费员:' + Vue.user.name, fontsize: 2, isbold: false, align: 'left'})
+      printContent.push({type: 4, value: 4, unit: 'line'})
+      this.$androidUtil.print(JSON.stringify(printContent))
+    },
+    // 回调函数
+    callBack(param) {
+      if (param === 'success') {
+        this.$showNewMessage('提示', '垃圾费缴费成功！', ['confirm'], 'newmgs')
+        this.$showMessage('确认', `垃圾费缴费成功！是否打印收费单？`, ['confirm', 'cancel'], 'newmgs').then((res) => {
+          console.log('result', res)
+          if (res === 'confirm') {
+            try {
+              this.print()
+            } catch (e) {
+              console.log('打印失败')
+              console.log(JSON.stringify(e))
+            }
+          }
+          this.back('toMain')
+        })
+      } else if (param === 'fail') {
+        this.$showNewMessage('提示', '缴费失败，请重试', ['confirm'], 'newmgs')
+      }
+    }
+  },
+
+  ready () {
+    // 从路由参数或全局状态获取用户信息中的垃圾费信息
+    // 这里假设用户信息已经通过某种方式传递过来
+    this.userInfo = this.userInfo
+    this.garbage = this.garbage
+    console.log('this.userInfo', this.userInfo)
+    console.log('this.garbage', this.garbage)
+  }
+}
+</script>
+
+<style scoped>
+.panel {
+  border: 1px solid #ddd;
+  border-radius: 4px;
+}
+
+.panel-heading {
+  background-color: #f5f5f5;
+  border-bottom: 1px solid #ddd;
+  padding: 10px 15px;
+}
+
+.panel-title {
+  margin: 0;
+  font-size: 16px;
+  text-align: center;
+}
+
+.panel-body {
+  padding: 15px;
+}
+
+.garbage-userinfo {
+  margin-bottom: 10px;
+  font-size: 14px;
+}
+
+.garbage-detail-table {
+  max-height: 220px;
+  overflow-y: auto;
+}
+
+.table {
+  margin-bottom: 0;
+}
+
+.btn-lg {
+  padding: 12px 24px;
+  font-size: 16px;
+}
+
+.btn-success {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+
+.btn-success:hover {
+  background-color: #449d44;
+  border-color: #398439;
+}
+</style>