Commit 5cb4378e81c2f1e5854090e2586fa8d296c08224

Authored by yvan.ni
1 parent 25cf2023

商品详情,收藏

pages/goods/goodsInfo/goodsInfo.js
... ... @@ -2787,23 +2787,8 @@ close_popup:function(e){
2787 2787 //确定def_pick为选择的门店
2788 2788 sure_pick:function (e) {
2789 2789 var th=this; var item=null;
2790   - var openindstore = e.currentTarget.dataset.openindstore;
2791   - if (openindstore == 1) {
2792   -
2793   - th.setData({
2794   - openSpecModal: !0,
2795   - openSpecModal_ind: openindstore, });
2796   - } else if (openindstore == 2) {
2797   -
2798   - th.setData({
2799   - openSpecModal: !0,
2800   - openSpecModal_ind: openindstore, });
2801   - } else {
2802   -
2803   - th.setData({
2804   - store: 0, choice_sort_store: 0, sort_store: 0
2805   - })
2806   - }
  2790 + var openindstore = e.currentTarget.dataset.openindstore;
  2791 +
2807 2792 if(th.data.choice_sort_store==0 ){
2808 2793 var index=th.data.fir_pick_index;
2809 2794 if(th.data.is_show_sto_cat==1){
... ... @@ -2811,13 +2796,31 @@ close_popup:function(e){
2811 2796 }else{
2812 2797 item=th.data.only_pk[index]; //当没有门店分类的时候
2813 2798 }
  2799 +
2814 2800 }else{
2815 2801 var index=th.data.sec_pick_index;
2816 2802 item=th.data.sec_sto.s_arr[index];
2817 2803 }
2818   - console.log("选择门店刷新","def_pick_store",item);
2819   - th.setData({def_pick_store:item,sto_sele_name:item.pickup_name,
2820   - sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0});
  2804 +
  2805 + //th.setData({fir_pick_index:0});
  2806 + console.log("选择门店刷新","def_pick_store",item);
  2807 + th.setData({def_pick_store:item,sto_sele_name:item.pickup_name,
  2808 + sto_sele_id:item.pickup_id,sto_sele_distr:item.distr_type,store:0,choice_sort_store:0, fir_pick_index:0});
  2809 +
  2810 + if (openindstore == 1) {
  2811 + th.setData({
  2812 + openSpecModal: !0,
  2813 + openSpecModal_ind: openindstore, });
  2814 + } else if (openindstore == 2) {
  2815 + th.setData({
  2816 + openSpecModal: !0,
  2817 + openSpecModal_ind: openindstore, });
  2818 + } else {
  2819 + th.setData({
  2820 + store: 0, choice_sort_store: 0, sort_store: 0
  2821 + })
  2822 + }
  2823 +
2821 2824 },
2822 2825 //---点击二级之后的选择---
2823 2826 choose_for_store: function (e) {
... ... @@ -2834,18 +2837,14 @@ close_popup:function(e){
2834 2837 var index=th.data.fir_pick_index;
2835 2838  
2836 2839 if(th.data.is_show_sto_cat==1){
2837   -
2838 2840 item=th.data.def_pickpu_list[index];
2839   -
2840 2841 }else{
2841   -
2842 2842 item=th.data.only_pk[index]; //当没有门店分类的时候
2843 2843  
2844 2844 }
2845 2845 }else{
2846 2846 var index=th.data.sec_pick_index;
2847 2847 item=th.data.sec_sto.s_arr[index];
2848   -
2849 2848 }
2850 2849  
2851 2850 var store_id=o.stoid;
... ...
pages/user/collect_list/collect_list.js
... ... @@ -17,48 +17,57 @@ Page({
17 17 collects: null,
18 18 currentPage: 1,
19 19 curpage: 1,
20   -
21 20 ismore: 0,
22 21 iscollects: 0,
23   -
24 22 editEd: 0, //商品编辑按钮是否点击
25 23 isall: false, //是否全选
26 24 sum: 0,
27   - total_collects:0,
28   - is_goods:0,
29   - pageSize:8,//分页数量
  25 + total_collects: 0,
  26 + is_goods: 0,
  27 + pageSize: 8, //分页数量
  28 + isdelete: 0
30 29 },
31 30 onLoad: function() {
32 31 o.init(this, "", "collects"),
33   - this.requestCollectList();
34   - // this.requestList();
  32 + this.requestCollectList();
35 33 },
36 34 requestCollectList: function() {
37 35 var th = this;
38   - e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize +"&user_id=" +
  36 + e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize + "&user_id=" +
39 37 app_d.user_id + "&store_id=" + oo.stoid + "&page=" + th.data.currentPage;
40   - o.request(e, function(e) {
41   - th.data.currentPage++;
42   - if(th.data.total_collects==0){
43   - th.setData({ iscollects: 1, total_collects:e.data.data.total})
44   - }
45   - if (th.data.total_collects<th.data.pageSize){
46   - var goods_list = this.selectComponent("#goods_recommend"); //组件的id
47   - goods_list.get_list();
48   - }
  38 + o.request(e, function(e) {
  39 + th.data.currentPage++;
  40 + if (th.data.total_collects == 0) {
  41 + th.setData({
  42 + iscollects: 1,
  43 + total_collects: e.data.data.total
  44 + })
  45 + }
  46 + if (th.data.total_collects < th.data.pageSize) {
  47 +
  48 + th.setData({
  49 + is_goods: 1
  50 + })
  51 + var goods_list = th.selectComponent("#goods_recommend"); //组件的id
  52 + goods_list.get_list();
  53 +
  54 +
  55 + }
49 56 });
50 57 },
51 58  
52 59 //--到底部刷新---
53 60 onReachBottom: function() {
54   - if ((this.data.currentPage-1)*this.data.pageSize<this.data.total_collects){
  61 + if ((this.data.currentPage - 1) * this.data.pageSize < this.data.total_collects) {
55 62 this.requestCollectList();
56   - }else{
57   - if(this.data.is_goods==0) this.setData({is_goods:1});
  63 + } else {
  64 + if (this.data.is_goods == 0) this.setData({
  65 + is_goods: 1
  66 + });
58 67 var goods_list = this.selectComponent("#goods_recommend"); //组件的id
59 68 goods_list.get_list();
60 69 }
61   -
  70 +
62 71 },
63 72  
64 73 //--取消收藏---
... ... @@ -81,7 +90,7 @@ Page({
81 90 }
82 91 },
83 92 //图片失败,默认图片
84   - bind_bnerr: function (e) {
  93 + bind_bnerr: function(e) {
85 94 var _errImg = e.currentTarget.dataset.errimg;
86 95 var _errObj = {};
87 96 _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
... ... @@ -121,7 +130,6 @@ Page({
121 130  
122 131  
123 132 goto: function(ee) {
124   - // e.goto("/pages/index/index/index");
125 133 wx.switchTab({
126 134 url: '/pages/index/index/index',
127 135 })
... ... @@ -134,6 +142,7 @@ Page({
134 142 t.select_checked(false, null)
135 143 t.setData({
136 144 editEd: 1,
  145 + isall:0
137 146 })
138 147 } else {
139 148 t.select_checked(false, null)
... ... @@ -168,95 +177,109 @@ Page({
168 177 //全选为收藏商品checked为true
169 178 allClick: function() {
170 179 var th = this;
171   - var list=th.data.collects;
  180 + var list = th.data.collects;
172 181 //判断是否全选
173 182 if (th.data.isall) {
174   - for (var i = 0; i <list.length; i++) {
175   - //var collect = "collects[" + i + "].checked";
176   - //this.setData({
177   - // [collect]: false,
178   - // isall: 0
179   - //})
180   - list[i].checked=false;
  183 + for (var i = 0; i < list.length; i++) {
  184 + list[i].checked = false;
181 185 }
182 186 this.setData({
183   - sum: 0,isall:0,collects:list
  187 + sum: 0,
  188 + isall: 0,
  189 + collects: list
184 190 })
185 191 } else {
186 192 for (var i = 0; i < list.length; i++) {
187   - list[i].checked=true;
  193 + list[i].checked = true;
188 194 }
189 195 this.setData({
190   - sum: th.data.collects.length,collects:list,isall:1
  196 + sum: th.data.collects.length,
  197 + collects: list,
  198 + isall: 1
191 199 })
192 200 }
193 201 },
194 202  
195 203 //分页删除
196 204 alldelete: function(e) {
  205 +
197 206 var th = this;
  207 + if (th.data.isdelete) return false;
198 208 // 全选的话直接删除
199 209 if (th.data.isall) {
200 210 a.delete("/api/weshop/goodscollect/removeUser/" + oo.stoid + "/" + app_d.user_id, {
201 211 isShowLoading: 0,
202 212 success: function(e) {
203 213 th.setData({
204   - collects: [],total_collects:0,
  214 + collects: [],
  215 + total_collects: 0,
  216 + isdelete:0
205 217 })
206 218 getApp().my_warnning("取消成功", 1, th);
207 219  
208 220 }
209 221 })
210 222 } else { //按照多个id删除收藏商品
211   -
212   - var new_colls= [];
  223 +
  224 + var new_colls = [];
213 225 var collectId = th.data.collects;
214 226  
215   - var str="";
  227 + var str = "";
216 228 for (var i = 0; i < th.data.collects.length; i++) {
217 229 if (collectId[i].checked) {
218   - str+= collectId[i].collect_id+",";
219   - }else{
  230 + str += collectId[i].collect_id + ",";
  231 + } else {
220 232 new_colls.push(collectId[i]);
221 233 }
222 234 }
223   - str = str.substr(0, str.length - 1);
224   - var url = "/api/weshop/goodscollect/removeByIds/" + oo.stoid + "/" + app_d.user_id + "/" + str;
  235 + if(str.length==""){
  236 + getApp().my_warnning("请选择商品", 0, th);
  237 + return false;
  238 + }
  239 + th.setData({
  240 + isdelete: 1
  241 + })
  242 + str = str.substr(0, str.length - 1);
  243 + var url = "/api/weshop/goodscollect/removeByIds/" + oo.stoid + "/" + app_d.user_id + "/" + str;
225 244  
226 245 a.delete(url, {
227   - isShowLoading: 0,
228   - success: function(e) {
229   - th.setData({
230   - collects: new_colls,
231   - sum: 0,
232   - total_collects:new_colls.length
233   - })
234   - // th.select_checked(false,null);
235   - getApp().my_warnning("取消收藏成功", 1, th);
236   - }
237   -
238   - })
239   -
240   - }
241   - },
242   - select_checked:function(check,sum){
243   - var th = this;
244   - if(sum==null){
245   - for (var i = 0; i < this.data.collects.length; i++) {
246   - var collect = "collects[" + i + "].checked";
247   - th.setData({
248   - [collect]: check
249   - })
250   - }
251   - }else{
252   - var collect = "collects[" + sum + "].checked";
  246 + isShowLoading: 0,
  247 + success: function(e) {
253 248 th.setData({
254   - [collect]: check
  249 + collects: new_colls,
  250 + sum: 0,
  251 + total_collects: new_colls.length,
  252 + isdelete: 0
255 253 })
  254 + // th.select_checked(false,null);
  255 + getApp().my_warnning("取消收藏成功", 1, th);
256 256 }
  257 +
  258 + })
  259 +
  260 + }
  261 + },
  262 + select_checked: function(check, sum) {
  263 + var th = this;
  264 + if (sum == null) {
  265 + for (var i = 0; i < this.data.collects.length; i++) {
  266 + var collect = "collects[" + i + "].checked";
  267 + th.setData({
  268 + [collect]: check,
  269 + sum:0
  270 + })
  271 + }
  272 + } else {
  273 + var collect = "collects[" + sum + "].checked";
  274 + th.setData({
  275 + [collect]: check
  276 + })
  277 + }
257 278 },
258 279  
259   - go_to:function (e) {
260   - var url=e.currentTarget.dataset.url; getApp().goto(url);
  280 + go_to: function(e) {
  281 + var th = this;
  282 + var url = e.currentTarget.dataset.url;
  283 + getApp().goto(url);
261 284 }
262 285 });
263 286 \ No newline at end of file
... ...
pages/user/collect_list/collect_list.wxml
1   -<!-- <view class="container">
2   - <view class="collect-ul">
3   - <view class="collect-li" wx:for="{{collects}}" wx:key="{{index}}">
4   - <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
5   - <image class="collect-img" src="{{item.original_img}}" lazy-load="true"
6   - binderror="bind_bnerr2" data-errorimg="collects[{{index}}].original_img"></image>
7   - </navigator>
8   - <view class="collect-name ellipsis-2">{{item.goods_name}}</view>
9   - <view class="collect-footer">
10   - <view class="collect-price">¥{{item.shop_price}}</view>
11   - <view bindtap="cancelCollect" class="collect-btn" data-id="{{item.collect_id}}">删除</view>
12   - <navigator class="collect-btn" url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">看相似</navigator>
13   - </view>
14   - </view>
15   - </view>
16   - <view class="no-data" wx:if="{{!collects||collects.length==0}}">
17   - <image class="cart-image" src="{{iurl}}/miniapp/images/cart-null.png"></image>
18   - <view class="no-data-title">没有相关的数据</view>
19   - <navigator class="lookat" openType="switchTab" url="/pages/index/index/index"> 去逛逛 </navigator>
20   - </view>
21   -</view> -->
22 1 <!-- 无收藏时显示 -->
23 2 <view class="noCollection" wx:if="{{iscollects==0?false:true && collects.length<1}}">
24 3 <view class="flex-level">
25   - <image src="../../../images/Nocollection.png"></image>
  4 + <image src="{{url}}miniapp/images/Nocollection.png"></image>
26 5 </view>
27 6 <view class="flex-level fs30 xc-ash">当前暂无收藏</view>
28 7 <view class="flex-level">
... ... @@ -38,18 +17,19 @@
38 17 <!-- 商品数量 -->
39 18 <view class="sum flex-vertical-between">
40 19 <view class="flex-center">共{{total_collects}}件商品</view>
41   - <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view>
42   - </view>
  20 + <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd==1?'完成':'编辑'}}</view>
  21 + </view>
43 22 <!-- 商品集合 -->
44 23 <view class="{{editEd?'collects_max colls_max':'collects_max'}}">
45   - <view class="collect flex-vertical" bindtap="iconClick" data-index="{{index}}" wx:for="{{collects}}" wx:key="{{index}}">
  24 + <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:''}}">
  25 +
46 26 <view class="radioCheck iconClick" wx:if="{{editEd}}">
47 27 <radio color="rgb(214,1,33)" class="scale" checked="{{item.checked==true?true:false}}"></radio>
48 28 </view>
49 29 <!-- 商品图片 -->
50 30 <view class="flex">
51 31 <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
52   - <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
  32 + <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
53 33 </view>
54 34  
55 35 <!-- 商品属性 -->
... ... @@ -74,11 +54,11 @@
74 54 </view>
75 55 </view>
76 56  
77   - <view class="money_right flex" wx:if="{{!editEd}}">
78   - <view class="similar flex-level fs20" bindtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
  57 + <view class="money_right flex line" wx:if="{{!editEd}}">
  58 + <view class="similar flex-level fs22" catchtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
79 59 <view>找相似</view>
80 60 </view>
81   - <image src="{{url}}miniapp/images/dele.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
  61 + <image src="{{url}}miniapp/images/trash.png" catchtap="cancelCollect" data-id="{{item.collect_id}}"></image>
82 62 </view>
83 63  
84 64 </view>
... ... @@ -86,24 +66,25 @@
86 66 </view>
87 67  
88 68 </view>
89   - </view>
90 69  
91   - </view>
  70 + </navigator>
  71 +
92 72 </view>
  73 +</view>
93 74  
94   - <!--- 好物推荐 --->
95   - <view class="title" wx:if="{{collects.length>0 && is_goods}}">
96   - <view class="Recommend flex-center">
97   - <view class="lin"></view>
98   - <view class="flex-center">
99   - <image src="../../../images/Diamonds.png"></image>
100   - <view class="fs28">好物推荐</view>
101   - </view>
102   - <view class="lin"></view>
103   - </view>
104   - <!-- 好物推荐 -->
105   - <goods_recommend id="goods_recommend"></goods_recommend>
  75 +<!--- 好物推荐 --->
  76 +<view class="title" wx:if="{{collects.length>0 && is_goods}}">
  77 + <view class="Recommend flex-center">
  78 + <view class="lin"></view>
  79 + <view class="flex-center">
  80 + <image src="{{url}}miniapp/images/Diamonds.png"></image>
  81 + <view class="fs28">好物推荐</view>
  82 + </view>
  83 + <view class="lin"></view>
106 84 </view>
  85 + <!-- 好物推荐 -->
  86 + <goods_recommend id="goods_recommend"></goods_recommend>
  87 +</view>
107 88 </view>
108 89  
109 90 <!-- 全选收藏 -->
... ... @@ -120,9 +101,9 @@
120 101 <text class="co-red">{{sum>0?sum:'0'}}</text> 件
121 102 </view>
122 103 </view>
123   - <view class="delete fs30 flex-center white" bindtap="alldelete">
124   - 删除
  104 + <view class="delete fs30 flex-center white {{isdelete==1?'Deleting':''}}" bindtap="alldelete">
  105 + {{isdelete==0?'删除':'删除中'}}
125 106 </view>
126 107 </view>
127 108  
128 109 -<warn id="warn"></warn>
  110 +<warn id="warn"></warn>
129 111 \ No newline at end of file
... ...
pages/user/collect_list/collect_list.wxss
... ... @@ -230,19 +230,18 @@ page {
230 230 }
231 231  
232 232 .commodity .collects_max .collect .attribute .attribute_money .money_right .similar {
233   - width: 90rpx;
234   - height: 29rpx;
  233 + width: 97rpx;
  234 + height: 30rpx;
235 235 border-radius: 21rpx;
236   - border: 1rpx solid rgb(147, 147, 147);
237   - font-size: 18rpx;
  236 + border: 1rpx solid rgb(162, 162, 162);
238 237 margin-right: 22rpx;
239   - color: rgb(89, 89, 89);
  238 + color: rgb(110,110, 110);
240 239 align-items: center;
241 240 }
242 241  
243 242 .commodity .collects_max .collect .attribute .attribute_money .money_right view {
244   - height: 27rpx;
245   - line-height: 27rpx;
  243 + height: 30rpx;
  244 + line-height: 30rpx;
246 245 }
247 246  
248 247 .commodity .collects_max .collect .attribute .attribute_money .money_right image {
... ... @@ -318,7 +317,7 @@ page {
318 317 } */
319 318  
320 319 .Recommend {
321   - height: 95rpx;
  320 + height: 80rpx;
322 321 padding-top: 7rpx;
323 322 }
324 323  
... ... @@ -503,7 +502,9 @@ page {
503 502 height: 100%;
504 503 background-color: rgb(219, 27, 52);
505 504 }
506   -
  505 +.abs .Deleting{
  506 + background-color: rgb(131, 131, 131);
  507 +}
507 508 .abs .Number {
508 509 margin-right: 18rpx;
509 510 letter-spacing: 0rpx;
... ...