提交项目
This commit is contained in:
liuyuan
@@ -13,8 +13,8 @@
|
||||
<view class="goods_box">
|
||||
<view class="curriulum_title_box">
|
||||
<view v-if="this.options.isMiaosha == 1" class="miaosha_box">
|
||||
<view class="price_box"
|
||||
v-if="$platform=='android'&&curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0
|
||||
<!-- <view class="price_box"
|
||||
v-if="curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0
|
||||
||curriculumData.activityPrice && curriculumData.activityPrice > 0">
|
||||
<view class="price_left">
|
||||
<template v-if="curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0">
|
||||
@@ -44,8 +44,8 @@
|
||||
</text>
|
||||
<text class="xianshimaiosha" v-else-if="curriculumData.activityPrice && curriculumData.activityPrice > 0">活动立减</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="putong" v-else>
|
||||
</view> -->
|
||||
<view class="putong">
|
||||
<template>
|
||||
<text class="aui-text-danger price">
|
||||
￥{{ curriculumData.price }}
|
||||
|
||||
@@ -27,24 +27,24 @@
|
||||
|
||||
<view class="order_top common_radius_box color_shandow goods_box">
|
||||
<view class="curriulum_title_box goods_item" style=" position: relative;" v-for="(v, i) in goodsDataList">
|
||||
<text class="goods_item_vip" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
|
||||
<!-- <text class="goods_item_vip" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text> -->
|
||||
<image class="goods_item_img" :src="v.productImages" mode="aspectFit">
|
||||
</image>
|
||||
<view class="normal_box">
|
||||
<view class="normal_box_top">
|
||||
<view class="curriulum_title">{{ v.productName }} </view>
|
||||
<view class="price_box">
|
||||
<view class="vip_price" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
|
||||
<!-- <view class="vip_price" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
|
||||
<text class="vip_price_jg">￥{{ v.vipPrice }}</text>
|
||||
<text class="vip_price_text">VIP到手价</text>
|
||||
<text class="vip_price_line">￥{{ v.price }}</text>
|
||||
</view>
|
||||
<text class="price" v-else-if="$platform=='android'&&v.activityPrice&&v.activityPrice>0">
|
||||
<text class="price" v-else-if="v.activityPrice&&v.activityPrice>0">
|
||||
<text class="vip_price_jg">￥{{ v.activityPrice }}</text>
|
||||
<text class="vip_price_text">活动价</text>
|
||||
<text class="vip_price_line">￥{{ v.price }}</text>
|
||||
</text>
|
||||
<text v-else>￥{{ v.price }}</text>
|
||||
</text> -->
|
||||
<text>￥{{ v.price }}</text>
|
||||
|
||||
<view>
|
||||
x 1
|
||||
@@ -92,13 +92,13 @@
|
||||
<text style="color: #aaa; margin-left: 10rpx">
|
||||
(全部积分：{{ initData.user.jf }})</text>
|
||||
</template>
|
||||
<template v-else-if="v.type == 5">
|
||||
<!-- <template v-else-if="v.type == 5">
|
||||
<text class="type_text_red">活动立减</text>
|
||||
</template>
|
||||
|
||||
<template v-else-if="v.type == 6">
|
||||
<text class="type_text_red">VIP专享立减</text>
|
||||
</template>
|
||||
</template> -->
|
||||
<text v-else>{{ v.text }}</text>
|
||||
</view>
|
||||
<view class="right">
|
||||
@@ -110,12 +110,12 @@
|
||||
<template v-if="v.type == 3">
|
||||
<text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
|
||||
</template>
|
||||
<template v-if="v.type == 5">
|
||||
<!-- <template v-if="v.type == 5">
|
||||
<text class="type_text_red">-￥{{districtAmount}}</text>
|
||||
</template>
|
||||
<template v-if="v.type == 6">
|
||||
<text class="type_text_red">-￥{{vipPrice}}</text>
|
||||
</template>
|
||||
</template> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -476,11 +476,11 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
if (res.code == 0) {
|
||||
this.goodsDataList = res.shopProductList;
|
||||
//请求VIP还是活动的逻辑
|
||||
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
|
||||
if(this.goodsDataList[0].isVipPrice==1&&
|
||||
this.goodsDataList[0].vipPrice!=null&&
|
||||
this.goodsDataList[0].vipPrice!=0){
|
||||
await this.getVipDiscountAmount();
|
||||
}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
|
||||
}else if(this.goodsDataList[0].activityPrice&&
|
||||
this.goodsDataList[0].activityPrice>0){
|
||||
await this.getDistrictAmount();
|
||||
}else{
|
||||
@@ -558,7 +558,7 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
this.jfNumberShow = this.jfNumber.toFixed(2);
|
||||
}
|
||||
|
||||
this.actualPayment = this.totalPrice - this.jfNumber - this.vipPrice - this.districtAmount + this.freightNum;
|
||||
this.actualPayment = this.totalPrice - this.jfNumber + this.freightNum;
|
||||
|
||||
if (this.actualPayment == 0) {
|
||||
this.isDefaultCurrency = true;
|
||||
@@ -597,17 +597,17 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
},
|
||||
];
|
||||
//如果是活动
|
||||
if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
|
||||
this.priceBreakdownList.push({
|
||||
type: 5,
|
||||
})
|
||||
}
|
||||
//如果是vip
|
||||
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
|
||||
this.priceBreakdownList.push({
|
||||
type: 6,
|
||||
})
|
||||
}
|
||||
// if(this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
|
||||
// this.priceBreakdownList.push({
|
||||
// type: 5,
|
||||
// })
|
||||
// }
|
||||
// //如果是vip
|
||||
// if(this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
|
||||
// this.priceBreakdownList.push({
|
||||
// type: 6,
|
||||
// })
|
||||
// }
|
||||
|
||||
var data = {
|
||||
uid: this.userInfo.id,
|
||||
@@ -753,8 +753,8 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
|
||||
if (!this.isShowAddress) {
|
||||
if (this.initData.user.jf >= that.totalPrice) {
|
||||
this.jfNumber = that.totalPrice - that.vipPrice - that.districtAmount;
|
||||
this.jfNumberMax = that.totalPrice - that.vipPrice - that.districtAmount;
|
||||
this.jfNumber = that.totalPrice;
|
||||
this.jfNumberMax = that.totalPrice;
|
||||
} else {
|
||||
this.jfNumber = this.initData.user.jf;
|
||||
this.jfNumberMax = this.initData.user.jf;
|
||||
@@ -766,9 +766,9 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
that.jfNumberShow = that.jfNumber.toFixed(2);
|
||||
that.actualPayment = that.totalPrice - that.jfNumber;
|
||||
}
|
||||
that.actualPayment = that.actualPayment + that.freightNum - that.vipPrice- that.districtAmount;
|
||||
that.actualPayment = that.actualPayment + that.freightNum;
|
||||
} else {
|
||||
that.actualPayment = that.totalPrice + that.freightNum - that.vipPrice - that.districtAmount;
|
||||
that.actualPayment = that.totalPrice + that.freightNum;
|
||||
}
|
||||
|
||||
if (this.actualPayment == 0 && !this.isShowAddress) {
|
||||
@@ -856,11 +856,11 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
|
||||
appName: "xlkj",
|
||||
come: "3", //3心灵空间
|
||||
}
|
||||
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
|
||||
if(this.goodsDataList[0].isVipPrice==1&&
|
||||
this.goodsDataList[0].vipPrice!=null&&
|
||||
this.goodsDataList[0].vipPrice!=0){
|
||||
data.vipDiscountAmount = this.vipPrice; //vip
|
||||
}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
|
||||
}else if(this.goodsDataList[0].activityPrice&&
|
||||
this.goodsDataList[0].activityPrice>0){
|
||||
data.districtMoney = this.districtAmount; //活动
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user