|
@@ -124,13 +124,13 @@
|
|
|
<view v-show="item.shippingType === 1 && Number(orderInfoVo.secondType)===0"
|
|
<view v-show="item.shippingType === 1 && Number(orderInfoVo.secondType)===0"
|
|
|
class='item acea-row row-between-wrapper'>
|
|
class='item acea-row row-between-wrapper'>
|
|
|
<view>快递费用</view>
|
|
<view>快递费用</view>
|
|
|
- <view v-if='!item.freightFeeSl || item.freightFeeSl == 0' class="noCoupon">免运费</view>
|
|
|
|
|
- <view v-else class='money'>sL{{item.freightFeeSl || 0}}</view>
|
|
|
|
|
|
|
+ <view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免运费</view>
|
|
|
|
|
+ <view v-else class='money'>{{$store.getters.priceUnit}}{{item.freightFee || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view v-show="item.svipDiscountPriceSl != 0&&orderInfoVo.type!=2"
|
|
|
|
|
|
|
+ <view v-show="item.svipDiscountPrice != 0&&orderInfoVo.type!=2"
|
|
|
class='item acea-row row-between-wrapper'>
|
|
class='item acea-row row-between-wrapper'>
|
|
|
<view>会员优惠</view>
|
|
<view>会员优惠</view>
|
|
|
- <view class='money'>-{{$store.getters.priceUnit}}{{item.svipDiscountPriceSl || 0}}</view>
|
|
|
|
|
|
|
+ <view class='money'>-{{$store.getters.priceUnit}}{{item.svipDiscountPrice || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view v-if="isProductType" class='item acea-row row-between-wrapper'>
|
|
<view v-if="isProductType" class='item acea-row row-between-wrapper'>
|
|
|
<view>店铺优惠</view>
|
|
<view>店铺优惠</view>
|
|
@@ -138,7 +138,7 @@
|
|
|
@tap='couponTap(item.merCouponUserList,item.merId, index)'>
|
|
@tap='couponTap(item.merCouponUserList,item.merId, index)'>
|
|
|
<view class='discount acea-row row-between-wrapper'>
|
|
<view class='discount acea-row row-between-wrapper'>
|
|
|
<text
|
|
<text
|
|
|
- class="couponTitle line1">{{item.couponFeeSl==0?`有${item.merCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${item.couponFeeSl}`}}</text>
|
|
|
|
|
|
|
+ class="couponTitle line1">{{item.couponFee==0?`有${item.merCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${item.couponFee}`}}</text>
|
|
|
<text class='iconfont text-bbb icon-ic_rightarrow ml-4'></text>
|
|
<text class='iconfont text-bbb icon-ic_rightarrow ml-4'></text>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -159,20 +159,20 @@
|
|
|
<view v-show="secondType !== ProductTypeEnum.Integral" class='moneyList borRadius14'>
|
|
<view v-show="secondType !== ProductTypeEnum.Integral" class='moneyList borRadius14'>
|
|
|
<view class='item acea-row row-between-wrapper'>
|
|
<view class='item acea-row row-between-wrapper'>
|
|
|
<view>商品总价</view>
|
|
<view>商品总价</view>
|
|
|
- <view class='money'>{{$store.getters.priceUnit}}{{orderInfoVo.proTotalFeeSl || 0}}</view>
|
|
|
|
|
|
|
+ <view class='money'>{{$store.getters.priceUnit}}{{orderInfoVo.proTotalFee || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFeeSl) > 0">
|
|
|
|
|
|
|
+ <view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFee) > 0">
|
|
|
<view>运费:</view>
|
|
<view>运费:</view>
|
|
|
- <view class='money'>+{{$store.getters.priceUnit}}{{orderInfoVo.freightFeeSl || 0}}</view>
|
|
|
|
|
|
|
+ <view class='money'>+{{$store.getters.priceUnit}}{{orderInfoVo.freightFee || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view v-show="orderInfoVo.svipDiscountPriceSl != 0 &&orderInfoVo.type!=2"
|
|
|
|
|
|
|
+ <view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2"
|
|
|
class='item acea-row row-between-wrapper'>
|
|
class='item acea-row row-between-wrapper'>
|
|
|
<view>会员优惠</view>
|
|
<view>会员优惠</view>
|
|
|
- <view class='money'>-{{$store.getters.priceUnit}}{{orderInfoVo.svipDiscountPriceSl || 0}}</view>
|
|
|
|
|
|
|
+ <view class='money'>-{{$store.getters.priceUnit}}{{orderInfoVo.svipDiscountPrice || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
- <view class='item acea-row row-between-wrapper' v-if="parseInt(merCouponFeeSl) > 0 && isProductType">
|
|
|
|
|
|
|
+ <view class='item acea-row row-between-wrapper' v-if="parseInt(merCouponFee) > 0 && isProductType">
|
|
|
<view>店铺优惠</view>
|
|
<view>店铺优惠</view>
|
|
|
- <view class='money'>-{{$store.getters.priceUnit}}{{merCouponFeeSl}}</view>
|
|
|
|
|
|
|
+ <view class='money'>-{{$store.getters.priceUnit}}{{merCouponFee}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view v-if="isProductType" class='item acea-row row-between-wrapper'>
|
|
<view v-if="isProductType" class='item acea-row row-between-wrapper'>
|
|
|
<view>平台优惠</view>
|
|
<view>平台优惠</view>
|
|
@@ -180,7 +180,7 @@
|
|
|
class='discount acea-row row-between-wrapper'
|
|
class='discount acea-row row-between-wrapper'
|
|
|
@tap='couponTap(orderInfoVo.platCouponUserList,0)'>
|
|
@tap='couponTap(orderInfoVo.platCouponUserList,0)'>
|
|
|
<text
|
|
<text
|
|
|
- class="couponTitle line1">{{platCouponFeeSl==0?`有${orderInfoVo.platCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${platCouponFeeSl}`}}</text>
|
|
|
|
|
|
|
+ class="couponTitle line1">{{platCouponFee==0?`有${orderInfoVo.platCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${platCouponFee}`}}</text>
|
|
|
<text class='text-bbb iconfont icon-ic_rightarrow ml-4'></text>
|
|
<text class='text-bbb iconfont icon-ic_rightarrow ml-4'></text>
|
|
|
</view>
|
|
</view>
|
|
|
<view v-else class="noCoupon">暂无优惠券</view>
|
|
<view v-else class="noCoupon">暂无优惠券</view>
|
|
@@ -200,9 +200,9 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
|
- <view class='item acea-row row-between-wrapper' v-if="Number(orderInfoVo.deductionPriceSl) > 0">
|
|
|
|
|
|
|
+ <view class='item acea-row row-between-wrapper' v-if="Number(orderInfoVo.deductionPrice) > 0">
|
|
|
<view>抵扣金额</view>
|
|
<view>抵扣金额</view>
|
|
|
- <view class='money'>-{{$store.getters.priceUnit}} {{orderInfoVo.deductionPriceSl || 0}}</view>
|
|
|
|
|
|
|
+ <view class='money'>-{{$store.getters.priceUnit}} {{orderInfoVo.deductionPrice || 0}}</view>
|
|
|
</view>
|
|
</view>
|
|
|
|
|
|
|
|
</view>
|
|
</view>
|
|
@@ -214,7 +214,7 @@
|
|
|
<PointsPrice v-if="orderInfoVo.secondType === ProductTypeEnum.Integral" :pointsPrice="orderInfoVo"
|
|
<PointsPrice v-if="orderInfoVo.secondType === ProductTypeEnum.Integral" :pointsPrice="orderInfoVo"
|
|
|
:pointsGoodsStyle="hotPointsStyle"></PointsPrice>
|
|
:pointsGoodsStyle="hotPointsStyle"></PointsPrice>
|
|
|
<!-- 其他价格 -->
|
|
<!-- 其他价格 -->
|
|
|
- <text v-else class='price_color f-s-38 regular line-heightOne'>{{$store.getters.priceUnit}}{{orderInfoVo.totalPriceReat || 0}}</text>
|
|
|
|
|
|
|
+ <text v-else class='price_color f-s-38 regular line-heightOne'>{{$store.getters.priceUnit}}{{orderInfoVo.payFee || 0}}</text>
|
|
|
</view>
|
|
</view>
|
|
|
<view class='settlement' style='z-index:100' @tap="SubOrder">
|
|
<view class='settlement' style='z-index:100' @tap="SubOrder">
|
|
|
{{secondType === ProductTypeEnum.Integral?"确认兑换":"立即下单"}}
|
|
{{secondType === ProductTypeEnum.Integral?"确认兑换":"立即下单"}}
|
|
@@ -284,7 +284,6 @@
|
|
|
ProductMarketingTypeEnum
|
|
ProductMarketingTypeEnum
|
|
|
} from "../../../enums/productEnums";
|
|
} from "../../../enums/productEnums";
|
|
|
import orderPay from "@/mixins/OrderPay.js";
|
|
import orderPay from "@/mixins/OrderPay.js";
|
|
|
- import {rmbToLgns,getRmbToLgnsRate} from "@/utils";
|
|
|
|
|
let app = getApp();
|
|
let app = getApp();
|
|
|
/**
|
|
/**
|
|
|
* 积分商品推荐样式
|
|
* 积分商品推荐样式
|
|
@@ -359,7 +358,6 @@
|
|
|
merchantOrderVoList: [],
|
|
merchantOrderVoList: [],
|
|
|
priceGroup: {},
|
|
priceGroup: {},
|
|
|
animated: false,
|
|
animated: false,
|
|
|
- totalPrice: 0,
|
|
|
|
|
integralRatio: "0",
|
|
integralRatio: "0",
|
|
|
orderKey: "",
|
|
orderKey: "",
|
|
|
// usableCoupon: {},
|
|
// usableCoupon: {},
|
|
@@ -386,8 +384,6 @@
|
|
|
platUserCouponId: 0, //平台优惠券id
|
|
platUserCouponId: 0, //平台优惠券id
|
|
|
platCouponFee: '', //平台优惠券金额
|
|
platCouponFee: '', //平台优惠券金额
|
|
|
merCouponFee: '', //店铺优惠券总金额
|
|
merCouponFee: '', //店铺优惠券总金额
|
|
|
- platCouponFeeSl: '', //平台优惠券金额
|
|
|
|
|
- merCouponFeeSl: '', //店铺优惠券总金额
|
|
|
|
|
surplusFee: 0, //商品总金额-商户优惠券金额=平台端可使用优惠券的门槛
|
|
surplusFee: 0, //商品总金额-商户优惠券金额=平台端可使用优惠券的门槛
|
|
|
merUserCouponId: 0, //店铺使用优惠券的id
|
|
merUserCouponId: 0, //店铺使用优惠券的id
|
|
|
tempCouponObj: {}, //临时优惠券数据
|
|
tempCouponObj: {}, //临时优惠券数据
|
|
@@ -517,7 +513,6 @@
|
|
|
getloadPreOrder: function() {
|
|
getloadPreOrder: function() {
|
|
|
loadPreOrderApi(this.orderNo).then(res => {
|
|
loadPreOrderApi(this.orderNo).then(res => {
|
|
|
let orderInfoVo = res.data;
|
|
let orderInfoVo = res.data;
|
|
|
- orderInfoVo.proTotalFeeSl = 0
|
|
|
|
|
if(orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId){
|
|
if(orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId){
|
|
|
this.groupActivityId=orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId
|
|
this.groupActivityId=orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId
|
|
|
this.productId=orderInfoVo.merchantInfoList[0].orderInfoList[0].productId
|
|
this.productId=orderInfoVo.merchantInfoList[0].orderInfoList[0].productId
|
|
@@ -528,11 +523,6 @@
|
|
|
this.reservationInfo = uni.getStorageSync('reservationInfo') || {} //缓存的预约信息,地址id,配送类型
|
|
this.reservationInfo = uni.getStorageSync('reservationInfo') || {} //缓存的预约信息,地址id,配送类型
|
|
|
|
|
|
|
|
orderInfoVo.merchantInfoList.map(item => {
|
|
orderInfoVo.merchantInfoList.map(item => {
|
|
|
- item.couponFeeSl = rmbToLgns(item.couponFee)
|
|
|
|
|
- item.merCouponFeeSl = rmbToLgns(item.merCouponFee)
|
|
|
|
|
- item.freightFeeSl = rmbToLgns(item.freightFee)
|
|
|
|
|
- item.svipDiscountPriceSl = rmbToLgns(item.svipDiscountPrice)
|
|
|
|
|
-
|
|
|
|
|
if (item.shippingType === 2) this.getTakeTheir(item.merId)
|
|
if (item.shippingType === 2) this.getTakeTheir(item.merId)
|
|
|
this.orderMerchantRequestList.push({
|
|
this.orderMerchantRequestList.push({
|
|
|
shippingType: orderInfoVo.secondType === this.ProductTypeEnum.Reservation ? this.reservationInfo.shippingType : item.shippingType,
|
|
shippingType: orderInfoVo.secondType === this.ProductTypeEnum.Reservation ? this.reservationInfo.shippingType : item.shippingType,
|
|
@@ -540,21 +530,6 @@
|
|
|
remark: '',
|
|
remark: '',
|
|
|
userCouponId: item.userCouponId
|
|
userCouponId: item.userCouponId
|
|
|
})
|
|
})
|
|
|
- item.orderInfoList.map(list => {
|
|
|
|
|
- list.priceSl = rmbToLgns(list.price)
|
|
|
|
|
- list.vipPriceSl = rmbToLgns(list.vipPrice)
|
|
|
|
|
- list.payPriceSl = rmbToLgns(list.payPrice)
|
|
|
|
|
- list.merCouponPriceSl = rmbToLgns(list.merCouponPrice)
|
|
|
|
|
- if(list.vipPriceSl != 0){
|
|
|
|
|
- orderInfoVo.proTotalFeeSl = parseFloat(
|
|
|
|
|
- (parseFloat(orderInfoVo.proTotalFeeSl) + parseFloat((list.vipPriceSl * list.payNum))).toFixed(2)
|
|
|
|
|
- );
|
|
|
|
|
- }else{
|
|
|
|
|
- orderInfoVo.proTotalFeeSl = parseFloat(
|
|
|
|
|
- (parseFloat(orderInfoVo.proTotalFeeSl) + parseFloat((list.payPriceSl * list.payNum))).toFixed(2)
|
|
|
|
|
- );
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
item.addressDetail = this.merchangtInfo.addressDetail;
|
|
item.addressDetail = this.merchangtInfo.addressDetail;
|
|
|
item.phone = this.merchangtInfo.phone;
|
|
item.phone = this.merchangtInfo.phone;
|
|
|
item.latitude = this.merchangtInfo.latitude;
|
|
item.latitude = this.merchangtInfo.latitude;
|
|
@@ -566,21 +541,6 @@
|
|
|
this.platCouponFee = orderInfoVo.platCouponFee; //平台优惠券总金额
|
|
this.platCouponFee = orderInfoVo.platCouponFee; //平台优惠券总金额
|
|
|
this.merCouponFee = orderInfoVo.merCouponFee; //店铺优惠券总金额
|
|
this.merCouponFee = orderInfoVo.merCouponFee; //店铺优惠券总金额
|
|
|
|
|
|
|
|
- this.platCouponFeeSl = rmbToLgns(orderInfoVo.platCouponFee); //平台优惠券总金额
|
|
|
|
|
- this.merCouponFeeSl = rmbToLgns(orderInfoVo.merCouponFee); //店铺优惠券总金额
|
|
|
|
|
- orderInfoVo.freightFeeSl = rmbToLgns(orderInfoVo.freightFee);
|
|
|
|
|
- orderInfoVo.svipDiscountPriceSl = rmbToLgns(orderInfoVo.svipDiscountPrice);
|
|
|
|
|
- orderInfoVo.deductionPriceSl = rmbToLgns(orderInfoVo.deductionPrice);
|
|
|
|
|
- orderInfoVo.payFeeSl = rmbToLgns(orderInfoVo.payFee);
|
|
|
|
|
- orderInfoVo.totalPriceReat = parseFloat(
|
|
|
|
|
- (parseFloat(orderInfoVo.proTotalFeeSl) - parseFloat(this.platCouponFeeSl) - parseFloat(this.merCouponFeeSl)).toFixed(2)
|
|
|
|
|
- );
|
|
|
|
|
- // 这是汇率差
|
|
|
|
|
- orderInfoVo.reatDiff = parseFloat(
|
|
|
|
|
- (parseFloat(orderInfoVo.totalPriceReat) - parseFloat(orderInfoVo.payFeeSl)).toFixed(2)
|
|
|
|
|
- );
|
|
|
|
|
- // 这个是下单时的汇率
|
|
|
|
|
- orderInfoVo.rate = getRmbToLgnsRate()
|
|
|
|
|
this.orderInfoVo = {
|
|
this.orderInfoVo = {
|
|
|
...orderInfoVo,
|
|
...orderInfoVo,
|
|
|
systemFormValue: orderInfoVo.systemFormValue ? this.$util.objToArr(JSON.parse(
|
|
systemFormValue: orderInfoVo.systemFormValue ? this.$util.objToArr(JSON.parse(
|
|
@@ -752,7 +712,6 @@
|
|
|
this.changeOrderPay(res.data.orderNo, 'yue', 'yue', 'integral', 'integral', '0')
|
|
this.changeOrderPay(res.data.orderNo, 'yue', 'yue', 'integral', 'integral', '0')
|
|
|
} else {
|
|
} else {
|
|
|
// 其他商品走正常流程,去支付收银台页面
|
|
// 其他商品走正常流程,去支付收银台页面
|
|
|
- res.data.totalPriceReat = data.orderInfoVo.totalPriceReat
|
|
|
|
|
this.getToPayment(this.secondType, res.data)
|
|
this.getToPayment(this.secondType, res.data)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -796,19 +755,8 @@
|
|
|
orderExtend: systemFormData.length ? JSON.stringify(systemFormData) : '',
|
|
orderExtend: systemFormData.length ? JSON.stringify(systemFormData) : '',
|
|
|
reservationName: this.reservationInfo.reservationName,
|
|
reservationName: this.reservationInfo.reservationName,
|
|
|
reservationPhone: this.reservationInfo.reservationPhone,
|
|
reservationPhone: this.reservationInfo.reservationPhone,
|
|
|
- reservationPhone: this.reservationInfo.reservationPhone,
|
|
|
|
|
- orderInfoVo: {
|
|
|
|
|
- // 这是 totalPriceReat - payFeeSl 所谓的汇差
|
|
|
|
|
- reatDiff: this.orderInfoVo.reatDiff,
|
|
|
|
|
- // 这是订单下单时候的汇率
|
|
|
|
|
- rate: this.orderInfoVo.rate,
|
|
|
|
|
- // 这是通过产品价格/汇率*数量累计扣掉优惠后的总价(当前使用的是totalPriceReat来结算)
|
|
|
|
|
- totalPriceReat: this.orderInfoVo.totalPriceReat,
|
|
|
|
|
- // 这是rmb直接/汇率后扣掉优惠的总价
|
|
|
|
|
- payFeeSl: this.orderInfoVo.payFeeSl
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ reservationPhone: this.reservationInfo.reservationPhone
|
|
|
};
|
|
};
|
|
|
- console.log(data)
|
|
|
|
|
uni.showLoading({
|
|
uni.showLoading({
|
|
|
title: '订单提交中'
|
|
title: '订单提交中'
|
|
|
});
|
|
});
|