Merge branch '7.1' into 7.3

activityPages/activityDetail/activityDetail.vue

@@ -23,7 +23,9 @@
         <view v-if="detailData.Listndustrial.length" class="network dustrial-ui">
           <view class="network-left">产业标签：</view>
           <view class="network-right">
-            <view class="dustrial-item" @click="goDustrialHandler(item)" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">{{ item.IndustryName }}</view>
+            <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">{{
+              item.IndustryName
+            }}</view>
           </view>
         </view>
         <view v-if="detailData.ActivityTimeText" class="network">
@@ -806,14 +808,16 @@ export default {
   .dustrial-ui {
     margin-bottom: 10rpx !important;
   }
-  .dustrial-item {
+  .dustrial-li {
     display: inline-block;
+    padding: 0 13rpx;
+    margin: 0 20rpx 20rpx 0;
+  }
+  .dustrial-item {
     background: #edf4ff;
     border: 1px solid #3385ff;
-    padding: 0 13rpx;
     border-radius: 4rpx;
     color: #3385ff;
-    margin: 0 20rpx 20rpx 0;
   }
 }
 </style>

pageMy/search/search.vue

@@ -476,6 +476,7 @@ export default {
             line-height: 40rpx;
             color: #7f7f7f;
             display: -webkit-box;
+            word-break: break-all;
             text {
               display: inline;
             }