From a48a93e9b8cfac65fb05ddead13ac86f7263ab39 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 28 Sep 2019 15:15:31 +0800
Subject: [PATCH] 加入购物车的优化，评价商品的名称，数量不正确的优化

---
 pages/goods/goodsInfo/goodsInfo.js        | 12 ++++++++----
 pages/user/add_comment/add_comment.js     | 18 ++++++++++--------
 pages/user/add_comment/add_comment.wxml   |  2 +-
 pages/user/comment/comment.js             |  5 ++---
 pages/user/order_detail/order_detail.wxml |  6 ++++++
 pages/user/order_list/order_list.wxml     |  6 +++---
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 76078f8..5605525 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -768,13 +768,15 @@ Page({
               var updata = {
                 id: item.id,
                 goods_num: e.data.goodsInputNum + item.goods_num,
-                goods_price: newd.shop_price,
+                goods_price: newd.goods_price,
               };
 
               i.put("/api/weshop/cart/update", {
                 data: updata,
                 success: function(t) {
                    getApp().my_warnning('加入购物车成功', 1, th,450);
+                   var c_num = th.data.cartGoodsNum + th.data.goodsInputNum;
+                   th.setData({cartGoodsNum:c_num});
                    th.closeSpecModal();
                 }
               });
@@ -783,6 +785,8 @@ Page({
                 data: newd,
                 success: function(t) {
                    getApp().my_warnning('加入购物车成功', 1, th,450);
+                   var c_num=th.data.cartGoodsNum+e.data.goodsInputNum;
+                   th.setData({cartGoodsNum:c_num});
                    th.closeSpecModal();
                 }
               });
@@ -2874,9 +2878,9 @@ close_popup:function(e){
         success:function(res){
          
           if (res.data.code==0){
-            if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0});
-            s.showWarning("设置门店地址成功", null, 500, !1);
-            getApp().globalData.pk_store = item;
+             if (th.data.choice_sort_store == 0) th.setData({fir_pick_index:0});
+             s.showWarning("设置门店地址成功", null, 500, !1);
+             getApp().globalData.pk_store = item;
           }else{
             console.log("门店地址失败");
             s.showWarning("设置默认门店地址失败", null, 500, !1);
diff --git a/pages/user/add_comment/add_comment.js b/pages/user/add_comment/add_comment.js
index 31fd533..ba233b8 100644
--- a/pages/user/add_comment/add_comment.js
+++ b/pages/user/add_comment/add_comment.js
@@ -24,18 +24,16 @@ Page({
   },
   onLoad: async function (a) {
     var th = this;
+    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 => {
 
-    await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + a.goods_id, { 1: 1 }).then(res => {
-      a.img = th.data.iurl + res.data.data.original_img
+      a.img = th.data.iurl + res.data.data.pageData[0].original_img;
+      a.goods_name=res.data.data.pageData[0].goods_name;
+      a.goods_num=res.data.data.pageData[0].goods_num;
     })
-
-
     this.setData({ options: a });
     t.getUserInfo(function (e) {
       console.log(e);
-      th.setData({
-        userinfo: e
-      })
+      th.setData({userinfo: e})
     })
   },
   keyUpChangeNum: function (t) {
@@ -209,7 +207,11 @@ Page({
     this.setData({
       content: e.detail.value
     })
-  }
+  },
+
+  onUnload: function () {
+    wx.navigateBack({ delta:1 })
+  },
 
   
 });
\ No newline at end of file
diff --git a/pages/user/add_comment/add_comment.wxml b/pages/user/add_comment/add_comment.wxml
index 7a48950..554921f 100644
--- a/pages/user/add_comment/add_comment.wxml
+++ b/pages/user/add_comment/add_comment.wxml
@@ -18,7 +18,7 @@
           <!-- 商品数量 -->
           <view class='sum flex-vertical balin xc-black'>
             <view class="fs24">x</view>
-            <view class="fs28">1</view>
+            <view class="fs28">{{options.goods_num}}</view>
           </view>
 
         </view>
diff --git a/pages/user/comment/comment.js b/pages/user/comment/comment.js
index 1c9e378..476d974 100644
--- a/pages/user/comment/comment.js
+++ b/pages/user/comment/comment.js
@@ -121,9 +121,8 @@ Page({
   comment: function(t) {
     for (var e = t.currentTarget.dataset.recid, a = this.data.comments, s = 0; s < a.length && a[s].rec_id != e; s++);
     if (!(s >= a.length)) {
-      var n = "?order_id=" + a[s].order_id;
-      n += "&goods_id=" + a[s].goods_id, n += "&goods_name=" + a[s].goods_name, n += "&price=" + a[s].goods_price,
-        n += "&img=" + a[s].original_img,
+        var n = "?order_id=" + a[s].order_id;
+        n += "&goods_id=" + a[s].goods_id, n += "&price=" + a[s].goods_price;
         wx.navigateTo({
           url: "/pages/user/add_comment/add_comment" + n
         });
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 37be71c..1804ef1 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -117,5 +117,11 @@
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
         <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
+        <block wx:if="{{order.order_status==2}}">
+            <navigator wx:if="{{order.order_goods.length>1}}"  class="tips-btn"
+                       url="/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator>
+            <navigator wx:else  class="tips-btn"
+                       url="/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">评价</navigator>
+        </block>
     </view>
 </view>
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 7d8d543..7fd9a41 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -86,10 +86,10 @@
                     <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>
                     <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>
 
-                     <navigator wx:if="{{item.order_goods.length>1}}" redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}"
+                     <navigator wx:if="{{item.order_goods.length>1}}"  class="order-btn white red-b"
                                 url="/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价</navigator>
-                     <navigator wx:else  redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}"
-                                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>
+                     <navigator wx:else  class="order-btn white red-b"
+                                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>
 
 
                     <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>
--
libgit2 0.21.4