Commit 7a7d1c960fc096c970ceac1c3f43c3203b0d6814

Authored by yvan.ni
1 parent 59789d37

1. 购物车赠品图片显示

2.   再进入购物车的时候,要把赠品清理掉
3.   在选择的时候也要先清理赠品
Showing 1 changed file with 16 additions and 4 deletions
pages/cart/cart/cart.js
... ... @@ -153,7 +153,17 @@ Page({
153 153 if(carr && carr.length>0) {
154 154 for (var i = 0; i < carr.length; i++) {
155 155 var item = carr[i];
156   - var good = null;
  156 + var good = null;
  157 + if(item.is_gift){
  158 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  159 + getApp().request.delete(url, {
  160 + success: function (t) {
  161 + }
  162 + });
  163 + //商品已经下架
  164 + continue;
  165 + }
  166 +
157 167 await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + item.goods_id, {}).then(res => {
158 168 good = res.data.data;
159 169 })
... ... @@ -177,6 +187,7 @@ Page({
177 187 //商品已经下架
178 188 continue;
179 189 }
  190 +
180 191 //如果秒杀活动都去掉了,或者结束了,那么这个商品也没有必要留着
181 192 if (item.prom_type == 1) {
182 193 var prom = null;
... ... @@ -1209,9 +1220,9 @@ Page({
1209 1220 }
1210 1221 }
1211 1222 if(item.is_gift==1){
1212   - //var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
  1223 + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
1213 1224 //getApp().request.delete(url, {});
1214   - //await getApp().request.promiseDelete(url, {}) // 要用同步让赠品删除
  1225 + await getApp().request.promiseDelete(url, {}) // 要用同步让赠品删除
1215 1226 list.goods.splice(i--,1);
1216 1227 }
1217 1228 }
... ... @@ -1290,7 +1301,8 @@ Page({
1290 1301 prom_id:p_item[0],
1291 1302 prom_type:3,
1292 1303 selected:1,
1293   - gift_id:discount.gift_id
  1304 + gift_id:discount.gift_id,
  1305 + original_img:th.data.imgUrl+o.original_img
1294 1306 };
1295 1307  
1296 1308  
... ...