Compare commits

..

6 Commits

5 changed files with 64 additions and 64 deletions

View File

@ -649,7 +649,7 @@ export default {
addCar() { addCar() {
let that = this; let that = this;
this.info.commodity_goods_info_list[this.currentGGIndex].cart_count = { 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) => { // this.info.commodity_goods_info_list.forEach((item) => {
// console.log(item.cart_count); // 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 = { const params = {
goods_id_and_count: [ goods_id_and_count: [
@ -683,7 +683,7 @@ export default {
// 0 // 0
const currentCount = this.info.commodity_goods_info_list[this.currentGGIndex].cart_count?.count; 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 = { const params = {
user_id: uni.getStorageSync("userId"), user_id: uni.getStorageSync("userId"),
@ -691,13 +691,15 @@ export default {
{ {
goods_id: this.info.commodity_goods_info_list[this.currentGGIndex].id, goods_id: this.info.commodity_goods_info_list[this.currentGGIndex].id,
count: newCount, count: newCount,
price: this.changePrice
}, },
], ],
adver_id: this.itemObj.adver_id, adver_id: this.itemObj.adver_id,
}; };
request(apiArr.updateCar, "POST", params).then((res) => { request(apiArr.updateCar, "POST", params).then((res) => {
this.getShopCarList(); return this.getShopCarList();
}).then(() => {
uni.showToast({ uni.showToast({
title: "操作成功!", title: "操作成功!",
success() { }, success() { },

View File

@ -284,6 +284,11 @@ image {
margin-top: 26rpx; margin-top: 26rpx;
} }
.car_right_disabled {
background: #CCCCCC;
color: #FFFFFF;
}
.cars { .cars {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

View File

@ -175,30 +175,22 @@
</view> </view>
<view class="car_right" v-if=" <view class="car_right" v-if="
!info.commodity_goods_info_list[currentGGIndex].cart_count || info.commodity_goods_info_list[currentGGIndex].stock_quantity > 0 &&
info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0 (!info.commodity_goods_info_list[currentGGIndex].cart_count ||
info.commodity_goods_info_list[currentGGIndex].cart_count.count == 0)
" @click="addCar"> " @click="addCar">
加入购物车 加入购物车
</view> </view>
<view class="car_right" v-if="info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0"> <view class="car_right" @click="changeCar" v-if="
<!-- <view class="car_right"> --> info.commodity_goods_info_list[currentGGIndex].cart_count.count > 0
<u-number-box v-model="info.commodity_goods_info_list[currentGGIndex].cart_count.count" && info.commodity_goods_info_list[currentGGIndex].stock_quantity > 0
@change="changeCar" min="0"> ">
<!-- <u-number-box > --> 加入购物车
<view slot="minus" class="minus">
<u-icon name="minus" size="36" bold></u-icon>
</view> </view>
<text slot="input" style="width: 200rpx; text-align: center" class="input">
{{ info.commodity_goods_info_list[currentGGIndex].cart_count.count }} <view class="car_right car_right_disabled" v-if="info.commodity_goods_info_list[currentGGIndex].stock_quantity < 1">
</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> </view>
</view> </view>
@ -576,32 +568,39 @@ export default {
}, },
// //
changeCar(newValue) { changeCar() {
// // // addCar
// this.info.commodity_goods_info_list[this.currentGGIndex].cart_count.count = newValue.value const currentGoods = this.info.commodity_goods_info_list[this.currentGGIndex];
// // const currentQuantity = currentGoods.cart_count ? currentGoods.cart_count.count : 0;
// this.carOrderList.forEach(item => { const stockQuantity = currentGoods.stock_quantity || 0;
// if (item.commodity_goods_info.id == this.info.commodity_goods_info_list[this.currentGGIndex].id) {
// item.count = newValue.value //
// } if (currentQuantity >= stockQuantity) {
// }) uni.showToast({
// // title: "库存不足",
// let carNum = 0 icon: "none",
// this.carOrderList.forEach(item => { duration: 2000
// carNum += item.count });
// }) return;
// this.carNum = carNum }
//
//
currentGoods.cart_count = {
count: currentQuantity + 1,
};
const params = { const params = {
user_id: uni.getStorageSync("userId"), user_id: uni.getStorageSync("userId"),
goods_id_and_count: [{ goods_id_and_count: [{
goods_id: this.info.commodity_goods_info_list[this.currentGGIndex].id, goods_id: currentGoods.id,
count: newValue.value, count: currentGoods.cart_count.count,
},], }],
}; };
request(apiArr.updateCar, "POST", params).then((res) => { request(apiArr.updateCar, "POST", params).then((res) => {
console.log(res); console.log(res);
this.getShopCarList(); this.getShopCarList();
this.getShopCar();
uni.showToast({ uni.showToast({
title: "操作成功!", title: "操作成功!",
success() { }, success() { },

View File

@ -185,7 +185,7 @@ export default {
}, },
// //
getShopCarList() { getShopCarList() {
request(apiArr.getCar, "POST").then((res) => { return request(apiArr.getCar, "POST").then((res) => {
this.value = res.total; this.value = res.total;
// //
this.goodsDetail = [].concat(res.same_day_cart_list || [], res.normal_cart_list || []) this.goodsDetail = [].concat(res.same_day_cart_list || [], res.normal_cart_list || [])
@ -408,7 +408,12 @@ export default {
this.isSearched = false; this.isSearched = false;
}, },
onShow() { onShow() {
this.getShopCarList(); this.getShopCarList().then(() => {
//
setTimeout(() => {
this.syncGoodsQuantities();
}, 100);
});
}, },
onReachBottom() { onReachBottom() {
if (this.flag) { if (this.flag) {

View File

@ -49,7 +49,7 @@
<view class="row"> <view class="row">
<view class="row_label">商家分类</view> <view class="row_label">商家分类</view>
<view class="row_con" @click="chooseClassify"> <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> <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
</view> </view>
</view> </view>
@ -115,7 +115,7 @@
@cancel="cancelCity"></u-picker> @cancel="cancelCity"></u-picker>
<u-picker :show="show3" :columns="[buss]" keyName="short_name" @confirm="clickBuss" <u-picker :show="show3" :columns="[buss]" keyName="short_name" @confirm="clickBuss"
@cancel="cancelBuss"></u-picker> @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> @cancel="cancelClassify"></u-picker>
</view> </view>
</template> </template>
@ -301,7 +301,7 @@ export default {
duration: 2000 duration: 2000
}); });
} }
if (!that.confirmClassify.ad_code) { if (!that.confirmClassify.id) {
return uni.showToast({ return uni.showToast({
title: '请选择商家分类', title: '请选择商家分类',
duration: 2000 duration: 2000
@ -319,7 +319,7 @@ export default {
let license_photo = that.imgList6.join(",") let license_photo = that.imgList6.join(",")
request(apiArr.createStore, "POST", { request(apiArr.createStore, "POST", {
contact_name: that.contact_name, contact_name: that.contact_name,
contact_phone: that.contact_phone, phone: that.contact_phone,
bank_card: that.bank_card, bank_card: that.bank_card,
store_name: that.store_name, store_name: that.store_name,
address: that.address, address: that.address,
@ -327,7 +327,7 @@ export default {
facade_photo, facade_photo,
interior_photo, interior_photo,
license_photo, license_photo,
classify_code: that.confirmClassify.ad_code, merchant_cate_id: that.confirmClassify.id,
}).then(res => { }).then(res => {
that.contact_name = '' that.contact_name = ''
that.contact_phone = '' that.contact_phone = ''
@ -370,20 +370,9 @@ export default {
}) })
}, },
getClassify(e) { getClassify(e) {
this.classify = [ request(apiArr.getMerChantCateList, "POST", {}).then(res => {
{ this.classify = res.rows
ad_code: "1", })
short_name: "111"
},
{
ad_code: "2",
short_name: "222"
},
{
ad_code: "3",
short_name: "333"
},
]
}, },
}, },