Merge branch 'dev-1.0' of…

Merge branch 'dev-1.0' of https://gitlab.infra.miyatech.com/pengguangpu/doublescreen-front into dev-1.0

pages/balance/balance.js

@@ -31,10 +31,12 @@ Page({
           data: null
         },
         success: (res) => {
-          e.preventDefault();
+          console.log(`sendBuddyMessage success: ${JSON.stringify(res)}`);
+          // e.preventDefault();
+          my.navigateBack();
         },
         fail: (res) => {
-          console.info(`sendBuddyMessage failed: ${JSON.stringify(res)}`);
+          console.log(`sendBuddyMessage failed: ${JSON.stringify(res)}`);
         }
       });
     }
@@ -48,6 +50,7 @@ Page({
   },
 
   onLoad(options) {
+
     console.log("balance onLoad==>" + JSON.stringify(options));
     var totalQuantity = options.totalQuantity
     var totalPrice = options.totalPrice
@@ -108,10 +111,6 @@ Page({
       }
     });
 
-  },
-
-  onShow() {
-    console.log("balance onShow");
     my.ix.onBuddyMessage({
       success: (res) => {
         console.info(`onBuddyMessage success: ${JSON.stringify(res)}`);
@@ -129,6 +128,12 @@ Page({
         }
       }
     });
+
+  },
+
+  onShow() {
+    console.log("balance onShow");
+    //这个界面接受事件是在onLoad，去除监听是在onUnload
   },
 
   onHide() {

pages/home/home.js

@@ -365,7 +365,7 @@ Page({
       printer.printNowDate(),
     ];
     if (null != printLastOrder_goodsList && printLastOrder_goodsList.length > 0) {
-        cmds.push(printer.printDivide("-")),
+      cmds.push(printer.printDivide("-")),
         cmds.push(printer.printText("活动商品")),
         cmds.push(printer.printText("商品名称    " + "    编码    " + "    数量"))
       for (var i = 0; i < printLastOrder_goodsList.length; i++) {
@@ -375,7 +375,7 @@ Page({
         cmds.push(printer.printTwoText(printLastOrder_goodsList[i].barcode, printLastOrder_goodsList[i].quantity + ""));
       }
     }
-   
+
     cmds.push(printer.setAlign(printer.ALIGN_LEFT));
     cmds.push(printer.printDivide("-"));
     cmds.push(printer.printText("应收金额:" + printLastOrder_orderPriceYuan));

pages/scan/scan.js

@@ -129,6 +129,7 @@ Page({
         let req = {}
         req.discCouponMsg = "超额优惠券"
         req.discCouponState = 4;
+        req.discCouponPrice = this.data.totalDisc
         this.useCouponCallback(ACTION_USE_COUPON, req)
         return
       }