Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

src/pages/goods/detail.vue

@@ -93,7 +93,7 @@
             </view>
           </view>
         </view>
-        
+
         <Loading :type="2" :loadStatus="remarkLoadStatus" :dataList="remarkList" />
       </view>
 
@@ -510,14 +510,14 @@
         flex-shrink: 0;
         display: flex;
         align-items: center;
-        margin-left: 20rpx;
+        margin-left: 30rpx;
         .iconfont {
-          font-size: 30rpx;
+          font-size: 32rpx;
           color: $sec-font;
         }
         .text {
-          font-size: 26rpx;
-          margin-left: 4rpx;
+          font-size: 28rpx;
+          margin-left: 6rpx;
           color: $sec-font;
         }
         &.active {
@@ -603,7 +603,7 @@
       .left {
         font-size: 28rpx;
         word-break: break-all;
-        line-height: 36rpx;
+        line-height: 40rpx;
       }
       .right {
         flex-shrink: 0;
@@ -612,11 +612,11 @@
         display: flex;
         align-items: center;
         padding: 8rpx 12rpx;
-        margin-left: 40rpx;
+        margin-left: 30rpx;
         border-radius: 8rpx;
         .iconfont {
-          font-size: 24rpx;
-          margin-right: 4rpx;
+          font-size: 28rpx;
+          margin-right: 8rpx;
         }
       }
     }
@@ -628,8 +628,11 @@
       .it {
         margin-top: 16rpx;
         font-size: 28rpx;
-        line-height: 36rpx;
+        line-height: 40rpx;
         word-break: break-all;
+        &:hover {
+          background: #eaeaea;
+        }
         &:first-child {
           margin-top: 0;
         }

src/pages/mine/index.vue

@@ -373,6 +373,7 @@ export default {
       .text {
         margin-top: 8rpx;
         font-size: 24rpx;
+        font-weight: 500;
       }
     }
   }
@@ -387,10 +388,10 @@ export default {
     justify-content: space-between;
     .left {
       font-size: 32rpx;
-      font-weight: 500;
+      font-weight: 600;
     }
     .right {
-      font-size: 24rpx;
+      font-size: 28rpx;
       color: $sec-font;
       text {
         font-size: 28rpx;
@@ -408,12 +409,13 @@ export default {
       .icon {
         position: relative;
         .iconfont {
-          font-size: 48rpx;
+          font-size: 52rpx;
         }
       }
       .text {
         margin-top: 8rpx;
         font-size: 24rpx;
+        font-weight: 500;
       }
     }
   }

src/pages/mine/myEarnings/list.vue

@@ -28,7 +28,7 @@
         </view>
         <view class="right">
           <view class="status">{{item.status | statusFilter}}</view>
-          <view class="price">+{{item.amount | priceFilter}}</view>
+          <view class="price">¥{{item.amount | priceFilter}}</view>
         </view>
       </view>
     </view>
@@ -76,7 +76,7 @@
     methods: {
       getStats() {
         return new Promise((resolve, reject) => {
-          this.$api.get('/likeOrCollect/countLikeCollect', {
+          this.$api.postJson('/order/share/my/profit', {
             userId: this.$store.state.user.userId,
           }).then(res => {
             if (!res.data) return false;
@@ -248,4 +248,4 @@
 
     }
   }
-</style>
+</style>

src/styles/common.scss

@@ -114,19 +114,14 @@
         .it {
           display: flex;
           align-items: center;
-          margin-left: 20rpx;
+          margin-left: 30rpx;
           .iconfont {
-            font-size: 30rpx;
+            font-size: 32rpx;
             color: $sec-font;
-            display: flex;
-            align-items: center;
-            .iconfont {
-              margin-right: 4rpx;
-            }
           }
           .text {
-            font-size: 26rpx;
-            margin-left: 4rpx;
+            font-size: 28rpx;
+            margin-left: 6rpx;
             color: $sec-font;
           }
         }
@@ -142,6 +137,7 @@
     padding: 20rpx 30rpx;
     .top {
       display: flex;
+      align-items: center;
       image {
         width: 88rpx;
         height: 88rpx;
@@ -165,6 +161,7 @@
       }
       .status {
         color: $theme-color;
+        font-size: 28rpx;
       }
     }
     .goods {