feats

src/pages/pg4/Flower.vue

@@ -3,7 +3,7 @@
     <div class="txt modal-flower">
       <img class="close abs" src="/images/pg4/close.png" alt="" @click="onCancel">
       <img class="open-flower" src="/images/pg4/flower-open.gif" alt="">
-      <p class="title">{{country}}, 全球总种植数量: {{ user?.num }}</p>
+      <p class="title">全球总种植数量: {{ user?.num }}</p>
       <p class="planting" @click="animate">
         <img src="/images/pg4/planting.png" alt="">
       </p>

src/pages/pg4/Map.vue

@@ -37,23 +37,25 @@
 
   onMounted(() => {
     const map = new BMap.Map(el.value);
-    const point = new BMap.Point(116.404, 39.915); // 天安门
+    // const point = new BMap.Point(116.404, 39.915); // 天安门
+    const point = new BMap.Point(118.749731,32.04067);
     map.centerAndZoom(point, 3);
     mapRef.value = map;
 
     // 绑定事件
     map.addEventListener('click', (e) => {
-      console.log('-----start-----')
-      loading.value = true;
-      const { point } = e;
-      getCountry(point.lng, point.lat).then(x => {
-        emit('click', x);
-        loading.value = false;
-      console.log('-----end-----')
-      }).catch((err) => {
-        console.error(err);
-        loading.value = false;
-      });
+      // console.log('-----start-----')
+      // loading.value = true;
+      // const { point } = e;
+      // getCountry(point.lng, point.lat).then(x => {
+      //   emit('click', x);
+      //   loading.value = false;
+      // console.log('-----end-----')
+      // }).catch((err) => {
+      //   console.error(err);
+      //   loading.value = false;
+      // });
+      emit('click', '中国');
     });
 
     // 显示 marker
@@ -67,8 +69,15 @@
         
         const point = new BMap.Point(target[0], target[1]);
         const marker = new BMap.Marker(point, { icon });
+
+        //
+        marker.addEventListener('click', (e) => {
+          console.log('------marker----->', e)
+          emit('click', '中国');
+        });
+
         map.addOverlay(marker);
-        marker.setAnimation(BMAP_ANIMATION_BOUNCE);
+        // marker.setAnimation(BMAP_ANIMATION_BOUNCE);
 
         // map.getOverlays().forEach((overlay) => {
         //   console.log('------overlay-------', overlay)

src/pages/pg4/video.vue

@@ -37,9 +37,16 @@
   const { query } = route;
   const { from } = query;
 
-  // if (from) {
-  //   window.location.href = decodeURIComponent(from);
-  // }
+  if (from) {
+    // window.location.href = decodeURIComponent(from);
+    // const link = document.createElement('a');
+    // link.target = "_blank";
+    // link.href = from;
+    // link.click();
+    // history.pushState('', '', from);
+    alert(123)
+    router.push(from);
+  }
 
   const onReplay = () => {
     mediaRef.value.play();

src/pages/share/index.vue

@@ -30,17 +30,22 @@ const src = ref();
 
 
 onMounted(() => {
-  setTimeout(()=>{
+  const t = setTimeout(()=>{
     html2canvas(src.value).then((canvas) => {
-    imgData.value = canvas.toDataURL("image/jpg", 0.8);
-  });
-  },1000)
+      imgData.value = canvas.toDataURL("image/jpg", 0.8);
+    });
+
+    clearTimeout(t);
+  }, 200);
 });
 </script>
 
 <style lang="less" scoped>
 .share-pg {
   position: relative;
+  overflow: hidden;
+  height: 100%;
+
   .goback{
     z-index: 100;
     left: 10px;
@@ -48,10 +53,12 @@ onMounted(() => {
   }
 
   .will-copy {
-    position: relative;
+    position: absolute;
     z-index: 1;
     width: 100vw;
     height: 100vh;
+    left: -200vw;
+    top: 0;
 
     .copy-img {
       width: 100%;
@@ -74,7 +81,7 @@ onMounted(() => {
 
   .img-target {
     position: absolute;
-    z-index: 2;
+    z-index: 20;
     width: 100vw;
     height: 100vh;
     top: 0;

src/utils/country_gps.js

@@ -40,7 +40,8 @@ export default {
   "中非共和国": [18.810124, 6.041238],
   "乍得": [18.447049, 14.768537],
   "智利": [-69.977876, -25.138942],
-  "中国": [116.416833, 39.948327],
+  // "中国": [116.416833, 39.948327],
+  "中国": [118.749731,32.04067],
   "哥伦比亚": [-73.478806, 2.776096],
   "科摩罗": [43.375844, -11.78857],
   "刚果": [21.743027,-2.573788],