From d24817bd03c897958217da682281a94c4084d81e Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 23 Sep 2019 16:33:36 +0800
Subject: [PATCH] 添加评价，和 评价列表

---
 pages/user/add_comment/add_comment.wxml   |   4 ++--
 pages/user/collect_list/collect_list.js   |  82 ++++++++++++++++++++++++++++++++++++++--------------------------------------------
 pages/user/collect_list/collect_list.json |   3 ++-
 pages/user/collect_list/collect_list.wxml | 104 +++++++++++++++-----------------------------------------------------------------------------------------
 4 files changed, 57 insertions(+), 136 deletions(-)

diff --git a/pages/user/add_comment/add_comment.wxml b/pages/user/add_comment/add_comment.wxml
index 083ac03..50641e7 100644
--- a/pages/user/add_comment/add_comment.wxml
+++ b/pages/user/add_comment/add_comment.wxml
@@ -86,7 +86,7 @@
         <!-- 评论图片集合 -->
         <view class="images">
           <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{imgs}}">
-            <image class="abs" src="../../../images/cancel.png" data-index="{{index}}" bindtap="deleteImg"></image>
+            <image class="abs" src="{{iurl}}miniapp/images/cancel.png" data-index="{{index}}" bindtap="deleteImg"></image>
           </image>
 
         </view>
@@ -95,7 +95,7 @@
         <view class="addimage flex-center xc-ash" bindtap="chooseImg">
           <view>
             <view class="flex-center">
-              <image src="../../../images/camera.png"></image>
+              <image src="{{iurl}}miniapp/images/camera.png"></image>
             </view>
             <view class="flex-center fs20">添加图片</view>
             <view class="flex-center fs20">{{imgs.length>0?imgs.length:0}}/3</view>
diff --git a/pages/user/collect_list/collect_list.js b/pages/user/collect_list/collect_list.js
index 4e5ec32..61b7b0f 100644
--- a/pages/user/collect_list/collect_list.js
+++ b/pages/user/collect_list/collect_list.js
@@ -17,15 +17,15 @@ Page({
     collects: null,
     currentPage: 1,
     curpage: 1,
-    collects_Recommend: [],
+
     ismore: 0,
     iscollects: 0,
-    loadName: null,
+
     editEd: 0, //商品编辑按钮是否点击
     isall: false, //是否全选
     sum: 0,
     total_collects:0,
-    total_goods:0,
+    is_goods:0,
     pageSize:8,//分页数量
   },
   onLoad: function() {
@@ -34,31 +34,34 @@ Page({
      // this.requestList();
   },
   requestCollectList: function() {
-    isShowLoading: 0;
     var th = this;
     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)
+         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.requestList();
-        }      
+         }
+         if (th.data.total_collects<th.data.pageSize){
+           var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+           goods_list.get_list();
+         }
     });
   },
 
   //--到底部刷新---
   onReachBottom: function() {
-    if (this.data.currentPage*this.data.pageSize<this.data.total_collects){
+    if ((this.data.currentPage-1)*this.data.pageSize<this.data.total_collects){
       this.requestCollectList();
     }else{
-      this.requestList();
+      if(this.data.is_goods==0) this.setData({is_goods:1});
+      var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+      goods_list.get_list();
     }
        
   },
+
+  //--取消收藏---
   cancelCollect: function(t) {
     var e = t.currentTarget.dataset.id,
       o = this;
@@ -79,27 +82,15 @@ Page({
   },
   //图片失败，默认图片
   bind_bnerr: function (e) {
-    var _errImg = e.target.dataset.errorimg;
+    var _errImg = e.currentTarget.dataset.errimg;
     var _errObj = {};
-    _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg";
+    _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
     this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
 
   },
 
-  //图片失败，默认图片
-  bind_bnerr2: function(e) {
-    var _errImg = e.target.dataset.errorimg;
-    var th = this;
-    this.setData({
-      [_errImg]: th.data.iurl + "/miniapp/images/default_g_img.gif",
-    })
-  },
- 
-
   requestList: function() {
-    this.setData({
-      loadName: '加载中...'
-    })
+
     var e = this;
     a.get("/api/weshop/goods/page", {
       isShowLoading: 0,
@@ -177,31 +168,30 @@ Page({
   //全选为收藏商品checked为true
   allClick: function() {
     var th = this;
+    var list=th.data.collects;
     //判断是否全选
     if (th.data.isall) {
-      for (var i = 0; i <= th.data.collects.length; i++) {
-        var collect = "collects[" + i + "].checked";
-        this.setData({
-          [collect]: false,
-          isall: 0
-        })
+      for (var i = 0; i <list.length; i++) {
+        //var collect = "collects[" + i + "].checked";
+        //this.setData({
+        //  [collect]: false,
+        //  isall: 0
+        //})
+        list[i].checked=false;
       }
       this.setData({
-        sum: 0
+        sum: 0,isall:0,collects:list
       })
     } else {
-      for (var i = 0; i <= th.data.collects.length; i++) {
-        var collect = "collects[" + i + "].checked";
-        this.setData({
-          [collect]: true,
-          isall: 1
-        })
+      for (var i = 0; i < list.length; i++) {
+        list[i].checked=true;
       }
       this.setData({
-        sum: th.data.collects.length
+         sum: th.data.collects.length,collects:list,isall:1
       })
     }
   },
+
   //分页删除
   alldelete: function(e) {
     var th = this;
@@ -211,7 +201,7 @@ Page({
         isShowLoading: 0,
         success: function(e) {
           th.setData({
-            collects: []
+            collects: [],total_collects:0,
           })
           getApp().my_warnning("取消成功", 1, th);
 
@@ -236,10 +226,10 @@ Page({
       a.delete(url, {
           isShowLoading: 0,
           success: function(e) {
-          
             th.setData({
               collects: new_colls,
-              sum: 0
+              sum: 0,
+              total_collects:new_colls.length
             })
             // th.select_checked(false,null);
               getApp().my_warnning("取消收藏成功", 1, th);
@@ -264,5 +254,9 @@ Page({
             [collect]: check
           })
         }
+  },
+
+  go_to:function (e) {
+      var url=e.currentTarget.dataset.url; getApp().goto(url);
   }
 });
\ No newline at end of file
diff --git a/pages/user/collect_list/collect_list.json b/pages/user/collect_list/collect_list.json
index 7ccdd64..64db42e 100644
--- a/pages/user/collect_list/collect_list.json
+++ b/pages/user/collect_list/collect_list.json
@@ -2,6 +2,7 @@
     "navigationBarTitleText": "我的收藏",
     "enablePullDownRefresh": false,
     "usingComponents": {
-      "warn": "/components/long_warn/long_warn"
+       "warn": "/components/long_warn/long_warn",
+       "goods_recommend": "/components/goods_list/goods_list"
     }
 }
\ 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 c5fabca..fe7408f 100644
--- a/pages/user/collect_list/collect_list.wxml
+++ b/pages/user/collect_list/collect_list.wxml
@@ -37,7 +37,7 @@
   <view class="commodity">
     <!-- 商品数量 -->
     <view class="sum flex-vertical-between">
-      <view class="flex-center">共{{collects.length}}件商品</view>
+      <view class="flex-center">共{{total_collects}}件商品</view>
       <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view>
     </view> 
     <!-- 商品集合 -->
@@ -49,7 +49,7 @@
         <!-- 商品图片 -->
         <view class="flex">
           <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
-            <image src="{{item.original_img}}" onerror="this.src='../../../images/right.png'"></image>
+              <image src="{{item.original_img}}"  binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
           </view>
 
           <!-- 商品属性 -->
@@ -75,10 +75,10 @@
               </view>
 
               <view class="money_right flex" wx:if="{{!editEd}}">
-                <view class="similar flex-level fs20">
+                <view class="similar flex-level fs20" bindtap="go_to"  data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
                   <view>找相似</view>
                 </view>
-                <image src="../../../images/delete.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
+                <image src="{{url}}miniapp/images/dele.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
               </view>
 
             </view>
@@ -89,95 +89,23 @@
       </view>
 
     </view>
-
   </view>
 
-
-
-  <view class="title" wx:if="{{collects.length>0}}">
-
-    <!-- <view>
-
-      <view class="China flex-level">
-        <view class="le flex-vertical">
-          <view class="one"></view>
-          <view class="two"></view>
-          <view class="three"></view>
-        </view>
-
-        <view class="Recommend flex-level" bindtap="requestList">热门好物</view>
-
-        <view class="le flex-vertical">
-          <view class="three flex-vertical"></view>
-          <view class="two"></view>
-          <view class="one"></view>
-        </view>
-      </view>
-
- 
-      <view class="english flex-center">
-        <view class="silk"></view>
-        <view class="esh five-level-word">GOOD HOT THING</view>
-        <view class="silk"></view>
-      </view>
-
-    </view> -->
-    <view class="Recommend flex-center">
-      <view class="lin"></view>
-      <view class="flex-center">
+  <!--- 好物推荐 --->
+  <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>
-
-    <view class="collects">
-      <view class="hang ">
-
-        <!-- 商品详情 -->
-        <view class="collect ib" wx:for="{{collects_Recommend}}">
-          <!-- 商品图片 -->
-          <image class="sp" src="{{iurl}}{{item.original_img}}" lazy-load="true" binderror="bind_bnerr2" data-url="../../../images/starsred" data-errorimg="../../../images/starsred"></image>
-          <view class="bottom">
-            <!-- 商品名称 -->
-            <view class="goods_name ellipsis-2 fs24">{{item.goods_name}}</view>
-            <!-- 商品价格 -->
-            <view class="money flex line">
-              <!-- 办卡价 -->
-              <view class="flex xc-wc line">
-                <view class="fs24">￥</view>
-                <view class="fs35">{{item.shop_price}}</view>
-              </view>
-              <!-- 原价 -->
-              <view class="price flex xc-ash">
-                <view class="fs24">￥</view>
-                <view class="fs24">{{item.market_price}}</view>
-              </view>
-
-            </view>
-
-          </view>
-
-        </view>
-     
-        <view wx:if="{{loadName!=null}}" class="load fs26 xc-ash flex-center">{{loadName}}</view>
-      </view>
-
-      <!-- 加载完毕提示 -->
-      <view class="nothing flex-center" wx:if="{{ismore!=0}}">
-        <view class="Foil"></view>
-        <view class="no_content fs24">没有更多内容了</view>
-        <view class="Foil"></view>
-      </view>
-
-
-
-    </view>
-
+        <view class="lin"></view>
+     </view>
+     <!-- 好物推荐 -->
+     <goods_recommend id="goods_recommend"></goods_recommend>
   </view>
-
-
 </view>
+
 <!-- 全选收藏 -->
 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}">
   <view class="left">
@@ -195,8 +123,6 @@
   <view class="delete fs30 flex-center white" bindtap="alldelete">
     删除
   </view>
-
-
 </view>
 
-<warn id="warn"></warn>
\ No newline at end of file
+<warn id="warn"></warn>
--
libgit2 0.21.4