更新 合理卸货天数

miniprogram/pages/index/index.wxml

@@ -42,24 +42,25 @@
       </view>
     </view>
     <view class="df jcsa tac">
-      <view bindtap="goTo" class="go-to" data-url="/pages/index/security/security">
+      <!-- <view bindtap="goTo" class="go-to" data-url="/pages/index/security/security">
         <image class="index-image" src="../../images/security.png"></image>
         <view>安全</view>
-      </view>
+      </view> -->
       <view bindtap="goTo" class="go-to" data-url="/pages/index/declarePort/voyageList">
         <image class="index-image" src="../../images/port.png"></image>
         <view>报 港</view>
       </view>
-    </view>
-    <view class="df jcsa tac">
       <view bindtap="goTo" class="go-to" data-url="/pages/index/weather/weatherList">
         <image class="index-image" src="../../images/weather.png"></image>
         <view>天气查询</view>
       </view>
+    </view>
+    <!-- <view class="df jcsa tac">
+    
       <view class="go-to">
         <view class="index-image"></view>
         <view></view>
       </view>
-    </view>
+    </view> -->
   </scroll-view>
 </view>

miniprogram/pages/index/weather/weatherList.wxml

@@ -6,10 +6,10 @@
 </view>
 <scroll-view bindrefresherrefresh="scrollDownList" refresher-triggered="{{isFreshing}}" refresher-enabled="{{true}}" scroll-y="true" bindscrolltolower="scrollList" style="height:calc(100vh - 140rpx);padding-bottom: 100rpx;background: #fff;">
   <view class="df aic jcsb list" wx:for="{{list}}" wx:key="index" bindtap="goToDetail" data-id="{{item.id}}">
-    <view class="col-1 ml30">{{item.portName}}</view>
-    <view class="col-2">{{item.weather}}</view>
-    <view class="col-3">{{item.temperature}} ℃</view>
-    <view class="col-4">{{item.winddirection}} 风 / {{item.windpower}} 级</view>
+    <view class="col-1 ml30">{{item.portName||'-'}}</view>
+    <view class="col-2">{{item.weather||'-'}}</view>
+    <view class="col-3">{{item.temperature||'-'}} ℃</view>
+    <view class="col-4">{{item.winddirection||'-'}} 风 / {{item.windpower||'-'}} 级</view>
   </view>
   <view bindtap="scrollList" class="bottom-text">{{total==0?'暂无数据':(total>size*currentPage?'点击或滑动加载更多...':'已加载完毕')}}</view>
 </scroll-view>

miniprogram/pages/voyages/detail/detail.wxml

@@ -61,7 +61,13 @@
       <view class="line-item">
         <view class="line-title">货量:</view>
         <view class="line-text" style="width: 40vw;">{{tons}} 吨</view>
-        <view class="line-text">{{pieces}} 件</view>
+        <view class="line-text">{{pieces||'-'}} 件</view>
+      </view>
+    </view>
+    <view class="line">
+      <view class="line-item">
+        <view class="line-title" style="width: 300rpx;">合理卸货天数:</view>
+        <view class="line-text">{{reasonableUnloadingDays}}</view>
       </view>
     </view>
   </view>
@@ -79,8 +85,10 @@
     <view class="line">
       <view class="line-full-item">
         <view class="line-full-title">实际货量:</view>
-        <input class="d-input" disabled="{{tab2disabled}}" model:value="{{actualLoadTons}}" type="text" style="width: 20vw;" />{{' 吨'}}
-        <input class="d-input" disabled="{{tab2disabled}}" model:value="{{actualLoadPieces}}" type="text" style="width: 10vw;" />{{' 件'}}
+        <input class="d-input" disabled="{{tab2disabled}}" model:value="{{actualLoadTons}}" type="text" style="width: 20vw;" />
+        <view style="margin-right:10rpx">{{' 吨'}}</view>
+        <input class="d-input" disabled="{{tab2disabled}}" model:value="{{actualLoadPieces}}" type="text" style="width: 10vw;" />
+        <view style="margin-right:10rpx">{{' 件'}}</view>
       </view>
     </view>
     <view class="line">
@@ -103,6 +111,12 @@
         </picker>
       </view>
     </view>
+    <view class="line">
+      <view class="line-full-item">
+        <view class="line-full-title">合理卸货天数:</view>
+        <input class="d-input" disabled="{{tab2disabled}}" model:value="{{reasonableUnloadingDays}}" type="text" style="width: 40vw;" />
+      </view>
+    </view>
     <view class="df aic jcsa p20" style="border-top: 1px solid #999;">
       <view wx:for="{{voyageDetails}}" wx:key="portId" class="tabsview" bindtap="changeDischargeTab" data-index="{{index}}" style="color:{{currentDischargeIndex==index?'#0d8fcc':''}};border-bottom:{{currentDischargeIndex==index?'2rpx solid #0d8fcc':''}}">{{item.portName}}</view>
     </view>
@@ -166,7 +180,7 @@
         <input class="d-input" disabled="{{tab2disabled}}" bindblur="bindDischargePortChange" value="{{voyageDetails[currentDischargeIndex].actualDischargePieces}}" data-index="{{currentDischargeIndex}}" data-param="actualDischargePieces" type="text" style="width: 10vw;" />{{' 件'}}
       </view>
     </view>
-    <view class="next" bindtap="updateVoyage">更新航次</view>
+    <view class="next" bindtap="updateVoyage" style="width: 400rpx;">更新航次</view>
     <view style="height: 30px;"></view>
   </view>
   <view class="p30" wx:if="{{tab==4}}">