小程序3期开始2

pages/activity/activity.vue

@@ -103,7 +103,7 @@
 					<view class="list-center" @click="goDetail(item)">
 
 						<text class="title" v-if="item.IsBrackets==1">{{item.ActivityName}}</text>
-						<text class="title-two" v-else>艾尔复盘</text>
+						<text class="title-two" v-else>{{item.ActivityName}}</text>
 						<view class="setting-center">
 							<view class="">
 								<view class="box-expert" style="padding-bottom: 30rpx ;"
@@ -663,7 +663,9 @@
 						this.activityTypeName = str.join(',')
 					}
 					this.activityTypeIds = arr.join(',')
-				}
+				}
+				this.page_no = 1
+				this.collectList = []
 				this.getList()
 				this.selectComponent(`#${type}`).toggle();
 			},
@@ -917,7 +919,7 @@
 				border-radius: 35rpx;
 				padding-left: 34rpx;
 				color: #8D8D8D;
-				font-size: 24rpx;
+				font-size: 28rpx;
 
 				.search_ico {
 					padding-right: 16rpx;
@@ -1011,7 +1013,6 @@
 				box-sizing: border-box;
 				overflow: hidden;
 				margin-top: 30rpx;
-				// height: 396rpx;
 				width: 100%;
 				background: #FFFFFF;
 				box-shadow: 0px 3rpx 6rpx rgba(141, 141, 141, 0.16);

pages/activityDetail/activityDetail.vue

@@ -16,8 +16,7 @@
 				</view>
 				<text v-if="detailData.ChartPermissionName">所属行业：{{detailData.ChartPermissionName}}</text>
 				<text v-if="detailData.ActivityTimeText">活动时间：{{detailData.ActivityTimeText}}</text>
-				<text v-if="detailData.DistinguishedGuest">嘉&nbsp;&nbsp; &nbsp;
-					&nbsp;宾：{{detailData.DistinguishedGuest}}</text>
+				<text v-if="detailData.DistinguishedGuest">嘉&nbsp;&nbsp; &nbsp;&nbsp;宾：{{detailData.DistinguishedGuest}}</text>
 				<text v-if="detailData.Host">主&nbsp; 持&nbsp; 人：{{detailData.Host}}</text>
 				<text v-if="detailData.Expert">专&nbsp;&nbsp; &nbsp; &nbsp;家：{{detailData.Expert}}</text>
 				<text v-if="detailData.City">城&nbsp;&nbsp; &nbsp; &nbsp;市：{{detailData.City}}</text>
@@ -34,14 +33,16 @@
 					<text @click="phonebtn(detailData.AmericaTell)" class="phone">{{detailData.AmericaTell}}</text>
 
 				</view>
-				<text v-if="detailData.ReportLink">报告链接：{{detailData.ReportLink}}</text>
+				<!-- <text v-if="detailData.ReportLink">报告链接：{{detailData.ReportLink}}</text> -->
 
-				<text
-					v-if="detailData.OnlineParticipation">拨入密码：{{detailData.IsSignup==1?detailData.OnlineParticipation:'请报名获取'}}</text>
+				<!-- <view class=""> -->
+					<text v-if="detailData.ParticipationCode">拨入密码：{{detailData.ActivityTypeName=='公司调研电话会'&&detailData.IsSignup==0?'请报名获取':detailData.ParticipationCode}}</text>
+					<!-- <text>拨入密码： {{detailData.ParticipationCode}}</text> -->
+				<!-- </view> -->
 			</view>
 
 			<view class="network" v-if="detailData.OnlineParticipation">
-				<view class="network-left">网络参会：{{detailData.OnlineParticipation}} </view>
+				<view class="network-left">网络参会：</view>
 				<view class="network-right" @click="networkBtn" style="color: #2C83FF;">
 					{{detailData.OnlineParticipation}}
 				</view>
@@ -188,10 +189,7 @@
 						this.industryMsg = res.Data.PopupMsg.split('：', 1)
 						this.sellerMobile = res.Data.SellerMobile
 						if (res.Data.HasPermission == 1) {
-							console.log(11);
 							this.detailData = res.Data.Detail
-							console.log(res.Data.Detail);
-							console.log(this.detailData);
 							let pages = getCurrentPages()
 							let prevPage = pages[pages.length - 2]
 							const index = prevPage.$vm.collectList.findIndex(item => item.ActivityId == this.id)

pages/activitySearch/activitySearch.vue

@@ -109,7 +109,7 @@
 				<view class="" style="display: flex;">
 					<view class="list-center" @click="goDetail(item)">
 						<text class="title" v-if="item.IsBrackets==1">{{item.ActivityName}}</text>
-						<text class="title-two" v-else>艾尔复盘</text>
+						<text class="title-two" v-else>{{item.ActivityName}}</text>
 						<view class="setting-center">
 							<view class="">
 								<view class="box-expert" style="padding-bottom: 30rpx ;"
@@ -455,7 +455,6 @@
 				const times = date.getTime()
 				const num = new Date().getTime()
 				if (times - num <= 3600000) {
-					console.log(1);
 					uni.showModal({
 						confirmText: '知道了',
 						showCancel: false,
@@ -664,7 +663,9 @@
 						this.activityTypeName = str.join(',')
 					}
 					this.activityTypeIds = arr.join(',')
-				}
+				}
+				this.page_no = 1
+				this.collectList = []
 				this.getList()
 				this.selectComponent(`#${type}`).toggle();
 			},
@@ -874,7 +875,7 @@
 				align-items: center;
 
 				.sea_ipt_placeholder {
-					color: #E5E5E5;
+					color: #E5E5E5 !important;
 				}
 
 				.sea_ipt {

pages/applyTrial/applyTrial.vue

@@ -71,7 +71,7 @@
 			/* 上传图片 */
 			ChooseFile() {
 				this.$util.upload.Single(uploadurl,res=>{
-					console.log(res)
+					//console.log(res)
 					let data = JSON.parse(res.data)
 					if(data.Ret === 200) {
 						this.fileList = data.Data.ResourceUrl.split();

pages/authGuide/authGuide.vue

@@ -75,7 +75,7 @@
 					Signature: data.signature
 				}).then(res => {
 					if(res.Ret === 200) {
-						console.log(app.globalData)
+						//console.log(app.globalData)
 						/* 判断是否绑定过 未绑定去绑定 绑定过返回上一页面 */
 						app.globalData.isBind && uni.redirectTo({
 							url:'/pages/login/login'

pages/reportForm/reportForm.vue

@@ -12,11 +12,11 @@
 				<scroll-view scroll-x="true" scroll-with-animation class="scroll-tab" :scroll-into-view="'_'+tabIndex">
 					<block v-for="(item, index) in tabBars" :key="item.ChartPermissionId">
 						<view :id="'_'+index" class="scroll-tab-item"
-							:class="{ active: tabAct_id === item.ChartPermissionId }"
+							:class="{ active: tabAct_id == item.ChartPermissionId }"
 							@click.stop="toggleTab(item,index)">
 							{{item.PermissionName}}
 							<image src="@/static/img/border_act.png" mode="" class="border_act"
-								v-if="tabAct_id === item.ChartPermissionId"></image>
+								v-if="tabAct_id == item.ChartPermissionId"></image>
 						</view>
 					</block>
 				</scroll-view>
@@ -556,7 +556,7 @@
 					text-align: center;
 					display: inline-block;
 					padding: 0 8rpx 30rpx 8rpx;
-					margin-right: 70rpx;
+					margin-right: 50rpx;
 					border-bottom: 8rpx solid transparent;
 					position: relative;
 

pages/reportSearch/reportSearch.vue

@@ -226,7 +226,11 @@
 				this.getDataList();				
 			}
 		}),
-		onLoad() {
+		onLoad(options) {
+			if(options.text) {
+				this.searchTxt=options.text
+				this.getDataList();	
+			}
 			// 获取历史搜索记录
 			if(this.$db.get('historySearchListReport')) {
 				let historyList = JSON.parse(this.$db.get('historySearchListReport'));
@@ -235,7 +239,18 @@
 		},
 		onShow() {
 			this.getKeyWord()		
-		}
+		},
+		/**
+		 * 用户点击分享
+		 */
+		onShareAppMessage: function(res) {
+			return {
+				title: "报告",
+				path: '/pages/reportSearch/reportSearch?text='+this.searchTxt,
+				success: (res) => {},
+				fail: (err) => {}
+			}
+		},
 	}
 </script>