shish 4 lat temu
rodzic
commit
1658b49289

+ 2 - 0
hdPad/src/components/keyboard-listener/keyboard-listener.vue

@@ -11,6 +11,7 @@ export default {
   },
 }
 </script>
+
 <script module="keyboard" lang="renderjs">
 export default {
   mounted () {
@@ -34,5 +35,6 @@ export default {
   }
 }
 </script>
+
 <style>
 </style>

+ 0 - 14
hdPad/src/manifest.json

@@ -141,20 +141,6 @@
                     "pid" : "3514",
                     "parameters" : {}
                 }
-            },
-            "longyoung-KeyEventListen" : {
-                "__plugin_info__" : {
-                    "name" : "【longyoung】蓝牙usb外接键盘扫描枪监听获取输入内容【万能】 - [试用版,仅用于自定义调试基座]",
-                    "description" : "【万能监听】外接键盘扫描枪监听,有疑问,关注公众号「longyoung」后台发消息提问。",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=1744",
-                    "android_package_name" : "",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 0,
-                    "pid" : "1744",
-                    "parameters" : {}
-                }
             }
         }
     },

+ 1 - 2
hdPad/src/mixins/globalMixins.js

@@ -4,9 +4,8 @@ import { pageTo, isLogin } from '@/utils/util.js'
 import { getUser, wxMiniLogin } from '@/utils/auth'
 import { getDictionaries } from '@/api/mini'
 import { hasTokenAutoLogin } from '@/api/common'
-import scanMins from "@/mixins/scan";
 export default {
-  mixins: [scanMins],
+  mixins: [],
 	data() {
 		return {
 			// 全局混入,插入链接参数

+ 5 - 4
hdPad/src/mixins/scan.js

@@ -6,6 +6,9 @@ export default {
 		return {
 		}
 	},
+    created(){
+        this.listenScan()
+    },
 	methods: {
         listenScan(){
             //商米收银台
@@ -17,12 +20,10 @@ export default {
                 globalEvent.addEventListener('scancode',function(e){
                     if(e.code == 'ok'){
                         let productIdCode = e.data
-                        uni.$emit('scancodedate',{code:productIdCode})
+                        uni.$emit('listenGetScanCode',{code:productIdCode})
                     }
                 })
-                console.log('商米监听扫码')
-            }else{
-
+                console.log('商米监听扫码...')
             }
         }
     }

+ 4 - 4
hdPad/src/pages/home/cash.vue

@@ -77,15 +77,15 @@ export default {
 	onShow() {
         var that = this
 		//每次进来先 移除全局自定义事件监听器
-        uni.$off('scancodedate') 
-        uni.$on('scancodedate',function(data){  
-            console.log('你想要的code:', data.code)
+        uni.$off('listenGetScanCode') 
+        uni.$on('listenGetScanCode',function(data){  
+            console.log('code:'+ data.code)
 			that.$msg(data.code)
         })
 	},
 	onunload(){
 		// 移除监听事件
-		uni.$off('scancodedate')
+		uni.$off('listenGetScanCode')
 	},
 	mounted() {
 		if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){

+ 25 - 3
hdPad/src/pages/home/components/nav.vue

@@ -1,13 +1,15 @@
 <template>
   <view class="nav-left">
     <view class="item-list" v-for="(s, idx) in nav" @tap="goTo(s)" :key="idx">{{s.name}}</view>
-    <keyboard-listener @keyup="keyup"></keyboard-listener>
+    <keyboard-listener v-if="device == 'PAD'" @keyup="getScan"></keyboard-listener>
   </view>
 </template>
 <script>
+import scanMins from "@/mixins/scan";
 import keyboardListener from "@/components/keyboard-listener/keyboard-listener.vue";
 export default {
   name: "navComponet",
+  mixins: [scanMins],
   components: { keyboardListener },
   data() {
     return {
@@ -17,11 +19,31 @@ export default {
         { name: "选款", page: "/pages/home/selectMake" },
         { name: "新款", page: "/pages/home/make" },
       ],
+      device:'',
     };
   },
+  created(){
+    // #ifdef APP-PLUS
+    if(plus.device.vendor == 'SUNMI'){
+      this.device = 'SUNMI'
+    }else{
+      this.device = 'PAD'
+      console.log('平板监听扫码...')
+    }
+    // #endif
+  },
   methods: {
-		keyup(item){
-			console.log(item)
+		getScan(item){
+			let hasScanCode = uni.getStorageSync('hasScanCode')
+      let code = item.key || ''
+      if(!this.$util.isEmpty(code)){
+        if(code != 'Enter'){
+          uni.setStorageSync('hasScanCode', hasScanCode+code)
+        }else{
+          uni.$emit('listenGetScanCode',{code:hasScanCode})
+          uni.removeStorageSync('hasScanCode')
+        }
+      }
 		},
     goTo(item) {
       this.$util.hitRemind();