diff --git a/.env.production b/.env.prd similarity index 67% rename from .env.production rename to .env.prd index eb2b8c4..b112485 100644 --- a/.env.production +++ b/.env.prd @@ -1,4 +1,4 @@ -VITE_MODE = production +VITE_MODE = prd VITE_HOST = https://hd.xglpa.com VITE_CDN = https://cdn.xglpa.com VITE_FOLDER = /vite-4 diff --git a/package.json b/package.json index d5efa5d..267f5c7 100644 --- a/package.json +++ b/package.json @@ -6,8 +6,8 @@ "scripts": { "dev": "vite", "fat": "vite --mode fat", - "build:fat": "vite build --mode fat", - "build:prod": "vite build --mode production", + "build-fat": "vite build --mode fat", + "build-prd": "vite build --mode prd", "preview": "vite preview" }, "dependencies": { diff --git a/src/components/Loading.vue b/src/components/Loading.vue index e191d39..5fa9567 100644 --- a/src/components/Loading.vue +++ b/src/components/Loading.vue @@ -50,6 +50,9 @@ onMounted(() => { res => { if (res.code == 0) { console.log('我的奖品', res); + if(res.data){ + // userStore.updatePrize(code,money) + } } } ) diff --git a/src/components/Question.vue b/src/components/Question.vue index f9ef149..63556dc 100644 --- a/src/components/Question.vue +++ b/src/components/Question.vue @@ -104,6 +104,8 @@ const showResult = (event) => { subAnswer({}, userStore.token).then((res) => { console.log("key:", res); if (res.code == 0) { + userStore.updateDrawKey(res.data) + } }); } diff --git a/src/data/imgList.js b/src/data/imgList.js index 2603ef0..7fdadc4 100644 --- a/src/data/imgList.js +++ b/src/data/imgList.js @@ -22,6 +22,10 @@ const page = [ 'qa/prev-btn.png', 'qa/answer-box-2.png', 'qa/answer-box-1.png', + 'music-off.png', + 'music-on.png', + + ] // 处理为vite引入图片格式 diff --git a/src/page/Home/App.vue b/src/page/Home/App.vue index 66450a7..e23be9c 100644 --- a/src/page/Home/App.vue +++ b/src/page/Home/App.vue @@ -77,7 +77,7 @@ const drawFn = (item) => { } }; -const showResult = ref(true); +const showResult = ref(false); const resultFn = (item) => { if (item.action == "hide") { showResult.value = false; @@ -96,7 +96,9 @@ const ruleFn = (item) => { onMounted(() => { let code = getQueryString("code"); + let url = import.meta.env.VITE_URL; console.log("code:", code); + console.log("url:", url); let dev = import.meta.env.VITE_MODE; if (dev != "dev") { @@ -110,7 +112,7 @@ onMounted(() => { showLoad.value = true; return; } else { - authorize({ scopeType: 1 }).then((res) => { + authorize({ scopeType: 1,redirectUri:url }).then((res) => { if (res.code == 0) { console.log("重定向地址:", res.data); location.replace(res.data); @@ -147,7 +149,7 @@ onMounted(() => { } }); } else { - authorize({ scopeType: 1 }).then((res) => { + authorize({ scopeType: 1,redirectUri:url }).then((res) => { if (res.code == 0) { console.log("重定向地址:", res.data); location.replace(res.data); diff --git a/src/plugins/wxshare.js b/src/plugins/wxshare.js index 566844c..9145a3c 100644 --- a/src/plugins/wxshare.js +++ b/src/plugins/wxshare.js @@ -7,8 +7,6 @@ const linkUrl = import.meta.env.VITE_HOST + import.meta.env.VITE_FOLDER export function wxShare(option) { let url = location.href.split('#')[0]; - // qiween: https://www.qiween.com/wxapi/api/jsconfig - // 信蜂: https://wx.xfhd.net/wxapi/api/jsconfig?appid=wx41d80a1bb01f658d axios.get('https://wx.xfhd.net/wxapi/api/jsconfig?appid=wx41d80a1bb01f658d', { params: { url } }) diff --git a/vite.config.js b/vite.config.js index e519923..55ad5d8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -18,7 +18,7 @@ export default defineConfig(({ command, mode }) => { return { define: { // enable hydration mismatch details in production build - __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: mode == 'production' ? 'false' : 'true', + __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: mode == 'prd' ? 'false' : 'true', }, plugins: [ @@ -125,8 +125,8 @@ export default defineConfig(({ command, mode }) => { terserOptions: { compress: { //生产环境时移除打印日志 - // drop_console: mode == 'production' ? true : false, - // drop_debugger: mode == 'production' ? true : false, + // drop_console: mode == 'prd' ? true : false, + // drop_debugger: mode == 'prd' ? true : false, }, },