新增 提交日报图片类型

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

@@ -12,7 +12,8 @@ Page({
     markers: [],
     latitude: 31.891992,
     longitude: 120.551369,
-    trans: ''
+    trans: '',
+    isMarkVisable: false
   },
 
   previewImage(e) {
@@ -24,20 +25,44 @@ Page({
       urls: [src] // 需要预览的图片http链接列表
     })
   },
-  async checkMedia(e) {
+
+  async noPass() {
+    this.checkMedia({
+      audit: 2
+    })
+  },
+  async checkMedia(postData) {
     let res = await postApi('/dayReport/audit', {
-      audit: e.currentTarget.dataset.audit,
+      ...postData,
       mediaId: this.data.media.id
     })
     wx.showToast({
       title: res.data.msg,
     })
-    wx.switchTab({
-      url: '/pages/voyageManage/voyageManage',
+    if (res.data.status == 0) {
+      setTimeout(() => {
+        wx.switchTab({
+          url: '/pages/voyageManage/voyageManage',
+        })
+      }, 1500)
+    }
+  },
+
+  showMark() {
+    this.setData({
+      isMarkVisable: true
+    })
+  },
+  async markMedia(e) {
+    let {
+      type
+    } = e.currentTarget.dataset
+    this.checkMedia({
+      type,
+      audit: 1
     })
   },
   onLoad(options) {
-
     this.setData({
       voyageId: options.id,
       trans: options.trans,

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

@@ -1,9 +1,20 @@
-<map enable-scroll="{{false}}" enable-zoom="{{false}}" markers="{{markers}}" scale="{{10}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 300rpx;" name="map"></map>
+<view style="height: 294rpx;overflow:hidden">
+  <map enable-scroll="{{false}}" enable-zoom="{{false}}" markers="{{markers}}" scale="{{10}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 334rpx;" name="map"></map>
+</view>
 <image bindtap="previewImage" class="media" src="{{media.viewUrl}}" data-src="{{media.viewUrl}}" mode="aspectFill"></image>
-<view class="df aic jscb mt50 mb50">
-  <button bindtap="checkMedia" data-audit="{{1}}" class="next">通过</button>
-  <button bindtap="checkMedia" data-audit="{{2}}" class="next">不通过</button>
+<view class="df aic jscb mt50 mb50" wx:if="{{!isMarkVisable}}">
+  <button bindtap="showMark" data-audit="{{1}}" class="next">通过</button>
+  <button bindtap="noPass" data-audit="{{2}}" class="next">不通过</button>
 </view>
+<block wx:else="">
+  <view class="mt50 ml30 mb30 c3">请选择图片类型:</view>
+  <view class="df aic jscb mt20 mb50">
+    <button bindtap="markMedia" data-type="{{0}}" class="next mark">日报</button>
+    <button bindtap="markMedia" data-type="{{1}}" class="next mark">验仓</button>
+    <button bindtap="markMedia" data-type="{{2}}" class="next mark">清仓</button>
+  </view>
+</block>
+
 <view class="df aic jscb">
   <button open-type="share" data-type="{{1}}" class="next">分享航次照片</button> <button open-type="share" data-type="{{2}}" class="next">分享航行报告</button>
 </view>

miniprogram/pages/voyageManage/myDaily/examine/examine.wxss

@@ -22,4 +22,11 @@
   color: #FFFFFF;
   box-sizing: border-box;
   padding: 0;
+}
+
+.mark {
+  width: 200rpx !important;
+  height: 80rpx;
+  line-height: 80rpx;
+  font-size: 34rpx;
 }