更新 单据

miniprogram/pages/index/declarePort/detail.wxss

@@ -12,7 +12,6 @@
 
 .card {
   width: 694rpx;
-  height: calc(100vh - 420rpx);
   background: #FFFFFF;
   border-radius: 12rpx;
   margin: 32rpx auto;

miniprogram/pages/voyageManage/myBills/examine/examine.js

@@ -12,7 +12,14 @@ Page({
     tab: -1,
     currentDischargeIndex: 0,
     dischargeTime: "",
-    ocrList: []
+    ocrList: [],
+    isAcc: false
+  },
+
+  showAcc() {
+    this.setData({
+      isAcc: true
+    })
   },
 
   previewImage(e) {
@@ -184,7 +191,6 @@ Page({
   },
 
   ocrInputBlur(e) {
-    console.log(e)
     let {
       index,
       param

miniprogram/pages/voyageManage/myBills/examine/examine.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "单据分配"
 }

miniprogram/pages/voyageManage/myBills/examine/examine.wxml

@@ -1,104 +1,103 @@
-<view class="p20">
-  <view class="p20">航次信息</view>
-  <view class="box">
+<view style="padding: 32rpx;">
+  <view class="title-1">航次信息</view>
+  <view class="card">
     <view class="line">
-      <view class="line-full-item">
-        <view class="line-full-title">货主名称:</view>
-        <view class="line-full-text">{{currentBillItem.cargoOwner}}</view>
-      </view>
+      <view class="title">货主名称</view>
+      <view class="content">{{currentBillItem.cargoOwner}}</view>
     </view>
     <view class="line">
-      <view class="line-full-item">
-        <view class="line-full-title">货种:</view>
-        <view class="line-full-text">{{currentBillItem.cargo}}</view>
-      </view>
+      <view class="title">货种</view>
+      <view class="content">{{currentBillItem.cargo}}</view>
     </view>
     <view class="line">
-      <view class="line-full-item">
-        <view class="line-full-title">开航时间:</view>
-        <view class="line-full-text">{{currentBillItem.setSailTime}}</view>
-      </view>
+      <view class="title">开航时间</view>
+      <view class="content">{{currentBillItem.setSailTime}}</view>
     </view>
     <view class="line">
-      <view class="line-full-item">
-        <view class="line-full-title">实际到港时间:</view>
-        <view class="line-text">{{currentBillItem.actualArrivalTime}}</view>
-      </view>
+      <view class="title">实际到港时间</view>
+      <view class="content">{{currentBillItem.actualArrivalTime}}</view>
     </view>
   </view>
-  <view class="p20">单据</view>
+  <view class="title-1">单据</view>
   <view class="df aic jcsa">
     <image wx:for="{{currentBillItem.shipownerUploadFiles}}" wx:key="id" bindtap="previewImage" wx:if="{{item.checked}}" style="height:200rpx;margin: 10rpx;" src="{{item.viewUrl}}" data-src="{{item.viewUrl}}" mode="aspectFill"></image>
   </view>
-</view>
-<view class="p20">请选择分配单据类型</view>
-<view class="df aic jcsa">
-  <view class="tabsview" bindtap="changeTab" data-tab="{{1}}" style="color:{{tab==1?'#fff':'#0094FE'}};background:{{tab==1?'#0094FE':''}};border:{{tab==1?'':'1px solid #0094FE'}};">运单</view>
-  <view class="tabsview" bindtap="changeTab" data-tab="{{2}}" style="color:{{tab==2?'#fff':'#0094FE'}};background:{{tab==2?'#0094FE':''}};border:{{tab==2?'':'1px solid #0094FE'}};">磅单</view>
-  <view class="tabsview" bindtap="changeTab" data-tab="{{4}}" style="color:{{tab==4?'#fff':'#0094FE'}};background:{{tab==4?'#0094FE':''}};border:{{tab==4?'':'1px solid #0094FE'}};">汽车磅单</view>
-  <view class=" reject" bindtap="changeTab" data-tab="{{5}}">不通过</view>
-</view>
-<block wx:if="{{tab==1}}">
-
-</block>
-<block wx:if="{{tab==2||tab==4}}">
-  <picker class="picker0" bindchange="bindDiscPortChange" value="{{currentDischargeIndex}}" range="{{currentBillItem.discPorts}}" range-key="portName">
-    <view class="picker">
-      {{currentBillItem.discPorts[currentDischargeIndex].portName||'请选择卸货港'}}
-      <image style="display: inline-block;width: 40rpx;height: 40rpx;" src="../../../../images/bottom-selece.png"></image>
+  <view class="df acc aic jcsb mt30" wx:if="{{!isAcc}}">
+    <view bindtap="changeTab" data-tab="{{5}}">不通过</view>
+    <view bindtap="showAcc">通过</view>
+  </view>
+  <block wx:else>
+    <view class="fs26 mb20" style="color:#555">请选择分配单据类型</view>
+    <view class="df aic jcsa">
+      <view class="tabsview {{tab==1?'current-btn':''}}" bindtap="changeTab" data-tab="{{1}}">运单</view>
+      <view class="tabsview {{tab==2?'current-btn':''}}" bindtap="changeTab" data-tab="{{2}}">磅单</view>
+      <view class="tabsview {{tab==4?'current-btn':''}}" bindtap="changeTab" data-tab="{{4}}">汽车磅单</view>
     </view>
-  </picker>
-</block>
-<block wx:if="{{tab==2}}">
-  <view class="p20 box2" wx:if="{{currentDischargeIndex!=-1}}">
-    <view class="df jcsb line2">
-      <view>卸货时间</view>
+
+    <view class="df line2 disc" style="padding: 20rpx;border-bottom: 2rpx solid #ddd;margin-top: 30rpx;" wx:if="{{tab==2||tab==4}}">
+      <view class="box-title">卸货港</view>
       <view>
-        <picker class="picker2" mode="date" style="border-radius: 0;" model:value="{{dischargeTime}}">
-          <view>
-            {{dischargeTime||'选择开始时间'}}
+        <picker class="picker0" bindchange="bindDiscPortChange" value="{{currentDischargeIndex}}" range="{{currentBillItem.discPorts}}" range-key="portName">
+          <view class="text">
+            {{currentBillItem.discPorts[currentDischargeIndex].portName||'请选择卸货港'}}
           </view>
         </picker>
       </view>
     </view>
-    <view class="df jcsb line2">
-      <view>卸货吨位(吨)</view>
-      <view><input model:value="{{dischargeTons}}" type="digit" placeholder="必填" /></view>
-    </view>
-    <view class="df jcsb line2">
-      <view>卸货件数</view>
-      <view><input model:value="{{dischargePieces}}" type="number" /></view>
-    </view>
-    <view class="next" bindtap="distributeBills">确认</view>
-  </view>
-
-</block>
-<block wx:if="{{tab==4}}">
-  <view class="primary" bindtap="ocr">开始识别</view>
-  <block wx:for="{{ocrList}}" wx:key="viewUrl">
-    <view class="p20 box2" wx:if="{{currentDischargeIndex!=-1&&ocrList.length}}">
-      <view class="df jcsb line2">
-        <view>车牌</view>
-        <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="carNum" value="{{item.carNum}}" type="text" placeholder="" /></view>
-      </view>
-      <view class="df jcsb line2">
-        <view>收货单位</view>
-        <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="receivingUnit" value="{{item.receivingUnit}}" type="text" /></view>
-      </view>
-      <view class="df jcsb line2">
-        <view>毛重</view>
-        <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="grossWeight" value="{{item.grossWeight}}" type="digit" /></view>
-      </view>
-      <view class="df jcsb line2">
-        <view>皮重</view>
-        <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="tare" value="{{item.tare}}" type="digit" /></view>
+    <block wx:if="{{tab==2}}">
+      <view class="p20 box2" wx:if="{{currentDischargeIndex!=-1}}">
+        <view class="df line2">
+          <view class="box-title ">卸货时间</view>
+          <view>
+            <picker class="picker2" mode="date" style="border-radius: 0;" model:value="{{dischargeTime}}">
+              <view class="text" style="color:#6C6C6C">
+                {{dischargeTime||'选择卸货时间'}}
+              </view>
+            </picker>
+          </view>
+        </view>
+        <view class="df  line2">
+          <view class="box-title">卸货吨位(吨)</view>
+          <view><input model:value="{{dischargeTons}}" type="digit" placeholder="必填" /></view>
+        </view>
+        <view class="df  line2">
+          <view class="box-title">卸货件数</view>
+          <view class="text"><input model:value="{{dischargePieces}}" type="number" /></view>
+        </view>
+        <view class="primary" bindtap="distributeBills">确认</view>
       </view>
-      <view class="df jcsb line2">
-        <view>净重</view>
-        <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="netWeight" value="{{item.netWeight}}" type="digit" /></view>
+
+    </block>
+    <block wx:if="{{tab==4}}">
+      <view wx:if="{{ocrList.length==0}}" class="primary" bindtap="ocr">开始识别</view>
+      <view wx:else>
+        <block wx:for="{{ocrList}}" wx:key="viewUrl">
+          <view class="p20 box2" wx:if="{{currentDischargeIndex!=-1&&ocrList.length}}">
+            <view class="df jcsb line2">
+              <view>车牌</view>
+              <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="carNum" value="{{item.carNum}}" type="text" placeholder="" /></view>
+            </view>
+            <view class="df jcsb line2">
+              <view>收货单位</view>
+              <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="receivingUnit" value="{{item.receivingUnit}}" type="text" /></view>
+            </view>
+            <view class="df jcsb line2">
+              <view>毛重</view>
+              <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="grossWeight" value="{{item.grossWeight}}" type="digit" /></view>
+            </view>
+            <view class="df jcsb line2">
+              <view>皮重</view>
+              <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="tare" value="{{item.tare}}" type="digit" /></view>
+            </view>
+            <view class="df jcsb line2">
+              <view>净重</view>
+              <view><input bindblur="ocrInputBlur" data-index="{{index}}" data-param="netWeight" value="{{item.netWeight}}" type="digit" /></view>
+            </view>
+          </view>
+        </block>
       </view>
-    </view>
+      <view wx:if="{{currentDischargeIndex!=-1&&ocrList.length}}" class="primary" bindtap="distributeBills">确认</view>
+      <view style="height: 30rpx;"></view>
+    </block>
   </block>
-  <view wx:if="{{currentDischargeIndex!=-1&&ocrList.length}}" class="primary" bindtap="distributeBills">确认</view>
-  <view style="height: 30rpx;"></view>
-</block>
+</view>

miniprogram/pages/voyageManage/myBills/examine/examine.wxss

@@ -1,95 +1,115 @@
-/* pages/voyageManage/myDaily/examine/examine.wxss */
-.box {
-  width: 80vw;
-  border: 1rpx solid grey;
-  border-radius: 20rpx;
-  margin: 0 auto;
-  padding: 10rpx 20rpx;
+.card {
+  width: 694rpx;
+  background: #FFFFFF;
+  border-radius: 12rpx;
+  margin: 32rpx auto;
+  padding: 32rpx 24rpx 16rpx 24rpx;
 }
 
 .line {
-  font-size: 28rpx;
-  margin: 10rpx 20rpx;
+  display: flex;
+  align-items: center;
+  margin-bottom: 24rpx;
 }
 
-.line-full-item {
-  display: flex;
-  justify-content: space-between;
+.title {
+  width: 180rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #BDC2C8;
+  margin-right: 40rpx;
 }
 
+.content {
+  font-size: 30rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #6C6C6C;
+  flex: 1;
+}
 
-line-full-title,
-.line-full-text {
-  width: 50%;
+.title-1 {
+  height: 27rpx;
+  line-height: 27rpx;
+  font-size: 30rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #239AFE;
+  padding-left: 18rpx;
+  border-left: 4rpx solid #0089FD;
+  margin-bottom: 30rpx;
 }
 
-.line-full-text {
-  color: #444;
+.acc>view {
+  width: 330rpx;
+  height: 86rpx;
+  background: linear-gradient(270deg, #0089FD 0%, #43A9FF 100%);
+  border-radius: 20rpx;
+  text-align: center;
+  line-height: 86rpx;
+  font-size: 34rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
 }
 
 .tabsview {
-  font-size: 28rpx;
-  text-align: center;
-  color: #333;
+  width: 200rpx;
+  height: 60rpx;
   border-radius: 10rpx;
-  padding: 10rpx 20rpx;
+  border: 2rpx solid #028AFD;
+  text-align: center;
+  line-height: 56rpx;
+  font-size: 28rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #0089FD;
 }
 
-.reject {
-  font-size: 28rpx;
-  text-align: center;
-  color: #333;
-  padding: 10rpx 20rpx;
-  background: #d90024;
-  border-radius: 10rpx;
-  color: #fff;
+.current-btn {
+  color: #FFFFFF;
+  background: #0089FD;
 }
 
-.picker0 {
-  min-width: 260rpx;
-  max-width: 320rpx;
-  border: 1rpx solid grey;
-  padding: 10rpx 20rpx 10rpx 30rpx;
-  border-radius: 10rpx;
-  font-size: 26rpx;
-  margin: 20rpx auto;
+.line2 {
+  margin-bottom: 30rpx;
+  border-bottom: 2rpx solid #ddd;
+  padding-bottom: 30rpx;
 }
 
-.picker {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+.box2 .line2 view:first-child {
+  color: #BDC2C8;
 }
 
-.box2 {
-  border: 1px solid grey;
-  margin: 30rpx auto;
+.box2 .line2>view:last-child {
+  color: #6C6C6C;
+}
+
+.primary {
+  width: 590rpx;
+  height: 96rpx;
+  line-height: 96rpx;
+  background: linear-gradient(270deg, #0089FD 0%, #43A9FF 100%);
   border-radius: 20rpx;
-  width: 80vw;
+  font-size: 34rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  text-align: center;
+  margin: 20rpx auto;
+  margin-top: 50rpx;
 }
 
-.box2 input,
-.picker2 {
-  width: 320rpx !important;
-  border: 1px solid grey;
-  padding: 0 10rpx;
+.box2 {
+  margin-bottom: 30rpx;
 }
 
-.line2 {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 28rpx;
-  margin: 20rpx auto
+.box-title {
+  width: 240rpx;
+  color: #BDC2C8;
 }
 
-.primary {
-  padding: 16rpx 30rpx;
-  color: #fff;
-  background: #0094FE;
-  font-size: 28rpx;
-  text-align: center;
-  border-radius: 10rpx;
-  margin: 0 auto;
-  width: 320rpx;
+.text {
+  color: #6C6C6C;
 }

miniprogram/pages/voyageManage/myBills/myBills.wxml

@@ -1,13 +1,13 @@
-<view class="p40">
-  <view class="m30">
+<view style="padding: 32rpx;">
+  <view class="title">
     请选择需要处理的单据(可多选):
+
   </view>
   <block wx:for="{{currentBillItem.shipownerUploadFiles}}" wx:key="id">
-    <view class="df aic jcsb" style="margin: 30rpx 0;">
+    <view class="df jcsb mb40">
       <checkbox bindtap="check" value="{{item.checked}}" checked="{{item.checked}}" data-index="{{index}}"></checkbox>
-      <image bindtap="check" style="width: 75vw;height: 260rpx;" src="{{item.viewUrl}}" data-index="{{index}}"></image>
+      <image bindtap="check" style="width: 609rpx;height: 265rpx;" src="{{item.viewUrl}}" data-index="{{index}}"></image>
     </view>
   </block>
-
   <view bindtap="examineMedia" class="next">下一步</view>
 </view>

miniprogram/pages/voyageManage/myBills/myBills.wxss

@@ -0,0 +1,22 @@
+.title {
+  font-size: 30rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #20252E;
+  margin-bottom: 42rpx;
+}
+
+.next {
+  width: 590rpx;
+  height: 96rpx;
+  background: linear-gradient(270deg, #0089FD 0%, #43A9FF 100%);
+  box-shadow: 0px 4rpx 10rpx 1rpx rgba(0, 170, 102, 0.37);
+  border-radius: 20rpx;
+  margin: 113rpx auto;
+  font-size: 34rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #FFFFFF;
+  line-height: 96rpx;
+  text-align: center;
+}

miniprogram/pages/voyages/detail/detail.js

@@ -9,7 +9,7 @@ import {
 Page({
   data: {
     id: '',
-    tab: 4,
+    tab: 1,
     shipDischargeCurrentPage: 1,
     truckLoadCurrentPage: 1,
     coordinates: [],