wxd / MShopWeApp

Commit 671e07221d0de7bf86bc93248e732355cedc9714

Authored by yvan.ni
2 parents 8ec14eb5 fc300ec7

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 3 changed files with 63 additions and 47 deletions
pages/goods/categoryList/categoryList.wxml
  View file @671e072
... ... @@ -122,9 +122,9 @@
122 122  
123 123  
124 124 <!-- 分类项目内容 22 -->
125   - <view class="flex project_height" style="margin-left:-10rpx;margin-bottom:120rpx; height: auto;" id="two_type">
  125 + <view class="flex project_height" style="height:100%;box-sizing:border-box;padding-bottom:100rpx;" id="two_type">
126 126 <!-- 分类项目的类型 -->
127   - <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;">
  127 + <view class="project_type" style="background-color:#eee;<!-- height:88%; -->overflow-y:auto;position:fixed;left:0;z-index:99;top:120rpx;">
128 128 <view class="project_type-frame" style="margin-bottom:120rpx;">
129 129 <view wx:if="{{is_show_gb}}" class="{{status_show == 1?'':''}}">
130 130 <!-- <view style="{{status_show == 1?'position: absolute;height: 52rpx;width: 6rpx;background-color: red;left: 0; margin-top: 24rpx;':''}}"></view> -->
... ... @@ -159,7 +159,7 @@
159 159  
160 160 </view>
161 161 <!-- 分类项目的内容 -->
162   - <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
  162 + <view class="classify_content" style="padding-left:196rpx;">
163 163 <!-- 国家的样式 -->
164 164 <block wx:if="{{select_classify_on==223&&is_show_gb}}">
165 165 <view class="classify_name fs28 flex-space-between">
... ... @@ -209,7 +209,7 @@
209 209 <!-- 品类-->
210 210 <block wx:if="{{is_show_pl}}">
211 211 <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
212   - <view>
  212 + <view class="my-container">
213 213 <view class="classify_name fs28 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
214 214 <view class="classify_title ellipsis-1">{{classify_name}}</view>
215 215 <view class="flex select_more" >
... ... @@ -220,7 +220,7 @@
220 220 <!-- 显示2级列表 -->
221 221 <view class="classify_content-frame flex-wrap">
222 222 <block wx:if="{{goodslist && goodslist.length>0}}">
223   - <block wx:for="{{goodslist}}" wx:for-item="goods"wx:for-index="indx">
  223 + <block wx:for="{{goodslist}}" wx:for-item="goods" wx:for-index="indx">
224 224 <view class="type_img_frame t-c ib" data-cid="{{goods.items.id}}" data-pid="{{goods.items.parent_id}}" bindtap="go_cate">
225 225 <image class=" type_img" src="{{goods.items.icoimg==null||goods.items.icoimg==''?iurl+'/miniapp/images/no_cate_def.png':goods.items.icoimg}}"binderror="goods_bnerr" data-err="goodslist[{{index}}].logo"></image>
226 226 <view class="brand_img_name fs24 ellipsis-1">{{goods.items.name}}</view>
... ... @@ -297,7 +297,7 @@
297 297 <!-- 分类项目内容 -->
298 298 <view class="flex project_height" style="margin-left:-10rpx;">
299 299 <!-- 分类项目的类型 -->
300   - <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:126rpx;" id="thress_type3">
  300 + <view class="project_type" style="background-color:#eee;height:88%;overflow-y:auto;position:fixed;left:0;z-index:99;top:120rpx;" id="thress_type3">
301 301 <view class="project_type-frame" style="margin-bottom:120rpx;">
302 302 <view wx:if="{{is_show_gb}}">
303 303 <view bindtap="click_classify" class="tab-bar-item {{select_classify_on==223 ? 'active' : ''}}" data-current="223" data-index="223" data-name="国家" wx:if="{{is_country}}">
... ... @@ -345,7 +345,7 @@
345 345 </view>
346 346 </view>
347 347 <!-- 分类项目的内容 -->
348   - <view class="classify_content" style="margin-left:27%;margin-top:130rpx">
  348 + <view class="classify_content" style="margin-left:27%;margin-top:120rpx">
349 349 <!-- 国家的样式 -->
350 350 <block wx:if="{{select_classify_on==223&&is_show_gb}}">
351 351 <view class="classify_name fs28 flex-space-between">
... ...
pages/goods/categoryList/categoryList.wxss
  View file @671e072
1 1 /*---nyf 2018-9-7---*/
2 2  
3   -page{height: 100%; background: #fff;}
  3 +page{height: 100%; background: #fff;padding-top:120rpx;box-sizing: border-box;}
4 4 .top_view{ width: 100%;background: #fff;}
5 5  
6 6 .swiper-tab{
... ... @@ -103,7 +103,7 @@ line-height: 50rpx;
103 103  
104 104 /*--国家--*/
105 105 .nation_box{ position: absolute;width: 260rpx; height: 160rpx; background-size: 100% 100%; background-repeat: no-repeat;
106   - top:110rpx;left: 50%; margin-left: -130rpx;z-index: 8; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAACACAYAAACLIbwOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkVDREM1NjhCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkVDREM1NjlCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyRUNEQzU2NkIwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyRUNEQzU2N0IwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlO56qEAAAFJSURBVHja7NfRCYAgFIbRDMd0Doe4a9ietxWUIjDOeZYefvhIS2aOA/jcaQIQH4gPEB+IDxAfiA8QH2ynzhyKiGYqWNN7vx7HN/MhYO2H5doJ3nwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EJ8JQHwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EB8gPhAfID4QHyA+EB8gPhAfID4QHyA+EB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPEB+ID8QHiA/EB4gPxAeID8QHiA/EB4gPxAeID8QH4gPEB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPxAeID8QHiA/EB4gPxAeID8QHiA/EB4gPxgfgA8YH4APGB+ADxgfgA8YH4APGB+ADxgfhAfID4QHyA+OB/6uzBiGjmgveUzBxmANdOEB8gPhAfID4QHyA+2MotwAD/ZBI/EDK5cgAAAABJRU5ErkJggg==");}
  106 + top:110rpx;left: 50%; /* margin-left: -130rpx; */z-index: 8; background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAN8AAACACAYAAACLIbwOAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MkVDREM1NjhCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MkVDREM1NjlCMDU3MTFFNjg3NEZDNzlCNDg1N0FGRjUiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyRUNEQzU2NkIwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyRUNEQzU2N0IwNTcxMUU2ODc0RkM3OUI0ODU3QUZGNSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PlO56qEAAAFJSURBVHja7NfRCYAgFIbRDMd0Doe4a9ietxWUIjDOeZYefvhIS2aOA/jcaQIQH4gPEB+IDxAfiA8QH2ynzhyKiGYqWNN7vx7HN/MhYO2H5doJ3nwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EJ8JQHwgPkB8ID5AfCA+QHwgPkB8ID5AfCA+EB8gPhAfID4QHyA+EB8gPhAfID4QHyA+EB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPEB+ID8QHiA/EB4gPxAeID8QHiA/EB4gPxAeID8QH4gPEB+IDxAfiA8QH4gPEB+IDxAfiA8QH4gPxAeID8QHiA/EB4gPxAeID8QHiA/EB4gPxgfgA8YH4APGB+ADxgfgA8YH4APGB+ADxgfhAfID4QHyA+OB/6uzBiGjmgveUzBxmANdOEB8gPhAfID4QHyA+2MotwAD/ZBI/EDK5cgAAAABJRU5ErkJggg==");}
107 107  
108 108 .n_img{width: 100%; height: 375rpx;}
109 109 .nt_1{height:82rpx; line-height: 100rpx;}
... ... @@ -177,7 +177,7 @@ line-height: 50rpx;
177 177 height: 120rpx;
178 178 z-index: 10;
179 179 background: #fff;
180   - border-top: 4rpx solid #eee;
  180 + /* border-top: 4rpx solid #eee; */
181 181 border-bottom: 1rpx solid #eee;
182 182  
183 183 }
... ... @@ -212,13 +212,14 @@ margin-top: 8rpx;
212 212  
213 213 }
214 214 .project_type{
  215 + box-sizing: border-box;
215 216 width: 26%;
216 217 height: 100%;
  218 + padding-bottom: 100rpx;
217 219 border-right: 1rpx solid #eee;
218 220 white-space: nowrap;
219   -overflow: hidden;
220   -overflow-y: scroll;
221   -
  221 + overflow: hidden;
  222 + overflow-y: scroll;
222 223 }
223 224 .share_type{
224 225 margin: auto;
... ... @@ -301,20 +302,16 @@ width: 60%;
301 302  
302 303 }
303 304 .classify_content{
304   - width: 72%
  305 + width: 100%
305 306  
306 307 }
307   - .classify_content-frame{
308   - width: 90%;
309   - margin: auto;
310   - flex-wrap:wrap;
311   - max-height: 90%;
312   - overflow-y:scroll;
313   - overflow: hidden scroll;
314   - padding-bottom: 65rpx;
315   -
316   -
317   - }
  308 + .classify_content-frame{
  309 + box-sizing: border-box;
  310 + width: 100%;
  311 + padding: 0 20rpx;
  312 + flex-wrap:wrap;
  313 + overflow-y:scroll;
  314 + }
318 315 .country_img-frame{
319 316 width: 48%;
320 317 height: 140rpx;
... ... @@ -331,12 +328,12 @@ width: 60%;
331 328  
332 329 }
333 330 .nation_box.box{
334   - top: 16%;
335   -width:80%;
336   -height:70%;
337   -left: 70.5%;
338   -overflow: hidden;
339   -
  331 + width:80%;
  332 + height:70%;
  333 + top: 50%;
  334 + left: 50%;
  335 + overflow: hidden;
  336 + transform: translate(-50%, -50%);
340 337 }
341 338 .nt_1.line-height{
342 339 line-height: 65rpx;
... ... @@ -363,10 +360,10 @@ line-height: 65rpx;
363 360 font-size: 24rpx;
364 361 }
365 362 .brand_img_frame{
366   - width: 45%;
  363 + width: 50%;
367 364 margin-top: 18rpx;
368   - margin-right: 15rpx;
369   - height: 160rpx;
  365 + /* margin-right: 15rpx; */
  366 + height: 160rpx;
370 367 }
371 368 .brand_img{
372 369 width:220rpx;
... ... @@ -375,13 +372,12 @@ line-height: 65rpx;
375 372 margin-top: 10rpx;
376 373  
377 374 }
378   - .type_img_frame{
379   - width: 30%;
  375 + .type_img_frame {
  376 + width: calc(100% / 3);
380 377 height: 140rpx;
381   - margin-top: 18rpx;
382   - margin-right: 15rpx;
383   -
384   -
  378 + margin-top: 20rpx;
  379 + margin-bottom: 20rpx;
  380 + /* margin-right: 15rpx; */
385 381 }
386 382  
387 383  
... ... @@ -504,7 +500,8 @@ margin: auto;
504 500 border-left: 8rpx solid #E41F19;
505 501 height: 50rpx;
506 502 left: 0;
507   - top:26rpx;
  503 + top:50%;
  504 + transform: translateY(-50%);
508 505 }
509 506  
510 507  
... ... @@ -517,11 +514,29 @@ margin: auto;
517 514 height: 110rpx;
518 515  
519 516 }
  517 +
  518 +
  519 + .classify_content > view:last-of-type .classify_content-frame {
  520 + padding-bottom: 100rpx;
  521 + }
  522 +
  523 + .classify_content > view:only-child .classify_content-frame {
  524 + padding-bottom: 0;
  525 + }
  526 +
  527 + .classify_content > .classify_content-frame {
  528 + padding-bottom: 118rpx;
  529 + }
  530 +
520 531  
521 532 page {
522   - overflow-x: hidden;
523   - padding-bottom: 40rpx;
  533 + /* overflow-x: hidden; */
  534 + /* padding-bottom: 40rpx; */
524 535 }
  536 +
  537 + /* .my-container {
  538 + padding-bottom: 118rpx;
  539 + } */
525 540  
526 541 /* 风格三商品列表样式引入 */
527 542 @import "../goodsList/goodsList.wxss";
528 543 \ No newline at end of file
... ...
pages/index/index/index.wxml
  View file @671e072
... ... @@ -392,10 +392,7 @@
392 392 <!--商品分组-->
393 393 <block wx:if="{{item.ename=='goodsGroup'}}">
394 394 <goodsGroup object="{{item.content}}"></goodsGroup>
395   - <!-- 技术支持 -->
396   - <view class="logo-container t-c">
397   - <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
398   - </view>
  395 +
399 396 </block>
400 397 <!--通知-->
401 398 <block wx:if="{{item.ename=='notice'}}">
... ... @@ -449,6 +446,10 @@
449 446  
450 447  
451 448 </block>
  449 + <!-- 技术支持 -->
  450 + <view class="logo-container t-c">
  451 + <view class="flex ai_c fs24 jc-center pdv20 white"><image src="{{url + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
  452 + </view>
452 453 </view>
453 454  
454 455 </block>
... ...