瀏覽代碼

更新 多分享路径;地图标记点渲染

wzh 3 年之前
父節點
當前提交
14ed257bf1

+ 1 - 0
miniprogram/app.json

@@ -9,6 +9,7 @@
     "pages/shipOwnerManage/shipOwnerList/shipOwnerList",
     "pages/shipOwnerManage/addShipOnwer/addShipOnwer",
     "pages/financialManage/financialManage",
+    "pages/share/share",
     "pages/sharePage/sharePage",
     "pages/voyageManage/createVoyage/createVoyage",
     "pages/voyageManage/myBills/myBills",

+ 29 - 8
miniprogram/pages/voyageManage/myDaily/examine/examine.js

@@ -10,8 +10,8 @@ Page({
     media: {},
     voyageId: 0,
     markers: [],
-    longitude: '',
-    latitude: '',
+    latitude: 31.891992,
+    longitude: 120.551369,
     trans: ''
   },
 
@@ -51,29 +51,50 @@ Page({
       longitude
     } = media
     let markers = [{
-      id: "map",
+      id: 1,
       latitude,
       longitude,
+      // latitude: Number(latitude),
+      // longitude: Number(longitude),
       iconPath: "https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/red-circle.png?sign=6d208881376358fb4111aa6d7f1a7846&t=1647934972",
       height: 20,
       width: 20
     }]
+    let points = [{
+      latitude,
+      longitude
+    }]
     this.setData({
       media,
+      points,
       markers,
-      latitude,
-      longitude,
     })
   },
 
   share(e) {
     console.log(e)
   },
-  onShareAppMessage() {
-    let id = this.data.voyageId
+  onShareAppMessage(res) {
+    let {
+      type
+    } = res.target.dataset
+    let path
+    if (type == 1) {
+      let {
+        media,
+        longitude,
+        latitude
+      } = this.data
+      let shareImageUrl = media.viewUrl
+      path = `/pages/share/share?shareImageUrl=${(shareImageUrl.replace(/\?/g, 'qwerdfb000mmmccc')).replace(/=/g, 'mmmcccqwerdfb')}&latitude=${latitude}&longitude=${longitude}`
+
+    } else {
+      let id = this.data.voyageId
+      path = `/pages/sharePage/sharePage?id=${id}`
+    }
     return {
       title: '真实 实时 精准',
-      path: `/pages/sharePage/sharePage?id=${id}`
+      path
     }
   },
 })

+ 2 - 2
miniprogram/pages/voyageManage/myDaily/examine/examine.wxml

@@ -1,4 +1,4 @@
-<map enable-scroll="{{false}}" enable-zoom="{{false}}" markers="{{markers}}" latitude="{{latitude}}" latitude="{{latitude}}" style="width: 100%;height: 400rpx;" name="map"></map>
+<map enable-scroll="{{false}}" enable-zoom="{{false}}" markers="{{markers}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" style="width: 100%;height: 400rpx;" name="map"></map>
 <image bindtap="previewImage" style="width: 100%;height: 400rpx;" src="{{media.viewUrl}}" data-src="{{media.viewUrl}}" mode="aspectFill"></image>
 <view class="df aic jscb">
   <view bindtap="checkMedia" data-audit="{{1}}" class="next">通过</view>
@@ -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" bindtap="share">分享航次照片</button> <button style="width: 300rpx;line-height: 80rpx;padding: 0;font-weight: 400;" open-type="share" data-type="{{2}}" class="next" bindtap="share">分享航行报告</button>
+  <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>
 </view>
 <!-- </block> -->
 <!-- <block wx:if="{{trans=='卸货中'}}"> -->

+ 2 - 2
miniprogram/pages/voyages/detail/detail.js

@@ -93,8 +93,8 @@ Page({
       this.setData({
         polyline: this.data.polyline,
         markers: this.data.markers,
-        // latitude: this.data.latitude,
-        // longitude: this.data.lo fngitude,
+        latitude: this.data.latitude,
+        longitude: this.data.longitude,
         points
       })
 

+ 1 - 1
miniprogram/pages/voyages/detail/detail.wxml

@@ -1,4 +1,4 @@
-<map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" style="width: 100%;height: 400rpx;" name="map"></map>
+<map enable-zoom="{{false}}" enable-scroll="{{false}}" markers="{{markers}}" include-points="{{points}}" latitude="{{latitude}}" longitude="{{longitude}}" 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 wx:if="{{canCancel}}" bindtap="cancelVoyage" class="voyage-btn back-red">取消航次</view>