Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots

src/components/MyWinning.vue

@@ -293,7 +293,7 @@ export default {
         border-radius: 8px;
         margin-top: 11px;
         width: 343px;
-        background-color: #c1172d;
+        background-color: #b12b32;
         border: 0;
         position: fixed;
         z-index: 15;

src/components/imgbox.vue

@@ -45,7 +45,7 @@ export default {
     height: 49.5vw;
     transform-style: preserve-3d;
     transition: all 0.6s ease;
-    transform: rotateY(-180deg) scale(1);
+    transform: rotateY(-180deg) scale(2);
     .back {
       transform: rotateY(-180deg);
     }

src/pages/Honghe.vue

@@ -256,10 +256,8 @@ export default {
   flex-direction: column;
 }
 .index-box {
-  // background: url('../assets/indexImg/indexBgc.jpg') no-repeat;
-  background-color: #c1172d;
-  background-size: 100% 100%;
-  width: 100%;
+  background-color: #b12b32;
+  width: 100vw;
   height: 100vh;
   position: relative;
   top: 0;
@@ -271,20 +269,12 @@ export default {
     z-index: 2;
   }
   .topImage {
-    width: 90%;
-    z-index: 8;
-    overflow-wrap: break-word;
-    text-align: center;
-    white-space: nowrap;
-    align-self: center;
-    margin-top: 20px;
-    background-size: 100% auto;
-    background-repeat: no-repeat;
+    width: 100vw;
   }
   .outer6-wrapper {
     width: 92vw;
     border: 1px solid #d0b69a;
-    margin: 16px auto 0;
+    margin: 0 auto;
     margin-bottom: 2em;
 
     .outer6 {

src/pages/SaveShare.vue

@@ -214,7 +214,7 @@ export default {
       border-radius: 8px;
       margin-top: 11px;
       width: 343px;
-      background-color: #c1172d;
+      background-color: #b12b32;
       border: 0;
       position: fixed;
       z-index: 15;

src/router/index.js

@@ -5,7 +5,7 @@ import Router from 'vue-router'
 import Honghe from '../pages/Honghe.vue'
 import SaveShare from '../pages/SaveShare.vue'
 import { useModel } from '../store'
-import { getOpenId } from '../utils/wx'
+import { getUserInfo } from '../utils/wx'
 import { login } from '../services/person'
 import { setToken } from '../utils/token'
 
@@ -36,7 +36,7 @@ router.beforeEach((to, from, next) => {
 
   // 未登录
   if (!person.personId) {
-    getOpenId().then(openid => {
+    getUserInfo().then(openid => {
       login(openid).then(res => {
         const { user, token } = res;
         setPerson(user)

src/utils/request.js

@@ -16,6 +16,6 @@ export default function request (url, options = {}) {
     })
 }
 
-export const baseURL = process.env.NODE_ENV === 'development' ?
-  '/api/wx' :
-  '/api/wx'
+export const domain = process.env.NODE_ENV === 'development' ? '' : 'https://h5.njyunzhi.com'
+
+export const baseURL = `${domain}/api/wx`

src/utils/wx.js

@@ -64,9 +64,9 @@ export function redirect () {
   const queryCode = getCode();
   localStorage.setItem('wxcode', queryCode)
 
-  if (!queryCode || queryCode === originCode) {
+  if (!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=snsapi_userinfo&state=123#wechat_redirect`
     window.location.href = url
   }
 }
@@ -85,3 +85,18 @@ export function getOpenId () {
 
   return request(`https://api.h5.njyunzhi.com/mp/openid?code=${encodeURIComponent(code)}`)
 }
+
+/**
+ * 获取 openid
+ * @returns 
+ */
+export function getUserInfo () {
+  if (process.env.NODE_ENV === 'development') return Promise.resolve({ openid: '123' });
+
+  const code = getCode()
+  if (!code) {
+    return Promise.reject("获取用户信息失败, 请刷新重试")
+  }
+
+  return request(`https://api.h5.njyunzhi.com/mp/userinfo?code=${encodeURIComponent(code)}`)
+}