Commit 42464d23a2ac94b220603d5fdadde4ad179e9bef
Merge branch 'test' into 'qa'
Test See merge request !33
Showing
3 changed files
with
6 additions
and
3 deletions
pages/cart/cart2/cart2.js
| @@ -625,7 +625,10 @@ Page({ | @@ -625,7 +625,10 @@ Page({ | ||
| 625 | } | 625 | } |
| 626 | 626 | ||
| 627 | th.data.cartlist[i].user_money = parseFloat(th.data.cartlist[i].user_money).toFixed(2); | 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 | th.data.cartlist[i].goods_price = o_price.toFixed(2); | 632 | th.data.cartlist[i].goods_price = o_price.toFixed(2); |
| 630 | th.data.cartlist[i].order_amount= th.data.cartlist[i].order_amount- th.data.cartlist[i].user_money; //会员使用余额 | 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
| @@ -331,7 +331,7 @@ Page({ | @@ -331,7 +331,7 @@ Page({ | ||
| 331 | var th=this; | 331 | var th=this; |
| 332 | var order_id=t.currentTarget.dataset.order_id; | 332 | var order_id=t.currentTarget.dataset.order_id; |
| 333 | wx.showModal({ | 333 | wx.showModal({ |
| 334 | - title: "是否取消订单？", | 334 | + title: "是否删除订单？", |
| 335 | success: function(tt) { | 335 | success: function(tt) { |
| 336 | t.confirm && rq.put("/api/weshop/order/updatebyId", { | 336 | t.confirm && rq.put("/api/weshop/order/updatebyId", { |
| 337 | data: { | 337 | data: { |
pages/user/order_list/order_list.js
| @@ -252,7 +252,7 @@ Page({ | @@ -252,7 +252,7 @@ Page({ | ||
| 252 | var th=this; | 252 | var th=this; |
| 253 | var order_id=t.currentTarget.dataset.order_id; | 253 | var order_id=t.currentTarget.dataset.order_id; |
| 254 | wx.showModal({ | 254 | wx.showModal({ |
| 255 | - title: "是否取消订单？", | 255 | + title: "是否删除订单？", |
| 256 | success: function(tt) { | 256 | success: function(tt) { |
| 257 | tt.confirm && rq.put("/api/weshop/order/updatebyId", { | 257 | tt.confirm && rq.put("/api/weshop/order/updatebyId", { |
| 258 | data: { | 258 | data: { |