Skip to content

I
integral-mall
Commit ccedf50e by chenxin
Options

Merge branch 'dev' of http://115.159.76.241/integralMall/integral-mall into dev2 

# Conflicts:
#	dist/index.html
#	dist/static/js/app.5e5109db5cdfeb7b4656.js
#	src/router/index.js
#	src/utils/limiting.js
parents 0e5404d3 78045c59
Showing with 117 additions and 49 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><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.5e5109db5cdfeb7b4656.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><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.cf65265bb1dd7a80607c.js></script></body></html>
\ No newline at end of file
dist/static/js/app.5e5109db5cdfeb7b4656.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/app.cf65265bb1dd7a80607c.js 0 → 100644
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.
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
......@@ -56,6 +56,7 @@
"friendly-errors-webpack-plugin": "^1.6.1",
"html-webpack-plugin": "^2.30.1",
"node-notifier": "^5.1.2",
"node-sass": "^4.12.0",
"onchange": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",
......@@ -65,6 +66,7 @@
"postcss-url": "^7.2.1",
"prettier": "^1.16.4",
"rimraf": "^2.6.0",
"sass-loader": "^8.0.0",
"semver": "^5.3.0",
"shelljs": "^0.7.6",
"uglifyjs-webpack-plugin": "^1.1.1",
......
src/router/index.js
import Vue from 'vue';
import Router from 'vue-router';
import store from '@/store/index';
import bus from '../assets/eventBus.js';
// import store from '@/store/index';
// import bus from '../assets/eventBus.js';
import VueClipboard from 'vue-clipboard2';
import main from '../views/main';
import gift from '../views/goods/gift/gift';
......@@ -117,21 +117,19 @@ const router = new Router({
]
});
router.beforeEach((to, from, next) => {
console.log('to1', to.meta.useMenuLimit);
if (to.meta.useMenuLimit == true) {
console.log('to2', store.state.product.canUseMenuUrl.includes(to.path));
if (store.state.product.canUseMenuUrl.includes(to.path)) {
next();
} else {
// 不允许访问则重置到menu的第一个路由
// 全部不选（没有积分商城任何菜单时，limit.js catch
bus.$emit('updateLeft', store.state.product.canUseMenuUrl[0]); // 更新左侧
next(store.state.product.canUseMenuUrl[0]);
}
} else {
next();
}
});
// router.beforeEach((to, from, next) => {
// if (to.meta.useMenuLimit == true) {
// if (store.state.product.canUseMenuUrl.includes(to.path)) {
// next();
// } else {
// // 不允许访问则重置到menu的第一个路由
// // 全部不选（没有积分商城任何菜单时，limit.js catch
// bus.$emit('updateLeft', store.state.product.canUseMenuUrl[0]); // 更新左侧
// next(store.state.product.canUseMenuUrl[0]);
// }
// } else {
// next();
// }
// });
export default router;
src/service/request.js
......@@ -6,8 +6,9 @@ import router from '../router';
// axios 配置
// axios.defaults.timeout = 5000;
// let adminUrl = 'http://gicdev.demogic.com'
// let adminUrl = process.env.NODE_ENV === 'production' ? '':'http://111.231.99.90:8880/app/mock/19'
// let adminUrl = process.env.NODE_ENV === 'production' ? '':'localhost:8080/'
let adminUrl = process.env.NODE_ENV === 'production' ? '' : 'http://gicdev.demogic.com';
let request;
request = axios.create({
......@@ -48,7 +49,6 @@ request.interceptors.response.use(
if (response.status == 200 && response.data.errorCode === 401) {
window.location.href = window.location.origin + '/gic-web';
// window.location.href = 'http://gicdev.com/gic-web'
}
return response;
......
src/utils/limiting.js
import request from '@/service/request.js';
import globalConfig from '@/config/index';
// import request from '@/service/request.js';
// import globalConfig from '@/config/index';
import store from '@/store/index';
// import store from '@/store/index';
export default config => {
const { createApp } = config;
window.onload = async function() {
try {
// 获取用户企业id
let loginUserRes = await request.get(`/api-auth/get-current-memu-data?project=integral-mall&path=${window.location.hash.split('/')[1]}&requestProject=integral-mall`);
const leftMenu = loginUserRes.data.result.leftMenu || [];
let _leftMenuLimit = [];
leftMenu.forEach(element => {
if (element.level4List) {
element.level4List.forEach(level4 => {
_leftMenuLimit.push(`/${level4.menuUrl}`);
});
} else {
_leftMenuLimit.push(`/${element.menuUrl}`);
}
});
_leftMenuLimit = [...new Set(_leftMenuLimit)];
store.commit('mutations_updateMenuUrl', _leftMenuLimit); // 更新企业id
createApp();
} catch (error) {
// 未登录
window.location.href = globalConfig.api + 'gic-web/';
}
};
createApp();
// window.onload = async function() {
// try {
// 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 _leftMenuLimit = [];
// leftMenu.forEach(element => {
// if (element.level4List) {
// element.level4List.forEach(level4 => {
// _leftMenuLimit.push(`/${level4.menuUrl}`);
// });
// } else {
// _leftMenuLimit.push(`/${element.menuUrl}`);
// }
// });
// _leftMenuLimit = [...new Set(_leftMenuLimit)];
// store.commit('mutations_updateMenuUrl', _leftMenuLimit); // 更新菜单url
// createApp();
// } catch (error) {
// // 未登录
// window.location.href = globalConfig.api + 'gic-web/';
// }
// };
};
src/views/goods/coupon/info.vue
......@@ -175,7 +175,7 @@
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组，系统不会默认选中此新增门店分组，请重新确认选择并保存礼品</span>
</el-form-item>
<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 label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
......
src/views/goods/coupon/testStore.vue 0 → 100644
<template>
<div class="mall-section-container">
<pickUp-store :pickUpPointType="pickUpPointType" :selectData="selectData" @getArr="getArr"></pickUp-store>
</div>
</template>
<script>
import pickUpStore from '../../../components/store/store';
export default {
data() {
return {
pickUpPointType: 0,
selectData: []
// 门店区域数据测试
// selectData: [
// {
// id: '320000',
// label: '江苏省'
// },
// {
// id: '620800',
// label: '平凉市'
// }
// ]
// 门店分组数据测试
// selectData: [
// {
// storeGroupId: 'ff80808161c24e8c0161c6b043b00010',
// storeGroupName: '杭州2'
// },
// {
// storeGroupId: 'ff80808165ea5e530165ebedbd9c0072',
// storeGroupName: '长沙萨达萨'
// }
// ]
// 自提点数据
// selectData: [
// {
// integralMallPickUpPointId: 'ff808081720d8e2801721206883f0f54',
// pickUpPointName: '测试门店2592845'
// },
// {
// integralMallPickUpPointId: 'ff808081720d8e280172120688380e41',
// pickUpPointName: '测试门店8674606'
// }
// ]
};
},
methods: {
//调用获取数据
getArr(arr, type) {}
},
components: {
pickUpStore
}
};
</script>
<style scoped>
.mall-section-container {
padding: 50px;
background: #fff;
height: 600px;
}
</style>
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