Home Verkennen Help
Registreren Inloggen
zhh
/
front-end
1
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

蓝牙 可以试用版

shish 5 jaren geleden
bovenliggende
adc7de98b0
commit
8323d38673
43 gewijzigde bestanden met toevoegingen van 671 en 170 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 2 2
      ghs/dist/shop/index.html
  2. 0 0
      ghs/dist/shop/js/app.d7ce8303.js
  3. 4 4
      ghs/vue.config.js
  4. 2 2
      ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json
  5. 1 0
      ghsApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
  6. 1 0
      ghsApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
  7. 1 0
      ghsApp/dist/build/mp-weixin/admin/statistics/demo.wxss
  8. 0 0
      ghsApp/dist/build/mp-weixin/common/main.wxss
  9. 2 2
      ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
  10. 2 2
      ghsApp/dist/build/mp-weixin/components/app-date-picker.json
  11. 2 2
      ghsApp/dist/build/mp-weixin/components/app-result.json
  12. 2 2
      ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
  13. 2 2
      ghsApp/dist/build/mp-weixin/components/module/app-vip.json
  14. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/alert.json
  15. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/badge.json
  16. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
  17. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/fab.json
  18. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/modal.json
  19. 2 2
      ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
  20. 6 6
      ghsApp/dist/build/mp-weixin/ext.json
  21. 2 2
      ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
  22. 1 0
      ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
  23. 1 0
      ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
  24. 4 4
      ghsApp/dist/build/mp-weixin/project.config.json
  25. 6 6
      ghsApp/dist/build/mp-weixin/static/iconfont/iconfont.css
  26. 6 6
      ghsApp/src/ext.json
  27. 136 73
      ghsApp/src/mixins/BLE.js
  28. 193 0
      ghsApp/src/pagesOrder/js/commands.js
  29. 162 0
      ghsApp/src/pagesOrder/js/printerjobs.js
  30. 78 0
      ghsApp/src/pagesOrder/js/printerutil.js
  31. 6 6
      ghsApp/src/static/iconfont/iconfont.css
  32. 2 2
      hd/dist/shop/index.html
  33. 0 0
      hd/dist/shop/js/app.371b7fd7.js
  34. 4 4
      hd/vue.config.js
  35. 6 6
      hdApp/src/ext.json
  36. 1 1
      hdApp/src/manifest.json
  37. 6 6
      hdApp/src/static/iconfont/iconfont.css
  38. 5 5
      mallApp/src/ext.json
  39. 1 1
      mallApp/src/manifest.json
  40. 6 6
      mallApp/src/static/iconfont/iconfont.css
  41. 2 2
      pt/dist/web/index.html
  42. 0 0
      pt/dist/web/js/app.c0d3a222.js
  43. 4 4
      pt/vue.config.js

+ 2 - 2
ghs/dist/shop/index.html
Bestand weergeven 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>销花宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.ff37452f.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.ff37452f.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.d7ce8303.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.d7ce8303.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
ghs/dist/shop/js/app.d7ce8303.js


+ 4 - 4
ghs/vue.config.js
Bestand weergeven 

@@ -3,7 +3,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
 
-const proxyTarget = 'https://api.shop.wixhb.com';
 
+const proxyTarget = 'http://api.shop.hzghd.com';
 
 
 function resolve(dir) {
 
 	return path.join(__dirname, dir);
 
@@ -14,11 +14,11 @@ function resolve(dir) {
 
  * **/
 
 let hostUrl = ``;
 
 if(process.env.NODE_ENV == 'development'){
 
-	hostUrl = `https://img.wixhb.com/`;
 
+	hostUrl = `http://img.hzghd.com/`;
 
 }else if(process.env.NODE_ENV == 'local'){
 
-	hostUrl = `https://img.wixhb.com/`;
 
+	hostUrl = `http://img.hzghd.com/`;
 
 }else{
 
-	hostUrl = `https://img.wixhb.com/`;
 
+	hostUrl = `https://img.hzghd.com/`;
 
 }
 
 
 const cdn = {

+ 2 - 2
ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 1 - 0
ghsApp/dist/build/mp-weixin/admin/shopAdmin/bind.wxss
Bestand weergeven 

@@ -0,0 +1 @@
 
+/* admin/shopAdmin/bind.wxss */

+ 1 - 0
ghsApp/dist/build/mp-weixin/admin/staff/sel-member.wxss
Bestand weergeven 

@@ -0,0 +1 @@
 
+/* admin/staff/sel-member.wxss */

+ 1 - 0
ghsApp/dist/build/mp-weixin/admin/statistics/demo.wxss
Bestand weergeven 

@@ -0,0 +1 @@
 
+/* admin/statistics/demo.wxss */

File diff suppressed because it is too large
+ 0 - 0
ghsApp/dist/build/mp-weixin/common/main.wxss


+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-date-picker.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/app-result.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/module/app-vip.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/alert.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/badge.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/fab.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/modal.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/components/plugin/simple-address.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "component": true,
 
-  "usingComponents": {}
 
+  "usingComponents": {},
 
+  "component": true
 
 }

+ 6 - 6
ghsApp/dist/build/mp-weixin/ext.json
Bestand weergeven 

@@ -1,12 +1,12 @@
 
 {
 
   "extEnable": true,
 
-  "extAppid": "wxcf32b3f0684c2433",
 
+  "extAppid": "wx21b7c3ef12082099",
 
   "directCommit": false,
 
   "ext": {
 
-    "account": 12358,
 
-    "apiHost": "https://api.shop.wixhb.com",
 
-    "socketApiHost": "api.shop.wixhb.com",
 
-    "imgHost": "https://img.wixhb.com",
 
-    "name":"销花宝"
 
+    "account": 12362,
 
+    "apiHost": "https://api.shop.hzghd.com",
 
+    "socketApiHost": "api.shop.hzghd.com",
 
+    "imgHost": "https://img.hzghd.com",
 
+    "name":"花掌柜"
 
   }
 
 }

+ 2 - 2
ghsApp/dist/build/mp-weixin/pagesOrder/components/stepShip.json
Bestand weergeven 

@@ -1,4 +1,4 @@
 
 {
 
-  "usingComponents": {},
 
-  "component": true
 
+  "component": true,
 
+  "usingComponents": {}
 
 }

+ 1 - 0
ghsApp/dist/build/mp-weixin/pagesStore/me/rechargeList.wxss
Bestand weergeven 

@@ -0,0 +1 @@
 
+/* pagesStore/me/rechargeList.wxss */

+ 1 - 0
ghsApp/dist/build/mp-weixin/pagesStore/me/withdraw.wxss
Bestand weergeven 

@@ -0,0 +1 @@
 
+/* pagesStore/me/withdraw.wxss */

+ 4 - 4
ghsApp/dist/build/mp-weixin/project.config.json
Bestand weergeven 

@@ -21,9 +21,9 @@
 
     "checkSiteMap": true,
 
     "uploadWithSourceMap": true,
 
     "compileHotReLoad": false,
 
-    "useMultiFrameRuntime": true,
 
-    "useApiHook": true,
 
-    "useApiHostProcess": true,
 
+    "useMultiFrameRuntime": false,
 
+    "useApiHook": false,
 
+    "useApiHostProcess": false,
 
     "babelSetting": {
 
       "ignore": [],
 
       "disablePlugins": [],
 
@@ -40,7 +40,7 @@
 
   },
 
   "compileType": "miniprogram",
 
   "libVersion": "",
 
-  "appid": "wxcf32b3f0684c2433",
 
+  "appid": "wx21b7c3ef12082099",
 
   "projectname": "%E4%BE%9B%E5%BA%94%E5%95%86",
 
   "condition": {
 
     "search": {

+ 6 - 6
ghsApp/dist/build/mp-weixin/static/iconfont/iconfont.css
Bestand weergeven 

@@ -1,11 +1,11 @@
 
 @font-face {
 
   font-family: 'iconfont';  /* project id 1525256 */
 
-  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');
 
+  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');
 
 }
 
 
 .iconfont {

+ 6 - 6
ghsApp/src/ext.json
Bestand weergeven 

@@ -1,12 +1,12 @@
 
 {
 
   "extEnable": true,
 
-  "extAppid": "wxcf32b3f0684c2433",
 
+  "extAppid": "wx21b7c3ef12082099",
 
   "directCommit": false,
 
   "ext": {
 
-    "account": 12358,
 
-    "apiHost": "https://api.shop.wixhb.com",
 
-    "socketApiHost": "api.shop.wixhb.com",
 
-    "imgHost": "https://img.wixhb.com",
 
-    "name":"销花宝"
 
+    "account": 12362,
 
+    "apiHost": "https://api.shop.hzghd.com",
 
+    "socketApiHost": "api.shop.hzghd.com",
 
+    "imgHost": "https://img.hzghd.com",
 
+    "name":"花掌柜"
 
   }
 
 }

+ 136 - 73
ghsApp/src/mixins/BLE.js
Bestand weergeven 

@@ -4,6 +4,10 @@ var util = require("@/pagesOrder/js/util.js");
 
 import drawQrcode from "@/pagesOrder/js/weapp.qrcode.esm";
 
 var toArrayBuffer = require('to-array-buffer');
 
 
+var PrinterJobs = require("@/pagesOrder/js/printerjobs.js");
 
+var printerUtil = require("@/pagesOrder/js/printerutil.js");
 
+
 
+
 
 export default {
 
 	data() {
 
 		return {
 
@@ -253,82 +257,141 @@ export default {
 
 				}
 
 			});
 
 		},
 
+		_writeBLECharacteristicValue(data) {
 
+			uni.writeBLECharacteristicValue({
 
+			  deviceId: data.deviceId,
 
+			  serviceId: data.serviceId,
 
+			  characteristicId: data.characteristicId,
 
+			  value: data.buffer,
 
+			  success(res) {
 
+				console.log('writeBLECharacteristicValue success', res)
 
+			  },
 
+			  fail(res) {
 
+				console.log('writeBLECharacteristicValue fail', res)
 
+			  }
 
+			})
 
+		  },
 
+
 
 		senBleLabel() {
 
 			let BleVal = this.BleVal;
 
 			let self = this;
 
 			console.log(BleVal,'BleValBleVal')
 
 			let currDev = uni.getStorageSync('BLE');
 
-			//标签模式
 
 			let deviceId = currDev.deviceId;
 
 			let serviceId = currDev.services[0].serviceId;
 
 			let characteristicId = currDev.services[0].characteristicId;
 
 
-			let arrPrint = [];
 
-			//初始化打印机
 
-			arrPrint.push(util.sendDirective([0x1B, 0x40])); //16进制
 
-			//正文
 
-			arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
-			//字体宽高加倍
 
-			arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
-			arrPrint.push(util.hexStringToBuff(BleVal.sendNum));
 
-			//字体不放大，宽高不再加倍
 
-			arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
 
-			arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
-			arrPrint.push(util.hexStringToBuff(" |纯彩花艺\n"));
 
-			arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
+			let printerJobs = new PrinterJobs();
 
+			printerJobs
 
+			  .print('2018年12月5日17:34')
 
+			  .print(printerUtil.fillLine())
 
+			  .setAlign('ct')
 
+			  .setSize(2, 2)
 
+			  .print('#20饿了么外卖')
 
+			  .setSize(1, 1)
 
+			  .print('切尔西Chelsea')
 
+			  .setSize(2, 2)
 
+			  .print('在线支付(已支付)')
 
+			  .setSize(1, 1)
 
+			  .print('订单号：5415221202244734')
 
+			  .print('下单时间：2017-07-07 18:08:08')
 
+			  .setAlign('lt')
 
+			  .print(printerUtil.fillAround('一号口袋'))
 
+			  .print(printerUtil.inline('意大利茄汁一面 * 1', '15'))
 
+			  .print(printerUtil.fillAround('其他'))
 
+			  .print('餐盒费：1')
 
+			  .print('[赠送康师傅冰红茶] * 1')
 
+			  .print(printerUtil.fillLine())
 
+			  .setAlign('rt')
 
+			  .print('原价：￥16')
 
+			  .print('总价：￥16')
 
+			  .setAlign('lt')
 
+			  .print(printerUtil.fillLine())
 
+			  .print('备注')
 
+			  .print("无")
 
+			  .print(printerUtil.fillLine())
 
+			  .println();
 
+		
+			let buffer = printerJobs.buffer();
 
 			
-			arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
-			arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
+			// 1.并行调用多次会存在写失败的可能性
 
+			// 2.建议每次写入不超过20字节
 
+			// 分包处理，延时调用
 
+			const maxChunk = 20;
 
+			const delay = 20;
 
+			for (let i = 0, j = 0, length = buffer.byteLength; i < length; i += maxChunk, j++) {
 
+			  let subPackage = buffer.slice(i, i + maxChunk <= length ? (i + maxChunk) : length);
 
+			  setTimeout(this._writeBLECharacteristicValue, j * delay, {deviceId:deviceId, serviceId:serviceId, characteristicId:characteristicId,buffer:subPackage});
 
+			}
 
 
-			//字体宽高加倍
 
-			arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
+			
+			// let arrPrint = [];
 
+			// //初始化打印机
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x40])); //16进制
 
+			// //正文
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
+			// //字体宽高加倍
 
+			// arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
+			// arrPrint.push(util.hexStringToBuff(BleVal.sendNum));
 
+			// //字体不放大，宽高不再加倍
 
+			// arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
 
-			arrPrint.push(util.hexStringToBuff(BleVal.custom.fullAddress+ "\n"));	
-			arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
-			arrPrint.push(util.hexStringToBuff(BleVal.custom.customName+"\n"+BleVal.custom.customMobile+ "\n"));
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
+			// arrPrint.push(util.hexStringToBuff(" |纯彩花艺\n"));
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
+			
+			// arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
 
-			//字体不放大，宽高不再加倍
 
-			arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
+			// //字体宽高加倍
 
+			// arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
 
-			if(BleVal.remark.length > 0){
 
-				arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
-				arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
-				arrPrint.push(util.hexStringToBuff("备注：\n"));
 
-				arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
-				//字体宽高加倍
 
-				arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
-				arrPrint.push(util.hexStringToBuff(BleVal.remark+"\n"));
 
-				//字体不放大，宽高不再加倍
 
-				arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
-			}
 
+			// arrPrint.push(util.hexStringToBuff(BleVal.custom.fullAddress+ "\n"));	
+			// arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
+			// arrPrint.push(util.hexStringToBuff(BleVal.custom.customName+"\n"+BleVal.custom.customMobile+ "\n"));
 
 
-			arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
-			arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
-			arrPrint.push(util.hexStringToBuff(util.printThreeData('花材', '数量', '价格')));
 
-			if(BleVal.product.length > 0){
 
-				BleVal.product.forEach(function(currentItem){
 
-					arrPrint.push(util.hexStringToBuff(util.printThreeData(currentItem.name, currentItem.num, currentItem.price)))
 
-				})
 
-			}
 
-			arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("运费:", BleVal.sendCost)));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("总金额:", BleVal.prePrice)));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("优惠:", BleVal.discountAmount)));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("应付金额:", BleVal.realPrice)));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("实付金额:", BleVal.debt == 1 ? '0.00' : BleVal.realPrice)));
 
-			if(BleVal.debtAmount > 0){
 
-				//加粗
 
-				//arrPrint.push(util.sendDirective([0x1b, 0x45, 0x01]));
 
-				arrPrint.push(util.hexStringToBuff(util.printTwoData("累计欠款:", BleVal.debtAmount)));
 
-				//取消加粗	
-				//arrPrint.push(util.sendDirective([0x1b, 0x45, 0x00]));
 
-			}
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("订单日期:", BleVal.date)));
 
-			arrPrint.push(util.hexStringToBuff(util.printTwoData("订单编号:", BleVal.orderSn)));
 
-			arrPrint.push(util.sendDirective([0x1B, 0x61, 0x00]));
 
-			arrPrint.push(util.hexStringToBuff("门店地址："+BleVal.address+"\n"));
 
-			arrPrint.push(util.hexStringToBuff("\n\n\n\n"));
 
+			// //字体不放大，宽高不再加倍
 
+			// arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
+
 
+			// if(BleVal.remark.length > 0){
 
+			// 	arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
+			// 	arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
+			// 	arrPrint.push(util.hexStringToBuff("备注：\n"));
 
+			// 	arrPrint.push(util.sendDirective([0x1B, 0x0E]));
 
+			// 	//字体宽高加倍
 
+			// 	arrPrint.push(util.sendDirective([0x1d, 0x21, 0x11]));
 
+			// 	arrPrint.push(util.hexStringToBuff(BleVal.remark+"\n"));
 
+			// 	//字体不放大，宽高不再加倍
 
+			// 	arrPrint.push(util.sendDirective([0x1d, 0x21, 0x00]));
 
+			// }
 
+
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x14]));
 
+			// arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
+			// arrPrint.push(util.hexStringToBuff(util.printThreeData('花材', '数量', '价格')));
 
+			// if(BleVal.product.length > 0){
 
+			// 	BleVal.product.forEach(function(currentItem){
 
+			// 		arrPrint.push(util.hexStringToBuff(util.printThreeData(currentItem.name, currentItem.num, currentItem.price)))
 
+			// 	})
 
+			// }
 
+			// arrPrint.push(util.hexStringToBuff("--------------------------------\n"));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("运费:", BleVal.sendCost)));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("总金额:", BleVal.prePrice)));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("优惠:", BleVal.discountAmount)));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("应付金额:", BleVal.realPrice)));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("实付金额:", BleVal.debt == 1 ? '0.00' : BleVal.realPrice)));
 
+			// if(BleVal.debtAmount > 0){
 
+			// 	//加粗
 
+			// 	//arrPrint.push(util.sendDirective([0x1b, 0x45, 0x01]));
 
+			// 	arrPrint.push(util.hexStringToBuff(util.printTwoData("累计欠款:", BleVal.debtAmount)));
 
+			// 	//取消加粗	
+			// 	//arrPrint.push(util.sendDirective([0x1b, 0x45, 0x00]));
 
+			// }
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("订单日期:", BleVal.date)));
 
+			// arrPrint.push(util.hexStringToBuff(util.printTwoData("订单编号:", BleVal.orderSn)));
 
+			// arrPrint.push(util.sendDirective([0x1B, 0x61, 0x00]));
 
+			// arrPrint.push(util.hexStringToBuff("门店地址："+BleVal.address+"\n"));
 
+			// arrPrint.push(util.hexStringToBuff("\n\n\n\n"));
 
 
 			// const ctx = uni.createCanvasContext('canvas');
 
 			// ctx.clearRect(0, 0, 130, 130);
 
@@ -369,20 +432,20 @@ export default {
 
 			// 	}
 
 			// });
 
 
-			addPrintNum({id:self.orderId}).then(res=>{
 
-				if(!self.$util.isEmpty(self.detailInfo)){
 
-					self.detailInfo.printNum++;
 
-				}
 
-				if(!self.$util.isEmpty(self.list.data)){
 
-					self.list.data.forEach(ele=>{
 
-						if (ele.id==self.orderId) {
 
-							ele.printNum++;
 
-						}
 
-					})
 
-				}
 
+			// addPrintNum({id:self.orderId}).then(res=>{
 
+			// 	if(!self.$util.isEmpty(self.detailInfo)){
 
+			// 		self.detailInfo.printNum++;
 
+			// 	}
 
+			// 	if(!self.$util.isEmpty(self.list.data)){
 
+			// 		self.list.data.forEach(ele=>{
 
+			// 			if (ele.id==self.orderId) {
 
+			// 				ele.printNum++;
 
+			// 			}
 
+			// 		})
 
+			// 	}
 
 
-			})
 
-			this.printInfo({deviceId:deviceId, serviceId:serviceId, characteristicId:characteristicId}, arrPrint);
 
+			// })
 
+			// this.printInfo({deviceId:deviceId, serviceId:serviceId, characteristicId:characteristicId}, arrPrint);
 
 
 		},

+ 193 - 0
ghsApp/src/pagesOrder/js/commands.js
Bestand weergeven 

@@ -0,0 +1,193 @@
 
+/**
 
+ * 修改自https://github.com/song940/node-escpos/blob/master/commands.js
 
+ * ESC/POS _ (Constants)
 
+ */
 
+var _ = {
 
+  LF: [0x0a],
 
+  FS: [0x1c],
 
+  FF: [0x0c],
 
+  GS: [0x1d],
 
+  DLE: [0x10],
 
+  EOT: [0x04],
 
+  NUL: [0x00],
 
+  ESC: [0x1b],
 
+  EOL: '\n',
 
+};
 
+
 
+/**
 
+ * [FEED_CONTROL_SEQUENCES Feed control sequences]
 
+ * @type {Object}
 
+ */
 
+_.FEED_CONTROL_SEQUENCES = {
 
+  CTL_LF: [0x0a],   // Print and line feed
 
+  CTL_GLF: [0x4a, 0x00],   // Print and feed paper (without spaces between lines)
 
+  CTL_FF: [0x0c],   // Form feed
 
+  CTL_CR: [0x0d],   // Carriage return
 
+  CTL_HT: [0x09],   // Horizontal tab
 
+  CTL_VT: [0x0b],   // Vertical tab
 
+};
 
+
 
+_.CHARACTER_SPACING = {
 
+  CS_DEFAULT: [0x1b, 0x20, 0x00],
 
+  CS_SET: [0x1b, 0x20]
 
+};
 
+
 
+_.LINE_SPACING = {
 
+  LS_DEFAULT: [0x1b, 0x32],
 
+  LS_SET: [0x1b, 0x33]
 
+};
 
+
 
+/**
 
+ * [HARDWARE Printer hardware]
 
+ * @type {Object}
 
+ */
 
+_.HARDWARE = {
 
+  HW_INIT: [0x1b, 0x40], // Clear data in buffer and reset modes
 
+  HW_SELECT: [0x1b, 0x3d, 0x01], // Printer select
 
+  HW_RESET: [0x1b, 0x3f, 0x0a, 0x00], // Reset printer hardware
 
+};
 
+
 
+/**
 
+ * [CASH_DRAWER Cash Drawer]
 
+ * @type {Object}
 
+ */
 
+_.CASH_DRAWER = {
 
+  CD_KICK_2: [0x1b, 0x70, 0x00], // Sends a pulse to pin 2 []
 
+  CD_KICK_5: [0x1b, 0x70, 0x01], // Sends a pulse to pin 5 []
 
+};
 
+
 
+/**
 
+ * [MARGINS Margins sizes]
 
+ * @type {Object}
 
+ */
 
+_.MARGINS = {
 
+  BOTTOM: [0x1b, 0x4f], // Fix bottom size
 
+  LEFT: [0x1b, 0x6c], // Fix left size
 
+  RIGHT: [0x1b, 0x51], // Fix right size
 
+};
 
+
 
+/**
 
+ * [PAPER Paper]
 
+ * @type {Object}
 
+ */
 
+_.PAPER = {
 
+  PAPER_FULL_CUT: [0x1d, 0x56, 0x00], // Full cut paper
 
+  PAPER_PART_CUT: [0x1d, 0x56, 0x01], // Partial cut paper
 
+  PAPER_CUT_A: [0x1d, 0x56, 0x41], // Partial cut paper
 
+  PAPER_CUT_B: [0x1d, 0x56, 0x42], // Partial cut paper
 
+};
 
+
 
+/**
 
+ * [TEXT_FORMAT Text format]
 
+ * @type {Object}
 
+ */
 
+_.TEXT_FORMAT = {
 
+  TXT_NORMAL: [0x1b, 0x21, 0x00], // Normal text
 
+  TXT_2HEIGHT: [0x1b, 0x21, 0x10], // Double height text
 
+  TXT_2WIDTH: [0x1b, 0x21, 0x20], // Double width text
 
+  TXT_4SQUARE: [0x1b, 0x21, 0x30], // Double width & height text
 
+
 
+  TXT_UNDERL_OFF: [0x1b, 0x2d, 0x00], // Underline font OFF
 
+  TXT_UNDERL_ON: [0x1b, 0x2d, 0x01], // Underline font 1-dot ON
 
+  TXT_UNDERL2_ON: [0x1b, 0x2d, 0x02], // Underline font 2-dot ON
 
+  TXT_BOLD_OFF: [0x1b, 0x45, 0x00], // Bold font OFF
 
+  TXT_BOLD_ON: [0x1b, 0x45, 0x01], // Bold font ON
 
+  TXT_ITALIC_OFF: [0x1b, 0x35], // Italic font ON
 
+  TXT_ITALIC_ON: [0x1b, 0x34], // Italic font ON
 
+
 
+  TXT_FONT_A: [0x1b, 0x4d, 0x00], // Font type A
 
+  TXT_FONT_B: [0x1b, 0x4d, 0x01], // Font type B
 
+  TXT_FONT_C: [0x1b, 0x4d, 0x02], // Font type C
 
+
 
+  TXT_ALIGN_LT: [0x1b, 0x61, 0x00], // Left justification
 
+  TXT_ALIGN_CT: [0x1b, 0x61, 0x01], // Centering
 
+  TXT_ALIGN_RT: [0x1b, 0x61, 0x02], // Right justification
 
+};
 
+
 
+/**
 
+ * [BARCODE_FORMAT Barcode format]
 
+ * @type {Object}
 
+ */
 
+_.BARCODE_FORMAT = {
 
+  BARCODE_TXT_OFF: [0x1d, 0x48, 0x00], // HRI barcode chars OFF
 
+  BARCODE_TXT_ABV: [0x1d, 0x48, 0x01], // HRI barcode chars above
 
+  BARCODE_TXT_BLW: [0x1d, 0x48, 0x02], // HRI barcode chars below
 
+  BARCODE_TXT_BTH: [0x1d, 0x48, 0x03], // HRI barcode chars both above and below
 
+
 
+  BARCODE_FONT_A: [0x1d, 0x66, 0x00], // Font type A for HRI barcode chars
 
+  BARCODE_FONT_B: [0x1d, 0x66, 0x01], // Font type B for HRI barcode chars
 
+
 
+  BARCODE_HEIGHT: function (height) { // Barcode Height [1-255]
 
+    return [0x1d, 0x68, height];
 
+  },
 
+  BARCODE_WIDTH: function (width) {   // Barcode Width  [2-6]
 
+    return [0x1d, 0x77, width];
 
+  },
 
+  BARCODE_HEIGHT_DEFAULT: [0x1d, 0x68, 0x64], // Barcode height default:100
 
+  BARCODE_WIDTH_DEFAULT: [0x1d, 0x77, 0x01], // Barcode width default:1
 
+
 
+  BARCODE_UPC_A: [0x1d, 0x6b, 0x00], // Barcode type UPC-A
 
+  BARCODE_UPC_E: [0x1d, 0x6b, 0x01], // Barcode type UPC-E
 
+  BARCODE_EAN13: [0x1d, 0x6b, 0x02], // Barcode type EAN13
 
+  BARCODE_EAN8: [0x1d, 0x6b, 0x03], // Barcode type EAN8
 
+  BARCODE_CODE39: [0x1d, 0x6b, 0x04], // Barcode type CODE39
 
+  BARCODE_ITF: [0x1d, 0x6b, 0x05], // Barcode type ITF
 
+  BARCODE_NW7: [0x1d, 0x6b, 0x06], // Barcode type NW7
 
+  BARCODE_CODE93: [0x1d, 0x6b, 0x48], // Barcode type CODE93
 
+  BARCODE_CODE128: [0x1d, 0x6b, 0x49], // Barcode type CODE128
 
+};
 
+
 
+/**
 
+ * [IMAGE_FORMAT Image format]
 
+ * @type {Object}
 
+ */
 
+_.IMAGE_FORMAT = {
 
+  S_RASTER_N: [0x1d, 0x76, 0x30, 0x00], // Set raster image normal size
 
+  S_RASTER_2W: [0x1d, 0x76, 0x30, 0x01], // Set raster image double width
 
+  S_RASTER_2H: [0x1d, 0x76, 0x30, 0x02], // Set raster image double height
 
+  S_RASTER_Q: [0x1d, 0x76, 0x30, 0x03], // Set raster image quadruple
 
+};
 
+
 
+/**
 
+ * [BITMAP_FORMAT description]
 
+ * @type {Object}
 
+ */
 
+_.BITMAP_FORMAT = {
 
+  BITMAP_S8: [0x1b, 0x2a, 0x00],
 
+  BITMAP_D8: [0x1b, 0x2a, 0x01],
 
+  BITMAP_S24: [0x1b, 0x2a, 0x20],
 
+  BITMAP_D24: [0x1b, 0x2a, 0x21]
 
+};
 
+
 
+/**
 
+ * [GSV0_FORMAT description]
 
+ * @type {Object}
 
+ */
 
+_.GSV0_FORMAT = {
 
+  GSV0_NORMAL: [0x1d, 0x76, 0x30, 0x00],
 
+  GSV0_DW: [0x1d, 0x76, 0x30, 0x01],
 
+  GSV0_DH: [0x1d, 0x76, 0x30, 0x02],
 
+  GSV0_DWDH: [0x1d, 0x76, 0x30, 0x03]
 
+};
 
+
 
+/**
 
+ * [BEEP description]
 
+ * @type {string}
 
+ */
 
+_.BEEP = [0x1b, 0x42]; // Printer Buzzer pre hex
 
+
 
+/**
 
+ * [COLOR description]
 
+ * @type {Object}
 
+ */
 
+
 
+_.COLOR = {
 
+  0: [0x1b, 0x72, 0x00], // black
 
+  1: [0x1b, 0x72, 0x01] // red
 
+};
 
+
 
+/**
 
+ * [exports description]
 
+ * @type {[type]}
 
+ */
 
+module.exports = _;

+ 162 - 0
ghsApp/src/pagesOrder/js/printerjobs.js
Bestand weergeven 

@@ -0,0 +1,162 @@
 
+const commands = require('./commands.js');
 
+const TextEncoder = require('text-encoding/index').TextEncoder;
 
+
 
+const printerJobs = function () {
 
+  this._queue = Array.from(commands.HARDWARE.HW_INIT);
 
+  this._encoder = new TextEncoder("gb2312", {NONSTANDARD_allowLegacyEncoding: true});
 
+  this._enqueue = function (cmd) {
 
+    this._queue.push.apply(this._queue, cmd);
 
+  }
 
+};
 
+
 
+/**
 
+ * 增加打印内容
 
+ * @param  {string} content  文字内容
 
+ */
 
+printerJobs.prototype.text = function (content) {
 
+  if (content) {
 
+    let uint8Array = this._encoder.encode(content);
 
+    let encoded = Array.from(uint8Array);
 
+    this._enqueue(encoded);
 
+  }
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 打印文字
 
+ * @param  {string} content  文字内容
 
+ */
 
+printerJobs.prototype.print = function (content) {
 
+  this.text(content);
 
+  this._enqueue(commands.LF);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 打印文字并换行
 
+ * @param  {string}  content  文字内容
 
+ */
 
+printerJobs.prototype.println = function (content = '') {
 
+  return this.print(content + commands.EOL);
 
+};
 
+
 
+/**
 
+ * 设置对齐方式
 
+ * @param {string} align 对齐方式 LT/CT/RT
 
+ */
 
+printerJobs.prototype.setAlign = function (align) {
 
+  this._enqueue(commands.TEXT_FORMAT['TXT_ALIGN_' + align.toUpperCase()]);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 设置字体
 
+ * @param  {string} family A/B/C
 
+ */
 
+printerJobs.prototype.setFont = function (family) {
 
+  this._enqueue(commands.TEXT_FORMAT['TXT_FONT_' + family.toUpperCase()]);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 设定字体尺寸
 
+ * @param  {number} width 字体宽度 1~2
 
+ * @param  {number} height 字体高度 1~2
 
+ */
 
+printerJobs.prototype.setSize = function (width, height) {
 
+  if (2 >= width && 2 >= height) {
 
+    this._enqueue(commands.TEXT_FORMAT.TXT_NORMAL);
 
+    if (2 === width && 2 === height) {
 
+      this._enqueue(commands.TEXT_FORMAT.TXT_4SQUARE);
 
+    } else if (1 === width && 2 === height) {
 
+      this._enqueue(commands.TEXT_FORMAT.TXT_2HEIGHT);
 
+    } else if (2 === width && 1 === height) {
 
+      this._enqueue(commands.TEXT_FORMAT.TXT_2WIDTH);
 
+    }
 
+  }
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 设定字体是否加粗
 
+ * @param  {boolean} bold
 
+ */
 
+printerJobs.prototype.setBold = function (bold) {
 
+  if (typeof bold !== 'boolean') {
 
+    bold = true;
 
+  }
 
+  this._enqueue(bold ? commands.TEXT_FORMAT.TXT_BOLD_ON : commands.TEXT_FORMAT.TXT_BOLD_OFF);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 设定是否开启下划线
 
+ * @param  {boolean} underline
 
+ */
 
+printerJobs.prototype.setUnderline = function (underline) {
 
+  if (typeof underline !== 'boolean') {
 
+    underline = true;
 
+  }
 
+  this._enqueue(underline ? commands.TEXT_FORMAT.TXT_UNDERL_ON : commands.TEXT_FORMAT.TXT_UNDERL_OFF);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 设置行间距为 n 点行,默认值行间距是 30 点
 
+ * @param {number} n 0≤n≤255
 
+ */
 
+printerJobs.prototype.setLineSpacing = function (n) {
 
+  if (n === undefined || n === null) {
 
+    this._enqueue(commands.LINE_SPACING.LS_DEFAULT);
 
+  } else {
 
+    this._enqueue(commands.LINE_SPACING.LS_SET);
 
+    this._enqueue([n]);
 
+  }
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 打印空行
 
+ * @param {number} n
 
+ */
 
+printerJobs.prototype.lineFeed = function (n = 1) {
 
+  return this.print(new Array(n).fill(commands.EOL).join(''));
 
+};
 
+
 
+/**
 
+ *  设置字体颜色，需要打印机支持
 
+ *  @param  {number} color - 0 默认颜色黑色 1 红色
 
+ */
 
+printerJobs.prototype.setColor = function (color) {
 
+  this._enqueue(commands.COLOR[color === 1 ? 1 : 0]);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * https://support.loyverse.com/hardware/printers/use-the-beeper-in-a-escpos-printers
 
+ * 蜂鸣警报，需要打印机支持
 
+ * @param  {number} n    蜂鸣次数,1-9
 
+ * @param  {number} t 蜂鸣长短,1-9
 
+ */
 
+printerJobs.prototype.beep = function (n, t) {
 
+  this._enqueue(commands.BEEP);
 
+  this._enqueue([n, t]);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 清空任务
 
+ */
 
+printerJobs.prototype.clear = function () {
 
+  this._queue = Array.from(commands.HARDWARE.HW_INIT);
 
+  return this;
 
+};
 
+
 
+/**
 
+ * 返回ArrayBuffer
 
+ */
 
+printerJobs.prototype.buffer = function () {
 
+  return new Uint8Array(this._queue).buffer;
 
+};
 
+
 
+module.exports = printerJobs;

+ 78 - 0
ghsApp/src/pagesOrder/js/printerutil.js
Bestand weergeven 

@@ -0,0 +1,78 @@
 
+// 打印机纸宽58mm，页的宽度384，字符宽度为1，每行最多盛放32个字符
 
+const PAGE_WIDTH = 384;
 
+const MAX_CHAR_COUNT_EACH_LINE = 32;
 
+
 
+/**
 
+ * @param str
 
+ * @returns {boolean} str是否全是中文
 
+ */
 
+function isChinese(str) {
 
+  return /^[\u4e00-\u9fa5]$/.test(str);
 
+}
 
+
 
+/**
 
+ * 返回字符串宽度(1个中文=2个英文字符)
 
+ * @param str
 
+ * @returns {number}
 
+ */
 
+function getStringWidth(str) {
 
+  let width = 0;
 
+  for (let i = 0, len = str.length; i < len; i++) {
 
+    width += isChinese(str.charAt(i)) ? 2 : 1;
 
+  }
 
+  return width;
 
+}
 
+
 
+/**
 
+ * 同一行输出str1, str2，str1居左, str2居右
 
+ * @param {string} str1 内容1
 
+ * @param {string} str2 内容2
 
+ * @param {number} fontWidth 字符宽度 1/2
 
+ * @param {string} fillWith str1 str2之间的填充字符
 
+ *
 
+ */
 
+function inline(str1, str2, fillWith = ' ', fontWidth = 1) {
 
+  const lineWidth = MAX_CHAR_COUNT_EACH_LINE / fontWidth;
 
+  // 需要填充的字符数量
 
+  let fillCount = lineWidth - (getStringWidth(str1) + getStringWidth(str2)) % lineWidth;
 
+  let fillStr = new Array(fillCount).fill(fillWith.charAt(0)).join('');
 
+  return str1 + fillStr + str2;
 
+}
 
+
 
+/**
 
+ * 用字符填充一整行
 
+ * @param {string} fillWith 填充字符
 
+ * @param {number} fontWidth 字符宽度 1/2
 
+ */
 
+function fillLine(fillWith = '-', fontWidth = 1) {
 
+  const lineWidth = MAX_CHAR_COUNT_EACH_LINE / fontWidth;
 
+  return new Array(lineWidth).fill(fillWith.charAt(0)).join('');
 
+}
 
+
 
+/**
 
+ * 文字内容居中，左右用字符填充
 
+ * @param {string} str 文字内容
 
+ * @param {number} fontWidth 字符宽度 1/2
 
+ * @param {string} fillWith str1 str2之间的填充字符
 
+ */
 
+function fillAround(str, fillWith = '-', fontWidth = 1) {
 
+  const lineWidth = MAX_CHAR_COUNT_EACH_LINE / fontWidth;
 
+  let strWidth = getStringWidth(str);
 
+  // 内容已经超过一行了，没必要填充
 
+  if (strWidth >= lineWidth) {
 
+    return str;
 
+  }
 
+  // 需要填充的字符数量
 
+  let fillCount = lineWidth - strWidth;
 
+  // 左侧填充的字符数量
 
+  let leftCount = Math.round(fillCount / 2);
 
+  // 两侧的填充字符，需要考虑左边需要填充，右边不需要填充的情况
 
+  let fillStr = new Array(leftCount).fill(fillWith.charAt(0)).join('');
 
+  return fillStr + str + fillStr.substr(0, fillCount - leftCount);
 
+}
 
+
 
+module.exports = {
 
+  inline: inline,
 
+  fillLine: fillLine,
 
+  fillAround: fillAround,
 
+};

+ 6 - 6
ghsApp/src/static/iconfont/iconfont.css
Bestand weergeven 

@@ -1,11 +1,11 @@
 
 @font-face {
 
   font-family: 'iconfont';  /* project id 1525256 */
 
-  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');
 
+  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');
 
 }
 
 
 .iconfont {

+ 2 - 2
hd/dist/shop/index.html
Bestand weergeven 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huahb.cn/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>只管花</title><link href="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.huaml.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.3740417b.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huahb.cn/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huahb.cn/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huahb.cn/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huahb.cn/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huahb.cn/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huahb.cn/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huahb.cn/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huahb.cn/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huahb.cn/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huahb.cn/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huahb.cn/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huahb.cn/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.3740417b.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.371b7fd7.js" rel="preload" as="script"><link href="/js/chunk-libs.1c1e0cb4.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.huaml.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.huaml.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.huaml.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.huaml.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.huaml.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.huaml.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.huaml.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.huaml.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.huaml.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.huaml.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.huaml.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.huaml.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.1c1e0cb4.js"></script><script src="/js/app.371b7fd7.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
hd/dist/shop/js/app.371b7fd7.js


+ 4 - 4
hd/vue.config.js
Bestand weergeven 

@@ -3,7 +3,7 @@ const path = require('path');
 
 const isProduction = process.env.NODE_ENV === 'production';
 
 
 //http和https切换请修改这里，修改后需要重新运行npm run serve shish 2021.4.12
 
-const proxyTarget = 'https://api.shop.huahb.cn';
 
+const proxyTarget = 'http://api.shop.huaml.com';
 
 
 function resolve(dir) {
 
 	return path.join(__dirname, dir);
 
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 
 let hostUrl = ``;
 
 if(process.env.NODE_ENV == 'development'){
 
-	hostUrl = `https://img.huahb.cn/`;
 
+	hostUrl = `http://img.huaml.com/`;
 
 }else if(process.env.NODE_ENV == 'local'){
 
-	hostUrl = `https://img.huahb.cn/`;
 
+	hostUrl = `http://img.huaml.com/`;
 
 }else{
 
-	hostUrl = `https://img.huahb.cn/`;
 
+	hostUrl = `https://img.huaml.com/`;
 
 }
 
 const cdn = {
 
 	dev: {

+ 6 - 6
hdApp/src/ext.json
Bestand weergeven 

@@ -1,12 +1,12 @@
 
 {
 
   "extEnable": true,
 
-  "extAppid": "wx0d42f5f1dcb3a370",
 
+  "extAppid": "wxe4675bab299a52f7",
 
   "directCommit": false,
 
   "ext": {
 
-    "account": 12358,
 
-    "apiHost": "https://api.shop.huahb.cn",
 
-    "socketApiHost": "api.shop.huahb.cn",
 
-    "imgHost": "https://img.huahb.cn",
 
-    "name":"花惠宝"
 
+    "account": 12362,
 
+    "apiHost": "https://api.shop.huaml.com",
 
+    "socketApiHost": "api.shop.huaml.com",
 
+    "imgHost": "https://img.huaml.com",
 
+    "name":"花美玲"
 
   }
 
 }

+ 1 - 1
hdApp/src/manifest.json
Bestand weergeven 

@@ -84,7 +84,7 @@
 
     "quickapp" : {},
 
     /* 小程序特有相关 线上（花惠宝） wx0d42f5f1dcb3a370 开发（花美玲） wxe4675bab299a52f7 */
 
     "mp-weixin" : {
 
-        "appid" : "wx0d42f5f1dcb3a370",
 
+        "appid" : "wxe4675bab299a52f7",
 
         "setting" : {
 
             "urlCheck" : false
 
         },

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css
Bestand weergeven 

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

+ 5 - 5
mallApp/src/ext.json
Bestand weergeven 

@@ -1,12 +1,12 @@
 
 {
 
   "extEnable": true,
 
-  "extAppid": "wx99a1dfc4171efb42",
 
+  "extAppid": "wxe41bd5816affd0ba",
 
   "directCommit": false,
 
   "ext": {
 
     "account": 0,
 
-    "apiHost": "https://api.shop.zhiguanhua.cn",
 
-    "socketApiHost": "api.shop.zhiguanhua.cn",
 
-    "imgHost": "https://img.zhiguanhua.cn",
 
-    "name":"花卉宝"
 
+    "apiHost": "https://api.shop.theflorist.cn",
 
+    "socketApiHost": "api.shop.theflorist.cn",
 
+    "imgHost": "https://img.theflorist.cn",
 
+    "name":"中花卉"
 
   }
 
 }

+ 1 - 1
mallApp/src/manifest.json
Bestand weergeven 

@@ -83,7 +83,7 @@
 
     "quickapp" : {},
 
     /* 小程序特有相关 线上（花卉宝） wx99a1dfc4171efb42 开发（中花卉） wxe41bd5816affd0ba */
 
     "mp-weixin" : {
 
-        "appid" : "wx99a1dfc4171efb42",
 
+        "appid" : "wxe41bd5816affd0ba",
 
         "setting" : {
 
             "urlCheck" : false
 
         },

+ 6 - 6
mallApp/src/static/iconfont/iconfont.css
Bestand weergeven 

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

+ 2 - 2
pt/dist/web/index.html
Bestand weergeven 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>花卉宝</title><link href="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.wixhb.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="referer" content="never"><meta name="renderer" content="webkit"><meta name="viewport" content><link rel="icon" href="/favicon.ico"><title>花卉宝</title><link href="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.core.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.css" rel="stylesheet"><link href="https://img.hzghd.com/cdn/element-ui/2.13.0/theme-chalk/index.css" rel="stylesheet"><style>html,
 
 			body,
 
 			#app {
 
 				height: 100%;
 
@@ -43,4 +43,4 @@
 
 			.once .sub-title {
 
 				color: #ababab;
 
 				font-size: 12px;
 
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.6e859856.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.wixhb.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.wixhb.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.wixhb.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.wixhb.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.wixhb.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.wixhb.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.wixhb.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.wixhb.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.wixhb.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.wixhb.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.wixhb.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.wixhb.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.6e859856.js"></script></body></html>
 
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.c0d3a222.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="https://img.hzghd.com/cdn/vue/2.6.10/vue.min.js"></script><script src="https://img.hzghd.com/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="https://img.hzghd.com/cdn/vuex/3.1.1/vuex.min.js"></script><script src="https://img.hzghd.com/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="https://img.hzghd.com/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="https://img.hzghd.com/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="https://img.hzghd.com/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="https://img.hzghd.com/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="https://img.hzghd.com/cdn/element-ui/2.13.0/index.js"></script><script src="https://img.hzghd.com/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="https://img.hzghd.com/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="https://img.hzghd.com/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.c0d3a222.js"></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
pt/dist/web/js/app.c0d3a222.js


+ 4 - 4
pt/vue.config.js
Bestand weergeven 

@@ -4,7 +4,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 
 //http和https切换请修改这里，修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 
 const proxyTarget =
 
-	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.com';
 
+	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
 
 
 function resolve(dir) {
 
 	return path.join(__dirname, dir);
 
@@ -15,11 +15,11 @@ function resolve(dir) {
 
  * **/
 
 let hostUrl = ``;
 
 if(process.env.NODE_ENV == 'development'){
 
-	hostUrl = `http://img.wixhb.com/`;
 
+	hostUrl = `http://img.hzghd.com/`;
 
 }else if(process.env.NODE_ENV == 'local'){
 
-	hostUrl = `http://img.wixhb.com/`;
 
+	hostUrl = `http://img.hzghd.com/`;
 
 }else{
 
-	hostUrl = `https://img.wixhb.com/`;
 
+	hostUrl = `https://img.hzghd.com/`;
 
 }
 
 
 const cdn = {

Some files were not shown because too many files changed in this diff