bug修改

pages/projectDetail/projectDetail.js

@@ -105,7 +105,9 @@ Page({
         showMeeting: true
       })
       MeetingApi.meetingList({
-        workingGroupProjectId: this.data.id
+        workingGroupProjectId: this.data.id,
+        column: 'pm.createTime',
+        order: 'desc'
       }).then(res => {
         console.log(res)
         if (res.success) {
@@ -204,4 +206,4 @@ Page({
   onShareAppMessage: function () {
 
   }
-})
+})

pages/projectDetail/projectDetail.json

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

pages/projectDetail/projectDetail.wxml

@@ -11,7 +11,7 @@
 		</view>
 		<view>
 			<text>运行年份</text>
-			<text>{{form.year}}年</text>
+			<text>{{form.year ? form.year + '年' : ''}}</text>
 		</view>
 		<view>
 			<text>项目负责人</text>
@@ -19,11 +19,11 @@
 		</view>
 		<view>
 			<text>应付金额</text>
-			<text>{{form.receivableAmount ? form.receivableAmount + '元' : '0'}}</text>
+			<text>{{form.receivableAmount ? form.receivableAmount + '元' : ''}}</text>
 		</view>
 		<view>
 			<text>实付金额</text>
-			<text>{{form.paidAmount ? form.paidAmount + '元' : '0'}}</text>
+			<text>{{form.paidAmount ? form.paidAmount + '元' : ''}}</text>
 		</view>
 		<view>
 			<text>企业联系人</text>
@@ -107,6 +107,7 @@
 				<image wx:if='{{item.sendMethod === 1}}' src="../../assets/images/ems.png"></image>
 				<text>{{item.sendMethod_dictText ? item.sendMethod_dictText : '未邮寄'}}</text>
 			</view>
+			<view class="way project-name">项目名称：{{item.chargeCompanyName}}</view>
 			<view class="way-info">
 				<view class="way-left">
 					<text class="way-left-text green">票</text>
@@ -121,7 +122,7 @@
 				<view class="way-left">
 					<text class="way-left-text blue">邮</text>
 					<view class="way-center">
-						<text>邮寄人：{{item.contactName}}</text>
+						<text>邮寄人：{{item.mailName ? item.mailName : '无'}}</text>
 						<text>邮寄时间：{{item.sendDate ? item.sendDate : '无'}}</text>
 					</view>
 				</view>
@@ -134,4 +135,4 @@
 		</view>
 		<text class="no-data" style="height: 50px;" wx:if="{{!form.mailBill}}">暂无邮寄记录！</text>
 	</view>
-</view>
+</view>

pages/projectDetail/projectDetail.wxss

@@ -134,6 +134,16 @@ page{
   padding: 0 !important;
   height: auto !important;
 }
+.project-name{
+  display: block !important;
+    width: 100%;
+    overflow: hidden !important;
+    text-overflow: ellipsis !important;
+    white-space: nowrap !important;
+    box-sizing: border-box;
+    height: 40px !important;
+    line-height: 40px;
+}
 .info-file{
   padding: 0 !important;
   display: flex;
@@ -179,21 +189,32 @@ page{
   height: 23px;
   margin-right: 10px;
 }
+.way-info{
+  display: flex;
+}
 .way-info .way-left{
   padding: 0;
   display: flex;
   justify-content: flex-start !important;
+  width: 70%;
 }
 .way-info .way-center{
   display: flex;
-    flex-direction: column;
-    justify-content: space-between;
-    align-items: flex-start;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: flex-start;
+  width: 100%;
+  overflow: hidden;
 }
 .way-info .way-center text:nth-child(1){
   color: #333;
+  display: block;
+  width: 100%;
   font-size: 14px;
   flex-shrink: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 .way-info .way-center text:nth-child(2){
   color: #999;
@@ -202,29 +223,35 @@ page{
 }
 .way-info .green {
   width: 20px;
-    height: 20px;
-    background: #069F99;
-    color: #fff;
-    font-size: 11px;
-    text-align: center;
-    line-height: 20px;
-    border-radius: 5px;
+  height: 20px;
+  background: #069F99;
+  color: #fff;
+  font-size: 11px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 5px;
 }
 .way-info .blue {
   width: 20px;
-    height: 20px;
-    background: #0A72F7;
-    color: #fff;
-    font-size: 11px;
-    text-align: center;
-    line-height: 20px;
-    border-radius: 5px;
+  height: 20px;
+  background: #0A72F7;
+  color: #fff;
+  font-size: 11px;
+  text-align: center;
+  line-height: 20px;
+  border-radius: 5px;
 }
 .way-info .way-right{
-  flex-shrink: 0;
+  width: 30%;
+  word-break: break-word;
   padding: 0;
   color: #666;
   font-size: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 3;
+  -webkit-box-orient: vertical;
 }
 .basic-info .look-progress{
   padding: 0 15px;
@@ -268,4 +295,4 @@ page{
   display: block;
   text-align: center;
   line-height: 40px;
-}
+}