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

# Conflicts:
#	package.json

@@ -10,22 +10,22 @@
       <img class="lazy" src="{{image2 coverImage w=240 h=240 q=80 mode=2}}" alt="" />
     </div>
     <div class="item-detail">
-      <div class="desc-wrapper" onclick="onItemClick({{stringify this}})">
-        <div class="item-name">{{findGood.productName}}</div>
-        <div class="item-desc">{{content}}</div>
-      </div>
-      <div class="like-option">
-        <p class="like-option-btn {{#if findGood.isFavorite}}fav{{/if}}" onclick="onFavItemClick({{stringify this}}, this)">
-            <span class="fav-icon"></span>
-            <span class="fav-text">
-                {{#if findGood.favoriteNum}}
-                    {{findGood.favoriteNum}}人喜欢
-                {{else}}
-                    喜欢
-                {{/if}}
-            </span>
-        </p>
-    </div>
+        <div class="desc-wrapper" onclick="onItemClick({{stringify this}})">
+            <div class="item-name">{{findGood.productName}}</div>
+            <div class="item-desc">{{content}}</div>
+        </div>
+        <div class="like-option">
+            <p class="like-option-btn {{#if findGood.isFavorite}}fav{{/if}}" onclick="onFavItemClick({{stringify this}}, this)">
+                <span class="fav-icon"></span>
+                <span class="fav-text">
+                    {{#if findGood.favoriteNum}}
+                        {{findGood.favoriteNum}}人喜欢
+                    {{else}}
+                        喜欢
+                    {{/if}}
+                </span>
+            </p>
+        </div>
     </div>
   </div>
 </div>

 {
     "name": "yohobuywap-node-activity",
-    "version": "6.9.16-beta-1",
+    "version": "6.9.15-29",
     "private": true,
     "description": "A New Yohobuy Project With Express",
     "repository": {

@@ -60,7 +60,7 @@ body {
 
 .item-wrapper {
     padding: 40.96px 0 46.08px 0;
-    border-bottom: 1px solid #e0e0e0;
+    border-bottom: 0.5px solid #e0e0e0;
 
     &:last-child {
         border-bottom: 0;
@@ -112,69 +112,59 @@ body {
     .item-info {
         display: flex;
         margin-top: 25.6px;
-        max-height: 240px;
+        max-height: 204.8px;
         overflow: hidden;
         text-decoration: none;
         color: #000;
 
         .item-detail {
-            display: flex;
-            flex-direction: column;
             flex: 1;
             margin-left: 34.13px;
-            justify-content: space-between;
-
-            .desc-wrapper {
-                margin-top: 8.5px;
-                -webkit-tap-highlight-color: transparent;
-            }
+            display: flex;
+            flex-direction: column;
+            position: relative;
 
-            .item-name {
-                font-size: 23.89px;
-                letter-spacing: 0.18px;
-                display: -webkit-box;
-                -webkit-line-clamp: 2;
-                -webkit-box-orient: vertical;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                max-height: 92px;
-                font-weight: bold;
+            &:before {
+                content: "";
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                z-index: -1;
             }
 
-            .item-desc {
-                font-size: 18.77px;
-                color: #b0b0b0;
-                letter-spacing: 0;
-                max-height: 64px;
-                text-overflow: ellipsis;
-                display: -webkit-box;
-                -webkit-line-clamp: 2;
-                overflow: hidden;
-                -webkit-box-orient: vertical;
+            .desc-wrapper {
                 margin-top: 8.5px;
-            }
+                -webkit-tap-highlight-color: transparent;
 
-            .action-tip {
-                font-size: 20.48px;
-                letter-spacing: 0.16px;
-                display: flex;
-                align-items: center;
-                margin-bottom: -6.83px;
-            }
+                .item-name {
+                    font-size: 23.89px;
+                    letter-spacing: 0.18px;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 2;
+                    -webkit-box-orient: vertical;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    max-height: 92px;
+                    font-weight: bold;
+                }
 
-            .action-icon {
-                display: inline-block;
-                width: 32px;
-                height: 32px;
-                background: url("img/activity/find-goods-more@3x.png");
-                background-repeat: no-repeat;
-                background-position: center;
-                background-size: cover;
-                margin-left: 5.12px;
+                .item-desc {
+                    font-size: 18.77px;
+                    color: #b0b0b0;
+                    letter-spacing: 0;
+                    max-height: 64px;
+                    text-overflow: ellipsis;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 2;
+                    overflow: hidden;
+                    -webkit-box-orient: vertical;
+                    margin-top: 8.5px;
+                }
             }
 
             .like-option {
-                font-size: 24px;
+                position: absolute;
+                top: 130px;
 
                 .like-option-btn {
                     display: flex;