合并远程代码，解决冲突，自测;

app.json

 {
   "pages": [
     "pages/index/index",
+    "pages/poster/poster",
     "pages/home/home",
     "pages/poster/poster",
     "pages/waitoperate/waitoperate",

const/actioncmd.js

@@ -30,3 +30,6 @@ export const ACTION_GO_HOME = "ACTION_GO_HOME";
 
 //获取账户信息
 export const ACTION_GET_ACCOUNT = "ACTION_GET_ACCOUNT";
+
+//直接收款
+export const ACTION_DIRECT_PAYMENT = "ACTION_DIRECT_PAYMENT";

pages/index/index.acss

 /* home样式 */
-
 .homePage {
     display: flex;
     flex-direction: column;
@@ -7,8 +6,22 @@
     height: 100%;
     background: white;
     /* border: 2px solid red; */
+    position: absolute
+}
+
+
+/* home样式 */
+.homePageFilter {
+    display: flex;
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+    background: #F3F7F9;
+    filter: blur(3px);
+    position: absolute;
 }
 
+
 .homeTopView {
     position: relative;
     width: 750rpx;
@@ -502,6 +515,14 @@
     height: 155rpx;
 }
 
+/* 自定义键盘 */
+.land-keybord{
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    border: 2px solid red;
+}
+
 /* 结算页 */
 
 .balanceTopView {

pages/index/index.js

@@ -10,6 +10,8 @@ import { ACTION_ON_PAY_SUCCESS } from '../../const/actioncmd'
 import { ACTION_ON_PAY_FAILED } from '../../const/actioncmd'
 import { ACTION_GO_HOME } from '../../const/actioncmd'
 import { ACTION_GET_ACCOUNT } from '../../const/actioncmd'
+import { ACTION_DIRECT_PAYMENT } from '../../const/actioncmd'
+
 
 Page({
   data: {
@@ -126,7 +128,7 @@ Page({
           context.goPage('landscan');
         } else if (res.action == ACTION_GO_BALANCE) {
           //跳转
-          context.goPage('waitoperate');
+           context.goPage('waitoperate');
         } else if (res.action == ACTION_ON_PAY_SUCCESS) {
 
           //分转元
@@ -149,6 +151,11 @@ Page({
           context.setData({
             storeName: res.data.storeName
           });
+        }else if(res.action == ACTION_DIRECT_PAYMENT){
+           if(res.data != null){
+             context.setData({totalPrice:res.data})
+           }
+           context.goPage('waitoperate');
         }
       }
     });
@@ -331,6 +338,36 @@ Page({
     });
   },
 
+  //直接收银
+  directPayment(e) {
+    this.setData({scene:3}) 
+  },
+  //发生直接收银事件
+  sendPaymentToFront(payment) {
+    var commonRequest = {
+      action: ACTION_DIRECT_PAYMENT,
+      data: payment
+    };
+    let context = this;
+    my.ix.sendBuddyMessage({
+      target: getApp().globalData.frontScreenAppId,
+      data: commonRequest,
+      success: (res) => {
+        console.log("发送直接收款事件到前屏小程序 成功 ===》" + JSON.stringify(res));
+      },
+      fail: (res) => {
+        console.log("发送收款事件到前屏小程序 失败 ===》 " + JSON.stringify(res));
+        my.showToast({
+          type: 'fail',
+          content: '操作失败',
+          duration: 3000,
+          success: () => {
+          },
+        });
+      },
+    });
+  }, 
+
 
   /**landscan页面逻辑方法 */
   //把所有的商品数据发送到后屏
@@ -356,10 +393,17 @@ Page({
 
 
   //键盘完成
-  onKeyBordFinished(barcode) {
-
+  onKeyBordFinished(result) {
+    if(this.data.scene == 3){
+        this.sendPaymentToFront(result)
+    }else if(this.data.scene == 1){
+        this.sendGoodsInfoToFront(result) 
+    }  
     this.onKeyBordClose();
-
+  },
+  
+  //把手输条码发生到前屏
+  sendGoodsInfoToFront(barcode) {
     my.showLoading({});
     var commonRequest = {
       action: ACTION_REQUEST_GOOD_INFO,
@@ -376,15 +420,19 @@ Page({
         my.hideLoading();
         my.showToast({
           type: 'fail',
-          content: '发送商品条码到后屏失败',
+          content: '操作失败',
           duration: 3000,
           success: () => {
           },
         });
       }
     })
+
+
   },
 
+
+
   //  键盘关闭
   onKeyBordClose() {
     this.setData({ scene: 0 })