From d010edfebaebbdaa46c7058ba19378122616e258 Mon Sep 17 00:00:00 2001
From: "XGL-THINKPAD-X1\\rucky" <ruckyshao@gmail.com>
Date: Tue, 23 Jan 2024 20:42:12 +0800
Subject: [PATCH] update

---
 .env.fat               |  1 +
 .env.prd               |  1 +
 src/data/index.js      |  2 +-
 src/page/Home/App.vue  | 11 +++++++++++
 src/plugins/wxshare.js |  2 +-
 src/store/index.js     |  4 ++--
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.env.fat b/.env.fat
index f7426f3..be41d88 100644
--- a/.env.fat
+++ b/.env.fat
@@ -2,5 +2,6 @@ VITE_MODE = fat
 VITE_HOST = https://wmm-stg.pingan.com.cn
 VITE_CDN = https://cdn.xglpa.com
 VITE_FOLDER = /vite-4
+VITE_APPID = wxc2bc9f9e8d19b504
 VITE_API = /intfgw/data/mmoactivity
 VITE_URL = https://w-stg.pingan.com.cn/lckj/pawm-mmo-activity-xgl-frontend/index.html
diff --git a/.env.prd b/.env.prd
index 9b7d66e..e8613b1 100644
--- a/.env.prd
+++ b/.env.prd
@@ -2,5 +2,6 @@ VITE_MODE = prd
 VITE_HOST = https://wmm.pingan.com.cn
 VITE_CDN = https://cdn.xglpa.com
 VITE_FOLDER = /vite-4
+VITE_APPID = wx567d5d82d2dfdd1c
 VITE_API = /intfgw/data/mmoactivity
 VITE_URL = https://w.pingan.com.cn/lckj/pawm-mmo-activity-xgl-frontend/index.html
\ No newline at end of file
diff --git a/src/data/index.js b/src/data/index.js
index 6cfc778..35679dd 100644
--- a/src/data/index.js
+++ b/src/data/index.js
@@ -228,7 +228,7 @@ export const mbtiList = [
     {
         type: 'ESTP',
         job: '企业家',
-        des: ['聪明，精力充沛善于感知的人们，','每天都在冲向新的冒险'],
+        des: ['充满活力热衷于突破，','强大的洞察力，常常发现新事物和想法'],
         blessings: ['人间四月芳菲尽', '吃喝玩乐要尽兴'],
         product: '7天成长',
         productPic: new URL('../assets/images/result/product/ESTP.png', import.meta.url).href,
diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue
index 734b667..26d6be4 100644
--- a/src/page/Home/App.vue
+++ b/src/page/Home/App.vue
@@ -184,6 +184,8 @@ onMounted(() => {
               duration: 0,
               forbidClick: true,
             });
+            return
+
           }
 
           // 活动未开启：6002
@@ -194,7 +196,16 @@ onMounted(() => {
               icon: "flag-o",
               forbidClick: true,
             });
+            return
           }
+
+          Toast.fail({
+              message: "活动已结束",
+              duration: 0,
+              forbidClick: true,
+            });
+
+
         }
 
 
diff --git a/src/plugins/wxshare.js b/src/plugins/wxshare.js
index 196291b..81064eb 100644
--- a/src/plugins/wxshare.js
+++ b/src/plugins/wxshare.js
@@ -19,7 +19,7 @@ export function wxShare(option) {
             let data = res.data;
             wx.config({
                 debug: false, // 开启调试模式
-                appId: 'wxc2bc9f9e8d19b504', // 必填，公众号的唯一标识
+                appId: import.meta.env.VITE_APPID, // 必填，公众号的唯一标识
                 timestamp: data.timestamp, // 必填，生成签名的时间戳
                 nonceStr: data.nonceStr, // 必填，生成签名的随机串
                 signature: data.signature, // 必填，签名，见附录1
diff --git a/src/store/index.js b/src/store/index.js
index cc94f44..740bef7 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,8 +5,8 @@ export const useMainStore = defineStore("counter", {
     state: () => {
         return {
             hasDraw: true, //是否有抽奖机会
-            token: 'INFJ',
-            MBTI: 'INFJ',    //测试结果
+            token: '',
+            MBTI: 'ESFP',    //测试结果
             hasPrize: false,  //是否有奖品
             prizeCode: 'oggSVMbeLgSK', //兑换码
             prizeMoney: '8.88', //金额