Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents 891080d8 0e0c2148
Showing 2 changed files with 34 additions and 2 deletions
packageE/pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
@@ -3885,7 +3885,7 @@ Page({
     var coupon_price = quan_price; //优惠券优惠了多少钱
     if (order_m < 0) {
       order_m = 0;
-      coupon_price = parseFloat(order_m).toFixed(2);
+      coupon_price = parseFloat(allpice - cut_price).toFixed(2);
     }
     //--看一下有没有订单优惠--
     var o_condition = parseFloat(order_m);
@@ -5325,6 +5325,25 @@ Page({
               th.setData({
                 submit: 0,
               })
+              if(data.code==-2){
+
+
+                //-- 如果是购物车结算，还要删除购物车 --
+                if (th.data.is_b_now == 0) {
+                  console.log(th.data.cartlist_y);
+                  var list =JSON.parse(JSON.stringify(th.data.cartlist_y));
+                  for (var i = 0; i < list.length; i++) {
+                    //删除购物车
+                    a.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {});
+                  }
+                }
+
+                setTimeout(()=>{
+                   getApp().re_to('/pages/user/order_list/order_list')
+                },1300)
+
+              }
+
             }
@@ -272,6 +272,7 @@ Page({
         sec_i: -1, //选中分类门店 下标
         cx_prom_group: [], //促销活动，用于显示和判断默认要用什么促销活动
         showFold:true,
+        new_share_imgurl:'', //普通商品分享图片
       },
       //------初始化加载----------
@@ -2926,8 +2927,12 @@ Page({
               price = th.data.prom_act.price;
             }
+            
             var title = th.data.sele_g.goods_name;
             var img = th.data.sele_g.original_img;
+            if(th.data.new_share_imgurl){
+              img = th.data.iurl + th.data.new_share_imgurl
+            }
             if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) {
               title = th.data.prom_act.share_title;
               if (!title) title = th.data.prom_act.title;
@@ -3035,7 +3040,11 @@ Page({
                 if (e.data.code == 0) arrdata = e.data.data.pageData;
               })
               if (!arrdata) return false;
-
+              if(arrdata[0]){
+                tt.setData({
+                  new_share_imgurl:arrdata[0].share_imgurl
+                })
+              }
               var arrsku = new Array();
               var gitem = null;
               var gb = 1,
@@ -6650,6 +6659,9 @@ Page({
                         if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) {
                           img_url = this.data.iurl + this.data.prom_act.share_imgurl;
                         }
+                        if (this.data.new_share_imgurl) {
+                          img_url=this.data.iurl + this.data.new_share_imgurl
+                        }
                         //获取商品是分享图信息
                         wx.getImageInfo({
@@ -7894,6 +7906,7 @@ Page({
                             },
                             send() {
+                              
                               this.setData({
                                 share_hidden: false,
                               });