Commit a48a93e9b8cfac65fb05ddead13ac86f7263ab39

Authored by yvan.ni
1 parent 503804a6

加入购物车的优化,评价商品的名称,数量不正确的优化

pages/goods/goodsInfo/goodsInfo.js
@@ -768,13 +768,15 @@ Page({ @@ -768,13 +768,15 @@ Page({
768 var updata = { 768 var updata = {
769 id: item.id, 769 id: item.id,
770 goods_num: e.data.goodsInputNum + item.goods_num, 770 goods_num: e.data.goodsInputNum + item.goods_num,
771 - goods_price: newd.shop_price, 771 + goods_price: newd.goods_price,
772 }; 772 };
773 773
774 i.put("/api/weshop/cart/update", { 774 i.put("/api/weshop/cart/update", {
775 data: updata, 775 data: updata,
776 success: function(t) { 776 success: function(t) {
777 getApp().my_warnning('加入购物车成功', 1, th,450); 777 getApp().my_warnning('加入购物车成功', 1, th,450);
  778 + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
  779 + th.setData({cartGoodsNum:c_num});
778 th.closeSpecModal(); 780 th.closeSpecModal();
779 } 781 }
780 }); 782 });
@@ -783,6 +785,8 @@ Page({ @@ -783,6 +785,8 @@ Page({
783 data: newd, 785 data: newd,
784 success: function(t) { 786 success: function(t) {
785 getApp().my_warnning('加入购物车成功', 1, th,450); 787 getApp().my_warnning('加入购物车成功', 1, th,450);
  788 + var c_num=th.data.cartGoodsNum+e.data.goodsInputNum;
  789 + th.setData({cartGoodsNum:c_num});
786 th.closeSpecModal(); 790 th.closeSpecModal();
787 } 791 }
788 }); 792 });
@@ -2874,9 +2878,9 @@ close_popup:function(e){ @@ -2874,9 +2878,9 @@ close_popup:function(e){
2874 success:function(res){ 2878 success:function(res){
2875 2879
2876 if (res.data.code==0){ 2880 if (res.data.code==0){
2877 - if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0});  
2878 - s.showWarning("设置门店地址成功", null, 500, !1);  
2879 - getApp().globalData.pk_store = item; 2881 + if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0});
  2882 + s.showWarning("设置门店地址成功", null, 500, !1);
  2883 + getApp().globalData.pk_store = item;
2880 }else{ 2884 }else{
2881 console.log("门店地址失败"); 2885 console.log("门店地址失败");
2882 s.showWarning("设置默认门店地址失败", null, 500, !1); 2886 s.showWarning("设置默认门店地址失败", null, 500, !1);
pages/user/add_comment/add_comment.js
@@ -24,18 +24,16 @@ Page({ @@ -24,18 +24,16 @@ Page({
24 }, 24 },
25 onLoad: async function (a) { 25 onLoad: async function (a) {
26 var th = this; 26 var th = this;
  27 + await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { data:{store_id:os.stoid,goods_id:a.goods_id, order_id:a.order_id}}).then(res => {
27 28
28 - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + a.goods_id, { 1: 1 }).then(res => {  
29 - a.img = th.data.iurl + res.data.data.original_img 29 + a.img = th.data.iurl + res.data.data.pageData[0].original_img;
  30 + a.goods_name=res.data.data.pageData[0].goods_name;
  31 + a.goods_num=res.data.data.pageData[0].goods_num;
30 }) 32 })
31 -  
32 -  
33 this.setData({ options: a }); 33 this.setData({ options: a });
34 t.getUserInfo(function (e) { 34 t.getUserInfo(function (e) {
35 console.log(e); 35 console.log(e);
36 - th.setData({  
37 - userinfo: e  
38 - }) 36 + th.setData({userinfo: e})
39 }) 37 })
40 }, 38 },
41 keyUpChangeNum: function (t) { 39 keyUpChangeNum: function (t) {
@@ -209,7 +207,11 @@ Page({ @@ -209,7 +207,11 @@ Page({
209 this.setData({ 207 this.setData({
210 content: e.detail.value 208 content: e.detail.value
211 }) 209 })
212 - } 210 + },
  211 +
  212 + onUnload: function () {
  213 + wx.navigateBack({ delta:1 })
  214 + },
213 215
214 216
215 }); 217 });
216 \ No newline at end of file 218 \ No newline at end of file
pages/user/add_comment/add_comment.wxml
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <!-- 商品数量 --> 18 <!-- 商品数量 -->
19 <view class='sum flex-vertical balin xc-black'> 19 <view class='sum flex-vertical balin xc-black'>
20 <view class="fs24">x</view> 20 <view class="fs24">x</view>
21 - <view class="fs28">1</view> 21 + <view class="fs28">{{options.goods_num}}</view>
22 </view> 22 </view>
23 23
24 </view> 24 </view>
pages/user/comment/comment.js
@@ -121,9 +121,8 @@ Page({ @@ -121,9 +121,8 @@ Page({
121 comment: function(t) { 121 comment: function(t) {
122 for (var e = t.currentTarget.dataset.recid, a = this.data.comments, s = 0; s < a.length && a[s].rec_id != e; s++); 122 for (var e = t.currentTarget.dataset.recid, a = this.data.comments, s = 0; s < a.length && a[s].rec_id != e; s++);
123 if (!(s >= a.length)) { 123 if (!(s >= a.length)) {
124 - var n = "?order_id=" + a[s].order_id;  
125 - n += "&goods_id=" + a[s].goods_id, n += "&goods_name=" + a[s].goods_name, n += "&price=" + a[s].goods_price,  
126 - n += "&img=" + a[s].original_img, 124 + var n = "?order_id=" + a[s].order_id;
  125 + n += "&goods_id=" + a[s].goods_id, n += "&price=" + a[s].goods_price;
127 wx.navigateTo({ 126 wx.navigateTo({
128 url: "/pages/user/add_comment/add_comment" + n 127 url: "/pages/user/add_comment/add_comment" + n
129 }); 128 });
pages/user/order_detail/order_detail.wxml
@@ -117,5 +117,11 @@ @@ -117,5 +117,11 @@
117 <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view> 117 <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
118 <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator> 118 <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
119 <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> 119 <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
  120 + <block wx:if="{{order.order_status==2}}">
  121 + <navigator wx:if="{{order.order_goods.length>1}}" class="tips-btn"
  122 + url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
  123 + <navigator wx:else class="tips-btn"
  124 + url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">评价</navigator>
  125 + </block>
120 </view> 126 </view>
121 </view> 127 </view>
pages/user/order_list/order_list.wxml
@@ -86,10 +86,10 @@ @@ -86,10 +86,10 @@
86 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view> 86 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
87 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view> 87 <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}" class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
88 88
89 - <navigator wx:if="{{item.order_goods.length>1}}" redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" 89 + <navigator wx:if="{{item.order_goods.length>1}}" class="order-btn white red-b"
90 url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator> 90 url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
91 - <navigator wx:else redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}"  
92 - url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].goods_price}}">评价</navigator> 91 + <navigator wx:else class="order-btn white red-b"
  92 + url="/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价</navigator>
93 93
94 94
95 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator> 95 <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>