cygx 3.1

activityPages/activityDetail/activityDetail.vue

@@ -9,95 +9,95 @@
 				<view v-if="detailData.ActivityName" class="dialog-title" :class="1==1?'brackets-title':''">{{detailData.ActivityName}}</view>
 				<view class="city-box">
 					<text v-if="detailData.ActivityTypeName" >活动类型：</text>
-					<view class="city" >
+					<view class="city" >
 						<text style="color: #333;">{{detailData.ActivityTypeName}}</text>
 						<image v-if="detailData.City" style="margin-left: 15rpx" src="../../static/img/location.png" mode=""></image>
 						<text v-if="detailData.City">{{detailData.City}}</text>
 					</view>
-				</view>
-				<view v-if="detailData.ChartPermissionName" class="network">
-					<view class="network-left">所属行业：</view>
-					<view class="network-right">{{detailData.ChartPermissionName}}</view>
-				</view>
-				<view v-if="detailData.ActivityTimeText" class="network">
-					<view class="network-left">活动时间：</view>
-					<view class="network-right">{{detailData.ActivityTimeText}}</view>
-				</view>
-				<view v-if="detailData.DistinguishedGuest" class="network">
-					<view class="network-left" >嘉&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;宾：</view>
-					<view class="network-right">{{detailData.DistinguishedGuest}}</view>
-				</view>
-				<view v-if="detailData.Host" class="network">
-					<view class="network-left">主&nbsp;&nbsp;持&nbsp;人：</view>
-					<view class="network-right">{{detailData.Host}}</view>
-				</view>
-				<view v-if="detailData.Speaker" class="network">
-					<view class="network-left">主&nbsp;&nbsp;讲&nbsp;人：</view>
-					<view class="network-right">{{detailData.Speaker}}</view>
-				</view>
-				<view v-if="detailData.Expert" class="network">
-					<view class="network-left">专家背景：</view>
-					<view class="network-right">
-						 <rich-text :nodes="detailData.Expert"></rich-text>
-					</view>
-				</view>
-				<view v-if="detailData.MainlandTell" class="network">
-					<view class="network-left">大陆拨入：</view>
-					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.MainlandTell)">{{detailData.MainlandTell}}</view>
-				</view>
-				<view v-if="detailData.HongKongTell" class="network">
-					<view class="network-left">香港拨入：</view>
-					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.HongKongTell)">{{detailData.HongKongTell}}</view>
-				</view>
-				<view v-if="detailData.TaiwanTell" class="network">
-					<view class="network-left">台湾拨入：</view>
-					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.TaiwanTell)">{{detailData.TaiwanTell}}</view>
-				</view>
-				<view v-if="detailData.AmericaTell" class="network">
-					<view class="network-left">美国拨入：</view>
-					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.AmericaTell)">{{detailData.AmericaTell}}</view>
-				</view>
-				<view v-if="detailData.ParticipationCode" class="network">
-					<view class="network-left">拨入密码：</view>
-					<view class="network-right">{{detailData.ActivityTypeName=='公司调研电话会'&&detailData.IsLimitPeople==1 && detailData.IsSignup==0?'请报名获取':detailData.ParticipationCode}}</view>
-				</view>
-				<view class="network" v-if="detailData.OnlineParticipation">
-					<view class="network-left">网络参会：</view>
-					<view class="network-right" @click="networkBtn" style="color: #2C83FF;">
-						{{detailData.OnlineParticipation}}
-					</view>
-				</view>
-				<view v-if="detailData.Address" class="network">
-					<view class="network-left">活动地址：</view>
-					<view class="network-right" v-if="detailData.IsSignup==0 && detailData.ActivityTypeName=='公司线下调研'&&detailData.IsLimitPeople==1">请报名获取
-					</view>
-					<view class="network-right" v-else>{{detailData.Address}}</view>
-				</view>
-				<view v-if="detailData.Highlights" class="network">
-					<view class="network-left">活动亮点： </view>
-					<view class="network-right">
-					 <rich-text :nodes="detailData.Highlights"></rich-text>
-					</view>
-				</view>
-				<view class="network" v-if="detailData.ReportLink">
-					<view class="network-left">相关报告：</view>
-					<view class="network-right" style="color: #2C83FF;" @click="goDetail">
-						查看报告链接
-					</view>
-				</view>
-				<view v-if="detailData.Theme" class="network">
-					<view class="network-left">主&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题： </view>
-					<view class="network-right">
-						 <rich-text :nodes="detailData.Theme"></rich-text>
-					</view>
-				</view>
-				<view v-if="detailData.Remarks" class="network">
-					<view class="network-left">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注： </view>
-					<view class="network-right">
-						 <rich-text :nodes="detailData.Remarks"></rich-text>
-					
-					</view>
-				</view>
+				</view>
+				<view v-if="detailData.ChartPermissionName" class="network">
+					<view class="network-left">所属行业：</view>
+					<view class="network-right">{{detailData.ChartPermissionName}}</view>
+				</view>
+				<view v-if="detailData.ActivityTimeText" class="network">
+					<view class="network-left">活动时间：</view>
+					<view class="network-right">{{detailData.ActivityTimeText}}</view>
+				</view>
+				<view v-if="detailData.DistinguishedGuest" class="network">
+					<view class="network-left" >嘉&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;宾：</view>
+					<view class="network-right">{{detailData.DistinguishedGuest}}</view>
+				</view>
+				<view v-if="detailData.Host" class="network">
+					<view class="network-left">主&nbsp;&nbsp;持&nbsp;人：</view>
+					<view class="network-right">{{detailData.Host}}</view>
+				</view>
+				<view v-if="detailData.Speaker" class="network">
+					<view class="network-left">主&nbsp;&nbsp;讲&nbsp;人：</view>
+					<view class="network-right">{{detailData.Speaker}}</view>
+				</view>
+				<view v-if="detailData.Expert" class="network">
+					<view class="network-left">专家背景：</view>
+					<view class="network-right">
+						 <rich-text :nodes="detailData.Expert"></rich-text>
+					</view>
+				</view>
+				<view v-if="detailData.MainlandTell" class="network">
+					<view class="network-left">大陆拨入：</view>
+					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.MainlandTell)">{{detailData.MainlandTell}}</view>
+				</view>
+				<view v-if="detailData.HongKongTell" class="network">
+					<view class="network-left">香港拨入：</view>
+					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.HongKongTell)">{{detailData.HongKongTell}}</view>
+				</view>
+				<view v-if="detailData.TaiwanTell" class="network">
+					<view class="network-left">台湾拨入：</view>
+					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.TaiwanTell)">{{detailData.TaiwanTell}}</view>
+				</view>
+				<view v-if="detailData.AmericaTell" class="network">
+					<view class="network-left">美国拨入：</view>
+					<view class="network-right" style="color: #2C83FF;" @click="phonebtn(detailData.AmericaTell)">{{detailData.AmericaTell}}</view>
+				</view>
+				<view v-if="detailData.ParticipationCode" class="network">
+					<view class="network-left">拨入密码：</view>
+					<view class="network-right">{{detailData.ActivityTypeName=='公司调研电话会'&&detailData.IsLimitPeople==1 && detailData.IsSignup==0?'请报名获取':detailData.ParticipationCode}}</view>
+				</view>
+				<view class="network" v-if="detailData.OnlineParticipation">
+					<view class="network-left">网络参会：</view>
+					<view class="network-right" @click="networkBtn" style="color: #2C83FF;">
+						{{detailData.OnlineParticipation}}
+					</view>
+				</view>
+				<view v-if="detailData.Address" class="network">
+					<view class="network-left">活动地址：</view>
+					<view class="network-right" v-if="detailData.IsSignup==0 && detailData.ActivityTypeName=='公司线下调研'&&detailData.IsLimitPeople==1">请报名获取
+					</view>
+					<view class="network-right" v-else>{{detailData.Address}}</view>
+				</view>
+				<view v-if="detailData.Highlights" class="network">
+					<view class="network-left">活动亮点： </view>
+					<view class="network-right">
+					 <rich-text :nodes="detailData.Highlights"></rich-text>
+					</view>
+				</view>
+				<view class="network" v-if="detailData.ReportLink">
+					<view class="network-left">相关报告：</view>
+					<view class="network-right" style="color: #2C83FF;" @click="goDetail">
+						查看报告链接
+					</view>
+				</view>
+				<view v-if="detailData.Theme" class="network">
+					<view class="network-left">主&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题： </view>
+					<view class="network-right">
+						 <rich-text :nodes="detailData.Theme"></rich-text>
+					</view>
+				</view>
+				<view v-if="detailData.Remarks" class="network">
+					<view class="network-left">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注： </view>
+					<view class="network-right">
+						 <rich-text :nodes="detailData.Remarks"></rich-text>
+					
+					</view>
+				</view>
 				
 			</view>
 			<view class="" style="height: 50rpx;"></view>
@@ -135,14 +135,14 @@
 						</view>
 					</view>
 				</view>
-			</view>
-			<view class="select-box">
-				<u-popup v-model="selectShow" mode="bottom">
-					<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
-					<view style="color: #2C83FF;" @click="signupAdd(1)">预约外呼</view>
-					<view style="color: #2C83FF;" @click="signupAdd(2)">自主拨入</view>
-					<view style="color: #A9AFB8;" @click="selectShow=false">取消</view>
-				</u-popup>
+			</view>
+			<view class="select-box">
+				<u-popup v-model="selectShow" mode="bottom">
+					<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
+					<view style="color: #2C83FF;" @click="signupAdd(1)">预约外呼</view>
+					<view style="color: #2C83FF;" @click="signupAdd(2)">自主拨入</view>
+					<view style="color: #A9AFB8;" @click="selectShow=false">取消</view>
+				</u-popup>
 			</view>
 			<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
 				:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure" />
@@ -189,25 +189,25 @@
 				isNeedAddCountryCode: false,
 				haveAuth: '',
 				industryMsg: '',
-				sellerMobile: '',
-				sellerName:'',//销售名称
-				msgType:""
+				sellerMobile: '',
+				sellerName:'',//销售名称
+				msgType:""	,
 			}
 		},
 		components: {
 			modalDialog,
 			jurisdiction
-		},
-		watch:{
-			haveAuth:{
-				handler(){
-					if(this.haveAuth==1){
-						this.$store.dispatch("statistics",{PageType:'ActivitParticulars',DetailId:this.id})
-					}
-					
-				},
-				immediate:true
-			}
+		},
+		watch:{
+			haveAuth:{
+				handler(){
+					if(this.haveAuth==1){
+						this.$store.dispatch("statistics",{PageType:'ActivitParticulars',DetailId:this.id})
+					}
+					
+				},
+				immediate:true
+			}
 		},
 		methods: {
 			//获取是否需要填写区号接口
@@ -225,8 +225,8 @@
 					if (res.Ret == 200) {
 						this.haveAuth = res.Data.HasPermission
 						this.industryMsg = res.Data.PopupMsg
-						this.sellerMobile = res.Data.SellerMobile
-						this.sellerName=res.Data.SellerName
+						this.sellerMobile = res.Data.SellerMobile
+						this.sellerName=res.Data.SellerName
 						this.msgType=res.Data.MsgType
 						if (res.Data.HasPermission == 1) {
 							this.detailData = res.Data.Detail
@@ -349,26 +349,26 @@
 				}
 			},
 		},
-		onLoad(option) {
-			this.$store.dispatch("checkHandle").then(res=>{
-				this.id = option.id
-				this.countryCcode()
-				this.getActivityDetail()
+		onLoad(option) {
+			this.$store.dispatch("checkHandle").then(res=>{
+				this.id = option.id
+				this.countryCcode()
+				this.getActivityDetail()
 			})
 			
-		},
-		onShow() {
-		},
-		/**
-		 * 用户点击分享
-		 */
-		onShareAppMessage: function(res) {
-			return {
-				title: '活动',
-				path: '/activityPages/activityDetail/activityDetail?id='+this.id,
-				success: (res) => {},
-				fail: (err) => {}
-			}
+		},
+		onShow() {
+		},
+		/**
+		 * 用户点击分享
+		 */
+		onShareAppMessage: function(res) {
+			return {
+				title: '活动',
+				path: '/activityPages/activityDetail/activityDetail?id='+this.id,
+				success: (res) => {},
+				fail: (err) => {}
+			}
 		},
 	}
 </script>
@@ -410,11 +410,11 @@
 				opacity: 0.8;
 				font-size: 30rpx;
 				font-weight: bold;
-				margin-bottom: 15rpx;
+				margin-bottom: 15rpx;
 				color: #000;
 			}
-			.brackets-title {
-				padding-left: 20rpx;
+			.brackets-title {
+				padding-left: 20rpx;
 			}
 			.city-box {
 				display: flex;
@@ -440,16 +440,16 @@
 		}
 
 		.network {
-			margin-bottom: 30rpx;
+			margin-bottom: 30rpx;
 			padding: 0 !important;
 			display: flex;
 			// padding-left: 54rpx;
 
 			.network-left {
-				width: 160rpx;
-				text-align-last:justify;
-				text-align:justify;
-				// font-weight: bold;
+				width: 160rpx;
+				text-align-last:justify;
+				text-align:justify;
+				// font-weight: bold;
 				// color: #666;
 			}
 

activityPages/activityDetail/jurisdiction/components.vue

@@ -77,7 +77,13 @@
 			},
 			// 返回首頁
 			backIndex() {
-				uni.navigateBack()
+				uni.navigateBack({
+					fail(){
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}
+				})
 			},
 			callPhone(num) {
 				uni.makePhoneCall({

activityPages/index.js

@@ -244,22 +244,27 @@ export default {
 						str.push(key.StatusName)
 					}
 				})
-				if (str.length == this.listActivityStaus.length) {
-					this.activeStateName = '所有状态'
-				} else if (str.length <= 0) {
-					this.activeStateName = '活动状态'
-				} else {
-					this.activeStateName = str.join(',')
-				}
 				this.activeState = arr.join(',')
-				
 				const arrTwo = []
+				const strTwo = []
 				this.activityTimeList.forEach(key => {
 					if (key.IsChoose) {
 						arrTwo.push(key.Id)
+						strTwo.push(key.StatusName)
 					}
 				})
-				this.activityTimeStatus = arrTwo.join(',')
+				this.activityTimeStatus = arrTwo.join(',')
+				if (strTwo.length > 0) {
+					this.activeStateName = strTwo.join(',')
+				}else{
+					if (str.length == this.listActivityStaus.length) {
+						this.activeStateName = '所有状态'
+					} else if (str.length <= 0) {
+						this.activeStateName = '活动状态'
+					} else {
+						this.activeStateName = str.join(',')
+					}
+				}
 			} else if (type == 'industry') {
 				const arr = []
 				const str = []

activityPages/networkAttend/networkAttend.vue

@@ -13,7 +13,6 @@
 		},
 		onLoad(opion) {
 			this.url=opion.url
-			console.log(this.url);
 		}
 	}
 </script>

config/config.js

@@ -1,6 +1,6 @@
 
-export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
-//export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
+//export const baseUrl = 'http://8.136.199.33:8500/api';//小程序开发接口地址
+export const baseUrl = 'https://cygx.hzinsights.com/api';//小程序线上接口地址
 // #ifdef H5
 export const H5baseUrl=process.env.NODE_ENV === 'development'?window.location.origin+'/':baseUrl
 // #endif

pages/activity/activity.vue

@@ -28,7 +28,7 @@
 		<view class="select-sticky" v-if="tabsActive == 0">
 			<view class="select-conyent">
 				<van-dropdown-menu active-color="#333333">
-					<van-dropdown-item id="statusstate" :title="activeStateName" @close="closeTheWindow('statusstate')">
+					<van-dropdown-item id="statusstate"  @open="isscroll" :title="activeStateName" @close="closeTheWindow('statusstate')">
 						<view class="menu-items">
 							<view class="menu-items-box" @click="overallBtn('statusstate', key)"
 								v-for="key in listActivityStaus" :key="key.Id">
@@ -58,7 +58,7 @@
 							</view>
 						</view>
 					</van-dropdown-item>
-					<van-dropdown-item id="industry" :title="chartPermissionName" @close="closeTheWindow('industry')">
+					<van-dropdown-item id="industry"  @open="isscroll" :title="chartPermissionName" @close="closeTheWindow('industry')">
 						<view class="decide">
 							<view class="items-box">
 								<u-icon v-if="isShowJurisdiction" name="checkbox-mark" color="#2C83FF" size="24">
@@ -85,7 +85,7 @@
 							<text @click="replacementConfirm('industry')">确定</text>
 						</view>
 					</van-dropdown-item>
-					<van-dropdown-item id="genre" :title="activityTypeName" @close="closeTheWindow('genre')">
+					<van-dropdown-item id="genre"  @open="isscroll" :title="activityTypeName" @close="closeTheWindow('genre')">
 						<view class="menu-items">
 							<view class="menu-items-box" @click="overallActivity('genre', item)"
 								v-for="(item, index) in listActivityType" :key="item.ActivityTypeId">
@@ -246,7 +246,8 @@
 				activeState: "1", //活动进行状态
 				dynamicList: [],
 				dynamicLKeyWodr: [],
-				keyWord: ''
+				keyWord: '',
+				isScrollShow:false
 			};
 		},
 		mixins: [myMixin],
@@ -301,7 +302,10 @@
 			}
 
 		},
-		methods: {
+		methods: {
+			isscroll(){
+				this.isScrollShow=true
+			},
 			shareOption() {
 				const arr = this.activeState.split(',').map(item => item - 0)
 				this.listActivityStaus.forEach(item => {
@@ -592,18 +596,29 @@
 						str.push(item.StatusName)
 					}
 				})
-				if (str.length == this.listActivityStaus.length) {
-					this.activeStateName = '所有状态'
-				} else {
-					this.activeStateName = str.join(',')
-				}
+				// if (str.length == this.listActivityStaus.length) {
+				// 	this.activeStateName = '所有状态'
+				// } else {
+				// 	this.activeStateName = str.join(',')
+				// }
 				this.activeState = arr.join(',')
-				const arrTwo = []
+				const arrTwo = []
+				const strTwo=[]
 				this.activityTimeList.forEach(key => {
 					if (key.IsChoose) {
 						arrTwo.push(key.Id)
+						strTwo.push(key.StatusName)
 					}
-				})
+				})
+				if (strTwo.length > 0) {
+					this.activeStateName = strTwo.join(',')
+				}else{
+					if (str.length == this.listActivityStaus.length) {
+						this.activeStateName = '所有状态'
+					}  else {
+						this.activeStateName = str.join(',')
+					}
+				}
 				this.activityTimeStatus = arrTwo.join(',')
 				const hyArr = []
 				const hyStr = []
@@ -640,16 +655,19 @@
 				this.getList()
 			},
 			//选择标签
-			changeTarget(index, item) {
+			changeTarget(index, item) {
+				// console.log(this.spanIndex);
 				let arrIndex = this.spanIndex.indexOf(index);
 				if (arrIndex > -1) {
 					this.spanIndex.splice(arrIndex, 1);
-					this.dynamicLKeyWodr.splice(arrIndex, 1);
 				} else {
 					this.spanIndex.push(index);
-					this.dynamicLKeyWodr.push(item.KeyWord)
-				}
-				this.keyWord = this.dynamicLKeyWodr.join(',')
+				}
+				const arr = []
+				this.spanIndex.forEach(item=>{
+					arr.push(this.dynamicList[item].KeyWord)
+				})
+				this.keyWord = arr.join(',')
 				this.page_no = 1
 				this.getList()
 			},
@@ -661,10 +679,10 @@
 		 * 用户点击分享
 		 */
 		onHide() {
-			if (this.tabsActive !== 0) return
+			if (this.tabsActive !== 0 ) return
 			this.selectComponent("#statusstate").toggle(false);
 			this.selectComponent("#industry").toggle(false);
-			this.selectComponent("#genre").toggle(false);
+			this.selectComponent("#genre").toggle(false);
 		},
 		onShareAppMessage: function(res) {
 			return {
@@ -712,7 +730,14 @@
 			} else {
 				this.getScheduleList();
 			}
-		})
+		}),
+		onPageScroll() {
+			if (this.tabsActive !== 0 || !this.isScrollShow) return
+			this.selectComponent("#statusstate").toggle(false);
+			this.selectComponent("#industry").toggle(false);
+			this.selectComponent("#genre").toggle(false);
+			this.isScrollShow=false
+		},
 	};
 </script>
 

pages/index/index.vue

@@ -24,9 +24,6 @@
 						<image src="@/static/img/border_act.png" mode="" class="border_act" v-if="tabAct_id == item.ChartPermissionId"></image>
 						</view>
 					</block>
-					<view class="show-right">
-						<image src="../../static/img/collect_act.png" mode=""></image>
-					</view>
 				</scroll-view>
 				
 			</view>
@@ -309,25 +306,14 @@ export default {
 			font-size: 32rpx;
 			box-shadow: 0 3rpx 6rpx rgba(187,216,255,0.2);
 			.scroll-tab {
-				position: relative;
 				width: 100%;
-				// height: 100rpx;
 				white-space: nowrap;
-				.show-right {
-					position: absolute;
-					top: 0rpx;
-					right: -10rpx;
-					image {
-						width: 40rpx;
-						height: 30rpx;
-					}
-				}
 			}
 			.scroll-tab-item {
 				// flex-grow: 1;
 				text-align: center;
 				display: inline-block;
-				padding: 20rpx 8rpx 30rpx 8rpx;
+				padding: 10rpx 8rpx 20rpx 8rpx;
 				margin-right: 40rpx;
 				border-bottom: 8rpx solid transparent;
 				position: relative;

pages/reportDetail/reportDetail.vue

@@ -142,10 +142,13 @@
 			},
 			// 返回首頁
 			backIndex() {
-				uni.navigateBack()
-				// uni.switchTab({
-				// 	url:'/pages/index/index',
-				// })
+				uni.navigateBack({
+					fail(){
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}
+				})
 			},
 			callPhone(num) {
 				uni.makePhoneCall({

store/index.js

@@ -42,15 +42,15 @@ const store = new Vuex.Store({
 		},
 		//获取用户的pv/uv
 		statistics(type,payload){
-			return new Promise ((resolve,reject)=>{
-				User.pageHistory(payload).then(res => {
-					if(res.Ret === 200){
-						resolve(res.Data)
-					}
-				}).catch(err => {
-					reject(err)
-				})
-			})
+			// return new Promise ((resolve,reject)=>{
+			// 	User.pageHistory(payload).then(res => {
+			// 		if(res.Ret === 200){
+			// 			resolve(res.Data)
+			// 		}
+			// 	}).catch(err => {
+			// 		reject(err)
+			// 	})
+			// })
 		}
 	},
 	getters: {