liyongli 2 jaren geleden
bovenliggende
commit
886bdd5502
52 gewijzigde bestanden met toevoegingen van 64 en 34 verwijderingen
  1. 0 0
      src/assets/img/12/1-1.png
  2. 0 0
      src/assets/img/12/1.kuang.png
  3. 0 0
      src/assets/img/12/1.text.png
  4. 0 0
      src/assets/img/12/1.text2.png
  5. BIN
      src/assets/img/12/10-1.png
  6. BIN
      src/assets/img/12/10.kuang.png
  7. BIN
      src/assets/img/12/10.text.png
  8. BIN
      src/assets/img/12/10.text2.png
  9. BIN
      src/assets/img/12/11-1.png
  10. BIN
      src/assets/img/12/11.kuang.png
  11. BIN
      src/assets/img/12/11.text.png
  12. BIN
      src/assets/img/12/11.text2.png
  13. BIN
      src/assets/img/12/12-1.png
  14. BIN
      src/assets/img/12/12.kuang.png
  15. BIN
      src/assets/img/12/12.text.png
  16. BIN
      src/assets/img/12/12.text2.png
  17. BIN
      src/assets/img/12/2-1.png
  18. BIN
      src/assets/img/12/2.kuang.png
  19. BIN
      src/assets/img/12/2.text.png
  20. BIN
      src/assets/img/12/2.text2.png
  21. BIN
      src/assets/img/12/3-1.png
  22. BIN
      src/assets/img/12/3.kuang.png
  23. BIN
      src/assets/img/12/3.text.png
  24. BIN
      src/assets/img/12/3.text2.png
  25. BIN
      src/assets/img/12/4-1.png
  26. BIN
      src/assets/img/12/4.kuang.png
  27. BIN
      src/assets/img/12/4.text.png
  28. BIN
      src/assets/img/12/4.text2.png
  29. BIN
      src/assets/img/12/5-1.png
  30. BIN
      src/assets/img/12/5.kuang.png
  31. BIN
      src/assets/img/12/5.text.png
  32. BIN
      src/assets/img/12/5.text2.png
  33. BIN
      src/assets/img/12/6-1.png
  34. BIN
      src/assets/img/12/6.kuang.png
  35. BIN
      src/assets/img/12/6.text.png
  36. BIN
      src/assets/img/12/6.text2.png
  37. BIN
      src/assets/img/12/7-1.png
  38. BIN
      src/assets/img/12/7.kuang.png
  39. BIN
      src/assets/img/12/7.text.png
  40. BIN
      src/assets/img/12/7.text2.png
  41. BIN
      src/assets/img/12/8-1.png
  42. BIN
      src/assets/img/12/8.kuang.png
  43. BIN
      src/assets/img/12/8.text.png
  44. BIN
      src/assets/img/12/8.text2.png
  45. BIN
      src/assets/img/12/9-1.png
  46. BIN
      src/assets/img/12/9.kuang.png
  47. BIN
      src/assets/img/12/9.text.png
  48. BIN
      src/assets/img/12/9.text2.png
  49. 42 16
      src/view/SilkRoadSpringFestivalGala/index.vue
  50. 1 3
      src/view/SilkRoadSpringFestivalGala/pages/fourth.vue
  51. 3 3
      src/view/SilkRoadSpringFestivalGala/pages/second.vue
  52. 18 12
      src/view/SilkRoadSpringFestivalGala/pages/sex.vue

+ 0 - 0
src/assets/img/1-1.png → src/assets/img/12/1-1.png


+ 0 - 0
src/assets/img/1.kuang.png → src/assets/img/12/1.kuang.png


+ 0 - 0
src/assets/img/1.text.png → src/assets/img/12/1.text.png


+ 0 - 0
src/assets/img/1.text2.png → src/assets/img/12/1.text2.png


BIN
src/assets/img/12/10-1.png


BIN
src/assets/img/12/10.kuang.png


BIN
src/assets/img/12/10.text.png


BIN
src/assets/img/12/10.text2.png


BIN
src/assets/img/12/11-1.png


BIN
src/assets/img/12/11.kuang.png


BIN
src/assets/img/12/11.text.png


BIN
src/assets/img/12/11.text2.png


BIN
src/assets/img/12/12-1.png


BIN
src/assets/img/12/12.kuang.png


BIN
src/assets/img/12/12.text.png


BIN
src/assets/img/12/12.text2.png


BIN
src/assets/img/12/2-1.png


BIN
src/assets/img/12/2.kuang.png


BIN
src/assets/img/12/2.text.png


BIN
src/assets/img/12/2.text2.png


BIN
src/assets/img/12/3-1.png


BIN
src/assets/img/12/3.kuang.png


BIN
src/assets/img/12/3.text.png


BIN
src/assets/img/12/3.text2.png


BIN
src/assets/img/12/4-1.png


BIN
src/assets/img/12/4.kuang.png


BIN
src/assets/img/12/4.text.png


BIN
src/assets/img/12/4.text2.png


BIN
src/assets/img/12/5-1.png


BIN
src/assets/img/12/5.kuang.png


BIN
src/assets/img/12/5.text.png


BIN
src/assets/img/12/5.text2.png


BIN
src/assets/img/12/6-1.png


BIN
src/assets/img/12/6.kuang.png


BIN
src/assets/img/12/6.text.png


BIN
src/assets/img/12/6.text2.png


BIN
src/assets/img/12/7-1.png


BIN
src/assets/img/12/7.kuang.png


BIN
src/assets/img/12/7.text.png


BIN
src/assets/img/12/7.text2.png


BIN
src/assets/img/12/8-1.png


BIN
src/assets/img/12/8.kuang.png


BIN
src/assets/img/12/8.text.png


BIN
src/assets/img/12/8.text2.png


BIN
src/assets/img/12/9-1.png


BIN
src/assets/img/12/9.kuang.png


BIN
src/assets/img/12/9.text.png


BIN
src/assets/img/12/9.text2.png


+ 42 - 16
src/view/SilkRoadSpringFestivalGala/index.vue

@@ -10,11 +10,21 @@
       </div>
     </div>
     <div class="screen">
-      <second v-if="page == 'second'" @changePage="changePage" />
-      <third v-if="page == 'third'" @changePage="changePage" />
-      <fourth v-if="page == 'fourth'" @changePage="changePage" />
-      <five v-if="page == 'five'" @changePage="changePage" />
-      <sex v-if="page === 'sex'" />
+      <transition name="fade">
+        <second v-if="page === 'second'" @changePage="changePage" />
+      </transition>
+      <transition name="fade">
+        <third v-if="page === 'third'" @changePage="changePage" />
+      </transition>
+      <transition name="fade">
+        <fourth v-if="page === 'fourth'" @changePage="changePage" />
+      </transition>
+      <transition name="fade">
+        <five v-if="page === 'five'" @changePage="changePage" />
+      </transition>
+      <transition name="fade">
+        <sex v-if="page === 'sex'" />
+      </transition>
     </div>
   </div>
 </template>
@@ -26,7 +36,7 @@ import five from "./pages/five.vue";
 import sex from "./pages/sex.vue";
 
 // import { onMounted, reactive } from "vue";
-import { ref, reactive } from "vue";
+import { ref } from "vue";
 // import { isIpad, isIpod, isIphone } from "../../utils/isTerminal";
 /**
  * window.$originData.orginParames.title 页面标题
@@ -34,16 +44,16 @@ import { ref, reactive } from "vue";
  * window.$originData.urlParames url参数
  */
 console.log(window.$originData);
-const page = ref("first");
-let first_text = ['"大美中国·多彩丝路"', "2023丝路春晚 联名限定"];
-for (let i = 0; i < first_text.length; i++) {
-  first_text[i] = first_text[i].split("");
-}
-const first_text_view = reactive(first_text);
-let time = setTimeout(() => {
-  clearTimeout(time);
-    page.value = "second";
-}, 5000);
+const page = ref("second");
+// let first_text = ['"大美中国·多彩丝路"', "2023丝路春晚 联名限定"];
+// for (let i = 0; i < first_text.length; i++) {
+//   first_text[i] = first_text[i].split("");
+// }
+// const first_text_view = reactive(first_text);
+// let time = setTimeout(() => {
+//   clearTimeout(time);
+//     page.value = "second";
+// }, 5000);
 
 function changePage(type) {
   page.value = type;
@@ -58,8 +68,24 @@ function changePage(type) {
   .screen {
     width: 100%;
     height: 100%;
+    background-color: #000000;
     > div {
       height: 100%;
+      width: 100%;
+      transition: all 2s;
+    }
+
+    .fade-enter-from,
+    .fade-leave-to {
+      opacity: 0;
+    }
+    .fade-enter-active,
+    .fade-leave-active {
+      transition: opacity 1s ease;
+    }
+    .fade-enter-to,
+    .fade-leave-from {
+      opacity: 1;
     }
   }
   .first {

+ 1 - 3
src/view/SilkRoadSpringFestivalGala/pages/fourth.vue

@@ -44,11 +44,9 @@ window.addEventListener(
 let t = setTimeout(() => {
   clearTimeout(t);
   d.value = true;
-  console.log("------");
 }, 2000);
 
-function inputFile(e) {
-  console.log(e);
+function inputFile() {
   emits("changePage", "five")
 }
 </script>

+ 3 - 3
src/view/SilkRoadSpringFestivalGala/pages/second.vue

@@ -12,7 +12,7 @@
   </div>
 </template>
 <script setup>
-import { ref,defineEmits } from "vue";
+import { ref, defineEmits } from "vue";
 // import { onMounted, reactive } from "vue";
 // import { isIpad, isIpod, isIphone } from "../../utils/isTerminal";
 /**
@@ -28,7 +28,7 @@ function close() {
   let t = setTimeout(() => {
     clearTimeout(t);
     emits("changePage", "third");
-  }, 2000);
+  }, 300);
 }
 </script>
 <style lang="scss" scoped>
@@ -67,7 +67,7 @@ function close() {
     .clickEle {
       background-color: #ffffff;
       border-radius: 50%;
-      transition: all 0.5s;
+      transition: all 0.2s;
       height: 1.8em;
       width: 1.8em;
     }

+ 18 - 12
src/view/SilkRoadSpringFestivalGala/pages/sex.vue

@@ -1,8 +1,7 @@
 <template>
-  <div class="sex">
+  <div class="sex" :style="'background-image: url(' + bgimg + ')'">
     <img
-      src="../../../assets/img/1.kuang.png"
-      v-show="step === 2 || step === 3"
+      :src="kuangimg"
       :style="
         step === 2
           ? 'opacity: 1'
@@ -13,20 +12,18 @@
       class="firstImg"
     />
     <img
-      src="../../../assets/img/1.text.png"
-      v-show="step === 1"
+      :src="textimg"
       :style="step === 1 ? 'opacity: 1' : 'opacity: 0'"
       class="sImg"
     />
     <img
-      src="../../../assets/img/1.text2.png"
-      v-show="step === 3"
+      :src="text2img"
       :style="step === 3 ? 'opacity: 1' : 'opacity: 0'"
       class="tImg"
     />
 
     <div class="btns">
-      <div class="btn" style="margin-left: 0;">下载壁纸</div>
+      <div class="btn" style="margin-left: 0">下载壁纸</div>
       <div class="btn">生成海报</div>
     </div>
   </div>
@@ -45,26 +42,36 @@ let t = setInterval(() => {
   step.value += 1;
   if (step.value === 3) clearInterval(t);
 }, 2000);
+
+const type = Math.floor(Math.random() * 13 + 1);
+const url = {
+  bg: require("@/assets/img/12/" + type + "-1.png"),
+  kuang: require("@/assets/img/12/" + type + ".kuang.png"),
+  text: require("@/assets/img/12/" + type + ".text.png"),
+  text2: require("@/assets/img/12/" + type + ".text2.png"),
+};
+const bgimg = ref(url.bg);
+const kuangimg = ref(url.kuang);
+const textimg = ref(url.text);
+const text2img = ref(url.text2);
 </script>
 <style lang="scss" scoped>
 .sex {
   width: 100%;
   height: 100%;
-  background-image: url(../../../assets/img/1-1.png);
   background-size: 100% 100%;
   position: relative;
   img {
     width: 50%;
+    transition: all 4s;
   }
   .firstImg {
-    transition: all 1s;
     position: absolute;
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
   }
   .sImg {
-    transition: all 1s;
     position: absolute;
     top: 50%;
     left: 50%;
@@ -72,7 +79,6 @@ let t = setInterval(() => {
     transform: translate(-50%, -50%);
   }
   .tImg {
-    transition: all 1s;
     position: absolute;
     top: 50%;
     width: 90%;