最新需求修改

components/CusProvinceCityArea/index.vue

@@ -208,12 +208,12 @@ export default {
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	font-size: 36rpx;
+	font-size: 30rpx;
 	color: #303133;
 	transition: all 0.2s;
 
 	&.selected-item {
-		font-size: 36rpx;
+		font-size: 30rpx;
 		font-weight: bold;
 		color: #303133;
 	}

components/CusTeamInfo/index.vue

@@ -22,11 +22,11 @@
 						<view class="dialog-box-form-item-right">{{teamInfo.industryName||'暂无'}}</view>
 					</view>
 					<view class="dialog-box-form-item adfacjb">
-						<view class="dialog-box-form-item-left">团队模式类型</view>
+						<view class="dialog-box-form-item-left">团队职能类型</view>
 						<view class="dialog-box-form-item-right">{{teamInfo.functionsName||'暂无'}}</view>
 					</view>
 					<view class="dialog-box-form-item adfacjb">
-						<view class="dialog-box-form-item-left">团队架构类型</view>
+						<view class="dialog-box-form-item-left">团队模式类型</view>
 						<view class="dialog-box-form-item-right">{{teamInfo.organizationsName||'暂无'}}</view>
 					</view>
 					<view class="dialog-box-form-item adfacjb">

components/CusTeamInfoFill/index.vue

@@ -28,14 +28,14 @@
 				</view>
 			</view>
 			<view class="form-item adfacjb">
-				<view class="form-item-title" :class="{'red':isqtype}">团队模式类型</view>
+				<view class="form-item-title" :class="{'red':isqtype}">团队职能类型</view>
 				<view class="form-item-inp adfac" @click="turnPage('function')">
 					<text :class="{'active':functionTypeText!=='请选择'}">{{functionTypeText}}</text>
 					<u-icon name="arrow-right" size="20rpx" color="#B9C0C8"></u-icon>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
-				<view class="form-item-title" :class="{'red':isqtype}">团队架构类型</view>
+				<view class="form-item-title" :class="{'red':isqtype}">团队模式类型</view>
 				<view class="form-item-inp adfac" @click="turnPage('architecture')">
 					<text :class="{'active':architectureTypeText!=='请选择'}">{{architectureTypeText}}</text>
 					<u-icon name="arrow-right" size="20rpx" color="#B9C0C8"></u-icon>
@@ -204,8 +204,8 @@ import props from '../../uni_modules/uview-ui/libs/config/props'
 				if(!this.teamInfo.districtId) return this.$showToast('请选择所属地区')
 				if(!this.teamInfo.industryId) return this.$showToast('请选择所属行业')
 				if(this.isqtype){
-					if(this.teamInfo.functionIds.length===0) return this.$showToast('请选择团队模式类型')
-					if(this.teamInfo.orgIds.length===0) return this.$showToast('请选择团队架构类型')
+					if(this.teamInfo.functionIds.length===0) return this.$showToast('请选择团队职能类型')
+					if(this.teamInfo.orgIds.length===0) return this.$showToast('请选择团队模式类型')
 					if(!this.teamInfo.scale) return this.$showToast('请选择团队规模')
 					// if(!this.teamInfo.hierarchy) return this.$showToast('请选择团队层级')
 					if(!this.teamInfo.brief) return this.$showToast('请输入团队简介')

pages/my.vue

@@ -121,7 +121,7 @@
 			},
 			async getMyInfo(userId){
 				const userBrief = await this.getTeamScaleData()
-				this.$api.get(`/wx/myCount/${userId}`,this.params).then(({data:res})=>{
+				this.$api.get(`/wx/myCount/${userId}`).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
 					this.headData = res.data;
 					this.$set(this.headData,'userBriefText',userBrief.find(u=>u.id==this.headData.userBrief).name||'普通用户')

pagesMy/team.vue

@@ -1,52 +1,57 @@
 <template>
 	<view class="default_page adffc" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='我的团队'></cus-header>
-		<view class="list" v-if="list.length">
-			<view class="list-item" v-for="(item,index) in list" :key="item.id">
-				<image class="list-item-icon" :src="imgBase+'team_icon.png'"></image>
-				<image class="list-item-edit" :src="imgBase+'team_edit.png'" @click="handleEdit(item)"></image>
-				<view class="list-item-top">
-					<view class="list-item-top-title">{{item.teamName}}</view>
-					<view class="list-item-top-pre adf" style="margin-top: 36rpx;">
-						<view class="list-item-top-pre-left">所属地区：</view>
-						<view class="list-item-top-pre-right">{{item.provinceName+item.cityName}}</view>
-					</view>
-					<view class="list-item-top-pre adf">
-						<view class="list-item-top-pre-left">所属行业：</view>
-						<view class="list-item-top-pre-right">{{item.industryName||''}}</view>
-					</view>
-					<view class="list-item-top-pre adf">
-						<view class="list-item-top-pre-left">团队模式类型：</view>
-						<view class="list-item-top-pre-right">{{item.functionNames||''}}</view>
-					</view>
-					<view class="list-item-top-pre adf">
-						<view class="list-item-top-pre-left">团队结构类型：</view>
-						<view class="list-item-top-pre-right">{{item.orgNames||''}}</view>
-					</view>
-					<view class="list-item-top-pre adf">
-						<view class="list-item-top-pre-left">团队规模：</view>
-						<view class="list-item-top-pre-right">{{item.scaleName||''}}</view>
+		<template v-if="isPerson">
+			<view class="alert">团队编辑功能仅对团队评估发起者开放，请购买并发起团队版 PERILL评估以解锁此权限。</view>
+		</template>
+		<template v-else>
+			<view class="list" v-if="list.length">
+				<view class="list-item" v-for="(item,index) in list" :key="item.id">
+					<image class="list-item-icon" :src="imgBase+'team_icon.png'"></image>
+					<image class="list-item-edit" :src="imgBase+'team_edit.png'" @click="handleEdit(item)"></image>
+					<view class="list-item-top">
+						<view class="list-item-top-title">{{item.teamName}}</view>
+						<view class="list-item-top-pre adf" style="margin-top: 36rpx;">
+							<view class="list-item-top-pre-left">所属地区：</view>
+							<view class="list-item-top-pre-right">{{item.provinceName+item.cityName}}</view>
+						</view>
+						<view class="list-item-top-pre adf">
+							<view class="list-item-top-pre-left">所属行业：</view>
+							<view class="list-item-top-pre-right">{{item.industryName||''}}</view>
+						</view>
+						<view class="list-item-top-pre adf">
+							<view class="list-item-top-pre-left">团队职能类型：</view>
+							<view class="list-item-top-pre-right">{{item.functionNames||''}}</view>
+						</view>
+						<view class="list-item-top-pre adf">
+							<view class="list-item-top-pre-left">团队结构类型：</view>
+							<view class="list-item-top-pre-right">{{item.orgNames||''}}</view>
+						</view>
+						<view class="list-item-top-pre adf">
+							<view class="list-item-top-pre-left">团队规模：</view>
+							<view class="list-item-top-pre-right">{{item.scaleName||''}}</view>
+						</view>
+						<!-- <view class="list-item-top-pre adf">
+							<view class="list-item-top-pre-left">团队层级：</view>
+							<view class="list-item-top-pre-right">{{item.hierarchyName||''}}</view>
+						</view> -->
 					</view>
-					<!-- <view class="list-item-top-pre adf">
-						<view class="list-item-top-pre-left">团队层级：</view>
-						<view class="list-item-top-pre-right">{{item.hierarchyName||''}}</view>
+					<!-- <view class="list-item-bottom adfacjb" @click="handleReivew">
+						<view class="list-item-bottom-left">关联问卷：</view>
+						<view class="list-item-bottom-right adfacjb">
+							<view class="list-item-bottom-right-num">{{item.queNum||0}}条</view>
+							<view class="list-item-bottom-right-review adfac">
+								<text>查看</text>
+								<image :src="imgBase+'my_arrow_right.png'"></image>
+							</view>
+						</view>
 					</view> -->
 				</view>
-				<!-- <view class="list-item-bottom adfacjb" @click="handleReivew">
-					<view class="list-item-bottom-left">关联问卷：</view>
-					<view class="list-item-bottom-right adfacjb">
-						<view class="list-item-bottom-right-num">{{item.queNum||0}}条</view>
-						<view class="list-item-bottom-right-review adfac">
-							<text>查看</text>
-							<image :src="imgBase+'my_arrow_right.png'"></image>
-						</view>
-					</view>
-				</view> -->
 			</view>
-		</view>
-		<view class="empty adffcacjc" v-else>
-			<page-empty text="暂无团队"></page-empty>
-		</view>
+			<view class="empty adffcacjc" v-else>
+				<page-empty text="暂无团队"></page-empty>
+			</view>
+		</template>
 	</view>
 </template>
 
@@ -62,6 +67,7 @@
 					limit:10,
 					coachId:''
 				},
+				isPerson:true,
 				isOver:false,
 				scaleMap:new Map(),
 				hierarchyMap:new Map()
@@ -77,6 +83,12 @@
 			if(this.isOver) return
 			this.getList()
 		},
+		onReady() {
+			this.$api.get(`/wx/myCount/${JSON.parse(uni.getStorageSync('userInfo')).id}`).then(({data:res})=>{
+				if(res.code!==0) return this.$showToast(res.msg)
+				if(res.data.type==2) this.isPerson = false;
+			})
+		},
 		methods:{
 			getTeamScaleData(){
 				return new Promise((resolve,reject)=>{
@@ -128,6 +140,16 @@
 		background: #F7F7F7;
 		padding: 0 24rpx 40rpx;
 		box-sizing: border-box;
+		
+		.alert{
+			padding-top: 30rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #6B7280;
+			line-height: 40rpx;
+		}
+		
 		.list{
 			overflow: hidden;
 			&-item{

pagesMy/teamUser.vue

@@ -1,45 +1,50 @@
 <template>
 	<view class="default_page adffc" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='团队成员'></cus-header>
-		<view class="add" @click="handleAdd">+ 添加</view>
-		<view class="list" v-if="list.length">
-			<u-swipe-action>
-				<u-swipe-action-item  v-for="(item, index) in list" :key="index"
-				  :options="options" @click="e=>deleteUser(item,e)" :ref="'swipeAction' + index" :threshold="5"
-				>
-					<view class="swipe-action u-border-top u-border-bottom">
-						<view class="swipe-action__content">
-							<view class="lbox adfac" @click.prevent="selectUser(item,index)">
-								<template v-if="type">
-									<image class="lbox-select" v-if="item.select" :src="imgBase+'selected.png'"></image>
-									<image class="lbox-select" v-else :src="imgBase+'not_select.png'"></image>
-								</template>
-								<view class="lbox-info">
-									<view class="lbox-info-top adfac">
-										<text>{{item.realName}}</text>
-										<template v-if="type">
-											<view class="type adfac" @click.stop="selectUserCategory(item,index)">
-												{{item.categoryName||'选择身份类型'}}
-												<image :src="imgBase+'icon_user_down.png'"></image>
-											</view>
-										</template>
+		<template v-if="isPerson">
+			<view class="alert">团队成员编辑功能仅对团队评估发起者开放，请购买并发起团队版PERILL评估以解锁此权限。</view>
+		</template>
+		<template v-else>
+			<view class="add" @click="handleAdd">+ 添加</view>
+			<view class="list" v-if="list.length">
+				<u-swipe-action>
+					<u-swipe-action-item  v-for="(item, index) in list" :key="index"
+					  :options="options" @click="e=>deleteUser(item,e)" :ref="'swipeAction' + index" :threshold="5"
+					>
+						<view class="swipe-action u-border-top u-border-bottom">
+							<view class="swipe-action__content">
+								<view class="lbox adfac" @click.prevent="selectUser(item,index)">
+									<template v-if="type">
+										<image class="lbox-select" v-if="item.select" :src="imgBase+'selected.png'"></image>
+										<image class="lbox-select" v-else :src="imgBase+'not_select.png'"></image>
+									</template>
+									<view class="lbox-info">
+										<view class="lbox-info-top adfac">
+											<text>{{item.realName}}</text>
+											<template v-if="type">
+												<view class="type adfac" @click.stop="selectUserCategory(item,index)">
+													{{item.categoryName||'选择身份类型'}}
+													<image :src="imgBase+'icon_user_down.png'"></image>
+												</view>
+											</template>
+										</view>
+										<view class="lbox-info-email">{{item.emailTM}}</view>
+									</view>
+									<view class="lbox-edit" @click.stop="handleEdit(item)">
+										<u-icon name="edit-pen" size="42rpx" color="#B9B9B9"></u-icon>
 									</view>
-									<view class="lbox-info-email">{{item.emailTM}}</view>
-								</view>
-								<view class="lbox-edit" @click.stop="handleEdit(item)">
-									<u-icon name="edit-pen" size="42rpx" color="#B9B9B9"></u-icon>
 								</view>
 							</view>
 						</view>
-					</view>
-				</u-swipe-action-item>
-			</u-swipe-action>
-		</view>
-		<view v-else class="adffcacjc" style="flex: 1;">
-			<empty text='暂无团队人员,请添加'></empty>
-		</view>
-		<view class="btn" v-if="type" @click="handleConfirmAdd">确定</view>
-		<cus-select :show="show" title="选择身份类型" :list="categoryData" @close="show=false" @confirmTeam="selectConfirm"></cus-select>
+					</u-swipe-action-item>
+				</u-swipe-action>
+			</view>
+			<view v-else class="adffcacjc" style="flex: 1;">
+				<empty text='暂无团队人员,请添加'></empty>
+			</view>
+			<view class="btn" v-if="type" @click="handleConfirmAdd">确定</view>
+			<cus-select :show="show" title="选择身份类型" :list="categoryData" @close="show=false" @confirmTeam="selectConfirm"></cus-select>
+		</template>
 	</view>
 </template>
 
@@ -68,6 +73,7 @@
 						}
 					}
 				],
+				isPerson:true,
 				show:false,
 				categoryData:[],
 				currentUser:null,
@@ -90,6 +96,12 @@
 			this.list = [];
 			this.getList()
 		},
+		onReady() {
+			this.$api.get(`/wx/myCount/${JSON.parse(uni.getStorageSync('userInfo')).id}`).then(({data:res})=>{
+				if(res.code!==0) return this.$showToast(res.msg)
+				if(res.data.type==2) this.isPerson = false;
+			})
+		},
 		methods:{
 			scrolltolower(){
 				if(this.isOver) return
@@ -188,6 +200,16 @@
 	.default_page{
 		padding: 0 24rpx;
 		box-sizing: border-box;
+		
+		.alert{
+			padding-top: 30rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #6B7280;
+			line-height: 40rpx;
+		}
+		
 		.add{
 			width: calc(100% - 52rpx);
 			height: 88rpx;

pagesPublish/teamTypeMultiple.vue

@@ -28,10 +28,10 @@
 					<div class="box-top-btn add" @click="handleAdd">添加</div>
 				</div>
 				<div class="box-inp">
-					<u--input type="text" v-model="name" border="none" fontSize="30rpx" color="#002846" :placeholder="'请输入自定义团队'+(type==='function'?'职能':'架构')+'类型'" maxlength="20" clearable showWordLimit></u--input>
+					<u--input type="text" v-model="name" border="none" fontSize="30rpx" color="#002846" :placeholder="'请输入自定义团队'+(type==='function'?'职能':'模式')+'类型'" maxlength="20" clearable showWordLimit></u--input>
 				</div>
 				<div class="box-textarea">
-					<u-textarea v-model="remark" height="100rpx" border="none" style="font-size: 30rpx;color: #002846;" :placeholder="'请输入自定义团队'+(type==='function'?'职能':'架构')+'类型的备注'" maxlength="100" count></u-textarea>
+					<u-textarea v-model="remark" height="100rpx" border="none" style="font-size: 30rpx;color: #002846;" :placeholder="'请输入自定义团队'+(type==='function'?'职能':'模式')+'类型的备注'" maxlength="100" count></u-textarea>
 				</div>
 			</div>
 		</div>
@@ -44,7 +44,7 @@
 			return {
 				show:false,
 				type:'',
-				title:'选择团队模式类型',
+				title:'选择团队职能类型',
 				list:[],
 				name:'',
 				remark:''
@@ -53,7 +53,10 @@
 		onLoad(options) {
 			this.type = options.type;
 			if(this.type==='function') this.getTeamFunctionList()
-			else if(this.type==='architecture') this.getTeamArchitecturelist()
+			else if(this.type==='architecture'){
+				this.title = '选择团队模式类型';
+				this.getTeamArchitecturelist()
+			} 
 		},
 		methods:{
 			getTeamFunctionList(){
@@ -78,8 +81,8 @@
 				this.$set(this.list[index],'select',!this.list[index].select)
 			},
 			handleAdd(){
-				if(!this.name) return this.$showToast(`请输入${this.type==='function'?'职能':'结构'}类型名称`)
-				if(!this.remark) return this.$showToast(`请输入${this.type==='function'?'职能':'结构'}类型备注`)
+				if(!this.name) return this.$showToast(`请输入团队${this.type==='function'?'职能':'模式'}类型名称`)
+				if(!this.remark) return this.$showToast(`请输入团队${this.type==='function'?'职能':'模式'}类型备注`)
 				if(this.type==='function'){
 					this.$api.post('/core/function',{
 						functionName:this.name,
@@ -101,7 +104,7 @@
 				}
 			},
 			confirm(){
-				if(this.list.filter(l=>l.select).length===0) return this.$showToast(`请至少选择一种团队${this.type==='function'?'职能':'结构'}类型`)
+				if(this.list.filter(l=>l.select).length===0) return this.$showToast(`请至少选择一种团队${this.type==='function'?'职能':'模式'}类型`)
 				this.getOpenerEventChannel().emit('selectConfirm',{
 					type:this.type,
 					ids:this.list.filter(l=>l.select).map(l=>l.id),