Merge branch 'master' into 12.2

activityPages/activityDetail/activityDetail.vue

@@ -841,6 +841,13 @@ export default {
       height: 318rpx;
     }
   }
+  .new_icon {
+    width: 60rpx;
+    height: 30rpx;
+    margin: 0 20rpx 20rpx 0;
+    display: inline-block;
+    vertical-align: middle;
+  }
   .activity-content {
     width: 100%;
     padding: 20rpx 30rpx 100rpx;

activityPages/components/selectCss.scss

@@ -87,11 +87,12 @@
     border-radius: 26rpx;
     background-color: #f8f8fa;
     flex-shrink: 0;
+    margin-right: 20rpx;
   }
 
   .screen-item-ul {
     height: 80rpx !important;
-    margin-top: -35rpx;
+    margin-top: -30rpx;
   }
 }
 

pages-purchaser/lastestReport/lastestReport.vue

@@ -293,7 +293,7 @@ export default {
         background-position: center;
         background-repeat: no-repeat;
         font-weight: 500;
-        font-size: 32rpx;
+        font-size: 24rpx;
         color: white;
         line-height: 45rpx;
         padding: 20rpx;

pages-purchaser/researchList/researchList.vue

@@ -384,7 +384,7 @@ export default {
         background-position: center;
         background-repeat: no-repeat;
         font-weight: 500;
-        font-size: 32rpx;
+        font-size: 24rpx;
         color: white;
         line-height: 45rpx;
         padding: 20rpx;

pages-search/components/report.vue

@@ -338,7 +338,7 @@ export default {
         background-position: center;
         background-repeat: no-repeat;
         font-weight: 500;
-        font-size: 32rpx;
+        font-size: 24rpx;
         color: white;
         line-height: 45rpx;
         padding: 20rpx;

pages/reportForm/index.scss

@@ -1,6 +1,6 @@
 .reportForm-container {
   background-color: $uni-bg-color;
-
+  overflow: hidden;
   .index-fixed {
     width: 750rpx;
     position: fixed;
@@ -407,7 +407,7 @@
       background-position: center;
       background-repeat: no-repeat;
       font-weight: 500;
-      font-size: 32rpx;
+      font-size: 24rpx;
       color: white;
       line-height: 45rpx;
       padding: 20rpx;
@@ -456,4 +456,4 @@
   width: 32rpx;
   height: 32rpx;
   margin-right: 10rpx;
-}
+}

reportPages/hotList/hotList.vue

@@ -364,7 +364,7 @@ export default {
         background-position: center;
         background-repeat: no-repeat;
         font-weight: 500;
-        font-size: 32rpx;
+        font-size: 24rpx;
         color: white;
         line-height: 45rpx;
         padding: 20rpx;