Merge branch 'dev-1.0' of…

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

const/actioncmd.js

@@ -83,6 +83,9 @@ export const ACTION_VERIFY_FAILED = "ACTION_VERIFY_FAILED";
 //提货
 export const ACTION_PICK_UP_GOODS = "ACTION_PICK_UP_GOODS";
 
+//退出
+export const ACTION_QUIT = "ACTION_QUIT";
+
 const FLOW_IDLE = "idle";
 const FLOW_COLLECTIONS = "collections";//收款
 const FLOW_REFUND = "refund";//退款

pages/components/landkeybord/landkeybord.js

@@ -3,7 +3,7 @@ Component({
   data: {
     result: "",
     scenes: 2,
-    errMsg:"" 
+    errMsg: ""
   },
 
   props: {
@@ -11,7 +11,7 @@ Component({
     //场景 1.输入商品码 2.会员 3.收款  4.退款
     scene: 1,
     //错误提示
-    errMsg:''
+    errMsg: ''
   },
   didMount() { },
   didUpdate() { },
@@ -22,7 +22,7 @@ Component({
     if (nextProps.scene == 0) {
       this.setData({
         result: '',
-        errMsg:'',
+        errMsg: '',
       });
     }
 
@@ -67,18 +67,24 @@ Component({
         this.setData({ result: '' });
       }
     }, finish(e) {
+      this.setData({ errMsg: "" })
       if (this.data.scenes == 3 || this.data.scenes == 4) {
         //判断价格是否参数合法
         var priceReg = /(^[1-9]\d*(\.\d{1,2})?$)|(^0(\.\d{1,2})?$)/;
         if (!priceReg.test(this.data.result)) {
-           //错误提示
-           this.setData({errMsg:"金额格式有误"}) 
+          //错误提示
+          this.setData({ errMsg: "金额格式有误" })
+          return
+        }
+      } else if (this.data.scenes == 2) {
+        if (this.data.result == null || this.data.result.length != 11) {
+          this.setData({ errMsg: "会员号格式有误" })
           return
         }
       }
-       this.props.onKeyBordFinished(this.data.result); 
-    },closeKeybord(e){
-       this.props.onKeyBordClose(); 
+      this.props.onKeyBordFinished(this.data.result);
+    }, closeKeybord(e) {
+      this.props.onKeyBordClose();
     }
 
 

pages/index/index.axml

@@ -6,7 +6,9 @@
         <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="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 style="display:flex;flex-direction:row-reverse;position:absolute;right:19rpx;top:19rpx;width:auto;background:#ffffff;" onTap="onQuit">
+        <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 class="homeBodyView" style="height:100%;">
       <swiper indicator-dots="{{true}}">

pages/index/index.js

@@ -3,7 +3,7 @@ import {
   ACTION_USE_COUPON, ACTION_GOODS, ACTION_MEMBER,
   ACTION_GO_BALANCE, ACTION_REQUEST_GOOD_INFO, ACTION_PRINT_RESULT,
   ACTION_REPRINT, ACTION_GO_SCAN, ACTION_ON_PAY_SUCCESS,
-  ACTION_ON_PAY_FAILED, ACTION_GO_HOME,
+  ACTION_ON_PAY_FAILED, ACTION_GO_HOME, ACTION_QUIT,
   ACTION_DIRECT_PAYMENT, ACTION_CONVERT_COUPON, ACTION_LOGIN_OK,
   ACTION_REFUND, ACTION_REFUND_SUCCESS, ACTION_REFUND_FAILED,
   ACTION_PRINT_LAST_ORDER, ACTION_GET_CUR_AD, ACTION_SEND_SEL_AD,
@@ -115,6 +115,9 @@ Page({
       { url: "/images/img_ad1.png", selected: true },
       { url: "/images/img_ad2.png", selected: false },
     ],
+
+    /**键盘 */
+    keyboardErrMsg: "",
   },
 
   /** 
@@ -425,6 +428,32 @@ Page({
     // 页面被拉到底部
   },
 
+  onQuit() {
+    console.log("onQuit");
+    this.setData({
+      isFrontScreenLoginOK: false,
+      storeName: "--",
+      storeId: "--",
+      userName: "--",
+    })
+
+    this.goPage('home')
+
+    my.ix.sendBuddyMessage({
+      target: getApp().globalData.frontScreenAppId,
+      data: {
+        action: ACTION_QUIT,
+        data: null
+      },
+      success: (res) => {
+        console.log("通知前屏退出 成功 ===》" + JSON.stringify(res));
+      },
+      fail: (res) => {
+        console.log("通知前屏退出 失败 ===》" + JSON.stringify(res));
+      }
+    })
+  },
+
 
   //回到首页
   goHome() {
@@ -796,9 +825,6 @@ Page({
     } else if (this.data.scene == 1) {
       this.sendGoodsInfoToFront(result)
     } else if (this.data.scene == 2) {
-      if (result.length != 11) {
-        return;//键盘不给消失
-      }
       this.sendMemberLogin(result);
     } else if (this.data.scene == 4) {
       this.sendRefund(result);
@@ -853,7 +879,7 @@ Page({
 
   //清空商品信息
   clearGood(e) {
-    this.setData({ goods: [],discCouponPrice:0 })
+    this.setData({ goods: [], discCouponPrice: 0 })
     this.calculation([]);
   },
 
@@ -928,14 +954,13 @@ Page({
     this.sendGoodInfoToFront()
   },
 
- fen2Yuan(num) {
-  if (typeof num !== "number" || isNaN(num)) return null;
-     return (num / 100).toFixed(2);
+  fen2Yuan(num) {
+    if (typeof num !== "number" || isNaN(num)) return null;
+    return (num / 100).toFixed(2);
   },
 
 
   sendMemberLogin(result) {
-
     this.setData({
       memberPhone: result
     })
@@ -1133,10 +1158,10 @@ Page({
   //使用券
   useCoupon(e) {
 
-    if(this.data.goods.length == 0){
+    if (this.data.goods.length == 0) {
       this.showToast("请先录入商品")
       return
-    } 
+    }
 
     this.setData({ discCouponState: 1 })
     var request = {};