bugfix

const/actioncmd.js

@@ -16,6 +16,9 @@ export const ACTION_REQUEST_GOOD_INFO = "ACTION_REQUEST_GOOD_INFO";
 //去扫码页面
 export const ACTION_GO_SCAN = "ACTION_GO_SCAN";
 
+//会员登录
+export const ACTION_MEMBER = "ACTION_MEMBER";
+
 //获取店铺信息
 export const ACTION_STORE_INFO = "ACTION_STORE_INFO";
 
@@ -56,9 +59,10 @@ export const ACTION_PRINT_LAST_ORDER = "ACTION_PRINT_LAST_ORDER";
 export const ACTION_USE_COUPON = "ACTION_USE_COUPON";
 
 const FLOW_IDLE = "idle";
-const FLOW_COLLECTIONS = "collections";
-const FLOW_REFUND = "refund";
+const FLOW_COLLECTIONS = "collections";//收款
+const FLOW_REFUND = "refund";//退款
+const FLOW_DIRECT_PAYMENT = "direct_payment"
 
 export {
-  FLOW_IDLE,FLOW_COLLECTIONS,FLOW_REFUND
+  FLOW_IDLE,FLOW_COLLECTIONS,FLOW_REFUND,FLOW_DIRECT_PAYMENT
 }

pages/components/landkeybord/landkeybord.js

@@ -29,8 +29,6 @@ Component({
       scenes: nextProps.scene,
     });
 
-    console.log("scenes:"+this.data.scenes);
-
   },
   methods: {
 

pages/index/index.acss

@@ -222,6 +222,16 @@
     font-size: 19rpx
 }
 
+.land-scan-member {
+    margin-left: 19rpx;
+    text-align: left;
+    font-size: 19rpx;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(51, 51, 51, 1);
+    line-height: 21rpx;
+}
+
 /* 顶部收银字体样式 */
 
 .cashier-text {
@@ -619,11 +629,32 @@
     border: 2px solid red;
 }
 
-/* 结算页 */
+/* 等待操作页 */
+
+.waitOperate {
+    display: flex;
+    flex-direction: column;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    left: 0rpx;
+    top: 0rpx;
+}
+
+.waitOperateBackButton {
+    color: #333333;
+    font-size: 19rpx;
+    line-height: 60rpx;
+    height: 60rpx;
+    width: 110rpx;
+    text-align: center;
+    /* border: 2px solid red; */
+    position: relative;
+}
 
 .balanceTopView {
     position: relative;
-    width: 768rpx;
+    width: 750rpx;
     height: 60rpx;
     background: rgba(255, 255, 255, 1);
     /* border: 2px solid red; */
@@ -634,11 +665,11 @@
     display: flex;
     flex-direction: row;
     position: relative;
-    width: 768rpx;
-    height: 372rpx;
+    width: 750rpx;
+    height: 362rpx;
     box-sizing: border-box;
     align-items: center;
-    background: #F3F7F9;
+    background: #FFFFFF;
 }
 
 .leftBody {
@@ -647,6 +678,7 @@
     position: relative;
     width: 52.8%;
     height: 100%;
+    background: rgba(243, 247, 249, 1);
     box-sizing: border-box;
 }
 
@@ -960,3 +992,69 @@
     position: absolute;
     top: 89rpx;
 }
+
+/* 取消等待操作页的操作。名称为recheck*/
+
+.recheckPage {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    background: rgba(0, 0, 0, 0.65);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    z-index: 1;
+}
+
+.recheckDialog {
+    width: 516rpx;
+    height: 292rpx;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 5px;
+    margin-top: 65rpx;
+    display: flex;
+    position: relative;
+    flex-direction: column;
+    align-items: center;
+}
+
+.recheckRemind {
+    font-size: 21rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: rgba(51, 51, 51, 1);
+    line-height: 26rpx;
+    margin-top: 60rpx;
+}
+
+.recheckButtonConfirm {
+    width: 246rpx;
+    height: 60rpx;
+    background: rgba(0, 122, 255, 1);
+    border-radius: 5rpx;
+    position: relative;
+    box-sizing: border-box;
+    margin-top: 32rpx;
+}
+
+.recheckButtonCancel {
+    width: 252rpx;
+    height: 60rpx;
+    background: rgba(255, 255, 255, 1);
+    border-radius: 5rpx;
+    border: 2rpx solid rgba(0, 122, 255, 1);
+    position: relative;
+    box-sizing: border-box;
+    margin-top: 19rpx;
+}
+
+.recheckButtonText {
+    width: 100%;
+    height: 60rpx;
+    margin: 0 auto;
+    text-align: center;
+    font-size: 24rpx;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    line-height: 60rpx;
+}
\ No newline at end of file

pages/index/index.axml

@@ -6,10 +6,10 @@
         <text style="position:absolute;font-size:19rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:rgba(0,0,0,0.85);line-height:22rpx;left:55rpx;top:19rpx;">{{storeName}}</text>
       </view>
       <view style="position:absolute;font-size:22rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(51,51,51,1);line-height:22rpx;left:0rpx;top:19rpx;width:100%;text-align:center;">首页</view>
-      <view style="display:flex;flex-direction:row-reverse;position:absolute;right:19rpx;top:19rpx;width:auto;background:#ffffff;">
+      <!-- <view style="display:flex;flex-direction:row-reverse;position:absolute;right:19rpx;top:19rpx;width:auto;background:#ffffff;">
         <view style="font-size:19rpx;font-family:PingFangSC-Regular,PingFang SC;font-weight:400;color:rgba(51,51,51,1);line-height:22rpx;">退出</view>
         <image mode="aspectFit" src="/images/icon_exit.png" style="position:relative;width:19rpx;height:19rpx;margin-right:8rpx;margin-top:1rpx;"/>
-      </view>
+      </view> -->
     </view>
     <view class="homeBodyView" style="height:100%;">
       <swiper indicator-dots="{{true}}">
@@ -118,7 +118,8 @@
   <view hidden="{{!pageShow['landscan']}}">
     <view class="{{scene != 0 ? 'pfilter' : 'pageland' }}">
       <view class="land-scan-top">
-        <button class="land-scan-top-member-login" size="default" type="ghost">会员登陆</button>
+        <button class="land-scan-top-member-login" size="default" type="ghost" catchTap="onMemberTap" a:if="{{memberPhoneShown == ''}}">会员登录</button>
+        <view class="land-scan-member" hidden="{{memberPhoneShown == ''}}">会员，{{memberPhoneShown}}</view>
         <text class="cashier-text">收银</text>
         <view onTap="goHome">
           <image class="go-home-icon" mode="aspectFit" src="/images/icon_home.png"/>
@@ -204,11 +205,11 @@
       </view>
     </view>
   </view>
-  <!-- 结算页 -->
-  <view class="balance" hidden="{{!pageShow['waitoperate']}}">
+  <!-- 等待操作页 -->
+  <view class="waitOperate" hidden="{{!pageShow['waitoperate']}}">
     <view class="balanceTopView">
       <!--back button-->
-      <view catchTap="waitOperateBack" class="backButton">
+      <view catchTap="waitOperateBack" class="waitOperateBackButton">
         <image mode="aspectFit" style="position:absolute;width:11rpx;height:17rpx;left: 18rpx;top:22rpx;" src="/images/icon_back.png"/>
         <text>返回</text>
       </view>
@@ -216,26 +217,27 @@
     <!-- 界面主体 -->
     <view class="bodyContainer">
       <view class="leftBody">
-        <view class="contentLine" style="margin-top:29rpx;">
+        <view class="contentLine" style="margin-top:29rpx;" hidden="{{flowType!='collections'}}">
           <view class="descText">合计金额：</view>
           <view class="totalPrice">￥{{totalPrice}}</view>
         </view>
-        <view class="contentLine" style="margin-top: 14.5rpx;">
+        <view class="contentLine" style="margin-top: 14.5rpx;" hidden="{{flowType!='collections'}}">
           <view class="descText">商家优惠：</view>
-          <view class="totalCoupon">￥{{totalDisc}}</view>
+          <view class="totalCoupon">￥{{discCouponPrice}}</view>
         </view>
         <view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;">
-          <view class="descText">应收款：</view>
+          <view class="descText">{{waitOperateMoneyRemind}}</view>
           <view class="moneySign">￥</view>
-          <view class="payPrice">{{totalPrice - totalDisc}}</view>
-          <view class="descText">（共{{totalQuantity}}件）</view>
+
+          <view class="payPrice">{{waitOperateAmount}}</view>
+          <view class="descText" hidden="{{flowType!='collections'}}">（共{{totalQuantity}}件）</view>
         </view>
       </view>
       <view class="rightBody">
-        <view class="remindText">等待顾客付款…</view>
+        <view class="remindText">{{waitOperateRemindText}}</view>
         <image mode="aspectFit" style="width:166rpx;height:143rpx;margin-top:39rpx;" src="/images/icon_wait_operate.png"/>
-        <view catchTap="waitOperateBack" style="width:252rpx;height:60rpx;background:rgba(255,255,255,1);border-radius:5rpx;border:2rpx solid rgba(0,122,255,1);position:relative;box-sizing: border-box;margin-top:32rpx;">
-          <view catchTap="cancelCollect" style="width:100%;height:60rpx;margin:0 auto;text-align:center;font-size:24rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(0,122,255,1);line-height:60rpx;">取消收款</view>
+        <view catchTap="waitOperateCancel" style="width:252rpx;height:60rpx;background:rgba(255,255,255,1);border-radius:5rpx;border:2rpx solid rgba(0,122,255,1);position:relative;box-sizing: border-box;margin-top:32rpx;">
+          <view style="width:100%;height:60rpx;margin:0 auto;text-align:center;font-size:24rpx;font-family:PingFangSC-Medium,PingFang SC;font-weight:500;color:rgba(0,122,255,1);line-height:60rpx;">{{waitOperateCancelText}}</view>
         </view>
       </view>
     </view>
@@ -349,12 +351,6 @@
   <!-- 键盘 -->
   <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>
@@ -365,7 +361,7 @@
         <view class="operateResultDesc">{{operateSuccessDesc}}</view>
         <view class="operateResultBtnContainer">
           <view class="operateResultConfirmBtn">
-              <view class="operateResultConfirmBtnText">确定</view>
+            <view class="operateResultConfirmBtnText" onTap="operateResultClose">确定</view>
           </view>
         </view>
       </block>
@@ -375,13 +371,25 @@
         <view class="operateResultDesc">{{operateFailedDesc}}</view>
         <view class="operateResultBtnContainer">
           <view class="operateResultCloseBtn">
-              <view class="operateResultCloseBtnText">关闭</view>
+            <view class="operateResultCloseBtnText" onTap="operateResultClose">关闭</view>
           </view>
           <view class="operateResultConfirmBtn">
-              <view class="operateResultConfirmBtnText">重新退款</view>
+            <view class="operateResultConfirmBtnText" onTap="operateResultReOperate">{{operateReDo}}</view>
           </view>
         </view>
       </block>
     </view>
   </view>
+  <!-- 重新检查弹窗 -->
+  <view class="recheckPage" hidden="{{!recheckShow}}">
+    <view class="recheckDialog">
+      <view class="recheckRemind">{{recheckRemind}}</view>
+      <view class="recheckButtonConfirm" onTap="recheckConfirm">
+        <view class="recheckButtonText" style="color:#ffffff;">确定</view>
+      </view>
+      <view class="recheckButtonCancel" onTap="recheckCancel">
+        <view class="recheckButtonText" style="color:rgba(0,122,255,1);">取消</view>
+      </view>
+    </view>
   </view>
+</view>
\ No newline at end of file