htc 2 天之前
父节点
当前提交
b5532a90f4

+ 1 - 1
components/CusTeamInfo/index.vue

@@ -152,7 +152,7 @@
 				&-content{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
-					font-size: 28rpx;
+					font-size: 30rpx;
 					color: #536387;
 					line-height: 42rpx;
 					margin-top: 36rpx;

+ 9 - 5
components/CusTeamInfoFill/index.vue

@@ -4,13 +4,13 @@
 			<view class="form-item adfacjb">
 				<view class="form-item-title">团队名称</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" border="none" inputAlign="right" fontSize="28rpx" color="#6B7280"/>
+					<u-input v-model="teamInfo.teamName" placeholder="请输入团队名称" border="none" inputAlign="right" fontSize="30rpx" color="#6B7280"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
 				<view class="form-item-title">所在公司</view>
 				<view class="form-item-inp">
-					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" border="none" inputAlign="right" fontSize="28rpx" color="#6B7280"/>
+					<u-input v-model="teamInfo.enterpriseName" placeholder="请输入公司名称" border="none" inputAlign="right" fontSize="30rpx" color="#6B7280"/>
 				</view>
 			</view>
 			<view class="form-item adfacjb">
@@ -59,7 +59,7 @@
 		<view class="box">
 			<view class="box-title">团队简介</view>
 			<view class="box-textarea">
-				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #6B7280;" :placeholderStyle="{'color':'#B3BFC8','font-size':'28rpx','line-height':'40rpx'}" 
+				<u-textarea border="none" height="320rpx" maxlength="-1" style="color: #6B7280;padding: 0;" :placeholderStyle="{'color':'#B3BFC8','font-size':'30rpx','line-height':'40rpx'}" 
 				v-model="teamInfo.brief" placeholder="示例:这是一个为公司ERP系统升级而组建的36人团队,成员由公司副总经理、各部门总监以及各部门核心骨干组成。团队成员工作地点分布在香港、上海、苏州、深圳和东莞等地。团队成员年龄在35-50岁之间,男女比例比较均衡,大部份成员在该公司同事超过十年。"></u-textarea>
 			</view>
 		</view>
@@ -85,6 +85,7 @@
 				default:'下一步'
 			}
 		},
+		options: { styleIsolation: 'shared' },
 		data(){
 			return {
 				teamInfo:{
@@ -208,10 +209,13 @@
 </script>
 
 <style scoped lang="scss">
+	::v-deep .u-textarea{
+		padding: 36rpx 0 !important;
+	}
 	::v-deep .u-textarea textarea{
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		color: #6B7280;
 		line-height: 40rpx;
 	}
@@ -260,7 +264,7 @@
 					text{
 						font-family: PingFangSC, PingFang SC;
 						font-weight: 400;
-						font-size: 28rpx;
+						font-size: 30rpx;
 						color: #B3BFC8;
 						line-height: 40rpx;
 						margin-right: 10rpx;

+ 22 - 3
pagesHome/components/report/generateList.vue

@@ -29,9 +29,17 @@
 							<view class="gbox-item-bottom-left-text">创建时间:</view>
 							<view class="gbox-item-bottom-left-time">{{item.createDate||''}}</view>
 						</view>
-						<view class="gbox-item-bottom-right" @click="reviewPdf(item)" v-if="item.state==1">预览</view>
-						<view class="gbox-item-bottom-right" @click="sendReport(item)" v-if="item.state!=-1&&item.type==2">发送报告</view>
-						<view class="gbox-item-bottom-right" @click="reSendReport(item)" v-if="item.state==-1&&item.type==2">重新生成</view>
+						<div class="gbox-item-bottom-rightbox adfac" v-if="item.type==1">
+							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="reviewPdf(item)" v-if="item.state==1&&!item.fileUrl">预览</view>
+							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="askReport(item)" v-if="item.state==1&&item.fileUrl">提问</view>
+							<view class="gbox-item-bottom-right" @click="reviewReport(item)" v-if="item.state==1">查看报告</view>
+							<view class="gbox-item-bottom-right" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
+						</div>
+						<div class="gbox-item-bottom-rightbox adfac" v-else-if="item.type==2">
+							<view class="gbox-item-bottom-right" style="margin-right: 20rpx;" @click="reviewPdf(item)" v-if="item.state==1">预览</view>
+							<view class="gbox-item-bottom-right" @click="sendReport(item)" v-if="item.state!=-1">发送报告</view>
+							<view class="gbox-item-bottom-right" @click="reSendReport(item)" v-if="item.state==-1">重新生成</view>
+						</div>
 					</view>
 				</view>
 			</u-list-item>
@@ -75,6 +83,17 @@
 				if(item.type==2) url = `/pagesHome/pdfZyb?reportId=${item.reportId}`
 				uni.navigateTo({ url })
 			},
+			reviewReport(item){
+				if(!item.fileUrl) return this.$showToast('报告pdf为空,请稍后再试。')
+				uni.navigateTo({
+					url:'/pages/webView?src='+item.fileUrl
+				})
+			},
+			askReport(item){
+				uni.navigateTo({
+					url:`/pages/reportAsk?pdfUrl=${item.fileUrl}&fileName=${this.typeCfg[item.type]||'基础版'}-${item.reportName}`
+				})
+			},
 			sendReport(item){
 				if(!item.fileUrl) return this.$showModal('该报告尚未生成PDF文件,请等待生成后发送。')
 				uni.showModal({

+ 1 - 1
pagesPublish/rechargeCenter.vue

@@ -113,7 +113,7 @@
 			return {
 				userInfo:null,
 				headData:null,
-				avatar:this.$imgBase+'avatar.png',
+				avatar:this.$imgBase+'my_avatar.png',
 				tabList:['基础版','专业版','专家版'],
 				typeCfg:{
 					1:'基础版',