Просмотр исходного кода

AI对话暂时隐藏加提示;其他提示文字修改等

htc 19 часов назад
Родитель
Сommit
d63394476a

+ 12 - 2
pages/home.vue

@@ -50,9 +50,11 @@
 			</view>
 		</view>
 		<view class="boxs adfacjb">
-			<view class="boxs-pre bp1" @click="toTurn('/pages/dialog')">
+			<!-- <view class="boxs-pre bp1" @click="toTurn('/pages/dialog')"> -->
+			<view class="boxs-pre bp1" @click="testShow=true">
 				<view class="boxs-pre-title">AI教练对话</view>
-				<view class="boxs-pre-tip adfac">点击开始<image :src="imgBase+'home_arrow_right.png'"></image></view>
+				<!-- <view class="boxs-pre-tip adfac">点击开始<image :src="imgBase+'home_arrow_right.png'"></image></view> -->
+				<view class="boxs-pre-tip adfac">即将上线,敬请期待</view>
 			</view>
 			<view class="boxs-pre bp2" @click="toTurn('/pagesHome/weixin')">
 				<view class="boxs-pre-title">专业支持</view>
@@ -117,6 +119,13 @@
 				<view class="kr-btn" @click="handleToFill">去填写</view>
 			</view>
 		</view>
+		<view class="kind-reminder adffcacjc" v-if="testShow">
+			<view class="kr-box adffcac">
+				<view class="kr-title">温馨提示</view>
+				<view class="kr-p" style="margin-top: 54rpx;">功能测试中,即将上线,敬请期待!</view>
+				<view class="kr-btn" @click="testShow=false">确定</view>
+			</view>
+		</view>
 		<Tabbar :tabbarIndex="0"></Tabbar>
 	</view>
 </template>
@@ -137,6 +146,7 @@
 				teamKindShow:false,
 				teamKindMsg:'',
 				questionnaireKindShow:false,
+				testShow:false
 			}
 		},
 		onLoad(options) {

+ 72 - 8
pagesHome/components/createList.vue

@@ -99,7 +99,14 @@
 			@addUser="addUser"
 			@handleConfirm="userConfirm"
 			@deleteUser="deleteUser"
-		></cus-team-user>
+		></cus-team-user>
+		<view class="kind-reminder adffcacjc" v-if="testShow">
+			<view class="kr-box adffcac">
+				<view class="kr-title">温馨提示</view>
+				<view class="kr-p" style="margin-top: 54rpx;">{{tipText}}</view>
+				<view class="kr-btn" @click="testShow=false">确定</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -154,7 +161,9 @@ export default {
 			teamScaleData:[],
 			teamLevelData:[],
 			categoryData:[],
-			delMemberIds:[],
+			delMemberIds:[],
+			testShow:false,
+			tipText:''
 		}
 	},
 	methods:{
@@ -295,12 +304,8 @@ export default {
 						}
 					})
 				}else if(res.code!==0){
-					uni.showModal({
-						title:'生成报告',
-						content:res.msg,
-						showCancel:false,
-						confirmColor:'#199C9C'
-					})
+					this.testShow = true;
+					this.tipText = res.msg||'';
 				}
 				this.show = false;
 			})
@@ -690,6 +695,65 @@ export default {
 				margin-top: 66rpx;
 			}
 		}
+	}
+	
+	.kind-reminder{
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+		background: rgba(0, 0, 0, .6);
+		.kr-box{
+			width: calc(100% - 100rpx);
+			padding: 54rpx 30rpx 40rpx;
+			box-sizing: border-box;
+			background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/remind_bg.png') no-repeat;
+			background-size: 100% 100%;
+			position: relative;
+			image{
+				width: 48rpx;
+				height: 48rpx;
+				position: absolute;
+				top: 40rpx;
+				right: 30rpx;
+			}
+			.kr-title{
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #002846;
+				line-height: 56rpx;
+				text-align: center;
+			}
+			.kr-p{
+				font-family: PingFangSC, PingFang SC;
+				font-weight: 400;
+				font-size: 30rpx;
+				color: #002846;
+				line-height: 48rpx;
+				text-align: center;
+				span{
+					font-weight: bold;
+					margin: 0 10rpx;
+				}
+			}
+			.kr-btn{
+				width: calc(100% - 80rpx);
+				height: 88rpx;
+				background: linear-gradient( 90deg, #33A7A7 0%, #64BBBB 100%);;
+				border-radius: 44rpx;
+				font-family: PingFang-SC, PingFang-SC;
+				font-weight: bold;
+				font-size: 32rpx;
+				color: #FFFFFF;
+				line-height: 88rpx;
+				text-align: center;
+				letter-spacing: 2rpx;
+				margin-top: 66rpx;
+			}
+		}
 	}
 }
 </style>

+ 69 - 1
pagesHome/components/report/generateList.vue

@@ -20,7 +20,8 @@
 							<view class="gbox-item-p-left">创建时间:</view>
 							<view class="gbox-item-p-right">{{item.createDate||''}}</view>
 						</view>
-						<image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)" v-if="item.state==1&&item.fileUrl"></image>
+						<!-- <image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)" v-if="item.state==1&&item.fileUrl"></image> -->
+						<image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="testShow=true" v-if="item.state==1&&item.fileUrl"></image>
 					</view>
 					<view class="gbox-item-bottom adfacjb">
 						<view class="gbox-item-bottom-rightbox adfac" v-if="item.type==1">
@@ -39,6 +40,13 @@
 				</view>
 			</u-list-item>
 		</u-list>
+		<view class="kind-reminder adffcacjc" v-if="testShow">
+			<view class="kr-box adffcac">
+				<view class="kr-title">温馨提示</view>
+				<view class="kr-p" style="margin-top: 54rpx;">功能测试中,即将上线,敬请期待!</view>
+				<view class="kr-btn" @click="testShow=false">确定</view>
+			</view>
+		</view>
 		<cus-select-team-user 
 			ref="selectTeamUser" 
 			:show="teamUserShow"
@@ -84,6 +92,7 @@
 				categoryData:[],
 				sendType:1,
 				selectItem:null,
+				testShow:false
 			}
 		},
 		methods:{
@@ -390,5 +399,64 @@
 				}
 			}
 		}
+	
+		.kind-reminder{
+			position: fixed;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			z-index: 1000;
+			background: rgba(0, 0, 0, .6);
+			.kr-box{
+				width: calc(100% - 100rpx);
+				padding: 54rpx 60rpx 48rpx;
+				box-sizing: border-box;
+				background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/remind_bg.png') no-repeat;
+				background-size: 100% 100%;
+				position: relative;
+				image{
+					width: 48rpx;
+					height: 48rpx;
+					position: absolute;
+					top: 40rpx;
+					right: 30rpx;
+				}
+				.kr-title{
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #002846;
+					line-height: 56rpx;
+					text-align: center;
+				}
+				.kr-p{
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 30rpx;
+					color: #002846;
+					line-height: 48rpx;
+					text-align: center;
+					span{
+						font-weight: bold;
+						margin: 0 10rpx;
+					}
+				}
+				.kr-btn{
+					width: calc(100% - 80rpx);
+					height: 88rpx;
+					background: linear-gradient( 90deg, #33A7A7 0%, #64BBBB 100%);;
+					border-radius: 44rpx;
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					line-height: 88rpx;
+					text-align: center;
+					letter-spacing: 2rpx;
+					margin-top: 66rpx;
+				}
+			}
+		}
 	}
 </style>

+ 69 - 1
pagesHome/components/report/receiveList.vue

@@ -20,7 +20,8 @@
 							<view class="gbox-item-p-left">报告时间:</view>
 							<view class="gbox-item-p-right">{{item.createDate||''}}</view>
 						</view>
-						<image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)"></image>
+						<!-- <image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="askReport(item)"></image> -->
+						<image class="gbox-item-ask" :src="imgBase+'report_ask.png'" @click="testShow=true" v-if="item.fileUrl"></image>
 					</view>
 					<view class="gbox-item-bottom adfacjb">
 						<view class="gbox-item-bottom-rightbox adfac">
@@ -30,6 +31,13 @@
 				</view>
 			</u-list-item>
 		</u-list>
+		<view class="kind-reminder adffcacjc" v-if="testShow">
+			<view class="kr-box adffcac">
+				<view class="kr-title">温馨提示</view>
+				<view class="kr-p" style="margin-top: 54rpx;">功能测试中,即将上线,敬请期待!</view>
+				<view class="kr-btn" @click="testShow=false">确定</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -49,6 +57,7 @@
 					2:'团队版',
 					0:'团队PRO版'
 				},
+				testShow:false
 			}
 		},
 		methods:{
@@ -248,5 +257,64 @@
 				}
 			}
 		}
+		
+		.kind-reminder{
+			position: fixed;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			z-index: 1000;
+			background: rgba(0, 0, 0, .6);
+			.kr-box{
+				width: calc(100% - 100rpx);
+				padding: 54rpx 60rpx 48rpx;
+				box-sizing: border-box;
+				background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/remind_bg.png') no-repeat;
+				background-size: 100% 100%;
+				position: relative;
+				image{
+					width: 48rpx;
+					height: 48rpx;
+					position: absolute;
+					top: 40rpx;
+					right: 30rpx;
+				}
+				.kr-title{
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #002846;
+					line-height: 56rpx;
+					text-align: center;
+				}
+				.kr-p{
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 30rpx;
+					color: #002846;
+					line-height: 48rpx;
+					text-align: center;
+					span{
+						font-weight: bold;
+						margin: 0 10rpx;
+					}
+				}
+				.kr-btn{
+					width: calc(100% - 80rpx);
+					height: 88rpx;
+					background: linear-gradient( 90deg, #33A7A7 0%, #64BBBB 100%);;
+					border-radius: 44rpx;
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #FFFFFF;
+					line-height: 88rpx;
+					text-align: center;
+					letter-spacing: 2rpx;
+					margin-top: 66rpx;
+				}
+			}
+		}
 	}
 </style>

+ 2 - 2
pagesHome/reportResult.vue

@@ -5,8 +5,8 @@
 			<image class="box-loading" src="https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/e6d5bea9491a14aafd3f955d332e62d08e521229/report_success.png" v-if="result==0"></image>
 			<image class="box-loading" src="https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/e6d5bea9491a14aafd3f955d332e62d08e521229/report_fail.png" v-else></image>
 			<div class="box-p1">{{result==0?'报告正在生成中~':'报告生成失败'}}</div>
-			<div class="box-p2" v-if="result==0">预计所需时间7-10分钟</div>
-			<div class="box-p3">{{result==0?'稍后可去我的PERILL报告中查看结果':'失败原因:网络延迟'}}</div>
+			<div class="box-p2" v-if="result==0">预计所需时间1小时左右</div>
+			<div class="box-p3">{{result==0?'我们会在报告生成完成后提示你,你可以去我的PREILL报告查阅报告结果。':'失败原因:网络延迟'}}</div>
 		</div>
 		<div class="form">
 			<div class="form-item adfacjb">