我的消息

wx_application/src/utils/utils.Request.aApi.js

@@ -3,17 +3,17 @@
  */
 import requestAPI from '@/utils/bRequest'
 
-export function getMessageByClerkId(params) {
+export function getMessageByUserId(params) {
   return requestAPI({
-    url: '/admin/auth/marketing/getMessageByClerkId',
+    url: '/admin/auth/marketing/getMessageByUserId',
     method: 'get',
     params
   })
 }
 
-export function getClerkInfoBySupervisorId(params) {
+export function getClerkInfoBySupervisorUserId(params) {
   return requestAPI({
-    url: '/admin/auth/addressbook/clerk/getClerkInfoBySupervisorId',
+    url: '/admin/auth/addressbook/clerk/getClerkInfoBySupervisorUserId',
     method: 'get',
     params
   })

wx_application/src/views/mainSale/me/main/index.vue

 <template>
     <div class="main">
         <div class="backgrounds">
-      <img class="background-img" :src="cache.icon.testImg" />
+            <img class="background-img" :src="avatarUrl"/>
         </div>
         <div class="infos">
             <div class="info">
                 <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">
@@ -31,11 +31,11 @@
             </div> -->
             <div class="list" @click="listTaskClick">
                 <div class="list-title">任务列表</div>
-        <img class="list-icon" :src="cache.icon.arrowRightDark" />
+                <img class="list-icon" :src="cache.icon.arrowRightDark"/>
             </div>
-      <div class="list list-latest">
+            <div class="list">
                 <div class="list-title">我的收益</div>
-        <img class="list-icon" :src="cache.icon.arrowRightDark" />
+                <img class="list-icon" :src="cache.icon.arrowRightDark"/>
             </div>
             <div class="list list-latest" @click="handleDetail('message')">
                 <div class="list-title">我的消息</div>
@@ -45,23 +45,23 @@
 
         <div class="main-menuBar">
             <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>
             <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>
             <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>
             <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>
             <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>
         </div>
@@ -70,13 +70,15 @@
 
 <script>
   import {configWx, getUserInfo} from "@/utils/aCommon"
-  import { getUserInfoByUserId } from "@/api/sidebar/voucher";
+  import {getUserInfoByUserId} from "@/api/sidebar/voucher";
   import axios from "axios"
-  import { editStore } from "@/api/sidebar/voucher";
+  import {editStore} from "@/api/sidebar/voucher";
+
   export default {
     name: "me",
     data() {
       return {
+        avatarUrl: '',
         cache: {
           icon: {
             testImg: "/mainSale/test-city.png",
@@ -130,6 +132,8 @@
       };
     },
     mounted() {
+
+      this.avatarUrl = sessionStorage.getItem("avatar")
       this.checkNowMenuBar()
 
     },
@@ -146,20 +150,20 @@
         this.$router.push("Task");
       },
       menuProfit() {
-      this.$router.push({ path: "/profitList" });
+        this.$router.push({path: "/profitList"});
       },
       menuTask() {
-      this.$router.push({ path: "/taskList" });
+        this.$router.push({path: "/taskList"});
       },
       menuCase() {
-      this.$router.push({ path: "/case" });
+        this.$router.push({path: "/case"});
       }
     }
   };
 </script>
 
 <style scoped>
-.main {
+    .main {
         /*border: 1px solid red;*/
         background-color: rgba(248, 248, 248, 1);
         width: 100%;
@@ -172,28 +176,31 @@
         justify-content: start;
 
         overflow: auto;
-}
-.backgrounds {
+    }
+
+    .backgrounds {
         /*border: 1px solid dodgerblue;*/
         width: 100%;
         height: 124px;
         overflow: hidden;
         background-color: rgba(10, 10, 10, 0.5);
-}
-.background-img {
+    }
+
+    .background-img {
         width: 100%;
         height: 100%;
         object-fit: cover;
         filter: blur(2px);
-}
+    }
 
-.infos {
+    .infos {
         /*border: 1px solid orange;*/
         width: 100%;
         height: 44px;
         margin-top: 12px;
-}
-.info {
+    }
+
+    .info {
         /*border: 1px solid red;*/
         width: 100%;
         height: 148px;
@@ -206,20 +213,23 @@
         flex-direction: column;
         justify-content: space-between;
         align-items: start;
-}
-.info-logos {
+    }
+
+    .info-logos {
         /*background-color: #96CEDC;*/
         width: 100%;
         height: 48px;
-}
-.info-logo {
+    }
+
+    .info-logo {
         width: 48px;
         height: 48px;
         border-radius: 50%;
         border: 1px solid white;
         object-fit: cover;
-}
-.info-msgs {
+    }
+
+    .info-msgs {
         width: 100%;
         height: 80px;
         margin-bottom: 12px;
@@ -232,8 +242,9 @@
         flex-direction: row;
         justify-content: center;
         align-items: center;
-}
-.msg {
+    }
+
+    .msg {
         width: 50%;
         height: 100%;
         /*border: 1px solid red;*/
@@ -243,12 +254,14 @@
         flex-direction: column;
         justify-content: space-between;
         align-items: flex-start;
-}
-.msg-latest {
+    }
+
+    .msg-latest {
         border-right: none;
         align-items: flex-end;
-}
-.msg-title {
+    }
+
+    .msg-title {
         width: 120px;
         height: 14px;
         font-size: 12px;
@@ -256,8 +269,9 @@
         line-height: 14px;
         color: rgba(45, 71, 106, 1);
         text-align: center;
-}
-.msg-num {
+    }
+
+    .msg-num {
         width: 120px;
         height: 32px;
         border-radius: 16px;
@@ -267,23 +281,25 @@
         flex-direction: row;
         justify-content: center;
         align-items: center;
-}
-.msg-num-red {
+    }
+
+    .msg-num-red {
         color: rgba(208, 2, 27, 1);
         font-size: 18px;
         font-weight: bold;
         line-height: 20px;
         text-align: center;
-}
-.msg-num-blue {
+    }
+
+    .msg-num-blue {
         color: rgba(117, 178, 253, 1);
         font-size: 18px;
         font-weight: bold;
         line-height: 20px;
         text-align: center;
-}
+    }
 
-.lists {
+    .lists {
         /*border: 1px solid red;*/
         width: 100%;
         height: auto;
@@ -291,8 +307,9 @@
         background-color: rgba(255, 255, 255, 1);
 
         box-shadow: 0px 1px 3px 0px rgba(221, 221, 221, 1);
-}
-.list {
+    }
+
+    .list {
         /*border: 1px solid dodgerblue;*/
         width: 100%;
         height: 44px;
@@ -303,26 +320,29 @@
         flex-direction: row;
         justify-content: space-between;
         align-items: center;
-}
-.list-latest {
+    }
+
+    .list-latest {
         border-bottom: none;
-}
-.list-title {
+    }
+
+    .list-title {
         width: auto;
         height: 16px;
         font-size: 14px;
         font-weight: bold;
         line-height: 16px;
         color: rgba(45, 71, 106, 1);
-}
-.list-icon {
+    }
+
+    .list-icon {
         margin-right: 16px;
         width: 8px;
         height: 13px;
         object-fit: cover;
-}
+    }
 
-.main-menuBar {
+    .main-menuBar {
         /*border: 1px solid darkviolet;*/
         box-shadow: inset 0px 1px 2px 0px rgba(221, 221, 221, 1);
         width: 100%;
@@ -335,8 +355,9 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-}
-.menuBar-menu {
+    }
+
+    .menuBar-menu {
         /*background-color: greenyellow;*/
         width: 48px;
         height: 47px;
@@ -345,21 +366,24 @@
         flex-direction: column;
         justify-content: flex-end;
         align-items: center;
-}
-.menuBar-icon {
+    }
+
+    .menuBar-icon {
         width: 24px;
         height: 24px;
         object-fit: cover;
-}
-.menuBar-title {
+    }
+
+    .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 {
+    }
+
+    .menuBar-title-ac {
         color: rgba(67, 119, 188, 1);
-}
+    }
 </style>

wx_application/src/views/mainSale/message/index.vue

@@ -20,27 +20,26 @@
 </template>
 
 <script>
-  import {getMessageByClerkId} from '@/utils/utils.Request.aApi'
+  import {getMessageByUserId} from '@/utils/utils.Request.aApi'
 
   export default {
     name: 'index',
     data() {
       return {
-        // clerkId: '2003160512400400000',
-        clerkId: '',
+        userId: '',
         messageList: []
       }
     },
     mounted() {
-      this.clerkId = sessionStorage.getItem('userId')
+      this.userId = sessionStorage.getItem('userId')
       this.handleGetMessageByClerkId()
     },
     methods: {
       handleGetMessageByClerkId() {
         let _this = this
-        let requestRarams = {clerkId: _this.clerkId}
+        let requestRarams = {userId: _this.userId}
         alert(JSON.stringify(requestRarams))
-        getMessageByClerkId(requestRarams)
+        getMessageByUserId(requestRarams)
           .then(res => {
             if (res.result == 'success') {
               _this.messageList = res.data

wx_application/src/views/mainSale/message/releaseMessage.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script>
-  import {getClerkInfoBySupervisorId, newTask} from '@/utils/utils.Request.aApi'
+  import {getClerkInfoBySupervisorUserId, newTask} from '@/utils/utils.Request.aApi'
 
   export default {
     name: 'releaseMessage',
@@ -29,20 +29,19 @@
       return {
         radio: '1',
         checkIds: [],
-        // supervisorId:'2003160512400400000',
         supervisorId: '',
         userList: []
       }
     },
     mounted() {
-      this.supervisorId = sessionStorage.getItem('userId')
+      this.supervisorUserId = sessionStorage.getItem('userId')
       this.getClerkInfoBySupervisorId()
     },
     methods: {
       // 根据主管id获取所属部门全部员工信息
       getClerkInfoBySupervisorId() {
         let _this = this
-        getClerkInfoBySupervisorId({supervisorId: _this.supervisorId})
+        getClerkInfoBySupervisorUserId({supervisorUserId: _this.supervisorUserId})
           .then(res => {
             if (res.result == 'success') {
               _this.userList = res.data
@@ -65,12 +64,16 @@
         //发布  全员发送 获取全部id  部分可见 获取check 的id
         let title = this.$store.state.message.title
         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 requestParam = {
           title: title,
           content: content,
-          supervisorId: supervisorId,
+          supervisorUserId: supervisorUserId,
           clerkIds: clerkIds
         }
         let _this = this