Browse Source

我的报告接口联调

htc 5 days ago
parent
commit
968475be47

+ 2 - 2
pages.json

@@ -1,13 +1,13 @@
 {
 	"pages": [
 		{
-			"path": "pages/pdf",
+			"path": "pages/home",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path": "pages/home",
+			"path": "pages/pdf",
 			"style": {
 				"navigationStyle": "custom"
 			}

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

@@ -5,7 +5,7 @@
 				<view class="gbox-item">
 					<view class="gbox-item-top adf">
 						<view class="gbox-item-top-type">{{typeCfg[item.type]||'基础版'}}</view>
-						<view class="gbox-item-top-title">{{item.title||''}}</view>
+						<view class="gbox-item-top-title">{{item.reportName||''}}</view>
 					</view>
 					<view class="gbox-item-p adf">
 						<view class="gbox-item-p-left">团队名称:</view>

+ 6 - 6
pagesHome/components/report/receiveList.vue

@@ -4,20 +4,20 @@
 			<u-list-item v-for="(item, index) in list" :key="item.id">
 				<view class="rbox-item">
 					<view class="rbox-item-top adfac">
-						<view class="rbox-item-top-type">{{typeCfg['1']}}</view>
-						<view class="rbox-item-top-title">{{'甜梦巧克力公司PREILL分析报告'}}</view>
+						<view class="rbox-item-top-type">{{typeCfg[item.type]||'基础版'}}</view>
+						<view class="rbox-item-top-title">{{item.reportName||''}}</view>
 					</view>
 					<view class="rbox-item-p adf">
 						<view class="rbox-item-p-left">团队名称:</view>
-						<view class="rbox-item-p-right">{{'甜梦巧克力有限公司'}}</view>
+						<view class="rbox-item-p-right">{{item.teamName||''}}</view>
 					</view>
 					<view class="rbox-item-p adf">
 						<view class="rbox-item-p-left">发送教练:</view>
-						<view class="rbox-item-p-right">{{'刘亦可'}}</view>
+						<view class="rbox-item-p-right">{{item.coachName||''}}</view>
 					</view>
 					<view class="rbox-item-p adf">
 						<view class="rbox-item-p-left">报告时间:</view>
-						<view class="rbox-item-p-right">{{'2025-05-28 12:00:00'}}</view>
+						<view class="rbox-item-p-right">{{item.createDate||''}}</view>
 					</view>
 					<view class="rbox-item-btn" @click="reviewReport(item)">查看报告</view>
 				</view>
@@ -40,7 +40,7 @@
 					1:'基础版',
 					2:'专业版',
 					3:'专家版'
-				}
+				},
 			}
 		},
 		methods:{

+ 12 - 6
pagesHome/components/report/sendList.vue

@@ -6,8 +6,8 @@
 					<view class="sbox-item-top adfacjb">
 						<view class="sbox-item-top-left adfac">
 							<image :src="imgBase+'avatar.png'"></image>
-							<text>{{'刘怡然'}}</text>
-							<view class="type">{{'赞助人Sponsor'}}</view>
+							<text>{{item.memberName||''}}</text>
+							<view class="type">{{item.categoryName}}</view>
 						</view>
 						<view class="sbox-item-top-right adfac">
 							<image :src="imgBase+'send_success.png'"></image>
@@ -17,15 +17,15 @@
 					</view>
 					<view class="sbox-item-pre first adfacjb">
 						<view class="sbox-item-pre-left">报告名称:</view>
-						<view class="sbox-item-pre-right">{{'甜梦巧克力公司PREILL分析报告/专业版'}}</view>
+						<view class="sbox-item-pre-right">{{item.reportName||''}}/{{typeDict[item.type]||''}}</view>
 					</view>
 					<view class="sbox-item-pre adfacjb">
 						<view class="sbox-item-pre-left">团队名称:</view>
-						<view class="sbox-item-pre-right">{{'甜梦巧克力有限公司'}}</view>
+						<view class="sbox-item-pre-right">{{item.teamName||''}}</view>
 					</view>
 					<view class="sbox-item-pre adfacjb">
 						<view class="sbox-item-pre-left">发送时间:</view>
-						<view class="sbox-item-pre-right">{{'2025-05-28 12:00:00'}}</view>
+						<view class="sbox-item-pre-right">{{item.createDate||''}}</view>
 					</view>
 				</view>
 			</u-list-item>
@@ -43,7 +43,11 @@
 		},
 		data(){
 			return {
-				
+				typeDict:{
+					'1':'基础版',
+					'2':'专业版',
+					'3':'专家版'
+				}
 			}
 		},
 		methods:{
@@ -115,6 +119,8 @@
 				}
 				&-right{
 					width: calc(100% - 130rpx);
+					padding-left: 10rpx;
+					box-sizing: border-box;
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 26rpx;

+ 24 - 3
pagesHome/report.vue

@@ -52,7 +52,8 @@
 					teamName:''
 				},
 				list:[],
-				isOver:false
+				isOver:false,
+				categoryData:[]
 			}
 		},
 		onLoad() {
@@ -89,9 +90,29 @@
 					this.queryParams.page++;
 					if(res.data.list.length===0) this.isOver = true;
 				})
+			},
+			async getUserCategoryData(){
+				return new Promise((resolve,reject)=>{
+					this.$api.get('/getListByType/UserCategory').then(({data:res})=>{
+						if(res.code!==0) return this.$showToast(res.msg)
+						this.categoryData = res.data.map(d=>({name:d.dictLabel,id:d.dictValue}))
+						resolve()
+					})
+				})
 			},
-			getSendList(){
-				this.list = [{id:1},{id:2},{id:3}];
+			async getSendList(){
+				await this.getUserCategoryData()
+				let query = JSON.parse(JSON.stringify(this.queryParams));
+				query.coachId = uni.getStorageSync('userInfo')&&JSON.parse(uni.getStorageSync('userInfo')).id||'';
+				this.$api.get('/core/report/receivedReportList',query).then(({data:res})=>{
+					if(res.code!==0) return this.$showToast(res.msg)
+					this.list = [...this.list,...res.data.list];
+					this.list.forEach(l=>{
+						l.categoryName = this.categoryData.find(c=>c.id===l.category).name||'';
+					})
+					this.queryParams.page++;
+					if(res.data.list.length===0) this.isOver = true;
+				})
 			},
 			reSendReport(){
 				this.initList();