安装包支持64位

ghsApp/dist/build/app-plus/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

ghsApp/dist/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/2ff5df30-6d2b-11ec-b769-87862b99da79
+https://ide.dcloud.net.cn/build/download/d5b03e90-ad1e-11ec-a297-a3d457b7fb91

ghsApp/dist/cache/wgt/__UNI__BD781B0/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

ghsApp/src/manifest.json

@@ -39,7 +39,8 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -101,20 +102,6 @@
             }
         },
         "nativePlugins" : {
-            "G5KJ-ShangMiPrint" : {
-                "__plugin_info__" : {
-                    "name" : "商米内置打印机与扫码",
-                    "description" : "实现商米内置打印机与外接usb扫码枪识别",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3514",
-                    "android_package_name" : "zhh.huahuibao.app",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3514",
-                    "parameters" : {}
-                }
-            },
             "Html5app-Gprinter" : {
                 "__plugin_info__" : {
                     "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",

ghsApp/src/mixins/globalMixins.js

@@ -4,14 +4,8 @@ import { pageTo, isLogin } from '@/utils/util.js'
 import { getUser, wxMiniLogin } from '@/utils/auth'
 import { postWxCode, getDictionaries } from '@/api/mini'
 import { getStaffApi,hasTokenAutoLogin } from '@/api/common'
-import { allProduct } from '@/api/product'
 import { codePay} from "@/api/order/index";
 
-// #ifdef APP-PLUS
-const shangMiPrint = uni.requireNativePlugin('G5KJ-ShangMiPrint')
-const globalEvent = uni.requireNativePlugin('globalEvent')
-// #endif
-
 export default {
 	data() {
 		return {
@@ -90,9 +84,7 @@ export default {
 					})
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
-          // #ifdef APP-PLUS
-          this.listenPDAkd()
-          // #endif
+
           this.setUserShopAll()
           if (this.init) {
             this.init()
@@ -118,9 +110,6 @@ export default {
 					})
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
-          // #ifdef APP-PLUS
-          this.listenPDAkd()
-          // #endif
           this.setUserShopAll()
           if (this.init) {
             this.init()
@@ -141,142 +130,6 @@ export default {
 	},
 	methods: {
     ...mapActions(['setUserShopAll']),
-
-    // #ifdef APP-PLUS
-    //监听pda扫码开单
-    listenPDAkd(){
-
-          //PDA扫码开单前准备好所有花材，首页已经有加载不再需要
-          allProduct().then(res=>{
-            this.allProduct = res.data.list
-            console.log('................载入最新花材................')
-          })
-
-          this.checkStock = true
-
-          let that = this
-
-          //商米D1s收银台
-          if(plus.device.vendor == 'SUNMI'){
-            //https://ext.dcloud.net.cn/plugin?id=3514
-            //初始化
-            shangMiPrint.init()
-            //扫码返回
-            globalEvent.addEventListener('scancode',function(e){
-              if(e.code == 'ok'){
-                let productIdCode = e.data
-                that.globalPDAKd(productIdCode)
-              }
-            })
-            console.log('!!!!!!!!!!!!!!!!!!!!!!!!商米收银台发起监听!!!!!!!!!!!!!!!!!!!!!!!!')
-          }
-
-          //新大陆PDA
-          if(plus.device.vendor == 'Newland'){
-            //PDA
-            var main = plus.android.runtimeMainActivity(); //获取activity
-            var receiver = plus.android.implements('io.dcloud.feature.internal.reflect.BroadcastReceiver', {
-              onReceive: that.listenPDAkdReceive
-            });
-            var IntentFilter = plus.android.importClass('android.content.IntentFilter');
-            var filter = new IntentFilter();
-            filter.addAction("nlscan.action.SCANNER_RESULT"); //监听扫描
-            main.registerReceiver(receiver, filter); //注册监听
-            console.log('!!!!!!!!!!!!!!!!!!!!!!!!PDA发起监听!!!!!!!!!!!!!!!!!!!!!!!!!')
-          }
-
-    },
-		//接收pda扫码
-		listenPDAkdReceive(context, intent) {
-			//通过intent实例引入intent类，方便以后的'.'操作
-			plus.android.importClass(intent)
-			var productIdCode = intent.getStringExtra("SCAN_BARCODE1")
-			this.globalPDAKd(productIdCode)
-		},
-    globalPDAKd(productIdCode){
-
-      //没有登陆直接扫码
-      if(this.$util.isEmpty(this.getLoginInfo)){
-        this.$msg('您还没有登陆')
-        return false
-      }
-
-      var pages = getCurrentPages()
-			let currentRoute  = pages[pages.length-1].route;
-
-      //付款码支付
-      if(currentRoute == 'admin/billing/toPay'){
-        this.requestCodePay(productIdCode)
-        return
-      }
-
-			let that = this
-      that.kdType = 'SCAN'
-      let selectJobType = "bill"
-
-      let currentCustomId = that.skCustomId || 0
-      let pdaCustomId = uni.getStorageSync('pdaCustomId')
-      if(!this.$util.isEmpty(pdaCustomId) && currentRoute == 'admin/billing/affirm'){
-        currentCustomId = pdaCustomId
-      }
-      if(currentCustomId == 0){
-        this.$util.noStockRemind()
-        this.$msg('没有客户信息')
-      }
-      let selectJobId = currentCustomId
-      //涉及记住花材的代码和流程，请全项目搜索关键词remember_item
-      let storageData = uni.getStorageSync('selectList_'+selectJobType+'_target_'+selectJobId)
-			if(!this.$util.isEmpty(storageData)){
-				this.setSelectInfo({ selectJobType: selectJobType, info: storageData,selectJobId:selectJobId})
-			}
-      let selectInfoData = this.getSelectInfo
-      let currentList = selectInfoData[selectJobType+'_'+selectJobId] || []
-      let index = this.allProduct.findIndex(ele => Number(ele.id) == Number(productIdCode))
-      if(index == -1){
-        this.$util.noStockRemind()
-        this.$msg('没有找到花材..')
-        return false
-      }
-      let currentProduct = this.allProduct[index]
-      let storeIndex = -1
-      if(!this.$util.isEmpty(currentList)){
-        storeIndex = currentList.findIndex(ele=> Number(ele.id) == Number(currentProduct.id))
-      }
-      let currentItem = {}
-      if(storeIndex == -1){
-        currentProduct.bigCount = 1
-        currentProduct.smallCount = 0
-        currentProduct.userPrice = currentProduct.bigPrice
-        currentItem = currentProduct
-        if ((Number(currentItem.bigCount) * currentProduct.ratio + Number(currentItem.smallCount)) > (Number(currentProduct.bigNum) * currentProduct.ratio + Number(currentProduct.smallNum))) {
-          this.$util.noStockRemind()
-          uni.showToast({title:"库存不足",icon:"none"})
-          if(currentRoute != 'admin/billing/affirm'){
-            that.$util.pageTo({url: "/admin/billing/affirm",query:{customId:currentCustomId,kdType:that.kdType}})
-          }
-          return
-        }
-        currentList.push(currentProduct)       
-      }else{
-        let currentInfo = currentList[storeIndex]
-        if (((Number(currentInfo.bigCount)+1) * currentProduct.ratio + Number(currentInfo.smallCount)) > (Number(currentProduct.bigNum) * currentProduct.ratio + Number(currentProduct.smallNum))) {
-          this.$util.noStockRemind()
-          uni.showToast({title:"库存不足",icon:"none"})
-          if(currentRoute != 'admin/billing/affirm'){
-            that.$util.pageTo({url: "/admin/billing/affirm",query:{customId:currentCustomId,kdType:that.kdType}})
-          }
-          return
-        }
-        currentList[storeIndex].bigCount = Number(currentList[storeIndex].bigCount) + 1
-        currentItem = currentList[storeIndex]
-      }
-      uni.setStorageSync('selectList_'+selectJobType+'_target_'+currentCustomId, currentList)
-      that.setSelectInfo({ selectJobType: selectJobType, info: currentList,selectJobId:selectJobId })
-      if(currentRoute != 'admin/billing/affirm'){
-        that.$util.pageTo({url: "/admin/billing/affirm",query:{customId:currentCustomId,kdType:that.kdType}})
-      }
-    },
-		// #endif
     //付款码付款
     requestCodePay(authCode){
       let that = this

hdApp/src/manifest.json

@@ -69,7 +69,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {

开发/ghsApp/src/manifest.json

@@ -39,7 +39,8 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -101,20 +102,6 @@
             }
         },
         "nativePlugins" : {
-            "G5KJ-ShangMiPrint" : {
-                "__plugin_info__" : {
-                    "name" : "商米内置打印机与扫码",
-                    "description" : "实现商米内置打印机与外接usb扫码枪识别",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3514",
-                    "android_package_name" : "zhh.huahuibao.app",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3514",
-                    "parameters" : {}
-                }
-            },
             "Html5app-Gprinter" : {
                 "__plugin_info__" : {
                     "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",

开发/hdApp/src/manifest.json

@@ -69,7 +69,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {

线上/ghsApp/src/manifest.json

@@ -39,7 +39,8 @@
                     "<uses-permission android:name=\"android.permission.MEDIA_CONTENT_CONTROL\"/>",
                     "<uses-permission android:name=\"android.permission.USE_FINGERPRINT\"/>"
                 ],
-                "autoSdkPermissions" : true
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {
@@ -101,20 +102,6 @@
             }
         },
         "nativePlugins" : {
-            "G5KJ-ShangMiPrint" : {
-                "__plugin_info__" : {
-                    "name" : "商米内置打印机与扫码",
-                    "description" : "实现商米内置打印机与外接usb扫码枪识别",
-                    "platforms" : "Android",
-                    "url" : "https://ext.dcloud.net.cn/plugin?id=3514",
-                    "android_package_name" : "zhh.huahuibao.app",
-                    "ios_bundle_id" : "",
-                    "isCloud" : true,
-                    "bought" : 1,
-                    "pid" : "3514",
-                    "parameters" : {}
-                }
-            },
             "Html5app-Gprinter" : {
                 "__plugin_info__" : {
                     "name" : "Android 和 IOS 佳博 蓝牙小票 标签 打印插件",

线上/hdApp/src/manifest.json

@@ -69,7 +69,9 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>",
                     "<uses-permission android:name=\"android.permission.RECEIVE_USER_PRESENT\"/>"
-                ]
+                ],
+                "autoSdkPermissions" : true,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {