Skip to content

C
chart-web
Commit 4c293573 authored by looker's avatar looker
Browse files
Options

v0.3

parent f7f02a9f
Hide whitespace changes
Inline Side-by-side
Showing with 441 additions and 193 deletions
config/dev.env.js
View file @ 4c293573
...@@ -3,6 +3,7 @@ var prodEnv = require('./prod.env') ...@@ -3,6 +3,7 @@ var prodEnv = require('./prod.env')
module.exports = merge(prodEnv, { module.exports = merge(prodEnv, {
NODE_ENV: '"development"', NODE_ENV: '"development"',
API_URL:'"/api/"',
WX_ADDRESS: '"http://imdev.chenzhen.shop:9093/"', WX_ADDRESS: '"http://imdev.chenzhen.shop:9093/"',
IMG_ADDRESS:'"http://chat-x.oss-cn-beijing.aliyuncs.com/"' IMG_ADDRESS:'"http://chat-x.oss-cn-beijing.aliyuncs.com/"'
}) })
config/index.js
View file @ 4c293573
...@@ -23,7 +23,7 @@ module.exports = { ...@@ -23,7 +23,7 @@ module.exports = {
}, },
dev: { dev: {
env: require('./dev.env'), env: require('./dev.env'),
port: 8078, port: 8099,
autoOpenBrowser: true, autoOpenBrowser: true,
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/',
......
config/prod.env.js
View file @ 4c293573
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
API_URL:'""',
WX_ADDRESS: "http://imweb.chenzhen.shop:9093", WX_ADDRESS: "http://imweb.chenzhen.shop:9093",
IMG_ADDRESS:'"http://chat-x.oss-cn-beijing.aliyuncs.com/"' IMG_ADDRESS:'"http://chat-x.oss-cn-beijing.aliyuncs.com/"'
} }
src/components/load/moreDot.vue
View file @ 4c293573
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
} }
.spinner > div { .spinner > div {
width: 30px; width: 8px;
height: 30px; height: 8px;
background-color: #c3c3c3; background-color: #c3c3c3;
border-radius: 100%; border-radius: 100%;
......
src/components/message/message.vue
View file @ 4c293573
...@@ -17,12 +17,20 @@ ...@@ -17,12 +17,20 @@
<div class="text" v-html="replaceFace(item.content)"></div> <div class="text" v-html="replaceFace(item.content)"></div>
</div> </div>
</div> </div>
<div v-if="item.type==10000" class="main" :class="{ self: item.isSend }">
<div class="time" style="text-align: center"><span>{{item.createTime | time}}</span></div>
<div style="text-align: center">
<div style="font-size: 12px;color: #26c8e2;text-align: center;">
系统消息：{{item.content}}
</div>
</div>
</div>
<div v-if="item.type==3" class="main" :class="{ self: item.isSend }"> <div v-if="item.type==3" class="main" :class="{ self: item.isSend }">
<img class="avatar" width="36" height="36" :src="item.isSend ? user.img : selectedChat.user.img||'static/images/weixin.jpg'" /> <img class="avatar" width="36" height="36" :src="item.isSend ? user.img : selectedChat.user.img||'static/images/weixin.jpg'" />
<div class="time"><span>{{item.createTime | time}}</span></div> <div class="time"><span>{{item.createTime | time}}</span></div>
<div class="content"> <div class="content">
<div class="img"><img style="width:300px; <div class="img"><img style="width:300px;
height:300px;" :src="imgUrl+item.imageUrl" alt=""></div> height:300px;" :src="item.imageUrl | imgUrl" alt=""></div>
</div> </div>
</div> </div>
</li> </li>
...@@ -67,6 +75,7 @@ export default { ...@@ -67,6 +75,7 @@ export default {
}, },
mounted() { mounted() {
let temp = this let temp = this
this.$refs.list.scrollTop = this.$refs.list.scrollHeight
this.$refs.list.onscroll = function () { this.$refs.list.onscroll = function () {
if(this.scrollTop ==0){ if(this.scrollTop ==0){
temp.moreMessage() temp.moreMessage()
...@@ -79,18 +88,19 @@ export default { ...@@ -79,18 +88,19 @@ export default {
selectId() { selectId() {
}, },
messages(val, old){ messages(val, old){
console.log(433333333)
if(!val||val.length==0){ if(!val||val.length==0){
return return
} }
if(!old||old.length==0){ if(!old||old.length==0){//初始化
setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0) setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0)
}else if(val[0].conversationId!=old[0].conversationId){ }else if(val[0].conversationId!=old[0].conversationId){//切换tab
setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0) setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0)
} }
if(this.headerId != val[val.length-1].conversationId){ if(this.headerId == val[0].id){//
setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0) setTimeout(() => this.$refs.list.scrollTop = this.$refs.list.scrollHeight, 0)
}else{ }else{
this.$refs.list.scrollTop= 140 this.$refs.list.scrollTop= 50
// } // }
// let liArray = this.$refs.list.children[0].children // let liArray = this.$refs.list.children[0].children
// let index = val.length - old.length // let index = val.length - old.length
...@@ -102,7 +112,7 @@ export default { ...@@ -102,7 +112,7 @@ export default {
// } // }
// } // }
} }
this.headerId = val[0].conversationId this.headerId = val[0].id
// console.log(66666666666666666666666) // console.log(66666666666666666666666)
// if(old.length+1==val.length){ // if(old.length+1==val.length){
...@@ -141,6 +151,13 @@ export default { ...@@ -141,6 +151,13 @@ export default {
// }else{ // }else{
// return date.getHours() + ':' + date.getMinutes(); // return date.getHours() + ':' + date.getMinutes();
// } // }
},
imgUrl(img){
if(img.indexOf("http") >= 0){
return img
}else{
return process.env.IMG_ADDRESS + img
}
} }
} }
} }
......
src/components/text/text.vue
View file @ 4c293573
...@@ -3,14 +3,26 @@ ...@@ -3,14 +3,26 @@
<div class="text"> <div class="text">
<div class="emoji"> <div class="emoji">
<i class="icon iconfont icon-look" @click="showEmoji=!showEmoji"></i> <i class="icon iconfont icon-look" @click="showEmoji=!showEmoji"></i>
<img class="icon-img" align="absmiddle" src="static/icon-img/folder-open.png" alt=""> <div style="width: 20px;display: inline-block;">
<el-upload
class="upload-demo"
action="/api/o/upload/image"
:on-preview="handlePreview"
:on-remove="handleRemove"
:on-success="fileEd"
:show-file-list=false
>
<img class="icon-img" align="absmiddle" src="static/icon-img/folder-open.png" alt="">
</el-upload>
</div>
<img class="icon-img" align="absmiddle" src="static/icon-img/link.png" alt=""> <img class="icon-img" align="absmiddle" src="static/icon-img/link.png" alt="">
<img class="icon-img" align="absmiddle" src="static/icon-img/tag.png" alt=""> <img class="icon-img" align="absmiddle" src="static/icon-img/tag.png" alt="">
<img class="icon-img" align="absmiddle" src="static/icon-img/retweet.png" alt="" @click="transfer"> <img class="icon-img" align="absmiddle" src="static/icon-img/retweet.png" alt="" @click="transfer">
<img class="icon-img" align="absmiddle" src="static/icon-img/poweroff.png" alt="" @click="closeSession"> <img class="icon-img" align="absmiddle" src="static/icon-img/poweroff.png" alt="" @click="closeSession">
<transition name="showbox"> <transition name="showbox">
<div class="emojiBox" v-show="showEmoji"> <div class="emojiBox" v-show="showEmoji">
<li v-for="(item, index) in emojis"> <li v-for="(item, index) in user.emojis">
<img :src="'static/emoji/'+item.file" :data="item.code" @click="content +=item.code"> <img :src="'static/emoji/'+item.file" :data="item.code" @click="content +=item.code">
</li> </li>
</div> </div>
...@@ -33,28 +45,28 @@ ...@@ -33,28 +45,28 @@
<div> <div>
<el-select style="width: 100%;" v-model="value7" placeholder="请选择"> <el-select style="width: 100%;" v-model="value7" placeholder="请选择">
<el-option-group <el-option-group
v-for="group in options3" v-for="group in tempList"
:key="group.label" :key="group.id"
:label="group.label"> :label="group.name">
<el-option <el-option
v-for="item in group.options" v-for="item in group.chis"
:key="item.value" :key="item.toCustomerId"
:label="item.label" :label="item.name"
:value="item.value"> :value="item.toCustomerId">
</el-option> </el-option>
</el-option-group> </el-option-group>
</el-select> </el-select>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button> <el-button type="primary" @click="toTransterIng(value7)">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { mapGetters, mapState } from 'vuex' import { mapGetters, mapState, mapActions } from 'vuex'
export default { export default {
data () { data () {
return { return {
...@@ -62,35 +74,12 @@ export default { ...@@ -62,35 +74,12 @@ export default {
reply: '未找到', reply: '未找到',
frequency: 0, frequency: 0,
sendType:1, sendType:1,
upLoadImgUrl:process.env.IMG_ADDRESS,
imageUrl:'', imageUrl:'',
warn: false, warn: false,
showEmoji: false, showEmoji: false,
dialogVisible:false, dialogVisible:false,
options3: [{ tempList:[],
label: '售前',
options: [{
value: 'Shanghai',
label: '随机转机'
}, {
value: 'Beijing',
label: '张辅导费'
}]
}, {
label: '售中',
options: [{
value: 'Chengdu',
label: '随机抓捏'
}, {
value: 'Shenzhen',
label: '深圳'
}, {
value: 'Guangzhou',
label: '广州'
}, {
value: 'Dalian',
label: '大连'
}]
}],
value7: '' value7: ''
}; };
}, },
...@@ -104,17 +93,40 @@ export default { ...@@ -104,17 +93,40 @@ export default {
]) ])
}, },
methods: { methods: {
...mapActions([
'getTranster',
'toTranster',
'closeTake'
]),
fileEd(res){
if(res.code==200){
this.imageUrl = res.data.url
this.sendType = 3
this.send()
}
console.log(res)
},
handleRemove(file, fileList) {
console.log(file, fileList);
},
handlePreview(file) {
console.log(file);
},
// 按回车发送信息 // 按回车发送信息
closeSession(){ closeSession(){
let temp = this
this.$confirm('确定要结束对话吗?', '提示', { this.$confirm('确定要结束对话吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$message({ temp.closeTake().then((data)=>{
type: 'success', this.$message({
message: '已结束!' type: 'success',
}); message: '已结束!'
});
})
}).catch(() => { }).catch(() => {
// this.$message({ // this.$message({
// type: 'info', // type: 'info',
...@@ -122,48 +134,65 @@ export default { ...@@ -122,48 +134,65 @@ export default {
// }); // });
}); });
}, },
toTransterIng(cId){
console.log(cId)
for(let tobj of this.tempList){
for(let obj of tobj.chis){
if(cId==obj.toCustomerId){
this.toTranster(obj).then((r,t)=>{
this.dialogVisible = false
this.$message({
message: '转接成功！',
type: 'success'
});
}).catch((data)=>{
console.log(data)
})
}
}
}
},
transfer(){ transfer(){
this.dialogVisible = true let that = this
// let transfers = ` this.getTranster().then((data)=>{
let tempList = []
// ` for(let obj of data){
// this.$alert(transfers, 'HTML 片段', { let temp ={
// dangerouslyUseHTMLString: true id:obj.roleBo.name,
// }); name:obj.roleBo.name
// let transfers = ` }
// <el-collapse v-model="activeNames" @change="handleChange"> let chis = [{
// <el-collapse-item title="一致性 Consistency" name="1"> type:1,
// <el-row> toRoleId:obj.roleBo.roleId,
// <el-col :span="24"><div class="grid-content bg-purple-dark"></div></el-col> name:'随机转换'
// </el-row> }]
// </el-collapse-item> for(let r of obj.customerServiceBos){
// </el-collapse> if(r.customerSessionBo&&r.customerSessionBo.userState!='40'){
// ` chis.push({
// this.$confirm(transfers, '选择转接对象', { type:2,
// dangerouslyUseHTMLString: true, toRoleId:obj.roleBo.roleId,
// confirmButtonText: '确定', toCustomerId:r.customerId,
// cancelButtonText: '取消', name:r.username
// type: 'warning', })
// center: true }
// }).then(() => { }
// this.$message({ temp.chis = chis
// type: 'success', chis.length>1&&tempList.push(temp)
// message: '删除成功!' }
// }); that.tempList = tempList
// }).catch(() => { this.dialogVisible = true
// this.$message({ }).catch((data)=>{
// type: 'info', that.tempList=[]
// message: '已取消删除' this.dialogVisible = false
// }); })
// });
}, },
onKeyup (e) { onKeyup (e) {
if ( e.keyCode === 13 ) { if ( e.keyCode === 13 ) {
this.send() this.send()
} }
}, },
// 点击发送按钮发送信息
send () { send () {
if(this.sendType!=3){
if(this.content.length < 1){ if(this.content.length < 1){
this.warn = true this.warn = true
this.content = '' this.content = ''
...@@ -180,20 +209,28 @@ export default { ...@@ -180,20 +209,28 @@ export default {
this.$store.dispatch('sendMessage', msg) this.$store.dispatch('sendMessage', msg)
this.content = '' this.content = ''
} }
}else{
var msg = {
id:this.user.selectId,
type:this.sendType,
content: this.content,
imageUrl:this.imageUrl
}
this.$store.dispatch('sendMessage', msg)
this.content = ''
this.sendType =1
}
} }
}, },
// 在进入的时候 聚焦输入框
mounted() { mounted() {
this.$refs.text.focus() this.$refs.text.focus()
}, },
watch: { watch: {
// 在选择其它对话的时候 聚焦输入框
selectId() { selectId() {
setTimeout(() => { setTimeout(() => {
this.$refs.text.focus() this.$refs.text.focus()
}, 0) }, 0)
}, },
// 当输入框中的值为空时 弹出提示 并在一秒后消失
content() { content() {
if(this.content === ''){ if(this.content === ''){
if( this.frequency === 0){ if( this.frequency === 0){
......
src/page/login/Loading.vue
View file @ 4c293573
template> <template>
<div class="loadEffect" :style="{marginTop: marginTop? marginTop : '50%'}"> <div class="loadEffect" :style="{marginTop: marginTop? marginTop : '90%'}">
<span class="ld-span"></span> <div class="spinner">
<span class="ld-span"></span> <div class="spinner-container container1">
<span class="ld-span"></span> <div class="circle1"></div>
<span class="ld-span"></span> <div class="circle2"></div>
<span class="ld-span"></span> <div class="circle3"></div>
<span class="ld-span"></span> <div class="circle4"></div>
<span class="ld-span"></span> </div>
<span class="ld-span"></span> <div class="spinner-container container2">
<div class="circle1"></div>
<div class="circle2"></div>
<div class="circle3"></div>
<div class="circle4"></div>
</div>
<div class="spinner-container container3">
<div class="circle1"></div>
<div class="circle2"></div>
<div class="circle3"></div>
<div class="circle4"></div>
</div>
</div>
</div> </div>
</template> </template>
...@@ -29,67 +41,114 @@ export default { ...@@ -29,67 +41,114 @@ export default {
margin-top:50%; margin-top:50%;
transform: scale(.5) transform: scale(.5)
} }
.loadEffect .ld-span{ .spinner {
display: inline-block; margin: 100px auto;
width: 20px; width: 20px;
height: 20px; height: 20px;
border-radius: 50%; position: relative;
background: #67e7d5; }
position: absolute;
-webkit-animation: load 1.04s ease infinite; .container1 > div, .container2 > div, .container3 > div {
} width: 6px;
@-webkit-keyframes load{ height: 6px;
0%{ background-color: #333;
-webkit-transform: scale(1.2);
opacity: 1; border-radius: 100%;
} position: absolute;
100%{ -webkit-animation: bouncedelay 1.2s infinite ease-in-out;
-webkit-transform: scale(.3); animation: bouncedelay 1.2s infinite ease-in-out;
opacity: 0.5; -webkit-animation-fill-mode: both;
} animation-fill-mode: both;
} }
.loadEffect .ld-span:nth-child(1){
left: 0; .spinner .spinner-container {
top: 50%; position: absolute;
margin-top:-10px; width: 100%;
-webkit-animation-delay:0.13s; height: 100%;
} }
.loadEffect .ld-span:nth-child(2){
left: 14px; .container2 {
top: 14px; -webkit-transform: rotateZ(45deg);
-webkit-animation-delay:0.26s; transform: rotateZ(45deg);
} }
.loadEffect .ld-span:nth-child(3){
left: 50%; .container3 {
top: 0; -webkit-transform: rotateZ(90deg);
margin-left: -10px; transform: rotateZ(90deg);
-webkit-animation-delay:0.39s; }
}
.loadEffect .ld-span:nth-child(4){ .circle1 { top: 0; left: 0; }
top: 14px; .circle2 { top: 0; right: 0; }
right:14px; .circle3 { right: 0; bottom: 0; }
-webkit-animation-delay:0.52s; .circle4 { left: 0; bottom: 0; }
}
.loadEffect .ld-span:nth-child(5){ .container2 .circle1 {
right: 0; -webkit-animation-delay: -1.1s;
top: 50%; animation-delay: -1.1s;
margin-top:-10px; }
-webkit-animation-delay:0.65s;
} .container3 .circle1 {
.loadEffect .ld-span:nth-child(6){ -webkit-animation-delay: -1.0s;
right: 14px; animation-delay: -1.0s;
bottom:14px; }
-webkit-animation-delay:0.78s;
} .container1 .circle2 {
.loadEffect .ld-span:nth-child(7){ -webkit-animation-delay: -0.9s;
bottom: 0; animation-delay: -0.9s;
left: 50%; }
margin-left: -10px;
-webkit-animation-delay:0.91s; .container2 .circle2 {
} -webkit-animation-delay: -0.8s;
.loadEffect .ld-span:nth-child(8){ animation-delay: -0.8s;
bottom: 14px; }
left: 14px;
-webkit-animation-delay:1.04s; .container3 .circle2 {
-webkit-animation-delay: -0.7s;
animation-delay: -0.7s;
}
.container1 .circle3 {
-webkit-animation-delay: -0.6s;
animation-delay: -0.6s;
}
.container2 .circle3 {
-webkit-animation-delay: -0.5s;
animation-delay: -0.5s;
}
.container3 .circle3 {
-webkit-animation-delay: -0.4s;
animation-delay: -0.4s;
}
.container1 .circle4 {
-webkit-animation-delay: -0.3s;
animation-delay: -0.3s;
}
.container2 .circle4 {
-webkit-animation-delay: -0.2s;
animation-delay: -0.2s;
}
.container3 .circle4 {
-webkit-animation-delay: -0.1s;
animation-delay: -0.1s;
}
@-webkit-keyframes bouncedelay {
0%, 80%, 100% { -webkit-transform: scale(0.0) }
40% { -webkit-transform: scale(1.0) }
}
@keyframes bouncedelay {
0%, 80%, 100% {
transform: scale(0.0);
-webkit-transform: scale(0.0);
} 40% {
transform: scale(1.0);
-webkit-transform: scale(1.0);
}
} }
</style> </style>
\ No newline at end of file
src/service/api.js
View file @ 4c293573
const url={} const url={}
url.login = '/api/y/customer/passport/sign' url.login = `${process.env.API_URL}y/customer/passport/sign`
url.wsUrl = "http://imdev.chenzhen.shop:9093/" url.wsUrl = "http://imdev.chenzhen.shop:9093/"
// url.wsUrl = process.env.WX_ADDRESS url.getTransferList = `${process.env.API_URL}o/customer/transfer`
url.toTreansfer = `${process.env.API_URL}o/customer/transfer`
url.closeTake = `${process.env.API_URL}o/customerConversation/finish`
// url.wsUrl = process.env.API_URL
export default url export default url
\ No newline at end of file
src/service/chart.js 0 → 100644
View file @ 4c293573
import apiUrl from './api.js'
import request from '@/utils/request'
const getTransfer = (param)=>{
return request({
url: apiUrl.getTransferList,
method: 'get',
params: param
})
}
const toTrensfer = (param)=>{
return request({
url: apiUrl.toTreansfer,
method: 'post',
data: param
})
}
const closeSession = (param)=>{
return request({
url: apiUrl.closeTake,
method: 'put',
data: param
})
}
export default {
getTransfer,
toTrensfer,
closeSession
}
\ No newline at end of file
src/service/index.js
View file @ 4c293573
import apiUrl from './api.js' import apiUrl from './api.js'
import request from '@/utils/request' import request from '@/utils/request'
export const login = (param)=>{ import chart from './chart'
const login = (param)=>{
return request({ return request({
url: apiUrl.login, url: apiUrl.login,
method: 'post', method: 'post',
data: param data: param
}) })
}
export {
login,
chart
} }
\ No newline at end of file
src/store/modules/user.js
View file @ 4c293573
...@@ -5,6 +5,7 @@ import { compare } from '@/utils/tools' ...@@ -5,6 +5,7 @@ import { compare } from '@/utils/tools'
import { setToken, getToken, emojis } from '@/utils/auth' import { setToken, getToken, emojis } from '@/utils/auth'
import { panelStatus } from '@/utils/common' import { panelStatus } from '@/utils/common'
import Vue from 'vue' import Vue from 'vue'
let isSend = false;
const now = new Date(); const now = new Date();
const user = { const user = {
state: { state: {
...@@ -41,6 +42,10 @@ const user = { ...@@ -41,6 +42,10 @@ const user = {
state.whichPane = value state.whichPane = value
} }
}, },
SET_CHARTING_LIST(state,value){
state.chatlist = value.reverse(compare('queryData'))
state.chartings =value.reverse(compare('queryData'))
},
CHANGE_ISSELECTMORE(state,value){ CHANGE_ISSELECTMORE(state,value){
state.isSelectMore = value state.isSelectMore = value
}, },
...@@ -62,7 +67,8 @@ const user = { ...@@ -62,7 +67,8 @@ const user = {
id: value[i].id, id: value[i].id,
user: { user: {
name: value[i].userBo.nickname, name: value[i].userBo.nickname,
img: value[i].userBo.avatar img: value[i].userBo.avatar,
id:value[i].userBo.userId
}, },
page: 1, page: 1,
rows: 30, rows: 30,
...@@ -86,7 +92,8 @@ const user = { ...@@ -86,7 +92,8 @@ const user = {
id: value[i].id, id: value[i].id,
user: { user: {
name: value[i].userBo.nickname, name: value[i].userBo.nickname,
img: value[i].userBo.avatar img: value[i].userBo.avatar,
id:value[i].userBo.userId
}, },
page: 1, page: 1,
rows: 30, rows: 30,
...@@ -131,7 +138,7 @@ const user = { ...@@ -131,7 +138,7 @@ const user = {
}).catch(error => { }).catch(error => {
reject(error) reject(error)
}) })
}) })
}, },
init ({ commit, state }) { init ({ commit, state }) {
state.wsObject.emit('appevent', { state.wsObject.emit('appevent', {
...@@ -168,34 +175,50 @@ const user = { ...@@ -168,34 +175,50 @@ const user = {
connected({ state, commit }) { connected({ state, commit }) {
state.wsObject state.wsObject
.on('messages/message', (data, callback) => { .on('messages/message', (data, callback) => {
commit('SEND_MESSAGE', [data]) if(isSend){
callback() isSend = false
}else{
commit('SEND_MESSAGE', [data])
callback()
}
}) })
.on('conversations/index', (data, callback) => { .on('conversations/index', (data, callback) => {
console.log(data)
commit('SET_CHART_LIST', data) commit('SET_CHART_LIST', data)
}) })
.on('conversations/friend', (data, callback) => { .on('conversations/friend', (data, callback) => {
console.log(data) console.log(data)
}) })
.on('messages/index', (data, callback) => { .on('messages/index', (data, callback) => {
console.log(45454545454545454) if(isSend){
commit('CHANGE_ISSELECTMORE',false) isSend = false
callback(true) }else{
data&&commit('ADD_MESSAGE', data) commit('CHANGE_ISSELECTMORE',false)
!data&&state.messagesPage-- callback(true)
data&&commit('ADD_MESSAGE', data)
!data&&state.messagesPage--
}
}) })
.on('conversations/show', (data, callback) => { .on('conversations/show', (data, callback) => {
const tempChatlist = state.tempChatlist let { tempChatlist, userInfo: { customerId } } = state
for(let j in tempChatlist){ if(data!=null&&data.userBo.primaryBindCustomerId!= customerId){
if(tempChatlist[j].id==data.id){ let temp = null
let tempMessages = [...tempChatlist[j].messages] let isNew = true
tempChatlist[j] = data const { chartings } = state
tempChatlist[j].messages= tempMessages for(let i in state.chatlist){
if(state.chatlist[i].id == data.id){
temp = Object.assign(state.chatlist[i])
isNew = false
state.chatlist.splice(i, 1);
}
} }
} if(isNew){
commit('SET_CHART_LIST', tempChatlist) let list = [data].concat(tempChatlist)
commit('SET_CHART_LIST', list)
}else{
let list = [temp].concat(state.chatlist)
commit('SET_CHARTING_LIST', list)
}
}
}) })
.on('conversions/search', (data, callback) => { .on('conversions/search', (data, callback) => {
callback() callback()
...@@ -237,8 +260,7 @@ const user = { ...@@ -237,8 +260,7 @@ const user = {
} }
} }
} }
} }
commit('SELECT_SEESION', conversation) commit('SELECT_SEESION', conversation)
}, },
selectMessage({ commit, state }, message){ selectMessage({ commit, state }, message){
...@@ -289,21 +311,93 @@ const user = { ...@@ -289,21 +311,93 @@ const user = {
conversationId:conversation.id, conversationId:conversation.id,
type: conversation.type, type: conversation.type,
isSend:1, isSend:1,
imageUrl: conversation.imageUrl,
content: conversation.content, content: conversation.content,
createTime: Date.parse(new Date()) createTime: Date.parse(new Date())
} }
isSend=true
commit('SEND_MESSAGE', [temp]) commit('SEND_MESSAGE', [temp])
}, },
search: ({ commit }, value) => { getTranster({ commit, state }, prams){
setTimeout(() => { let { chartings, selectId, userInfo: { customerId } } = state
commit('search', value) let customerdeId =null
}, 100) for(let tob of chartings){
if(tob.id==selectId){
customerdeId = tob.user.id
}
}
return new Promise((resolve, reject) => {
service.chart.getTransfer({
userId:customerdeId,
customerId
}).then(response=>{
if(response.code==200){
resolve(response.data)
}else{
reject(response)
}
}).catch(error => {
reject(error)
})
})
},
toTranster({ commit, state }, prams){
let { chartings, chatlist, selectId, userInfo: { customerId } } = state
let tempUserId =null
for(let tob of chartings){
if(tob.id==selectId){
tempUserId = tob.user.id
}
}
prams.userId = tempUserId
prams.fromCustomerId = customerId
return new Promise((resolve, reject) => {
service.chart.toTrensfer(prams).then(response=>{
if(response.code==200){
resolve(response.data)
for(let i in chatlist){
if(chatlist[i].id == selectId){
chatlist.splice(i, 1);
}
}
commit('SET_CHARTING_LIST', chatlist)
}else{
reject(response)
}
}).catch(error => {
reject(error)
})
})
}, },
// selectSession: ({ commit }, value) => commit('selectSession', value), closeTake({ commit, state }, prams){
selectFriend: ({ commit }, value) => commit('selectFriend', value), let { chartings, chatlist, selectId, userInfo: { customerId } } = state
// sendMessage: ({ commit }, msg) => commit('sendMessage', msg), let customerdeId =null
send: ({ commit }) => commit('send'), for(let tob of chartings){
initData: ({ commit }) => commit('initData') if(tob.id==selectId){
customerdeId = tob.user.id
}
}
return new Promise((resolve, reject) => {
service.chart.closeSession({
userId:customerdeId,
customerId
}).then(response=>{
if(response.code==200){
resolve(response.data)
for(let i in chatlist){
if(chatlist[i].id == selectId){
chatlist.splice(i, 1);
}
}
commit('SET_CHARTING_LIST', chatlist)
}else{
reject(response)
}
}).catch(error => {
reject(error)
})
})
}
} }
} }
export default user export default user
\ No newline at end of file
src/utils/request.js
View file @ 4c293573
...@@ -31,6 +31,9 @@ service.interceptors.response.use( ...@@ -31,6 +31,9 @@ service.interceptors.response.use(
* code为非20000是抛错 可结合自己业务进行修改 * code为非20000是抛错 可结合自己业务进行修改
*/ */
// const res = response.data // const res = response.data
if(response.data.code != 200){
Message.error(response.data.message);
}
return response.data return response.data
// if (res.code !== 20000) { // if (res.code !== 20000) {
// Message({ // Message({
......
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