zhenghuang
/
bsdgy-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/feature/20200514_version' into 0605

Browse Source 
# Conflicts:
#	src/pages/Home.vue
#	src/pages/activity/useTable.vue
feature_0521
root 6 years ago
parent 5e47dd1240 3594ca1288
commit 98addca3fb
5 changed files with 409 additions and 407 deletions
Show Stats Download Patch File Download Diff File

79
src/pages/Home.vue
Unescape Escape View File

@ -1,52 +1,33 @@
<template>
<div class="layout">
<Layout :style="{minHeight: '100vh'}">
<Sider collapsible
:collapsed-width="78"
v-model="isCollapsed"
:hide-trigger="true">
<Sider collapsible :collapsed-width="78" v-model="isCollapsed" :hide-trigger="true" >
<div style="margin: 40px 0 20px 10px;font-weight: bold;font-size: 30px;color: #ffffff;">
<Poptip placement="bottom-start"
width="200"
:offset="-8">
<img src="../../static/img/avatar.png"
style="width: 32px;vertical-align: middle;cursor: pointer" />
<Poptip placement="bottom-start" width="200" :offset="-8">
<img src="../../static/img/avatar.png" style="width: 32px;vertical-align: middle;cursor: pointer"/>
<div slot="content">
<div style="cursor: pointer;"
@click="logoutClick">
<div style="cursor: pointer;" @click="logoutClick">
<span class="logout-span">退出登录</span>
<img class="logout-img"
src="../../static/img/logout.png" />
<img class="logout-img" src="../../static/img/logout.png"/>
</div>
</div>
</Poptip>
<span class="project-title">优客后台管理</span>
</div>
<Menu ref="menu"
:active-name="selectedItemName"
:open-names="openName"
theme="dark"
width="auto"
@on-select="onSelectLister"
:accordion="true">
<MenuItem v-if="roleCode === 'GLY-ADMIN' || roleCode === 'DG-YUNYING' || roleCode === 'GL-YUNYING'"
:name="0"
to="/customer/view">
<Menu ref="menu" :active-name="selectedItemName" :open-names="openName" theme="dark" width="auto"
@on-select="onSelectLister" :accordion="true">
<MenuItem v-if="roleCode === 'GLY-ADMIN' || roleCode === 'DG-YUNYING' || roleCode === 'GL-YUNYING'" :name="0" to="/customer/view">
<Icon type="ios-paper"/>
<span style="margin-left: 7px">首页</span>
</MenuItem>
<Submenu :name="item.id"
v-for="item in onePermissionList"
:key="item.id">
<Submenu :name="item.id" v-for="item in onePermissionList" :key="item.id">
<template slot="title">
<Icon type="ios-paper"/>
{{item.name}}
</template>
<MenuItem :name="cItem.id"
:to="cItem.resource"
v-for="cItem in item.subMenuList"
<MenuItem :name="cItem.id" :to="cItem.resource" v-for="cItem in item.subMenuList"
:key="cItem.id">
{{cItem.name}}
</MenuItem>
@ -57,8 +38,7 @@
<!-- <Header :style="{background: '#fff', boxShadow: '0 2px 3px 2px rgba(0,0,0,.1)'}"></Header>-->
<Content :style="{padding: '0 16px 16px'}">
<Breadcrumb :style="{margin: '16px 0'}">
<BreadcrumbItem><span style="cursor: pointer"
@click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
<BreadcrumbItem><span style="cursor: pointer" @click="breadcrumbClick">{{selectedMenu}}</span></BreadcrumbItem>
<BreadcrumbItem>{{selectedSubMenu}}</BreadcrumbItem>
</Breadcrumb>
<Card>
@ -300,12 +280,29 @@ export default {
},
//账户管理页面回调方法
callBack (item) {
let that = this;
this.selectedMenu = "设置管理";
this.selectedSubMenu = "账户管理";
this.selectedItemName = this.onePermissionList[2].subMenuList[0].id;
this.$router.push({ path: '/account/manager', query: item });
callBack(val) {
this.selectedMenu = val.selectedMenu;
this.selectedSubMenu = val.selectedSubMenu;
let url = "";
for (let i = 0; i < this.onePermissionList.length; i++) {
let item = this.onePermissionList[i];
for (let k = 0; k < item.subMenuList.length; k++) {
let cItem = item.subMenuList[k];
if(cItem.name === val.selectedSubMenu){
this.selectedItemName = cItem.id;
url = cItem.resource;
}
}
}
if(val.type === 1){
this.$router.push({path: url,query:val.data});
}else{
this.$router.push(url);
}
},
setHeader(data){
let that = this;
@ -316,15 +313,8 @@ export default {
},
//手动设置面包屑
setMenuName: function (menu1, menu2) {
console.log("setMenu", arguments)
this.selectedMenu = menu1;
this.selectedSubMenu = menu2;
let parentId;
let subId;
this.onePermissionList.forEach(item => {
if (item.name == menu1) parentId = item.id
})
this.$forceUpdate()
},
//面包屑点击跳转
breadcrumbClick: function () {
@ -345,6 +335,7 @@ export default {
}
</script>
<style scoped>
.layout-con {
height: 100%;
width: 100%;

3
src/pages/activity/useActivityStepOne.vue
Unescape Escape View File

@ -175,7 +175,8 @@ export default {
.text {
position: relative;
left: 100px;
left: 50px;
line-height: 44px;
}
.inputClass {

64
src/pages/activity/useTable.vue
Unescape Escape View File

@ -1,50 +1,46 @@
<template>
<div class="use_box">
<Modal :scrollable="false"
<Modal
:scrollable="false"
v-model="showUse"
title="使用活动"
@on-cancel="cancel"
:loading="true"
width="70%"
@on-visible-change="visibleChange">
<Steps style="padding: 40px;"
:current="currentStep">
@on-visible-change="visibleChange"
>
<Steps style="padding: 40px;" :current="currentStep">
<Step title="基本信息"></Step>
<Step :title="isModify ? '修改零售公司' : '选择零售公司'"
content></Step>
<Step :title="isModify ? '修改店铺' : '选择店铺'"
content></Step>
<Step title="确认信息"
content></Step>
<Step :title="isModify ? '修改零售公司' : '选择零售公司'" content></Step>
<Step :title="isModify ? '修改店铺' : '选择店铺'" content></Step>
<Step title="确认信息" content></Step>
</Steps>
<useActivityStepOne :schedule="schedule"
:isModify="isModify"
v-if="currentStep == 0 && show"></useActivityStepOne>
<useActivityStepTwo :schedule="schedule"
:isModify="isModify"
v-if="currentStep == 1"></useActivityStepTwo>
<useActivityStepThree :schedule="schedule"
:isModify="isModify"
v-if="currentStep == 2"></useActivityStepThree>
<useActivityStepFoure :schedule="schedule"
:isModify="isModify"
v-if="currentStep == 3"></useActivityStepFoure>
<useActivityStepOne :schedule="schedule" :isModify="isModify" v-if="currentStep == 0 && show"></useActivityStepOne>
<useActivityStepTwo :schedule="schedule" :isModify="isModify" v-if="currentStep == 1"></useActivityStepTwo>
<useActivityStepThree :schedule="schedule" :isModify="isModify" v-if="currentStep == 2"></useActivityStepThree>
<useActivityStepFoure :schedule="schedule" :isModify="isModify" v-if="currentStep == 3"></useActivityStepFoure>
<div slot="footer">
<Button v-if="currentStep !== 0"
<Button
v-if="currentStep !== 0"
type="primary"
shape="circle"
:loading="modal_loading"
@click="back">上一步</Button>
<Button v-if="currentStep !== 3"
@click="back"
>上一步</Button>
<Button
v-if="currentStep !== 3"
type="primary"
shape="circle"
:loading="modal_loading"
@click="next">下一步</Button>
<Button v-if="currentStep == 3"
@click="next"
>下一步</Button>
<Button
v-if="currentStep == 3"
type="primary"
shape="circle"
:loading="modal_loading"
@click="finish">完成</Button>
@click="finish"
>完成</Button>
</div>
</Modal>
</div>
@ -95,6 +91,7 @@ export default {
}
},
created() {
this.setMenuName("活动管理", "活动计划");
},
mounted() {},
methods: {
@ -160,11 +157,18 @@ export default {
ActivityManager.saveActivityData(store.getters.useData, function(data) {
store.commit("RSET_useData");
that.$emit("doShow", false);
that.setMenuName("活动管理", "活动计划");
that.$router.push("/activity/plan");
// that.$router.push("/activity/plan");
that.currentStep = 0;
that.modal_loading = false;
that.showUse = false;
let request = {
selectedMenu: "活动管理",
selectedSubMenu: "活动计划",
data: {},
type: 2
};
that.bus.$emit("callBack",request);
});
}
}

8
src/pages/user/RoleManager.vue
Unescape Escape View File

@ -367,7 +367,13 @@
goToAccManagerPage: function (item) {
// this.$router.push({path: '/account/manager',query:item});
// 回调首页更新菜单栏选择
this.bus.$emit("callBack",item);
let request = {
selectedMenu: "设置管理",
selectedSubMenu: "账户管理",
data: item,
type: 1
};
this.bus.$emit("callBack",request);
},
//选中角色
selectRole: function (id) {

2
src/services/CommonHttp.js
Unescape Escape View File

@ -7,7 +7,7 @@ import commonUtils from '../utils/Common'
// http://mf.kiisoo.com:58080/
// axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/';
axios.defaults.baseURL =
process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
process.env.NODE_ENV === 'production' ? 'https://wxtk.bsdits.com/kiisoo-ic/' : '/kiisoo-ic'
//响应时间
axios.defaults.timeout = 120000

Write Preview
Loading…
Cancel
Save