theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

order 7.23

Browse Source
This commit is contained in:
ghusermoon 2020-07-23 14:56:20 +08:00
parent 2e087313d4
commit be9f2ec1c7
9 changed files with 209 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/api/shop.js
View File

@ -77,6 +77,10 @@ export default {
getGoodsClassifyList() { getGoodsClassifyList() {
return vm.$u.post('Goods/getGoodsClassifyList'); return vm.$u.post('Goods/getGoodsClassifyList');
}, },
// 商品推荐的分类
getGoodsClassRecommend() {
return vm.$u.post('Goods/getGoodsClassRecommend');
},
// 商品推荐 // 商品推荐
getGoodsRecommend({page, gc_id}){ getGoodsRecommend({page, gc_id}){
return vm.$u.post('Goods/getGoodsRecommend', { return vm.$u.post('Goods/getGoodsRecommend', {
@ -172,11 +176,6 @@ export default {
id: id id: id
}); });
}, },
goodsInfo({id}){
return vm.$u.post('goods/goodsInfo', {
goods_id: id
});
},
// 商品搜索 // 商品搜索
ShopSearch({keyword,page = 1,order = 'goods_salenum'}){ ShopSearch({keyword,page = 1,order = 'goods_salenum'}){
return vm.$u.post('ShopSearch/search',{ return vm.$u.post('ShopSearch/search',{

5
components/mine/coupon/mine.vue
View File

@ -39,6 +39,7 @@ export default {
goodsClass: Array, goodsClass: Array,
}, },
created() { created() {
// console.log(this.goodsClass);
// console.log(this.couponInfo); // console.log(this.couponInfo);
}, },
filters: { filters: {
@ -51,9 +52,6 @@ export default {
} }
}, },
methods: { methods: {
exchange() {
this.$emit('exchange', this.couponInfo.vouchertemplate_id);
},
use() { use() {
this.$emit('use', this.couponInfo); this.$emit('use', this.couponInfo);
}, },
@ -64,6 +62,7 @@ export default {
.c-coupon { .c-coupon {
position: relative; position: relative;
z-index: 9; z-index: 9;
margin-bottom: 30rpx;
@mixin coupon-image($url) { @mixin coupon-image($url) {
width: 690rpx; width: 690rpx;
height: 194rpx; height: 194rpx;

45
components/shop/list/index.vue
View File

@ -3,19 +3,13 @@
<view class="top"> <view class="top">
商品推荐 商品推荐
</view> </view>
<!-- <view class="label">
<text v-for="item in classifyList" :key="item.gc_id">{{ item.gc_name }}</text>
</view>
<view class="item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
</view> -->
<view> <view>
<u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper> <u-tabs-swiper ref="uTabs" :list="classifyList" name="gc_name" :is-scroll="true" active-color="#FF780F" :current="current" font-size="24" :show-bar="false" @change="tabsChange" height="60" ></u-tabs-swiper>
</view> </view>
<swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" > <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish" :style="{height: swiperHeight}">
<swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index"> <swiper-item class="swiper-item" v-for="(_, index) in classifyList" :key="index">
<!-- <scroll-view scroll-y style="height: 800rpx;width: 100%;"> --> <!-- <scroll-view scroll-y style="height: 800rpx;width: 100%;"> -->
<view class="item"> <view class="goods-item">
<item v-for="item in goodsList" :key="item.goods_id" :info="item"></item> <item v-for="item in goodsList" :key="item.goods_id" :info="item"></item>
</view> </view>
<u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty> <u-empty text="暂无商品" mode="list" color="#000" v-if="!goodsList.length"></u-empty>
@ -30,17 +24,16 @@ export default {
name:"list", name:"list",
data() { data() {
return { return {
current: Number, current: -1,
swiperCurrent: 0, swiperCurrent: 0,
goodsList: [], goodsList: [],
classifyList: [],
swiperHeight: '',
} }
}, },
components:{ components:{
item item
}, },
props: {
classifyList: Array
},
watch: { watch: {
current(index) { current(index) {
const id = this.classifyList[index].gc_id; const id = this.classifyList[index].gc_id;
@ -48,21 +41,35 @@ export default {
} }
}, },
created() { created() {
this.current = 0; this.getGoodsClassRecommend();
console.log(this.classifyList);
}, },
methods: { methods: {
getGoodsClassRecommend(gc_id) {
this.$u.api.getGoodsClassRecommend().then(res => {
if (res.errCode == 0) {
// 初始化 current
this.current = 0;
this.classifyList = res.data.gc_recommend;
// this.getGoodsRecommend(this.classifyList[0].gc_id);
}
})
},
getGoodsRecommend(gc_id) { getGoodsRecommend(gc_id) {
this.$u.api.getGoodsRecommend({ this.$u.api.getGoodsRecommend({
page: 1, page: 1,
gc_id: gc_id, gc_id: gc_id,
}).then((res)=>{ }).then(res => {
if (res.errCode == 0) { if (res.errCode == 0) {
this.goodsList = res.data.goodsList; this.goodsList = res.data.goodsList;
console.log(this.goodsList); // console.log(this.goodsList);
this.setSwiperHeight();
} }
}) })
}, },
setSwiperHeight() {
// height: 230px, margin-bottom: 13
this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (230 + 13) + 'px';
},
// tabs通知swiper切换 // tabs通知swiper切换
tabsChange(index) { tabsChange(index) {
this.swiperCurrent = index; this.swiperCurrent = index;
@ -108,5 +115,11 @@ export default {
// margin-top: 20rpx; // margin-top: 20rpx;
// } // }
.goods-item {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
margin-top: 20rpx;
}
} }
</style> </style>

32
components/shop/list/item.vue
View File

@ -4,7 +4,7 @@
<view class="info"> <view class="info">
<text class="title u-line-1">{{ info.goods_name }}</text> <text class="title u-line-1">{{ info.goods_name }}</text>
<text class="jianjie u-line-2">{{ info.goods_advword }}</text> <text class="jianjie u-line-2">{{ info.goods_advword }}</text>
<text class="price">{{ info.goods_price }}</text> <text class="price">￥{{ info.goods_price }}</text>
</view> </view>
</view> </view>
</template> </template>
@ -16,10 +16,18 @@ export default {
}, },
methods: { methods: {
toDetailsPage() { toDetailsPage() {
this.$u.api.getGoodsDetails({ id: this.info.goods_id }).then((res)=>{
if (res.errCode == 0) {
const goods = {
goods: res.data,
type: 1,
}
this.$store.commit('setGoodsDetails', goods);
this.$store.commit('setGoodsId', this.info.goods_id);
this.$u.route({ this.$u.route({
url: 'pageB/sdetails/index', url: 'pageB/sdetails/index',
params: { })
id: this.info.goods_id // console.log(this.goodsInfo.mobile_body);
} }
}) })
} }
@ -28,31 +36,33 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.item{ .item{
width: 330rpx; width: 330rpx;
height: 469rpx; height: 460rpx;
margin-bottom: 27rpx; margin-bottom: 26rpx;
background-color: #f8f8f8; background-color: #f8f8f8;
border-radius: 10rpx; border-radius: 10rpx 10rpx 0rpx 0rpx;
overflow: hidden;
.img{ .img{
width: 100%; width: 330rpx;
height: 272rpx; height: 272rpx;
background: rgba(245,245,245,1);
border-radius: 10rpx 10rpx 0rpx 0rpx;
margin-bottom: 24rpx;
} }
.info{ .info{
width: 320rpx; width: 320rpx;
padding: 0 12rpx; padding: 0 12rpx 28rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
.title{ .title{
font-size: 30rpx; font-size: 30rpx;
color: #333; color: #333;
margin-bottom: 13rpx;
} }
.jianjie{ .jianjie{
font-size: 26rpx; font-size: 26rpx;
color: #666; color: #666;
margin-bottom: 20rpx;
} }
.price{ .price{
color: #FF3131; color: #FF3131;

25
pageB/components/sdetails/tloos.vue
View File

@ -9,7 +9,7 @@
<image src="/static/image/common/19.png"></image> <image src="/static/image/common/19.png"></image>
客服 客服
</view> </view>
<view class="button" style="background:rgba(253,211,96,0.6);">试穿试送</view> <view class="button" style="background:rgba(253,211,96,0.6);" v-if="info.goods_try == 1">试穿试送</view>
<view class="button" style="background:rgba(253,211,96,1);" @click="buy(2)">加入购物车</view> <view class="button" style="background:rgba(253,211,96,1);" @click="buy(2)">加入购物车</view>
<view class="button" style="background:rgba(255,120,15,1);" @click="buy(1)">立即购买</view> <view class="button" style="background:rgba(255,120,15,1);" @click="buy(1)">立即购买</view>
</view> </view>
@ -28,10 +28,9 @@
<text>购买数量</text> <text>购买数量</text>
<u-number-box v-model="value" @change="valChange"></u-number-box> <u-number-box v-model="value" @change="valChange"></u-number-box>
</view> </view>
<view style="height:180rpx"></view> <view style="height:100rpx"></view>
</view> </view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</scroll-view> </scroll-view>
</u-popup> </u-popup>
</view> </view>
@ -41,26 +40,29 @@
import guige from "./guige" import guige from "./guige"
export default { export default {
name:"tloos", name:"tloos",
props: ['id','info'], props: ['id', 'info'],
components:{ components:{
guige guige
}, },
data(){ data(){
return { return {
show:false, show: false,
value:1, value: 1,
sel:"", sel: "",
quanxuan:false quanxuan: false
} }
}, },
created() {
this.show = false;
},
methods: { methods: {
buy(type){ buy(type){
let that = this; let that = this;
if(this.show){ if(this.show){
if(this.info.spec_value == null){ if(this.info.spec_value == null){
this.$emit("buy",{type,value:that.value}) this.$emit("buy", { type, value: that.value })
}else if(this.quanxuan){ }else if(this.quanxuan){
this.$emit("buy",{type,value:that.value}) this.$emit("buy", { type, value: that.value })
}else{ }else{
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '请选择规格', title: '请选择规格',
@ -68,7 +70,7 @@ export default {
}) })
} }
}else{ }else{
this.show = true this.show = true;
} }
}, },
@ -87,7 +89,6 @@ export default {
if(sel != 0){ if(sel != 0){
arr.push(sel) arr.push(sel)
} }
} }
// console.log(arr.length) // console.log(arr.length)
if(arr.length == index){ if(arr.length == index){

68
pageB/sdetails/index.vue
View File

@ -26,8 +26,9 @@
<view class="hr"></view> <view class="hr"></view>
<!-- <navs :value="领券"></navs> --> <!-- <navs :value="领券"></navs> -->
<navs :value="'产品规格'"></navs> <navs :value="'产品规格'"></navs>
<navs :value="'产品颜色'"></navs> <!-- <navs :value="'产品颜色'"></navs> -->
<navs :value="'选择尺码'"></navs> <!-- <navs :value="'选择尺码'"></navs> -->
<!-- <navs v-for="(value, index) in goodsInfo.spec_name" :value="value" :key="index"></navs> -->
<view class="hr"></view> <view class="hr"></view>
<view class="group-user" v-if="groupUser.length"> <view class="group-user" v-if="groupUser.length">
<view class="top"> <view class="top">
@ -84,7 +85,7 @@
<view class="name u-line-1">{{ user.member_nickname }}</view> <view class="name u-line-1">{{ user.member_nickname }}</view>
</view> </view>
</view> </view>
<view class="involvement-btn" @click="settlementOrder('involvement')">参与拼团</view> <view class="involvement-btn" @click="settlementOrder({ type: 'involvement' })">参与拼团</view>
<image class="close" src="/static/image/common/17.png" @click="showInvolvementUser=false"></image> <image class="close" src="/static/image/common/17.png" @click="showInvolvementUser=false"></image>
</view> </view>
</u-popup> </u-popup>
@ -119,7 +120,7 @@
</view> </view>
</view> </view>
<!-- 普通商品 tool --> <!-- 普通商品 tool -->
<tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="info" v-if="type==1"></tloos> <tloos @buy="buy" @xuanze="xuanze" :id="goodsInfo.goods_commonid" :info="goodsInfo" v-if="type==1"></tloos>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
</template> </template>
@ -186,7 +187,7 @@ export default {
this.setTitle(); this.setTitle();
}, },
spikeGoods() { spikeGoods() {
this.settlementOrder(3) this.settlementOrder()
}, },
setSpikeTime() { setSpikeTime() {
const time = this.groupbuyInfo.groupbuy_endtime; const time = this.groupbuyInfo.groupbuy_endtime;
@ -210,45 +211,48 @@ export default {
}, 1000) }, 1000)
}, },
buy(info){ buy(info){
if(info.type == 2){ if(info.type == 2){ // 加入购物车
this.$u.api.addCart({ this.$u.api.addCart({
goods_id: this.id, goods_id: this.id,
quantity: info.value, quantity: info.value,
}).then(res => { }).then(res => {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.errCode[1], title: res.message,
type: res.errCode == 0 ? 'success' : 'warning', type: res.errCode == 0 ? 'success' : 'warning',
}) })
}) })
} else if (info.type == 1) { // 支付
this.settlementOrder({num: info.value});
} }
}, },
getGoodsDetails(id) { // getGoodsDetails(id) {
this.id = id; // this.id = id;
this.$u.api.getGoodsDetails({ id: id }).then((res)=>{ // this.$u.api.getGoodsDetails({ id: id }).then((res)=>{
if (res.errCode == 0) { // if (res.errCode == 0) {
this.goodsInfo = res.data.goods; // this.goodsInfo = res.data.goods;
let list = []; // let list = [];
res.data.goods_image[0].forEach(item => { // res.data.goods_image[0].forEach(item => {
let temp = { // let temp = {
image: item // image: item
} // }
list.push(temp); // list.push(temp);
}) // })
this.list = list; // this.list = list;
// console.log(this.goodsInfo.mobile_body); // this.info = res.data.goods;
} // this.glist = res.data.spec_list;
}) // // console.log(this.goodsInfo.mobile_body);
this.$u.api.goodsInfo({id}).then((res)=>{ // }
// console.log(res) // })
this.info = res.data.goods; // },
this.glist = res.data.spec_list; // 下单
}) /*
}, * @params {Number} type 拼团或者开团
settlementOrder(type) { **/
settlementOrder({type, num = 1} = {}) {
// ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀） // ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
let params = { let params = {
ifcart: 0, ifcart: 0,
cart_id: [this.goodsInfo.goods_id + '|' + 1], cart_id: [this.goodsInfo.goods_id + '|' + num],
} }
if(this.type == 2) { if(this.type == 2) {
if(type == 'involvement') { if(type == 'involvement') {
@ -288,7 +292,7 @@ export default {
let title = ''; let title = '';
switch (this.type) { switch (this.type) {
case 1: case 1:
title = '商品详情';
break; break;
case 2: case 2:
title = '拼团商品详情'; title = '拼团商品详情';

109
pageC/cart/ConfirmOrder.vue
View File

@ -33,10 +33,10 @@
</view> </view>
</view> </view>
<view class="order-info"> <view class="order-info">
<view @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderInfo.ifcart != 0"> <view @click="showCoupon({type: 2, store_id: item[0].store_id})" v-if="orderType == 1 || orderType == 5">
<view class="title">优惠券折扣</view> <view class="title">优惠券折扣</view>
<view class="value"> <view class="value">
<view>￥{{ item.coupon_price ? item.coupon_price : '0.00' }}</view> <view>-￥{{ storeCoupon[item[0].store_id] ? storeCoupon[item[0].store_id].voucher_price.toFixed(2) : '0.00' }}</view>
<image src="../static/image/1.png"></image> <image src="../static/image/1.png"></image>
</view> </view>
</view> </view>
@ -50,10 +50,10 @@
</view> </view>
</view> </view>
<view class="common-active"> <view class="common-active">
<view @click="showCoupon({type: 1})" v-if="orderInfo.ifcart != 0"> <view @click="showCoupon({type: 1})" v-if="orderType == 1 || orderType == 5">
<view class="title">平台优惠券</view> <view class="title">平台优惠券</view>
<view class="value"> <view class="value">
<view>-￥{{ choiceCoupon.vouchertemplate_id ? choiceCoupon.voucher_price : '0.00' }}</view> <view>-￥{{ choiceCoupon.vouchertemplate_id ? choiceCoupon.voucher_price.toFixed(2) : '0.00' }}</view>
<image src="../static/image/1.png"></image> <image src="../static/image/1.png"></image>
</view> </view>
</view> </view>
@ -66,11 +66,17 @@
</view> </view>
</view> </view>
<u-popup v-model="couponStatus" mode="bottom"> <u-popup v-model="couponStatus" mode="bottom">
<scroll-view class="coupon-choose" style="height: 800rpx;"> <scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 1">
<view class="title">优惠券详情</view> <view class="title">优惠券详情</view>
<view class="text">使用优惠券</view> <view class="text">店铺优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in couponList" :key="index"></Coupon> <Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_all_list" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!couponList.length"></u-empty> <u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_all_list.length"></u-empty>
</scroll-view>
<scroll-view class="coupon-choose" scroll-y style="height: 800rpx;" v-if="this.couponType.type == 2">
<view class="title">优惠券详情</view>
<view class="text">平台优惠券</view>
<Coupon :couponInfo="coupon" @use="useCoupon($event)" :goodsClass="goodsClass" v-for="(coupon, index) in orderInfo.store_voucher_list[this.couponType.store_id]" :key="index"></Coupon>
<u-empty text="无可用优惠券" mode="coupon" v-if="!orderInfo.store_voucher_list[this.couponType.store_id].length"></u-empty>
</scroll-view> </scroll-view>
</u-popup> </u-popup>
<view class="bottom"> <view class="bottom">
@ -110,9 +116,12 @@ export default {
}, // 配送方式 }, // 配送方式
couponList: [], couponList: [],
couponStatus: false, couponStatus: false,
couponType: {}, // 选择的优惠券
storeCoupon: {}, // 选中的店铺优惠券
choiceCoupon: {}, // 使用的平台优惠券 choiceCoupon: {}, // 使用的平台优惠券
goodsClass: [], goodsClass: [],
orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单 orderType: '', // 订单类型 1 普通订单 2 拼团订单 3 秒杀订单 4 优惠券 5 购物车订单
} }
}, },
components: { components: {
@ -140,6 +149,7 @@ export default {
this.orderInfo = this.$store.state.orderInfo; this.orderInfo = this.$store.state.orderInfo;
console.log(this.orderType); console.log(this.orderType);
console.log(this.orderInfo); console.log(this.orderInfo);
this.getGoodsClass();
}, },
onShow() { onShow() {
// 判断是不是从选择地址页面返回 // 判断是不是从选择地址页面返回
@ -156,7 +166,21 @@ export default {
'$store.state.orderAddress'(value) { '$store.state.orderAddress'(value) {
this.addressInfo = value; this.addressInfo = value;
this.getFreight(); this.getFreight();
} },
// storeCoupon: {
// deep: true,
// handler() {
// console.log(222);
// this.setTotalPrice(); // 计算总价
// }
// },
// choiceCoupon: {
// deep: true,
// handler() {
// console.log(111);
// this.setTotalPrice(); // 计算总价
// }
// },
}, },
methods: { methods: {
// 如果有pintuangroup_headid为参团不然为开团 // 如果有pintuangroup_headid为参团不然为开团
@ -198,16 +222,32 @@ export default {
}) })
} }
} }
// 拼接优惠券
let coupon = [];
for (const key in this.storeCoupon) {
if (this.storeCoupon.hasOwnProperty(key)) {
const element = this.storeCoupon[key];
temp = key + '|' + element.voucher_id;
coupon.push(temp);
temp = '';
}
}
// 平台券store_id写0
if(JSON.stringify(this.choiceCoupon) != '{}') {
coupon.push(0 + '|' + this.choiceCoupon.voucher_id)
}
let params = { let params = {
ifcart: ifcart, ifcart: ifcart,
cart_id: id, cart_id: id,
address_id: this.addressInfo.address_id, address_id: this.addressInfo.address_id,
buy_city_id: this.addressInfo.city_id, buy_city_id: this.addressInfo.city_id,
voucher_id: coupon,
} }
if(this.orderType == 2) { if(this.orderType == 2) {
Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id }) Object.assign(params, { pintuan_id: this.orderInfo.pintuan_id })
if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id }) if(this.orderInfo.pintuangroup_id) Object.assign(params, { pintuangroup_id: this.orderInfo.pintuangroup_id })
} }
// console.log(params);
this.$u.api.sendOrder(params).then(res => { this.$u.api.sendOrder(params).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
this.$u.route({ this.$u.route({
@ -222,36 +262,24 @@ export default {
} }
}) })
}, },
async getCoupon({ type, store_id, status }) { showCoupon({ type, store_id = -1 } = {}) {
const res = await this.$u.api.getMemberCouponList({ this.couponType = {
type: type, type: type,
store_id: store_id, store_id: store_id
status: status,
})
return res;
},
showCoupon({ type, gc_id, store_id }) {
// this.getCoupon({
// type: type, // 优惠券类型: 1平台券, 2店铺券
// store_id: store_id,
// status: 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
// }).then(res => {
// this.couponStatus = true;
// })
let params = {
type: type, // 优惠券类型: 1平台券, 2店铺券
status: 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
} }
if(store_id) Object.assign(params, 'store_id', store_id);
if(gc_id) Object.assign(params, 'gc_id', gc_id);
this.$u.api.getMemberCouponList(params).then(res => {
this.couponList = res.data;
this.couponStatus = true; this.couponStatus = true;
})
}, },
useCoupon(coupon) { useCoupon(coupon) {
this.choiceCoupon = coupon; if(this.couponType.type == 1) this.choiceCoupon = coupon;
if(this.couponType.type == 2) {
Object.assign(this.storeCoupon, {
[this.couponType.store_id]: coupon
})
}
// console.log(this.choiceCoupon);
// console.log(this.storeCoupon);
this.couponStatus = false; this.couponStatus = false;
this.setTotalPrice(); // 计算总价
}, },
getFreight() { getFreight() {
this.$u.api.getFreight({ this.$u.api.getFreight({
@ -267,10 +295,11 @@ export default {
} }
}) })
}, },
setTotalPrice(object) { setTotalPrice() {
const goods = this.orderInfo.store_goods_total; const goods = this.orderInfo.store_goods_total;
const freight = this.freight; const freight = this.freight;
let price = 0; let price = 0;
// 商品价格加上运费
[goods, freight].forEach(object => { [goods, freight].forEach(object => {
for (const key in object) { for (const key in object) {
if (object.hasOwnProperty(key)) { if (object.hasOwnProperty(key)) {
@ -279,6 +308,18 @@ export default {
} }
} }
}) })
// 减去优惠券
// 平台
if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price);
// 店铺
if(JSON.stringify(this.storeCoupon) != '{}') {
for (const key in this.storeCoupon) {
if (this.storeCoupon.hasOwnProperty(key)) {
const element = this.storeCoupon[key];
price -= element.voucher_price;
}
}
}
// console.log(price); // console.log(price);
this.totalPrice = price.toFixed(2); this.totalPrice = price.toFixed(2);
}, },

2
pageC/cart/index.vue
View File

@ -100,7 +100,7 @@ export default {
// ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀） // ifcart 结算方式 1:购物车 0:直接结算（立即购买/拼团/秒杀）
this.$u.api.settlementOrder({ ifcart: 1, cart_id: id }).then(res => { this.$u.api.settlementOrder({ ifcart: 1, cart_id: id }).then(res => {
if(res.errCode == 0) { if(res.errCode == 0) {
this.$store.commit('orderType', 2); this.$store.commit('setOrderType', 5);
this.$store.commit('updateOrderInfo', res.data); this.$store.commit('updateOrderInfo', res.data);
this.$u.route({ this.$u.route({
url: '/pageC/cart/ConfirmOrder' url: '/pageC/cart/ConfirmOrder'

4
pages/shop/index.vue
View File

@ -48,7 +48,7 @@
<image class="lingquan"></image> <image class="lingquan"></image>
<youhq></youhq> <youhq></youhq>
<view class="hr" style="margin-top:40rpx"></view> <view class="hr" style="margin-top:40rpx"></view>
<list v-if="couponGroupList.length" :classifyList="couponGroupList"></list> <list></list>
<view class="cart" @click="toCartPage"> <view class="cart" @click="toCartPage">
<image src="/static/image/common/3.png"></image> <image src="/static/image/common/3.png"></image>
</view> </view>
@ -196,7 +196,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.shop{ .shop{
padding: 0 33rpx; padding: 0 33rpx 100rpx;
.top{ .top{
width: 100%; width: 100%;
height: 88rpx; height: 88rpx;