开发

ghsApp/dist/build/mp-weixin/admin/clear/orderItem.json

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

ghsApp/dist/build/mp-weixin/admin/home/components/plugin/time-axis.json

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

ghsApp/dist/build/mp-weixin/components/app-coupon-sel.json

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

ghsApp/dist/build/mp-weixin/components/app-img.json

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

ghsApp/dist/build/mp-weixin/components/app-result.json

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

ghsApp/dist/build/mp-weixin/components/module/allSelectInput.json

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

ghsApp/dist/build/mp-weixin/components/module/app-search.json

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

ghsApp/dist/build/mp-weixin/components/module/app-share-mask.json

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

ghsApp/dist/build/mp-weixin/components/module/app-vip.json

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

ghsApp/dist/build/mp-weixin/components/none-hd.json

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

ghsApp/dist/build/mp-weixin/components/plugin/alert.json

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

ghsApp/dist/build/mp-weixin/components/plugin/badge.json

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

ghsApp/dist/build/mp-weixin/components/plugin/bottom-popup.json

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

ghsApp/dist/build/mp-weixin/components/plugin/dropdown-list.json

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

ghsApp/dist/build/mp-weixin/components/plugin/modal.json

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

ghsApp/dist/build/mp-weixin/project.config.json

@@ -21,9 +21,9 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "useMultiFrameRuntime": false,
-    "useApiHook": false,
-    "useApiHostProcess": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],

ghsApp/src/mixins/BLE.js

@@ -281,37 +281,62 @@ export default {
 			let serviceId = currDev.services[0].serviceId;
 			let characteristicId = currDev.services[0].characteristicId;
 
+			let currentRealPrice = BleVal.debt == 1 ? '0.00' : BleVal.realPrice;
 
 			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('在线支付(已支付)')
+			  .print(BleVal.sendNum)
 			  .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();
+			  .setSize(2, 2)
+			  .print(BleVal.custom.fullAddress)
+			  .print(BleVal.custom.customName)
+			  .print(BleVal.custom.customMobile)
+
+				.setSize(1, 1)
+				.print("备注：")
+				.setSize(2, 2)
+				.print(BleVal.remark)
+				.setSize(1, 1)
+				
+
+				.setAlign('lt')
+				.print(printerUtil.fillAround('花材 数量 价格'));
+				
+				if(BleVal.product.length > 0){
+					BleVal.product.forEach(function(currentItem){
+						printerJobs.print(printerUtil.inline(currentItem.name+' '+currentItem.num, currentItem.price));
+					})
+				}
+				printerJobs.print(printerUtil.fillLine());
+				//printerJobs.setAlign('rt');
+				printerJobs.setAlign('lt')
+				if(BleVal.sendCost>0){
+					printerJobs.print('运费：￥'+BleVal.sendCost);
+				}
+				
+				printerJobs.print('总金额：￥'+BleVal.prePrice);
+
+				if(BleVal.discountAmount > 0){
+					printerJobs.print('优惠：￥'+BleVal.discountAmount);
+				}
+			
+				printerJobs.print('应付金额：￥'+BleVal.realPrice);
+				printerJobs.print('实付金额：￥'+currentRealPrice);
+			
+				if(BleVal.debtAmount > 0){
+					printerJobs.print('累计欠款：￥'+BleVal.debtAmount);
+				}
+
+				printerJobs.print(printerUtil.fillLine());
+				printerJobs.print('订单日期：'+BleVal.date);
+				printerJobs.print('订单编号：'+BleVal.orderSn);
+				printerJobs.print('门店名称：纯彩花艺');
+				printerJobs.print('门店地址：'+BleVal.address);
+				
+				printerJobs.println().println();
+			
 		
 			let buffer = printerJobs.buffer();