Commit d24817bd03c897958217da682281a94c4084d81e

Authored by yvan.ni
1 parent 94dd68ab

添加评价,和 评价列表

pages/user/add_comment/add_comment.wxml
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 <!-- 评论图片集合 --> 86 <!-- 评论图片集合 -->
87 <view class="images"> 87 <view class="images">
88 <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{imgs}}"> 88 <image class="rel" catchtap="previewImg" data-index="{{index}}" src="{{item}}" wx:for="{{imgs}}">
89 - <image class="abs" src="../../../images/cancel.png" data-index="{{index}}" bindtap="deleteImg"></image> 89 + <image class="abs" src="{{iurl}}miniapp/images/cancel.png" data-index="{{index}}" bindtap="deleteImg"></image>
90 </image> 90 </image>
91 91
92 </view> 92 </view>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 <view class="addimage flex-center xc-ash" bindtap="chooseImg"> 95 <view class="addimage flex-center xc-ash" bindtap="chooseImg">
96 <view> 96 <view>
97 <view class="flex-center"> 97 <view class="flex-center">
98 - <image src="../../../images/camera.png"></image> 98 + <image src="{{iurl}}miniapp/images/camera.png"></image>
99 </view> 99 </view>
100 <view class="flex-center fs20">添加图片</view> 100 <view class="flex-center fs20">添加图片</view>
101 <view class="flex-center fs20">{{imgs.length>0?imgs.length:0}}/3</view> 101 <view class="flex-center fs20">{{imgs.length>0?imgs.length:0}}/3</view>
pages/user/collect_list/collect_list.js
@@ -17,15 +17,15 @@ Page({ @@ -17,15 +17,15 @@ Page({
17 collects: null, 17 collects: null,
18 currentPage: 1, 18 currentPage: 1,
19 curpage: 1, 19 curpage: 1,
20 - collects_Recommend: [], 20 +
21 ismore: 0, 21 ismore: 0,
22 iscollects: 0, 22 iscollects: 0,
23 - loadName: null, 23 +
24 editEd: 0, //商品编辑按钮是否点击 24 editEd: 0, //商品编辑按钮是否点击
25 isall: false, //是否全选 25 isall: false, //是否全选
26 sum: 0, 26 sum: 0,
27 total_collects:0, 27 total_collects:0,
28 - total_goods:0, 28 + is_goods:0,
29 pageSize:8,//分页数量 29 pageSize:8,//分页数量
30 }, 30 },
31 onLoad: function() { 31 onLoad: function() {
@@ -34,31 +34,34 @@ Page({ @@ -34,31 +34,34 @@ Page({
34 // this.requestList(); 34 // this.requestList();
35 }, 35 },
36 requestCollectList: function() { 36 requestCollectList: function() {
37 - isShowLoading: 0;  
38 var th = this; 37 var th = this;
39 e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize +"&user_id=" + 38 e = "/api/weshop/goodscollect/list?" + "pageSize=" + th.data.pageSize +"&user_id=" +
40 app_d.user_id + "&store_id=" + oo.stoid + "&page=" + th.data.currentPage; 39 app_d.user_id + "&store_id=" + oo.stoid + "&page=" + th.data.currentPage;
41 o.request(e, function(e) { 40 o.request(e, function(e) {
42 th.data.currentPage++; 41 th.data.currentPage++;
43 -  
44 - if(th.data.total_collects) 42 + if(th.data.total_collects==0){
45 th.setData({ iscollects: 1, total_collects:e.data.data.total}) 43 th.setData({ iscollects: 1, total_collects:e.data.data.total})
46 -  
47 - if (th.data.total_collects<th.data.pageSize){  
48 - th.requestList();  
49 - } 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 + }
50 }); 49 });
51 }, 50 },
52 51
53 //--到底部刷新--- 52 //--到底部刷新---
54 onReachBottom: function() { 53 onReachBottom: function() {
55 - if (this.data.currentPage*this.data.pageSize<this.data.total_collects){ 54 + if ((this.data.currentPage-1)*this.data.pageSize<this.data.total_collects){
56 this.requestCollectList(); 55 this.requestCollectList();
57 }else{ 56 }else{
58 - this.requestList(); 57 + if(this.data.is_goods==0) this.setData({is_goods:1});
  58 + var goods_list = this.selectComponent("#goods_recommend"); //组件的id
  59 + goods_list.get_list();
59 } 60 }
60 61
61 }, 62 },
  63 +
  64 + //--取消收藏---
62 cancelCollect: function(t) { 65 cancelCollect: function(t) {
63 var e = t.currentTarget.dataset.id, 66 var e = t.currentTarget.dataset.id,
64 o = this; 67 o = this;
@@ -79,27 +82,15 @@ Page({ @@ -79,27 +82,15 @@ Page({
79 }, 82 },
80 //图片失败,默认图片 83 //图片失败,默认图片
81 bind_bnerr: function (e) { 84 bind_bnerr: function (e) {
82 - var _errImg = e.target.dataset.errorimg; 85 + var _errImg = e.currentTarget.dataset.errimg;
83 var _errObj = {}; 86 var _errObj = {};
84 - _errObj[_errImg] = this.data.url + "/miniapp/images/del/logo.jpg"; 87 + _errObj[_errImg] = this.data.iurl + "/miniapp/images/default_g_img.gif";
85 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 88 this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
86 89
87 }, 90 },
88 91
89 - //图片失败,默认图片  
90 - bind_bnerr2: function(e) {  
91 - var _errImg = e.target.dataset.errorimg;  
92 - var th = this;  
93 - this.setData({  
94 - [_errImg]: th.data.iurl + "/miniapp/images/default_g_img.gif",  
95 - })  
96 - },  
97 -  
98 -  
99 requestList: function() { 92 requestList: function() {
100 - this.setData({  
101 - loadName: '加载中...'  
102 - }) 93 +
103 var e = this; 94 var e = this;
104 a.get("/api/weshop/goods/page", { 95 a.get("/api/weshop/goods/page", {
105 isShowLoading: 0, 96 isShowLoading: 0,
@@ -177,31 +168,30 @@ Page({ @@ -177,31 +168,30 @@ Page({
177 //全选为收藏商品checked为true 168 //全选为收藏商品checked为true
178 allClick: function() { 169 allClick: function() {
179 var th = this; 170 var th = this;
  171 + var list=th.data.collects;
180 //判断是否全选 172 //判断是否全选
181 if (th.data.isall) { 173 if (th.data.isall) {
182 - for (var i = 0; i <= th.data.collects.length; i++) {  
183 - var collect = "collects[" + i + "].checked";  
184 - this.setData({  
185 - [collect]: false,  
186 - isall: 0  
187 - }) 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;
188 } 181 }
189 this.setData({ 182 this.setData({
190 - sum: 0 183 + sum: 0,isall:0,collects:list
191 }) 184 })
192 } else { 185 } else {
193 - for (var i = 0; i <= th.data.collects.length; i++) {  
194 - var collect = "collects[" + i + "].checked";  
195 - this.setData({  
196 - [collect]: true,  
197 - isall: 1  
198 - }) 186 + for (var i = 0; i < list.length; i++) {
  187 + list[i].checked=true;
199 } 188 }
200 this.setData({ 189 this.setData({
201 - sum: th.data.collects.length 190 + sum: th.data.collects.length,collects:list,isall:1
202 }) 191 })
203 } 192 }
204 }, 193 },
  194 +
205 //分页删除 195 //分页删除
206 alldelete: function(e) { 196 alldelete: function(e) {
207 var th = this; 197 var th = this;
@@ -211,7 +201,7 @@ Page({ @@ -211,7 +201,7 @@ Page({
211 isShowLoading: 0, 201 isShowLoading: 0,
212 success: function(e) { 202 success: function(e) {
213 th.setData({ 203 th.setData({
214 - collects: [] 204 + collects: [],total_collects:0,
215 }) 205 })
216 getApp().my_warnning("取消成功", 1, th); 206 getApp().my_warnning("取消成功", 1, th);
217 207
@@ -236,10 +226,10 @@ Page({ @@ -236,10 +226,10 @@ Page({
236 a.delete(url, { 226 a.delete(url, {
237 isShowLoading: 0, 227 isShowLoading: 0,
238 success: function(e) { 228 success: function(e) {
239 -  
240 th.setData({ 229 th.setData({
241 collects: new_colls, 230 collects: new_colls,
242 - sum: 0 231 + sum: 0,
  232 + total_collects:new_colls.length
243 }) 233 })
244 // th.select_checked(false,null); 234 // th.select_checked(false,null);
245 getApp().my_warnning("取消收藏成功", 1, th); 235 getApp().my_warnning("取消收藏成功", 1, th);
@@ -264,5 +254,9 @@ Page({ @@ -264,5 +254,9 @@ Page({
264 [collect]: check 254 [collect]: check
265 }) 255 })
266 } 256 }
  257 + },
  258 +
  259 + go_to:function (e) {
  260 + var url=e.currentTarget.dataset.url; getApp().goto(url);
267 } 261 }
268 }); 262 });
269 \ No newline at end of file 263 \ No newline at end of file
pages/user/collect_list/collect_list.json
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 "navigationBarTitleText": "我的收藏", 2 "navigationBarTitleText": "我的收藏",
3 "enablePullDownRefresh": false, 3 "enablePullDownRefresh": false,
4 "usingComponents": { 4 "usingComponents": {
5 - "warn": "/components/long_warn/long_warn" 5 + "warn": "/components/long_warn/long_warn",
  6 + "goods_recommend": "/components/goods_list/goods_list"
6 } 7 }
7 } 8 }
8 \ No newline at end of file 9 \ No newline at end of file
pages/user/collect_list/collect_list.wxml
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 <view class="commodity"> 37 <view class="commodity">
38 <!-- 商品数量 --> 38 <!-- 商品数量 -->
39 <view class="sum flex-vertical-between"> 39 <view class="sum flex-vertical-between">
40 - <view class="flex-center">共{{collects.length}}件商品</view> 40 + <view class="flex-center">共{{total_collects}}件商品</view>
41 <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view> 41 <view class="flex-right-vertical editEd" bindtap="editcollects">{{editEd?'完成':'编辑'}}</view>
42 </view> 42 </view>
43 <!-- 商品集合 --> 43 <!-- 商品集合 -->
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <!-- 商品图片 --> 49 <!-- 商品图片 -->
50 <view class="flex"> 50 <view class="flex">
51 <view class="{{editEd?'collect_image iconrp':'collect_image'}}"> 51 <view class="{{editEd?'collect_image iconrp':'collect_image'}}">
52 - <image src="{{item.original_img}}" onerror="this.src='../../../images/right.png'"></image> 52 + <image src="{{item.original_img}}" binderror="bind_bnerr" data-errimg="collects[{{index}}].original_img"></image>
53 </view> 53 </view>
54 54
55 <!-- 商品属性 --> 55 <!-- 商品属性 -->
@@ -75,10 +75,10 @@ @@ -75,10 +75,10 @@
75 </view> 75 </view>
76 76
77 <view class="money_right flex" wx:if="{{!editEd}}"> 77 <view class="money_right flex" wx:if="{{!editEd}}">
78 - <view class="similar flex-level fs20"> 78 + <view class="similar flex-level fs20" bindtap="go_to" data-url="/pages/goods/goodsList/goodsList?cat_id={{item.cat_id}}">
79 <view>找相似</view> 79 <view>找相似</view>
80 </view> 80 </view>
81 - <image src="../../../images/delete.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image> 81 + <image src="{{url}}miniapp/images/dele.png" bindtap="cancelCollect" data-id="{{item.collect_id}}"></image>
82 </view> 82 </view>
83 83
84 </view> 84 </view>
@@ -89,95 +89,23 @@ @@ -89,95 +89,23 @@
89 </view> 89 </view>
90 90
91 </view> 91 </view>
92 -  
93 </view> 92 </view>
94 93
95 -  
96 -  
97 - <view class="title" wx:if="{{collects.length>0}}">  
98 -  
99 - <!-- <view>  
100 -  
101 - <view class="China flex-level">  
102 - <view class="le flex-vertical">  
103 - <view class="one"></view>  
104 - <view class="two"></view>  
105 - <view class="three"></view>  
106 - </view>  
107 -  
108 - <view class="Recommend flex-level" bindtap="requestList">热门好物</view>  
109 -  
110 - <view class="le flex-vertical">  
111 - <view class="three flex-vertical"></view>  
112 - <view class="two"></view>  
113 - <view class="one"></view>  
114 - </view>  
115 - </view>  
116 -  
117 -  
118 - <view class="english flex-center">  
119 - <view class="silk"></view>  
120 - <view class="esh five-level-word">GOOD HOT THING</view>  
121 - <view class="silk"></view>  
122 - </view>  
123 -  
124 - </view> -->  
125 - <view class="Recommend flex-center">  
126 - <view class="lin"></view>  
127 - <view class="flex-center"> 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">
128 <image src="../../../images/Diamonds.png"></image> 99 <image src="../../../images/Diamonds.png"></image>
129 <view class="fs28">好物推荐</view> 100 <view class="fs28">好物推荐</view>
130 </view> 101 </view>
131 - <view class="lin"></view>  
132 - </view>  
133 -  
134 - <view class="collects">  
135 - <view class="hang ">  
136 -  
137 - <!-- 商品详情 -->  
138 - <view class="collect ib" wx:for="{{collects_Recommend}}">  
139 - <!-- 商品图片 -->  
140 - <image class="sp" src="{{iurl}}{{item.original_img}}" lazy-load="true" binderror="bind_bnerr2" data-url="../../../images/starsred" data-errorimg="../../../images/starsred"></image>  
141 - <view class="bottom">  
142 - <!-- 商品名称 -->  
143 - <view class="goods_name ellipsis-2 fs24">{{item.goods_name}}</view>  
144 - <!-- 商品价格 -->  
145 - <view class="money flex line">  
146 - <!-- 办卡价 -->  
147 - <view class="flex xc-wc line">  
148 - <view class="fs24">¥</view>  
149 - <view class="fs35">{{item.shop_price}}</view>  
150 - </view>  
151 - <!-- 原价 -->  
152 - <view class="price flex xc-ash">  
153 - <view class="fs24">¥</view>  
154 - <view class="fs24">{{item.market_price}}</view>  
155 - </view>  
156 -  
157 - </view>  
158 -  
159 - </view>  
160 -  
161 - </view>  
162 -  
163 - <view wx:if="{{loadName!=null}}" class="load fs26 xc-ash flex-center">{{loadName}}</view>  
164 - </view>  
165 -  
166 - <!-- 加载完毕提示 -->  
167 - <view class="nothing flex-center" wx:if="{{ismore!=0}}">  
168 - <view class="Foil"></view>  
169 - <view class="no_content fs24">没有更多内容了</view>  
170 - <view class="Foil"></view>  
171 - </view>  
172 -  
173 -  
174 -  
175 - </view>  
176 - 102 + <view class="lin"></view>
  103 + </view>
  104 + <!-- 好物推荐 -->
  105 + <goods_recommend id="goods_recommend"></goods_recommend>
177 </view> 106 </view>
178 -  
179 -  
180 </view> 107 </view>
  108 +
181 <!-- 全选收藏 --> 109 <!-- 全选收藏 -->
182 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}"> 110 <view class="abs flex-vertical" wx:if="{{editEd && collects.length>0}}">
183 <view class="left"> 111 <view class="left">
@@ -195,8 +123,6 @@ @@ -195,8 +123,6 @@
195 <view class="delete fs30 flex-center white" bindtap="alldelete"> 123 <view class="delete fs30 flex-center white" bindtap="alldelete">
196 删除 124 删除
197 </view> 125 </view>
198 -  
199 -  
200 </view> 126 </view>
201 127
202 -<warn id="warn"></warn>  
203 \ No newline at end of file 128 \ No newline at end of file
  129 +<warn id="warn"></warn>