合并远程代码；

app.json

 {
   "pages": [
-    "pages/printlastorder/printlastorder",
     "pages/index/index",
+    "pages/printlastorder/printlastorder",
     "pages/poster/poster",
     "pages/home/home",
     "pages/poster/poster",

const/actioncmd.js

@@ -36,6 +36,10 @@ export const ACTION_DIRECT_PAYMENT = "ACTION_DIRECT_PAYMENT";
 
 //兑换券
 export const ACTION_CONVERT_COUPON = "ACTION_CONVERT_COUPON";
+
+//前屏登录完成
+export const ACTION_LOGIN_OK = "ACTION_LOGIN_OK";
+
 //退款操作
 export const ACTION_REFUND = "ACTION_REFUND";
 

pages/index/index.acss

+.login-waiting-page{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute 
+}
+
+.login-waiting-left{
+   width: 50%;
+   height: 100%;
+}
+
+.login-waiting-right{
+   width: 50%;
+   height: 100%;
+   background-color: white;
+   display: flex;
+   flex-direction: row;
+   justify-content: center;
+   align-items: center
+}
+
+.login-waiting-right-image{
+   width: 287rpx;
+   height: 204rpx;
+}
+
 /* home样式 */
 
 .homePage {

pages/index/index.axml

@@ -283,6 +283,13 @@
   <!-- 键盘 -->
   <land-keybord scene="{{scene}}" onKeyBordFinished="onKeyBordFinished" onKeyBordClose="onKeyBordClose">
   </land-keybord>
+
+  <!-- 等待前屏登录 -->
+  <view class="login-waiting-page" a:if="{{!isFrontScreenLoginOK}}">
+   <image class="login-waiting-left" mode="aspectFill" src="/images/login_wait_left.png"/>
+   <view class="login-waiting-right">
+     <image class="login-waiting-right-image" mode="aspectFit" src="/images/login_waiting_right.png"/>
+   </view>
   <!-- 操作结果页 -->
   <view hidden="{{!pageShow['operateResult']}}">
     <view class="operateTopView"></view>

pages/index/index.js

@@ -12,6 +12,7 @@ import { ACTION_GO_HOME } from '../../const/actioncmd'
 import { ACTION_GET_ACCOUNT } from '../../const/actioncmd'
 import { ACTION_DIRECT_PAYMENT } from '../../const/actioncmd'
 import { ACTION_CONVERT_COUPON } from '../../const/actioncmd'
+import { ACTION_LOGIN_OK } from '../../const/actioncmd'
 import { ACTION_REFUND } from '../../const/actioncmd'
 import { ACTION_REFUND_SUCCESS } from '../../const/actioncmd'
 import { ACTION_REFUND_FAILED } from '../../const/actioncmd'
@@ -27,6 +28,8 @@ Page({
       "payresult": false,
       "operateResult":false
     },
+    // 前屏是否完成登录
+    isFrontScreenLoginOK:false,
     flowType:"",  //流程类型：用于区分易混淆的流程，以及共同界面使用时用该标识位作为区分
     storeName: "--",
     /**支付结果页相关参数 */
@@ -91,6 +94,7 @@ Page({
   onLoad(query) {
     // 页面加载
     console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
+    
   },
   onReady() {
     // 页面加载完成
@@ -186,6 +190,9 @@ Page({
            if(null != res.data.msg){
                context.setData({convertCouponMsg:res.data.msg})
            }
+        }else if(res.action == ACTION_LOGIN_OK){
+          //前屏登录完成
+           context.setData({isFrontScreenLoginOK:true})
         } else if(res.action == ACTION_REFUND_SUCCESS){
           //跳转到成功页面
           context.goPage('operateResult');
@@ -194,7 +201,6 @@ Page({
           context.setData({
             isPaySuccess: false,
           });
-
           context.goPage('operateResult');
         }