wzh 3 лет назад
Родитель
Сommit
3fe817d8e3
1 измененных файлов с 16 добавлено и 15 удалено
  1. 16 15
      miniprogram/pages/voyages/detail/detail.wxml

+ 16 - 15
miniprogram/pages/voyages/detail/detail.wxml

@@ -10,7 +10,7 @@
   <view class="tabsview" bindtap="changeTab" data-tab="{{4}}" style="color:{{tab==4?'#0d8fcc':''}};border-bottom:{{tab==4?'2rpx solid #0d8fcc':''}}">单据信息</view>
   <view class="tabsview" bindtap="changeTab" data-tab="{{5}}" style="color:{{tab==5?'#0d8fcc':''}};border-bottom:{{tab==5?'2rpx solid #0d8fcc':''}}">航次照片</view>
 </view>
-<view scroll-y="true" style="height:calc(100vh - 570rpx);font-size: 28rpx;color:#222;padding-bottom: 50rpx;" lower-threshold="50">
+<scroll-view scroll-y="true" style="height:calc(100vh - 570rpx);font-size: 28rpx;color:#222;padding-bottom: 50rpx;" lower-threshold="50">
   <view wx:if="{{tab==1}}">
     <view class="line">
       <view class="line-full-item">
@@ -52,20 +52,7 @@
       <view></view>
       <view class="next" bindtap="showAddDischargePortModal">添加卸货港</view>
     </view>
-    <view wx:if="{{dischargeModal}}" class="mask" catchtouchmove="doNothing">
-      <view style="padding: 20rpx 0;">
-        <view class="df aic jcsb line">
-          <view>卸货港</view>
-          <view>
-            <NewPicker placeholder="选择装货港" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
-          </view>
-        </view>
-        <view class="df aic jcsa">
-          <view class="next mt30" bindtap="addDischargePort">添加卸货港</view>
-          <view class="next mt30" bindtap="cancelAddDischargePort">取消</view>
-        </view>
-      </view>
-    </view>
+
     <view class="line">
       <view class="line-item">
         <view class="line-title">货种:</view>
@@ -250,4 +237,18 @@
       <image data-src="{{item.viewUrl}}" bindtap="previewImage" src="{{item.viewUrl}}" style="width: 90%;display: block;margin: 0 auto;" mode="aspectFit"></image>
     </view>
   </view>
+</scroll-view>
+<view wx:if="{{dischargeModal}}" class="mask" catchtouchmove="doNothing">
+  <view style="padding: 20rpx 0;">
+    <view class="df aic jcsb line">
+      <view>卸货港</view>
+      <view>
+        <NewPicker placeholder="选择装货港" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
+      </view>
+    </view>
+    <view class="df aic jcsa">
+      <view class="next mt30" bindtap="addDischargePort">添加卸货港</view>
+      <view class="next mt30" bindtap="cancelAddDischargePort">取消</view>
+    </view>
+  </view>
 </view>