@@ -2,9 +2,9 @@
< view class = "order-container" :style = "themeColor" : class = "{ 'safe-area': isIphoneX }" >
<!-- # ifdef MP - WEIXIN -- >
< view class = "payment-navbar" : style = "{
'padding-top': menuButtonBounding.top + 'px',
height: menuButtonBounding.height + 'px'
}" >
'padding-top': menuButtonBounding.top + 'px',
height: menuButtonBounding.height + 'px'
}" >
< view class = "nav-wrap" >
< text class = "iconfont icon-back_light" @click ="back" > < / text >
< view class = "navbar-title" > 确认订单 < / view >
@@ -18,11 +18,12 @@
<!-- 选择地址 -- >
< template v-if = "orderPaymentData.exchange_info.type == 1 && orderPaymentData.is_virtual == 0" >
< ! - - 配送方式 - - >
< view class = "delivery-mode" v-if = "orderCreateData.delivery &&orderPaymentData.delivery.express_type.length > 1" >
< view class = "delivery-mode"
v-if = "orderCreateData.delivery && orderPaymentData.delivery.express_type.length > 1" >
< view class = "action" >
< view v-for = "(deliveryItem, deliveryIndex) in orderPaymentData.delivery.express_type"
:key = "deliveryIndex"
: class = "{active: deliveryItem.name == orderCreateData.delivery.delivery_type}"
: class = "{ active: deliveryItem.name == orderCreateData.delivery.delivery_type }"
@click ="selectDeliveryType(deliveryItem)" >
{{ deliveryItem.title }}
< ! - - 外圆角 - - >
@@ -31,10 +32,12 @@
< / view >
< / view >
< view class = "address-box" : class = "{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}"
< view class = "address-box"
: class = "{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
v-if = "orderPaymentData.delivery.delivery_type != 'store'" >
< block v-if = "storeInfo.storeList.length > 1 && orderPaymentData.delivery.delivery_type == 'local'" >
< view class = "local-delivery-store" v-if = "Object.keys(storeInfo.currStore).length" @click="$refs.deliveryPopup.open()" >
< view class = "local-delivery-store" v-if = "Object.keys(storeInfo.currStore).length"
@click ="$refs.deliveryPopup.open()" >
< view class = "info" >
由 < text class = "store-name" > { { storeInfo . currStore . store _name } } < / text > 提供配送
< / view >
@@ -49,14 +52,19 @@
< / view >
< / view >
< / block >
< view class = "info-wrap" : class = "{'local': orderPaymentData.delivery.delivery_type == 'local'}" v-if = "orderCreateData.member_address" @click="selectAddress" >
< view class = "info-wrap" : class = "{ 'local': orderPaymentData.delivery.delivery_type == 'local' }"
v-if = "orderCreateData.member_address" @click="selectAddress" >
< view class = "content" >
< text class = "name font-size-base" > { { orderCreateData . member _address . name ? orderCreateData . member _address . name : '' } } < / text >
< text class = "font-size-base mobile" > { { orderCreateData . member _address . mobile ? orderCreateData . member _address . mobil e : '' } } < / text >
< text class = "name font-size-base" > { { orderCreateData . member _address . name ?
orderCreateData . member _address . nam e : '' } } < / text >
< text class = "font-size-base mobile" > { { orderCreateData . member _address . mobile ?
orderCreateData . member _address . mobile : '' } } < / text >
< text class = "cell-more iconfont icon-right" > < / text >
< view class = "desc-wrap" >
{ { orderCreateData . member _address . full _address ? orderCreateData . member _address . full _address : '' } }
{ { orderCreateData . member _address . address ? orderCreateData . member _address . address : '' } }
{ { orderCreateData . member _address . full _address ?
orderCreateData . member _address . full _ address : '' } }
{ { orderCreateData . member _address . address ? orderCreateData . member _address . address : ''
} }
< / view >
< / view >
< / view >
@@ -69,11 +77,14 @@
<!-- 外卖配送 -- >
< block v-if = "orderPaymentData.delivery.delivery_type == 'local'" >
< view class = "local-box" v-if = "orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1" >
< view class = "local-box"
v-if = "orderPaymentData.config.local.is_use && orderPaymentData.delivery.local.info && orderPaymentData.delivery.local.info.time_is_open == 1" >
< view class = "pick-block" @click ="localtime" >
< view class = "font-size-base" > 送达时间 < / view >
< view class = "time-picker" >
< text : class = "{'color-tip': !orderCreateData.buyer_ask_delivery_title}" > { { orderCreateData . buyer _ask _delivery _title ? orderCreateData . buyer _ask _delivery _title : '请选择送达时间' } } < / text >
< text : class = "{ 'color-tip': !orderCreateData.buyer_ask_delivery_title }" > { {
orderCreateData . buyer _ask _delivery _title ?
orderCreateData . buyer _ask _delivery _title : '请选择送达时间' } } < / text >
< text class = "iconfont icon-right cell-more" > < / text >
< / view >
< / view >
@@ -82,7 +93,9 @@
< image class = "address-line" :src = "$util.img('public/uniapp/order/address-line.png')" > < / image >
< / view >
< view class = "store-box" : class = "{'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1}" v-if = "orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore" >
< view class = "store-box"
: class = "{ 'not-delivery-type': orderPaymentData.delivery.express_type.length <= 1 }"
v-if = "orderPaymentData.delivery.delivery_type == 'store' && storeInfo.currStore" >
< block v-if = "storeInfo.currStore" >
< view @click ="openSiteDelivery" class = "store-info" >
< view class = "store-address-info" >
@@ -104,20 +117,22 @@
< view class = "mobile-wrap store-mobile" >
< view class = "form-group" >
< text class = "text" > 姓名 < / text >
< input type = "text" placeholder -class = " color -tip placeholder " class = "input" v-model = "member_address.name" disabled / >
< input type = "text" placeholder -class = " color -tip placeholder " class = "input"
v-model = "member_address.name" disabled / >
< / view >
< / view >
< view class = "mobile-wrap store-mobile" >
< view class = "form-group" >
< text class = "text" > 预留手机 < / text >
< input type = "number" maxlength = "11" placeholder = "请输入您的手机号码"
placeholder -class = " color -tip placeholder " class = "input" v-model = "member_address.mobile" / >
placeholder -class = " color -tip placeholder " class = "input"
v-model = "member_address.mobile" / >
< / view >
< / view >
< view class = "store-time" >
< view class = "left" > 自提时间 < / view >
< view class = "right" @click ="storetime" >
{{ orderCreateData.buyer_ask_delivery_title }}
{{ orderCreateData.buyer_ask_delivery_title }}
< text class = "iconfont icon-right" > < / text >
< / view >
< / view >
@@ -137,27 +152,35 @@
< view class = "form-group" >
< text class = "iconfont icon-dianhua2" > < / text >
< text class = "text" > 手机号码 < / text >
< input type = "number" maxlength = "11" placeholder = "请输入您的手机号码" placeholder -class = " color -tip placeholder " class = "input" v-model = "orderCreateData.member_address.mobile" / >
< input type = "number" maxlength = "11" placeholder = "请输入您的手机号码"
placeholder -class = " color -tip placeholder " class = "input"
v-model = "orderCreateData.member_address.mobile" / >
< / view >
< / view >
<!-- 店铺 -- >
< view class = "site-wrap" : class = "orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''" >
< view class = "site-wrap"
: class = "orderPaymentData.exchange_info.type == 2 || orderPaymentData.exchange_info.type == 3 ? 'margin-top' : ''" >
< view class = "site-body" >
< view class = "goods-wrap" >
< block v-if = "orderPaymentData.exchange_info.type == 2" >
< view class = "goods-img" >
< image : src = "orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')" @error ="imageError()" mode = "aspectFill" / >
< image
: src = "orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/coupon.png')"
@error ="imageError()" mode = "aspectFill" / >
< / view >
< / block >
< block v-else-if = "orderPaymentData.exchange_info.type == 3" >
< view class = "goods-img" >
< image : src = "orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')" @error ="imageError()" mode = "aspectFill" / >
< image
: src = "orderPaymentData.exchange_info.image ? $util.img(orderPaymentData.exchange_info.image) : $util.img('public/uniapp/point/hongbao.png')"
@error ="imageError()" mode = "aspectFill" / >
< / view >
< / block >
< block v-else >
< view class = "goods-img" >
< image :src = "$util.img(orderPaymentData.exchange_info.image)" @error ="imageError()" mode = "aspectFill" / >
< image :src = "$util.img(orderPaymentData.exchange_info.image)" @error ="imageError()"
mode = "aspectFill" / >
< / view >
< / block >
< view class = "goods-info" >
@@ -182,7 +205,8 @@
< view class = "site-footer" >
< view class = "order-cell" >
< text class = "tit" > 买家留言 < / text >
< view class = "box" > < input type = "text" placeholder = "留言前建议先与商家协调一致" placeholder -class = " color -tip " v-model = "orderCreateData.buyer_message" / > < / view >
< view class = "box" > < input type = "text" placeholder = "留言前建议先与商家协调一致" placeholder -class = " color -tip "
v-model = "orderCreateData.buyer_message" / > < / view >
< / view >
< / view >
< / view >
@@ -196,7 +220,8 @@
< text class = "unit" > 积分 < / text >
< / view >
< / view >
< view class = "order-cell" v-if = "orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0" >
< view class = "order-cell"
v-if = "orderPaymentData.exchange_info.type == 1 && orderPaymentData.delivery_money > 0" >
< text class = "tit" > 运费 < / text >
< view class = "box" >
< text class = "unit" > { { $lang ( 'common.currencySymbol' ) } } < / text >
@@ -206,8 +231,9 @@
< / view >
< view class = "error-message" v-if = "orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''" >
{{ orderPaymentData.delivery.error_msg }}
< view class = "error-message"
v-if = " orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.error !== ''" >
{{ orderPaymentData.delivery.error_msg }}
< / view >
< view class = "order-submit" : class = "{ 'bottom-safe-area': isIphoneX }" >
< view class = "order-settlement-info" >
@@ -221,12 +247,14 @@
< / template >
< / view >
< view class = "submit-btn" >
< button v-if = "createBtn()" type="primary" class="mini" size="mini" @click="openChoosePayment()" > 提交订单 < / button >
< button v-if = "createBtn()" type="primary" class="mini" size="mini"
@click ="openChoosePayment()" > 提交订单 < / button >
< button v-else class = "no-submit mini" size = "mini" >
< block v-if = "orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price" >
差 {{ orderPaymentData.delivery.start_money -orderPaymentData .price | moneyFormat }} 起送
< block
v-if = "orderPaymentData.delivery && orderPaymentData.delivery.delivery_type == 'local' && orderPaymentData.delivery && orderPaymentData.delivery.error && orderPaymentData.delivery.start_money > orderPaymentData.price" >
差 {{ orderPaymentData.delivery.start_money - orderPaymentData.price | moneyFormat }} 起送
< / block >
< block v-else > 提交订单< / block >
< block v-else > 提交订单< / block >
< / button >
< / view >
< / view >
@@ -241,22 +269,29 @@
< / view >
< view class = "popup-body store-popup" : class = "{ 'safe-area': isIphoneX }" >
< view class = "delivery-content" >
< view class = "item-wrap" v-for = "(item, index) in storeInfo.storeList" :key="index" @click="selectPickupPoint(item)" >
< view class = "item-wrap" v-for = "(item, index) in storeInfo.storeList" :key="index"
@click ="selectPickupPoint(item)" >
< view class = "detail" >
< view class = "name" : class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" >
< view class = "name"
: class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" >
< text > { { item . store _name } } < / text >
< text v-if = "item.distance" > ( {{ item.distance }} km ) < / text >
< / view >
< view class = "info" >
< view : class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class = "font-size-goods-tag" >
< view
: class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
class = "font-size-goods-tag" >
营业时间 : { { item . open _date } }
< / view >
< view : class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''" class = "font-size-goods-tag" >
< view
: class = "item.store_id == orderPaymentData.delivery.store_id ? 'color-base-text' : ''"
class = "font-size-goods-tag" >
地址 : { { item . full _address } } { { item . address } }
< / view >
< / view >
< / view >
< view class = "icon" v-if = "item.store_id == orderPaymentData.delivery.store_id"><text class="iconfont icon-yuan_checked color-base-text" > < / text > < / view >
< view class = "icon" v-if = "item.store_id == orderPaymentData.delivery.store_id" > < text
class = "iconfont icon-yuan_checked color-base-text" > < / text > < / view >
< / view >
< view v-if = "!storeInfo.storeList" class="empty" > 所选择收货地址附近没有可以自提的门店 < / view >
< / view >
@@ -267,7 +302,8 @@
< / scroll-view >
<!-- 选择支付方式弹窗 -- >
< ns-payment ref = "choosePaymentPopup" :payMoney = "orderPaymentData.order_money" @confirm ="orderCreate" > < / ns -payment >
< ns-payment ref = "choosePaymentPopup" :payMoney = "orderPaymentData.order_money"
@confirm ="orderCreate" > < / ns -payment >
< loading-cover ref = "loadingCover" > < / loading-cover >
@@ -277,38 +313,28 @@
< / template >
< script >
import payment from './public/js/payment.js' ;
import MescrollUni from "@/components/mescroll/my-list-mescroll.vue" ;
// #ifdef MP-WEIXIN
import privacyPopup from '@/components/wx-privacy-popup/privacy-popup.vue' ;
// #endif
export default {
components : {
MescrollUni ,
// #ifdef MP-WEIXIN
privacyPopup
// #endif
} ,
mixins : [ payment ]
} ;
import payment from './public/js/payment.js' ;
export default {
mixins : [ payment ]
} ;
< / script >
< style lang = "scss" >
@ import "@/common/css/order_parment.scss" ;
@ import "@/common/css/order_parment.scss" ;
< / style >
< style lang = "scss" scoped >
/ deep / . uni - popup _ _wrapper . uni - custom . uni - popup _ _wrapper - box {
background : none ;
max - height : unset ! important ;
overflow - y : hidden ! important ;
}
/ deep/ . uni - popup _ _wrapper . uni - custom . uni - popup _ _wrapper - box {
background : none ;
max - height : unset ! important ;
overflow - y : hidden ! important ;
}
/ deep / . uni - popup _ _wrapper {
border - radius : 20 rpx 20 rpx 0 0 ;
}
/ deep/ . uni - popup _ _wrapper {
border - radius : 20 rpx 20 rpx 0 0 ;
}
/ deep / . uni - popup {
z - index : 8 ;
}
/ deep/ . uni - popup {
z - index : 8 ;
}
< / style >