小彬 3 years ago
parent
commit
c261532cf3

BIN
.DS_Store


+ 0 - 17
App.vue

@@ -19,17 +19,6 @@
 			access_token:'',
 			loadOver:''
 		},
-		// onError: function(err) {  
-		//             // 这里只能捕获方法内的异常,不能捕获生命周期中的逻辑异常  
-		//             //console.log('方法内异常');  
-		//             var json = JSON.stringify(err);  
-		//             var arr = json.split("\\n");   
-		//             var log = {  
-		//                 message : arr[1],  
-		//                 stack: err  
-		//             }    
-		//             this.$throw(log)   
-		//         },
 		methods:{
 			/* 微信code换临时token */
 			getOpenid() {
@@ -45,12 +34,6 @@
 						}catch (e){
 							
 						}
-						//由于这里是网络请求,可能会在 Page.onLoad 之后才返回
-						 // 所以此处加入 callback 以防止这种情况
-						// this.globalData.loadOver = true
-						// if (this.loadCallback) {
-						//   this.loadCallback(true);
-					 //   }
 					})
 				  }
 				});

+ 1 - 0
activityPages/accountsOfficial/accountsOfficial.vue

@@ -1,4 +1,5 @@
 <template>
+	<!-- 去往公众号 -->
 	<view>
 		<web-view src="https://mp.weixin.qq.com/s/jMGsvazoR3sze5WpIP5wLg"></web-view>
 	</view>

+ 50 - 33
activityPages/activityDetail/activityDetail.vue

@@ -1,10 +1,12 @@
 <template>
-	<view class="activity-detail">
-		<view class="" v-if="haveAuth==1">
+	<view class="container activity-detail">	
+		<view class="" v-if="haveAuth==1">
+			<!-- 头部滚动显示 -->
 			<view class="notice" v-if="detailData.IsLimitPeople==1">
 				<van-notice-bar  color="#FFFFFF" background="#FE9000"
 					text="该活动参与名额有限,报名客户请按时参加,若不能按时参加请及时取消报名,爽约会影响您的后续报名资格" />
 			</view>
+			<!-- 内容部分 -->
 			<view class="content">
 				<view v-if="detailData.ActivityName" class="dialog-title" :class="1==1?'brackets-title':''">{{detailData.ActivityName}}</view>
 				<view class="city-box">
@@ -101,6 +103,7 @@
 				
 			</view>
 			<view class="" style="height: 50rpx;"></view>
+			<!-- 操作按钮部分 -->
 			<view>
 				<view class="content-bottom"
 					v-if="detailData.ActivityTypeId==1||detailData.ActivityTypeId==2||(detailData.ActivityTypeId==3&&detailData.IsLimitPeople==0)||(detailData.IsLimitPeople==0 && detailData.ActivityTypeName=='公司线下调研')">
@@ -136,6 +139,7 @@
 					</view>
 				</view>
 			</view>
+			<!-- 参会方式的弹出层 -->
 			<view class="select-box">
 				<u-popup v-model="selectShow" mode="bottom">
 					<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
@@ -144,10 +148,13 @@
 					<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" />
+				:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure" :editIsShow="editIsShow" :countryCode="countryCode" :mobileEdit="mobileEdit" :goOnNextStep="goOnNextStep" :mailboxBinding="mailboxBinding"/>
+			<!-- 区号的弹出层 -->
 			<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
 		</view>
+		<!-- 权限部分 -->
 		<view v-else>
 			<jurisdiction :haveAuth="haveAuth" :industryMsg="industryMsg" :msgType="msgType" :sellerMobile="sellerMobile" :sellerName="sellerName"></jurisdiction>
 		</view>
@@ -155,11 +162,9 @@
 </template>
 
 <script>
-	import {
-		activity,
-		User
-	} from "@/config/api.js"
-	import modalDialog from '@/components/modalDialog.vue'
+	import { activity, User } from "@/config/api.js"
+	import modalDialog from '@/components/modalDialog.vue'
+	import areaCode from "@/components/areaCode.vue";
 	import jurisdiction from "./jurisdiction/components.vue"
 	let app = getApp()
 	export default {
@@ -191,12 +196,18 @@
 				industryMsg: '',
 				sellerMobile: '',
 				sellerName:'',//销售名称
-				msgType:""	,
+				msgType:""	,
+				editIsShow:false,//外呼莫泰框
+				countryCode:'',//外呼区号
+				mobileEdit:'',//外呼手机号
+				goOnNextStep:'',//设置外呼号后弹出哪个
+				mailboxBinding:false,//是否绑定邮箱
 			}
 		},
 		components: {
 			modalDialog,
-			jurisdiction
+			jurisdiction,
+			areaCode
 		},
 		watch:{
 			haveAuth:{
@@ -251,7 +262,7 @@
 				if (this.isNeedAddCountryCode) {
 					this.isAreaCode = true
 					this.areaCode = {
-						id,
+						id:Number(this.id),
 						type
 					}
 				} else {
@@ -260,18 +271,30 @@
 						SignupType: type,
 					}).then(res => {
 						if (res.Ret == 200) {
-							if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data.GoFollow) {
-								this.isShow = true
-							} else {
-								this.goFollow = res.Data.GoFollow
-							}
 							this.signupType = res.Data.SignupType
-							this.signupStatus = res.Data.SignupStatus
+							this.signupStatus = res.Data.SignupStatus
+							this.countryCode=res.Data.CountryCode
+							this.mobileEdit=res.Data.Mobile
+							this.goOnNextStep=res.Data.GoFollow
 							this.idTypeCancel = {
 								cutId: res.Data.ActivityId,
 								state: 1
 							}
-
+							if( res.Data.GoBindEmail){
+								this.mailboxBinding=true
+								return
+							}
+							if(res.Data.SignupStatus !== 'Success') {
+								this.isShow = true
+							}else {
+								if(res.Data.GoOutboundMobile){
+									this.editIsShow=true
+								}else if (res.Data.GoFollow){
+									this.goFollow = res.Data.GoFollow
+								}else if(res.Data.SignupStatus == 'Success') {
+									this.isShow = true
+								}
+							}
 						}
 					})
 				}
@@ -349,22 +372,22 @@
 				}
 			},
 		},
-		onLoad(option) {
-			this.$store.dispatch("checkHandle").then(res=>{
-				this.id = option.id
-				this.countryCcode()
-				this.getActivityDetail()
-			})
-			
+		onLoad(option) {
+			this.id = option.id
 		},
-		onShow() {
+		onShow() {
+			this.$store.dispatch("checkHandle").then(res=>{
+				this.countryCcode()//判断是否加区号
+				this.getActivityDetail()
+			})
+			
 		},
 		/**
 		 * 用户点击分享
 		 */
 		onShareAppMessage: function(res) {
 			return {
-				title: '活动',
+				title: '活动详情',
 				path: '/activityPages/activityDetail/activityDetail?id='+this.id,
 				success: (res) => {},
 				fail: (err) => {}
@@ -376,7 +399,6 @@
 <style lang="scss">
 	.activity-detail {
 		padding-bottom: 100rpx;
-
 		.notice {
 			height: 60rpx;
 			width: 100%;
@@ -387,7 +409,6 @@
 			margin-bottom: -20rpx;
 			color: #333333;
 			font-size: 28rpx;
-
 			view {
 				padding-left: 20rpx;
 			}
@@ -443,14 +464,10 @@
 			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;
-				// color: #666;
 			}
 
 			.network-right {

+ 0 - 7
activityPages/activityDetail/jurisdiction/components.vue

@@ -54,11 +54,6 @@
 				required: true
 			}
 		},
-		data() {
-			return {
-
-			};
-		},
 		methods: {
 			/* 无权限申请开通权限 */
 			applyAuth() {
@@ -123,7 +118,6 @@
 		.btn-cont {
 			width: 368rpx;
 			height: 80rpx;
-			// position: relative;
 			background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%);
 			color: #fff;
 			font-size: 34rpx;
@@ -133,7 +127,6 @@
 
 			&.back-btn {
 				background: linear-gradient(268deg, #2DDBFF 0%, #1599FF 49%, #005EFF 100%) !important;
-				// border: 2rpx solid #3385FF;
 				color: #fff;
 				margin-top: 30rpx;
 			}

+ 431 - 340
activityPages/activitySearch/activitySearch.vue

@@ -1,9 +1,8 @@
 <template>
 	<view class="container activity-content">
-		<!-- tabs -->
 		<view class="top-content">
 			<!-- 搜索 -->
-			<view class="searchTarget-header">
+			<view class="searchTarget-header" v-if="!dynamicName">
 				<input type="text" placeholder="请输入关键字" placeholder-class="sea_ipt_placeholder" class="sea_ipt"
 					v-model="searchTxt" focus="true" confirm-type="search" @confirm="searchHandle" />
 				<icon type="search" size="15" class="sea_ico" />
@@ -12,7 +11,13 @@
 					<text class="line">|</text>
 					<text @click="searchHandle" style="color: #3385FF;">搜索</text>
 				</view>
+			</view>
+			<!-- 选中的气泡主题 -->
+			<view class="dynamic-name" v-if="dynamicName">
+				<text>{{dynamicName}}</text>
+				<icon type="clear" size="16" color="#E0E0E0" @click="clearDynamicName"/>
 			</view>
+			<!-- 搜索历史 -->
 			<view class="search-cont-top" v-if="!isShowSearch&&historySearchList.length">
 				<view class="cont-tit">
 					<text>搜索历史</text>
@@ -22,8 +27,30 @@
 					<view class="target-item" v-for="(item,index) in historySearchList" :key="index"
 						@click="chooseTarget(item)">{{item}}</view>
 				</view>
-			</view>
-			<!-- 选择 -->
+			</view>
+			<!-- 气泡主题list -->
+			 <view class="dynamic-content" v-if="!isShowSearch">
+			 	<view class="target-title">
+			 		更多主题搜索:
+			 	</view>
+				<view class="target-item">
+					<view class="target-ul target-left">
+						<view class="target-text" v-for="(item,index) in dynamicList" :key="index" v-if="index%2===0">
+							<text @click="changeTarget(item.KeyWord)">
+								{{item.KeyWord}}
+							</text>
+						</view>
+					</view>
+					<view class="target-ul target-right">
+						<view class="target-text" v-for="(item,index) in dynamicList" :key="index" v-if="index%2 !== 0">
+							<text @click="changeTarget(item.KeyWord)">
+								{{item.KeyWord}}
+							</text>
+						</view>
+					</view>
+				</view>
+			 </view>
+			<!-- 各种状态选择 -->
 			<view class="select-conyent" v-if="isShowSearch">
 				<van-dropdown-menu active-color="#333333">
 					<van-dropdown-item id="statusstate" :title="activeStateName" @close="closeTheWindow('statusstate')">
@@ -99,13 +126,10 @@
 							<text @click="replacementConfirm('genre')">确定</text>
 						</view>
 					</van-dropdown-item>
-
-
-
 				</van-dropdown-menu>
 			</view>
-
 		</view>
+		<!-- 内容列表部分 -->
 		<view class="box-content" v-if="haveData" :class="{head:tabsActive==1}">
 			<view class="content-list" v-for="(item,index) in collectList" :key="index">
 				<view class="list-top" @click="goDetail(item)">
@@ -179,15 +203,21 @@
 			</view>
 			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage>1" />
 		</view>
+		<!-- 缺审部分 -->
 		<view class="nodata" v-else>
 			<image src="@/static/img/act_search.png" mode="" class="nodata_ico"></image>
 			<text>未找到搜索结果</text>
-		</view>
-		<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
-			:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
-			:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :hasPermission="hasPermission"
-			:jurisdictionList="jurisdictionList" />
+		</view>
+		<!-- 各种自定义弹框 -->
+		<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
+				:hasPermission="hasPermission" :jurisdictionList="jurisdictionList" :editIsShow="editIsShow"
+				:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
+				:countryCode="countryCode" :mobileEdit="mobileEdit" :goOnNextStep="goOnNextStep"
+				:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" 
+				:mailboxBinding="mailboxBinding"/>
+		<!-- 选择区号弹出层 -->
 		<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
+		<!-- 参会方式弹出层 -->
 		<view class="select-box">
 			<u-popup v-model="selectShow" mode="bottom">
 				<view style="color: #333333;font-size: 28rpxrpx;">请选择参会方式</view>
@@ -200,14 +230,10 @@
 </template>
 
 <script>
-	import {
-		activity,
-		User
-	} from "@/config/api.js"
-	import {
-		Throttle
-	} from '@/config/util.js'
-	import modalDialog from '@/components/modalDialog.vue'
+	import { activity, User } from "@/config/api.js"
+	import { Throttle } from '@/config/util.js'
+	import modalDialog from '@/components/modalDialog.vue'
+	import areaCode from "@/components/areaCode.vue";
 	import myMixin from '../index.js'
 	let app = getApp()
 	export default {
@@ -220,373 +246,413 @@
 				haveData: true,
 				activeState: "1,2,3", //活动进行状态
 				activeStateName: '全部状态',
-				selectShow: false,
+				selectShow: false,
+				dynamicList:[],
+				dynamicName:''
 			}
 		},
 		mixins: [myMixin],
 		components: {
-			modalDialog
-		},
-		onLoad(option) {
-			this.$store.dispatch("checkHandle",'load').then(res=>{
-				app.globalData.isAuth = res.IsAuth;
-				app.globalData.isBind = res.IsBind;
-				if (res.IsAuth) { //未授权
-					uni.navigateTo({
-						url: '/pages/authGuide/authGuide'
-					})
-				} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
-					uni.navigateTo({
-						url: '/pages/login/login'
-					})}
-				if (this.$db.get('historySearchListActivity')) {
-					let historyList = JSON.parse(this.$db.get('historySearchListActivity'));
-					this.historySearchList = historyList;
-				}
-				if (option.text) {
-					this.activeState = option.statesId //活动进行状态
-					this.activityTypeIds = option.typeIds //活动类型id 多个用 , 隔开
-					this.chartPermissionIds = option.chartIds //行业id 多个用 , 隔开
-					this.activeStateName = option.stateName
-					this.chartPermissionName = option.chartName
-					this.activityTypeName = option.typeName
-					this.searchTxt = option.text
-					this.activityTimeStatus = option.timeStatus;
-					this.isGain = false
-					this.isShowSearch = true
-				} else {
-					this.isGain = true
-				}
-				if (option.text) {
-					this.searchHandle()
-				}
-				this.countryCcode()
-			})
-			
+			modalDialog,
+			areaCode
 		},
-		/* 触底 */
-		onReachBottom: Throttle(function() {
-			if (this.status === 'nomore') return;
-			this.status = 'loading';
-			this.page_no++;
-			this.getList()
-		}),
 		methods: {
+			//获取快捷主题
+			fastSearchKeWord() {
+					activity.fastSearchKeWord({
+						ActiveState: this.activeState, 
+						ActivityTypeIds: this.activityTypeIds, 
+						ChartPermissionIds: this.chartPermissionIds,
+						WhichDay: this.activityTimeStatus,
+						Label:'More'
+					}).then(res => {
+						if (res.Ret !== 200) return
+						this.dynamicList = res.Data.List || []
+						
+					})
+				},
+				//主题的点击事件
+			//点击了快捷主题
+			changeTarget(val){
+					if(val){
+						this.dynamicName=val
+					}
+					if (this.isGain) {
+						this.empty()
+						this.getList()
+					}
+					this.getUserSearchContent()
+					this.isShowSearch=true
+					
+				},
+				//清除主题的点击事件
+			//清除了快捷主题
+			clearDynamicName(){
+					this.dynamicName=''
+					this.searchTxt = ''
+					this.collectList = []
+					this.haveData = true
+					this.isShowSearch = false
+				},
+			// 遍历
 			preserve() {
-			const arr = []
-			const str = []
-			this.listActivityStaus.forEach(item => {
-				if (item.IsChoose) {
-					arr.push(item.Id)
-					str.push(item.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 = []
-			this.activityTimeList.forEach(key => {
-				if (key.IsChoose) {
-					arrTwo.push(key.Id)
-				}
-			})
-			this.activityTimeStatus = arrTwo.join(',')
-			const hyArr = []
-			const hyStr = []
-			this.listChartPermission.forEach(key => {
-				if (key.IsChoose) {
-					hyArr.push(key.ChartPermissionId)
-					hyStr.push(key.PermissionName)
-				}
-			})
-			if (hyStr.length == this.listChartPermission.length) {
-				this.chartPermissionName = '所有行业'
-			} else if (hyStr.length <= 0) {
-				this.chartPermissionName = '行业分类'
-			} else {
-				this.chartPermissionName = hyStr.join(',')
-			}
-			this.chartPermissionIds = hyArr.join(',')
-			const lxArr = []
-			const lxStr = []
-			this.listActivityType.forEach(key => {
-				if (key.IsChoose) {
-					lxArr.push(key.ActivityTypeId)
-					lxStr.push(key.ActivityTypeName)
-				}
-			})
-			if (lxStr.length == this.listActivityType.length) {
-				this.activityTypeName = '所有活动'
-			} else if (lxStr.length <= 0) {
-				this.activityTypeName = '活动类型'
-			} else {
-				this.activityTypeName = lxStr.join(',')
-			}
-			this.activityTypeIds = lxArr.join(',')
-			this.getList()
-		},
-		shareOption() {
-			const arr = this.activeState.split(',').map(item => item - 0)
-			this.listActivityStaus.forEach(item => {
-				if (arr.indexOf(item.Id) !== -1) {
-					item.IsChoose = true
-				} else {
-					item.IsChoose = false
-				}
-			})
-			const arrTwo = this.activityTimeStatus.split(',').map(item => item - 0)
-			this.activityTimeList.forEach(item => {
-				if (arrTwo.indexOf(item.Id) !== -1) {
-					item.IsChoose = true
-				} else {
-					item.IsChoose = false
-				}
-			})
-			const hyarr = this.chartPermissionIds.split(',').map(item => item - 0)
-			this.listChartPermission.forEach(key => {
-				if (hyarr.indexOf(key.ChartPermissionId) !== -1) {
-					key.IsChoose = true
-				} else {
-					key.IsChoose = false
-				}
-			})
-			const lxarr = this.activityTypeIds.split(',').map(item => item - 0)
-			this.listActivityType.forEach(key => {
-				if (lxarr.indexOf(key.ActivityTypeId) !== -1) {
-					key.IsChoose = true
-				} else {
-					key.IsChoose = false
-				}
-			})
-			this.preserve()
-		},
-			searchHandle() {
-				if (this.searchTxt) {
-					//添加搜索记录
-					if (!this.historySearchList.includes(this.searchTxt)) {
-						this.historySearchList.unshift(this.searchTxt);
-						this.$db.set('historySearchListActivity', JSON.stringify(this.historySearchList))
+					const arr = []
+					const str = []
+					this.listActivityStaus.forEach(item => {
+						if (item.IsChoose) {
+							arr.push(item.Id)
+							str.push(item.StatusName)
+						}
+					})
+					if (str.length == this.listActivityStaus.length ||str.length <= 0) {
+						this.activeStateName = '所有状态'
+					} else {
+						this.activeStateName = str.join(',')
+					}
+					this.activeState = arr.join(',')
+					const arrTwo = []
+					this.activityTimeList.forEach(key => {
+						if (key.IsChoose) {
+							arrTwo.push(key.Id)
+						}
+					})
+					this.activityTimeStatus = arrTwo.join(',')
+					const hyArr = []
+					const hyStr = []
+					this.listChartPermission.forEach(key => {
+						if (key.IsChoose) {
+							hyArr.push(key.ChartPermissionId)
+							hyStr.push(key.PermissionName)
+						}
+					})
+					if ((hyStr.length == 6 && this.listChartPermission.length == 6)|| hyStr.length <= 0) {
+						this.chartPermissionName = '所有行业'
+					}else {
+						this.chartPermissionName = hyStr.join(',')
+					}
+					this.chartPermissionIds = hyArr.join(',')
+					const lxArr = []
+					const lxStr = []
+					this.listActivityType.forEach(key => {
+						if (key.IsChoose) {
+							lxArr.push(key.ActivityTypeId)
+							lxStr.push(key.ActivityTypeName)
+						}
+					})
+					if (lxStr.length == this.listActivityType.length ||lxStr.length <= 0) {
+						this.activityTypeName = '所有类型'
+					}else {
+						this.activityTypeName = lxStr.join(',')
 					}
-					this.isShowSearch = true
-					if (this.isGain) {
-						this.empty()
-						this.getList()
+					this.activityTypeIds = lxArr.join(',')
+					this.getList()
+			},
+			// 通过分享进来的下拉选择的状态、关联
+			shareOption() {
+				const arr = this.activeState.split(',').map(item => item - 0)
+				this.listActivityStaus.forEach(item => {
+					if (arr.indexOf(item.Id) !== -1) {
+						item.IsChoose = true
+					} else {
+						item.IsChoose = false
+					}
+				})
+				const arrTwo = this.activityTimeStatus.split(',').map(item => item - 0)
+				this.activityTimeList.forEach(item => {
+					if (arrTwo.indexOf(item.Id) !== -1) {
+						item.IsChoose = true
+					} else {
+						item.IsChoose = false
+					}
+				})
+				const hyarr = this.chartPermissionIds.split(',').map(item => item - 0)
+				this.listChartPermission.forEach(key => {
+					if (hyarr.indexOf(key.ChartPermissionId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				const lxarr = this.activityTypeIds.split(',').map(item => item - 0)
+				this.listActivityType.forEach(key => {
+					if (lxarr.indexOf(key.ActivityTypeId) !== -1) {
+						key.IsChoose = true
+					} else {
+						key.IsChoose = false
+					}
+				})
+				this.preserve()
+			},
+			//搜索记录进来
+			searchHandle() {
+					if (this.searchTxt) {
+						//添加搜索记录
+						if (!this.historySearchList.includes(this.searchTxt)) {
+							this.historySearchList.unshift(this.searchTxt);
+							this.$db.set('historySearchListActivity', JSON.stringify(this.historySearchList))
+						}
+						this.isShowSearch = true
+						if (this.isGain) {
+							this.empty()
+							this.getList()
+						}
+						this.getUserSearchContent()
+					} else {
+						this.$util.toast('请输入关键字')
 					}
-					this.getUserSearchContent()
-				} else {
-					this.$util.toast('请输入关键字')
-				}
 			},
 			// 选择历史搜索
 			chooseTarget(item) {
-				this.searchTxt = item;
-				this.collectList = [];
-				this.page_no = 1;
-				this.searchHandle()
+					this.searchTxt = item;
+					this.collectList = [];
+					this.page_no = 1;
+					this.searchHandle()
 			},
 			/* 历史搜索清空 */
 			clearHistory() {
-				this.historySearchList = [];
-				this.$db.del('historySearchListActivity');
+					this.historySearchList = [];
+					this.$db.del('historySearchListActivity');
 			},
 			//获取列表
 			getList() {
-				activity.getActivityList({
-					PageSize: this.pageSize,
-					CurrentIndex: this.page_no,
-					ActiveState: this.activeState, //活动进行状态
-					ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
-					ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
-					KeyWord: this.searchTxt,
-					WhichDay:this.activityTimeStatus
-				}).then(res => {
-					if (res.Ret !== 200) return
-					this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
-					this.totalPage = res.Data.Paging.Pages; //总页数
-					if (this.page_no === 1) {
-						this.collectList = res.Data.List || [];
-						this.haveData = this.collectList.length ? true : false
-						if (this.refresh) {
-							uni.stopPullDownRefresh();
-							this.refresh = false;
+					activity.getActivityList({
+						PageSize: this.pageSize,
+						CurrentIndex: this.page_no,
+						ActiveState: this.activeState, //活动进行状态
+						ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
+						ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
+						KeyWord: this.searchTxt,
+						WhichDay:this.activityTimeStatus,
+						Label:this.dynamicName
+					}).then(res => {
+						if (res.Ret !== 200) return
+						this.status = this.page_no < res.Data.Paging.Pages ? 'loadmore' : 'nomore';
+						this.totalPage = res.Data.Paging.Pages; //总页数
+						if (this.page_no === 1) {
+							this.collectList = res.Data.List || [];
+							this.haveData = this.collectList.length ? true : false
+							if (this.refresh) {
+								uni.stopPullDownRefresh();
+								this.refresh = false;
+							}
+						} else {
+							this.collectList.push(...res.Data.List)
 						}
-					} else {
-						this.collectList.push(...res.Data.List)
-					}
-				})
-			},
+					})
+			 },
 			//获取活动详情接口
 			getUserSearchContent(name) {
-				activity.getUserSearchContent({
-					IsShowJurisdiction: this.isId
-				}).then(res => {
-					if (this.isGain) {
-						res.Data.ListActivityStaus.forEach(item => {
-							item.IsChoose = true
-						})
-					}
-					this.isShowJurisdiction = res.Data.IsShowJurisdiction
-					this.listActivityStaus = res.Data.ListActivityStaus
-					this.listActivityType = res.Data.ListActivityType
-					this.listChartPermission = res.Data.ListChartPermission || []
-					this.listChartPermissionInit = res.Data.ListChartPermission2
-					if (this.isGain) {
-						// this.preserve()
-					} else {
-						this.shareOption()
-					}
-					if (name == 'traverse') {
-						const hyArr = []
-						this.listChartPermission.forEach(key => {
-							if (key.IsChoose) {
-								hyArr.push(key.ChartPermissionId)
-							}
-						})
+					activity.getUserSearchContent({
+						IsShowJurisdiction: this.isId
+					}).then(res => {
+						if (this.isGain) {
+							res.Data.ListActivityStaus.forEach(item => {
+								item.IsChoose = true
+							})
+						}
+						this.isShowJurisdiction = res.Data.IsShowJurisdiction
+						this.listActivityStaus = res.Data.ListActivityStaus
+						this.listActivityType = res.Data.ListActivityType
+						this.listChartPermission = res.Data.ListChartPermission || []
+						this.listChartPermissionInit = res.Data.ListChartPermission2
+						if (this.isGain) {
+							// this.preserve()
+						} else {
+							this.shareOption()
+						}
+						if (name == 'traverse') {
+							const hyArr = []
+							this.listChartPermission.forEach(key => {
+								if (key.IsChoose) {
+									hyArr.push(key.ChartPermissionId)
+								}
+							})
 
-						this.chartPermissionIds = hyArr.join(',')
-					}
-				})
-			},
+							this.chartPermissionIds = hyArr.join(',')
+						}
+					})
+			},
+			//恢复下拉选择的初始状态
 			empty() {
-				this.listActivityStaus.forEach(item => item.IsChoose = true)
-				this.activeState = '1,2,3'
-				this.activeStateName = '全部状态'
-				this.chartPermissionIds = ''
-				this.activityTimeList.forEach(key => {key.IsChoose=false})
-				this.activityTimeStatus=''
-				this.listChartPermission.forEach(item => item.IsChoose = false)
-				this.chartPermissionName = '行业分类'
-				this.listActivityType.forEach(item => item.IsChoose = false)
-				this.activityTypeIds = ''
-				this.activityTypeName = '活动类型'
+					this.listActivityStaus.forEach(item => item.IsChoose = true)
+					this.activeState = '1,2,3'
+					this.activeStateName = '全部状态'
+					this.chartPermissionIds = ''
+					this.activityTimeList.forEach(key => {key.IsChoose=false})
+					this.activityTimeStatus=''
+					this.listChartPermission.forEach(item => item.IsChoose = false)
+					this.chartPermissionName = '所有分类'
+					this.listActivityType.forEach(item => item.IsChoose = false)
+					this.activityTypeIds = ''
+					this.activityTypeName = '所有类型'
 			},
 			/* 表单清空 */
 			clearIpt() {
-				this.searchTxt = ''
-				this.collectList = []
-				this.haveData = true
-				this.isShowSearch = false
-			},
+					this.searchTxt = ''
+					this.collectList = []
+					this.haveData = true
+					this.isShowSearch = false
+				},
 			//取消弹框的确认事件
 			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
+					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) {
-				if (app.globalData.isBind && !app.globalData.isAuth) {
-					uni.navigateTo({
-						url: '/pages/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
+					if (app.globalData.isBind && !app.globalData.isAuth) {
+						uni.navigateTo({
+							url: '/pages/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.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
-						}
+								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)
-									})
+					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
+					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() {
+			},
+			onShow() {
+			this.countryCcode()//判断是否加区号
 			this.$store.dispatch("statistics",{PageType:'ActivitSearch'})
 		},
-		/**
-		 * 用户点击分享
-		 */
+		//load
+		onLoad(option) {
+			this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
+				app.globalData.isAuth = res.IsAuth;
+				app.globalData.isBind = res.IsBind;
+				if (res.IsAuth) { //未授权
+					uni.navigateTo({
+						url: '/pages/authGuide/authGuide'
+					})
+				} else if (res.IsBind && !res.IsAuth) { //已授权未绑定
+					uni.navigateTo({
+						url: '/pages/login/login'
+				})}
+				if (this.$db.get('historySearchListActivity')) {
+					let historyList = JSON.parse(this.$db.get('historySearchListActivity'));
+					this.historySearchList = historyList;
+				}
+				if (option.text || option.dycName) {
+					this.activeState = option.statesId //活动进行状态
+					this.activityTypeIds = option.typeIds //活动类型id 多个用 , 隔开
+					this.chartPermissionIds = option.chartIds //行业id 多个用 , 隔开
+					this.activeStateName = option.stateName
+					this.chartPermissionName = option.chartName
+					this.activityTypeName = option.typeName
+					this.searchTxt = option.text
+					this.dynamicName = option.dycName ||''
+					this.activityTimeStatus = option.timeStatus;
+					this.isGain = false
+					this.isShowSearch = true
+				} else {
+					this.isGain = true
+				}
+				if (option.text) {
+					this.searchHandle()
+				}else if(option.dycName) {
+					this.changeTarget()
+				}
+				this.fastSearchKeWord()
+			})
+			
+		},	
+		/* 触底 */
+		onReachBottom: Throttle(function() {
+			if (this.status === 'nomore') return;
+			this.status = 'loading';
+			this.page_no++;
+			this.getList()
+		}),
+		/* 用户点击分享  */
 		onShareAppMessage: function(res) {
 			return {
-				title: '活动',
+				title: '活动搜索',
 				path: '/activityPages/activitySearch/activitySearch?statesId=' + this.activeState + '&typeIds=' + this
 					.activityTypeIds + '&chartIds=' + this.chartPermissionIds + '&stateName=' + this.activeStateName +
 					'&chartName=' + this.chartPermissionName + '&typeName=' + this.activityTypeName + '&text=' + this
-					.searchTxt +"&timeStatus=" + this.activityTimeStatus,
+					.searchTxt +"&timeStatus=" + this.activityTimeStatus+"&dycName="+this.dynamicName,
 				success: (res) => {},
 				fail: (err) => {}
 			}
@@ -605,5 +671,30 @@
 </script>
 
 <style scoped lang="scss">
-	@import '../index.scss';
+	@import '../index.scss';
+	.dynamic-content {
+		padding: 0 0 0 0!important;
+		.target-title {
+			color: #333333 !important;
+			font-size: 28rpx !important;
+		}
+	}
+	.dynamic-name {
+		display: flex;
+		align-items: center;
+		padding: 36rpx 10rpx 20rpx !important;
+		color: #3385FF;
+		font-size: 28rpx;
+		text {
+			max-width: 100%;
+			padding-right: 40rpx;
+			overflow:hidden;
+			text-overflow:ellipsis;
+			white-space:nowrap;
+		}
+		icon {
+			width: 32rpx;
+			height: 32rpx;
+		}
+	}
 </style>

+ 181 - 13
activityPages/editOutbound/editOutbound.vue

@@ -1,8 +1,17 @@
 <template>
 	<view class="container outbound-content">
-		<view class="top-box" v-if="isShowTitle!=='设置外呼号码'&&identification!=='我的'">
+		<!-- 这里顶部安全是状态栏 -->
+		<view class="status_bar" color="#000000" :style="'height:'+ demoTop+ 'px;'"> </view>
+		<!-- 自定义状态栏 -->
+		<view class="status_title">
+			<u-icon name="arrow-left"  size="38" @click="backArrowleft"></u-icon>
+			<view class="status_center">{{isShowTitle}}</view>
+		</view>
+		<!-- 文本提示 -->
+		<view class="top-box" v-if="isShowTitle=='修改外呼号码' ||identification=='邮箱'">
 			修改后的外呼号码,将作为您的默认外呼号码,若后期还需修改,可在【我的】-【外呼号码】页面设置
 		</view>
+		<!-- 输入外呼手机号 -->
 		<view class="item-box">
 			<view class="ipt-item">
 				<label class="item-label item-iphone" @click="areaCode">+{{telephone}} <u-icon :name="areacodeShow?'arrow-up':'arrow-down'" color="#3385FF" size="28"></u-icon></label>
@@ -10,36 +19,63 @@
 			</view>
 			<text class="text-box">座机号请填写区号,分机号用"-"分隔,例:02150509999-8888</text>
 		</view>
+		<!-- 底部确认 和取消 -->
 		<view class="bottom-btn">
-			<view class="submit-box">
+			<view class="submit-box" @click="submit">
 				提交
 			</view>
-			<view class="cancel" v-if="isShowTitle!=='设置外呼号码'">
+			<view class="cancel" v-if="isShowTitle!=='设置外呼号码'" @click="cancelModification">
 				取消修改
 			</view>
 		</view>
+		<!-- 选择区号部分 -->
 		<view class="select-box">
-			<u-popup v-model="areacodeShow" mode="bottom">
+			<u-popup v-model="areacodeShow" mode="bottom" @close="areacodeShow=false">
 				<view class="box" style="color: #333333;font-size: 28rpxrpx;">请选择您的国际区号</view>
+				<view class="box" style="color: #2C83FF;" @click="areacode('86')">大陆+86</view>
 				<view class="box" style="color: #2C83FF;" @click="areacode('852')">香港+852</view>
-				<view class="box" style="color: #2C83FF;" @click="areacode('866')">台湾+866</view>
+				<view class="box" style="color: #2C83FF;" @click="areacode('886')">台湾+886</view>
 				<view class="box" style="color: #2C83FF;" @click="areacode('1')">美国+1</view>
 				<view class="box" style="color: #2C83FF;" @click="areacode('65')">新加坡+65</view>
-				<view class="box box-bottom" style="color: #A9AFB8;" @click="cancel">取消</view>
+				<view class="box box-bottom" style="color: #A9AFB8;" @click="areacodeShow=false">取消</view>
 			</u-popup>
 		</view>
+		<!-- 关注公众号 弹框 -->
+		<u-modal v-model="goFollowShow" :content-style="{fontSize: '32rpx'}" @confirm="goFollowShowBtn"
+			:show-cancel-button="true" confirm-text="去关注" @cancel="cancelDialog" :show-title="false"
+			:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="accounts"></rich-text>
+			</view>
+		</u-modal>
+		<!-- 知道的弹框 -->
+		<u-modal v-model="show" :content="content" :content-style="{fontSize: '32rpx'}" @confirm="cancelDialog"
+			:show-title="false" confirm-text="知道了" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="content"></rich-text>
+			</view>
+			</u-modal>
 	</view>
 </template>
 
 <script>
+	import {activity} from "@/config/api.js";
 	export default {
 		data() {
 			return {
 				phoneIpt:'',
-				isShowTitle:'',
+				isShowTitle:'设置',
 				telephone:'86',
 				areacodeShow: false,
-				identification:''
+				identification:'',
+				goFollowShow:false,
+				accounts:'',
+				show:false,
+				content:'',
+				demoTop:'',
+				id:'',
+				goOnNextStep:'',
+				cellphone:''
 			}
 		},
 		methods: {
@@ -49,20 +85,139 @@
 			areacode(code){
 				this.telephone=code
 				this.areacodeShow= false
-			}
+			},
+			//提交
+			submit(){
+				activity.addOutboundMobile({
+					ActivityId:Number(this.id),
+					OutboundCountryCode:this.telephone,
+					OutboundMobile:this.phoneIpt
+				}).then(res=>{
+					if(res.Ret !== 200 ) return
+					if(this.identification=='修改'||this.identification=='邮箱'){
+					if(this.identification=="邮箱"){
+						let pages = getCurrentPages()
+						let prevPage = pages[pages.length - 2]
+						if(prevPage.$page.fullPath=='/pages/activity/activity'||prevPage.$page.fullPath=='/activityPages/activitySearch/activitySearch'){
+							const index = prevPage.$vm.collectList.findIndex(item => item.ActivityId == this.id)
+							prevPage.$vm.collectList[index].IsSignup = 1
+						}
+						
+					}
+					if(this.goOnNextStep=='true') {
+						this.accounts=`
+							${this.telephone}-${this.phoneIpt}<br/>
+							预约成功,已加入您的活动日程<br/><br/>
+							
+							想要及时获取活动时间变更通知,请关注【弘则研究】公众号
+						`
+						this.goFollowShow=true
+						
+					}else {
+						this.content=`
+							${this.telephone}-${this.phoneIpt}<br/><br/>
+							预约外呼成功,已加入您的活动日程
+						`
+						this.show=true
+					}
+					}else {
+						uni.navigateBack()
+					}
+				})
+			},
+			//取消修改
+			cancelModification(){
+				if(this.identification=='修改'){
+					if(this.goOnNextStep=='true') {
+						this.accounts=`
+							${this.cellphone}<br/>
+							预约成功,已加入您的活动日程<br/><br/>
+							
+							想要及时获取活动时间变更通知,请关注【弘则研究】公众号
+						`
+						this.goFollowShow=true
+					}else {
+						this.content=`
+							${this.cellphone}<br/><br/>
+							预约外呼成功,已加入您的活动日程
+						`
+						this.show=true
+					}
+				}else {
+					uni.navigateBack()
+				}
+			},
+			//去关注公众号
+			goFollowShowBtn(){
+				uni.redirectTo({
+					url: '/activityPages/accountsOfficial/accountsOfficial'
+				})
+			},
+			//弹框的取消
+			cancelDialog(){
+				uni.navigateBack()
+			},
+			//右上角的返回
+			backArrowleft(){
+				if(this.identification=='修改'){
+					if(this.goOnNextStep=='true') {
+						this.accounts=`
+							${this.cellphone}<br/>
+							预约成功,已加入您的活动日程<br/><br/>
+							
+							想要及时获取活动时间变更通知,请关注【弘则研究】公众号
+						`
+						this.goFollowShow=true
+					}else {
+						this.content=`
+							${this.cellphone}<br/><br/>
+							预约外呼成功,已加入您的活动日程
+						`
+						this.show=true
+					}
+				}else {
+					uni.navigateBack()
+				}
+			},
 		},
 		onLoad(option) {
-			uni.setNavigationBarTitle({
-			    title:option.title
-			});
 			this.isShowTitle=option.title
 			this.identification=option.identification
-		}
+			this.id= option.id || ''
+			this.goOnNextStep=option.goOnNextStep||''
+			this.cellphone=option.cellphone||''
+			const res = uni.getSystemInfoSync()
+			this.demoTop=res.safeArea.top
+		},
+		
+		
 	}
 </script>
 
 <style scoped lang="scss">
 .outbound-content {
+/* 自定义状态栏 */
+.status_bar {
+	      width: 100%;
+}
+ 
+/* 自定义导航栏 */
+.status_title {
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	width: 100%;
+	height: 88rpx;
+	padding: 10rpx 62rpx 15rpx 30rpx;
+	background-color: #FFFFFF;
+	box-sizing: border-box;
+}
+.status_center {
+	margin: 0 auto;
+	font-size: 34rpx;
+	font-weight: 400;
+	color: #000000;
+}
 	.top-box {
 		width: 100%;
 		background-color: #F7F7F7;
@@ -141,4 +296,17 @@
 		}
 	}
 }
+.slot-content {
+		width: 100%;
+		padding: 50rpx;
+		text-align: center;
+		font-size: 32rpx;
+		color: #0F1826;
+		line-height: 48rpx;
+
+	}
+
+	.u-model__footer__button.data-v-3626fcec {
+		border-right: 1rpx solid #333;
+	}
 </style>

+ 51 - 37
activityPages/index.js

@@ -1,7 +1,4 @@
-import {
-	activity,
-	User
-} from "@/config/api.js"
+import { activity,User } from "@/config/api.js"
 let app = getApp()
 export default {
 	data() {
@@ -21,8 +18,8 @@ export default {
 			listChartPermissionInit:[],
 			activityTypeIds: '', //活动类型id 多个用 , 隔开
 			chartPermissionIds: '', //行业id 多个用 , 隔开
-			chartPermissionName: '行业分类',
-			activityTypeName: '活动类型',
+			chartPermissionName: '所有分类',
+			activityTypeName: '所有类型',
 			selectShow: false,
 			isShowJurisdiction: false,
 			isGain: true,
@@ -38,14 +35,12 @@ export default {
 				state: '',
 				isNum: false
 			},
-
 			isAreaCode: false,
 			areaCode: {
 				id: '',
 				type: ''
 			},
-			isNeedAddCountryCode: false,
-
+			isNeedAddCountryCode: false,//判断是否需要区号
 			isId: 0,
 			activityIdAdd: '',
 			// 历史搜索列表
@@ -60,10 +55,17 @@ export default {
 			applyForIsShow: false, //潜在用户
 			flag: false,
 			activityTimeList:[{Id: 1, IsChoose: false, StatusName: "今日活动"},{Id: 2, IsChoose: false, StatusName: "明日活动"}],
-			activityTimeStatus:''
+			activityTimeStatus:'',
+			editIsShow:false,//外呼莫泰框
+			countryCode:'',//外呼区号
+			mobileEdit:'',//外呼手机号
+			goOnNextStep:'',//设置外呼号后弹出哪个
+			mailboxBinding:false,//是否绑定邮箱
+			keyWord: '',
 		}
 	},
-	methods: {
+	methods: {
+		// 滑动状态下拉选择的收起
 		closeTheWindow(type) {
 			if (type == 'statusstate') {
 				const state = this.activeState ? this.activeState.split(',').map(Number) : []
@@ -94,11 +96,12 @@ export default {
 				})
 			}
 		},
+		// 我要报名
 		wanttosignup(id) {
 			this.activityIdAdd = id
 			this.selectShow = true
 		},
-
+		//判断是否要绑定区号
 		countryCcode() {
 			User.countryCcode().then(res => {
 				if (res.Ret == 200) {
@@ -147,17 +150,29 @@ export default {
 						if (this.hasPermission == 1) {
 							const index = this.collectList.findIndex(item => item.ActivityId == id)
 							this.collectList[index].SignupType = type
-							if (res.Data.GoFollow && res.Data.SignupStatus !== 'Success' || !res.Data
-								.GoFollow) {
-								this.isShow = true
-							} else {
-								this.goFollow = res.Data.GoFollow
-							}
 							this.signupType = res.Data.SignupType
-							this.signupStatus = res.Data.SignupStatus
+							this.signupStatus = res.Data.SignupStatus
+							this.countryCode=res.Data.CountryCode
+							this.mobileEdit=res.Data.Mobile
+							this.goOnNextStep=res.Data.GoFollow
 							this.idTypeCancel = {
 								cutId: res.Data.ActivityId,
 								state: 1
+							}
+							if( res.Data.GoBindEmail){
+								this.mailboxBinding=true
+								return
+							}
+							if(res.Data.SignupStatus !== 'Success') {
+								this.isShow = true
+							}else {
+								if(res.Data.GoOutboundMobile){
+									this.editIsShow=true
+								}else if (res.Data.GoFollow){
+									this.goFollow = res.Data.GoFollow
+								}else if(res.Data.SignupStatus == 'Success') {
+									this.isShow = true
+								}
 							}
 						} else if (this.hasPermission == 2) {
 							this.jurisdictionList.SellerMobile = res.Data.SellerMobile
@@ -200,7 +215,7 @@ export default {
 		},
 		//去往详情页面
 		goDetail(item) {
-			this.public('show', true, '/activityPages/activityDetail/activityDetail?id=', item.ActivityId)
+			this.public({type:'show'}, true, '/activityPages/activityDetail/activityDetail?id=', item.ActivityId)
 		},
 		//是否展示有权限的行业
 		isJurisdiction() {
@@ -257,10 +272,8 @@ export default {
 				if (strTwo.length > 0) {
 					this.activeStateName = strTwo.join(',')
 				}else{
-					if (str.length == this.listActivityStaus.length) {
+					if (str.length == this.listActivityStaus.length || str.length <= 0) {
 						this.activeStateName = '所有状态'
-					} else if (str.length <= 0) {
-						this.activeStateName = '活动状态'
 					} else {
 						this.activeStateName = str.join(',')
 					}
@@ -274,12 +287,10 @@ export default {
 						str.push(key.PermissionName)
 					}
 				})
-				if (str.length == this.listChartPermission.length) {
-					this.chartPermissionName = '所有行业'
-				} else if (str.length <= 0) {
-					this.chartPermissionName = '行业分类'
-				} else {
-					this.chartPermissionName = str.join(',')
+				if ((str.length == 6 && this.listChartPermission.length == 6) || str.length <= 0) {
+					this.chartPermissionName = '所有分类'
+				} else {
+					this.chartPermissionName = str.join(',')
 				}
 				this.chartPermissionIds = arr.join(',')
 
@@ -292,17 +303,19 @@ export default {
 						str.push(key.ActivityTypeName)
 					}
 				})
-				if (str.length == this.listActivityType.length) {
-					this.activityTypeName = '所有活动'
-				} else if (str.length <= 0) {
-					this.activityTypeName = '活动类型'
+				if (str.length == this.listActivityType.length || str.length <= 0) {
+					this.activityTypeName = '所有类型'
 				} else {
 					this.activityTypeName = str.join(',')
 				}
 				this.activityTypeIds = arr.join(',')
 			}
 			this.page_no = 1
-			this.collectList = []
+			this.collectList = []
+			this.dynamicList=[]
+			this.spanIndex=[]
+			this.keyWord=''
+			this.fastSearchKeWord()
 			this.getList()
 			this.selectComponent(`#${type}`).toggle();
 		},
@@ -320,13 +333,12 @@ export default {
 				this.chartPermissionIds = ''
 				this.isShowJurisdiction = false
 				this.isId = 2
-				// this.getUserSearchContent()
 				this.listChartPermission.map(item => item.IsChoose = false)
-				this.chartPermissionName = '行业分类'
+				this.chartPermissionName = '所有分类'
 			} else {
 				this.listActivityType.forEach(item => item.IsChoose = false)
 				this.activityTypeIds = ''
-				this.activityTypeName = '活动类型'
+				this.activityTypeName = '所有类型'
 			}
 		},
 		//状态的下拉选择
@@ -354,6 +366,7 @@ export default {
 				}
 			})
 		},
+		// 弹框的初始化
 		init() {
 			this.signupType = ''
 			this.goFollow = false
@@ -361,6 +374,7 @@ export default {
 			this.isShow = false
 			this.isCancelShow = false
 		},
+		// 跳转判断权限
 		public(type, flag, purl, price = '') {
 			this.$store.dispatch('checkHandle', type).then(res => {
 				app.globalData.isAuth = res.IsAuth;

+ 66 - 59
activityPages/index.scss

@@ -1,13 +1,73 @@
-.activity-content {
-		// position: relative;
-		background-color: #F7F7F7;
+.activity-content {
+		background-color: #F7F7F7;
+		.dynamic-content {
+			padding: 100rpx 20rpx 10rpx;
+			width: 100%;
+			background-color: #fff;
+			border-bottom: 3px solid #F7F7F7;
+			.target-title {
+				display: flex;
+				justify-content: space-between;
+				margin-bottom: 20rpx;
+				padding: 0  14rpx;
+				.box {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 28rpx;
+				color: #2C83FF;
+				image {
+					width: 30rpx;
+					height: 30rpx;
+				}
+			}
+			.foreshow {
+				font-size: 32rpx;
+				color: #333;		
+				font-weight: bold;
+			}
+		}		
+		.target-item {
+				width: 100%;
+				padding-bottom: 20rpx;
+				padding-right: 20rpx;
+				display: flex;
+				font-size: 32rpx;
+				font-weight: 400;
+				color: #2C83FF;
+				.target-ul {
+					width: 50%;					
+				}
+				.target-left {
+					padding-right: 50rpx;
+					border-right: 2rpx solid #E5E5E5;
+				}
+				.target-right {
+					padding-left: 33rpx;	
+				}
+				.target-text {
+					margin-top: 10rpx;
+					text {
+						line-height: 37rpx;
+						display: inline-block;
+						max-width: 305rpx;
+						overflow:hidden;
+						text-overflow:ellipsis;
+						white-space:nowrap;
+						padding: 4rpx 14rpx;						
+					}
+					.active {
+						background-color: #EBF4FF;
+					}
+				}
+			}
+		}
 		.top-content {
 			padding-bottom: 2rpx;
 			.tab {
 				display: flex;
 				font-size: 32rpx;
 				color: #707070;
-
 				.tab-item {
 					flex: 1;
 					text-align: center;
@@ -15,7 +75,6 @@
 						height: 78rpx;
 						line-height: 48rpx;
 						position: relative;
-
 						.border_act {
 							position: absolute;
 							height: 6rpx;
@@ -24,7 +83,6 @@
 							bottom: 0rpx;
 						}
 					}
-
 					.active {
 						color: #3385FF;
 						font-weight: bold;
@@ -32,7 +90,6 @@
 					}
 				}
 			}
-
 			.index-fixed {
 				margin-top: 40rpx;
 				width: 100%;
@@ -46,14 +103,11 @@
 				padding-left: 34rpx;
 				color: #8D8D8D;
 				font-size: 28rpx;
-
 				.search_ico {
 					padding-right: 16rpx;
 				}
 			}
-
 		}
-
 		.head {
 			padding-top: 80rpx !important;
 		}
@@ -65,33 +119,28 @@
 			top: 0;
 			left: 0;
 			z-index: 999;
-
 			.search-cont-top {
 				margin-top: 30rpx;
-
 				.cont-tit {
 					color: #666;
 					font-size: 28rpx;
 					margin-bottom: 30rpx;
 					display: flex;
 					justify-content: space-between;
-
 					.empty_ico {
 						width: 32rpx;
 						height: 33rpx;
 					}
 				}
-
 				.targetList {
 					display: flex;
 					flex-wrap: wrap;
-
-					// justify-content: space-between;
+					max-height: 138rpx;
+					overflow: hidden;
 					.target-item {
 						padding: 4rpx 18rpx;
 						color: #4A4A4A;
 						font-size: 26rpx;
-						// border: 1rpx solid #3385ff;
 						background-color: #F7F7F7;
 						margin-bottom: 30rpx;
 						margin-right: 30rpx;
@@ -99,7 +148,6 @@
 					}
 				}
 			}
-
 			.searchTarget-header {
 				position: relative;
 				width: 100%;
@@ -108,11 +156,9 @@
 				display: flex;
 				justify-content: center;
 				align-items: center;
-
 				.sea_ipt_placeholder {
 					color: #E5E5E5 !important;
 				}
-
 				.sea_ipt {
 					width: 682rpx;
 					height: 70rpx;
@@ -125,7 +171,6 @@
 					padding: 0 180rpx 0 78rpx;
 					border-radius: 70rpx;
 				}
-
 				.sea_ico {
 					width: 31rpx;
 					height: 31rpx;
@@ -134,7 +179,6 @@
 					top: 50%;
 					transform: translateY(-50%);
 				}
-
 				.ipt-right {
 					display: flex;
 					align-items: center;
@@ -143,15 +187,12 @@
 					top: 50%;
 					transform: translateY(-50%);
 					color: #3385FF;
-
 					.line {
 						margin: 0 21rpx;
 						color: #E0E0E0;
 					}
 				}
 			}
-
-
 			.select-conyent {
 				.decide {
 					background-color: #F8F8FA;
@@ -162,33 +203,27 @@
 					width: 100%;
 					padding-left: 30rpx;
 				}
-
 				.items-box {
 					width: 40rpx;
 				}
-
 				.menu-items {
 					background-color: #F8F8FA;
 					width: 100%;
 					display: flex;
 					flex-wrap: wrap;
 					padding: 30rpx 30rpx 0;
-
 					.menu-items-box {
 						display: flex;
 						width: 50%;
 						font-size: 28rpx;
 						font-weight: 400;
 						margin-bottom: 40rpx;
-
 					}
 				}
-
 				.replacement-box {
 					background-color: #fff;
 					border-radius: 0rpx 0rpx 16rpx 16rpx;
 				}
-
 				.replacement {
 					margin: 0rpx 30rpx 20rpx;
 					display: flex;
@@ -200,13 +235,11 @@
 					font-weight: 400;
 					color: #FFFFFF;
 					border-radius: 30rpx;
-
 					text {
 						flex: 1;
 						text-align: center;
 
 					}
-
 					.replacement-box {
 						border: 1rpx solid #2C83FF;
 						opacity: 1;
@@ -217,22 +250,18 @@
 				}
 			}
 		}
-
 		.box-content {
 			padding: 200rpx 34rpx 20rpx;
 			background-color: #F7F7F7;
-
 			.content-list {
 				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);
 				border-radius: 16rpx;
 				font-size: 28rpx;
-
 				.list-top {
 					margin: 0 30rpx;
 					display: flex;
@@ -242,17 +271,14 @@
 					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;
@@ -267,7 +293,6 @@
 						}
 					}
 				}
-
 				.list-center {
 					width: 100%;
 					color: #333333;
@@ -280,7 +305,6 @@
 						font-weight: bold;
 						text-indent: -14rpx
 					}
-
 					.title-two {
 						padding-left: 30rpx;
 						padding-bottom: 24rpx;
@@ -290,7 +314,6 @@
 						font-size: 28rpx;
 						font-weight: bold;
 					}
-
 					text {
 						padding-left: 30rpx;
 					}
@@ -304,38 +327,30 @@
 						.box-expert {
 							margin-left: 30rpx;
 							display: flex;
-
 						}
 					}
 				}
-
 				.list-bottom {
 					height: 80rpx;
-
-					// border-top: 1px solid #E5E5E5;
 					.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;
@@ -348,7 +363,6 @@
 				}
 			}
 		}
-
 		.nodata {
 			padding-top: 350rpx;
 
@@ -357,10 +371,8 @@
 				height: 288rpx;
 			}
 		}
-
 		.select-box {
 			width: 100%;
-
 			view {
 				height: 95prx;
 				line-height: 95rpx;
@@ -371,13 +383,11 @@
 			}
 		}
 	}
-
 	/deep/.van-dropdown-menu {
 		background-color: #fff;
 		box-shadow: none !important;
 		padding-top: 20rpx;
 	}
-
 	/deep/.van-dropdown-menu__item {
 		box-sizing: border-box;
 		width: 190rpx;
@@ -387,15 +397,12 @@
 		border-radius: 26rpx;
 		background: #F8F8FA;
 	}
-
 	/deep/.van-dropdown-item {
 		margin-top: -10rpx;
 	}
-
 	/deep/[data-index='2'] {
 		margin-right: 0rpx;
 	}
-
 	/deep/ .van-ellipsis {
 		font-size: 24rpx;
 	}

+ 3 - 1
activityPages/networkAttend/networkAttend.vue

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

+ 3 - 2
components/areaCode.vue

@@ -1,9 +1,10 @@
 <template>
 	<view class="select-box">
-		<u-popup v-model="areacodeShow" mode="bottom">
+		<u-popup v-model="areacodeShow" mode="bottom"  @close="cancel">
 			<view class="box" style="color: #333333;font-size: 28rpxrpx;">请选择您的国际区号</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('86')">大陆+86</view>
 			<view class="box" style="color: #2C83FF;" @click="areacode('852')">香港+852</view>
-			<view class="box" style="color: #2C83FF;" @click="areacode('866')">台湾+866</view>
+			<view class="box" style="color: #2C83FF;" @click="areacode('886')">台湾+886</view>
 			<view class="box" style="color: #2C83FF;" @click="areacode('1')">美国+1</view>
 			<view class="box" style="color: #2C83FF;" @click="areacode('65')">新加坡+65</view>
 			<view class="box box-bottom" style="color: #A9AFB8;" @click="cancel">取消</view>

+ 101 - 9
components/modalDialog.vue

@@ -1,7 +1,12 @@
 <template>
 	<view>
-		<u-modal v-model="show" :content="content" :content-style="{fontSize: '32rpx'}" @confirm="contentBtn"
-			:show-title="false" confirm-text="知道了" :confirm-style="{fontWeight: '700'}"></u-modal>
+		<u-modal v-model="show" :content-style="{fontSize: '32rpx'}" @confirm="contentBtn"
+			:show-title="false" confirm-text="知道了" :confirm-style="{fontWeight: '700'}">
+			<view class="slot-content">
+				<rich-text :nodes="content"></rich-text>
+			</view>
+			
+			</u-modal>
 
 		<!-- 关注公众号 -->
 		<u-modal v-model="goFollowShow" :content-style="{fontSize: '32rpx'}" @confirm="goFollowShowBtn"
@@ -34,7 +39,27 @@
 			</view>
 		</u-modal>
 		<u-modal v-model="showRelation" confirm-text="知道了" :confirm-style="{fontWeight: '700'}"
-			:content="contentRelation"></u-modal>
+			:content="contentRelation"></u-modal>
+			
+			
+			<!-- 修改手机号 -->
+			<u-modal width="650" v-model="editIsShowDlg" :content-style="{fontSize: '32rpx'}" @confirm="GoOutboundMobileBtn"
+				:show-cancel-button="true" confirm-text="无需修改" cancel-text="前去修改"
+				cancel-color="#3385FF"
+				 @cancel="GoOutboundMobileIsGo" :show-title="false"
+				:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" >
+				<view class="slot-content">
+					<rich-text :nodes="editIsShowAccounts"></rich-text>
+				</view>
+			</u-modal>
+			
+			<u-modal v-model="mailboxBindingDlg" :content-style="{fontSize: '32rpx'}" @confirm="gmailboxBindingDlgBtn"
+				:show-cancel-button="true" confirm-text="设置" @cancel="cancelMailboxBindingDlg" :show-title="false"
+				:cancel-style="{borderRight:'1rpx solid #EBEBEB'}" :confirm-style="{fontWeight: '700'}">
+				<view class="slot-content">
+					<rich-text :nodes="mailboxText"></rich-text>
+				</view>
+			</u-modal>
 	</view>
 </template>
 
@@ -56,7 +81,11 @@
 				accounts: '',
 				canceltext: '',
 				jurisdictionText: '',
-				hasPermissionText: '',
+				hasPermissionText: '',
+				editIsShowAccounts:'',
+				editIsShowDlg:false,
+				mailboxBindingDlg:false,
+				mailboxText:'您当前绑定的联系方式为邮箱,请先设置您的外呼号码'
 			}
 		},
 		props: {
@@ -92,10 +121,42 @@
 			},
 			hasPermission: { //权限字段
 				type: String
-			}
+			},
+			editIsShow:{
+				type:Boolean,
+			},
+			countryCode:{
+				type:String
+			},
+			mobileEdit:{
+				type:String
+			},
+				
+			goOnNextStep:{
+				type:Boolean,
+				default:false
+			},
+			mailboxBinding:{
+				type:Boolean,
+				default:false
+			},
+			
 
 		},
-		watch: {
+		watch: {
+			mailboxBinding(){
+				this.mailboxBindingDlg=this.mailboxBinding
+			},
+			editIsShow(){
+				this.editIsShowDlg=this.editIsShow
+				if(this.editIsShow){
+					this.editIsShowAccounts=`
+						默认外呼号码是您当前绑定的手机号:<br />
+						${this.countryCode}-${this.mobileEdit}<br/><br/>
+						是否需要修改您的外呼号码?
+					`
+				}
+			},
 			goFollow() {
 				this.goFollowShow = this.goFollow
 			},
@@ -105,8 +166,9 @@
 			signupType() {
 				if(this.signupStatus!=='Success') return
 				if (this.signupType == 1) {
-					this.content = '预约成功,已加入您的活动日程'
-					this.accounts = `
+					this.content = `${this.countryCode}-${this.mobileEdit}<br/>预约成功,已加入您的活动日程`
+					this.accounts = `
+					${this.countryCode}-${this.mobileEdit}<br/>
 					预约成功,已加入您的活动日程<br/><br/>
 					
 					想要及时获取活动时间变更通知,请关注【弘则研究】公众号
@@ -235,7 +297,37 @@
 			showhasPermissionCancel() {
 				this.showhasPermission = false
 				this.$parent.isShowhasPermission = false
-			},	
+			},	
+			GoOutboundMobileBtn(){
+				this.$parent.editIsShow=false
+				this.editIsShowDlg=false
+				if(this.goOnNextStep){
+					this.goFollowShow=true
+				}else {
+					this.show=true
+				}
+			},
+			GoOutboundMobileIsGo(){
+				this.$parent.editIsShow=false
+				this.editIsShowDlg=false
+				this.$emit('cancelShowBtn', this.idTypeCancel, this.signupType, this.idTypeCancel.isNum)
+				uni.navigateTo({
+					url:'/activityPages/editOutbound/editOutbound?title=修改外呼号码&identification=修改&goOnNextStep='+this.goOnNextStep+"&id="+this.idTypeCancel.cutId+'&cellphone='+ this.countryCode+'-'+ this.mobileEdit,
+				})
+			},
+			gmailboxBindingDlgBtn(){
+				this.$parent.mailboxBinding=false
+				this.mailboxBindingDlg=false
+				this.$parent.signupType=''
+				uni.navigateTo({
+					url:'/activityPages/editOutbound/editOutbound?title=设置外呼号码&identification=邮箱&goOnNextStep='+this.goOnNextStep+"&id="+this.idTypeCancel.cutId
+				})
+			},
+			cancelMailboxBindingDlg(){
+					this.$parent.mailboxBinding=false
+					this.mailboxBindingDlg=false
+			}
+			
 		}
 	}
 </script>

+ 8 - 10
config/api.js

@@ -1,14 +1,8 @@
-import {
-	baseUrl
-} from './config.js';
-import {
-	getHttp,
-	postHttp,
-} from './request.js';
+import { baseUrl } from './config.js';
+import { getHttp,postHttp } from './request.js';
 
 /* 上传 */
 export const uploadurl = baseUrl + '/resource/image/upload'
-
 // 校验token接口
 export const checkToken =  params => {
 	return getHttp('/user/check/status',params,0)
@@ -188,7 +182,7 @@ export const Reports = {
 	getArticleList: params => {
 		return getHttp('/report/industry/ArticleList',params)
 	},
-/*上传文章阅读时间接口*/
+	/*上传文章阅读时间接口*/
 	addStopTime: params => {
 		return postHttp('/article/addStopTime',params,0)
 	},
@@ -228,6 +222,10 @@ export const activity ={
 	},
 	/* 获取敏捷搜索关键词的列表接口*/
 	fastSearchKeWord: params => {
-		return getHttp('/activity/fastSearchKeWord',params)
+		return getHttp('/activity/labelList',params)
+	},
+	/*用户修改外呼手机号以及区号接口*/
+	addOutboundMobile: params => {
+		return postHttp('/user/countryCcode/addOutboundMobile',params)
 	},
 }

+ 2 - 2
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

+ 0 - 14
main.js

@@ -5,7 +5,6 @@ import * as Db from './config/db.js';//缓存操作
 import * as Util from './config/util.js';//通用方法
 import { hex_md5 } from './config/md5.js';//加密
 import uView from "uview-ui";
-// import baseUrl from "./config/config.js"
 
 Vue.use(uView);
 
@@ -15,19 +14,6 @@ Vue.prototype.$db = Db;
 Vue.prototype.$util = Util;
 Vue.prototype.$md5 = hex_md5;
 Vue.prototype.$global = App.globalData;
-// Vue.prototype.$onLaunched = new Promise(resolve => {
-//     Vue.prototype.$isResolve = resolve
-// })
-//在main.js中  
-//系统错误捕获  
-//if(baseUrl=='https://cygx.hzinsights.com/api'){
-	// const errorHandler = (err, vm, info) => {
-	// console.error(err);  
-	// }  
-	// Vue.config.errorHandler = errorHandler;  
-	// Vue.prototype.$throw = (error) => errorHandler(error, this);
-//}
-
 App.mpType = 'app'
 
 const app = new Vue({

+ 2 - 1
pages.json

@@ -146,7 +146,8 @@
                     "style" :                                                                                    
                 {
                     "navigationBarTitleText": "",
-                    "enablePullDownRefresh": false
+                    "enablePullDownRefresh": false,
+					 "navigationStyle": "custom"
                 }
                 
                 }

+ 131 - 176
pages/activity/activity.vue

@@ -1,5 +1,6 @@
 <template>
-	<view class="container activity-content">
+	<view class="container activity-content">
+		<!--  活动、日程 -->
 		<view class="top-content" id="idtop">
 			<view class="tab">
 				<view class="tab-item" v-for="(item, index) in tabs" :key="item.id">
@@ -12,19 +13,36 @@
 				</view>
 			</view>
 		</view>
-		<view class="dynamic-content" v-if="tabsActive == 0">
+		<!-- 活动主题预告 -->
+		<view class="dynamic-content" v-if="tabsActive == 0">
 			<view class="target-title">
-				活动预告:
-			</view>
-			<view class="target-item" v-for="(item,index) in dynamicList" :key="index" @click="changeTarget(index,item)"
-				:class="{'bgcolor':spanIndex.indexOf(index)>-1}">
-				{{item.KeyWord}}
-			</view>
-			<view class="target-item target-search" @click="goSearch">
-				<image src="../../static/img/search_iocn.png" mode=""></image>
-				<text style="margin-left: 10rpx;">更多...</text>
+							<view class="foreshow box">
+								<image src="../../static/img/foreshow_icon.png"></image>
+								<text style="margin-left: 10rpx;">活动预告</text>
+							</view>
+							<view class="even-more box" @click="goSearch">
+								<image src="../../static/img/search_iocn.png"></image>
+								<text style="margin-left: 10rpx;">更多主题...</text>
+							</view>
+			</view>
+			<view class="target-item">
+				<view class="target-ul target-left">
+					<view class="target-text" v-for="(item,index) in dynamicList" :key="index" v-if="index%2===0">
+						<text :class="spanIndex.includes(index)?'active':''" @click="changeTarget(index)">
+							{{item.KeyWord}}
+						</text>
+					</view>
+				</view>
+				<view class="target-ul target-right">
+					<view class="target-text" v-for="(item,index) in dynamicList" :key="index" v-if="index%2 !== 0">
+						<text :class="spanIndex.includes(index)?'active':''"  @click="changeTarget(index)">
+							{{item.KeyWord}}
+						</text>
+					</view>
+				</view>
 			</view>
 		</view>
+		<!-- 状态的下拉选择 -->
 		<view class="select-sticky" v-if="tabsActive == 0">
 			<view class="select-conyent">
 				<van-dropdown-menu active-color="#333333">
@@ -104,9 +122,8 @@
 				</van-dropdown-menu>
 			</view>
 
-		</view>
-
-		<!-- </view> -->
+		</view>
+		<!-- 活动的列表 -->
 		<view class="box-content" id="contentList" :class="{ head: tabsActive == 1 }" v-if="haveData">
 			<view class="content-list" v-for="(item, index) in collectList" :key="index">
 				<view class="list-top" @click="goDetail(item)">
@@ -170,11 +187,7 @@
 					</view>
 				</view>
 				<view class="list-bottom" v-else-if="item.ActiveState == 1">
-					<view class="multi" v-if="
-              item.ActivityTypeId == 1 ||
-              item.ActivityTypeId == 2 ||
-              (item.ActivityTypeId == 3 && item.IsLimitPeople == 0)
-            ">
+					<view class="multi" v-if="item.ActivityTypeId == 1 || item.ActivityTypeId == 2 ||  (item.ActivityTypeId == 3 && item.IsLimitPeople == 0)">
 						<text class="multi-outbound" v-if="item.IsSignup !== 1"
 							@click="signupAdd(item.ActivityId, 1)">预约外呼</text>
 						<text class="multi-outbound" v-else
@@ -196,15 +209,21 @@
 			<u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20"
 				v-if="totalPage > 1" />
 		</view>
+		<!-- 缺审显示 -->
 		<view class="nodata" :class="tabsActive == 0?'':'nodataTwo'" v-else>
 			<image src="@/static/img/act_search.png" mode="" class="nodata_ico"></image>
 			<text>{{tabsActive==1?'暂无日程':"暂无活动"}}</text>
-		</view>
+		</view>
+		<!-- 所有自定义弹框 -->
 		<modalDialog :isShow="isShow" :signupType="signupType" :goFollow="goFollow" :signupStatus="signupStatus"
-			:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
-			:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :hasPermission="hasPermission"
-			:jurisdictionList="jurisdictionList" />
+			:hasPermission="hasPermission" :jurisdictionList="jurisdictionList" :editIsShow="editIsShow"
+			:isCancelShow="isCancelShow" :idTypeCancel="idTypeCancel" @cancelShowBtn="cancelEnsure"
+			:countryCode="countryCode" :mobileEdit="mobileEdit" :goOnNextStep="goOnNextStep"
+			:isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" 
+			:mailboxBinding="mailboxBinding"/>
+		<!-- 区号的选择 -->
 		<areaCode :isAreaCode="isAreaCode" :areaCode="areaCode" />
+		<!-- 限制报名的参会方式 -->
 		<view class="select-box">
 			<u-popup v-model="selectShow" mode="bottom">
 				<view style="color: #333333; font-size: 28rpxrpx">请选择参会方式</view>
@@ -217,13 +236,8 @@
 </template>
 
 <script>
-	import {
-		activity,
-		User
-	} from "@/config/api.js";
-	import {
-		Throttle
-	} from "@/config/util.js";
+	import { activity, User } from "@/config/api.js";
+	import { Throttle } from "@/config/util.js";
 	import modalDialog from "@/components/modalDialog.vue";
 	import areaCode from "@/components/areaCode.vue";
 	import myMixin from "@/activityPages/index.js";
@@ -244,9 +258,7 @@
 				spanIndex: [],
 				activeStateName: "未开始",
 				activeState: "1", //活动进行状态
-				dynamicList: [],
-				dynamicLKeyWodr: [],
-				keyWord: '',
+				dynamicList: [],
 				isScrollShow:false
 			};
 		},
@@ -255,57 +267,12 @@
 			modalDialog,
 			areaCode,
 		},
-		onLoad(option) {
-			this.$store.dispatch("checkHandle", 'load').then(res => {
-				app.globalData.isAuth = res.IsAuth;
-				app.globalData.isBind = res.IsBind;
-				this.countryCcode(); //判断是否加区号
-				if (Object.keys(option).length !== 0) {
-					this.activeState = option.statesId; //活动进行状态
-					this.activityTypeIds = option.typeIds; //活动类型id 多个用 , 隔开
-					this.chartPermissionIds = option.chartIds; //行业id 多个用 , 隔开
-					this.activeStateName = option.stateName;
-					this.chartPermissionName = option.chartName;
-					this.activityTypeName = option.typeName;
-					this.activityTimeStatus = option.timeStatus;
-					this.spanIndex = option.indexs ? option.indexs.split(',').map(item => item - 0) : []
-					this.keyWord = option.keys
-					this.isGain = false;
-				} else {
-					this.isGain = true;
-				}
-				if (this.isGain) {
-					this.getList();
-				}
-				this.getUserSearchContent();
-			})
-			this.fastSearchKeWord()
-		},
-		//切换tabs 刷新页面
-		onTabItemTap() {
-			if (this.page_no > 1 || this.tabsActive !== 0 || this.collectList !== []) {
-				this.tabsActive = 0;
-				this.activeStateName = "未开始";
-				this.chartPermissionName = "行业分类";
-				this.activityTypeName = "活动类型";
-				this.activeState = "1"; //活动进行状态
-				this.activityTypeIds = ""; //活动类型id 多个用 , 隔开
-				this.chartPermissionIds = ""; //行业id 多个用 , 隔开
-				this.page_no = 1;
-				this.collectList = [];
-				this.spanIndex=[]
-				this.keyWord= ''
-				this.activityTimeList.forEach(key => {key.IsChoose=false})
-				this.activityTimeStatus=''
-				this.getList();
-				this.getUserSearchContent();
-			}
-
-		},
 		methods: {
+			//页面滑动了
 			isscroll(){
 				this.isScrollShow=true
-			},
+			},
+			// 通过分享进来的下拉选择的状态
 			shareOption() {
 				const arr = this.activeState.split(',').map(item => item - 0)
 				this.listActivityStaus.forEach(item => {
@@ -341,12 +308,6 @@
 				})
 				this.preserve()
 			},
-			fastSearchKeWord() {
-				activity.fastSearchKeWord().then(res => {
-					if (res.Ret !== 200) return
-					this.dynamicList = res.Data.List || []
-				})
-			},
 			//获取列表
 			getList() {
 				activity
@@ -357,7 +318,7 @@
 						ActivityTypeIds: this.activityTypeIds, //活动类型id 多个用 , 隔开
 						ChartPermissionIds: this.chartPermissionIds, //行业id 多个用 , 隔开
 						IsShowJurisdiction: this.isId,
-						KeyWord: this.keyWord,
+						Label: this.keyWord,
 						WhichDay: this.activityTimeStatus
 					})
 					.then((res) => {
@@ -428,8 +389,6 @@
 							this.shareOption()
 						}
 					});
-
-
 			},
 			//头部tabs切换
 			toggleTab(item, index) {
@@ -495,9 +454,9 @@
 					this.getScheduleList();
 				}
 			},
-			//搜索事件
+			//去往搜索事件
 			goSearch() {
-				this.public('show', true, "/activityPages/activitySearch/activitySearch")
+				this.public({type:'show'}, true, "/activityPages/activitySearch/activitySearch")
 			},
 			//添加会议提醒接口
 			meetingReminderAdd(id) {
@@ -596,11 +555,6 @@
 						str.push(item.StatusName)
 					}
 				})
-				// if (str.length == this.listActivityStaus.length) {
-				// 	this.activeStateName = '所有状态'
-				// } else {
-				// 	this.activeStateName = str.join(',')
-				// }
 				this.activeState = arr.join(',')
 				const arrTwo = []
 				const strTwo=[]
@@ -627,11 +581,9 @@
 						hyArr.push(key.ChartPermissionId)
 						hyStr.push(key.PermissionName)
 					}
-				})
-				if (hyStr.length == this.listChartPermission.length && hyStr.length > 0) {
-					this.chartPermissionName = '所有行业'
-				} else if (hyStr.length <= 0) {
-					this.chartPermissionName = '行业分类'
+				})
+				if ((hyStr.length == 6 && this.listChartPermission.length == 6) || hyStr.length <= 0) {
+					this.chartPermissionName = '所有分类'
 				} else {
 					this.chartPermissionName = hyStr.join(',')
 				}
@@ -644,19 +596,16 @@
 						lxStr.push(key.ActivityTypeName)
 					}
 				})
-				if (lxStr.length == this.listActivityType.length && lxStr.length > 0) {
-					this.activityTypeName = '所有活动'
-				} else if (lxStr.length <= 0) {
-					this.activityTypeName = '活动类型'
+				if (lxStr.length == this.listActivityType.length && lxStr.length > 0 || lxStr.length <= 0) {
+					this.activityTypeName = '所有类型'
 				} else {
 					this.activityTypeName = lxStr.join(',')
 				}
 				this.activityTypeIds = lxArr.join(',')
 				this.getList()
 			},
-			//选择标签
+			//选择预告气泡的标签
 			changeTarget(index, item) {
-				// console.log(this.spanIndex);
 				let arrIndex = this.spanIndex.indexOf(index);
 				if (arrIndex > -1) {
 					this.spanIndex.splice(arrIndex, 1);
@@ -665,28 +614,94 @@
 				}
 				const arr = []
 				this.spanIndex.forEach(item=>{
-					arr.push(this.dynamicList[item].KeyWord)
+					if(this.dynamicList.length>0){
+						 arr.push(this.dynamicList[item].KeyWord)
+					}
+					
 				})
 				this.keyWord = arr.join(',')
 				this.page_no = 1
 				this.getList()
-			},
+			},
+			//获取快捷主题
+			fastSearchKeWord() {
+			   activity.fastSearchKeWord({
+			 		ActiveState: this.activeState, 
+			 		ActivityTypeIds: this.activityTypeIds, 
+			 		ChartPermissionIds: this.chartPermissionIds,
+			 		WhichDay: this.activityTimeStatus
+			 	}).then(res => {
+			 		if (res.Ret !== 200) return
+			 		this.dynamicList = res.Data.List || []
+			 	})
+		  },
 		},
+		//load
+		onLoad(option) {
+			this.$store.dispatch("checkHandle", {type:'load',val:option}).then(res => {
+				app.globalData.isAuth = res.IsAuth;
+				app.globalData.isBind = res.IsBind;
+				if(option){
+					if (Object.keys(option).length !== 0) {
+						this.activeState = option.statesId; //活动进行状态
+						this.activityTypeIds = option.typeIds; //活动类型id 多个用 , 隔开
+						this.chartPermissionIds = option.chartIds; //行业id 多个用 , 隔开
+						this.activeStateName = option.stateName;
+						this.chartPermissionName = option.chartName;
+						this.activityTypeName = option.typeName;
+						this.activityTimeStatus = option.timeStatus;
+						this.spanIndex = option.indexs ? option.indexs.split(',').map(item => item - 0) : []
+						this.keyWord = option.keys
+						this.isGain = false;
+					} 
+				}else {
+					this.isGain = true;
+				}
+				if (this.isGain) {
+					this.getList();
+				}
+				this.getUserSearchContent();
+				this.fastSearchKeWord()
+			})
+			
+		},
+		//切换tabs 刷新页面
+		onTabItemTap() {
+			if (this.page_no > 1 || this.tabsActive !== 0 || this.collectList !== []) {
+				this.tabsActive = 0;
+				this.activeStateName = "未开始";
+				this.chartPermissionName = "所有分类";
+				this.activityTypeName = "所有类型";
+				this.activeState = "1"; //活动进行状态
+				this.activityTypeIds = ""; //活动类型id 多个用 , 隔开
+				this.chartPermissionIds = ""; //行业id 多个用 , 隔开
+				this.page_no = 1;
+				this.collectList = [];
+				this.spanIndex=[]
+				this.keyWord= ''
+				this.activityTimeList.forEach(key => {key.IsChoose=false})
+				this.activityTimeStatus=''
+				this.getList();
+				this.getUserSearchContent();
+			}
+		
+		},
+		//show
 		onShow() {
+			this.countryCcode(); //判断是否加区号
 			this.$store.dispatch("statistics",{PageType:'Activit'})
 		},
-		/**
-		 * 用户点击分享
-		 */
+		//页面隐藏
 		onHide() {
 			if (this.tabsActive !== 0 ) return
 			this.selectComponent("#statusstate").toggle(false);
 			this.selectComponent("#industry").toggle(false);
 			this.selectComponent("#genre").toggle(false);
-		},
+		},
+		/** 用户点击分享 */
 		onShareAppMessage: function(res) {
 			return {
-				title: "活动",
+				title: this.keyWord? this.keyWord:this.activeStateName+','+this.chartPermissionName+','+this.activityTypeName,
 				path: "/pages/activity/activity?statesId=" +
 					this.activeState +
 					"&typeIds=" +
@@ -731,6 +746,7 @@
 				this.getScheduleList();
 			}
 		}),
+		// 页面滚动事件
 		onPageScroll() {
 			if (this.tabsActive !== 0 || !this.isScrollShow) return
 			this.selectComponent("#statusstate").toggle(false);
@@ -743,67 +759,17 @@
 
 <style scoped lang="scss">
 	@import "../../activityPages/index.scss";
-
 	.box-content {
 		padding: 0rpx 34rpx 20rpx !important;
 	}
-
-	.dynamic-content {
-		padding: 90rpx 30rpx 10rpx;
-		width: 100%;
-		background-color: #fff;
-		display: flex;
-		flex-wrap: wrap;
-		border-bottom: 3px solid #F7F7F7;
-
-		.target-title {
-			padding: 5rpx 20rpx 4rpx 5rpx;
-			border-radius: 20rpx;
-			margin: 15rpx 20rpx 15rpx 0;
-			font-size: 30rpx;
-			color: #2C83FF;
-
-		}
-
-		.target-item {
-			padding: 5rpx 20rpx;
-			color: #2C83FF;
-			font-size: 30rpx;
-			font-weight: 400;
-			font-family: PingFang SC;
-			background-color: #EBF4FF;
-			margin: 15rpx 20rpx 15rpx 0;
-			border-radius: 27rpx;
-		}
-
-		.target-search {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-
-			image {
-				width: 30rpx;
-				height: 30rpx;
-			}
-		}
-
-		.bgcolor {
-			background-color: #3385FF !important;
-			color: #fff !important;
-
-		}
-	}
-
 	.select-sticky {
 		position: sticky !important;
 		width: 100%;
 		top: 78rpx;
 		z-index: 9999;
 		background-color: #fff;
-
 		.select-conyent {
 			padding: 0 30rpx;
-
 			.decide {
 				background-color: #F8F8FA;
 				display: flex;
@@ -813,33 +779,27 @@
 				width: 100%;
 				padding-left: 30rpx;
 			}
-
 			.items-box {
 				width: 40rpx;
 			}
-
 			.menu-items {
 				background-color: #F8F8FA;
 				width: 100%;
 				display: flex;
 				flex-wrap: wrap;
 				padding: 30rpx 30rpx 0;
-
 				.menu-items-box {
 					display: flex;
 					width: 50%;
 					font-size: 28rpx;
 					font-weight: 400;
 					margin-bottom: 40rpx;
-
 				}
 			}
-
 			.replacement-box {
 				background-color: #fff;
 				border-radius: 0rpx 0rpx 16rpx 16rpx;
 			}
-
 			.replacement {
 				margin: 0rpx 30rpx 20rpx;
 				display: flex;
@@ -851,13 +811,10 @@
 				font-weight: 400;
 				color: #FFFFFF;
 				border-radius: 30rpx;
-
 				text {
 					flex: 1;
 					text-align: center;
-
 				}
-
 				.replacement-box {
 					border: 1rpx solid #2C83FF;
 					opacity: 1;
@@ -868,11 +825,9 @@
 			}
 		}
 	}
-
 	.activity-content .nodata {
 		padding-top: 80rpx !important;
 	}
-
 	.activity-content .nodataTwo {
 		padding-top: 280rpx !important;
 	}

+ 1 - 1
pages/index/index.vue

@@ -102,7 +102,7 @@ export default {
 		}
 	},
   	onLoad(optios) {
-		this.$store.dispatch("checkHandle").then((res) => {})
+		this.$store.dispatch("checkHandle",{type:'load',val:optios}).then((res) => {})
 		if(optios.tabid){
 			this.tabAct_id = optios.tabid
 			this.getReportList();

+ 3 - 2
pages/my/my.vue

@@ -44,7 +44,8 @@
 			<view class="list-item border_bottom"  @click="itemClickHandle('外呼')">
 				<text>外呼号码</text>
 				<view class="my-bot-box">
-					<text style="margin-right: 40rpx;">12312312312312</text>
+					<text v-if="userInfo.OutboundCountryCode && userInfo.OutboundMobile" style="margin-right: 40rpx;font-size: 28rpx;">{{userInfo.OutboundCountryCode}}-{{userInfo.OutboundMobile}}</text>
+					<text v-else style="margin-right: 40rpx;font-size: 28rpx;">未设置</text>
 					<u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
 				</view>
 			</view>
@@ -198,9 +199,9 @@
 				}
 			}
 			.no-log {
-				// width: 139rpx;
 				padding:0 20rpx;
 				height: 56rpx;
+				line-height: 52rpx;
 				background-color: #FFF;
 				color: #3385FF;
 				font-size: 24rpx;

+ 2 - 5
pages/reportDetail/reportDetail.vue

@@ -59,8 +59,8 @@
 				access_token:'',//用户标识
 				isIphoneX:false,//判断机型
 				reportInfo:'',
-				linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
-				//linkurl:'http://192.168.1.25:2000/raiReportDtl',//链接地址
+				//linkurl:'https://details.hzinsights.com/raiReportDtl',//线上链接地址
+				linkurl:'http://192.168.1.25:2000/raiReportDtl',//链接地址
 				showNav:false,
 				id:'',
 				idReport:null,
@@ -246,9 +246,6 @@
 			// 	   }
 			// 	}
 			// })
-			// let pages = getCurrentPages();
-			// let prevPage = pages[pages.length - 2]; //当前页面
-			// console.log(prevPage)
 			uni.setNavigationBarTitle({
 			    title: option.idReport?'报告详情':'纪要详情'
 			});

+ 4 - 5
pages/reportForm/reportForm.vue

@@ -225,7 +225,7 @@
 			}
 		},
 		 onLoad(option) {
-			 this.$store.dispatch("checkHandle",'load').then(res=>{
+			 this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
 				 app.globalData.isAuth = res.IsAuth;
 				 app.globalData.isBind = res.IsBind;
 				app.globalData.isSx=true
@@ -367,14 +367,14 @@
 			},
 			//跳转季度策略
 			isClickHandle(id) {
-				this.public('show',true,'/reportPages/industrialReport/industrialReport?id=',id)
+				this.public({type:'show'},true,'/reportPages/industrialReport/industrialReport?id=',id)
 				// uni.navigateTo({
 				// 	url: '/reportPages/industrialReport/industrialReport?id=' + id
 				// });
 			},
 			//跳转产业报告
 			goIndustryReport(id) {
-				this.public('show',true,'/reportPages/IndustryReport/IndustryReport?id=',id)
+				this.public({type:'show'},true,'/reportPages/IndustryReport/IndustryReport?id=',id)
 				// uni.navigateTo({
 				// 	url: '' + id
 				// });
@@ -454,7 +454,7 @@
 			}),
 			/* 搜索 */
 			goSearch() {
-				this.public('show',true,'/reportPages/reportSearch/reportSearch')
+				this.public({type:'show'},true,'/reportPages/reportSearch/reportSearch')
 			},
 			public(type,flag,purl,price=''){
 				return new Promise((resolve,reject) => {
@@ -505,7 +505,6 @@
 			wx.stopPullDownRefresh();
 		}),
 		onShow() {
-			console.log(this.tabAct_id);
 			if(this.tabAct_id){
 				this.$store.dispatch("statistics",{PageType:'Report',ChartPermissionId:this.tabAct_id})
 			}

+ 2 - 2
reportPages/IndustryReport/IndustryReport.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="industry-content">
+	<view class="container industry-content">
 	<view v-if="layoutTime">
 	<view class="content-top">
 	  <view class="top-bg">产业赛道布局于{{layoutTime}}</view>
@@ -80,7 +80,7 @@
 		},
     onLoad(option) {
 		this.industrialManagementId=option.id
-		this.$store.dispatch("checkHandle",'load').then(res=>{		
+		this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{		
 			this.tabAct_id=option.tab
 			this.toArticleCategoryList()
 		})

+ 2 - 2
reportPages/industrialReport/industrialReport.vue

@@ -1,6 +1,6 @@
 <template>
   		<!-- 季度策略 -->
-	<view class="industrial-container">
+	<view class="container industrial-container">
     <view class="collect-ul" v-if="haveData">
     			<view class="collect-ltem" v-for="(item,index) in collectList" :key="index" @click="goDetail(item,index)">
     				<view class="item-left">
@@ -44,7 +44,7 @@
 			};
 		},
     onLoad(option) {
-		 this.$store.dispatch("checkHandle",'load').then(res=>{
+		 this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
 			 this.categoryId= option.id-0
 			 this.getCollectList()
 		 })

+ 1 - 1
reportPages/reportSearch/reportSearch.vue

@@ -227,7 +227,7 @@
 			}
 		}),
 		onLoad(options) {
-			this.$store.dispatch("checkHandle",'load').then(res=>{
+			this.$store.dispatch("checkHandle",{type:'load',val:option}).then(res=>{
 				if(options.text) {
 					this.searchTxt=options.text
 					this.getDataList();	

+ 2 - 2
store/index.js

@@ -26,8 +26,8 @@ const store = new Vuex.Store({
 									let token = res.Data.Authorization;
 									set('access_token',token);
 									let page = getCurrentPages()[0];
-									if(payload=='load'){
-										page.onLoad();
+									if(payload.type=='load'){
+										page.onLoad(payload.val);
 									}else {
 										page.onShow();
 									}

BIN
wxcomponents/.DS_Store


BIN
wxcomponents/vant/.DS_Store