From 0e2701e575e8a6d5bc93f69f6200c690676ddcf7 Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Thu, 16 Jul 2026 13:51:38 +0800
Subject: [PATCH] updata
---
.../components/shop-item/shop-item.vue | 7 +++-
pages/restaurant/home/shop_home/shop_home.vue | 2 +-
.../orders-settlement/orders-settlement.vue | 30 ++++++++++++++-
.../order/orders-settlement/settlement.vue | 33 ++++++++++++++--
request/index/index.js | 6 ++-
unpackage/dist/.DS_Store | Bin 6148 -> 6148 bytes
unpackage/dist/build/.DS_Store | Bin 6148 -> 6148 bytes
unpackage/dist/build/web.zip | Bin 1521406 -> 0 bytes
unpackage/dist/build/web/index.html | 2 +-
.../build/web/static/js/index.720c046e.js | 1 +
.../build/web/static/js/index.db1a418a.js | 1 -
...iy-shopping_cart-shopping_cart.0f6e727d.js | 1 -
...iy-shopping_cart-shopping_cart.522d0057.js | 1 +
...urant-home-shop_home-shop_home.275a5f62.js | 1 -
...urant-home-shop_home-shop_home.3d455b8e.js | 1 +
...s-settlement-orders-settlement.1b4918ef.js | 1 -
...s-settlement-orders-settlement.9d0ca614.js | 1 +
...r-orders-settlement-settlement.455d24a8.js | 1 -
...r-orders-settlement-settlement.52a539a9.js | 1 +
.../dev/.automator/mp-weixin/.automator.json | 0
.../.sourcemap/mp-weixin/common/main.js.map | 1 +
.../mp-weixin/common/runtime.js.map | 1 +
.../.sourcemap/mp-weixin/common/vendor.js.map | 1 +
.../components/OrderStatus/OrderStatus.js.map | 1 +
.../components/add-address/add-address.js.map | 1 +
.../b-Bottom-Fit/b-Bottom-Fit.js.map | 1 +
.../mp-weixin/components/b-load/b-load.js.map | 1 +
.../b-nx-sku-popup/b-nx-sku-popup.js.map | 1 +
.../b-restaurant-order-status.js.map | 1 +
.../b-rx-commodity-item.js.map | 1 +
.../b-rx-sku-popup/b-rx-sku-popup.js.map | 1 +
.../b-shop-infor-head.js.map | 1 +
.../b-xbk-sku-popup/b-xbk-sku-popup.js.map | 1 +
.../card-checked/card-checked.js.map | 1 +
.../components/cardstyle/cardstyle.js.map | 1 +
.../components/countdown/countdown.js.map | 1 +
.../components/deduction/deduction.js.map | 1 +
.../components/erha-picker/erha-picker.js.map | 1 +
.../components/film-item/film-item.js.map | 1 +
.../components/film-play/film-play.js.map | 1 +
.../components/film-swiper/film-badge.js.map | 1 +
.../components/film-swiper/film-banner.js.map | 1 +
.../components/film-swiper/film-swiper.js.map | 1 +
.../linzq-citySelect/film-citySelect.js.map | 1 +
.../components/movies-item/movies-item.js.map | 1 +
.../orderindex-scan-code.js.map | 1 +
.../rechareModal/rechareModal.js.map | 1 +
.../recharge/recharge-Service.js.map | 1 +
.../components/recharge/recharge-Type.js.map | 1 +
.../components/recharge/recharge-User.js.map | 1 +
.../components/u-input/u-input.js.map | 1 +
.../pages/bufferpage/bufferpage.js.map | 1 +
.../pages/diy/addposition/addposition.js.map | 1 +
.../pages/diy/addresslis/addresslis.js.map | 1 +
.../diy/commodity_home/commodity_home.js.map | 1 +
.../mp-weixin/pages/diy/index_diy.js.map | 1 +
.../confirm_payment/confirm_payment.js.map | 1 +
.../orders/ersonal_order/ersonal_order.js.map | 1 +
.../diy/orders/order-infor/order-infor.js.map | 1 +
.../diy/orders/team_order/team_order.js.map | 1 +
.../pages/diy/pay-status/pay-status.js.map | 1 +
.../diy/shopping_cart/shopping_cart.js.map | 1 +
.../mp-weixin/pages/film/filmAddress.js.map | 1 +
.../mp-weixin/pages/film/filmDesc.js.map | 1 +
.../mp-weixin/pages/film/filmDetail.js.map | 1 +
.../mp-weixin/pages/film/filmForm.js.map | 1 +
.../mp-weixin/pages/film/filmIndex.js.map | 1 +
.../mp-weixin/pages/film/filmPlay.js.map | 1 +
.../mp-weixin/pages/film/filmSearch.js.map | 1 +
.../mp-weixin/pages/film/filmSeat.js.map | 1 +
.../mp-weixin/pages/film/filmSubmit.js.map | 1 +
.../mp-weixin/pages/film/filmYSearch.js.map | 1 +
.../mp-weixin/pages/film/filmYuan.js.map | 1 +
.../pages/goods/b_id2/b_id2_dian.js.map | 1 +
.../pages/goods/b_id3/b_id3_dian.js.map | 1 +
.../pages/goods/b_id3/b_id3_hua.js.map | 1 +
.../pages/goods/b_id4/b_id4_hua.js.map | 1 +
.../pages/goods/b_id5/b_id5_hua.js.map | 1 +
.../pages/goods/goods_Info/index.js.map | 1 +
.../pages/goods/goods_list/index.js.map | 1 +
.../mp-weixin/pages/goods/pay-success.js.map | 1 +
.../mp-weixin/pages/home/home.js.map | 1 +
.../balance_details/index.js.map | 1 +
.../diamondSubgiftCard/index.js.map | 1 +
.../diamondSubgiftList/index.js.map | 1 +
.../pages/pages-recharge/index/index.js.map | 1 +
.../pages/pages-recharge/index1/index1.js.map | 1 +
.../pages-recharge/myDiamond/index.js.map | 1 +
.../pages/pages-recharge/order/index.js.map | 1 +
.../pages-recharge/recharge/index.js.map | 1 +
.../rechargeEquity/index.js.map | 1 +
.../rechargeEquityCard/index.js.map | 1 +
.../rechargeProtocol/index.js.map | 1 +
.../rechargeSubgift/QR_code.js.map | 1 +
.../rechargeSubgift/index.js.map | 1 +
.../rechargeSubgiftCard/index.js.map | 1 +
.../pages-recharge/rechargeVip/index.js.map | 1 +
.../rechargeVipDetail/index.js.map | 1 +
.../shareRedEnvelopes/index.js.map | 1 +
.../pages-recharge/subgiftList/index.js.map | 1 +
.../pages-recharge/subgiftTotal/index.js.map | 1 +
.../subgiftTotalCard/index.js.map | 1 +
.../pages/pages-recharge/success/index.js.map | 1 +
.../pages-recharge/vipEquity/index.js.map | 1 +
.../mp-weixin/pages/pay/index.js.map | 1 +
.../pages/restaurant/arealist/arealist.js.map | 1 +
.../Home-Head-KDJ/Home-Head-KDJ.js.map | 1 +
.../Home-Head-MDL/Home-Head-MDL.js.map | 1 +
.../Home-Head-NX/Home-Head-NX.js.map | 1 +
.../Home-Head-RX/Home-Head-RX.js.map | 1 +
.../Home-Head-XBK/Home-Head-XBK.js.map | 1 +
.../Order-Item-KDJ/Order-Item-KDJ.js.map | 1 +
.../Order-Item-MDL/Order-Item-MDL.js.map | 1 +
.../Order-Item-NX/Order-Item-NX.js.map | 1 +
.../Order-Item-RX/Order-Item-RX.js.map | 1 +
.../Order-Item-XBK/Order-Item-XBK.js.map | 1 +
.../order-item-settlement.js.map | 1 +
.../restaurant-nav/restaurant-nav.js.map | 1 +
.../pages/restaurant/home/home.js.map | 1 +
.../components/shop-cart/shop-cart.js.map | 1 +
.../components/shop-head/shop-head.js.map | 1 +
.../components/shop-item/shop-item.js.map | 1 +
.../shop-combo/mdl-shop-combo.js.map | 1 +
.../home/shop_home/shop_home.js.map | 1 +
.../pages/restaurant/index/index_dyp.js.map | 1 +
.../pages/restaurant/index/index_kdj.js.map | 1 +
.../pages/restaurant/index/index_mdl.js.map | 1 +
.../pages/restaurant/index/index_nx.js.map | 1 +
.../pages/restaurant/index/index_rx.js.map | 1 +
.../pages/restaurant/index/index_xbk.js.map | 1 +
.../order/order-details/details.js.map | 1 +
.../order/order-details/order-details.js.map | 1 +
.../order-details/rx-orders-details.js.map | 1 +
.../order-details/xbk-orders-details.js.map | 1 +
.../order/order-status/order-status.js.map | 1 +
.../orders-settlement.js.map | 1 +
.../order/orders-settlement/settlement.js.map | 1 +
.../restaurant_home_list/index.js.map | 1 +
.../mp-weixin/pages/test/test.js.map | 1 +
.../l-painter-image/l-painter-image.js.map | 1 +
.../l-painter-view/l-painter-view.js.map | 1 +
.../components/l-painter/l-painter.js.map | 1 +
.../mescroll-body/mescroll-body.js.map | 1 +
.../mescroll-empty/mescroll-empty.js.map | 1 +
.../components/mescroll-top.js.map | 1 +
.../mescroll-uni/mescroll-uni.js.map | 1 +
.../uni-number-box/uni-number-box.js.map | 1 +
.../dist/dev/mp-weixin/project.config.json | 36 ++++++++++++++++++
.../dev/mp-weixin/project.private.config.json | 7 ++++
149 files changed, 247 insertions(+), 13 deletions(-)
delete mode 100644 unpackage/dist/build/web.zip
create mode 100644 unpackage/dist/build/web/static/js/index.720c046e.js
delete mode 100644 unpackage/dist/build/web/static/js/index.db1a418a.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-diy-shopping_cart-shopping_cart.0f6e727d.js
create mode 100644 unpackage/dist/build/web/static/js/pages-diy-shopping_cart-shopping_cart.522d0057.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.275a5f62.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-home-shop_home-shop_home.3d455b8e.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.1b4918ef.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.9d0ca614.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.455d24a8.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.52a539a9.js
create mode 100644 unpackage/dist/dev/.automator/mp-weixin/.automator.json
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/OrderStatus/OrderStatus.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/add-address/add-address.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-Bottom-Fit/b-Bottom-Fit.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-load/b-load.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-nx-sku-popup/b-nx-sku-popup.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-restaurant-order-status/b-restaurant-order-status.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-rx-commodity-item/b-rx-commodity-item.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-rx-sku-popup/b-rx-sku-popup.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-shop-infor-head/b-shop-infor-head.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/b-xbk-sku-popup/b-xbk-sku-popup.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/card-checked/card-checked.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/cardstyle/cardstyle.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/countdown/countdown.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/deduction/deduction.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/erha-picker/erha-picker.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/film-item/film-item.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/film-play/film-play.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/film-swiper/film-badge.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/film-swiper/film-banner.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/film-swiper/film-swiper.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/linzq-citySelect/film-citySelect.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/movies-item/movies-item.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/orderindex-scan-code/orderindex-scan-code.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/rechareModal/rechareModal.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/recharge/recharge-Service.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/recharge/recharge-Type.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/recharge/recharge-User.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/node-modules/uview-ui/components/u-input/u-input.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/bufferpage/bufferpage.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/addposition/addposition.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/addresslis/addresslis.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/commodity_home/commodity_home.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/index_diy.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/orders/confirm_payment/confirm_payment.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/orders/ersonal_order/ersonal_order.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/orders/order-infor/order-infor.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/orders/team_order/team_order.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/pay-status/pay-status.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/diy/shopping_cart/shopping_cart.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmAddress.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmDesc.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmDetail.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmForm.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmIndex.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmPlay.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmSearch.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmSeat.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmSubmit.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmYSearch.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/film/filmYuan.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/b_id2/b_id2_dian.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/b_id3/b_id3_dian.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/b_id3/b_id3_hua.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/b_id4/b_id4_hua.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/b_id5/b_id5_hua.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods_Info/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/goods_list/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/pay-success.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/home.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/balance_details/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/diamondSubgiftCard/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/diamondSubgiftList/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/index/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/index1/index1.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/myDiamond/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/order/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/recharge/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeEquity/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeEquityCard/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeProtocol/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeSubgift/QR_code.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeSubgift/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeSubgiftCard/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeVip/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/rechargeVipDetail/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/shareRedEnvelopes/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/subgiftList/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/subgiftTotal/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/subgiftTotalCard/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/success/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pages-recharge/vipEquity/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/pay/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/arealist/arealist.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Home-Head-KDJ/Home-Head-KDJ.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Home-Head-MDL/Home-Head-MDL.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Home-Head-NX/Home-Head-NX.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Home-Head-RX/Home-Head-RX.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Home-Head-XBK/Home-Head-XBK.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Order-Item-KDJ/Order-Item-KDJ.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Order-Item-MDL/Order-Item-MDL.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Order-Item-NX/Order-Item-NX.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Order-Item-RX/Order-Item-RX.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/Order-Item-XBK/Order-Item-XBK.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/order-item-settlement/order-item-settlement.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/components/restaurant-nav/restaurant-nav.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/home.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/shop_home/components/shop-cart/shop-cart.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/shop_home/components/shop-head/shop-head.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/shop_home/components/shop-item/shop-item.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/shop_home/shop-combo/mdl-shop-combo.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/home/shop_home/shop_home.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_dyp.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_kdj.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_mdl.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_nx.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_rx.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/index/index_xbk.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/order-details/details.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/order-details/order-details.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/order-details/rx-orders-details.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/order-details/xbk-orders-details.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/order-status/order-status.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/orders-settlement/orders-settlement.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/order/orders-settlement/settlement.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/restaurant/restaurant_home_list/index.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/test.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter-image/l-painter-image.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter-view/l-painter-view.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/lime-painter/components/l-painter/l-painter.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/mescroll-uni/components/mescroll-body/mescroll-body.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/mescroll-uni/components/mescroll-empty/mescroll-empty.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/components/mescroll-top.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.js.map
create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
create mode 100644 unpackage/dist/dev/mp-weixin/project.config.json
create mode 100644 unpackage/dist/dev/mp-weixin/project.private.config.json
diff --git a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
index ce21ef5..50891ab 100644
--- a/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
+++ b/pages/restaurant/home/shop_home/components/shop-item/shop-item.vue
@@ -76,6 +76,11 @@
{{item['bt_price']}}
+
+
+ 消费补贴卡:¥
+ {{item['subsidy_card_price']}}
+
预估积分:
@@ -363,7 +368,7 @@
padding-left: 22rpx;
&-bottom {
- margin-bottom: 15rpx;
+ // margin-bottom: 12rpx;
}
&-title {
diff --git a/pages/restaurant/home/shop_home/shop_home.vue b/pages/restaurant/home/shop_home/shop_home.vue
index 487d63d..78e004f 100644
--- a/pages/restaurant/home/shop_home/shop_home.vue
+++ b/pages/restaurant/home/shop_home/shop_home.vue
@@ -107,7 +107,7 @@
return {
// 肯德基
// 顶部通知
- topNotice: '当前3人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~',
+ topNotice: '当前6人正在下单,获取取餐码等待时间为1-2分钟,景区和交通枢纽不支持线上点餐~',
show: false,
suspend: config['suspend'],
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 61e82b6..216806a 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -94,6 +94,15 @@
+
+
+
+ 消费补贴卡:
+ (¥{{ UserCard.amount }} )
+
+
+
+
温馨提示
1、出餐后不支持退款,如需退款,请在出餐前联系客服;
@@ -209,6 +218,7 @@
import wx from 'weixin-js-sdk';
import state from '@/store/index';
import { HTTP_REQUEST_URL } from '@/config/app.js';
+ import { getCardPrice } from '@/request/index/index.js';
// 混入
import mixin from '@/static/js/mixin/mixin.js';
import restaurantmixins from '@/static/js/mixin/restaurantmixins.js';
@@ -261,7 +271,8 @@
// 产品集合
products: [],
use_coin: 0,
- use_broker: 0,
+ use_broker: 0,
+ use_card: 0,
// products>product_id
// products>amount
// products>is_deduction
@@ -285,11 +296,13 @@
computedTotal: {},
use_coin: false,
use_broker: false,
+ use_card: false,
hasAssigned: false, // 标志变量
YingPrice: 0 ,// 应付
realPayment: 0, // 实际付款
ZeroData: {},
+ UserCard: {}
};
},
onLoad() {
@@ -366,6 +379,7 @@
// 计算点餐金额
this['FormInfor']['use_coin'] = this.use_coin? 1 : 0;
this['FormInfor']['use_broker'] = this.use_broker? 1 : 0;
+ this['FormInfor']['use_card'] = this.use_card? 1 : 0;
this['FormInfor']['brand_id'] = this['BrandInfor']['brand_id'];
this['FormInfor']['restaurant_id'] = this['GetShopInfor']['restaurant_id'];
@@ -377,6 +391,14 @@
// 佣金计算
this.computedOrder(this.FormInfor);
+ this.getUserCard();
+ },
+
+
+ getUserCard() {
+ getCardPrice().then(res => {
+ this.UserCard = res.data;
+ })
},
// 是否使用券
@@ -386,6 +408,12 @@
this.getCart();
},
+ // 是否使用消费补贴卡
+ isCard() {
+ this.use_card = !this.use_card;
+ this.getCart();
+ },
+
isBroker() {
this.use_broker = !this.use_broker;
this.getCart();
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index e01c601..8cc27b8 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -117,6 +117,15 @@
+
+
+
+ 消费补贴卡:
+ (¥{{ UserCard.amount }} )
+
+
+
+
温馨提示
@@ -233,7 +242,8 @@