王智慧 3 лет назад
Родитель
Сommit
89b3d7f770
2 измененных файлов с 21 добавлено и 5 удалено
  1. 3 4
      miniprogram/pages/voyages/detail/detail.wxml
  2. 18 1
      miniprogram/pages/voyages/detail/detail.wxss

+ 3 - 4
miniprogram/pages/voyages/detail/detail.wxml

@@ -1,7 +1,6 @@
+<view wx:if="{{canComplete}}" bindtap="completeVoyage" class="voyage-btn back-blue">完成航次</view>
+<map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 294rpx;" name="map" class="map"></map>
 <view wx:if="{{canCancel}}" bindtap="cancelVoyage" class="cancel-voyage">取消航次</view>
 <view wx:if="{{canCancel}}" bindtap="cancelVoyage" class="cancel-voyage">取消航次</view>
-<!-- <map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 294rpx;" name="map" class="map"></map> -->
-<view style="width: 100%;height: 294rpx;"></view>
-<!-- <view wx:if="{{canComplete}}" bindtap="completeVoyage" class="voyage-btn back-blue">完成航次</view> -->
 <view class="df aic jcsa tabs" style="padding: 0 20rpx;margin-bottom:32rpx">
 <view class="df aic jcsa tabs" style="padding: 0 20rpx;margin-bottom:32rpx">
   <view class="tabsview {{tab==1?'current-tab':''}}" bindtap="changeTab" data-tab="{{1}}">航次信息</view>
   <view class="tabsview {{tab==1?'current-tab':''}}" bindtap="changeTab" data-tab="{{1}}">航次信息</view>
   <view class="tabsview {{tab==2?'current-tab':''}}" bindtap="changeTab" data-tab="{{2}}">运输记录</view>
   <view class="tabsview {{tab==2?'current-tab':''}}" bindtap="changeTab" data-tab="{{2}}">运输记录</view>
@@ -11,7 +10,7 @@
 </view>
 </view>
 <scroll-view scroll-y="true" class="scroll" lower-threshold="50">
 <scroll-view scroll-y="true" class="scroll" lower-threshold="50">
   <view wx:if="{{tab==1}}">
   <view wx:if="{{tab==1}}">
-    <view class="line">
+    <view class="line mt20">
       <view class="line-full-item">
       <view class="line-full-item">
         <view class="line-full-title">航次名称:</view>
         <view class="line-full-title">航次名称:</view>
         <view class="line-text">{{voyageName}}</view>
         <view class="line-text">{{voyageName}}</view>

+ 18 - 1
miniprogram/pages/voyages/detail/detail.wxss

@@ -1,7 +1,24 @@
 .cancel-voyage {
 .cancel-voyage {
+  width: 163rpx;
+  height: 56rpx;
+  border-radius: 12rpx;
+  background: rgba(255, 110, 0, 0.2);
+  text-align: center;
+  line-height: 56rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  position: fixed;
+  right: 20rpx;
+  top: 220rpx;
+  z-index: 100;
+  color: #FF6E00;
+  font-size: 26rpx;
+}
+
+.back-blue {
   width: 100vw;
   width: 100vw;
   height: 80rpx;
   height: 80rpx;
-  background: rgba(255, 100, 47, 0.15);
+  background: rgba(0, 137, 253, 0.1);
   text-align: center;
   text-align: center;
   line-height: 80rpx;
   line-height: 80rpx;
   font-size: 28rpx;
   font-size: 28rpx;