diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index e60c1cd..60fdbf9 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -174,7 +174,7 @@ - 保存 + 保存 保存成功即可获得一张{{couponInfo}} 保存成功即可获得一个{{libao}} diff --git a/packageA/pages/profile/profile.wxss b/packageA/pages/profile/profile.wxss index dad2d8e..66821d4 100644 --- a/packageA/pages/profile/profile.wxss +++ b/packageA/pages/profile/profile.wxss @@ -130,6 +130,11 @@ input { margin: 0 auto; } +.confirmtext.gray{ + background-color:darkgrey; +} + + .cmleft { margin-left: 45rpx; } diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index d531bbc..cb54ec2 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -3056,6 +3056,7 @@ Page({ //处理代发商品的拆分 if(df_goods.length>0 && item.order_goods.length>0 ){ var df_item=JSON.parse(JSON.stringify(item)); + item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); @@ -3065,6 +3066,8 @@ Page({ df_item.total_amount=df_price; df_item.shipping_price=0; //没有运费 if(df_item.order_prom_list) df_item.order_prom_list={}; + if(df_item.coupon_price) delete(df_item.coupon_price); + if(df_item.coupon_no) delete(df_item.coupon_no); //看一下是用余额比较多,还是用钱比较多 if(item.order_amount>item.user_money){ diff --git a/utils/util.js b/utils/util.js index 142ce60..867edf8 100644 --- a/utils/util.js +++ b/utils/util.js @@ -685,7 +685,7 @@ module.exports = { if (e.data.code == 0 && e.data.data ) { // 提示框 wx.showModal({ - title: '邀请登陆', + title: '邀请登录', content: e.data.data.vipname+'邀请你登录成为会员?', success: function (res) { if (res.confirm) {