zpj пре 10 месеци
родитељ
комит
9347295d9f

+ 4 - 16
package-lock.json

@@ -8,7 +8,7 @@
       "name": "zh-website",
       "version": "0.1.0",
       "dependencies": {
-        "ali-oss": "^6.17.1",
+        "ali-oss": "6.17.1",
         "animate.css": "^4.1.1",
         "axios": "^0.27.2",
         "cookies": "^0.8.0",
@@ -32,7 +32,7 @@
         "vue-seamless-scroll": "^1.1.23",
         "vuex": "^3.6.2",
         "wangeditor": "4.7.12",
-        "wowjs": "^1.1.3"
+        "wowjs": "1.1.3"
       },
       "devDependencies": {
         "@babel/core": "^7.12.16",
@@ -3417,7 +3417,7 @@
     },
     "node_modules/animate.css": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
       "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
     },
     "node_modules/ansi-colors": {
@@ -13863,11 +13863,6 @@
         "animate.css": "latest"
       }
     },
-    "node_modules/wowjs/node_modules/animate.css": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
-      "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
-    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -16633,7 +16628,7 @@
     },
     "animate.css": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz",
       "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
     },
     "ansi-colors": {
@@ -24457,13 +24452,6 @@
       "integrity": "sha512-HQp1gi56wYmjOYYOMZ08TnDGpT+AO21RJVa0t1NJ3jU8l3dMyP+sY7TO/lilzVp4JFjW88bBY87RnpxdpSKofA==",
       "requires": {
         "animate.css": "latest"
-      },
-      "dependencies": {
-        "animate.css": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
-          "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
-        }
       }
     },
     "wrap-ansi": {

+ 2 - 2
package.json

@@ -11,7 +11,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "ali-oss": "^6.17.1",
+    "ali-oss": "6.17.1",
     "animate.css": "^4.1.1",
     "axios": "^0.27.2",
     "cookies": "^0.8.0",
@@ -35,7 +35,7 @@
     "vue-seamless-scroll": "^1.1.23",
     "vuex": "^3.6.2",
     "wangeditor": "4.7.12",
-    "wowjs": "^1.1.3"
+    "wowjs": "1.1.3"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",

+ 1 - 1
src/main.js

@@ -31,7 +31,7 @@ Vue.prototype.$wow = new WOW({
   animateClass: 'animate__animated',
   offset: 0,
   mobile: true,
-  live: false,
+  live: true,
 })
 Vue.prototype.$langFilter = langFilter
 Vue.prototype.$eventBus = new Vue()

+ 1 - 1
src/utils/dom.js

@@ -7,4 +7,4 @@ export const isElementNotInViewport = function (el) {
       rect.bottom <= 0
     );
   }
-};
+};

+ 13 - 11
src/views/Forestage/Home/index.vue

@@ -2,7 +2,7 @@
   <!-- 首页 -->
   <div class="home-index">
     <div class="index-bg-1">
-        <div v-if="!userToken" class="wow animate__animated animate__bounceInUp info-1 text-align-center box-sizing-border-box pt-100">
+        <div v-if="!userToken" class=" animate__animated animate__bounceInUp info-1 text-align-center box-sizing-border-box pt-100">
             <div class="fs-34 fc-f fw-500 mb-12">{{$t('home.text1')}}</div>
             <div class="fs-14 fc-f fw-400 mb-40">{{$t('home.text2')}}</div>
             <div class="box-1 text-align-center fs-16 mb-12 hand-cursor" @click="toLogin()">{{$t('LoginIndex.login')}}</div>
@@ -11,27 +11,27 @@
     </div>
 
     <div class="index-bg-2  box-sizing-border-box pt-60">
-      <div class="fs-30 mb-18 text-align-center wow animate__animated animate__bounceInUp">{{$t('home.text3')}}</div>
-      <div class="fs-14 mb-60 box-sizing-border-box plr-220 lh-20 wow animate__animated animate__bounceInUp">
+      <div class="fs-30 mb-18 text-align-center  animate__animated animate__bounceInUp" >{{$t('home.text3')}}</div>
+      <div class="fs-14 mb-60 box-sizing-border-box plr-220 lh-20  animate__animated animate__bounceInUp" >
         {{$t('home.text4')}}
       </div>
       <div class="box-sizing-border-box plr-220 justify-content-space-between">
-        <div class="home-1 wow animate__animated animate__bounceInLeft">
-          <img class="home-1-img wow fadadeInUp" src="@/assets/img/home/home-1-1.png" alt="">
+        <div class="home-1  animate__animated animate__bounceInLeft">
+          <img class="home-1-img  fadadeInUp" src="@/assets/img/home/home-1-1.png" alt="">
           <div class="fs-14 mb-5">{{$t('home.text5')}}</div>
           <div class="fs-12 lh-17">{{$t('home.text6')}}</div>
         </div>
-        <div class="home-1 wow animate__animated animate__bounceInLeft">
+        <div class="home-1  animate__animated animate__bounceInLeft">
           <img class="home-1-img" src="@/assets/img/home/home-1-2.png" alt="">
           <div class="fs-14 mb-5">{{$t('home.text7')}}</div>
           <div class="fs-12 lh-17">{{$t('home.text8')}}</div>
         </div>
-        <div class="home-1 wow animate__animated animate__bounceInRight">
+        <div class="home-1  animate__animated animate__bounceInRight">
           <img class="home-1-img" src="@/assets/img/home/home-1-3.png" alt="">
           <div class="fs-14 mb-5">{{$t('home.text9')}}</div>
           <div class="fs-12 lh-17">{{$t('home.text10')}}</div>
         </div>
-        <div class="home-1 wow animate__animated animate__bounceInRight">
+        <div class="home-1  animate__animated animate__bounceInRight">
           <img class="home-1-img" src="@/assets/img/home/home-1-4.png" alt="">
           <div class="fs-14 mb-5">{{$t('home.text11')}}</div>
           <div class="fs-12 lh-17">{{$t('home.text12')}}</div>
@@ -39,7 +39,7 @@
       </div>
     </div>
 
-    <div class="index-bg-3 box-sizing-border-box pt-60 ">
+    <div class="index-bg-3 box-sizing-border-box pt-60">
       <div class="fs-30 mb-18 text-align-center mb-60 wow animate__animated animate__bounceInUp">{{$t('home.text13')}}</div>
       <div class="justify-content-space-between plr-220 box-sizing-border-box mb-18">
         <div class="box-sizing-border-box p-15-20 bg-c-f w-490 wow animate__animated animate__bounceInLeft">
@@ -87,7 +87,7 @@
       </div>
     </div>
 
-    <div class="index-bg-5 box-sizing-border-box pt-60 wow animate__animated animate__bounceInUp">
+    <div class="index-bg-5 box-sizing-border-box pt-60 wow animate__animated animate__bounceInUp" data-wow-delay='0.5s'>
       <div class="fs-42 fw-600 mb-18 text-align-center mb-12">{{$t('home.text23')}}</div>
       <div class="fs-12 mb-18 text-align-center mb-12 mb-60 plr-314 lh-20">{{$t('home.text24')}}</div>
 
@@ -143,7 +143,9 @@ export default {
     this.userToken = window.localStorage.getItem('userToken')
   },
   mounted() {
-
+    this.$nextTick(() => {
+      this.$wow.init()
+    });
   },
   methods: {
     toLogin(){

+ 9 - 5
src/views/Forestage/Team/index.vue

@@ -2,13 +2,13 @@
   <!-- 团队 -->
   <div class="work-index">
     <div class="work-index-bg box-sizing-border-box pt-100">
-      <div class="fc-f fs-34 fw-400 text-align-center mb-44 wow animate__animated animate__bounceInUp">{{$t('home3.text1')}}</div>
-      <div class="align-items-center justify-content mb-18 wow animate__animated animate__bounceInUp">
+      <div class="fc-f fs-34 fw-400 text-align-center mb-44  animate__animated animate__bounceInUp">{{$t('home3.text1')}}</div>
+      <div class="align-items-center justify-content mb-18  animate__animated animate__bounceInUp">
         <img class="d-icon" src="@/assets/img/team/d-icon.png" alt="">
         <div class="fs-14 fc-f">{{$t('home3.text2')}}</div>
         <img class="d-icon" src="@/assets/img/team/d-icon.png" alt="">
       </div>
-      <div class="align-items-center justify-content wow animate__animated animate__bounceInUp">
+      <div class="align-items-center justify-content  animate__animated animate__bounceInUp">
         <div class="b-1 fs-12 text-align-center mr-10">{{$t('home3.text3')}}:{{code}}</div>
         <div class="b-2 fs-12 text-align-center hand-cursor" @click="copyData">{{$t('home3.text4')}}</div>
       </div>
@@ -16,8 +16,8 @@
 
     <div class="box-sizing-border-box box-card">
       <div class="mb-96">
-        <div class="fs-36 mb-16 fw-500 wow animate__animated animate__bounceInLeft">{{$t('home3.text5')}}</div>
-        <div class="fs-22 lh-36 fw-400 wow animate__animated animate__bounceInRight">
+        <div class="fs-36 mb-16 fw-500  animate__animated animate__bounceInLeft">{{$t('home3.text5')}}</div>
+        <div class="fs-22 lh-36 fw-400  animate__animated animate__bounceInRight">
           {{$t('home3.text6')}}
         </div>
       </div>
@@ -88,8 +88,12 @@
 		  }
 	  },
 	mounted() {
+    this.$nextTick(() => {
+      this.$wow.init()
+    });
 		this.getInfo();
 	},
+
 	methods:{
     copyData(){
       if (this.code===''){

+ 1 - 1
src/views/Forestage/Tourism/index.vue

@@ -8,7 +8,7 @@
 				@click="selectType(item,i)">{{lang == 'cn'?item.class_name:item.class_name_en}}</div>
 		</div>
 
-		<div class="box-sizing-border-box plr-220">
+		<div class="box-sizing-border-box plr-220 ">
 			<div class="justify-content-space-between goods-box box-sizing-border-box mt-16"
 				v-for="(item,i) in goodsList" :key="i">
 				<img class="item-img" :src="item.cover_img" alt="">

+ 2 - 2
vue.config.js

@@ -12,14 +12,14 @@ module.exports = defineConfig({
     allowedHosts: 'all',
     proxy: {
       '/api': {
-        target: 'http://api.gmcyy.com/api/',
+        target: 'http://www.gmcyy.com/api/',
         changeOrigin: true,
         pathRewrite: {
           '^/api': ''
         }
       },
       '/adminApi': {
-        target: 'http://api.gmcyy.com/api/',
+        target: 'http://www.gmcyy.com/api/',
         changeOrigin: true,
         pathRewrite: {
           '^/adminApi': ''

+ 4 - 9
yarn.lock

@@ -1862,7 +1862,7 @@
     "require-from-string" "^2.0.2"
     "uri-js" "^4.2.2"
 
-"ali-oss@^6.17.1":
+"ali-oss@6.17.1":
   "integrity" "sha512-v2oT3UhSJTH/LrsscVvi7iEGrnundydNaFzpYAKatqOl4JNcBV4UiwtlJU+ZHLys040JH2k+CutznA0GoE+P2w=="
   "resolved" "https://registry.npmmirror.com/ali-oss/-/ali-oss-6.17.1.tgz"
   "version" "6.17.1"
@@ -1892,14 +1892,9 @@
     "utility" "^1.8.0"
     "xml2js" "^0.4.16"
 
-"animate.css@^4.1.1":
+"animate.css@^4.1.1", "animate.css@latest":
   "integrity" "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
-  "resolved" "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz"
-  "version" "4.1.1"
-
-"animate.css@latest":
-  "integrity" "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
-  "resolved" "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz"
+  "resolved" "https://registry.npmmirror.com/animate.css/-/animate.css-4.1.1.tgz"
   "version" "4.1.1"
 
 "ansi-colors@^4.1.1":
@@ -7962,7 +7957,7 @@
   "resolved" "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz"
   "version" "1.2.5"
 
-"wowjs@^1.1.3":
+"wowjs@1.1.3":
   "integrity" "sha512-HQp1gi56wYmjOYYOMZ08TnDGpT+AO21RJVa0t1NJ3jU8l3dMyP+sY7TO/lilzVp4JFjW88bBY87RnpxdpSKofA=="
   "resolved" "https://registry.npmjs.org/wowjs/-/wowjs-1.1.3.tgz"
   "version" "1.1.3"