Compare commits
6 Commits
414ea79463
...
884b7e5b38
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
884b7e5b38 | ||
|
|
a139ec38c9 | ||
|
|
56e0d60f34 | ||
|
|
042ce47b28 | ||
|
|
681c577a00 | ||
|
|
6bfda4993e |
@ -649,7 +649,7 @@ export default {
|
||||
addCar() {
|
||||
let that = this;
|
||||
this.info.commodity_goods_info_list[this.currentGGIndex].cart_count = {
|
||||
count: 1,
|
||||
count: this.itemObj.one_one === 1 ? 2 : 1,
|
||||
};
|
||||
// this.info.commodity_goods_info_list.forEach((item) => {
|
||||
// console.log(item.cart_count);
|
||||
@ -659,7 +659,7 @@ export default {
|
||||
// });
|
||||
// });
|
||||
|
||||
let countVal = 1
|
||||
let countVal = this.itemObj.one_one === 1 ? 2 : 1;
|
||||
|
||||
const params = {
|
||||
goods_id_and_count: [
|
||||
@ -683,7 +683,7 @@ export default {
|
||||
// 获取当前商品的购物车数量,如果不存在则设为0
|
||||
const currentCount = this.info.commodity_goods_info_list[this.currentGGIndex].cart_count?.count;
|
||||
// 新的数量为当前数量加一
|
||||
const newCount = currentCount + 1;
|
||||
const newCount = this.itemObj.one_one === 1 ? currentCount + 2 : currentCount + 1;
|
||||
|
||||
const params = {
|
||||
user_id: uni.getStorageSync("userId"),
|
||||
@ -691,13 +691,15 @@ export default {
|
||||
{
|
||||
goods_id: this.info.commodity_goods_info_list[this.currentGGIndex].id,
|
||||
count: newCount,
|
||||
price: this.changePrice
|
||||
},
|
||||
],
|
||||
adver_id: this.itemObj.adver_id,
|
||||
};
|
||||
|
||||
request(apiArr.updateCar, "POST", params).then((res) => {
|
||||
this.getShopCarList();
|
||||
return this.getShopCarList();
|
||||
}).then(() => {
|
||||
uni.showToast({
|
||||
title: "操作成功!",
|
||||
success() { },
|
||||
|
||||
@ -284,6 +284,11 @@ image {
|
||||
margin-top: 26rpx;
|
||||
}
|
||||
|
||||
.car_right_disabled {
|
||||
background: #CCCCCC;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
|
||||
.cars {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@ -175,30 +175,22 @@
|
||||
</view>
|
||||
|
||||
<view class="car_right" v-if="
|
||||
!info.commodity_goods_info_list[currentGGIndex].cart_count ||
|
||||
info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0
|
||||
info.commodity_goods_info_list[currentGGIndex].stock_quantity > 0 &&
|
||||
(!info.commodity_goods_info_list[currentGGIndex].cart_count ||
|
||||
info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0)
|
||||
" @click="addCar">
|
||||
加入购物车
|
||||
</view>
|
||||
|
||||
<view class="car_right" v-if="info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0">
|
||||
<!-- <view class="car_right"> -->
|
||||
<u-number-box v-model="info.commodity_goods_info_list[currentGGIndex].cart_count.count"
|
||||
@change="changeCar" min="0">
|
||||
<!-- <u-number-box > -->
|
||||
<view slot="minus" class="minus">
|
||||
<u-icon name="minus" size="36" bold></u-icon>
|
||||
</view>
|
||||
<text slot="input" style="width: 200rpx; text-align: center" class="input">
|
||||
{{ info.commodity_goods_info_list[currentGGIndex].cart_count.count }}
|
||||
</text>
|
||||
<!-- text slot="input" style="width: 200rpx; text-align: center" class="input">
|
||||
{{info.commodity_goods_info_list[currentGGIndex]}}
|
||||
</text> -->
|
||||
<view slot="plus" class="plus">
|
||||
<u-icon name="plus" color="#FFFFFF" size="36" bold></u-icon>
|
||||
</view>
|
||||
</u-number-box>
|
||||
<view class="car_right" @click="changeCar" v-if="
|
||||
info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0
|
||||
&& info.commodity_goods_info_list[currentGGIndex].stock_quantity > 0
|
||||
">
|
||||
加入购物车
|
||||
</view>
|
||||
|
||||
<view class="car_right car_right_disabled" v-if="info.commodity_goods_info_list[currentGGIndex].stock_quantity < 1">
|
||||
已售罄
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -576,32 +568,39 @@ export default {
|
||||
},
|
||||
|
||||
// 购物车更改
|
||||
changeCar(newValue) {
|
||||
// // 修改当前商品在购物车中的数量
|
||||
// this.info.commodity_goods_info_list[this.currentGGIndex].cart_count.count = newValue.value
|
||||
// // 修改购物车列表中的数量
|
||||
// this.carOrderList.forEach(item => {
|
||||
// if (item.commodity_goods_info.id == this.info.commodity_goods_info_list[this.currentGGIndex].id) {
|
||||
// item.count = newValue.value
|
||||
// }
|
||||
// })
|
||||
// // 计算购物车数量
|
||||
// let carNum = 0
|
||||
// this.carOrderList.forEach(item => {
|
||||
// carNum += item.count
|
||||
// })
|
||||
// this.carNum = carNum
|
||||
//商品数量变化
|
||||
changeCar() {
|
||||
// 直接增加商品数量,与addCar逻辑类似
|
||||
const currentGoods = this.info.commodity_goods_info_list[this.currentGGIndex];
|
||||
const currentQuantity = currentGoods.cart_count ? currentGoods.cart_count.count : 0;
|
||||
const stockQuantity = currentGoods.stock_quantity || 0;
|
||||
|
||||
// 检查库存是否充足
|
||||
if (currentQuantity >= stockQuantity) {
|
||||
uni.showToast({
|
||||
title: "库存不足",
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 增加商品数量
|
||||
currentGoods.cart_count = {
|
||||
count: currentQuantity + 1,
|
||||
};
|
||||
|
||||
const params = {
|
||||
user_id: uni.getStorageSync("userId"),
|
||||
goods_id_and_count: [{
|
||||
goods_id: this.info.commodity_goods_info_list[this.currentGGIndex].id,
|
||||
count: newValue.value,
|
||||
},],
|
||||
goods_id: currentGoods.id,
|
||||
count: currentGoods.cart_count.count,
|
||||
}],
|
||||
};
|
||||
|
||||
request(apiArr.updateCar, "POST", params).then((res) => {
|
||||
console.log(res);
|
||||
this.getShopCarList();
|
||||
this.getShopCar();
|
||||
uni.showToast({
|
||||
title: "操作成功!",
|
||||
success() { },
|
||||
|
||||
@ -185,7 +185,7 @@ export default {
|
||||
},
|
||||
// 获取购物车数据
|
||||
getShopCarList() {
|
||||
request(apiArr.getCar, "POST").then((res) => {
|
||||
return request(apiArr.getCar, "POST").then((res) => {
|
||||
this.value = res.total;
|
||||
// 合并当日达和普通商品数据
|
||||
this.goodsDetail = [].concat(res.same_day_cart_list || [], res.normal_cart_list || [])
|
||||
@ -408,7 +408,12 @@ export default {
|
||||
this.isSearched = false;
|
||||
},
|
||||
onShow() {
|
||||
this.getShopCarList();
|
||||
this.getShopCarList().then(() => {
|
||||
// 延迟一小段时间确保购物车数据已完全更新,然后同步商品数量
|
||||
setTimeout(() => {
|
||||
this.syncGoodsQuantities();
|
||||
}, 100);
|
||||
});
|
||||
},
|
||||
onReachBottom() {
|
||||
if (this.flag) {
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
<view class="row">
|
||||
<view class="row_label">商家分类</view>
|
||||
<view class="row_con" @click="chooseClassify">
|
||||
<input type="text" disabled v-model="confirmClassify.short_name" placeholder="请选择商家分类">
|
||||
<input type="text" disabled v-model="confirmClassify.cate_name" placeholder="请选择商家分类">
|
||||
<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
@ -115,7 +115,7 @@
|
||||
@cancel="cancelCity"></u-picker>
|
||||
<u-picker :show="show3" :columns="[buss]" keyName="short_name" @confirm="clickBuss"
|
||||
@cancel="cancelBuss"></u-picker>
|
||||
<u-picker :show="show4" :columns="[classify]" keyName="short_name" @confirm="clickClassify"
|
||||
<u-picker :show="show4" :columns="[classify]" keyName="cate_name" @confirm="clickClassify"
|
||||
@cancel="cancelClassify"></u-picker>
|
||||
</view>
|
||||
</template>
|
||||
@ -301,7 +301,7 @@ export default {
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
if (!that.confirmClassify.ad_code) {
|
||||
if (!that.confirmClassify.id) {
|
||||
return uni.showToast({
|
||||
title: '请选择商家分类',
|
||||
duration: 2000
|
||||
@ -319,7 +319,7 @@ export default {
|
||||
let license_photo = that.imgList6.join(",")
|
||||
request(apiArr.createStore, "POST", {
|
||||
contact_name: that.contact_name,
|
||||
contact_phone: that.contact_phone,
|
||||
phone: that.contact_phone,
|
||||
bank_card: that.bank_card,
|
||||
store_name: that.store_name,
|
||||
address: that.address,
|
||||
@ -327,7 +327,7 @@ export default {
|
||||
facade_photo,
|
||||
interior_photo,
|
||||
license_photo,
|
||||
classify_code: that.confirmClassify.ad_code,
|
||||
merchant_cate_id: that.confirmClassify.id,
|
||||
}).then(res => {
|
||||
that.contact_name = ''
|
||||
that.contact_phone = ''
|
||||
@ -370,20 +370,9 @@ export default {
|
||||
})
|
||||
},
|
||||
getClassify(e) {
|
||||
this.classify = [
|
||||
{
|
||||
ad_code: "1",
|
||||
short_name: "111"
|
||||
},
|
||||
{
|
||||
ad_code: "2",
|
||||
short_name: "222"
|
||||
},
|
||||
{
|
||||
ad_code: "3",
|
||||
short_name: "333"
|
||||
},
|
||||
]
|
||||
request(apiArr.getMerChantCateList, "POST", {}).then(res => {
|
||||
this.classify = res.rows
|
||||
})
|
||||
},
|
||||
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user