更新 拍摄成功样式;分享页样式

miniprogram/app.wxss

@@ -23,4 +23,12 @@ view {
   display: flex;
   justify-content: center;
   align-items: center;
+}
+
+.tac {
+  text-align: center;
+}
+
+.aic {
+  align-items: center;
 }

miniprogram/pages/share/share.js

@@ -1,15 +1,30 @@
 // pages/share/share.js
 Page({
   data: {
-    shareImageUrl: ''
+    shareImageUrl: '',
+    markers: [{
+      id: 999,
+      latitude: '32.001233',
+      longitude: '120.5475',
+      iconPath: "https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/%E8%B4%A7%E4%B8%BB%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%85%88%E8%A1%8C%E7%89%88/location.png",
+      height: 30,
+      width: 30
+    }],
+    logoUrl: 'https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/%E6%B1%87%E5%BE%88%E5%A4%9Alogo-%E5%B7%A6%E5%8F%B3.png'
   },
   onLoad: function (options) {
-    console.log(options)
-
+    wx.hideHomeButton()
+    let {
+      latitude,
+      longitude
+    } = options
+    this.data.markers[0].latitude = latitude
+    this.data.markers[0].longitude = longitude
 
 
 
     this.setData({
+      markers: this.data.markers,
       shareImageUrl: (options.shareImageUrl.replace(/qwerdfb000mmmccc/g, '?')).replace(/mmmcccqwerdfb/g, '=')
     })
   }

miniprogram/pages/share/share.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "汇很多"
+  "navigationBarTitleText": "汇很多科技"
 }

miniprogram/pages/share/share.wxml

@@ -1 +1,6 @@
-<image mode="aspectFit" src="{{shareImageUrl}}" style="width: 100vw;margin-top: 30%;"></image>
+<view class="df aic" class="header">
+    <image mode="aspectFit" class="logo" mode="aspectFit" src="{{logoUrl}}"></image>
+    <view class="text">航行日志</view>
+  </view>
+  <image mode="widthFix" src="{{shareImageUrl}}" class="main-image"></image>
+  <map enable-zoom="{{false}}" enable-scroll="{{false}}" scale="8" markers="{{markers}}" latitude="{{markers[0].latitude}}" longitude="{{markers[0].longitude}}" class="map" name=""></map>

miniprogram/pages/share/share.wxss

@@ -1 +1,34 @@
-/* pages/share/share.wxss */
+/* pages/share/share.wxss */
+.logo {
+  display: block;
+  width: 70px;
+  height: 25px;
+  margin-left: 15px;
+  position: absolute;
+}
+
+.text {
+  font-size: 14px;
+  color: #555;
+  text-align: center;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.header {
+  margin-top: 6vh;
+  align-items: center;
+  margin-bottom: 3vh;
+}
+
+.main-image {
+  width: 90vw;
+  margin: 0 auto;
+  display: block;
+}
+
+.map {
+  width: 90vw;
+  height: 30vh;
+  margin: 0 auto
+}

miniprogram/pages/takePhoto/success/success.js

@@ -1,4 +1,7 @@
 Page({
+  data: {
+    shareImageUrl: ''
+  },
   go() {
     wx.navigateTo({
       url: '/pages/takePhoto/takePhoto',
@@ -6,14 +9,22 @@ Page({
   },
   share() {
 
+  },
+  onLoad() {
+    this.setData({
+      shareImageUrl: wx.getStorageSync('shareImageUrl')
+    })
   },
   onShareAppMessage() {
     let shareImageUrl = wx.getStorageSync('shareImageUrl')
+    let latitude = wx.getStorageSync('latitude')
+    let longitude = wx.getStorageSync('longitude')
+
 
     return {
       title: '真实 实时 精准',
       // 小程序解析带有多个等号的参数时,无法解析等号后面的参数,故=号互相替换%%%%%%
-      path: `/pages/share/share?shareImageUrl=${(shareImageUrl.replace(/\?/g, 'qwerdfb000mmmccc')).replace(/=/g, 'mmmcccqwerdfb')}`,
+      path: `/pages/share/share?shareImageUrl=${(shareImageUrl.replace(/\?/g, 'qwerdfb000mmmccc')).replace(/=/g, 'mmmcccqwerdfb')}&latitude=${latitude}&longitude=${longitude}`,
       imageUrl: shareImageUrl
     }
   }

miniprogram/pages/takePhoto/success/success.wxml

@@ -1,7 +1,4 @@
-<view style="width: 100%;">
-  <image style="width: 300rpx;height: 300rpx;border-radius:50%;margin:0 auto;margin-top: 235rpx;display: block;" src="https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/green-circle-right-icon.jpg?sign=7fa6e412d07bfa0d5144ed2ed2716fff&t=1634542189"></image>
-</view>
-<view style="width: 100%;height: 48rpx;text-align:center;font-size: 34rpx;font-family: PingFangSC-Medium,PingFang SC;font-weight: 500;color: #0094FE;line-height: 48rpx;margin-top: 60rpx;">图片上传成功
-</view>
-<view bindtap="go" style="margin:0 auto;margin-top:156rpx;width: 650rpx;height: 80rpx;background:#0094FE;border-radius: 4rpx;color: #fff;text-align: center;font-size: 34rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;line-height: 80rpx;">继续拍照</view>
-<button open-type="share" bindtap="share" style="margin:0 auto;margin-top:40rpx;width: 650rpx;height: 80rpx;line-height:50rpx!important;border-radius: 4rpx;color: #0094FE;text-align: center;font-size: 34rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;line-height: 80rpx;border: 1px solid #0094FE;">分享</button>
+<image mode="heightFix" style="height: 60vh;margin:0 auto;display: block;" src="{{shareImageUrl}}"></image>
+<view class="success">图片上传成功</view>
+<view bindtap="go" class="go">继续拍照</view>
+<button open-type="share" bindtap="share" class="share">分享</button>

miniprogram/pages/takePhoto/success/success.wxss

@@ -1 +1,48 @@
-/* pages/takePhoto/success/success.wxss */
+/* pages/takePhoto/success/success.wxss */
+page {
+  padding-top: 10vh;
+}
+
+.share {
+  margin: 0 auto;
+  margin-top: 40rpx;
+  width: 90vw !important;
+  height: 80rpx;
+  line-height: 80rpx !important;
+  border-radius: 4rpx;
+  color: #0094FE;
+  text-align: center;
+  font-size: 34rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 80rpx;
+  border: 1px solid #0094FE;
+  padding: 0;
+}
+
+.go {
+  margin: 0 auto;
+  margin-top: 50rpx;
+  width: 90vw;
+  height: 80rpx;
+  background: #0094FE;
+  border-radius: 4rpx;
+  color: #fff;
+  text-align: center;
+  font-size: 34rpx;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  line-height: 80rpx;
+}
+
+.success {
+  width: 100%;
+  height: 48rpx;
+  text-align: center;
+  font-size: 34rpx;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #0094FE;
+  line-height: 48rpx;
+  margin-top: 30rpx;
+}

project.private.config.json

@@ -29,7 +29,8 @@
         {
           "name": "",
           "pathName": "pages/share/share",
-          "query": "shareImageUrl=https://hhd-pat-1255802371.cos.ap-shanghai.myqcloud.com/pat/images/%E8%88%B9%E8%80%81%E5%A4%A7%23281637159182904.qwerdfb000mmmcccsign=q-sign-algorithm%3Dsha1%26q-ak%3DAKID4xb091cy4tRikV0EBrGOGsCF1WkhMlum%26q-sign-time%3D1637159183%3B93158697600%26q-key-time%3D1637159183%3B93158697600%26q-header-list%3Dhost%26q-url-param-list%3D%26q-signature%3D7b0a98a3e901fbffb82441bd4d00aad45361b5d0",
+          "query": "shareImageUrl=https://hhd-pat-1255802371.cos.ap-shanghai.myqcloud.com/pat/images/%E8%88%B9%E7%8E%8B1647422492928.?sign=q-sign-algorithm%3Dsha1%26q-ak%3DAKID4xb091cy4tRikV0EBrGOGsCF1WkhMlum%26q-sign-time%3D1647422493%3B93158697600%26q-key-time%3D1647422493%3B93158697600%26q-header-list%3Dhost%26q-url-param-list%3D%26q-signature%3D721ca8bebf3e18a92730897ad52b9bf9036e51b9",
+          "launchMode": "default",
           "scene": 1007
         },
         {