Browse Source

Merge branch 'master' of http://git.ycjcjy.com/H5/njDaTuSha

Yansen 2 years ago
parent
commit
002aee9db7
3 changed files with 42 additions and 57 deletions
  1. 0
    1
      index.html
  2. 0
    26
      public/heart.js
  3. 42
    30
      src/pages/pg4/plant.vue

+ 0
- 1
index.html View File

8
     <script src="./jquery.1.9.1.js"></script>
8
     <script src="./jquery.1.9.1.js"></script>
9
     <script src="./turn.min.js"></script>
9
     <script src="./turn.min.js"></script>
10
     <script src="./config.js"></script>
10
     <script src="./config.js"></script>
11
-    <script src="./heart.js"></script>
12
     <!-- <script src="./slidePage/slidePage.min.js"></script> -->
11
     <!-- <script src="./slidePage/slidePage.min.js"></script> -->
13
     <!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=IDixtryGuZAFPZLh4r8XCAM054r8LCRs"></script> -->
12
     <!-- <script src="https://api.map.baidu.com/api?v=3.0&ak=IDixtryGuZAFPZLh4r8XCAM054r8LCRs"></script> -->
14
 
13
 

+ 0
- 26
public/heart.js View File

1
-jQuery(document).ready(function ($) {
2
-    $("html,body").click(function (e) {
3
-        // var n = Math.round(Math.random() * 100);
4
-	var n = 1;
5
-	var $i = $("<b/>").text("+" + n);
6
-	var x = e.pageX,
7
-	    y = e.pageY;
8
-	$i.css({
9
-		"z-index": 99999,
10
-		  "top": y - 20,
11
-		  "left": x,
12
-		  "position": "absolute",
13
-		   "color": "#fff"
14
-        // "color": "#C6B0EA"
15
-       
16
-	});
17
-	$("body").append($i);
18
-		$i.animate({
19
-		     "top": y - 80,
20
-		     "opacity": 0
21
-		}, 1500, function () {
22
-		 $i.remove();
23
-	  });
24
-	  e.stopPropagation();
25
-	});
26
-});

+ 42
- 30
src/pages/pg4/plant.vue View File

5
       <div class="content-item" v-for="(item, inx) in list" :key="inx">
5
       <div class="content-item" v-for="(item, inx) in list" :key="inx">
6
         <div v-show="isChoise(item.name)">
6
         <div v-show="isChoise(item.name)">
7
           <img
7
           <img
8
-            class="shadow animate__animated animate__fadeIn popularity-values"
8
+            class="shadow animate__animated animate__fadeIn plus1"
9
             :src="item.img2"
9
             :src="item.img2"
10
             alt=""
10
             alt=""
11
-            @click="() => click(item)"
11
+            @click="(e) => click(item, e)"
12
           />
12
           />
13
           <!-- <span class="num">已种植数量{{ contries[item.name] }}</span> -->
13
           <!-- <span class="num">已种植数量{{ contries[item.name] }}</span> -->
14
         </div>
14
         </div>
15
         <div v-show="!isChoise(item.name)">
15
         <div v-show="!isChoise(item.name)">
16
-          <img class="popularity-values" :src="item.img1" alt="" @click="() => click(item)" />
16
+          <img
17
+            class="plus1"
18
+            :src="item.img1"
19
+            alt=""
20
+            @click="(e) => click(item, e)"
21
+          />
17
         </div>
22
         </div>
18
       </div>
23
       </div>
19
       <div class="content-item">
24
       <div class="content-item">
42
 const flowerShow = ref();
47
 const flowerShow = ref();
43
 const planted = ref(false);
48
 const planted = ref(false);
44
 const badgeShow = ref(false);
49
 const badgeShow = ref(false);
45
-let  timer = 'timer'
46
 
50
 
47
-const isChoise = (name) => {
48
-  // const
49
-  //   console.log(name, "==--");
50
-  return choise.value?.filter((x) => x === name)?.length > 0;
51
-};
52
-const  animate =(plus)=> {
53
-clearInterval(timer);
54
-timer = setInterval(function () {
55
-  plus--;
56
-  if (plus <= 0) {
57
-    clearInterval(timer);
58
-  }
59
-  let $i = $("<i>+1</i>");
60
-  $(".popularity-values").append($i);
51
+let timer = "timer";
52
+
53
+const animate = (plus, e) => {
54
+  // var _this = this;
55
+  console.log(e, "==");
56
+
57
+  var n = 1;
58
+  var $i = $("<b/>").text("+" + n);
59
+  var x = e.pageX,
60
+    y = e.pageY;
61
+  var n = 1;
62
+  var $i = $("<b/>").text("+" + n);
63
+  var x = e.pageX,
64
+    y = e.pageY;
65
+  $i.css({
66
+    "z-index": 99999,
67
+    top: y - 20,
68
+    left: x,
69
+    position: "absolute",
70
+    color: "#fff",
71
+    // "color": "#C6B0EA"
72
+  });
73
+  $("body").append($i);
61
   $i.animate(
74
   $i.animate(
62
     {
75
     {
63
-      top: "-1.1rem",
64
-      right: "-0.9rem",
65
-      // "top": \'-55px\',
66
-      // "right": \'-45px\',
67
-      opacity: 0.1,
68
-      fontSize: "0.46rem",
76
+      top: y - 80,
77
+      opacity: 0,
69
     },
78
     },
70
-    1800,
79
+    1500,
71
     function () {
80
     function () {
72
       $i.remove();
81
       $i.remove();
73
     }
82
     }
74
   );
83
   );
75
-}, 800);
84
+  e.stopPropagation();
85
+};
86
+const isChoise = (name) => {
87
+  // const
88
+  //   console.log(name, "==--");
89
+  return choise.value?.filter((x) => x === name)?.length > 0;
76
 };
90
 };
77
 
91
 
78
-
79
-const click = (item) => {
92
+const click = (item, e) => {
80
   const arr = choise.value;
93
   const arr = choise.value;
81
   updateContries(item.name);
94
   updateContries(item.name);
82
-  console.log(arr, "==");
83
-  animate(1);
95
+  animate(1, e);
84
   choise.value = [...new Set(arr.concat([item.name]))];
96
   choise.value = [...new Set(arr.concat([item.name]))];
85
 };
97
 };
86
 
98