Skip to content

M
mallapp
Commit 2edaff60 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

parents ee9fdc4b 55af7fd5
Show whitespace changes
Inline Side-by-side
Showing with 87 additions and 130 deletions
pages/cart/cart.vue
View file @ 2edaff60
......@@ -8,120 +8,94 @@
padding: 0 15rpx;
">
<Text class="grid-text" v-if='IsEducation!=1'>商品库存有限，请尽快下单哦</Text>
<Text class="grid-text"
v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text class="grid-text" v-if='IsEducation==1'>共{{list[0].GoodsList.length?list[0].GoodsList.length:'0'}}个课程</Text>
<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
</view>
<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>
<u-empty v-if="emptyshow == true" text="购物车还是空的哦" mode="car"></u-empty>
<view v-if="list.length > 0"
style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
<view v-if="list.length > 0" style="height: calc(100vh - 60px-30px-35px-20px);width: calc(100vw);overflow: hidden;padding-top: 10px;">
<scroll-view :scroll-y="true" :enable-back-to-top="true" :enable-flex="true" :style="{ height: '100%' }">
<template v-if="list.length > 0 && emptyshow==false">
<view class="cartList" :style="{ 'margin-bottom': listbottom }" v-for="(c, i) in list" :key="i">
<view @click.stop="abc()"
style=" padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5; width: 100%;">
<view @click.stop="abc()" style=" padding: 0 12px 12px 12px; border-bottom: 1rpx solid #f5f5f5; width: 100%;">
<u-checkbox-group @change="mch_SelectAll(c.checked, i)">
<u-checkbox v-model="c.checked" shape="circle" :active-color="mc">{{ c.MallName }}
</u-checkbox>
</u-checkbox-group>
</view>
<view :class=" u.TenantId!=27?'cartList_item':'cartList_item2'"
v-for="(item, index) in c.GoodsList" :key="index" @click="btnclick(item,index,i)">
<view @click.stop="abc()" style="width: 40px;text-align: center;"
v-if="(item.GoodsStatus == 1 && item.InventoryNum!=0 && IsEducation!=1) || (editType == true&& IsEducation!=1)">
<view :class=" u.TenantId!=27?'cartList_item':'cartList_item2'" v-for="(item, index) in c.GoodsList" :key="index"
@click="btnclick(item,index,i)">
<view @click.stop="abc()" style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && item.InventoryNum!=0 && IsEducation!=1) || (editType == true&& IsEducation!=1)">
<u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)">
<u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
</u-checkbox-group>
</view>
<view @click.stop="abc()" style="width: 40px;text-align: center;"
v-if="(item.GoodsStatus == 1 && IsEducation==1) || (editType == true && IsEducation==1)">
<view @click.stop="abc()" style="width: 40px;text-align: center;" v-if="(item.GoodsStatus == 1 && IsEducation==1) || (editType == true && IsEducation==1)">
<u-checkbox-group @change="clickcheckbox(item.checked, item.Price, index, i)">
<u-checkbox v-model="item.checked" shape="circle" :active-color="mc"></u-checkbox>
</u-checkbox-group>
</view>
<view class="invalid" :style="{ background: mc }"
v-if="item.GoodsStatus != 1 && editType == false">
<view class="invalid" :style="{ background: mc }" v-if="item.GoodsStatus != 1 && editType == false">
<Text style="color: #fff; width: 22px;font-size: 20rpx;">失效</Text>
</view>
<view class="invalid" :style="{ background: mc }"
v-if="item.InventoryNum == 0 && editType == false && IsEducation!=1">
<view class="invalid" :style="{ background: mc }" v-if="item.InventoryNum == 0 && editType == false && IsEducation!=1">
<Text style="color: #fff; width: 22px;font-size: 20rpx;">售馨</Text>
</view>
<!-- 布局修改 -->
<view class="cent-box">
<image :src="item.CoverImage" v-if='IsEducation!=1' mode="aspectFill"
style="width: 150rpx;height: 150rpx;margin-left: 30rpx;border-radius: 5px;"
<image :src="item.CoverImage" v-if='IsEducation!=1' mode="aspectFill" style="width: 150rpx;height: 150rpx;margin-left: 30rpx;border-radius: 5px;"
@click.native.stop="clickHandler(item.GoodsId)" />
<image :src="item.CoverImage" v-if='IsEducation==1' mode="aspectFill"
style="width: 116px;height: 64px;margin-left: 30rpx;border-radius: 5px;box-shadow:0 4px 10px 1px #D2D2D2;"
<image :src="item.CoverImage" v-if='IsEducation==1' mode="aspectFill" style="width: 116px;height: 64px;margin-left: 30rpx;border-radius: 5px;box-shadow:0 4px 10px 1px #D2D2D2;"
@click.native.stop="clickHandler2(item.GoodsId)" />
<view :class="u.TenantId!=27?'item-r':'item-r2' "
:style="{'width':IsEducation!=1?'440rpx':item_r,'height':IsEducation!=1&&u.TenantId!=27?'150rpx':u.TenantId==27?'auto':'65px', }">
<view :class="u.TenantId!=27?'item-r':'item-r2' " :style="{'width':IsEducation!=1?'440rpx':item_r,'height':IsEducation!=1&&u.TenantId!=27?'150rpx':u.TenantId==27?'auto':'65px', }">
<view :class="IsEducation!=1?'item-r-n':'item-r-n2'">
<view
v-if="item.MarketingLogo.iswords && item.MarketingLogo.iswords==1&& item.MarketingLogo.words!=''"
class="Logo"
<view v-if="item.MarketingLogo.iswords && item.MarketingLogo.iswords==1&& item.MarketingLogo.words!=''" class="Logo"
:style="{color: item.MarketingLogo.wordsColor,background:item.MarketingLogo.wordsBack ,}">
{{item.MarketingLogo.words}}
</view>
<image
v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
mode="heightFix" :src="item.MarketingLogo.ico"
style=" height: 12px;margin-right: 5px" />
<image v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''" mode="heightFix"
:src="item.MarketingLogo.ico" style=" height: 12px;margin-right: 5px" />
{{ item.GoodsName}}
</view>
<view
style="width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
v-if="IsEducation!=1">
<Text v-for="(attr, inde2x) in item.SpecificationList" :key="inde2x"
style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
<view style="width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" v-if="IsEducation!=1">
<Text v-for="(attr, inde2x) in item.SpecificationList" :key="inde2x" style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
{{ attr}}
</Text>
</view>
<view
style="max-width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;"
@click.native.stop="goUrl(item.FreeShippingUrl)"
v-if="item.FreeShippingName !=null&&IsEducation!=1 && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)">
<view
style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<view style="max-width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-top: 2px;"
@click.native.stop="goUrl(item.FreeShippingUrl)" v-if="item.FreeShippingName !=null&&IsEducation!=1 && (item.FreeShippingFullMoneyPinkage>0 || item.FreeShippingFullNumPinkage>0)">
<view style="color: #FF4048;background: #fdf6ec;padding: 0 5px;display: inline-block;">
<Text style="font-size: 20rpx;margin-right: 5rpx;">
{{item.FreeShippingName !=null ?item.FreeShippingName+':':''}}
<text
v-if="item.FreeShippingFullMoneyPinkage==0 && item.FreeShippingFullNumPinkage>0">{{item.FreeShippingFullNumPinkage}}件包邮</text>
<text
v-if="item.FreeShippingFullMoneyPinkage>0 && item.FreeShippingFullNumPinkage==0">满{{item.FreeShippingFullMoneyPinkage}}元包邮</text>
<text v-if="item.FreeShippingFullMoneyPinkage==0 && item.FreeShippingFullNumPinkage>0">{{item.FreeShippingFullNumPinkage}}件包邮</text>
<text v-if="item.FreeShippingFullMoneyPinkage>0 && item.FreeShippingFullNumPinkage==0">满{{item.FreeShippingFullMoneyPinkage}}元包邮</text>
</Text>
</view>
</view>
<!-- 新增上课时间 -->
<Text v-if='u.TenantId==27&&item.EduData.ClassTime'
style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
<Text v-if='u.TenantId==27&&item.EduData.ClassTime' style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
上课时间:{{item.EduData.ClassTime}}
</Text>
<!-- 课程数量 -->
<Text v-if='u.TenantId==27&&item.EduData.ClassNum'
style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
<Text v-if='u.TenantId==27&&item.EduData.ClassNum' style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
课程数量:{{item.EduData.ClassNum}}次
</Text>
<view @click.stop="abc()"
style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<view @click.stop="abc()" style="display: flex;flex-direction: row;align-items: center;justify-content: space-between;">
<Text style="font-size: 30rpx;" :style="{ color: pricecolor }">
￥<Text style="40rpx">{{ item.Price }}</Text>
</Text>
<u-number-box v-if='IsEducation!=1&&u.TenantId!=27' v-model="item.Number"
:min="1" :max="item.InventoryNum"
<u-number-box v-if='IsEducation!=1&&u.TenantId!=27' v-model="item.Number" :min="1" :max="item.InventoryNum"
@change="valChange(i, index, item.Number, item.Price, $event)">
</u-number-box>
</view>
<!-- 新增绑定物品 -->
<view v-if='u.TenantId==27' v-for="(attr2, inde4x) in item.GoodsRelevanceList" :key="inde4x" >
<view v-if='u.TenantId==27' v-for="(attr2, inde4x) in item.GoodsRelevanceList" :key="inde4x">
<Text v-if='attr2.RelevanceName' style="color: #a0a09d;font-size: 20rpx;margin-right: 5rpx;">
已选物品:{{attr2.RelevanceName}}
</Text>
......@@ -130,18 +104,12 @@
</view>
</view>
<!-- 新增绑定物品 -->
<Text v-if="item.GoodsStatus != 1 && editType == false&&IsEducation!=1"
style="font-size: 20rpx;color:#a0a09d ;">失效原因：商品下架或者库存不足</Text>
<Text v-if="item.GoodsStatus != 1 && editType == false&&IsEducation==1"
style="font-size: 20rpx;color:#a0a09d ;">失效原因：课程下架</Text>
<Text v-if="item.GoodsStatus != 1 && editType == false&&IsEducation!=1" style="font-size: 20rpx;color:#a0a09d ;">失效原因：商品下架或者库存不足</Text>
<Text v-if="item.GoodsStatus != 1 && editType == false&&IsEducation==1" style="font-size: 20rpx;color:#a0a09d ;">失效原因：课程下架</Text>
</view>
</view>
<!-- 布局修改 -->
</view>
</view>
</template>
......@@ -152,8 +120,7 @@
<u-checkbox-group @change="SelectAll">
<u-checkbox v-model="allchecked" shape="circle" :active-color="mc">全选</u-checkbox>
</u-checkbox-group>
<Text style="font-size: 30rpx;" :style="{ color: pricecolor }"
v-if="editType == false">￥{{ TotalPrice }}</Text>
<Text style="font-size: 30rpx;" :style="{ color: pricecolor }" v-if="editType == false">￥{{ TotalPrice }}</Text>
</div>
<div class="bottom_btn" v-if="!editType">
<u-button size="80" :ripple="true" shape="circle" @click="settlement" :custom-style="{
......@@ -177,13 +144,11 @@
</view>
<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
<tabbars></tabbars>
</div>
</template>
<script>
import tabbars from '@/components/tabbar/index';
import auth from "@/components/auth/index.vue";
export default {
data() {
return {
......@@ -199,7 +164,6 @@
listbottom: 0,
editType: false,
list: [],
cart_id_list: [],
mc: '',
pricecolor: '',
......@@ -247,7 +211,6 @@
this.init();
this.TotalPrice = 0;
this.checkCount = 0;
}
},
mounted() {
......@@ -266,8 +229,6 @@
uni.setNavigationBarTitle({
title: this.pageTitle
});
},
methods: {
reloadUserinfo() {
......@@ -305,7 +266,6 @@
list.forEach(x => {
x.checked = false;
x.GoodsList.forEach(j => {
j.MarketingLogo = JSON.parse(j.MarketingLogo)
j.checked = false;
j.id = j.Id;
......@@ -321,11 +281,9 @@
this.list = [];
}
}
uni.hideNavigationBarLoading();
}
);
},
btnclick(item, index, i) { //点击最外层做的事
if ((item.GoodsStatus == 1 && item.InventoryNum != 0 && this.IsEducation != 1) || (this.editType ==
......@@ -338,19 +296,13 @@
this.clickcheckbox(item.checked, item.Price, index, i)
}
},
//单项点击
clickcheckbox(checked, price, index, i) {
// (item.checked, item.Price, index, i)
if (checked == true) {
this.checkCount += 1;
this.TotalPrice += parseFloat((price * this.list[i].GoodsList[index].Number).toFixed(2));
let goods_list_all = true; //判断该商场是否全选
this.list[i].GoodsList.forEach(x => {
if (this.editType == true) {
//编辑的时候不判断
// if (x.checked == false && x.new_status == 0) {
// goods_list_all = false;
// }
if (x.checked == false) {
goods_list_all = false;
}
......@@ -380,7 +332,6 @@
this.cart_id_list.push(obj);
}
} else {
this.TotalPrice -= parseFloat((price * this.list[i].GoodsList[index].Number).toFixed(2));
this.checkCount -= 1;
this.allchecked = false;
let goods_list_all = true; //判断该商场是否全选
......@@ -400,24 +351,19 @@
});
}
}
this.TotalPrice = parseFloat(this.TotalPrice.toFixed(2));
this.calcSumPrice();
},
mch_SelectAll(checked, i) {
console.log(checked, 'checked')
if (checked == true) {
let add_cartlist = [];
let new_statusnum = 0;
this.list[i].GoodsList.forEach(x => {
if (x.GoodsStatus == 1 && x.InventoryNum > 0) {
if (x.checked == false) {
this.TotalPrice += parseFloat((x.Price * x.Number).toFixed(2));
x.checked = true;
new_statusnum++;
}
}
//编辑时候的商城全选
if (this.editType == true) {
if (this.cart_id_list.length > 0) {
......@@ -455,7 +401,6 @@
this.list[i].GoodsList.forEach(x => {
if (x.GoodsStatus == 1) {
if (x.checked == true) {
this.TotalPrice -= parseFloat((x.Price * x.Number).toFixed(2));
new_statusnum++;
x.checked = false;
}
......@@ -470,23 +415,20 @@
this.allchecked = false;
this.checkCount -= new_statusnum;
}
this.TotalPrice = parseFloat(this.TotalPrice.toFixed(2));
this.calcSumPrice();
},
SelectAll() {
let list = this.list;
if (this.allchecked == true) {
this.checkCount = 0;
this.TotalPrice = 0;
this.cart_id_list = [];
list.forEach(x => {
this.list.forEach(x => {
x.checked = true;
x.GoodsList.forEach(j => {
if (j.GoodsStatus == 1 && j.InventoryNum > 0) {
j.checked = true;
this.checkCount++;
this.TotalPrice += parseFloat((j.Price * j.Number).toFixed(2));
}
//编辑的时候
if (this.editType == true) {
this.cart_id_list.push({
......@@ -500,33 +442,46 @@
this.checkCount = 0;
this.TotalPrice = 0;
this.cart_id_list = [];
list.forEach(x => {
this.list.forEach(x => {
x.checked = false;
x.GoodsList.forEach(j => {
j.checked = false;
});
});
}
this.TotalPrice = parseFloat(this.TotalPrice.toFixed(2));
this.calcSumPrice();
},
valChange(i, index, Number, p, e) {
// (i, index, item.Number, item.Price, $event)
let value = parseFloat(e.value);
let price = parseFloat(p);
if (Number > value) {
this.list[i].GoodsList[index].Number = value;
if (this.list[i].GoodsList[index].checked == true) {
this.TotalPrice -= parseFloat((price * (Number - value)).toFixed(2));
}
if (this.list[i].GoodsList[index].checked == true) {}
} else if (value > Number) {
this.list[i].GoodsList[index].Number = value;
if (this.list[i].GoodsList[index].checked == true) {
this.TotalPrice += parseFloat((price * (value - Number)).toFixed(2));
if (this.list[i].GoodsList[index].checked == true) {}
}
this.calcSumPrice();
},
//计算总价格
calcSumPrice() {
let tempPrice = 0;
this.TotalPrice = 0;
this.list.forEach(x => {
x.GoodsList.forEach(j => {
if (j.checked) {
tempPrice += parseFloat(j.Price * j.Number);
//是否有捆绑商品
if (j.GoodsRelevanceList && j.GoodsRelevanceList.length > 0) {
j.GoodsRelevanceList.forEach(qitem => {
tempPrice += parseFloat(qitem.RelevancePrice);
})
}
}
this.TotalPrice = parseFloat(this.TotalPrice.toFixed(2));
});
});
this.TotalPrice = parseFloat(tempPrice.toFixed(2));
},
edit() {
this.editType = !this.editType;
this.allchecked = false;
......@@ -562,12 +517,9 @@
this.allchecked = false;
this.checkCount = 0;
}
uni.hideNavigationBarLoading();
}
);
} else {
uni.showToast({
title: '请选择需要删除的商品',
......@@ -583,7 +535,6 @@
let forms = {};
this.list.forEach(y => {
let good = {
// MallId: y.MallId,
DetailList: [],
Use_Integral: 0,
User_Coupon_Id: 0,
......@@ -592,20 +543,16 @@
};
y.GoodsList.forEach(x => {
if (x.checked) {
console.log("x", x)
ShoppingCartIdList.push(x.Id)
let g = {
GoodsId: x.GoodsId,
Number: x.Number,
SpecificationSort: x.SpecificationSort,
};
good.DetailList.push(g);
}
});
forms = good;
console.log("forms", forms)
});
if (this.IsEducation != 1) {
uni.navigateTo({
......@@ -620,7 +567,6 @@
.stringify(ShoppingCartIdList)
});
}
} else {
uni.showToast({
title: '请选择购买商品',
......@@ -641,7 +587,6 @@
});
},
goUrl(url) {
console.log(url)
uni.navigateTo({
url: url
});
......@@ -649,7 +594,6 @@
abc() { //阻止change的事件冒泡
},
}
};
</script>
......
pages/order-submit/order-submit.vue
View file @ 2edaff60
......@@ -615,6 +615,7 @@
this.payInfo.GoodsName = this.mchs[0].goods_list[0].name.slice(0, 10);
this.formdata.DeliveryMethod = this.mchs[0].delivery.send_type;
this.ds = res.data;
console.log("this.ds ",this.ds )
this.expressPrice = 0.0;
this.goodPrice = 0.0;
this.couponPrice = 0.0;
......@@ -644,7 +645,6 @@
);
},
formatPrice() {
console.log("this.mchs", this.mchs);
if (this.mchs) {
this.mchs.forEach(x => {
x.delivery.showDelivery = false;
......@@ -655,7 +655,21 @@
}
});
}
this.goodPrice += parseFloat(x.total_goods_price);
//绑定商品价格 HK 2022-10-11新增 判断是否有绑定商品
let tempRelevancePrice = 0;
if (x.goods_list && x.goods_list.length > 0) {
x.goods_list.forEach(rootItem => {
if (rootItem.GoodsRelevanceList && rootItem.GoodsRelevanceList.length > 0) {
rootItem.GoodsRelevanceList.forEach(qitem => {
tempRelevancePrice += parseFloat(qitem.RelevancePrice);
console.log("tempRelevancePrice1", tempRelevancePrice)
})
}
})
}
console.log("tempRelevancePrice2", tempRelevancePrice)
//HK 2022-10-11 新增结束
this.goodPrice += parseFloat(x.total_goods_price) + parseFloat(tempRelevancePrice);
this.expressPrice += parseFloat(x.express_price);
this.couponPrice += parseFloat(x.coupon.coupon_discount || 0.0);
this.cashPrice += parseFloat(x.deposit.deposit_price || 0.0);
......@@ -698,7 +712,6 @@
button[disabled] {
color: rgba(0, 0, 0, .3) !important;
background-color: #f7f7f7 !important;
}
.ordersubmit {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment