bugfixed

app.json

 {
   "pages": [
+        "pages/landscan/landscan",
     "pages/index/index",
     "pages/poster/poster",
     "pages/payresult/payresult",
     "pages/printlastorder/printlastorder",
     "pages/home/home",
     "pages/poster/poster",
-    "pages/waitoperate/waitoperate",
-    "pages/landscan/landscan"
+    "pages/waitoperate/waitoperate"
   ],
   "window": {
     "defaultTitle": "",

const/actioncmd.js

@@ -67,6 +67,8 @@ export const ACTION_SYSTEM_SETTING = "ACTION_SYSTEM_SETTING";
 //结算页面回到扫商品页面
 export const ACTION_BALANCE_BACK_GOODS = "ACTION_BALANCE_BACK_GOODS";
 
+//提货
+export const ACTION_PICK_UP_GOODS = "ACTION_PICK_UP_GOODS";
 
 const FLOW_IDLE = "idle";
 const FLOW_COLLECTIONS = "collections";//收款

pages/index/index.axml

@@ -110,6 +110,66 @@
         </view>
       </view>
     </view>
+    <!-- 提货码 -->
+    <view class="page-coupon" a:if="{{pickGoodsState != 0}}">
+      <view class="coupon-top">
+        <view class="coupon-back-container" onTap="pickGoodsClose" a:if="{{pickGoodsState == 1}}">
+          <image class="coupon-back-icon" mode="aspectFit" src="/images/icon_back.png"/>
+          <text class="coupon-back-text">返回</text>
+        </view>
+        <view class="coupon-title" a:if="{{pickGoodsState == 1}}">提货</view>
+        <view></view>
+      </view>
+      <!-- 等待扫描 -->
+      <view class="coupon-bottom" a:if="{{pickGoodsState == 1}}">
+        <text class="scan-coupon-text">提示顾客扫描提货码…</text>
+        <image class="scan-coupon-guide" mode="aspectFit" src="/images/scan_guide.png"/>
+        <button class="cancel-use-coupon" size="default" type="ghost" onTap="pickGoodsClose">关闭</button>
+      </view>
+      <!-- 提货中 -->
+      <view class="coupon-bottom" a:if="{{pickGoodsState == 2}}">
+        <text class="scan-coupon-text">正在识别提货码…</text>
+        <image class="scan-coupon-guide" mode="aspectFit" src="/images/scan_guide.png"/>
+      </view>
+      <!-- 提货成功 -->
+      <view class="land-scan-boottom" a:if="{{pickGoodsState == 3}}">
+        <scroll-view class="shopcart-list" scroll-y="{{true}}" a:if="{{pickGoods.length > 0}}">
+          <view class="shopcart-cart-top-blank">
+          </view>
+          <block a:for="{{pickGoods}}">
+            <view class="scan-list-bg">
+              <view class="good-top">
+                <view class="good-name">
+        {{item.name}}
+                </view>
+              </view>
+              <view class="good-bottom">
+                <view class="good-price">¥{{item.price}}</view>
+                <view class="good-operat">
+                  <text class="good-num">{{item.quantity}}</text>
+                </view>
+              </view>
+            </view>
+          </block>
+        </scroll-view>
+        <view class="more-operating">
+          <image class="scan-coupon-fail" mode="aspectFit" src="/images/icon_success.png"/>
+          <text class="scan-coupon-text-fail">提货码已识别</text>
+          <text class="scan-coupon-text-fail-desr">请根据商品列表提供商品给顾客</text>
+          <button class="sure-use-coupon" type="primary" size="default" onTap="pickGoodsClose">商品已交付</button>
+        </view>
+      </view>
+      <!-- 提货失败 -->
+      <view class="coupon-bottom-fail" a:if="{{pickGoodsState == 4}}">
+        <image class="scan-coupon-fail" mode="aspectFit" src="/images/icon_failed.png"/>
+        <text class="scan-coupon-text-fail">提货失败</text>
+        <text class="scan-coupon-text-fail-desr">提货失败！无效的提货码</text>
+        <view class="failure-operation">
+          <button class="close-use-coupon" type="ghost" size="default" onTap="pickGoodsClose">关闭</button>
+          <button class="again-use-coupon" type="primary" size="default" onTap="onHomePickUpGoodsClicked">重新兑换</button>
+        </view>
+      </view>
+    </view>
   </view>
   <!--扫码页-->
   <view hidden="{{!pageShow['landscan']}}">
@@ -225,7 +285,6 @@
         <view style="position: absolute;display: flex;flex-direction: row;align-items: baseline;bottom:22rpx;left:0rpx;padding-left: 29rpx;">
           <view class="descText">{{waitOperateMoneyRemind}}</view>
           <view class="moneySign">￥</view>
-
           <view class="payPrice">{{waitOperateAmount}}</view>
           <view class="descText" hidden="{{flowType!='collections'}}">（共{{totalQuantity}}件）</view>
         </view>
@@ -386,7 +445,6 @@
       </view>
     </view>
   </view>
-
   <!-- 等待前屏登录 -->
   <view class="login-waiting-page" a:if="{{!isFrontScreenLoginOK}}">
     <image class="login-waiting-left" mode="aspectFill" src="/images/login_wait_left.png"/>
@@ -394,7 +452,6 @@
       <image class="login-waiting-right-image" mode="aspectFit" src="/images/login_waiting_right.png"/>
     </view>
   </view>
-
   <!-- 操作结果页 -->
   <view hidden="{{!pageShow['operateresult']}}">
     <view class="operateTopView"></view>

pages/index/index.js

@@ -7,7 +7,7 @@ import {
   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,
-  ACTION_SYSTEM_SETTING,ACTION_BALANCE_BACK_GOODS,
+  ACTION_SYSTEM_SETTING,ACTION_BALANCE_BACK_GOODS,ACTION_PICK_UP_GOODS
 } from '../../const/actioncmd'
 import { FLOW_IDLE, FLOW_COLLECTIONS, FLOW_REFUND, FLOW_DIRECT_PAYMENT } from '../../const/actioncmd'
 
@@ -49,6 +49,11 @@ Page({
     payPriceFen: 0,
     /**商品扫码页相关参数 */
 
+    //提货 0关闭 提货弹窗 1等待扫描提货码 2.提货码录入中 3.提货码录入成功 4.提货码录入失败
+    pickGoodsState: 0,
+    pickGoodsMsg: "录入失败！无效的提货码",
+    pickGoods: [],  
+
     //优惠券 0关闭 录入券弹窗 1等待录入 2.录入中 3.录入成功 4.录入失败
     discCouponState: 0,
     discCouponMsg: "录入失败！无效的优惠券码",
@@ -467,7 +472,21 @@ Page({
    * 提货
    */
   onHomePickUpGoodsClicked() {
-
+   let context = this;
+    my.ix.sendBuddyMessage({
+      target: getApp().globalData.frontScreenAppId,
+      data: {
+        action: ACTION_PICK_UP_GOODS,
+        data: 1
+      },
+      success: (sres) => {
+        context.setData({ pickGoodsState: 1 })
+        console.log("提货通知前屏 成功 ===》" + JSON.stringify(sres));
+      },
+      fail: (fres) => {
+        console.log("提货通知前屏 失败 ===》 " + JSON.stringify(fres));
+      }
+    })
   }, 
 
   /**日结 */
@@ -564,6 +583,7 @@ Page({
       discCouponState: 0,
       discCouponMsg: "",
       discCouponPrice: 0,
+      
     })
 
     var commonRequest = {

pages/landscan/landscan.axml

-<!-- 扫商品页面 -->
-<view class="{{scene != 0 ? 'pfilter' : 'pageland' }}">
-  <view class="land-scan-top">
-    <button class="land-scan-top-member-login" size="default" type="ghost">会员登陆</button>
-    <text class="cashier-text">收银</text>
-    <view>
-      <image class="go-home-icon" mode="aspectFit" src="/images/icon_home.png"/>
-      <text class="go-home-text">首页</text>
-    </view>
-  </view>
-  <view class="land-scan-boottom">
-    <!-- 空购物车 -->
-    <view class="shopcart-list-empty" hidden="{{goods.length > 0}}">
-        <view class="empty-remind-text">请扫描商品条码添加商品</view>
-        <image class="empty-remind-icon" mode="aspectFit" src="/images/scan_good_guide.png"/>
-    </view>
+
+<view class="land-scan-boottom">
   <!-- 购物车有数据 -->
-    <scroll-view class="shopcart-list"  scroll-y="{{true}}" a:if="{{goods.length > 0}}"  >
+  <scroll-view class="shopcart-list" scroll-y="{{true}}" a:if="{{goods.length > 0}}">
     <view class="shopcart-cart-top-blank">
     </view>
     <block a:for="{{goods}}">
-        <view class="scan-list-bg"  >
+      <view class="scan-list-bg">
         <view class="good-top">
           <view class="good-name">
         {{item.name}}
@@ -29,44 +15,16 @@
         <view class="good-bottom">
           <view class="good-price">¥{{item.price}}</view>
           <view class="good-operat">
-              <image id="{{item.barcode}}" class="good-decrease" mode="scaleToFill" src="/images/good_decrease.png" catchTap="decreaseGood"/>
             <text class="good-num">{{item.quantity}}</text>
-              <image id="{{item.barcode}}" class="good-increase" mode="scaleToFill" src="/images/good_increase.png" catchTap="increaseGood"/>
           </view>
         </view>
       </view>
     </block>
   </scroll-view>
   <view class="more-operating">
-      <view class="operating-top">
-        <image class="operat-icon" mode="aspectFit" src="/images/manual_barcode.png" catchTap="manualBarcode"/>
-        <image class="operat-icon" mode="aspectFit" src="/images/use_coupon.png" catchTap="useCoupon"/>
-        <image class="operat-icon" mode="aspectFit" src="/images/clear_shop_list.png" catchTap="clearGood"/>
-      </view>
-      <view class="operating-bottom">
-        <text class="total-num">共{{totalQuantity}}件商品，合计金额</text>
-        <text class="pay-price">¥{{totalPrice}}</text>
-        <button class="go-pay" size="default" type="primary" onTap="goPay">收款</button>
-      </view>
-    </view>
-  </view>
-</view>
-<!-- 扫描优惠券 -->
-<view class="page-coupon" a:if="{{couponUseing}}" >
-  <view class="coupon-top">
-    <view class="coupon-back-container" onTap="couponBack">
-      <image class="coupon-back-icon" mode="aspectFit" src="/images/icon_back.png"/>
-      <text class="coupon-back-text">返回</text>
-    </view>
-    <view class="coupon-title">优惠券</view>
-    <view></view>
-  </view>
-  <view class="coupon-bottom">
-    <text class="scan-coupon-text">等待顾客扫描优惠券码…</text>
-    <image class="scan-coupon-guide" mode="aspectFit" src="/images/scan_guide.png"/>
-    <button class="cancel-use-coupon" size="default" type="ghost" onTap="couponBack">取消</button>
+    <image class="scan-coupon-fail" mode="aspectFit" src="/images/icon_success.png"/>
+    <text class="scan-coupon-text-fail">提货码已识别</text>
+    <text class="scan-coupon-text-fail-desr">请根据商品列表提供商品给顾客</text>
+    <button class="sure-use-coupon" type="primary" size="default" onTap="convertCouponClose">确定</button>
   </view>
 </view>
\ No newline at end of file
-<!-- 键盘 -->
-<land-keybord scene="{{scene}}" onKeyBordFinished="onKeyBordFinished" onKeyBordClose="onKeyBordClose">
-</land-keybord>
\ No newline at end of file