|
@@ -352,24 +352,6 @@
|
|
|
// 判断是否全选
|
|
|
this.isAllChecked()
|
|
|
},
|
|
|
- // 清空购物车
|
|
|
- clearAll(){
|
|
|
- const _this = this
|
|
|
- uni.showModal({
|
|
|
- title: '提示',
|
|
|
- content: '确定清空购物车?',
|
|
|
- confirmText: '确定',
|
|
|
- success(res) {
|
|
|
- if(res.confirm){
|
|
|
- uni.showLoading({
|
|
|
- title: '正在清空...',
|
|
|
- mask: true
|
|
|
- })
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
// 全选
|
|
|
chooseAll(){
|
|
|
if(this.allDisabled){
|
|
@@ -515,6 +497,21 @@
|
|
|
const delSn = cartSn.filter(item => successList.find(k => k.productSn == item.productSn)).map(item => item.cartSn)
|
|
|
const removeList = res.data.removeList.map(item => item.productCode)
|
|
|
const selloutList = res.data.selloutList.map(item => item.productCode)
|
|
|
+ const promoChangeFlag = res.data.promoChangeFlag
|
|
|
+ // 活动变更
|
|
|
+ if(promoChangeFlag){
|
|
|
+ uni.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: '促销活动已变更,请刷新?',
|
|
|
+ confirmText:'确定刷新',
|
|
|
+ success(ret) {
|
|
|
+ if(ret.confirm){
|
|
|
+ _this.pageInit()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return
|
|
|
+ }
|
|
|
console.log(successList,delSn)
|
|
|
console.log(removeList,selloutList)
|
|
|
// 有已下架或已售罄产品提示
|
|
@@ -768,7 +765,8 @@
|
|
|
color: #666;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
- margin-top: 2px;
|
|
|
+ flex-wrap: wrap;
|
|
|
+ justify-content: flex-end;
|
|
|
text{
|
|
|
margin-right: 5px;
|
|
|
}
|
|
@@ -799,6 +797,8 @@
|
|
|
.btns{
|
|
|
border-radius: 100rpx;
|
|
|
height: 36px;
|
|
|
+ padding: 0 10px;
|
|
|
+ min-width: 80px;
|
|
|
}
|
|
|
}
|
|
|
}
|