Skip to content

I
integral-mall
Commit 78045c59 by chenxin
Options

fix: build

parent 133fed0d
Showing with 45 additions and 44 deletions
dist/index.html
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {}); gio('init','8be12240a3749eab', {});
//custom page code begin here //custom page code begin here
//custom page code end here //custom page code end here
gio('send');</script><link href=./static/css/app.15ac1aa39dd8b8e018b70f528db45463.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.40751fde931b32dd5f6c.js></script><script type=text/javascript src=./static/js/app.a469edeb6a6ebf66db57.js></script></body></html> gio('send');</script><link href=./static/css/app.1ce4ea3852aefeb897797ac5ead53f9f.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.451aecb7500fefa94ef3.js></script><script type=text/javascript src=./static/js/app.439fc81cb63c1a364861.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/app.439fc81cb63c1a364861.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.a469edeb6a6ebf66db57.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.40751fde931b32dd5f6c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.451aecb7500fefa94ef3.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/router/index.js
import Vue from 'vue'; import Vue from 'vue';
import Router from 'vue-router'; import Router from 'vue-router';
import store from '@/store/index'; // import store from '@/store/index';
import bus from '../assets/eventBus.js'; // import bus from '../assets/eventBus.js';
import VueClipboard from 'vue-clipboard2'; import VueClipboard from 'vue-clipboard2';
import main from '../views/main'; import main from '../views/main';
import gift from '../views/goods/gift/gift'; import gift from '../views/goods/gift/gift';
...@@ -117,19 +117,19 @@ const router = new Router({ ...@@ -117,19 +117,19 @@ const router = new Router({
] ]
}); });
router.beforeEach((to, from, next) => { // router.beforeEach((to, from, next) => {
if (to.meta.useMenuLimit == true) { // if (to.meta.useMenuLimit == true) {
if (store.state.product.canUseMenuUrl.includes(to.path)) { // if (store.state.product.canUseMenuUrl.includes(to.path)) {
next(); // next();
} else { // } else {
// 不允许访问则重置到menu的第一个路由 // // 不允许访问则重置到menu的第一个路由
// 全部不选（没有积分商城任何菜单时，limit.js catch // // 全部不选（没有积分商城任何菜单时，limit.js catch
bus.$emit('updateLeft', store.state.product.canUseMenuUrl[0]); // 更新左侧 // bus.$emit('updateLeft', store.state.product.canUseMenuUrl[0]); // 更新左侧
next(store.state.product.canUseMenuUrl[0]); // next(store.state.product.canUseMenuUrl[0]);
} // }
} else { // } else {
next(); // next();
} // }
}); // });
export default router; export default router;
src/utils/limiting.js
...@@ -4,29 +4,30 @@ import globalConfig from '@/config/index'; ...@@ -4,29 +4,30 @@ import globalConfig from '@/config/index';
import store from '@/store/index'; import store from '@/store/index';
export default config => { export default config => {
const { createApp } = config; const { createApp } = config;
window.onload = async function() { createApp();
try { // window.onload = async function() {
let path = window.location.hash.split('/')[1]; // try {
path = path.indexOf('?') !== -1 ? path.substring(0, path.indexOf('?')) : path; // let path = window.location.hash.split('/')[1];
// 获取用户菜单信息 // path = path.indexOf('?') !== -1 ? path.substring(0, path.indexOf('?')) : path;
let loginUserRes = await request.get(`/api-auth/get-current-memu-data?project=integral-mall&path=${path}&requestProject=integral-mall`); // // 获取用户菜单信息
const leftMenu = loginUserRes.data.result.leftMenu || []; // let loginUserRes = await request.get(`/api-auth/get-current-memu-data?project=integral-mall&path=${path}&requestProject=integral-mall`);
let _leftMenuLimit = []; // const leftMenu = loginUserRes.data.result.leftMenu || [];
leftMenu.forEach(element => { // let _leftMenuLimit = [];
if (element.level4List) { // leftMenu.forEach(element => {
element.level4List.forEach(level4 => { // if (element.level4List) {
_leftMenuLimit.push(`/${level4.menuUrl}`); // element.level4List.forEach(level4 => {
}); // _leftMenuLimit.push(`/${level4.menuUrl}`);
} else { // });
_leftMenuLimit.push(`/${element.menuUrl}`); // } else {
} // _leftMenuLimit.push(`/${element.menuUrl}`);
}); // }
_leftMenuLimit = [...new Set(_leftMenuLimit)]; // });
store.commit('mutations_updateMenuUrl', _leftMenuLimit); // 更新菜单url // _leftMenuLimit = [...new Set(_leftMenuLimit)];
createApp(); // store.commit('mutations_updateMenuUrl', _leftMenuLimit); // 更新菜单url
} catch (error) { // createApp();
// 未登录 // } catch (error) {
window.location.href = globalConfig.api + 'gic-web/'; // // 未登录
} // window.location.href = globalConfig.api + 'gic-web/';
}; // }
// };
}; };
src/views/goods/coupon/info.vue
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span> <span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item> </el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1"> <el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" :isAdd="isAdd" /> <vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" />
</el-form-item> </el-form-item>
<el-form-item label="限兑"> <el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox> <el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment