|
|
|
|
@ -2,24 +2,12 @@
|
|
|
|
|
<view class="order-submission"> |
|
|
|
|
<view class="allAddress" :style="systemStore ? '' : 'padding-top: 0.2*100rpx'"> |
|
|
|
|
<view class="nav acea-row"> |
|
|
|
|
<view |
|
|
|
|
class="item font-color-red" |
|
|
|
|
:class="shipping_type === 0 ? 'on' : 'on2'" |
|
|
|
|
@click="addressType(0)" |
|
|
|
|
v-if="systemStore" |
|
|
|
|
></view> |
|
|
|
|
<view |
|
|
|
|
class="item font-color-red" |
|
|
|
|
:class="shipping_type === 1 ? 'on' : 'on2'" |
|
|
|
|
@click="addressType(1)" |
|
|
|
|
v-if="systemStore" |
|
|
|
|
></view> |
|
|
|
|
</view> |
|
|
|
|
<view |
|
|
|
|
class="address acea-row row-between-wrapper" |
|
|
|
|
v-if="shipping_type === 0" |
|
|
|
|
@click="addressTap" |
|
|
|
|
> |
|
|
|
|
<view class="item font-color-red" :class="shipping_type === 0 ? 'on' : 'on2'" @click="addressType(0)" |
|
|
|
|
v-if="systemStore"></view> |
|
|
|
|
<view class="item font-color-red" :class="shipping_type === 1 ? 'on' : 'on2'" @click="addressType(1)" |
|
|
|
|
v-if="systemStore"></view> |
|
|
|
|
</view> |
|
|
|
|
<view class="address acea-row row-between-wrapper" v-if="shipping_type === 0" @click="addressTap"> |
|
|
|
|
<view class="addressCon" v-if="addressInfo.realName"> |
|
|
|
|
<view class="name"> |
|
|
|
|
{{ addressInfo.realName }} |
|
|
|
|
@ -35,11 +23,7 @@
|
|
|
|
|
</view> |
|
|
|
|
<view class="iconfont icon-jiantou"></view> |
|
|
|
|
</view> |
|
|
|
|
<div |
|
|
|
|
class="address acea-row row-between-wrapper" |
|
|
|
|
v-if="shipping_type === 1" |
|
|
|
|
@click="showStoreList" |
|
|
|
|
> |
|
|
|
|
<div class="address acea-row row-between-wrapper" v-if="shipping_type === 1" @click="showStoreList"> |
|
|
|
|
<div class="addressCon" v-if="storeItems"> |
|
|
|
|
<div class="name"> |
|
|
|
|
{{ storeItems.name }} |
|
|
|
|
@ -69,10 +53,7 @@
|
|
|
|
|
<text class="iconfont icon-jiantou"></text> |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<view |
|
|
|
|
class="item acea-row row-between-wrapper" |
|
|
|
|
v-if="deduction === false && enableIntegral === true" |
|
|
|
|
> |
|
|
|
|
<view class="item acea-row row-between-wrapper" v-if="deduction === false && enableIntegral === true"> |
|
|
|
|
<view>积分抵扣</view> |
|
|
|
|
<view class="discount"> |
|
|
|
|
<view class="select-btn"> |
|
|
|
|
@ -124,33 +105,21 @@
|
|
|
|
|
<view class="item"> |
|
|
|
|
<view>支付方式</view> |
|
|
|
|
<view class="list"> |
|
|
|
|
<view |
|
|
|
|
class="payItem acea-row row-middle" |
|
|
|
|
:class="active === 'weixin' ? 'on' : ''" |
|
|
|
|
@click="payItem('weixin')" |
|
|
|
|
v-show="isWeixin" |
|
|
|
|
> |
|
|
|
|
<view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" |
|
|
|
|
v-show="isWeixin"> |
|
|
|
|
<view class="name acea-row row-center-wrapper"> |
|
|
|
|
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 |
|
|
|
|
</view> |
|
|
|
|
<view class="tip">微信快捷支付</view> |
|
|
|
|
</view> |
|
|
|
|
<view |
|
|
|
|
class="payItem acea-row row-middle" |
|
|
|
|
:class="active === 'weixin' ? 'on' : ''" |
|
|
|
|
@click="payItem('weixin')" |
|
|
|
|
v-show="!isWeixin" |
|
|
|
|
> |
|
|
|
|
<view class="payItem acea-row row-middle" :class="active === 'weixin' ? 'on' : ''" @click="payItem('weixin')" |
|
|
|
|
v-show="!isWeixin"> |
|
|
|
|
<view class="name acea-row row-center-wrapper"> |
|
|
|
|
<view class="iconfont icon-weixin2" :class="active === 'weixin' ? 'bounceIn' : ''"></view>微信支付 |
|
|
|
|
</view> |
|
|
|
|
<view class="tip">微信快捷支付</view> |
|
|
|
|
</view> |
|
|
|
|
<view |
|
|
|
|
class="payItem acea-row row-middle" |
|
|
|
|
:class="active === 'yue' ? 'on' : ''" |
|
|
|
|
@click="payItem('yue')" |
|
|
|
|
> |
|
|
|
|
<view class="payItem acea-row row-middle" :class="active === 'yue' ? 'on' : ''" @click="payItem('yue')"> |
|
|
|
|
<view class="name acea-row row-center-wrapper"> |
|
|
|
|
<view class="iconfont icon-icon-test" :class="active === 'yue' ? 'bounceIn' : ''"></view>余额支付 |
|
|
|
|
</view> |
|
|
|
|
@ -185,21 +154,10 @@
|
|
|
|
|
</view> |
|
|
|
|
<view class="settlement" @click="createOrder">立即结算</view> |
|
|
|
|
</view> |
|
|
|
|
<CouponListWindow |
|
|
|
|
v-on:couponchange="changecoupon($event)" |
|
|
|
|
v-model="showCoupon" |
|
|
|
|
:price="orderPrice.totalPrice" |
|
|
|
|
:checked="usableCoupon.id" |
|
|
|
|
@checked="changeCoupon" |
|
|
|
|
:cartid="cartid" |
|
|
|
|
></CouponListWindow> |
|
|
|
|
<AddressWindow |
|
|
|
|
@checked="changeAddress" |
|
|
|
|
@redirect="addressRedirect" |
|
|
|
|
v-model="showAddress" |
|
|
|
|
:checked="addressInfo.id" |
|
|
|
|
ref="mychild" |
|
|
|
|
></AddressWindow> |
|
|
|
|
<CouponListWindow v-on:couponchange="changecoupon($event)" v-model="showCoupon" :price="orderPrice.totalPrice" |
|
|
|
|
:checked="usableCoupon.id" @checked="changeCoupon" :cartid="cartid"></CouponListWindow> |
|
|
|
|
<AddressWindow @checked="changeAddress" @redirect="addressRedirect" v-model="showAddress" :checked="addressInfo.id" |
|
|
|
|
ref="mychild"></AddressWindow> |
|
|
|
|
</view> |
|
|
|
|
</template> |
|
|
|
|
<style scoped lang="less"> |
|
|
|
|
@ -216,11 +174,9 @@
|
|
|
|
|
.order-submission .allAddress { |
|
|
|
|
width: 100%; |
|
|
|
|
background-image: linear-gradient(to bottom, #eb3729 0%, #eb3729 100%); |
|
|
|
|
background-image: -webkit-linear-gradient( |
|
|
|
|
to bottom, |
|
|
|
|
background-image: -webkit-linear-gradient(to bottom, |
|
|
|
|
#eb3729 0%, |
|
|
|
|
#eb3729 100% |
|
|
|
|
); |
|
|
|
|
#eb3729 100%); |
|
|
|
|
background-image: -moz-linear-gradient(to bottom, #eb3729 0%, #eb3729 100%); |
|
|
|
|
padding-top: 1 * 100rpx; |
|
|
|
|
} |
|
|
|
|
@ -308,11 +264,25 @@
|
|
|
|
|
import OrderGoods from "@/components/OrderGoods"; |
|
|
|
|
import CouponListWindow from "@/components/CouponListWindow"; |
|
|
|
|
import AddressWindow from "@/components/AddressWindow"; |
|
|
|
|
import { postOrderConfirm, postOrderComputed, createOrder } from "@/api/order"; |
|
|
|
|
import { mapGetters } from "vuex"; |
|
|
|
|
import { handleOrderPayResults } from "@/libs/order"; |
|
|
|
|
import { weappPay } from "@/libs/wechat"; |
|
|
|
|
import { isWeixin, handleErrorMessage } from "@/utils"; |
|
|
|
|
import { |
|
|
|
|
postOrderConfirm, |
|
|
|
|
postOrderComputed, |
|
|
|
|
createOrder |
|
|
|
|
} from "@/api/order"; |
|
|
|
|
import { |
|
|
|
|
mapGetters |
|
|
|
|
} from "vuex"; |
|
|
|
|
import { |
|
|
|
|
handleOrderPayResults, |
|
|
|
|
subscribeMessage |
|
|
|
|
} from "@/libs/order"; |
|
|
|
|
import { |
|
|
|
|
weappPay |
|
|
|
|
} from "@/libs/wechat"; |
|
|
|
|
import { |
|
|
|
|
isWeixin, |
|
|
|
|
handleErrorMessage |
|
|
|
|
} from "@/utils"; |
|
|
|
|
|
|
|
|
|
const NAME = "OrderSubmission", |
|
|
|
|
_isWeixin = isWeixin(); |
|
|
|
|
@ -546,6 +516,9 @@ export default {
|
|
|
|
|
if (this.$deviceType == "app") { |
|
|
|
|
from.from = "app"; |
|
|
|
|
} |
|
|
|
|
// #ifdef MP-WEIXIN |
|
|
|
|
subscribeMessage() |
|
|
|
|
// #endif |
|
|
|
|
createOrder(this.orderGroupInfo.orderKey, { |
|
|
|
|
realName: this.contacts, |
|
|
|
|
phone: this.contactsTel, |
|
|
|
|
@ -565,7 +538,7 @@ export default {
|
|
|
|
|
}) |
|
|
|
|
.then((res) => { |
|
|
|
|
uni.hideLoading(); |
|
|
|
|
handleOrderPayResults.call(this, res.data, "create"); |
|
|
|
|
handleOrderPayResults.call(this, res.data, "create", this.active); |
|
|
|
|
}) |
|
|
|
|
.catch((err) => { |
|
|
|
|
handleErrorMessage(err, "创建订单失败"); |
|
|
|
|
|
Gao xiaosong
5 years ago