Compare commits
7 Commits
36b69c31b1
...
531a6da611
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
531a6da611 | ||
|
|
3719becda3 | ||
|
|
50a3660621 | ||
|
|
6033edcd50 | ||
|
|
83b6a1a0c6 | ||
|
|
91f1748ba8 | ||
|
|
da61b6ca53 |
@ -460,11 +460,11 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
//获取购物车数量
|
//获取购物车数量
|
||||||
getShopCar() {
|
// getShopCar() {
|
||||||
request(apiArr.getCarCount, "POST", {}).then((res) => {
|
// request(apiArr.getCarCount, "POST", {}).then((res) => {
|
||||||
this.prevCarNum = res.total;
|
// this.prevCarNum = res.total;
|
||||||
});
|
// });
|
||||||
},
|
// },
|
||||||
|
|
||||||
getShopCarList() {
|
getShopCarList() {
|
||||||
return request(apiArr.getCar, "POST", {}).then((res) => {
|
return request(apiArr.getCar, "POST", {}).then((res) => {
|
||||||
@ -472,6 +472,7 @@ export default {
|
|||||||
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
||||||
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
||||||
this.carNum = res.total;
|
this.carNum = res.total;
|
||||||
|
this.prevCarNum = res.total;
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -510,7 +511,7 @@ export default {
|
|||||||
|
|
||||||
//因为是当前商品没有 调用update就是增加商品。增加商品之后再获取购物车数量
|
//因为是当前商品没有 调用update就是增加商品。增加商品之后再获取购物车数量
|
||||||
request(apiArr.updateCar, "POST", params).then((res) => {
|
request(apiArr.updateCar, "POST", params).then((res) => {
|
||||||
that.getShopCar();
|
// that.getShopCar();
|
||||||
that.getShopCarList();
|
that.getShopCarList();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -548,7 +549,7 @@ export default {
|
|||||||
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();
|
// this.getShopCar();
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: "操作成功!",
|
title: "操作成功!",
|
||||||
success() { },
|
success() { },
|
||||||
@ -598,7 +599,7 @@ export default {
|
|||||||
onShow() {
|
onShow() {
|
||||||
this.getShopCarList().then(() => {
|
this.getShopCarList().then(() => {
|
||||||
this.getGoodsInfo();
|
this.getGoodsInfo();
|
||||||
this.getShopCar();
|
// this.getShopCar();
|
||||||
this.getComment();
|
this.getComment();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@ -515,11 +515,11 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
//获取购物车数量
|
//获取购物车数量
|
||||||
getShopCar() {
|
// getShopCar() {
|
||||||
request(apiArr.getCarCount, "POST", {}).then((res) => {
|
// request(apiArr.getCarCount, "POST", {}).then((res) => {
|
||||||
this.prevCarNum = res.total;
|
// this.prevCarNum = res.total;
|
||||||
});
|
// });
|
||||||
},
|
// },
|
||||||
|
|
||||||
getShopCarList() {
|
getShopCarList() {
|
||||||
return request(apiArr.getCar, "POST", {}).then((res) => {
|
return request(apiArr.getCar, "POST", {}).then((res) => {
|
||||||
@ -527,6 +527,7 @@ export default {
|
|||||||
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
||||||
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
||||||
this.carNum = res.total;
|
this.carNum = res.total;
|
||||||
|
this.prevCarNum = res.total;
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -565,7 +566,7 @@ export default {
|
|||||||
|
|
||||||
//因为是当前商品没有 调用update就是增加商品。增加商品之后再获取购物车数量
|
//因为是当前商品没有 调用update就是增加商品。增加商品之后再获取购物车数量
|
||||||
request(apiArr.updateCar, "POST", params).then((res) => {
|
request(apiArr.updateCar, "POST", params).then((res) => {
|
||||||
that.getShopCar();
|
// that.getShopCar();
|
||||||
that.getShopCarList();
|
that.getShopCarList();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -603,7 +604,7 @@ export default {
|
|||||||
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();
|
// this.getShopCar();
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: "操作成功!",
|
title: "操作成功!",
|
||||||
success() { },
|
success() { },
|
||||||
@ -660,7 +661,7 @@ export default {
|
|||||||
onShow() {
|
onShow() {
|
||||||
this.getShopCarList().then(() => {
|
this.getShopCarList().then(() => {
|
||||||
this.getGoodsInfo();
|
this.getGoodsInfo();
|
||||||
this.getShopCar();
|
// this.getShopCar();
|
||||||
this.getComment();
|
this.getComment();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@ -155,7 +155,8 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
const params = {
|
const params = {
|
||||||
user_id: uni.getStorageSync('userId')
|
user_id: uni.getStorageSync('userId'),
|
||||||
|
community_id: uni.getStorageSync('changeCommData') ? uni.getStorageSync('changeCommData').id : ''
|
||||||
}
|
}
|
||||||
return request(apiArr.groupBuyList, 'POST', params).then(res => {
|
return request(apiArr.groupBuyList, 'POST', params).then(res => {
|
||||||
const list = res.group_buy_list.map(item => {
|
const list = res.group_buy_list.map(item => {
|
||||||
|
|||||||
@ -64,7 +64,8 @@
|
|||||||
{{ currentGG.goods_name }}
|
{{ currentGG.goods_name }}
|
||||||
</view>
|
</view>
|
||||||
<view class="Msg">{{ currentGG.commodity_brief }}</view>
|
<view class="Msg">{{ currentGG.commodity_brief }}</view>
|
||||||
<view class="num">已售{{ soldOutNum }} | 剩余{{ currentGG.total_stock }}</view>
|
<view class="num">已售{{ soldOutNum }}</view>
|
||||||
|
<!-- | 剩余{{ currentGG.total_stock }} -->
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 规格 -->
|
<!-- 规格 -->
|
||||||
@ -104,7 +105,7 @@
|
|||||||
<view class="fenge"></view>
|
<view class="fenge"></view>
|
||||||
|
|
||||||
<!-- 已购买区域 -->
|
<!-- 已购买区域 -->
|
||||||
<view>
|
<!-- <view>
|
||||||
<view class="purchase-area">
|
<view class="purchase-area">
|
||||||
<view class="purchase-count">{{ totalCount }}人已购买</view>
|
<view class="purchase-count">{{ totalCount }}人已购买</view>
|
||||||
<view class="view-more" @click="showPurchaseRecords">查看更多 ></view>
|
<view class="view-more" @click="showPurchaseRecords">查看更多 ></view>
|
||||||
@ -123,7 +124,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
|
|
||||||
<view class="fenge"></view>
|
<view class="fenge"></view>
|
||||||
|
|
||||||
@ -173,7 +174,6 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="cars" @click="car">
|
<view class="cars" @click="car">
|
||||||
<u-badge numberType="limit" :type="type" max="99" :value="carNum"></u-badge>
|
<u-badge numberType="limit" :type="type" max="99" :value="carNum"></u-badge>
|
||||||
|
|
||||||
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car.png"
|
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_car.png"
|
||||||
mode="widthFix"></image>
|
mode="widthFix"></image>
|
||||||
购物车
|
购物车
|
||||||
@ -433,7 +433,9 @@
|
|||||||
<view class="welfare-container">
|
<view class="welfare-container">
|
||||||
<view class="welfare-header">
|
<view class="welfare-header">
|
||||||
<view class="welfare-title">
|
<view class="welfare-title">
|
||||||
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/groupPurchase/welfare.png"></image>
|
<image
|
||||||
|
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/groupPurchase/welfare.png">
|
||||||
|
</image>
|
||||||
下单福利
|
下单福利
|
||||||
</view>
|
</view>
|
||||||
<view class="welfare-action">已获得</view>
|
<view class="welfare-action">已获得</view>
|
||||||
@ -467,7 +469,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="welfare-item welfare-item-beans">
|
<view class="welfare-item welfare-item-beans">
|
||||||
<view class="welfare-item-top">
|
<view class="welfare-item-top">
|
||||||
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_jin.png" mode="aspectFit"/>
|
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/activity_jin.png" mode="aspectFit" />
|
||||||
<view>石榴金</view>
|
<view>石榴金</view>
|
||||||
</view>
|
</view>
|
||||||
<view>
|
<view>
|
||||||
@ -489,15 +491,13 @@
|
|||||||
<view class="share-buttons">
|
<view class="share-buttons">
|
||||||
<button class="share-btn-wechat" open-type="share" bindtap="onShareButtonClick" />
|
<button class="share-btn-wechat" open-type="share" bindtap="onShareButtonClick" />
|
||||||
<view class="share-item">
|
<view class="share-item">
|
||||||
<image
|
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
|
||||||
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
|
|
||||||
mode="aspectFill"></image>
|
mode="aspectFill"></image>
|
||||||
微信好友
|
微信好友
|
||||||
</view>
|
</view>
|
||||||
<button class="share-btn-miniprogram" open-type="share" bindtap="onShareButtonClick" />
|
<button class="share-btn-miniprogram" open-type="share" bindtap="onShareButtonClick" />
|
||||||
<view class="share-item" @click="shareFriend">
|
<view class="share-item" @click="shareFriend">
|
||||||
<image
|
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
|
||||||
src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/shop_WX.png"
|
|
||||||
mode="aspectFill"></image>
|
mode="aspectFill"></image>
|
||||||
小程序链接
|
小程序链接
|
||||||
</view>
|
</view>
|
||||||
@ -509,6 +509,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -1087,12 +1088,12 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
//获取购物车数量
|
//获取购物车数量
|
||||||
getShopCar() {
|
// getShopCar() {
|
||||||
request(apiArr.getCarCount, "POST", {}).then((res) => {
|
// request(apiArr.getCarCount, "POST", {}).then((res) => {
|
||||||
this.carNum = res.total;
|
// this.carNum = res.total;
|
||||||
this.prevCarNum = res.total;
|
// this.prevCarNum = res.total;
|
||||||
});
|
// });
|
||||||
},
|
// },
|
||||||
|
|
||||||
getShopCarList() {
|
getShopCarList() {
|
||||||
const params = {
|
const params = {
|
||||||
@ -1102,6 +1103,7 @@ export default {
|
|||||||
// 合并当日达和普通商品数据
|
// 合并当日达和普通商品数据
|
||||||
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
|
||||||
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
.flatMap(supplier => supplier.commodity_cart_and_goods_model);
|
||||||
|
this.carNum = res.total;
|
||||||
return res;
|
return res;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -1132,7 +1134,7 @@ export default {
|
|||||||
group_buy_id: this.info.commodity_goods_info_list[this.currentGGIndex].group_buy_activity_id,
|
group_buy_id: this.info.commodity_goods_info_list[this.currentGGIndex].group_buy_activity_id,
|
||||||
}
|
}
|
||||||
request(apiArr.updateCar, "POST", params).then((res) => {
|
request(apiArr.updateCar, "POST", params).then((res) => {
|
||||||
that.getShopCar();
|
// that.getShopCar();
|
||||||
that.getShopCarList();
|
that.getShopCarList();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -1161,7 +1163,7 @@ export default {
|
|||||||
title: "操作成功!",
|
title: "操作成功!",
|
||||||
success() { },
|
success() { },
|
||||||
});
|
});
|
||||||
this.getShopCar();
|
// this.getShopCar();
|
||||||
this.getGoodsInfo();
|
this.getGoodsInfo();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@ -1191,6 +1193,7 @@ export default {
|
|||||||
this.showSeckill = false;
|
this.showSeckill = false;
|
||||||
uni.removeStorageSync('changeZTAddress')
|
uni.removeStorageSync('changeZTAddress')
|
||||||
this.defZTAddress = {}
|
this.defZTAddress = {}
|
||||||
|
this.changeCount = 0
|
||||||
},
|
},
|
||||||
|
|
||||||
editAddress() {
|
editAddress() {
|
||||||
@ -1279,7 +1282,7 @@ export default {
|
|||||||
this.getShopCarList().then(() => {
|
this.getShopCarList().then(() => {
|
||||||
this.getGoodsInfo();
|
this.getGoodsInfo();
|
||||||
});
|
});
|
||||||
this.getShopCar();
|
// this.getShopCar();
|
||||||
this.getZTAddress()
|
this.getZTAddress()
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@ -142,11 +142,11 @@
|
|||||||
</u-grid>
|
</u-grid>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="customer" @click="headerCustomerClick">
|
<!-- <view class="customer" @click="headerCustomerClick">
|
||||||
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector16.png"
|
<image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Vector16.png"
|
||||||
mode="" />
|
mode="" />
|
||||||
<view>客服</view>
|
<view>客服</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view style="padding-top: 174rpx;"></view>
|
<view style="padding-top: 174rpx;"></view>
|
||||||
<nav-footer :current="4" />
|
<nav-footer :current="4" />
|
||||||
</view>
|
</view>
|
||||||
@ -183,7 +183,7 @@ export default {
|
|||||||
{
|
{
|
||||||
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1563.png",
|
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1563.png",
|
||||||
name: "收货地址",
|
name: "收货地址",
|
||||||
url: "",
|
url: "/packages/shop/address/index",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1564.png",
|
image: "https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/page_user_Group_1564.png",
|
||||||
@ -468,12 +468,12 @@ export default {
|
|||||||
uni.setStorageSync('work_order_permission', community_worker && community_worker[0].work_order_permission == 1 || false);
|
uni.setStorageSync('work_order_permission', community_worker && community_worker[0].work_order_permission == 1 || false);
|
||||||
uni.setStorageSync('phone', res.account);
|
uni.setStorageSync('phone', res.account);
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
uni.showToast({
|
// uni.showToast({
|
||||||
title: '刷新成功',
|
// title: '刷新成功',
|
||||||
icon: 'success',
|
// icon: 'success',
|
||||||
mask: true,
|
// mask: true,
|
||||||
duration: 2000,
|
// duration: 2000,
|
||||||
})
|
// })
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user