From 5cb4378e81c2f1e5854090e2586fa8d296c08224 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 26 Sep 2019 19:51:21 +0800
Subject: [PATCH] 商品详情，收藏

---
 pages/goods/goodsInfo/goodsInfo.js        |  47 +++++++++++++++++++++++------------------------
 pages/user/collect_list/collect_list.js   | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------
 pages/user/collect_list/collect_list.wxml |  73 +++++++++++++++++++++++++++----------------------------------------------
 pages/user/collect_list/collect_list.wxss |  19 ++++++++++---------
 4 files changed, 154 insertions(+), 150 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index d565aaf..79a85d6 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -2787,23 +2787,8 @@ close_popup:function(e){
   //确定def_pick为选择的门店
   sure_pick:function (e) {
       var th=this; var item=null;
-    var openindstore = e.currentTarget.dataset.openindstore;
-    if (openindstore == 1) {
-   
-      th.setData({
-        openSpecModal: !0,
-        openSpecModal_ind: openindstore, });
-    } else if (openindstore == 2) {
-    
-      th.setData({
-        openSpecModal: !0,
-        openSpecModal_ind: openindstore, });
-    } else {
-    
-      th.setData({
-        store: 0, choice_sort_store: 0, sort_store: 0
-      })
-    }
+      var openindstore = e.currentTarget.dataset.openindstore;
+
       if(th.data.choice_sort_store==0 ){
            var index=th.data.fir_pick_index;
           if(th.data.is_show_sto_cat==1){
@@ -2811,13 +2796,31 @@ close_popup:function(e){
           }else{
              item=th.data.only_pk[index];  //当没有门店分类的时候
           }
+
       }else{
          var index=th.data.sec_pick_index;
          item=th.data.sec_sto.s_arr[index];
       }
-    console.log("选择门店刷新","def_pick_store",item);
-     th.setData({def_pick_store:item,sto_sele_name:item.pickup_name,
-      sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0});
+
+      //th.setData({fir_pick_index:0});
+      console.log("选择门店刷新","def_pick_store",item);
+      th.setData({def_pick_store:item,sto_sele_name:item.pickup_name,
+      sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0, fir_pick_index:0});
+
+      if (openindstore == 1) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore, });
+      } else if (openindstore == 2) {
+        th.setData({
+          openSpecModal: !0,
+          openSpecModal_ind: openindstore, });
+      } else {
+        th.setData({
+          store: 0, choice_sort_store: 0, sort_store: 0
+        })
+      }
+
   },
   //---点击二级之后的选择---
   choose_for_store: function (e) {
@@ -2834,18 +2837,14 @@ close_popup:function(e){
         var index=th.data.fir_pick_index;
        
         if(th.data.is_show_sto_cat==1){
-        
           item=th.data.def_pickpu_list[index];
-         
         }else{
-        
           item=th.data.only_pk[index];  //当没有门店分类的时候
         
         }
       }else{
         var index=th.data.sec_pick_index;
         item=th.data.sec_sto.s_arr[index];
-      
       }
     
     var store_id=o.stoid;
diff --git a/pages/user/collect_list/collect_list.js b/pages/user/collect_list/collect_list.js
index 61b7b0f..0cc324b 100644
--- a/pages/user/collect_list/collect_list.js
+++ b/pages/user/collect_list/collect_list.js
@@ -17,48 +17,57 @@ Page({
     collects: null,
     currentPage: 1,
     curpage: 1,
-
     ismore: 0,
     iscollects: 0,
-
     editEd: 0, //商品编辑按钮是否点击
     isall: false, //是否全选
     sum: 0,
-    total_collects:0,
-    is_goods:0,
-    pageSize:8,//分页数量
+    total_collects: 0,
+    is_goods: 0,
+    pageSize: 8, //分页数量
+    isdelete: 0
   },
   onLoad: function() {
     o.init(this, "", "collects"),
-     this.requestCollectList();
-     // this.requestList();
+      this.requestCollectList();
   },
   requestCollectList: function() {
     var th = this;
-    e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize +"&user_id=" +
+    e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize + "&user_id=" +
       app_d.user_id + "&store_id=" + oo.stoid + "&page=" + th.data.currentPage;
-      o.request(e, function(e) {
-         th.data.currentPage++;
-         if(th.data.total_collects==0){
-            th.setData({ iscollects: 1, total_collects:e.data.data.total})
-         }
-         if (th.data.total_collects<th.data.pageSize){
-           var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-           goods_list.get_list();
-         }
+    o.request(e, function(e) {
+      th.data.currentPage++;
+      if (th.data.total_collects == 0) {
+        th.setData({
+          iscollects: 1,
+          total_collects: e.data.data.total
+        })
+      }
+      if (th.data.total_collects < th.data.pageSize) {
+
+        th.setData({
+          is_goods: 1
+        })
+        var goods_list = th.selectComponent("#goods_recommend"); //组件的id
+        goods_list.get_list();
+
+
+      }
     });
   },
 
   //--到底部刷新---
   onReachBottom: function() {
-    if ((this.data.currentPage-1)*this.data.pageSize<this.data.total_collects){
+    if ((this.data.currentPage - 1) * this.data.pageSize < this.data.total_collects) {
       this.requestCollectList();
-    }else{
-      if(this.data.is_goods==0) this.setData({is_goods:1});
+    } else {
+      if (this.data.is_goods == 0) this.setData({
+        is_goods: 1
+      });
       var goods_list = this.selectComponent("#goods_recommend"); //组件的id
       goods_list.get_list();
     }
-       
+
   },
 
   //--取消收藏---
@@ -81,7 +90,7 @@ Page({
       }
   },
   //图片失败，默认图片
-  bind_bnerr: function (e) {
+  bind_bnerr: function(e) {
     var _errImg = e.currentTarget.dataset.errimg;
     var _errObj = {};
     _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
@@ -121,7 +130,6 @@ Page({
 
 
   goto: function(ee) {
-    // e.goto("/pages/index/index/index");
     wx.switchTab({
       url: '/pages/index/index/index',
     })
@@ -134,6 +142,7 @@ Page({
       t.select_checked(false, null)
       t.setData({
         editEd: 1,
+       isall:0
       })
     } else {
       t.select_checked(false, null)
@@ -168,95 +177,109 @@ Page({
   //全选为收藏商品checked为true
   allClick: function() {
     var th = this;
-    var list=th.data.collects;
+    var list = th.data.collects;
     //判断是否全选
     if (th.data.isall) {
-      for (var i = 0; i <list.length; i++) {
-        //var collect = "collects[" + i + "].checked";
-        //this.setData({
-        //  [collect]: false,
-        //  isall: 0
-        //})
-        list[i].checked=false;
+      for (var i = 0; i < list.length; i++) {
+        list[i].checked = false;
       }
       this.setData({
-        sum: 0,isall:0,collects:list
+        sum: 0,
+        isall: 0,
+        collects: list
       })
     } else {
       for (var i = 0; i < list.length; i++) {
-        list[i].checked=true;
+        list[i].checked = true;
       }
       this.setData({
-         sum: th.data.collects.length,collects:list,isall:1
+        sum: th.data.collects.length,
+        collects: list,
+        isall: 1
       })
     }
   },
 
   //分页删除
   alldelete: function(e) {
+   
     var th = this;
+    if (th.data.isdelete) return false;
     // 全选的话直接删除
     if (th.data.isall) {
       a.delete("/api/weshop/goodscollect/removeUser/" + oo.stoid + "/" + app_d.user_id, {
         isShowLoading: 0,
         success: function(e) {
           th.setData({
-            collects: [],total_collects:0,
+            collects: [],
+            total_collects: 0,
+            isdelete:0
           })
           getApp().my_warnning("取消成功", 1, th);
 
         }
       })
     } else { //按照多个id删除收藏商品
-  
-      var new_colls= [];
+
+      var new_colls = [];
       var collectId = th.data.collects;
 
-      var str="";
+      var str = "";
       for (var i = 0; i < th.data.collects.length; i++) {
         if (collectId[i].checked) {
-          str+= collectId[i].collect_id+",";     
-        }else{
+          str += collectId[i].collect_id + ",";
+        } else {
           new_colls.push(collectId[i]);
         }
       }
-       str = str.substr(0, str.length - 1);  
-       var url = "/api/weshop/goodscollect/removeByIds/" + oo.stoid + "/" + app_d.user_id + "/" + str;
+      if(str.length==""){
+        getApp().my_warnning("请选择商品", 0, th);
+        return false;
+      }
+      th.setData({
+        isdelete: 1
+      })
+      str = str.substr(0, str.length - 1);
+      var url = "/api/weshop/goodscollect/removeByIds/" + oo.stoid + "/" + app_d.user_id + "/" + str;
 
       a.delete(url, {
-          isShowLoading: 0,
-          success: function(e) {
-            th.setData({
-              collects: new_colls,
-              sum: 0,
-              total_collects:new_colls.length
-            })
-            // th.select_checked(false,null);
-              getApp().my_warnning("取消收藏成功", 1, th);
-            }
-          
-        })
-      
-    }
-  },
-  select_checked:function(check,sum){
-        var th = this;
-        if(sum==null){
-          for (var i = 0; i < this.data.collects.length; i++) {
-            var collect = "collects[" + i + "].checked";
-            th.setData({
-              [collect]: check
-            })
-        }
-        }else{
-          var collect = "collects[" + sum + "].checked";
+        isShowLoading: 0,
+        success: function(e) {
           th.setData({
-            [collect]: check
+            collects: new_colls,
+            sum: 0,
+            total_collects: new_colls.length,
+            isdelete: 0
           })
+          // th.select_checked(false,null);
+          getApp().my_warnning("取消收藏成功", 1, th);
         }
+
+      })
+
+    }
+  },
+  select_checked: function(check, sum) {
+    var th = this;
+    if (sum == null) {
+      for (var i = 0; i < this.data.collects.length; i++) {
+        var collect = "collects[" + i + "].checked";
+        th.setData({
+          [collect]: check,
+          sum:0
+        })
+      }
+    } else {
+      var collect = "collects[" + sum + "].checked";
+      th.setData({
+        [collect]: check
+      })
+    }
   },
 
-  go_to:function (e) {
-      var url=e.currentTarget.dataset.url; getApp().goto(url);
+  go_to: function(e) {
+    var th = this;
+    var url = e.currentTarget.dataset.url;
+    getApp().goto(url);
   }
 });
\ No newline at end of file
diff --git a/pages/user/collect_list/collect_list.wxml b/pages/user/collect_list/collect_list.wxml
index fe7408f..de129b2 100644
--- a/pages/user/collect_list/collect_list.wxml
+++ b/pages/user/collect_list/collect_list.wxml
@@ -1,28 +1,7 @@
-<!-- <view class="container">
-    <view class="collect-ul">
-        <view class="collect-li" wx:for="{{collects}}" wx:key="{{index}}">
-            <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-                <image class="collect-img" src="{{item.original_img}}" lazy-load="true"
-                    binderror="bind_bnerr2" data-errorimg="collects[{{index}}].original_img"></image>
-            </navigator>
-            <view class="collect-name ellipsis-2">{{item.goods_name}}</view>
-            <view class="collect-footer">
-                <view class="collect-price">￥{{item.shop_price}}</view>
-                <view bindtap="cancelCollect" class="collect-btn" data-id="{{item.collect_id}}">删除</view>
-                <navigator class="collect-btn" url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">看相似</navigator>
-            </view>
-        </view>
-    </view>
-    <view class="no-data" wx:if="{{!collects||collects.length==0}}">
-        <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
-        <view class="no-data-title">没有相关的数据</view>
-        <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
-    </view>
-</view> -->
 <!-- 无收藏时显示 -->
 <view class="noCollection" wx:if="{{iscollects==0?false:true && collects.length<1}}">
   <view class="flex-level">
-    <image src="../../../images/Nocollection.png"></image>
+    <image src="{{url}}miniapp/images/Nocollection.png"></image>
   </view>
   <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
   <view class="flex-level">
@@ -38,18 +17,19 @@
     <!-- 商品数量 -->
     <view class="sum flex-vertical-between">
       <view class="flex-center">共{{total_collects}}件商品</view>
-      <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view>
-    </view> 
+      <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd==1?'完成':'编辑'}}</view>
+    </view>
     <!-- 商品集合 -->
     <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
-      <view class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}"  wx:for="{{collects}}" wx:key="{{index}}">
+      <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}" url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id:''}}">
+
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
         </view>
         <!-- 商品图片 -->
         <view class="flex">
           <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
-              <image src="{{item.original_img}}"  binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
+            <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
           </view>
 
           <!-- 商品属性 -->
@@ -74,11 +54,11 @@
                 </view>
               </view>
 
-              <view class="money_right flex" wx:if="{{!editEd}}">
-                <view class="similar flex-level fs20" bindtap="go_to"  data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
+              <view class="money_right flex line" wx:if="{{!editEd}}">
+                <view class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
                   <view>找相似</view>
                 </view>
-                <image src="{{url}}miniapp/images/dele.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
+                <image src="{{url}}miniapp/images/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image>
               </view>
 
             </view>
@@ -86,24 +66,25 @@
           </view>
 
         </view>
-      </view>
 
-    </view>
+    </navigator>
+
   </view>
+</view>
 
-  <!--- 好物推荐 --->
-  <view class="title" wx:if="{{collects.length>0 && is_goods}}">
-     <view class="Recommend flex-center">
-        <view class="lin"></view>
-        <view class="flex-center">
-        <image src="../../../images/Diamonds.png"></image>
-        <view class="fs28">好物推荐</view>
-      </view>
-        <view class="lin"></view>
-     </view>
-     <!-- 好物推荐 -->
-     <goods_recommend id="goods_recommend"></goods_recommend>
+<!--- 好物推荐 --->
+<view class="title" wx:if="{{collects.length>0 && is_goods}}">
+  <view class="Recommend flex-center">
+    <view class="lin"></view>
+    <view class="flex-center">
+      <image src="{{url}}miniapp/images/Diamonds.png"></image>
+      <view class="fs28">好物推荐</view>
+    </view>
+    <view class="lin"></view>
   </view>
+  <!-- 好物推荐 -->
+  <goods_recommend id="goods_recommend"></goods_recommend>
+</view>
 </view>
 
 <!-- 全选收藏 -->
@@ -120,9 +101,9 @@
       <text class="co-red">{{sum>0?sum:'0'}}</text> 件
     </view>
   </view>
-  <view class="delete fs30 flex-center white" bindtap="alldelete">
-    删除
+  <view class="delete fs30 flex-center white {{isdelete==1?'Deleting':''}}" bindtap="alldelete">
+    {{isdelete==0?'删除':'删除中'}}
   </view>
 </view>
 
-<warn id="warn"></warn>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/collect_list/collect_list.wxss b/pages/user/collect_list/collect_list.wxss
index f681d96..0c1362f 100644
--- a/pages/user/collect_list/collect_list.wxss
+++ b/pages/user/collect_list/collect_list.wxss
@@ -230,19 +230,18 @@ page {
 }
 
 .commodity .collects_max .collect .attribute .attribute_money .money_right .similar {
-  width: 90rpx;
-  height: 29rpx;
+  width: 97rpx;
+  height: 30rpx;
   border-radius: 21rpx;
-  border: 1rpx solid rgb(147, 147, 147);
-  font-size: 18rpx;
+  border: 1rpx solid rgb(162, 162, 162);
   margin-right: 22rpx;
-  color: rgb(89, 89, 89);
+  color: rgb(110,110, 110);
   align-items: center;
 }
 
 .commodity .collects_max .collect .attribute .attribute_money .money_right view {
-  height: 27rpx;
-  line-height: 27rpx;
+  height: 30rpx;
+  line-height: 30rpx;
 }
 
 .commodity .collects_max .collect .attribute .attribute_money .money_right image {
@@ -318,7 +317,7 @@ page {
 } */
 
 .Recommend {
-  height: 95rpx;
+  height: 80rpx;
   padding-top: 7rpx;
 }
 
@@ -503,7 +502,9 @@ page {
   height: 100%;
   background-color: rgb(219, 27, 52);
 }
-
+.abs .Deleting{
+  background-color: rgb(131, 131, 131);
+}
 .abs .Number {
   margin-right: 18rpx;
   letter-spacing: 0rpx;
--
libgit2 0.21.4