Merge branch 'master' of http://git.ycjcjy.com/honghe/roundabout

src/components/BackPage.vue

@@ -5,6 +5,9 @@
     <div class="index-image">
       <img :src="backHome" class="bg-image" />
       <slot></slot>
+      <div class="GrassGIFBox">
+        <GrassGIF />
+      </div>
     </div>
   </div>
 </template>
@@ -25,9 +28,15 @@ export default {
 .index-image {
   height: 100vh;
   overflow: hidden;
+  z-index: 2000;
 
   .bg-image {
     width: 100vw;
   }
+  .GrassGIFBox {
+    position: absolute;
+    bottom: 0vh;
+    z-index: 0;
+  }
 }
 </style>

src/components/GrassGIF.vue

@@ -1,5 +1,8 @@
 <template>
-  <div :style="HomeStyle" class="grassBox">
+  <div class="grassBox">
+    <!-- :style="HomeStyle" -->
+    <img :src="grass" class="grassBox" />
+
     <img :src="grass1" class="grass1" />
     <img :src="grass2" class="grass2" />
     <img :src="grass3" class="grass3" />
@@ -8,6 +11,8 @@
 </template>
 
 <script>
+import grass from '../assets/GrassImage/花丛.png'
+
 import grass1 from '../assets/GrassImage/花丛-1.png'
 import grass2 from '../assets/GrassImage/花丛-2.png'
 import grass3 from '../assets/GrassImage/花丛-3.png'
@@ -21,6 +26,7 @@ export default {
     }
     return {
       HomeStyle,
+      grass,
       grass1,
       grass2,
       grass3,
@@ -34,49 +40,55 @@ export default {
 .grassBox {
   width: 100%;
   height: 21vh;
+  z-index: 322;
   .grass1 {
     width: 17%;
     transform: rotate(7deg);
-    position: relative;
-    left: 68vw;
-    top: 10vh;
-    animation: movegrass1 4s linear infinite;
+    position: absolute;
+    left: 69vw;
+    top: 14vh;
+    animation: movegrass1 2.5s linear infinite;
+    z-index: 1;
   }
   .grass2 {
     width: 11%;
-    transform: rotate(-8deg);
-    position: relative;
-    left: 60vw;
-    top: 6vh;
+    transform: rotate(-17deg);
+    position: absolute;
+    left: 77vw;
+    top: 7vh;
     animation: movegrass2 3.4s linear infinite;
+    z-index: 1;
   }
   .grass3 {
     width: 10%;
     transform: rotate(-13deg);
-    position: relative;
-    left: 56vw;
+    position: absolute;
+    left: 85vw;
     top: 3vh;
     animation: movegrass3 3s linear infinite;
+    z-index: 1;
   }
   .grass4 {
     width: 9%;
-    transform: rotate(-28deg);
-    position: relative;
-    right: -49vw;
-    top: 11vh;
+    transform: rotate(-50deg);
+    position: absolute;
+    right: 0vw;
+    top: 9vh;
     animation: movegrass4 2s linear infinite;
+    transform-origin: bottom;
+    z-index: 20;
   }
 }
 
 @-webkit-keyframes movegrass1 {
   0% {
-    transform: rotate(15deg);
+    transform: rotate(20deg);
   }
   50% {
     transform: rotate(0deg);
   }
   100% {
-    transform: rotate(15deg);
+    transform: rotate(20deg);
   }
 }
 @-webkit-keyframes movegrass2 {
@@ -102,14 +114,14 @@ export default {
   }
 }
 @-webkit-keyframes movegrass4 {
-  // 0% {
-  //   transform: rotate(20deg);
-  // }
-  // 50% {
-  //   transform: rotate(0deg);
-  // }
-  // 100% {
-  //   transform: rotate(20deg);
-  // }
+  0% {
+    transform: rotate(-10deg);
+  }
+  50% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(-10deg);
+  }
 }
 </style>

src/main.js

@@ -10,16 +10,10 @@ const app = createApp(App)
 // redirect()
 
 // Login().then(e => {
-//   new Vue({
-//     router,
-//     store,
-//     render: h => h(App),
-//   }).$mount('#app')
 
 // }).catch(e => {
 //   console.error(e)
-//   // alert('系统错误, 请刷新重试')
-//   // 重试一次
+//   alert('系统错误, 请刷新重试')
 //   redirect(true)
 // })
 

src/pages/OverPage.vue

@@ -97,6 +97,8 @@ export default {
 .IKnow-box {
   position: absolute;
   bottom: 7vh;
+  z-index: 500;
+
   &-top {
     display: flex;
     align-items: center;

src/pages/TopRulePage.vue

@@ -136,6 +136,8 @@ export default {
 .IKnow-box {
   position: absolute;
   width: 100vw;
+  z-index: 500;
+
   display: flex;
   bottom: 7vh;
 

src/pages/homePage.vue

@@ -1,7 +1,7 @@
 
 <template>
   <div>
-    <!-- <BackPage>
+    <BackPage>
       <div class="TitleBox">
         <img :src="gameTitle" />
       </div>
@@ -9,8 +9,7 @@
         <img :src="gameSatrt" class="bth-image" @click="linkTo" />
         <img :src="gameRule" class="bth-image" @click="goRule" />
       </div>
-    </BackPage>-->
-    <GrassGIF />
+    </BackPage>
   </div>
 </template>
 
@@ -117,6 +116,7 @@ export default {
   display: flex;
   bottom: 7vh;
   justify-content: center;
+  z-index: 500;
   .bth-image {
     width: 30%;
   }

src/utils/api.js

@@ -2,10 +2,10 @@ import request from "./request";
 
 
 
-// /**
-//  * @login
-//  *
-//  */
-// //
-// export const LoginUser = (params, data,) => request(`/api/wx/login?code=${params}`, { method: 'post' })
+/**
+ * @login
+ *
+ */
+//
+export const LoginUser = (params, data,) => request(`/api/wx/login?code=${params}`, { method: 'post' })
 

src/utils/initial.js

@@ -1,5 +1,5 @@
 import request from './request'
-import { LoginUser, pv } from './api'
+import { LoginUser, } from './api'
 
 
 
@@ -46,10 +46,10 @@ export function share (opt) {
       const fn = window.wx[apiName]
       if (typeof fn === 'function') {
         fn({
-          title: opt.title || '干洗护理 诠释新生', // 分享标题
+          title: opt.title || '为岸线圆梦，摩天轮圆满大作战！', // 分享标题
           link, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
           imgUrl, // 分享图标
-          desc: opt.desc || 'COLMO开启干洗护理新时代'
+          desc: opt.desc || '快来助力华侨城欢乐滨江摩天轮挂轿厢'
         })
       }
     })
@@ -82,6 +82,7 @@ export function Login () {
 
 
   return LoginUser(code).then(e => {
+    console.log("🚀 ~ file: initial.js ~ line 85 ~ returnLoginUser ~ code", code)
     // PVsum
     console.log(e);
     let userInfo = {
@@ -90,20 +91,15 @@ export function Login () {
       phone: e.person.phone,
       personId: e.person.personId,
     }
-    let location = window.location.href
 
     console.log(3, isLoaded);
 
 
-    try {
-      pv({ addr: location })
-    } catch (error) {
-      console.error(error)
-    }
+
     try {
       share({
-        title: '干洗护理 诠释新生',
-        desc: 'COLMO开启干洗护理新时代'
+        title: '为岸线圆梦，摩天轮圆满大作战！',
+        desc: '快来助力华侨城欢乐滨江摩天轮挂轿厢'
       })
     } catch (error) {
       console.error(error)
@@ -160,14 +156,16 @@ export function redirect (force) {
   const originCode = localStorage.getItem('wxcode');
   const wxfirst = localStorage.getItem('wxfirst') === null;
   const queryCode = getCode();
+  const scope = 'snsapi_userinfo'
 
   localStorage.setItem('wxcode', queryCode)
   localStorage.setItem('wxfirst', 'not');
 
+
   if (force || wxfirst || !queryCode || queryCode === originCode) {
 
     const local = encodeURIComponent(location.origin + location.pathname)
-    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=snsapi_base&state=123#wechat_redirect`
+    const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxd3bab568bc42d1de&redirect_uri=${local}&response_type=code&scope=${scope}&state=123#wechat_redirect`
     window.location.href = url;
   }
 }

vue.config.js

@@ -2,14 +2,27 @@ const { defineConfig } = require('@vue/cli-service')
 const path = require('path');
 
 module.exports = defineConfig({
+  devServer: {
+    proxy: {
+      '/api': {
+        target: "http://192.168.89.147:9000/",
+        // ws: true,
+        changeOrigin: true,
+        // pathRewrite: {
+        //   // 路径重写
+        //   "/api": "" 
+        // }
+      },
+    },
+  },
   publicPath: '.',
   transpileDependencies: true,
-  chainWebpack: (config)=>{
+  chainWebpack: (config) => {
     config.resolve.alias
-      .set('@', path.join(__dirname,'src'))
-      .set('@/components', path.join(__dirname,'src/components'))
-      .set('@/pages', path.join(__dirname,'src/pages'))
-      .set('@/assets', path.join(__dirname,'src/assets'))
-      .set('@/utils', path.join(__dirname,'src/utils'))
+      .set('@', path.join(__dirname, 'src'))
+      .set('@/components', path.join(__dirname, 'src/components'))
+      .set('@/pages', path.join(__dirname, 'src/pages'))
+      .set('@/assets', path.join(__dirname, 'src/assets'))
+      .set('@/utils', path.join(__dirname, 'src/utils'))
   },
 })