Merge remote-tracking branch 'origin/master'

src/pages/assistingAgriculture/RouteDetails/RouteDetails.vue

@@ -290,8 +290,20 @@
             <timeLine date="18:30">
               <p class="t1">活动景点</p>
             </timeLine> -->
-            <timeLine :date="v.activityTime.split(' ')[1]" v-for="(v, i) in itineraryData" :key="i">
-              <div v-html="v.activityDescribes"></div>
+            <timeLine :date="dateFormat(v.activityTime)" v-for="(v, i) in itineraryData" :key="i">
+              <div class="t3">
+                <span class="t1">{{ EnumRouteType[v.routeType] || '' }}</span>
+                <template v-if="v.routeType == 1">
+                  <img
+                    class="icon"
+                    @click="openMapApp(v)"
+                    src="/static/assistingAgriculture/routeDetails/position.png"
+                    style="margin-top: -6rpx"
+                  />
+                  <br />
+                </template>
+                <span v-html="v.activityDescribes"></span>
+              </div>
               <p>
                 <img class="icon" src="/static/assistingAgriculture/routeDetails/clock.png" />
                 <span class="t1">活动时间：约{{ v.duration }}小时</span>
@@ -330,6 +342,7 @@ import {
   getItinerary,
   getStoreInformation,
 } from '@/api/assistingAgriculture/route';
+import { navigationSelect } from '@/utils/common';
 import { sgyOrderOrderInfo } from '@/api/assistingAgriculture/shop';
 import { groupBuyConfirm, groupBuyUpdate, groupBuyCreate } from '@/api/confirmOrder';
 import { getCollect } from '@/api/packageDetail';
@@ -528,7 +541,59 @@ const getStoreInformationFn = (id) => {
   });
 };
 // 行程
+// "活动类型1.集合 2.交通 了.参观景点 4.用餐 5.酒店 0.其他活动"
+const dateFormat = (date) => {
+  const hhmmss = date.split(' ')[1];
+  const hhmm = hhmmss.split(':').splice(0, 2).join(':');
+
+  return hhmm;
+};
+/**
+ * 跳转地图
+ */
+
+function openMapApp(data) {
+  console.log(data);
+  const { tripLat, tripLng } = data;
+  uni.showActionSheet({
+    itemList: ['高德地图', '百度地图'],
+    success: (res) => {
+      const item = {
+        shopAddress: '目的地',
+        latitude: tripLat,
+        longitude: tripLng,
+        name: '',
+      };
+
+      switch (res.tapIndex) {
+        case 0:
+          // 打开高德地图
+          item.name = '高德地图';
+          navigationSelect(item);
+          break;
+        case 1:
+          item.name = '百度地图';
+          // 打开百度地图
+          navigationSelect(item);
+          break;
+        default:
+          break;
+      }
+    },
+    fail: (err) => {
+      console.log('取消选择', err);
+    },
+  });
+}
 const itineraryData = ref([]);
+const EnumRouteType = {
+  1: '集合点',
+  2: '交通',
+  3: '参观景点',
+  4: '用餐',
+  5: '酒店',
+  0: '其他活动',
+};
 /* shopId:1821388624367861761
 prodId:43835 */
 onLoad(({ shopId, prodId }) => {

src/pages/storeEntry/detail.vue

@@ -166,6 +166,7 @@
             <wd-button type="error" width="80%" class="submitBTN" @tap="submitData">提交</wd-button>
           </wd-cell-group>
           <wd-popup
+          :safe-area-inset-bottom="true"
             v-model="show"
             position="bottom"
             custom-style="height:500px;overflow:auto;"