fe / yohobuywap-node-activity · Commits

Go to a project

Authored by shuaiguo
Commit d46f014223bad2f86c8590a54b5d566935c03acd 2 parents 5e3bf12b e02c6b3e

Merge branch 'feature/find-goods' into feature/captcha 

# Conflicts:
#	package.json
Inline Side-by-side
Showing 3 changed files with 55 additions and 65 deletions
@@ -10,22 +10,22 @@ @@ -10,22 +10,22 @@
10 <img class="lazy" src="{{image2 coverImage w=240 h=240 q=80 mode=2}}" alt="" /> 10 <img class="lazy" src="{{image2 coverImage w=240 h=240 q=80 mode=2}}" alt="" />
11 </div> 11 </div>
12 <div class="item-detail"> 12 <div class="item-detail">
13 - <div class="desc-wrapper" onclick="onItemClick({{stringify this}})">  
14 - <div class="item-name">{{findGood.productName}}</div>  
15 - <div class="item-desc">{{content}}</div>  
16 - </div>  
17 - <div class="like-option">  
18 - <p class="like-option-btn {{#if findGood.isFavorite}}fav{{/if}}" onclick="onFavItemClick({{stringify this}}, this)">  
19 - <span class="fav-icon"></span>  
20 - <span class="fav-text">  
21 - {{#if findGood.favoriteNum}}  
22 - {{findGood.favoriteNum}}人喜欢  
23 - {{else}}  
24 - 喜欢  
25 - {{/if}}  
26 - </span>  
27 - </p>  
28 - </div> 13 + <div class="desc-wrapper" onclick="onItemClick({{stringify this}})">
  14 + <div class="item-name">{{findGood.productName}}</div>
  15 + <div class="item-desc">{{content}}</div>
  16 + </div>
  17 + <div class="like-option">
  18 + <p class="like-option-btn {{#if findGood.isFavorite}}fav{{/if}}" onclick="onFavItemClick({{stringify this}}, this)">
  19 + <span class="fav-icon"></span>
  20 + <span class="fav-text">
  21 + {{#if findGood.favoriteNum}}
  22 + {{findGood.favoriteNum}}人喜欢
  23 + {{else}}
  24 + 喜欢
  25 + {{/if}}
  26 + </span>
  27 + </p>
  28 + </div>
29 </div> 29 </div>
30 </div> 30 </div>
31 </div> 31 </div>
1 { 1 {
2 "name": "yohobuywap-node-activity", 2 "name": "yohobuywap-node-activity",
3 - "version": "6.9.16-beta-1", 3 + "version": "6.9.15-29",
4 "private": true, 4 "private": true,
5 "description": "A New Yohobuy Project With Express", 5 "description": "A New Yohobuy Project With Express",
6 "repository": { 6 "repository": {
@@ -60,7 +60,7 @@ body { @@ -60,7 +60,7 @@ body {
60 60
61 .item-wrapper { 61 .item-wrapper {
62 padding: 40.96px 0 46.08px 0; 62 padding: 40.96px 0 46.08px 0;
63 - border-bottom: 1px solid #e0e0e0; 63 + border-bottom: 0.5px solid #e0e0e0;
64 64
65 &:last-child { 65 &:last-child {
66 border-bottom: 0; 66 border-bottom: 0;
@@ -112,69 +112,59 @@ body { @@ -112,69 +112,59 @@ body {
112 .item-info { 112 .item-info {
113 display: flex; 113 display: flex;
114 margin-top: 25.6px; 114 margin-top: 25.6px;
115 - max-height: 240px; 115 + max-height: 204.8px;
116 overflow: hidden; 116 overflow: hidden;
117 text-decoration: none; 117 text-decoration: none;
118 color: #000; 118 color: #000;
119 119
120 .item-detail { 120 .item-detail {
121 - display: flex;  
122 - flex-direction: column;  
123 flex: 1; 121 flex: 1;
124 margin-left: 34.13px; 122 margin-left: 34.13px;
125 - justify-content: space-between;  
126 -  
127 - .desc-wrapper {  
128 - margin-top: 8.5px;  
129 - -webkit-tap-highlight-color: transparent;  
130 - } 123 + display: flex;
  124 + flex-direction: column;
  125 + position: relative;
131 126
132 - .item-name {  
133 - font-size: 23.89px;  
134 - letter-spacing: 0.18px;  
135 - display: -webkit-box;  
136 - -webkit-line-clamp: 2;  
137 - -webkit-box-orient: vertical;  
138 - overflow: hidden;  
139 - text-overflow: ellipsis;  
140 - max-height: 92px;  
141 - font-weight: bold; 127 + &:before {
  128 + content: "";
  129 + position: absolute;
  130 + width: 100%;
  131 + height: 100%;
  132 + z-index: -1;
142 } 133 }
143 134
144 - .item-desc {  
145 - font-size: 18.77px;  
146 - color: #b0b0b0;  
147 - letter-spacing: 0;  
148 - max-height: 64px;  
149 - text-overflow: ellipsis;  
150 - display: -webkit-box;  
151 - -webkit-line-clamp: 2;  
152 - overflow: hidden;  
153 - -webkit-box-orient: vertical; 135 + .desc-wrapper {
154 margin-top: 8.5px; 136 margin-top: 8.5px;
155 - } 137 + -webkit-tap-highlight-color: transparent;
156 138
157 - .action-tip {  
158 - font-size: 20.48px;  
159 - letter-spacing: 0.16px;  
160 - display: flex;  
161 - align-items: center;  
162 - margin-bottom: -6.83px;  
163 - } 139 + .item-name {
  140 + font-size: 23.89px;
  141 + letter-spacing: 0.18px;
  142 + display: -webkit-box;
  143 + -webkit-line-clamp: 2;
  144 + -webkit-box-orient: vertical;
  145 + overflow: hidden;
  146 + text-overflow: ellipsis;
  147 + max-height: 92px;
  148 + font-weight: bold;
  149 + }
164 150
165 - .action-icon {  
166 - display: inline-block;  
167 - width: 32px;  
168 - height: 32px;  
169 - background: url("img/activity/find-goods-more@3x.png");  
170 - background-repeat: no-repeat;  
171 - background-position: center;  
172 - background-size: cover;  
173 - margin-left: 5.12px; 151 + .item-desc {
  152 + font-size: 18.77px;
  153 + color: #b0b0b0;
  154 + letter-spacing: 0;
  155 + max-height: 64px;
  156 + text-overflow: ellipsis;
  157 + display: -webkit-box;
  158 + -webkit-line-clamp: 2;
  159 + overflow: hidden;
  160 + -webkit-box-orient: vertical;
  161 + margin-top: 8.5px;
  162 + }
174 } 163 }
175 164
176 .like-option { 165 .like-option {
177 - font-size: 24px; 166 + position: absolute;
  167 + top: 130px;
178 168
179 .like-option-btn { 169 .like-option-btn {
180 display: flex; 170 display: flex;