更新 文案

miniprogram/app.wxss

@@ -172,6 +172,11 @@ picker {
   font-size: 24rpx;
 }
 
+.fs26 {
+  font-size: 26rpx;
+}
+
+
 .fs28 {
   font-size: 28rpx;
 }

miniprogram/components/remotePicker/remotePicker.js

@@ -21,7 +21,10 @@ Component({
     },
     label: {
       type: String
-    }
+    },
+    placeholder: {
+      type: String
+    },
   },
   data: {
     arr: [],

miniprogram/components/remotePicker/remotePicker.wxml

@@ -1,6 +1,6 @@
 <!--components/remotePicker/remotePicker.wxml-->
 <view bindtap="_handlerOne" capture-bind:tap="_handlerOne">
-  <input disabled="{{disabled}}" model:value="{{label}}" confirm-type="search" type="text" placeholder="模糊搜索" bindconfirm="_getList" class="remote-picker-input" style="{{inputStyle}}" />
+  <input disabled="{{disabled}}" model:value="{{label}}" confirm-type="search" type="text" placeholder="{{placeholder}}" bindconfirm="_getList" class="remote-picker-input" style="{{inputStyle}}" />
   <view style="position: relative;">
     <scroll-view wx:if="{{arr.length}}" scroll-y="true" class="scroll">
       <view class="items" wx:for="{{arr}}" bindtap="_selectItem" data-label="{{item.value}}" data-value="{{item.key}}">

miniprogram/pages/index/index.wxml

@@ -2,7 +2,7 @@
   <view>
     <view class="block-line df aic">
       <view style="width: 100%;">
-        <view>活跃船舶数量</view>
+        <view>执行中航次数量</view>
         <view>{{indexInfo.activeShipNum}}</view>
       </view>
     </view>

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.wxml

@@ -6,7 +6,8 @@
     </view>
     <view class="df aic jcsb phones" wx:for="{{item.data}}" wx:for-item="item1">
       <view style="width: 200rpx;">{{item1.userName}}</view>
-      <view class="tac" style="width: 360rpx;text-align: left;">{{item1.shipName}}/{{item1.shipMmsi}}</view>
+      <view class="tac" style="width: 360rpx;text-align: left;">{{item1.shipName}}</view>
+      <view class="tac" style="width: 120rpx;text-align: left;">{{item1.cargo}}</view>
       <image mode="aspectFit" style="width: 52rpx;height: 52rpx;" bindtap="call" data-phone="{{item1.userPhone}}" src="../../../images/phone.png"></image>
     </view>
   </block>

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.wxss

@@ -20,7 +20,7 @@
 .phones {
   width: 70vw;
   padding: 6rpx 0;
-  margin: 0 auto;
+  margin: 24rpx auto;
   font-size: 28rpx;
 }
 

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxml

@@ -2,31 +2,31 @@
   <view class="df aic jcsb line">
     <view>选择船舶</view>
     <view>
-      <RemotePicker bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}"></RemotePicker>
+      <RemotePicker placeholder="选择船舶" bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}"></RemotePicker>
     </view>
   </view>
   <view class="df aic jcsb line">
     <view>选择货主</view>
     <view>
-      <RemotePicker bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}"></RemotePicker>
+      <RemotePicker placeholder="选择货主" bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}"></RemotePicker>
     </view>
   </view>
   <view class="df aic jcsb line">
     <view>选择货种</view>
     <view>
-      <RemotePicker bind:selectItem="selectCargo" url="/cargo/select"></RemotePicker>
+      <RemotePicker placeholder="选择货种" bind:selectItem="selectCargo" url="/cargo/select"></RemotePicker>
     </view>
   </view>
   <view class="df aic jcsb line">
     <view>装货港</view>
     <view>
-      <RemotePicker bind:selectItem="selectLoadPort" url="/port/backstage/getCol"></RemotePicker>
+      <RemotePicker placeholder="选择装货港" bind:selectItem="selectLoadPort" url="/port/backstage/getCol"></RemotePicker>
     </view>
   </view>
   <view class="df aic jcsb line" wx:for="{{dischargePorts}}">
     <view>卸货港 #{{index+1}}</view>
     <view>
-      <RemotePicker id="{{'disc'+index}}" style="width: 200rpx;" bind:selectItem="selectDiscPort" data-index="{{index}}" url="/port/backstage/getCol"></RemotePicker>
+      <RemotePicker placeholder="输入卸货港" id="{{'disc'+index}}" style="width: 200rpx;" bind:selectItem="selectDiscPort" data-index="{{index}}" url="/port/backstage/getCol"></RemotePicker>
     </view>
     <image bindtap="deleteDischargePort" data-index="{{index}}" src="../../../images/delete.png" class="delete"></image>
   </view>

miniprogram/pages/voyageManage/myDaily/examine/examine.js

@@ -65,6 +65,10 @@ Page({
       longitude,
     })
   },
+
+  share(e) {
+    console.log(e)
+  },
   onShareAppMessage() {
     let id = this.data.voyageId
     return {

miniprogram/pages/voyageManage/myDaily/examine/examine.wxml

@@ -6,7 +6,7 @@
 </view>
 <!-- <block wx:if="{{trans=='运输中'}}"> -->
 <view class="df aic jscb">
-  <button style="width: 300rpx;line-height: 80rpx;padding: 0;font-weight: 400;" open-type="share" data-type="{{1}}" class="next">分享航行报告</button> <button style="width: 300rpx;line-height: 80rpx;padding: 0;font-weight: 400;" open-type="share" data-type="{{2}}" class="next">分享航行报告</button>
+  <button style="width: 300rpx;line-height: 80rpx;padding: 0;font-weight: 400;" open-type="share" data-type="{{1}}" class="next" bindtap="share">分享航次照片</button> <button style="width: 300rpx;line-height: 80rpx;padding: 0;font-weight: 400;" open-type="share" data-type="{{2}}" class="next">分享航行报告</button>
 </view>
 <!-- </block> -->
 <!-- <block wx:if="{{trans=='卸货中'}}"> -->

miniprogram/pages/voyageManage/myDaily/myDaily.wxml

@@ -1,6 +1,7 @@
 <view class="p40">
   <view class="m30">
-    请选择需要处理的照片(单选):
+    <view> 请选择日报照片提交给货主(单选):</view>
+    <view class="fs24 p10">( 请遵守国家有关互联网信息安全相关法律 )</view>
   </view>
   <block wx:for="{{medias}}">
     <view class="df aic jcsb" style="margin: 30rpx 0;">

miniprogram/pages/voyageManage/voyageManage.js

@@ -2,6 +2,10 @@ const {
   postApi
 } = require("../../apis/api")
 
+import {
+  datetimeFormat
+} from "../../utils/utils"
+
 const app = getApp()
 
 Page({
@@ -156,10 +160,14 @@ Page({
       phoneNumber: e.currentTarget.dataset.phone
     })
   },
-  onLoad() {},
+  onLoad() {
+
+  },
   onShow() {
+
     this.setData({
-      maintab: app.globalData.maintab
+      maintab: app.globalData.maintab,
+      todayDate: datetimeFormat("年月月日日")
     })
     this.getList()
   }

miniprogram/pages/voyageManage/voyageManage.wxml

@@ -1,13 +1,15 @@
 <view class="df aic jcsb line">
-  <view>选择货主</view>
+  <view>航次搜索</view>
   <view>
-    <RemotePicker bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}" inputStyle="height:60rpx"></RemotePicker>
+    <RemotePicker bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}" placeholder="请输入货主，船名或船东" inputStyle="height:60rpx"></RemotePicker>
   </view>
 </view>
+<view class="date tac mb20 fs26">今日日期:{{todayDate}}</view>
+
 <!-- <block wx:if="{{cargoOwnerId}}"> -->
 <view class="df aic jcsa tabs" wx:if="{{maintab!=3}}">
-  <view class="tabsview" bindtap="changeStatus" data-status="{{1}}" style="color:{{status==1?'#0d8fcc':''}};border-bottom:{{status==1?'4rpx solid #0d8fcc':''}}">{{maintab==1?'执行中':'已拍照'}}</view>
-  <view class="tabsview" bindtap="changeStatus" data-status="{{2}}" style="color:{{status==2?'#0d8fcc':''}};border-bottom:{{status==2?'4rpx solid #0d8fcc':''}}">{{maintab==1?'历史航次':'未拍照'}}</view>
+  <view class="tabsview" bindtap="changeStatus" data-status="{{1}}" style="color:{{status==1?'#0d8fcc':''}};border-bottom:{{status==1?'4rpx solid #0d8fcc':''}}">{{maintab==1?'执行中':'已提交日报'}}</view>
+  <view class="tabsview" bindtap="changeStatus" data-status="{{2}}" style="color:{{status==2?'#0d8fcc':''}};border-bottom:{{status==2?'4rpx solid #0d8fcc':''}}">{{maintab==1?'历史航次':'未提交日报'}}</view>
 </view>
 <scroll-view bindrefresherrefresh="scrollDownList" refresher-triggered="{{isFreshing}}" refresher-enabled="{{true}}" scroll-y="true" style="height:calc(100vh - {{height}}rpx);background: #fff;">
   <view class="df aic jcsb list" wx:for="{{list}}" wx:key="index" data-id="{{item.id}}" bindtap="goToDetail" data-index="{{index}}" data-medias="{{item.medias}}" data-trans="{{item.transStatusName}}">

miniprogram/pages/voyageManage/voyageManage.wxss

@@ -2,7 +2,7 @@
 
 .line {
   width: 80%;
-  margin: 30rpx auto;
+  margin: 20rpx auto;
   font-size: 28rpx;
   position: relative;
 }
@@ -49,7 +49,6 @@
 }
 
 .tabsview {
-  width: 120rpx;
   height: 50rpx;
   text-align: center;
 }

miniprogram/pages/voyages/detail/detail.wxml

@@ -1,7 +1,7 @@
 <map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" style="width: 100%;height: 400rpx;" name="map"></map>
 <view class="df aic jcfe p10 fs24">
   <view wx:if="{{canComplete}}" bindtap="completeVoyage" class="voyage-btn back-blue">完成航次</view>
-  <view bindtap="cancelVoyage" class="voyage-btn back-red">取消航次</view>
+  <view wx:if="{{canCancel}}" bindtap="cancelVoyage" class="voyage-btn back-red">取消航次</view>
 </view>
 <view class="df aic jcsb p20" style="border-bottom: 1px solid #999;border-top: 1px solid #999;">
   <view class="tabsview" bindtap="changeTab" data-tab="{{1}}" style="color:{{tab==1?'#0d8fcc':''}};border-bottom:{{tab==1?'2rpx solid #0d8fcc':''}}">航次信息</view>

miniprogram/utils/utils.js

@@ -4,6 +4,77 @@ function subTimeStr(str) {
   return str.substring(0, index);
 }
 
+function datetimeFormat(type = "yyyy-MM-dd HH:mm:ss",t = new Date()) {
+  let timer, W;
+  let _d = new Date(t);
+  let yyyy = _d.getFullYear();
+
+  let M,
+    MM = _d.getMonth() + 1;
+  if (MM < 10) MM = "0" + MM;
+
+  let d,
+    dd = _d.getDate();
+  if (dd < 10) dd = "0" + dd;
+
+  let h,
+    hh,
+    H,
+    HH = _d.getHours();
+  if (h > 12) h = h - 12;
+  if (hh > 12) hh = hh - 12;
+  if (hh < 10) hh = "0" + hh;
+  if (HH < 10) HH = "0" + HH;
+
+  let mm = _d.getMinutes();
+  if (mm < 10) mm = "0" + mm;
+
+  let ss = _d.getSeconds();
+  if (ss < 10) ss = "0" + ss;
+
+  let w = _d.getDay();
+  if (0 == w) w = 7;
+
+  switch (type) {
+    case "yyyy-MM-dd HH:mm:ss": {
+      timer = `${yyyy}-${MM}-${dd} ${HH}:${mm}:${ss}`;
+      break;
+    }
+
+    case "MM-dd HH:mm:ss": {
+      timer = `${MM}-${dd} ${HH}:${mm}:${ss}`;
+      break;
+    }
+
+    case "yyyy-MM-dd": {
+      timer = `${yyyy}-${MM}-${dd}`;
+      break;
+    }
+
+    case "HH:mm:ss": {
+      timer = `${HH}:${mm}:${ss}`;
+      break;
+    }
+
+    case "yyyy/MM/dd": {
+      timer = `${yyyy}/${MM}/${dd}`;
+      break;
+    }
+
+    case "年月日": {
+      timer = `${yyyy}年${M}月${d}日`;
+      break;
+    }
+
+    case "年月月日日": {
+      timer = `${yyyy}年${MM}月${dd}日`;
+      break;
+    }
+  }
+  return timer;
+}
+
 export {
-  subTimeStr
+  subTimeStr,
+  datetimeFormat
 };