bd 3 سال پیش
والد
کامیت
b29155da8a

+ 9 - 29
activityPages/activityDetail/activityDetail.vue

@@ -149,7 +149,7 @@
               会议提醒
               <text>(会前15分钟推送微信消息提醒)</text>
             </view>
-            <view v-if="detailData.ActivityTypeId == 1" class="make-generation make-conference" @click="askingGo"> 帮我问 </view>
+            <view v-if="detailData.ActivityTypeId == 1" class="make-generation make-conference" @click="askingGo"> 帮我问 </view>
           </view>
         </view>
         <view class="bottom-env" v-else>
@@ -166,6 +166,12 @@
             </view>
           </view>
         </view>
+         <view  class="content-bottom" v-if="detailData.ActiveState == 2 && detailData.ActivityTypeId == 1">
+            <view class="make-conference"  @click="askingGo('提问')">
+              实时提问
+              <text>会议过程中,分析师可替您提问专家</text>
+            </view>
+          </view>
       </view>
       <!-- 参会方式的弹出层 -->
       <view class="select-box">
@@ -368,35 +374,9 @@ export default {
         url: "/pageMy/reportDetail/reportDetail?id=" + this.detailData.ArticleId,
       });
     },
-    askingGo() {
-      const str = this.detailData.ActivityTime.replace(/-/g, "/");
-      const date = new Date(str);
-      const times = date.getTime();
-      const num = new Date().getTime();
-      if (!this.detailData.IsResearch) {
-        if (times - num <= 900000) {
-          uni.showModal({
-            confirmText: "知道了",
-            showCancel: false,
-            confirmColor: "#3385FF",
-            content: "活动开始前15分钟内无法提交问题",
-          });
-          return;
-        }
-      } else {
-        if (times - num <= 3600000) {
-          uni.showModal({
-            confirmText: "知道了",
-            showCancel: false,
-            confirmColor: "#3385FF",
-            content: "活动开始前1小时内无法提交问题",
-          });
-          return;
-        }
-      }
-
+    askingGo(type = "") {
       uni.navigateTo({
-        url: "/activityPages/generationAsk/generationAsk?id=" + this.id,
+        url: "/activityPages/generationAsk/generationAsk?id=" + this.id + "&type=" + type,
       });
     },
     meetingReminderAdd() {

+ 8 - 103
activityPages/activitySearch/activitySearch.vue

@@ -144,7 +144,7 @@
           <view class="item">
             <view class="item-text" @click="goDetail(item)">
               <text class="activity-title"> {{ item.ActivityName }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙'">专家背景:{{ item.Expert }} </text>
+              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'">专家背景:{{ item.Expert }} </text>
               <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾:{{ item.DistinguishedGuest }} </text>
               <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人:{{ item.Speaker }}</text>
             </view>
@@ -159,7 +159,7 @@
               </view>
               <view class="bottom-box" v-else-if="item.ActivityType == 1">
                <view class="" style="width:130rpx">
-                  <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
+                  <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
                </view>
                 <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
                 <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
@@ -176,12 +176,15 @@
               </view>
             </block>
             <block v-else>
-               <view v-if="item.City" class="bottom-box city">
+               <view class="bottom-box city" v-if="item.City">
                 <view class="city-img">
                   <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" />
                   {{ item.City }}
                 </view>
-              </view>
+              </view>  
+               <view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
+                 <text class="button"  @click="askingGo(item,'提问')">实时提问</text>
+                </view>
             </block>
           </view>
         </view>
@@ -373,6 +376,7 @@ export default {
     //搜索记录进来
     searchHandle() {
       if (this.searchTxt) {
+         this.page_no = 1;
         //添加搜索记录
         if (!this.historySearchList.includes(this.searchTxt)) {
           this.historySearchList.unshift(this.searchTxt);
@@ -497,105 +501,6 @@ export default {
         }
       });
     },
-    // //取消弹框的确认事件
-    // cancelEnsure(obj, type, unm) {
-    // 		this.init()
-    // 		if (obj.cutId == 0 || obj.name == 'conference') return
-    // 		this.modification(obj.cutId, 'IsSignup', obj.state)
-    // 		this.collectList.forEach(item => {
-    // 			if (obj.cutId == item.ActivityId) {
-    // 				item.IsSignup = obj.state
-    // 				if (unm) {
-    // 					item.SignupNum = item.SignupNum - 1
-    // 					this.modification(obj.cutId, 'SignupNum', item.SignupNum > 0 ? item.SignupNum - 1 : 0)
-    // 				} else {
-    // 					this.modification(obj.cutId, 'SignupNum', item.SignupNum + 1)
-    // 					item.SignupNum = item.SignupNum + 1
-    // 				}
-    // 			}
-    // 		})
-    // },
-    // //添加会议提醒接口
-    // meetingReminderAdd(id) {
-    // 		
-    // 			uni.navigateTo({
-    // 				url: '/pageMy/login/login'
-    // 			})
-    // 			return
-    // 		}
-    // 		activity.meetingReminderAdd({
-    // 			ActivityId: id
-    // 		}).then(res => {
-    // 			if (res.Ret == 200) {
-    // 				this.hasPermission = res.Data.HasPermission
-    // 				if (this.hasPermission == 1) {
-    // 					if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data
-    // 						.GoFollow) {
-    // 						this.isShow = true
-    // 					} else {
-    // 						this.goFollow = res.Data.GoFollow
-    // 					}
-    // 					this.signupType = 999
-    // 					this.signupStatus = res.Data.SignupStatus
-    // 					this.idTypeCancel = {
-    // 						cutId: res.Data.ActivityId,
-    // 						state: 1,
-    // 						name: 'conference'
-    // 					}
-    // 					this.collectList.forEach(item => {
-    // 						if (id == item.ActivityId) {
-    // 							item.IsCancelMeetingReminder = 1
-    // 						}
-    // 						this.modification(id, 'IsCancelMeetingReminder', 1)
-    // 					})
-    // 				} else if (this.hasPermission == 2) {
-    // 					this.jurisdictionList.SellerMobile = res.Data.SellerMobile
-    // 					this.jurisdictionList.PopupMsg = res.Data.PopupMsg
-    // 					this.isShowhasPermission = true
-    // 				} else if (this.hasPermission == 3 || this.hasPermission == 4) {
-    // 					this.jurisdictionList.PopupMsg = res.Data.PopupMsg
-    // 					this.applyForIsShow = true
-    // 				}
-
-    // 			}
-    // 		})
-    // },
-    // //取消会议提醒接口
-    // meetingReminderCancel(id) {
-    // 		activity.meetingReminderCancel({
-    // 			ActivityId: id
-    // 		}).then(res => {
-    // 			if (res.Ret == 200) {
-    // 				uni.showModal({
-    // 					confirmText: '知道了',
-    // 					confirmColor: '#3385FF',
-    // 					content: res.Msg,
-    // 					showCancel: false,
-    // 					success: (res) => {
-    // 						if (res.confirm) {
-    // 							this.collectList.forEach(item => {
-    // 								if (id == item.ActivityId) {
-    // 									item.IsCancelMeetingReminder = 0
-    // 								}
-    // 								this.modification(id, 'IsCancelMeetingReminder', 0)
-    // 							})
-    // 						}
-    // 					}
-    // 				})
-    // 			}
-    // 		})
-    // },
-    //状态变化了同步活动页面的状态
-    // modification(id, type, num) {
-    // 		let pages = getCurrentPages()
-    // 		let prevPage = pages[pages.length - 2]
-    // 		if (prevPage.$page.fullPath == "/pages/activity/activity") {
-    // 			const index = prevPage.$vm.collectList.findIndex(item => item.ActivityId == id)
-    // 			if(index>=0) {
-    // 			prevPage.$vm.collectList[index][type] = num
-    // 			}
-    // 		}
-    // }
   },
   onShow() {
     this.countryCcode(); //判断是否加区号

+ 0 - 181
activityPages/components/index.scss

@@ -50,7 +50,6 @@
         }
       }
       .target-left {
-        // padding-right: 50rpx;
         border-right: 2rpx solid #e5e5e5;
       }
       .target-right {
@@ -71,9 +70,6 @@
         text {
           line-height: 37rpx;
           display: inline-block;
-          // max-width: 305rpx;
-
-          // text-overflow:ellipsis;
           white-space: nowrap;
           padding: 4rpx 14rpx;
         }
@@ -83,52 +79,6 @@
       }
     }
   }
-  // .top-content {
-  //   padding-bottom: 2rpx;
-  //   .tab {
-  //     display: flex;
-  //     font-size: 32rpx;
-  //     color: #707070;
-  //     .tab-item {
-  //       flex: 1;
-  //       text-align: center;
-  //       .scroll-tab-item {
-  //         height: 78rpx;
-  //         line-height: 48rpx;
-  //         position: relative;
-  //         .border_act {
-  //           position: absolute;
-  //           height: 6rpx;
-  //           width: 340rpx;
-  //           left: 0;
-  //           bottom: 0rpx;
-  //         }
-  //       }
-  //       .active {
-  //         color: #3385ff;
-  //         font-weight: bold;
-  //         font-size: 34rpx;
-  //       }
-  //     }
-  //   }
-  //   .index-fixed {
-  //     margin-top: 40rpx;
-  //     width: 100%;
-  //     display: flex;
-  //     align-items: center;
-  //     height: 70rpx;
-  //     background: #f6f6f6;
-  //     border: 1rpx solid #e5e5e5;
-  //     opacity: 1;
-  //     border-radius: 35rpx;
-  //     padding-left: 34rpx;
-  //     color: #8d8d8d;
-  //     font-size: 28rpx;
-  //     .search_ico {
-  //       padding-right: 16rpx;
-  //     }
-  //   }
-  // }
   .head {
     padding-top: 80rpx !important;
   }
@@ -270,137 +220,6 @@
       }
     }
   }
-  // .box-content {
-  //   padding: 200rpx 34rpx 20rpx;
-  //   background-color: #f7f7f7;
-  //   .content-list {
-  //     box-sizing: border-box;
-  //     overflow: hidden;
-  //     margin-top: 30rpx;
-  //     width: 100%;
-  //     background: #ffffff;
-  //     box-shadow: 0px 3rpx 6rpx rgba(141, 141, 141, 0.16);
-  //     border-radius: 16rpx;
-  //     font-size: 28rpx;
-  //     .list-top {
-  //       margin: 0 30rpx;
-  //       display: flex;
-  //       justify-content: space-between;
-  //       border-bottom: 1rpx solid #e5e5e5;
-  //       height: 82rpx;
-  //       line-height: 82rpx;
-  //       color: #333333;
-  //       font-size: 32rpx;
-  //       .list-top-box {
-  //         display: flex;
-
-  //         .title {
-  //           color: #333333;
-  //           font-size: 30rpx;
-  //           font-weight: bold;
-  //         }
-  //       }
-  //       .city {
-  //         margin-left: 40rpx;
-  //         display: flex;
-  //         color: #3385ff;
-  //         align-items: center;
-  //         font-size: 26rpx;
-
-  //         image {
-  //           width: 27rpx;
-  //           height: 32rpx;
-  //           margin-right: 12rpx;
-  //         }
-  //       }
-  //       .choose-limit {
-  //         position: relative;
-  //         display: flex;
-  //         align-items: center;
-  //         margin-left: 20rpx;
-  //         image {
-  //           width: 93rpx;
-  //           height: 38rpx;
-  //         }
-  //         .limit-img {
-  //           position: absolute;
-  //           top: 8rpx;
-  //           right: -30rpx;
-  //           width: 46rpx;
-  //           height: 26rpx;
-  //         }
-  //       }
-  //     }
-  //     .list-center {
-  //       width: 100%;
-  //       color: #333333;
-
-  //       .title {
-  //         padding: 20rpx 30rpx 24rpx 30rpx;
-  //         line-height: 46rpx;
-  //         color: #333;
-  //         font-size: 28rpx;
-  //         font-weight: bold;
-  //         text-indent: -14rpx;
-  //       }
-  //       .title-two {
-  //         padding-left: 30rpx;
-  //         padding-bottom: 24rpx;
-  //         padding-top: 20rpx;
-  //         line-height: 46rpx;
-  //         color: #333;
-  //         font-size: 28rpx;
-  //         font-weight: bold;
-  //       }
-  //       text {
-  //         padding-left: 30rpx;
-  //       }
-
-  //       .setting-center {
-  //         display: flex;
-  //         align-items: center;
-  //         justify-content: space-between;
-  //         padding-right: 30rpx;
-
-  //         .box-expert {
-  //           margin-left: 30rpx;
-  //           display: flex;
-  //         }
-  //       }
-  //     }
-  //     .list-bottom {
-  //       height: 80rpx;
-  //       .multi {
-  //         display: flex;
-  //         text-align: center;
-  //         line-height: 80rpx;
-  //         color: #3385ff;
-  //         text {
-  //           width: 50%;
-  //         }
-  //         .multi-outbound {
-  //           background: #3385ff;
-  //           color: #ffffff;
-  //           border-radius: 0px 0px 0px 16rpx;
-  //         }
-  //         .multi-remind {
-  //           background: #ebf4ff;
-  //           color: #3385ff;
-  //           border-radius: 0px 0px 16rpx 0px;
-  //         }
-  //       }
-  //       .multi-text {
-  //         line-height: 80rpx;
-  //         color: #ffffff;
-  //         width: 100%;
-  //         text-align: center;
-  //         background: #3385ff;
-  //         opacity: 1;
-  //         border-radius: 0px 0px 16rpx 16rpx;
-  //       }
-  //     }
-  //   }
-  // }
   .nodata {
     padding-top: 350rpx;
 

+ 3 - 28
activityPages/components/indexActivity.js

@@ -265,40 +265,15 @@ export default {
         });
       }
     },
-    //帮我代问
-  async  askingGo(item) {
-      const str = item.ActivityTime.replace(/-/g, "/");
-      const date = new Date(str);
-      const times = date.getTime();
-      const num = new Date().getTime();
-      if (item.ChartPermissionName !== "研选") {
-        if (times - num <= 900000) {
-          uni.showModal({
-            confirmText: "知道了",
-            showCancel: false,
-            confirmColor: "#3385FF",
-            content: "活动开始前15分钟内无法提交问题",
-          });
-          return;
-        }
-      } else {
-        if (times - num <= 3600000) {
-          uni.showModal({
-            confirmText: "知道了",
-            showCancel: false,
-            confirmColor: "#3385FF",
-            content: "活动开始前1小时内无法提交问题",
-          });
-          return;
-        }
-      }
+    //帮我带问
+  async  askingGo(item ,type ='') {
       const res = await activity.checkAskActivity({ActivityId:item.ActivityId })
       if (res.Ret == 200) {
         this.hasPermission = res.Data.HasPermission;
         this.jurisdictionList.ActivityId = res.Data.ActivityId;
         if (this.hasPermission == 1) {
           uni.navigateTo({
-            url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId,
+            url: "/activityPages/generationAsk/generationAsk?id=" + item.ActivityId + "&type=" + type,
           });
         } else if (this.hasPermission == 2) {
           this.jurisdictionList.SellerMobile = res.Data.SellerMobile;

+ 3 - 1
activityPages/components/indexActivity.scss

@@ -102,7 +102,9 @@
           }
         }
       }
-  
+      .real-time{
+        justify-content: flex-end !important;
+      }
       .bottom-box {
         display: flex;
         justify-content: space-between;

+ 1 - 1
activityPages/generationAsk/generationAsk.vue

@@ -60,7 +60,7 @@ export default {
     this.id = option.id;
     this.type = option.type || "";
     uni.setNavigationBarTitle({
-      title: this.type == "文章" ? "提问" : "帮我代问",
+      title: this.type == "文章" ? "提问" : this.type == "提问" ? "实时提问" : "帮我带问",
     });
   },
 };

+ 2 - 2
activityPages/themeActivity/themeActivity.vue

@@ -25,7 +25,7 @@
             <view class="item">
               <view class="item-text" @click="goDetail(item)">
                 <text class="activity-title"> {{ item.ActivityName }} </text>
-                <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙'">专家背景:{{ item.Expert }} </text>
+                <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'">专家背景:{{ item.Expert }} </text>
                 <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾:{{ item.DistinguishedGuest }} </text>
                 <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人:{{ item.Speaker }}</text>
               </view>
@@ -40,7 +40,7 @@
                 </view>
                 <view class="bottom-box" v-else-if="item.ActivityType == 1">
                   <view class="" style="width: 130rpx">
-                    <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
+                    <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
                   </view>
                   <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
                   <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>

+ 2 - 1
pageMy/reportDetail/reportDetail.vue

@@ -41,7 +41,8 @@ export default {
       isIphoneX: false, //判断机型
       reportInfo: "",
       linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-      //linkurl: "http://advisoryadmin.brilliantstart.cn/xcx_h5/raiReportDtl", //链接地址
+      //linkurl:'http://192.168.20.72:3000/xcx_h5/raiReportDtl',//线上链接地址
+     // linkurl: "http://advisoryadmin.brilliantstart.cn/xcx_h5/raiReportDtl", //链接地址
       showNav: false,
       id: "",
       isShowTip: false,

+ 16 - 5
pages/activity/activity.vue

@@ -82,15 +82,15 @@
             <image :src="item.ImgUrl">
             <text v-if="item.ActiveState == 1" class="img-status begin">未开始</text>
             <text v-else-if="item.ActiveState == 2" class="img-status proceed">进行中</text>
-            <text v-else class="img-status">已结束</text>
-            <view class="img-type">
-              <image :src="item.ImgUrlText" mode=""></image>
+            <text v-else class="img-status">已结束</text>
+            <view class="img-type">
+              <image :src="item.ImgUrlText" mode=""></image>
             </view>
           </view>
           <view class="item">
             <view class="item-text" @click="goDetail(item)">
               <text class="activity-title"> {{ item.ActivityName }} </text>
-              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙'">专家背景:{{ item.Expert }} </text>
+              <text class="text_twoLine" v-if="item.ActivityTypeName == '专家电话会' || item.ActivityTypeName == '专家线下沙龙' || item.ActivityTypeName == '研选电话会'">专家背景:{{ item.Expert }} </text>
               <text class="text_twoLine" v-if="item.ActivityTypeName == '公司调研电话会' || item.ActivityTypeName == '公司线下调研'">嘉宾:{{ item.DistinguishedGuest }} </text>
               <text class="text_twoLine" v-if="item.ActivityTypeName == '分析师电话会' || item.ActivityTypeName == '分析师线下沙龙'">主讲人:{{ item.Speaker }}</text>
             </view>
@@ -105,7 +105,7 @@
               </view>
               <view class="bottom-box" v-else-if="item.ActivityType == 1">
                 <view class="" style="width: 130rpx">
-                  <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
+                  <text v-if="item.ActivityTypeId == 1" @click="askingGo(item)">帮我问</text>
                 </view>
                 <text @click="meetingReminderAdd(item.ActivityId)" v-if="item.IsCancelMeetingReminder == 0">会议提醒</text>
                 <text @click="meetingReminderCancel(item.ActivityId)" v-else>取消提醒</text>
@@ -121,6 +121,17 @@
                 <text class="button" v-else @click="signupCancel(item.ActivityId, 3, item.ActivityTime)">取消报名</text>
               </view>
             </block>
+            <block v-else>
+               <view class="bottom-box city" v-if="item.City">
+                <view class="city-img">
+                  <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/location.png" />
+                  {{ item.City }}
+                </view>
+               </view>  
+               <view class="bottom-box real-time" v-if="item.ActiveState == 2 && item.ActivityTypeId == 1">
+                 <text class="button"  @click="askingGo(item,'提问')">实时提问</text>
+                </view>
+            </block>
           </view>
         </view>
       </view>