wangyifang
/
yunyubang-supplier-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
master
lion 3 years ago
parent ef0137c3be
commit 9b1455c22d
5 changed files with 338 additions and 146 deletions
Show Stats Download Patch File Download Diff File

17
src/api/notice/index.js
Unescape View File

@ -0,0 +1,17 @@
import request from "@/utils/request";
export function getNotice(params){
return request({
url:'/api/merchant/home/get-notice',
method:'get',
params
})
}
export function toggleRead(data){
return request({
url:'/api/admin/merchant/toggle-read',
method:"post",
data
})
}

450
src/layout/components/Navbar.vue
Unescape View File

@ -1,140 +1,312 @@
<template>
<div class="navbar">
<hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
<breadcrumb class="breadcrumb-container" />
<div class="right-menu">
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img src="../../assets/face.jpg" class="user-avatar">
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link to="/">
<el-dropdown-item>
系统首页
</el-dropdown-item>
</router-link>
<router-link to="/info/password">
<el-dropdown-item>
个人信息
</el-dropdown-item>
</router-link>
<el-dropdown-item divided @click.native="logout">
<span style="display:block;">退出</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
</div>
</template>
<script>
import {
mapGetters
} from 'vuex'
import Breadcrumb from '@/components/Breadcrumb'
import Hamburger from '@/components/Hamburger'
export default {
components: {
Breadcrumb,
Hamburger
},
computed: {
...mapGetters([
'sidebar',
'avatar'
])
},
methods: {
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
async logout() {
await this.$store.dispatch('user/logout')
this.$router.push(`/login?redirect=${this.$route.fullPath}`)
}
}
}
</script>
<style lang="scss" scoped>
.navbar {
height: 50px;
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
.hamburger-container {
line-height: 46px;
height: 100%;
float: left;
cursor: pointer;
transition: background .3s;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
}
}
.breadcrumb-container {
float: left;
}
.right-menu {
float: right;
height: 100%;
line-height: 50px;
&:focus {
outline: none;
}
.right-menu-item {
display: inline-block;
padding: 0 8px;
height: 100%;
font-size: 18px;
color: #5a5e66;
vertical-align: text-bottom;
&.hover-effect {
cursor: pointer;
transition: background .3s;
&:hover {
background: rgba(0, 0, 0, .025)
}
}
}
.avatar-container {
margin-right: 30px;
.avatar-wrapper {
margin-top: 5px;
position: relative;
.user-avatar {
cursor: pointer;
width: 40px;
height: 40px;
border-radius: 10px;
}
.el-icon-caret-bottom {
cursor: pointer;
position: absolute;
right: -20px;
top: 25px;
font-size: 12px;
}
}
}
}
}
<template>
<div class="navbar">
<hamburger
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb class="breadcrumb-container" />
<div class="right-menu">
<el-dropdown
class="message-container"
trigger="click"
:hide-on-click="false"
>
<div class="message-wrapper">
<i class="el-icon-chat-dot-square" />
<span>消息中心</span>
</div>
<template v-slot:dropdown>
<el-dropdown-menu class="message-dropdown">
<!-- <el-dropdown-item>
<Button
:ghost="messageStatus !== 2"
type="error"
size="small"
shape="circle"
icon="ios-close"
@click.native="messageStatus = 2,getNotice()"
>未读</Button
>
<Button
:ghost="messageStatus !== 1"
type="success"
size="small"
shape="circle"
icon="ios-checkmark"
style="margin-left: 10px"
@click.native="messageStatus = 1,getNotice()"
>已读</Button
>
</el-dropdown-item> -->
<template v-if="noticeData.length > 0">
<template v-for="(item, index) in noticeData">
<el-dropdown-item :divided="!index">
<div style="display: flex; align-items: center">
<div v-for="(value, key) in item.data">
{{item.created_at}} {{ key }} : {{ value }}
</div>
<Button
style="margin-left: 10px;"
size="small"
:type="item.read_at ? 'success' : 'primary'"
:icon="item.read_at ? 'md-checkmark' : 'ios-create-outline'"
@click="toggleMessage(item)"
>{{ item.read_at ? "已读" : "标为已读" }}</Button
>
</div>
</el-dropdown-item>
</template>
</template>
<template v-else>
<div style="min-width:200px;text-align: center;color: rgb(140,140,140);padding: 10px 0;">暂无通知</div>
</template>
</el-dropdown-menu>
</template>
</el-dropdown>
<el-dropdown class="avatar-container" trigger="click">
<div class="avatar-wrapper">
<img src="../../assets/face.jpg" class="user-avatar" />
<i class="el-icon-caret-bottom" />
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
<router-link to="/">
<el-dropdown-item> 系统首页 </el-dropdown-item>
</router-link>
<el-dropdown-item divided @click.native="logout">
<span style="display: block">退出</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
<!-- <el-drawer-->
<!-- size="36%"-->
<!-- append-to-body-->
<!-- :visible.sync="showDrawer"-->
<!-- direction="rtl">-->
<!-- <Table size="small" :loading="isLoading" :columns="columns" :data="noticeData"></Table>-->
<!-- </el-drawer>-->
</div>
</template>
<script>
import { mapGetters } from "vuex";
import Breadcrumb from "@/components/Breadcrumb";
import Hamburger from "@/components/Hamburger";
import { getNotice, toggleRead } from "@/api/notice";
export default {
components: {
Breadcrumb,
Hamburger,
},
data() {
return {
// showDrawer:false,
// // messageType:'',
// message: {
// 余额不足: "MerchantBalance",
// 用户取消单: "OrderItemMemberCancel",
// 分发48小时未接收退回: "OrderItemMerchantAutoRecover",
// 商家取消订单: "OrderItemMerchantCancel",
// 商家退回订单: "OrderItemMerchantReturn",
// },
//isLoading:false,
noticeData: [],
messageStatus: 2,
// columns:[
// {
// width: 160,
// title:"阅读时间",
// key:"read_at"
// },
// {
// title:"内容",
// render:(h,{row,column,index}) => {
// let getContent = () => {
// let keys = []
// if(row?.data && typeof row.data === 'object') keys = Object.keys(row?.data)
// return keys.map(item => {
// return h('span',{},`${item}:${row.data[item]}`)
// })
// console.log(keys)
// }
// return h('div',{},getContent())
// }
// },
// {
// title:"操作",
// width:120,
// render:(h,{row,column,index}) => {
// return h('Button',{
// props:row?.read_at ? {
// size:"small",
// type:'success',
// icon:'md-checkmark'
// } : {
// size:"small",
// type:'primary',
// icon:'ios-create-outline'
// },
// on:{
// ['click']:async () => {
// if(row?.read_at) return
//
// const res = await toggleRead({
// id:row.id
// })
// this.$message({
// type:'success',
// message:res?.msg || "成功"
// })
// this.messageClick(this.messageType)
// }
// }
// },row?.read_at ? '已读' : '标为已读')
// }
// },
// ]
};
},
computed: {
...mapGetters(["sidebar", "avatar"]),
},
methods: {
toggleMessage(item){
if(item.read_at) return
toggleRead({
id:item.id
}).then(res => {
this.$message({
type:'success',
message:res?.msg || "成功"
})
this.getNotice()
})
},
async getNotice() {
let res = await getNotice({
// read_state: this.messageStatus,
type:"MerchantBalance"
});
console.log(res);
this.noticeData = res.data;
},
toggleSideBar() {
this.$store.dispatch("app/toggleSideBar");
},
async logout() {
await this.$store.dispatch("user/logout");
this.$router.push(`/login?redirect=${this.$route.fullPath}`);
},
},
mounted() {
this.getNotice();
},
};
</script>
<style lang="scss" scoped>
.navbar {
height: 50px;
overflow: hidden;
position: relative;
background: #fff;
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container {
line-height: 46px;
height: 100%;
float: left;
cursor: pointer;
transition: background 0.3s;
-webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, 0.025);
}
}
.breadcrumb-container {
float: left;
}
.right-menu {
display: flex;
justify-content: flex-end;
height: 100%;
line-height: 50px;
&:focus {
outline: none;
}
.right-menu-item {
display: inline-block;
padding: 0 8px;
height: 100%;
font-size: 18px;
color: #5a5e66;
vertical-align: text-bottom;
&.hover-effect {
cursor: pointer;
transition: background 0.3s;
&:hover {
background: rgba(0, 0, 0, 0.025);
}
}
}
.avatar-container {
margin-right: 30px;
.avatar-wrapper {
margin-top: 5px;
position: relative;
.user-avatar {
cursor: pointer;
width: 40px;
height: 40px;
border-radius: 10px;
}
.el-icon-caret-bottom {
cursor: pointer;
position: absolute;
right: -20px;
top: 25px;
font-size: 12px;
}
}
}
.message-container {
margin-right: 20px;
.message-wrapper {
height: 100%;
padding: 0 6px;
& > i {
font-weight: 600;
}
& > span {
font-weight: 600;
padding-left: 6px;
}
}
}
}
}
</style>

7
src/views/dashboard/index.vue
Unescape View File

@ -111,8 +111,11 @@
page:1,
rows:10,
show_history:0,
state:'pending',
keyword:''
state:'assigned',
keyword:'',
not_state:["pending"],
sort_name:"updated_at",
sort_type:"desc"
},
total:0,
data:[],

4
src/views/finance/index.vue
Unescape View File

@ -90,7 +90,7 @@ export default {
// sortable:false
// },
{
label:'相关子订单号',
label:'订单编号',
prop:'order.serial',
sortable: false
}
@ -117,7 +117,7 @@ export default {
let map = new Map([
['balance','余额'],
['recharges','充值'],
['refunds','退款'],
['refunds','扣款'],
['fees','佣金']
])
return map.get(key)

6
src/views/order/index.vue
Unescape View File

@ -6,10 +6,10 @@
<div slot="content"></div>
<slot>
<div style="display: flex;align-items: center;">
<div style="margin-right: 10px;">是否包含历史记录</div>
<!-- <div style="margin-right: 10px;">是否包含历史记录</div>
<el-switch v-model="select.show_history" :active-value="1" :inactive-value="0" style="margin-right: 10px;"></el-switch>
-->
<div style="margin-right: 10px;">订单状态</div>
<el-select size="mini" placeholder="请选择状态" v-model="select.state" style="width: 140px;margin-right: 10px;">
@ -70,7 +70,7 @@ export default {
page:1,
rows:10,
show_history:0,
state:'',
state:'finished',
keyword:'',
not_state:["pending"],
sort_name:"updated_at",

Write Preview
Loading…
Cancel
Save