diff --git a/package-lock.json b/package-lock.json index 37b5b4f..b12b594 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2350,7 +2350,7 @@ "dev": true }, "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", + "version": "npm:vue-loader-v16@16.8.3", "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", "dev": true, diff --git a/postcss.config.js b/postcss.config.js index 3242573..306f697 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -2,7 +2,11 @@ const AutoPrefixer = require("autoprefixer"); const px2rem = require("postcss-px2rem"); module.exports = ({ file }) => { let remUnit; // 判断条件 请自行调整 我使用的是 mand-mobile ui 没有对vant引入进行测试 - if (file && file.dirname && file.dirname.indexOf("vant") > -1) { remUnit = 37.5; } else { remUnit = 75; } + if (file && file.dirname && file.dirname.indexOf("vant") > -1) { + remUnit = 37.5; + } else { + remUnit = 75; + } return { plugins: [ px2rem({ remUnit: remUnit, }), diff --git a/src/components/Index.vue b/src/components/Index.vue index c968ad8..472eab4 100644 --- a/src/components/Index.vue +++ b/src/components/Index.vue @@ -17,12 +17,8 @@
- - 活动已有{{ store.state.userAccount.participantNum }}人参与 + + 活动已有{{ store.state.userAccount.participantNum }}人参与
@@ -37,11 +33,7 @@
-
+
@@ -55,22 +47,12 @@
-
-
+
+
@@ -222,8 +204,8 @@ const redpacket = (prizeId) => { service .post( process.env.VUE_APP_API + - "/cms-activity/cms88/redpacket/receive/" + - redpacketId, + "/cms-activity/cms88/redpacket/receive/" + + redpacketId, {} ) .then((res) => { @@ -455,9 +437,9 @@ const activityBtn = (item) => { if (item.id == 3) { console.log("生日专享页面"); - console.log("跳转:", "https://appstatic.cmschina.com/activity/cmszhyxpt/bees/index.html?id=INT_SMKTC_MxCbQgYb&uuid="+store.state.userAccount.uuid); + console.log("跳转:", "https://appstatic.cmschina.com/activity/cmszhyxpt/bees/index.html?id=INT_SMKTC_MxCbQgYb&uuid=" + store.state.userAccount.uuid); window.location.href = - "https://appstatic.cmschina.com/activity/cmszhyxpt/bees/index.html?id=INT_SMKTC_MxCbQgYb&uuid="+store.state.userAccount.uuid; + "https://appstatic.cmschina.com/activity/cmszhyxpt/bees/index.html?id=INT_SMKTC_MxCbQgYb&uuid=" + store.state.userAccount.uuid; } if (item.id == 4) { @@ -565,8 +547,8 @@ const getIsAddService = (id) => { service .post( process.env.VUE_APP_API + - "/cms-activity/cms88/qywx/isadded/" + - isInActivityDate, + "/cms-activity/cms88/qywx/isadded/" + + isInActivityDate, {} ) .then((res) => { @@ -712,8 +694,8 @@ const deleteData = (type) => { service .post( process.env.VUE_APP_API + - "/cms-activity/cms88/redpacket/delete/" + - type, + "/cms-activity/cms88/redpacket/delete/" + + type, {} ) .then((res) => { @@ -1104,6 +1086,7 @@ const deleteData = (type) => { @include box(530px, 594px); @include bg_pos("../assets/img/pop/got_luckyBag_pop.png"); position: relative; + .go_index_btn { @include pos(394px, 92px, 79px, 389px); @include bg_pos("../assets/img/pop/to_index_btn.png"); diff --git a/【生产环境】招商88司庆活动-5.zip b/【生产环境】招商88司庆活动-6.zip similarity index 77% rename from 【生产环境】招商88司庆活动-5.zip rename to 【生产环境】招商88司庆活动-6.zip index 1825c15..3beb2f4 100644 Binary files a/【生产环境】招商88司庆活动-5.zip and b/【生产环境】招商88司庆活动-6.zip differ