From e7e5cd1171c8f87bd4fa122faab791dce2c8c671 Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Mon, 24 Jan 2022 09:39:22 +0800
Subject: [PATCH] 收藏夹、分类修改

---
 packageB/pages/user/collect_list/collect_list.js   |  6 +++++-
 packageB/pages/user/collect_list/collect_list.wxml |  9 +++++++--
 pages/goods/categoryList/categoryList.js           |  3 +++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packageB/pages/user/collect_list/collect_list.js b/packageB/pages/user/collect_list/collect_list.js
index ea786ae..b1fbd36 100644
--- a/packageB/pages/user/collect_list/collect_list.js
+++ b/packageB/pages/user/collect_list/collect_list.js
@@ -88,10 +88,14 @@ Page({
     for (var e = 0; e < this.data.collects.length; e++)
       if (this.data.collects[e].collect_id == t) {
         this.data.collects.splice(e, 1), this.setData({
-          collects: this.data.collects
+          collects: this.data.collects,
         });
         break;
       }
+	
+	this.setData({
+		total_collects: this.data.collects.length,
+	});
   },
   //图片失败，默认图片
   bind_bnerr: function(e) {
diff --git a/packageB/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml
index c3ba730..5f756a5 100644
--- a/packageB/pages/user/collect_list/collect_list.wxml
+++ b/packageB/pages/user/collect_list/collect_list.wxml
@@ -22,7 +22,7 @@
     <!-- 商品集合 -->
     <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
       <navigator class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}"
-                 data-url="{{editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:''}}">
+                 data-url="{{item.type == 1 ? '/packageA/pages/goodsInfo/goodsInfo?goods_id=' + item.goods_id : (editEd==0?'/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id:'')}}">
 
         <view class="radioCheck iconClick" wx:if="{{editEd}}">
           <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
@@ -56,7 +56,12 @@
               </view>
 
               <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 wx:if="{{item.type == 1}}" class="similar flex-level fs22" catchtap="go_to" data-url="/packageA/pages/cardList/cardList?cat_id={{item.cat_id}}">
+				  <view>找相似</view>
+				</view>
+				<!-- 其他 -->
+                <view wx:elif="{{item.type == 0}}" 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/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image>
diff --git a/pages/goods/categoryList/categoryList.js b/pages/goods/categoryList/categoryList.js
index a69258c..2e7ef4d 100644
--- a/pages/goods/categoryList/categoryList.js
+++ b/pages/goods/categoryList/categoryList.js
@@ -706,6 +706,9 @@ Page({
   // 新的版本分类点击一级分类
  click_classify:function(e){
   // 在风格三的时候，才会有current
+  this.setData({
+	countDownNum: 3,
+  });
   let cur = e.currentTarget.dataset.current;
   if(cur) {
       if (this.data.currentTab == cur) {
--
libgit2 0.21.4