wxd / MShopWeApp

Commit a880f9f750a05c708e5067dc5a501bc3e3113aa2

Authored by 后端研发-苏明海
2 parents ae653f2f 095e0d0f

Merge branch 'dev' into 'test' 

Dev

See merge request !32
Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
pages/cart/cart2/cart2.js
  View file @a880f9f
... ... @@ -625,7 +625,10 @@ Page({
625 625 }
626 626  
627 627 th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2);
628   - th.data.cartlist[i].coupon_price=coupon_price.toFixed(2);
  628 +
  629 + if (coupon_price>0) th.data.cartlist[i].coupon_price=coupon_price.toFixed(2);
  630 + else th.data.cartlist[i].coupon_price = coupon_price
  631 +
629 632 th.data.cartlist[i].goods_price = o_price.toFixed(2);
630 633 th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money; //会员使用余额
631 634  
... ...
pages/user/order_detail/order_detail.js
  View file @a880f9f
... ... @@ -331,7 +331,7 @@ Page({
331 331 var th=this;
332 332 var order_id=t.currentTarget.dataset.order_id;
333 333 wx.showModal({
334   - title: "是否取消订单？",
  334 + title: "是否删除订单？",
335 335 success: function(tt) {
336 336 t.confirm && rq.put("/api/weshop/order/updatebyId", {
337 337 data: {
... ...
pages/user/order_list/order_list.js
  View file @a880f9f
... ... @@ -252,7 +252,7 @@ Page({
252 252 var th=this;
253 253 var order_id=t.currentTarget.dataset.order_id;
254 254 wx.showModal({
255   - title: "是否取消订单？",
  255 + title: "是否删除订单？",
256 256 success: function(tt) {
257 257 tt.confirm && rq.put("/api/weshop/order/updatebyId", {
258 258 data: {
... ...