merge 修复bug

activityPages/activityDetail/activityDetail.vue

@@ -122,7 +122,7 @@
               <view class="item-right dustrial-content">
                 <view class="item" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">
                   <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)">{{ item.IndustryName }} </view>
-                  <image v-if="item.IndustryNewLabel"  class="new_icon" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png" mode=""></image>
+                  <image v-if="item.IndustryNewLabel" class="new_icon" src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png" mode=""></image>
                 </view>
               </view>
             </view>
@@ -256,7 +256,7 @@
                 </view>
               </block>
               <view class="content-bottom" v-if="detailData.ActiveState == 2 && detailData.ActivityTypeId == 1">
-                <view class="make-conference" @click="askingGo('提问')">
+                <view class="make-conference make-conference-remind" @click="askingGo('提问')">
                   实时提问
                   <text>会议过程中，分析师可替您提问专家</text>
                 </view>
@@ -554,13 +554,13 @@ export default {
     // 跳转新的小程序
     networkBtn() {
       if (this.detailData.OnlineParticipation.includes("http")) {
-      console.log(1);
+        console.log(1);
 
         uni.navigateTo({
           url: "/activityPages/networkAttend/networkAttend?url=" + this.detailData.OnlineParticipation,
         });
       } else {
-      console.log(2);
+        console.log(2);
 
         uni.navigateToMiniProgram({
           appId: "wxade30ff0c4ee757d",
@@ -961,5 +961,37 @@ export default {
     height: 48rpx;
     margin: -20rpx 0 0 -30rpx;
   }
+  .sign-in-img-box {
+    width: 704rpx;
+    height: 1121rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+    overflow: hidden;
+    image {
+      width: 100%;
+      height: calc(100% - 108rpx);
+    }
+    .button-box {
+      display: flex;
+      align-items: center;
+      height: 102rpx;
+      border-top: 1rpx solid #f0f0f0;
+      text {
+        flex: 1;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      text:last-child {
+        border-left: 1rpx solid #f0f0f0;
+        color: #3385ff;
+      }
+    }
+  }
+  .custom-class-popup {
+    border-radius: 8rpx;
+    overflow: hidden;
+  }
 }
 </style>