4 Commits 9d08110435 ... 75b47ce6a6

Autore SHA1 Messaggio Data
  bding 75b47ce6a6 Merge branch 'master' into 14.1 1 settimana fa
  bding 59e6af9599 14.1 ok 1 settimana fa
  bding 2ec4d07f7d 修改了 报名方式的方案 3 settimane fa
  bding 440a038f86 14.1 zoom 活动 3 settimane fa

+ 48 - 26
activityPages/activityDetail/activityDetail.vue

@@ -216,10 +216,16 @@
               <view class="item-left">链接参会:</view>
               <view class="item-right content-item-zoom" style="color: #376cbb">
                 <view>
-                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会' && detailData.IsLimitPeople">请报名获取 </view>
+                  <view class="default text_zoom" v-if="!detailData.IsSignup && detailData.ActivityTypeName == '公司调研电话会' && detailData.IsLimitPeople && detailData.IsZoom != 1"
+                    >请报名获取
+                  </view>
                   <blcok v-else>
-                    <text class="default text_zoom">{{ detailData.LinkParticipants }}</text>
-                    <view> 点击<text class="default copy-link copy-zoom" @click="copyLink(1)">复制链接</text>在手机浏览器打开,并输入会议密码 </view>
+                    <text class="default text_zoom" :style="{ color: detailData.IsZoom != 1 ? '#376cbb' : '#333' }">{{ detailData.LinkParticipants }}</text>
+                    <view class="click-copy">
+                      点击
+                      <view :class="['dustrial-li', 'dustrial-item','copy-link']" @click="copyLink(1)">复制链接 </view>
+                      <view>在手机浏览器打开</view>
+                    </view>
                   </blcok>
                 </view>
               </view>
@@ -230,8 +236,12 @@
                 <rich-text :nodes="detailData.AppAttendance"></rich-text>
               </view>
             </view>
+            <view v-if="detailData.MeetingId && isUserBindingPhoneNumber && haveAuth == 1 && detailData.IsZoom == 1" class="content-item">
+              <view class="item-left">会议 ID&nbsp;:</view>
+              <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.MeetingId }}</view>
+            </view>
             <view v-if="detailData.ConferencePassword && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
-              <view class="item-left">拨入密码:</view>
+              <view class="item-left">{{ detailData.IsZoom == 1 ? "会议密码" : "拨入密码" }}:</view>
               <view class="item-right">{{ detailData.ActivityTypeName == "公司调研电话会" && detailData.IsLimitPeople && !detailData.IsSignup ? "请报名获取" : detailData.ConferencePassword }}</view>
             </view>
             <view v-if="detailData.Address && isUserBindingPhoneNumber && haveAuth == 1" class="content-item">
@@ -692,7 +702,7 @@ export default {
             icon: "none",
             duration: 2000,
           });
-        },
+        }
       });
     },
     // 跳转产业标签
@@ -852,8 +862,6 @@ export default {
     this.id = option.id || "";
     this.isSendWx = option.IsSendWx || "";
     this.sourceType = option.sourceType || "";
-    console.log(option.detailDataShare);
-
     this.detailDataShare = option.detailDataShare ? JSON.parse(decodeURIComponent(option.detailDataShare) || {}) : "";
     // 详情页面不写路径
   },
@@ -889,8 +897,6 @@ export default {
       theme: this.detailData.ThemeText,
     };
     let detailDataShare = JSON.stringify(shaerObj).replace(/%/g, "%25");
-    console.log(detailDataShare, "--");
-
     return {
       title: this.detailData.ActivityName,
       query: "id=" + this.id + "&sourceType=微信分享&shareImag=" + this.detailData.MomentsImg + "&detailDataShare=" + encodeURIComponent(detailDataShare),
@@ -1032,23 +1038,6 @@ export default {
           padding-left: 0;
           margin-left: 0;
         }
-        .dustrial-li {
-          display: flex;
-          align-items: center;
-          font-size: 22rpx;
-          height: 40rpx;
-          padding: 0 13rpx;
-          margin: 0 20rpx 10rpx 0;
-          background-color: #f0f1f3;
-        }
-        .dustrial-item {
-          padding: 0 20rpx;
-          background: #e5efff;
-          border-radius: 4rpx;
-          color: $uni-color-new;
-          border-radius: 4rpx;
-          font-weight: 600;
-        }
       }
       .content-item-link {
         display: flex;
@@ -1126,6 +1115,23 @@ export default {
     overflow: hidden;
   }
 }
+.dustrial-li {
+  display: flex;
+  align-items: center;
+  font-size: 22rpx;
+  height: 40rpx;
+  padding: 0 13rpx;
+  margin: 0 20rpx 10rpx 0;
+  background-color: #f0f1f3;
+}
+.dustrial-item {
+  padding: 0 20rpx;
+  background: #e5efff;
+  border-radius: 4rpx;
+  color: $uni-color-new;
+  border-radius: 4rpx;
+  font-weight: 600;
+}
 .product-introduction-box {
   background-color: #f7f7f7;
   padding: 10rpx 0;
@@ -1253,4 +1259,20 @@ export default {
     margin-bottom: 20rpx;
   }
 }
+.click-copy {
+  display: flex;
+  flex-wrap: wrap;
+  view {
+    margin-left: 10rpx;
+    display: inline-block !important;
+  }
+  .copy-link {
+    margin-right: 0;
+  }
+}
+.text_zoom {
+  max-width: 80%;
+  word-wrap: break-word; /* 强制英文数字在边界处换行 */
+  overflow-wrap: break-word; /* 对于兼容性更好的情况 */
+}
 </style>

+ 3 - 3
activityPages/activityDetail/manageMixin.js

@@ -161,9 +161,9 @@ export default {
     // 我要报名
     wanttosignup() {
       if (
-        (!this.detailData.IsResearchPoints && this.detailData.ActivityTypeId == 3 && !this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1) ||
-        (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall) ||
-        (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1 && [1, 2].includes(this.detailData.ActivityTypeId))
+       ( (!this.detailData.IsResearchPoints && this.detailData.ActivityTypeId == 3 && !this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1) ||
+       (this.detailData.IsYidongConduct && this.detailData.IsCanOutboundCall) ||
+       (!this.detailData.IsYidongConduct && this.detailData.IsLimitPeople == 1 && [1, 2].includes(this.detailData.ActivityTypeId))) &&  this.detailData.IsZoom !=1
       ) {
         this.selectShow = true;
         this.selectYdong = this.detailData.IsYidongConduct;

+ 4 - 3
components/ItemComponent/activityItem.vue

@@ -215,9 +215,10 @@ export default {
         this.goDetail(item);
         return;
       } else if (
-        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
-        (item.IsYidongConduct && item.IsCanOutboundCall) ||
-        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
+        ((!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+          (item.IsYidongConduct && item.IsCanOutboundCall) ||
+          (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))) &&
+        item.IsZoom != 1
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;

+ 4 - 3
components/activity/indexActivity.js

@@ -53,9 +53,10 @@ export default {
         this.goDetail(item);
         return;
       } else if (
-        (!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
-        (item.IsYidongConduct && item.IsCanOutboundCall) ||
-        (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))
+        ((!item.IsResearchPoints && item.ActivityTypeId == 3 && !item.IsYidongConduct && item.IsLimitPeople == 1) ||
+          (item.IsYidongConduct && item.IsCanOutboundCall) ||
+          (!item.IsYidongConduct && item.IsLimitPeople == 1 && [1, 2].includes(item.ActivityTypeId))) &&
+        item.IsZoom != 1
       ) {
         this.selectShow = true;
         this.selectYdong = item.IsYidongConduct;