diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js index bd0598304..3fe95bb81 100644 --- a/src/components/sp-page/index.js +++ b/src/components/sp-page/index.js @@ -442,7 +442,8 @@ const SpPage = memo( }> + 0 ? 202 + 66 : 202} + ref={pageRef} + renderFooter={ + + {cartList.length > 0 && ( + + + + 合计 + + + 已优惠 + + + { + setState((draft) => { + draft.discountDetailLayout = true + }) + }} + > + 优惠详情 + + + )} + + + + 应收 + + + 已选择{cartList[0]?.totalNum || 0}件商品 + + + + {cartList.length == 0 ? '取单' : '挂单'} + + { + if (cartList.length == 0) { + showToast('请添加商品') + return + } + + setState((draft) => { + draft.isCameraOpend = false + }) + Taro.navigateTo({ + url: `/subpages/dianwu/checkout?distributor_id=${distributor_id}`, + events: { + onEventFetchOrder: () => { + getCashierList() + } + } + }) + }} + > + 结算收银 + + + + + + } + > - {cartList.length > 0 && ( - - - - 合计 - - - 已优惠 - - - { - setState((draft) => { - draft.discountDetailLayout = true - }) - }} - > - 优惠详情 - - - )} - - - - - 应收 - - - 已选择{cartList[0]?.totalNum || 0}件商品 - - - - {cartList.length == 0 ? '取单' : '挂单'} - - { - if (cartList.length == 0) { - showToast('请添加商品') - return - } - - setState((draft) => { - draft.isCameraOpend = false - }) - Taro.navigateTo({ - url: `/subpages/dianwu/checkout?distributor_id=${distributor_id}`, - events: { - onEventFetchOrder: () => { - getCashierList() - } - } - }) - }} - > - 结算收银 - - - - + + + ) } diff --git a/src/subpages/dianwu/comps/comp-tabbar.scss b/src/subpages/dianwu/comps/comp-tabbar.scss index e69de29bb..71c02d440 100644 --- a/src/subpages/dianwu/comps/comp-tabbar.scss +++ b/src/subpages/dianwu/comps/comp-tabbar.scss @@ -0,0 +1,8 @@ +.comp-tabbar { + height: 96px; + + .at-tab-bar { + position: initial; + box-shadow: none; + } +} diff --git a/src/subpages/dianwu/list.js b/src/subpages/dianwu/list.js index 2dd6527a2..caa6cddcc 100644 --- a/src/subpages/dianwu/list.js +++ b/src/subpages/dianwu/list.js @@ -91,7 +91,32 @@ function DianWuList() { } return ( - }> + + + + + 已选择 {cartList[0]?.totalNum || 0} 件商品 + + { + Taro.navigateTo({ + url: `/subpages/dianwu/cashier?distributor_id=${distributor_id}` + }) + }} + > + 进入收银台 + + + + + } + > - - - - 已选择 {cartList[0]?.totalNum || 0} 件商品 - - { - Taro.navigateTo({ - url: `/subpages/dianwu/cashier?distributor_id=${distributor_id}` - }) - }} - > - 进入收银台 - - ) } diff --git a/src/subpages/dianwu/list.scss b/src/subpages/dianwu/list.scss index d913c4f70..00839b6f8 100644 --- a/src/subpages/dianwu/list.scss +++ b/src/subpages/dianwu/list.scss @@ -5,14 +5,9 @@ $tabbar-ipx-height: 140px !default; // font-family: Helvetica; // padding-top: 170px; - &.ipx { - .sp-page__body { - height: calc(100vh - 140px); - } - } + .sp-page__body { position: relative; - height: calc(100vh - 120px); } .search-block { display: flex; @@ -20,21 +15,18 @@ padding: 0 20px; height: $header-height; background-color: #fff; - } - &.ipx { - .footer-wrap { - bottom: $tabbar-ipx-height; + + .sp-search-input { + width: 100%; } } + .footer-wrap { - position: fixed; - left: 0; - right: 0; - bottom: $tabbar-height; - height: $footer-height; + height: 106px; display: flex; justify-content: space-between; - padding: 10px 40px; + align-items: center; + padding: 0 40px; background: #ffffff; z-index: 1000; box-sizing: border-box; @@ -43,7 +35,7 @@ flex-direction: column; justify-content: center; flex: 1; - height: 100px; + height: 90px; background: #111a34; box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.14); border-radius: 50px 0 0 50px; @@ -67,9 +59,9 @@ } .btn-confirm { width: 245px; - height: 100px; + height: 90px; text-align: center; - line-height: 100px; + line-height: 90px; background: var(--color-dianwu-primary); box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.14); border-radius: 0px 50px 50px 0px; @@ -89,7 +81,10 @@ } .item-list-scroll { padding: 20px 0; - @include page-scroll($header-height, $footer-height); + // @include page-scroll($header-height, $footer-height); + height: calc(100% - $header-height); + overflow-y: scroll; + box-sizing: border-box; } .item-wrap { padding: 25px 20px; diff --git a/src/subpages/dianwu/pending-checkout.js b/src/subpages/dianwu/pending-checkout.js index de2ab2827..871cc0355 100644 --- a/src/subpages/dianwu/pending-checkout.js +++ b/src/subpages/dianwu/pending-checkout.js @@ -114,7 +114,11 @@ function DianwuPendingCheckout(props) { } return ( - }> + } + > {list.map((items, index) => { return items.map((item, sidx) => (