fe / yohobuywap-node · Commits

Go to a project

Authored by baoss
Commit 9a317957a6e94e750cf61cdaae73bd6f6ea6fb64 1 parent b1af3cc6

UI调整 review by bevishuang

Inline Side-by-side
Showing 12 changed files with 49 additions and 18 deletions
@@ -225,6 +225,16 @@ class GroupService extends global.yoho.BaseModel { @@ -225,6 +225,16 @@ class GroupService extends global.yoho.BaseModel {
225 let code = indexFilter.resources_code; 225 let code = indexFilter.resources_code;
226 226
227 result.floors = code && await this.newIndex(code); 227 result.floors = code && await this.newIndex(code);
  228 + result.floors.map(item => {
  229 + if (item.template_name === 'collageBuyPrdList') {
  230 + item.data.data.prdList.map(listItem => {
  231 + // eslint-disable-next-line max-len
  232 + listItem.collagedPersonNum = listItem.collagedPersonNum > 10000 ? (listItem.collagedPersonNum / 10000).toFixed(1) + '万' : listItem.collagedPersonNum;
  233 + return listItem;
  234 + });
  235 + }
  236 + return item;
  237 + });
228 result.filterGroupList = await this.filterGroupList({ 238 result.filterGroupList = await this.filterGroupList({
229 ...query 239 ...query
230 }); 240 });
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 {{/if}} 21 {{/if}}
22 {{> group/resources/filter-tab}} 22 {{> group/resources/filter-tab}}
23 </div> --}} 23 </div> --}}
24 - <div class="goods-list-title">猜你喜欢</div> 24 + {{!-- <div class="goods-list-title">猜你喜欢</div> --}}
25 <div id="goodsContainer" class="goods-container"> 25 <div id="goodsContainer" class="goods-container">
26 {{#if filterList.length}} 26 {{#if filterList.length}}
27 <div class="new-goods-list"> 27 <div class="new-goods-list">
1 -<div class="banner-top templates" data-f-name="{{template_name}}" data-f-id="{{template_id}}" data-id="{{@index}}" {{#ifcond is_extend '!==' '1'}}style="margin: 0 15px"{{/ifcond}}> 1 +<div class="banner-top templates {{#ifcond is_extend '!==' '1'}}pad{{/ifcond}}" data-f-name="{{template_name}}" data-f-id="{{template_id}}" data-id="{{@index}}">
2 <div class="banner-swiper swiper-container"> 2 <div class="banner-swiper swiper-container">
3 <ul class="swiper-wrapper"> 3 <ul class="swiper-wrapper">
4 {{#each data}} 4 {{#each data}}
1 {{#data}} 1 {{#data}}
2 -<div class="split-image templates" data-id="{{@index}}" data-f-name="{{../template_name}}" data-f-id="{{../template_id}}" {{#ifcond ../is_extend '!==' '1'}}style="margin: 0 15px"{{/ifcond}}> 2 +<div class="split-image templates {{#ifcond ../is_extend '!==' '1'}}pad{{/ifcond}}" data-id="{{@index}}" data-f-name="{{../template_name}}" data-f-id="{{../template_id}}">
3 <img src="{{image2 src w=../image_width h=../image_height q=60 mode=3}}"></img> 3 <img src="{{image2 src w=../image_width h=../image_height q=60 mode=3}}"></img>
4 <div class='url-content'> 4 <div class='url-content'>
5 {{#each urls}} 5 {{#each urls}}
@@ -88,6 +88,7 @@ @@ -88,6 +88,7 @@
88 "uglifyjs-webpack-plugin": "^2.1.3", 88 "uglifyjs-webpack-plugin": "^2.1.3",
89 "urlencode": "^1.1.0", 89 "urlencode": "^1.1.0",
90 "uuid": "^3.2.1", 90 "uuid": "^3.2.1",
  91 + "vue-loader": "^15.8.1",
91 "xml2js": "^0.4.19", 92 "xml2js": "^0.4.19",
92 "yoho-express-session": "^2.0.0", 93 "yoho-express-session": "^2.0.0",
93 "yoho-md5": "^2.0.0", 94 "yoho-md5": "^2.0.0",
  1 +/* eslint-disable max-len */
1 2
2 import qs from 'yoho-qs'; 3 import qs from 'yoho-qs';
3 const yoho = require('js/yoho-app'); 4 const yoho = require('js/yoho-app');
@@ -69,9 +70,9 @@ class ResourceShowYasRpter { @@ -69,9 +70,9 @@ class ResourceShowYasRpter {
69 let cacheTheShowSkns = []; // 暂存此次上报的楼层，上报后复制给 lastReportSkns 70 let cacheTheShowSkns = []; // 暂存此次上报的楼层，上报后复制给 lastReportSkns
70 let tabParams = {}; 71 let tabParams = {};
71 72
72 - tabParams.TAB_NAME = $('.guess-like-tab-active').parent().data('tab-name');  
73 - tabParams.TAB_ID = $('.guess-like-tab-active').parent().data('item-idx') + 1;  
74 - tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code'); 73 + tabParams.TAB_NAME = $('.guess-like-tab-active').parent().data('tab-name') || $('.guess-tab-active').parent().data('tab-name');
  74 + tabParams.TAB_ID = $('.guess-like-tab-active').parent().data('item-idx') + 1 || $('.guess-tab-active').parent().data('item-idx') + 1;
  75 + tabParams.P_PARAM = $('.guess-like-tab-active').parent().data('code') || $('.guess-tab-active').parent().data('code');
75 76
76 $('.templates').each((floorIndex, theFloor) => { 77 $('.templates').each((floorIndex, theFloor) => {
77 let $theFloor = $(theFloor); 78 let $theFloor = $(theFloor);
@@ -102,6 +103,7 @@ class ResourceShowYasRpter { @@ -102,6 +103,7 @@ class ResourceShowYasRpter {
102 } 103 }
103 }); 104 });
104 105
  106 + // console.log('ssss', floorsRawArr)
105 $theFloor.find('.split-item').each((aIndex, theA) => { 107 $theFloor.find('.split-item').each((aIndex, theA) => {
106 let $theA = $(theA); 108 let $theA = $(theA);
107 let href = $theA.data('href'); 109 let href = $theA.data('href');
@@ -140,6 +142,8 @@ class ResourceShowYasRpter { @@ -140,6 +142,8 @@ class ResourceShowYasRpter {
140 F_NAME 142 F_NAME
141 }); 143 });
142 } 144 }
  145 +
  146 + // console.log('prd', floorsRawArr)
143 }); 147 });
144 } 148 }
145 149
@@ -162,6 +166,7 @@ class ResourceShowYasRpter { @@ -162,6 +166,7 @@ class ResourceShowYasRpter {
162 newParams.ACTION_URL = goodsRawObj.href; 166 newParams.ACTION_URL = goodsRawObj.href;
163 } 167 }
164 this.reportParams.DATA.push(newParams); 168 this.reportParams.DATA.push(newParams);
  169 + console.log(this.reportParams.DATA);
165 } 170 }
166 } 171 }
167 }); 172 });
@@ -214,6 +219,7 @@ class ResourceShowYasRpter { @@ -214,6 +219,7 @@ class ResourceShowYasRpter {
214 }; 219 };
215 220
216 this.reportParams.DATA.push(newParams); 221 this.reportParams.DATA.push(newParams);
  222 + console.log(this.reportParams.DATA);
217 } 223 }
218 224
219 cacheTheShowSkns.push(goodsRawObj.PRD_SKN); 225 cacheTheShowSkns.push(goodsRawObj.PRD_SKN);
@@ -38,6 +38,10 @@ @@ -38,6 +38,10 @@
38 } 38 }
39 } 39 }
40 40
  41 +.pad {
  42 + margin: 0 20px;
  43 +}
  44 +
41 .banner-swiper { 45 .banner-swiper {
42 position: static; 46 position: static;
43 max-height: 312px; 47 max-height: 312px;
@@ -43,15 +43,16 @@ @@ -43,15 +43,16 @@
43 } 43 }
44 44
45 .guess-like-tab { 45 .guess-like-tab {
46 - width: 160px; 46 + width: 140px;
47 line-height: 88px; 47 line-height: 88px;
48 text-align: center; 48 text-align: center;
49 font-size: 28px; 49 font-size: 28px;
  50 + font-weight: 600;
50 color: #b0b0b0; 51 color: #b0b0b0;
51 } 52 }
52 53
53 .guess-like-tab-active { 54 .guess-like-tab-active {
54 - font-size: 32px; 55 + font-size: 34px;
55 font-weight: bold; 56 font-weight: bold;
56 color: #222; 57 color: #222;
57 } 58 }
@@ -27,3 +27,7 @@ @@ -27,3 +27,7 @@
27 } 27 }
28 } 28 }
29 } 29 }
  30 +
  31 +.pad {
  32 + margin: 0 20px;
  33 +}
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 } 18 }
19 19
20 .tab-content { 20 .tab-content {
21 - padding-top: 80px; 21 + padding-top: 88px;
22 } 22 }
23 23
24 .bottom { 24 .bottom {
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 font-family: PingFang-SC-Regular, sans-serif; 57 font-family: PingFang-SC-Regular, sans-serif;
58 color: #222; 58 color: #222;
59 letter-spacing: 0; 59 letter-spacing: 0;
60 - line-height: 30px; 60 + line-height: 1.6;
61 font-size: 28px; 61 font-size: 28px;
62 display: -webkit-box; 62 display: -webkit-box;
63 overflow: hidden; 63 overflow: hidden;
@@ -71,13 +71,13 @@ @@ -71,13 +71,13 @@
71 .new-group-invite, 71 .new-group-invite,
72 .new-group-free-post1 { 72 .new-group-free-post1 {
73 padding: 0 10px; 73 padding: 0 10px;
74 - height: 30px; 74 + height: 32px;
75 font-size: 18px; 75 font-size: 18px;
76 color: #fff; 76 color: #fff;
77 background-color: #ff575c; 77 background-color: #ff575c;
78 text-align: center; 78 text-align: center;
79 - line-height: 30px;  
80 - border-radius: 30px; 79 + line-height: 32px;
  80 + border-radius: 32px;
81 margin-right: 10px; 81 margin-right: 10px;
82 } 82 }
83 83
@@ -102,6 +102,7 @@ @@ -102,6 +102,7 @@
102 background: url("img/activity/group/group/go-group@3x.png") no-repeat; 102 background: url("img/activity/group/group/go-group@3x.png") no-repeat;
103 background-size: contain; 103 background-size: contain;
104 left: -5px; 104 left: -5px;
  105 + margin-bottom: 10px;
105 } 106 }
106 107
107 .group-free-number { 108 .group-free-number {
@@ -114,8 +115,8 @@ @@ -114,8 +115,8 @@
114 font-family: PingFang-SC-Regular, sans-serif; 115 font-family: PingFang-SC-Regular, sans-serif;
115 letter-spacing: 0; 116 letter-spacing: 0;
116 box-sizing: border-box; 117 box-sizing: border-box;
117 - height: 30px;  
118 - line-height: 30px; 118 + height: 32px;
  119 + line-height: 32px;
119 padding-left: 10px; 120 padding-left: 10px;
120 padding-right: 10px; 121 padding-right: 10px;
121 border-radius: 15px; 122 border-radius: 15px;
@@ -126,7 +127,7 @@ @@ -126,7 +127,7 @@
126 .forcefontsize10 { 127 .forcefontsize10 {
127 display: inline-block; 128 display: inline-block;
128 font-size: 18px; 129 font-size: 18px;
129 - font-weight: 1000; 130 + // font-weight: 1000;
130 } 131 }
131 132
132 .new-group-prict-bg { 133 .new-group-prict-bg {
@@ -151,9 +152,13 @@ @@ -151,9 +152,13 @@
151 margin-bottom: 4px; 152 margin-bottom: 4px;
152 } 153 }
153 154
  155 + .new-group-people-numer {
  156 + font-size: 24px;
  157 + }
  158 +
154 .new-group-price-collage { 159 .new-group-price-collage {
155 margin-left: 10px; 160 margin-left: 10px;
156 - font-size: 30px; 161 + font-size: 36px;
157 font-weight: bold; 162 font-weight: bold;
158 font-family: BrownStd-Bold, sans-serif; 163 font-family: BrownStd-Bold, sans-serif;
159 } 164 }
@@ -166,7 +171,7 @@ @@ -166,7 +171,7 @@
166 171
167 .new-group-price-market { 172 .new-group-price-market {
168 font-family: PingFang-SC-Regular, sans-serif; 173 font-family: PingFang-SC-Regular, sans-serif;
169 - font-size: 22px; 174 + font-size: 24px;
170 color: #b0b0b0; 175 color: #b0b0b0;
171 } 176 }
172 177
This diff could not be displayed because it is too large.