登录完善，会议活动筛选分页，扫码签到完善，分标委列表，详情

pages/projectDetail/projectDetail.js

@@ -1,5 +1,6 @@
 import UserApi from '../../assets/js/http/userApi'
 import { previewFile, initFileList } from '../../assets/js/preview'
+import MeetingApi from '../../assets/js/http/meetingApi'
 Page({
 
   /**
@@ -7,34 +8,65 @@ Page({
    */
   data: {
     form: {},
+    id: '', // 在工作组id,项目id
+    showMeeting: false, // 会议信息的显隐
     projectFileList: [], // 项目资料文件
-    notifyFileList: [] // 通知文件
+    notifyFileList: [], // 通知文件
+    meetingList: [] // 会议文件
   },
   // 预览
   preview(e){
     const fileObj = e.currentTarget.dataset.file
     previewFile(fileObj.id,fileObj.name)
   },
+  // 获取更多会议信息数据
+  goMoreMeeting(){
+    wx.navigateTo({
+      url: `../meeting/meeting?workingGroupProjectId=${this.data.id}`,
+    })
+  },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    UserApi.projectDetail({id: options.id}).then(res=>{
+    this.data.id = options.id
+    if(options.type == 'work') { // 工作组项目有会议详情
+      this.setData({
+        showMeeting: true
+      })
+      MeetingApi.meetingList({workingGroupProjectId: this.data.id}).then(res=>{
+        console.log(res)
+        if(res.success){
+          if(res.result.records && res.result.records.length >= 1){
+            this.setData({
+              meetingList: res.result.records
+            })
+          }else if(res.result.records && res.result.records.length >= 2){
+            this.setData({
+              meetingList: res.result.records.slice(1)
+            })
+          }
+        }
+      })
+    }
+    UserApi.projectDetail({id: this.data.id}).then(res=>{
       this.setData({
         form: res.result
       })
       // 获取项目资料文件list
-      initFileList(this.data.form.files).then(res => {
-        this.setData({
-          projectFileList: res
+      if(this.data.form) {
+        initFileList(this.data.form.files).then(res => {
+          this.setData({
+            projectFileList: res
+          })
         })
-      })
-      // 获取通知文件list
-      initFileList(this.data.form.chargeNoticeId).then(res => {
-        this.setData({
-          notifyFileList: res
+        // 获取通知文件list
+        initFileList(this.data.form.chargeNoticeId).then(res => {
+          this.setData({
+            notifyFileList: res
+          })
         })
-      })
+      }
     })
   },
 

pages/projectDetail/projectDetail.json

@@ -1,3 +1,4 @@
 {
+  "navigationBarTitleText": "详情",
   "usingComponents": {}
 }

pages/projectDetail/projectDetail.wxml

@@ -74,17 +74,18 @@
 			<text wx:if="{{projectFileList.length == 0}}">无</text>
 		</view>
 	</view>
-	<view class="basic-info" style="margin-top: 10px;">
+	<view class="basic-info" style="margin-top: 10px;" wx:if="{{showMeeting}}">
 		<view class="title">
 			<text>会议信息</text>
+			<text style="border: none;color: #999; font-size: 13px;" bindtap="goMoreMeeting">更多>></text>
 		</view>
-		<view style="padding: 0 15px;" wx:for="{{form.paymentRecord}}" wx:key="item">
+		<view style="padding: 0 15px;" wx:for="{{meetingList}}" wx:key="item">
 			<view class="meeting-info">
-				<text>hi一</text>
-				<text style="color: #069F99;">查看详情</text>
+				<text>{{item.meetingName}}</text>
+				<text style="color: #069F99;" bindtap="meetingDetail">查看详情</text>
 			</view>
-			<text wx:if="{{form.paymentRecord.length == 0}}">暂无会议记录！</text>
 		</view>
+		<text wx:if="{{meetingList.length == 0}}" class="no-data">暂无会议记录！</text>
 	</view>
 	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
@@ -92,8 +93,8 @@
 		</view>
 		<view style="padding: 0 15px;" wx:for="{{form.paymentRecord}}" wx:key="item">
 			<text wx:if="{{form.paymentRecord && form.paymentRecord.length}}">{{item.paymentDate}}到账{{item.amountReceived}}元</text>
-			<text wx:if="{{form.paymentRecord.length == 0}}">暂无到账记录！</text>
 		</view>
+		<text class="no-data" style="height: 50px;" wx:if="{{!form.paymentRecord}}">暂无到账记录！</text>
 	</view>
 	<view class="basic-info" style="margin-top: 10px;">
 		<view class="title">
@@ -130,5 +131,6 @@
 				<text wx:if="{{item.postStatus == 1}}">查看物流</text>
 			</view>
 		</view>
+		<text class="no-data" style="height: 50px;" wx:if="{{!form.mailBill}}">暂无邮寄记录！</text>
 	</view>
 </view>

pages/projectDetail/projectDetail.wxss

@@ -34,6 +34,10 @@ page{
 .basic-info view:last-child{
   border-bottom: 0;
 }
+.basic-info view text:nth-child(1){
+  flex-shrink: 0;
+  margin-right: 10px;
+}
 .meeting-name{
   margin-bottom: 10px;
 }
@@ -136,6 +140,12 @@ page{
   flex-direction: column;
   align-items: flex-end !important;
   height: auto !important;
+  overflow: hidden;
+}
+.info-file text{
+  overflow:hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .meeting-info{
   width: 100%;
@@ -144,6 +154,16 @@ page{
   justify-content: space-between !important;
   align-items: center;
   padding: 0 !important;
+  border: none;
+}
+.meeting-info text:nth-child(1){
+  flex-shrink: 1 !important;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.meeting-info text:nth-child(2){
+  flex-shrink: 0 !important;
 }
 .basic-info .way{
   padding: 0 15px;
@@ -169,10 +189,12 @@ page{
 .way-info .way-center text:nth-child(1){
   color: #333;
   font-size: 14px;
+  flex-shrink: 0;
 }
 .way-info .way-center text:nth-child(2){
   color: #999;
   font-size: 11px;
+  flex-shrink: 0;
 }
 .way-info .green {
   width: 20px;