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

# Conflicts:
#	package.json

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

@@ -60,7 +60,7 @@ body {
 
 
 .item-wrapper {
 .item-wrapper {
     padding: 40.96px 0 46.08px 0;
     padding: 40.96px 0 46.08px 0;
-    border-bottom: 1px solid #e0e0e0;
+    border-bottom: 0.5px solid #e0e0e0;
 
 
     &:last-child {
     &:last-child {
         border-bottom: 0;
         border-bottom: 0;
@@ -112,22 +112,29 @@ body {
     .item-info {
     .item-info {
         display: flex;
         display: flex;
         margin-top: 25.6px;
         margin-top: 25.6px;
-        max-height: 240px;
+        max-height: 204.8px;
         overflow: hidden;
         overflow: hidden;
         text-decoration: none;
         text-decoration: none;
         color: #000;
         color: #000;
 
 
         .item-detail {
         .item-detail {
-            display: flex;
-            flex-direction: column;
             flex: 1;
             flex: 1;
             margin-left: 34.13px;
             margin-left: 34.13px;
-            justify-content: space-between;
+            display: flex;
+            flex-direction: column;
+            position: relative;
+
+            &:before {
+                content: "";
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                z-index: -1;
+            }
 
 
             .desc-wrapper {
             .desc-wrapper {
                 margin-top: 8.5px;
                 margin-top: 8.5px;
                 -webkit-tap-highlight-color: transparent;
                 -webkit-tap-highlight-color: transparent;
-            }
 
 
                 .item-name {
                 .item-name {
                     font-size: 23.89px;
                     font-size: 23.89px;
@@ -153,28 +160,11 @@ body {
                     -webkit-box-orient: vertical;
                     -webkit-box-orient: vertical;
                     margin-top: 8.5px;
                     margin-top: 8.5px;
                 }
                 }
-
-            .action-tip {
-                font-size: 20.48px;
-                letter-spacing: 0.16px;
-                display: flex;
-                align-items: center;
-                margin-bottom: -6.83px;
-            }
-
-            .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;
             }
             }
 
 
             .like-option {
             .like-option {
-                font-size: 24px;
+                position: absolute;
+                top: 130px;
 
 
                 .like-option-btn {
                 .like-option-btn {
                     display: flex;
                     display: flex;