Skip to content

Y
ybf
Commit 69e60f0c authored by xulili's avatar xulili
Browse files
Options

我的消息

parent f309e747
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 309 deletions
wx_application/src/utils/utils.Request.aApi.js
View file @ 69e60f0c
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
*/ */
import requestAPI from '@/utils/bRequest' import requestAPI from '@/utils/bRequest'
export function getMessageByClerkId(params) { export function getMessageByUserId(params) {
return requestAPI({ return requestAPI({
url: '/admin/auth/marketing/getMessageByClerkId', url: '/admin/auth/marketing/getMessageByUserId',
method: 'get', method: 'get',
params params
}) })
} }
export function getClerkInfoBySupervisorId(params) { export function getClerkInfoBySupervisorUserId(params) {
return requestAPI({ return requestAPI({
url: '/admin/auth/addressbook/clerk/getClerkInfoBySupervisorId', url: '/admin/auth/addressbook/clerk/getClerkInfoBySupervisorUserId',
method: 'get', method: 'get',
params params
}) })
......
wx_application/src/views/mainSale/active/main/index.vue
View file @ 69e60f0c
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- <div class="menu"> <!-- <div class="menu">
<img class="menu-logo" :src="test.menuInfo.icon['1']" /> <img class="menu-logo" :src="test.menuInfo.icon['1']" />
<div class="menu-text">优惠券核销</div> <div class="menu-text">优惠券核销</div>
</div> --> </div> -->
<div class="menu" @click="menu02Click"> <div class="menu" @click="menu02Click">
<img class="menu-logo" :src="test.menuInfo.icon['2']" /> <img class="menu-logo" :src="test.menuInfo.icon['2']" />
<div class="menu-text">任务列表</div> <div class="menu-text">任务列表</div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div class="menu" @click="menu04Click"> <div class="menu" @click="menu04Click">
<img class="menu-logo" :src="test.menuInfo.icon['4']" /> <img class="menu-logo" :src="test.menuInfo.icon['4']" />
<div class="menu-text">专柜维护</div> <div class="menu-text">专柜维护</div>
</div> </div>
<div class="menu" @click="menu06Click"> <div class="menu" @click="menu06Click">
<img class="menu-logo" :src="test.menuInfo.icon['6']" /> <img class="menu-logo" :src="test.menuInfo.icon['6']" />
<div class="menu-text">商品管理</div> <div class="menu-text">商品管理</div>
......
wx_application/src/views/mainSale/me/main/index.vue
View file @ 69e60f0c
<template> <template>
<div class="main"> <div class="main">
<div class="backgrounds"> <div class="backgrounds">
<img class="background-img" :src="cache.icon.testImg" /> <img class="background-img" :src="avatarUrl"/>
</div> </div>
<div class="infos"> <div class="infos">
<div class="info"> <div class="info">
<div class="info-logos"> <div class="info-logos">
<img class="info-logo" :src="cache.icon.testImg" /> <img class="info-logo" :src="cache.icon.testImg"/>
</div>
<div class="info-msgs">
<div class="msg">
<div class="msg-title">未完成任务</div>
<div class="msg-num">
<div class="msg-num-red">15</div>
</div>
</div>
<div class="msg msg-latest">
<div class="msg-title">未完成任务</div>
<div class="msg-num">
<div class="msg-num-blue">5</div>
</div>
</div>
</div>
</div>
</div> </div>
<div class="info-msgs"> <div class="lists">
<div class="msg"> <!-- <div class="list">
<div class="msg-title">未完成任务</div> <div class="list-title">我的客户</div>
<div class="msg-num"> <img class="list-icon" :src="cache.icon.arrowRightDark" />
<div class="msg-num-red">15</div> </div> -->
<div class="list" @click="listTaskClick">
<div class="list-title">任务列表</div>
<img class="list-icon" :src="cache.icon.arrowRightDark"/>
</div> </div>
</div> <div class="list">
<div class="msg msg-latest"> <div class="list-title">我的收益</div>
<div class="msg-title">未完成任务</div> <img class="list-icon" :src="cache.icon.arrowRightDark"/>
<div class="msg-num"> </div>
<div class="msg-num-blue">5</div> <div class="list list-latest" @click="handleDetail('message')">
<div class="list-title">我的消息</div>
<img class="list-icon" :src="cache.icon.arrowRightDark"/>
</div> </div>
</div>
</div> </div>
</div>
</div>
<div class="lists">
<!-- <div class="list">
<div class="list-title">我的客户</div>
<img class="list-icon" :src="cache.icon.arrowRightDark" />
</div> -->
<div class="list" @click="listTaskClick">
<div class="list-title">任务列表</div>
<img class="list-icon" :src="cache.icon.arrowRightDark" />
</div>
<div class="list list-latest">
<div class="list-title">我的收益</div>
<img class="list-icon" :src="cache.icon.arrowRightDark" />
</div>
<div class="list list-latest" @click="handleDetail('message')">
<div class="list-title">我的消息</div>
<img class="list-icon" :src="cache.icon.arrowRightDark"/>
</div>
</div>
<div class="main-menuBar"> <div class="main-menuBar">
<div class="menuBar-menu" @click="menuBarClick('MainSale')"> <div class="menuBar-menu" @click="menuBarClick('MainSale')">
<img class="menuBar-icon" :src="menuBarInfo.icon.now['1']" /> <img class="menuBar-icon" :src="menuBarInfo.icon.now['1']"/>
<div class="menuBar-title">活动</div> <div class="menuBar-title">活动</div>
</div> </div>
<div class="menuBar-menu" @click="menuCase()"> <div class="menuBar-menu" @click="menuCase()">
<img class="menuBar-icon" :src="menuBarInfo.icon.now['2']" /> <img class="menuBar-icon" :src="menuBarInfo.icon.now['2']"/>
<div class="menuBar-title">案例</div> <div class="menuBar-title">案例</div>
</div> </div>
<div class="menuBar-menu" @click="menuProfit()"> <div class="menuBar-menu" @click="menuProfit()">
<img class="menuBar-icon" :src="menuBarInfo.icon.now['3']" /> <img class="menuBar-icon" :src="menuBarInfo.icon.now['3']"/>
<div class="menuBar-title menuBar-title-ac">收益</div> <div class="menuBar-title menuBar-title-ac">收益</div>
</div> </div>
<div class="menuBar-menu" @click="menuTask()"> <div class="menuBar-menu" @click="menuTask()">
<img class="menuBar-icon" :src="menuBarInfo.icon.now['4']" /> <img class="menuBar-icon" :src="menuBarInfo.icon.now['4']"/>
<div class="menuBar-title">任务</div> <div class="menuBar-title">任务</div>
</div> </div>
<div class="menuBar-menu" @click="menuBarClick('Me')"> <div class="menuBar-menu" @click="menuBarClick('Me')">
<img class="menuBar-icon" :src="menuBarInfo.icon.now['5']" /> <img class="menuBar-icon" :src="menuBarInfo.icon.now['5']"/>
<div class="menuBar-title">我的</div> <div class="menuBar-title">我的</div>
</div> </div>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import {configWx, getUserInfo} from "@/utils/aCommon" import {configWx, getUserInfo} from "@/utils/aCommon"
import { getUserInfoByUserId } from "@/api/sidebar/voucher"; import {getUserInfoByUserId} from "@/api/sidebar/voucher";
import axios from "axios" import axios from "axios"
import { editStore } from "@/api/sidebar/voucher"; import {editStore} from "@/api/sidebar/voucher";
export default { export default {
name: "me", name: "me",
data() { data() {
return { return {
avatarUrl: '',
cache: { cache: {
icon: { icon: {
testImg: "/mainSale/test-city.png", testImg: "/mainSale/test-city.png",
...@@ -127,239 +129,261 @@ ...@@ -127,239 +129,261 @@
userInfoResOld: "", userInfoResOld: "",
userInfoResNew: "" userInfoResNew: ""
}, },
}; };
},
mounted() {
this.checkNowMenuBar()
},
methods: {
checkNowMenuBar() {
let inData = "5";
this.menuBarInfo.icon.now = this.menuBarInfo.icon.ua;
this.menuBarInfo.icon.now[inData] = this.menuBarInfo.icon.ac[inData];
},
menuBarClick(inData) {
this.$router.push(inData);
},
listTaskClick() {
this.$router.push("Task");
}, },
menuProfit() { mounted() {
this.$router.push({ path: "/profitList" });
}, this.avatarUrl = sessionStorage.getItem("avatar")
menuTask() { this.checkNowMenuBar()
this.$router.push({ path: "/taskList" });
}, },
menuCase() { methods: {
this.$router.push({ path: "/case" }); checkNowMenuBar() {
} let inData = "5";
this.menuBarInfo.icon.now = this.menuBarInfo.icon.ua;
this.menuBarInfo.icon.now[inData] = this.menuBarInfo.icon.ac[inData];
},
menuBarClick(inData) {
this.$router.push(inData);
},
listTaskClick() {
this.$router.push("Task");
},
menuProfit() {
this.$router.push({path: "/profitList"});
},
menuTask() {
this.$router.push({path: "/taskList"});
},
menuCase() {
this.$router.push({path: "/case"});
}
} }
}; };
</script> </script>
<style scoped> <style scoped>
.main { .main {
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background-color: rgba(248, 248, 248, 1); background-color: rgba(248, 248, 248, 1);
width: 100%; width: 100%;
height: auto; height: auto;
min-height: 100%; min-height: 100%;
/*padding: ;*/ /*padding: ;*/
padding-bottom: 94px; padding-bottom: 94px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: start; justify-content: start;
overflow: auto; overflow: auto;
} }
.backgrounds {
/*border: 1px solid dodgerblue;*/ .backgrounds {
width: 100%; /*border: 1px solid dodgerblue;*/
height: 124px; width: 100%;
overflow: hidden; height: 124px;
background-color: rgba(10, 10, 10, 0.5); overflow: hidden;
} background-color: rgba(10, 10, 10, 0.5);
.background-img { }
width: 100%;
height: 100%; .background-img {
object-fit: cover; width: 100%;
filter: blur(2px); height: 100%;
} object-fit: cover;
filter: blur(2px);
.infos { }
/*border: 1px solid orange;*/
width: 100%; .infos {
height: 44px; /*border: 1px solid orange;*/
margin-top: 12px; width: 100%;
} height: 44px;
.info { margin-top: 12px;
/*border: 1px solid red;*/ }
width: 100%;
height: 148px; .info {
padding: 0px 16px; /*border: 1px solid red;*/
width: 100%;
position: relative; height: 148px;
bottom: 106px; padding: 0px 16px;
display: flex; position: relative;
flex-direction: column; bottom: 106px;
justify-content: space-between;
align-items: start; display: flex;
} flex-direction: column;
.info-logos { justify-content: space-between;
/*background-color: #96CEDC;*/ align-items: start;
width: 100%; }
height: 48px;
} .info-logos {
.info-logo { /*background-color: #96CEDC;*/
width: 48px; width: 100%;
height: 48px; height: 48px;
border-radius: 50%; }
border: 1px solid white;
object-fit: cover; .info-logo {
} width: 48px;
.info-msgs { height: 48px;
width: 100%; border-radius: 50%;
height: 80px; border: 1px solid white;
margin-bottom: 12px; object-fit: cover;
background-color: rgba(255, 255, 255, 1); }
border-radius: 2px;
box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1); .info-msgs {
padding: 14px 19px; width: 100%;
height: 80px;
display: flex; margin-bottom: 12px;
flex-direction: row; background-color: rgba(255, 255, 255, 1);
justify-content: center; border-radius: 2px;
align-items: center; box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1);
} padding: 14px 19px;
.msg {
width: 50%; display: flex;
height: 100%; flex-direction: row;
/*border: 1px solid red;*/ justify-content: center;
border-right: 1px solid rgba(238, 238, 238, 1); align-items: center;
}
display: flex;
flex-direction: column; .msg {
justify-content: space-between; width: 50%;
align-items: flex-start; height: 100%;
} /*border: 1px solid red;*/
.msg-latest { border-right: 1px solid rgba(238, 238, 238, 1);
border-right: none;
align-items: flex-end; display: flex;
} flex-direction: column;
.msg-title { justify-content: space-between;
width: 120px; align-items: flex-start;
height: 14px; }
font-size: 12px;
font-weight: bold; .msg-latest {
line-height: 14px; border-right: none;
color: rgba(45, 71, 106, 1); align-items: flex-end;
text-align: center; }
}
.msg-num { .msg-title {
width: 120px; width: 120px;
height: 32px; height: 14px;
border-radius: 16px; font-size: 12px;
background-color: rgba(248, 248, 248, 1); font-weight: bold;
line-height: 14px;
display: flex; color: rgba(45, 71, 106, 1);
flex-direction: row; text-align: center;
justify-content: center; }
align-items: center;
} .msg-num {
.msg-num-red { width: 120px;
color: rgba(208, 2, 27, 1); height: 32px;
font-size: 18px; border-radius: 16px;
font-weight: bold; background-color: rgba(248, 248, 248, 1);
line-height: 20px;
text-align: center; display: flex;
} flex-direction: row;
.msg-num-blue { justify-content: center;
color: rgba(117, 178, 253, 1); align-items: center;
font-size: 18px; }
font-weight: bold;
line-height: 20px; .msg-num-red {
text-align: center; color: rgba(208, 2, 27, 1);
} font-size: 18px;
font-weight: bold;
.lists { line-height: 20px;
/*border: 1px solid red;*/ text-align: center;
width: 100%; }
height: auto;
padding: 0px 0px 0px 16px; .msg-num-blue {
background-color: rgba(255, 255, 255, 1); color: rgba(117, 178, 253, 1);
font-size: 18px;
box-shadow: 0px 1px 3px 0px rgba(221, 221, 221, 1); font-weight: bold;
} line-height: 20px;
.list { text-align: center;
/*border: 1px solid dodgerblue;*/ }
width: 100%;
height: 44px; .lists {
/*border: 1px solid red;*/
border-bottom: 1px solid rgba(221, 221, 221, 1); width: 100%;
height: auto;
display: flex; padding: 0px 0px 0px 16px;
flex-direction: row; background-color: rgba(255, 255, 255, 1);
justify-content: space-between;
align-items: center; box-shadow: 0px 1px 3px 0px rgba(221, 221, 221, 1);
} }
.list-latest {
border-bottom: none; .list {
} /*border: 1px solid dodgerblue;*/
.list-title { width: 100%;
width: auto; height: 44px;
height: 16px;
font-size: 14px; border-bottom: 1px solid rgba(221, 221, 221, 1);
font-weight: bold;
line-height: 16px; display: flex;
color: rgba(45, 71, 106, 1); flex-direction: row;
} justify-content: space-between;
.list-icon { align-items: center;
margin-right: 16px; }
width: 8px;
height: 13px; .list-latest {
object-fit: cover; border-bottom: none;
} }
.main-menuBar { .list-title {
/*border: 1px solid darkviolet;*/ width: auto;
box-shadow: inset 0px 1px 2px 0px rgba(221, 221, 221, 1); height: 16px;
width: 100%; font-size: 14px;
height: 82px; font-weight: bold;
position: fixed; line-height: 16px;
bottom: 0px; color: rgba(45, 71, 106, 1);
left: 0px; }
background-color: #fafafa;
padding: 0px 14px; .list-icon {
display: flex; margin-right: 16px;
flex-direction: row; width: 8px;
justify-content: space-between; height: 13px;
} object-fit: cover;
.menuBar-menu { }
/*background-color: greenyellow;*/
width: 48px; .main-menuBar {
height: 47px; /*border: 1px solid darkviolet;*/
box-shadow: inset 0px 1px 2px 0px rgba(221, 221, 221, 1);
display: flex; width: 100%;
flex-direction: column; height: 82px;
justify-content: flex-end; position: fixed;
align-items: center; bottom: 0px;
} left: 0px;
.menuBar-icon { background-color: #fafafa;
width: 24px; padding: 0px 14px;
height: 24px; display: flex;
object-fit: cover; flex-direction: row;
} justify-content: space-between;
.menuBar-title { }
width: auto;
height: 12px; .menuBar-menu {
font-size: 10px; /*background-color: greenyellow;*/
font-weight: bold; width: 48px;
color: rgba(67, 119, 188, 0.4); height: 47px;
text-align: center;
} display: flex;
.menuBar-title-ac { flex-direction: column;
color: rgba(67, 119, 188, 1); justify-content: flex-end;
} align-items: center;
}
.menuBar-icon {
width: 24px;
height: 24px;
object-fit: cover;
}
.menuBar-title {
width: auto;
height: 12px;
font-size: 10px;
font-weight: bold;
color: rgba(67, 119, 188, 0.4);
text-align: center;
}
.menuBar-title-ac {
color: rgba(67, 119, 188, 1);
}
</style> </style>
wx_application/src/views/mainSale/message/index.vue
View file @ 69e60f0c
...@@ -20,27 +20,26 @@ ...@@ -20,27 +20,26 @@
</template> </template>
<script> <script>
import {getMessageByClerkId} from '@/utils/utils.Request.aApi' import {getMessageByUserId} from '@/utils/utils.Request.aApi'
export default { export default {
name: 'index', name: 'index',
data() { data() {
return { return {
// clerkId: '2003160512400400000', userId: '',
clerkId: '',
messageList: [] messageList: []
} }
}, },
mounted() { mounted() {
this.clerkId = sessionStorage.getItem('userId') this.userId = sessionStorage.getItem('userId')
this.handleGetMessageByClerkId() this.handleGetMessageByClerkId()
}, },
methods: { methods: {
handleGetMessageByClerkId() { handleGetMessageByClerkId() {
let _this = this let _this = this
let requestRarams = {clerkId: _this.clerkId} let requestRarams = {userId: _this.userId}
alert(JSON.stringify(requestRarams)) alert(JSON.stringify(requestRarams))
getMessageByClerkId(requestRarams) getMessageByUserId(requestRarams)
.then(res => { .then(res => {
if (res.result == 'success') { if (res.result == 'success') {
_this.messageList = res.data _this.messageList = res.data
......
wx_application/src/views/mainSale/message/releaseMessage.vue
View file @ 69e60f0c
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</template> </template>
<script> <script>
import {getClerkInfoBySupervisorId, newTask} from '@/utils/utils.Request.aApi' import {getClerkInfoBySupervisorUserId, newTask} from '@/utils/utils.Request.aApi'
export default { export default {
name: 'releaseMessage', name: 'releaseMessage',
...@@ -29,20 +29,19 @@ ...@@ -29,20 +29,19 @@
return { return {
radio: '1', radio: '1',
checkIds: [], checkIds: [],
// supervisorId:'2003160512400400000',
supervisorId: '', supervisorId: '',
userList: [] userList: []
} }
}, },
mounted() { mounted() {
this.supervisorId = sessionStorage.getItem('userId') this.supervisorUserId = sessionStorage.getItem('userId')
this.getClerkInfoBySupervisorId() this.getClerkInfoBySupervisorId()
}, },
methods: { methods: {
// 根据主管id获取所属部门全部员工信息 // 根据主管id获取所属部门全部员工信息
getClerkInfoBySupervisorId() { getClerkInfoBySupervisorId() {
let _this = this let _this = this
getClerkInfoBySupervisorId({supervisorId: _this.supervisorId}) getClerkInfoBySupervisorUserId({supervisorUserId: _this.supervisorUserId})
.then(res => { .then(res => {
if (res.result == 'success') { if (res.result == 'success') {
_this.userList = res.data _this.userList = res.data
...@@ -65,12 +64,16 @@ ...@@ -65,12 +64,16 @@
//发布 全员发送 获取全部id 部分可见 获取check 的id //发布 全员发送 获取全部id 部分可见 获取check 的id
let title = this.$store.state.message.title let title = this.$store.state.message.title
let content = this.$store.state.message.content let content = this.$store.state.message.content
let supervisorId = this.supervisorId let supervisorUserId = this.supervisorUserId
if(this.checkIds.length==0){
_this.$toast("请选择转发人");
return false
}
let clerkIds = this.checkIds + "" let clerkIds = this.checkIds + ""
let requestParam = { let requestParam = {
title: title, title: title,
content: content, content: content,
supervisorId: supervisorId, supervisorUserId: supervisorUserId,
clerkIds: clerkIds clerkIds: clerkIds
} }
let _this = this let _this = this
......
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