Skip to content

H
haoban-3
Commit 7b16ca27 by 陈羽
Options

update: 修改样式和修改路由

parent 2fb8b315
Showing with 30 additions and 44 deletions
src/components/common/gic-select-group-auth.vue
......@@ -9,7 +9,10 @@
<!--
选择门店分组组件：
<gic-select-group
:selectData="selectData"
:brandId="enterpriseId"
width="287px"
:authMerchant="true"
:selectData="partForm.storeGroup"
@checkGroupIds="checkGroupIds">
</gic-select-group>
......@@ -66,7 +69,7 @@ export default {
width: {
type: String,
default() {
return '357px';
return '287px';
}
},
selectData: {
......@@ -324,6 +327,6 @@ export default {
}
}
.authMerchant {
width: 323px;
width: 253px;
}
</style>
src/router/index.js
......@@ -37,8 +37,7 @@ if (window.sessionStorage.getItem('token')) {
/* eslint-disable */
store.commit(types.LOGIN, window.sessionStorage.getItem('token'));
}
export const constantRouterMap = [
{
export const constantRouterMap = [{
path: '/',
name: '/',
redirect: 'login'
......@@ -65,8 +64,7 @@ export const constantRouterMap = [
name: '通讯录',
redirect: 'contactsList',
component: _import('business', 'index'),
children: [
{
children: [{
path: '/contactsList',
name: '通讯录',
component: _import('business', 'contacts')
......@@ -110,8 +108,7 @@ export const constantRouterMap = [
name: '企业设置',
redirect: 'enterpriseSet',
component: _import('enterprise', 'index'),
children: [
{
children: [{
path: '/enterpriseSet',
name: '企业信息',
component: _import('enterprise', 'enterpriseSet')
......@@ -144,8 +141,7 @@ export const constantRouterMap = [
name: '销售线索',
redirect: 'storeList',
component: _import('salesleads', 'index'),
children: [
{
children: [{
path: '/storeList',
name: '门店视图',
component: _import('salesleads', 'storeList'),
......@@ -156,7 +152,7 @@ export const constantRouterMap = [
component: _import('salesleads', 'storeDetail')
},
{
path: '/taskList',
path: '/salesTaskList',
name: '计划视图',
component: _import('salesleads', 'taskList'),
},
......@@ -173,8 +169,7 @@ export const constantRouterMap = [
name: '企业数据',
redirect: 'enterpriseUseData',
component: _import('enterpriseData', 'index'),
children: [
{
children: [{
path: '/enterpriseUseData',
name: '好办使用详情',
component: _import('enterpriseData', 'enterpriseUseData')
......@@ -203,13 +198,11 @@ export const constantRouterMap = [
name: '溢出门店',
redirect: 'unreview',
component: _import('overstore', 'index'),
children: [
{
children: [{
path: '/overStoreList',
name: '溢出门店',
component: _import('overstore', 'overStoreList')
}
]
}]
},
{
......@@ -230,8 +223,7 @@ export const constantRouterMap = [
name: '我的顾客的',
redirect: '/memberShowSet',
component: _import('apps/customerApp', 'index'),
children: [
{
children: [{
path: '/memberShowSet',
name: '会员展示设置',
component: _import('apps/customerApp', 'memberShowSet')
......@@ -273,8 +265,7 @@ export const constantRouterMap = [
name: '云日报',
redirect: '/dailyRecord',
component: _import('apps/cloudDaily', 'index'),
children: [
{
children: [{
path: '/dailyRecord',
name: '云日报记录',
component: _import('apps/cloudDaily', 'dailyRecord')
......@@ -316,8 +307,7 @@ export const constantRouterMap = [
name: '话务任务',
redirect: '/taskRecord',
component: _import('apps/trafficTask', 'index'),
children: [
{
children: [{
path: '/taskRecord',
name: '话务任务记录',
component: _import('apps/trafficTask', 'taskRecord')
......@@ -369,8 +359,7 @@ export const constantRouterMap = [
name: '指标管理',
redirect: '/monthList',
component: _import('apps/quota', 'index'),
children: [
{
children: [{
path: '/monthList',
name: '月指标列表',
component: _import('apps/quota', 'monthList')
......@@ -413,8 +402,7 @@ export const constantRouterMap = [
name: '卡券赠送',
redirect: '/cardList',
component: _import('apps/card', 'index'),
children: [
{
children: [{
path: '/cardList',
name: '卡券列表',
component: _import('apps/card', 'cardList')
......@@ -436,8 +424,7 @@ export const constantRouterMap = [
name: '内购券',
redirect: '/cardTemplate',
component: _import('apps/protectCard', 'index'),
children: [
{
children: [{
path: '/cardTemplate',
name: '卡券模板',
component: _import('apps/protectCard', 'cardTemplate')
......@@ -485,13 +472,11 @@ export const constantRouterMap = [
name: '商品中心',
redirect: '/goodsShowSet',
component: _import('apps/shoppingCenter', 'index'),
children: [
{
children: [{
path: '/goodsShowSet',
name: '商品展示设置',
component: _import('apps/shoppingCenter', 'goodsShowSet')
}
]
}]
},
// 订单评价
{
......@@ -499,13 +484,11 @@ export const constantRouterMap = [
name: '订单评价设置',
redirect: '/evaluate-set',
component: _import('apps/order-evaluate', 'index'),
children: [
{
children: [{
path: '/evaluate-set',
name: '订单评价',
component: _import('apps/order-evaluate', 'evaluate-set')
}
]
}]
}
]
},
......@@ -515,8 +498,7 @@ export const constantRouterMap = [
name: '审核中心',
redirect: 'unreview',
component: _import('reviewCenter', 'index'),
children: [
{
children: [{
path: '/reviewed',
name: '已审核',
component: _import('reviewCenter', 'reviewed')
......
src/views/business/authMerchant-form.vue
......@@ -26,7 +26,7 @@
<el-tooltip slot="label" class="item" effect="dark" :open-delay="200" placement="top-start" content="输入品牌/商户的企业名称，只支持精确搜素。">
<span style="cursor: pointer;padding-bottom: 2px; border-bottom: 1px dashed #2F54EB;" class="font-14 color-606266">选择商户</span>
</el-tooltip>
<el-popover placement="bottom" title="" :disabled="type === 'edit'" trigger="click" popper-class="company-select-pop" width="253">
<el-popover placement="bottom" title="" :disabled="type === 'edit'" trigger="click" popper-class="authMerchant-select-pop" width="253">
<div class="company-select">
<div class="el-scrollbar define-search-select">
<div class="el-select-dropdown__wrap el-scrollbar__wrap" style="margin-bottom: -5px; margin-right: -5px;">
......@@ -447,4 +447,7 @@ export default {
.auth-merchant-add .el-select-dropdown__item {
height: 50px;
}
.authMerchant-select-pop {
left: 168px !important;
}
</style>
src/views/salesleads/index.vue
......@@ -116,7 +116,7 @@ export default {
that.changeRoute(`/storeList`);
break;
case '2':
that.changeRoute(`/taskList`);
that.changeRoute(`/salesTaskList`);
break;
case '3':
that.changeRoute(`/salesleadsSet`);
......
src/views/salesleads/storeDetail.vue
......@@ -235,9 +235,7 @@ export default {
let para = {
...that.pageParams,
enterpriseId: localStorage.getItem('userInfoBrandId'),
// storeId: 'ff80808175acbdbd0175aff217960011'
storeId: that.$route.params.id
// (ecmPlanId )
};
if (this.$route.query.ecmPlanId) {
para.ecmPlanId = this.$route.query.ecmPlanId;
......
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