Commit 12541cc5 authored by 黄奎's avatar 黄奎

页面修改

parent 906a8cc5
...@@ -5007,7 +5007,6 @@ ...@@ -5007,7 +5007,6 @@
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'resssssssss');
this.OrderDataList = res.data.data; this.OrderDataList = res.data.data;
this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney this.IsUpdateOrderMoney = res.data.data.IsUpdateOrderMoney
} }
......
...@@ -655,13 +655,11 @@ export default { ...@@ -655,13 +655,11 @@ export default {
}else if(this.index1 + 1==3){ }else if(this.index1 + 1==3){
period=this.yearVal period=this.yearVal
} }
console.log(this.yearVal,this.weekVal,this.monthVal)
let msg = { let msg = {
timeRange: this.index1 + 1, timeRange: this.index1 + 1,
userRange: this.index2 + 1, userRange: this.index2 + 1,
period period
}; };
console.log(msg)
this.apipost("user_get_usedsixSatistics", msg, r => { this.apipost("user_get_usedsixSatistics", msg, r => {
if(r.data.data && r.data.data.length>0){ if(r.data.data && r.data.data.length>0){
this.tableData = this.orderBy( this.tableData = this.orderBy(
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -303,9 +303,6 @@ ...@@ -303,9 +303,6 @@
methods: { methods: {
//非直采切换 //非直采切换
NoDirectScenicCheck(number) { NoDirectScenicCheck(number) {
// this.dayObj.ScenicArray.forEach(x=>{
// x.ScenicJson = x.ScenicJsonStr ? JSON.parse(x.ScenicJsonStr) : { x:0, y:0 };
// })
if (this.dayObj.ScenicArray == null) { if (this.dayObj.ScenicArray == null) {
this.dayObj.ScenicArray = []; this.dayObj.ScenicArray = [];
} }
......
...@@ -2,7 +2,7 @@ import store from '../' ...@@ -2,7 +2,7 @@ import store from '../'
import config from '../../configs' import config from '../../configs'
import util from '../../utils' import util from '../../utils'
export function formatMsg (msg) { export function formatMsg(msg) {
const nim = store.state.nim const nim = store.state.nim
if (msg.type === 'robot') { if (msg.type === 'robot') {
if (msg.content && msg.content.flag === 'bot') { if (msg.content && msg.content.flag === 'bot') {
...@@ -25,21 +25,21 @@ export function formatMsg (msg) { ...@@ -25,21 +25,21 @@ export function formatMsg (msg) {
return msg return msg
} }
export function onRoamingMsgs (obj) { export function onRoamingMsgs(obj) {
let msgs = obj.msgs.map(msg => { let msgs = obj.msgs.map(msg => {
return formatMsg(msg) return formatMsg(msg)
}) })
store.commit('updateMsgs', msgs) store.commit('updateMsgs', msgs)
} }
export function onOfflineMsgs (obj) { export function onOfflineMsgs(obj) {
let msgs = obj.msgs.map(msg => { let msgs = obj.msgs.map(msg => {
return formatMsg(msg) return formatMsg(msg)
}) })
store.commit('updateMsgs', msgs) store.commit('updateMsgs', msgs)
} }
export function onMsg (msg) { export function onMsg(msg) {
msg = formatMsg(msg) msg = formatMsg(msg)
store.commit('putMsg', msg) store.commit('putMsg', msg)
if (msg.sessionId === store.state.currSessionId) { if (msg.sessionId === store.state.currSessionId) {
...@@ -52,7 +52,7 @@ export function onMsg (msg) { ...@@ -52,7 +52,7 @@ export function onMsg (msg) {
} }
} }
function onSendMsgDone (error, msg) { function onSendMsgDone(error, msg) {
store.dispatch('hideLoading') store.dispatch('hideLoading')
if (error) { if (error) {
// 被拉黑 // 被拉黑
...@@ -67,7 +67,7 @@ function onSendMsgDone (error, msg) { ...@@ -67,7 +67,7 @@ function onSendMsgDone (error, msg) {
} }
// 消息撤回 // 消息撤回
export function onRevocateMsg (error, msg) { export function onRevocateMsg(error, msg) {
const nim = store.state.nim const nim = store.state.nim
if (error) { if (error) {
if (error.code === 508) { if (error.code === 508) {
...@@ -94,7 +94,7 @@ export function onRevocateMsg (error, msg) { ...@@ -94,7 +94,7 @@ export function onRevocateMsg (error, msg) {
to: msg.to, to: msg.to,
tip, tip,
time: msg.time, time: msg.time,
done: function sendTipMsgDone (error, tipMsg) { done: function sendTipMsgDone(error, tipMsg) {
let idClient = msg.deletedIdClient || msg.idClient let idClient = msg.deletedIdClient || msg.idClient
store.commit('replaceMsg', { store.commit('replaceMsg', {
sessionId: msg.sessionId, sessionId: msg.sessionId,
...@@ -112,20 +112,28 @@ export function onRevocateMsg (error, msg) { ...@@ -112,20 +112,28 @@ export function onRevocateMsg (error, msg) {
}) })
} }
export function revocateMsg ({state, commit}, msg) { export function revocateMsg({
state,
commit
}, msg) {
const nim = state.nim const nim = state.nim
let {idClient} = msg let {
idClient
} = msg
msg = Object.assign(msg, state.msgsMap[idClient]) msg = Object.assign(msg, state.msgsMap[idClient])
nim.deleteMsg({ nim.deleteMsg({
msg, msg,
done: function deleteMsgDone (error) { done: function deleteMsgDone(error) {
onRevocateMsg(error, msg) onRevocateMsg(error, msg)
} }
}) })
} }
// 发送普通消息 // 发送普通消息
export function sendMsg ({state, commit}, obj) { export function sendMsg({
state,
commit
}, obj) {
const nim = state.nim const nim = state.nim
obj = obj || {} obj = obj || {}
let type = obj.type || '' let type = obj.type || ''
...@@ -152,13 +160,16 @@ export function sendMsg ({state, commit}, obj) { ...@@ -152,13 +160,16 @@ export function sendMsg ({state, commit}, obj) {
} }
} }
export function sendTip ({state, commit}, obj) { export function sendTip({
state,
commit
}, obj) {
const nim = store.state.nim const nim = store.state.nim
nim.sendTipMsg({ nim.sendTipMsg({
scene: obj.scene, scene: obj.scene,
to: obj.to, to: obj.to,
tip: obj.tip, tip: obj.tip,
done: function sendTipMsgDone (error, msg) { done: function sendTipMsgDone(error, msg) {
// 超哥 do something // 超哥 do something
onSendMsgDone(error, msg) onSendMsgDone(error, msg)
} }
...@@ -166,9 +177,16 @@ export function sendTip ({state, commit}, obj) { ...@@ -166,9 +177,16 @@ export function sendTip ({state, commit}, obj) {
} }
// 发送文件消息 // 发送文件消息
export function sendFileMsg ({state, commit}, obj) { export function sendFileMsg({
state,
commit
}, obj) {
const nim = state.nim const nim = state.nim
let {scene, to, fileInput} = obj let {
scene,
to,
fileInput
} = obj
let type = 'file' let type = 'file'
if (/\.(png|jpg|bmp|jpeg|gif)$/i.test(fileInput.value)) { if (/\.(png|jpg|bmp|jpeg|gif)$/i.test(fileInput.value)) {
type = 'image' type = 'image'
...@@ -191,7 +209,7 @@ export function sendFileMsg ({state, commit}, obj) { ...@@ -191,7 +209,7 @@ export function sendFileMsg ({state, commit}, obj) {
}, },
beforesend: function (msg) { beforesend: function (msg) {
}, },
done: function (error, msg) { done: function (error, msg) {
onSendMsgDone(error, msg) onSendMsgDone(error, msg)
...@@ -199,16 +217,26 @@ export function sendFileMsg ({state, commit}, obj) { ...@@ -199,16 +217,26 @@ export function sendFileMsg ({state, commit}, obj) {
}) })
} }
export function sendDataUrlMsg ({state, commit}, obj) { export function sendDataUrlMsg({
state,
commit
}, obj) {
const nim = state.nim const nim = state.nim
let {scene, to, dataURL, name} = obj let {
scene,
to,
dataURL,
name
} = obj
let type = 'file' let type = 'file'
if (/(png|jpg|bmp|jpeg|gif)$/i.test(name)) { if (/(png|jpg|bmp|jpeg|gif)$/i.test(name)) {
type = 'image' type = 'image'
} else if (/(mov|mp4|ogg|webm)$/i.test(name)) { } else if (/(mov|mp4|ogg|webm)$/i.test(name)) {
type = 'video' type = 'video'
} }
let otherMsg = {'fileName': name} let otherMsg = {
'fileName': name
}
store.dispatch('showLoading') store.dispatch('showLoading')
nim.sendFile({ nim.sendFile({
scene: scene, scene: scene,
...@@ -217,7 +245,7 @@ export function sendDataUrlMsg ({state, commit}, obj) { ...@@ -217,7 +245,7 @@ export function sendDataUrlMsg ({state, commit}, obj) {
dataURL: dataURL, dataURL: dataURL,
custom: JSON.stringify(otherMsg), custom: JSON.stringify(otherMsg),
uploadprogress: function (data) { uploadprogress: function (data) {
}, },
uploaderror: function () { uploaderror: function () {
console && console.log('上传失败') console && console.log('上传失败')
...@@ -235,9 +263,21 @@ export function sendDataUrlMsg ({state, commit}, obj) { ...@@ -235,9 +263,21 @@ export function sendDataUrlMsg ({state, commit}, obj) {
} }
// 发送机器人消息 // 发送机器人消息
export function sendRobotMsg ({state, commit}, obj) { export function sendRobotMsg({
state,
commit
}, obj) {
const nim = state.nim const nim = state.nim
let {type, scene, to, robotAccid, content, params, target, body} = obj let {
type,
scene,
to,
robotAccid,
content,
params,
target,
body
} = obj
scene = scene || 'p2p' scene = scene || 'p2p'
if (type === 'text') { if (type === 'text') {
nim.sendRobotMsg({ nim.sendRobotMsg({
...@@ -279,7 +319,10 @@ export function sendRobotMsg ({state, commit}, obj) { ...@@ -279,7 +319,10 @@ export function sendRobotMsg ({state, commit}, obj) {
} }
// 发送消息已读回执 // 发送消息已读回执
export function sendMsgReceipt ({state, commit}) { export function sendMsgReceipt({
state,
commit
}) {
// 如果有当前会话 // 如果有当前会话
let currSessionId = store.state.currSessionId let currSessionId = store.state.currSessionId
if (currSessionId) { if (currSessionId) {
...@@ -290,7 +333,7 @@ export function sendMsgReceipt ({state, commit}) { ...@@ -290,7 +333,7 @@ export function sendMsgReceipt ({state, commit}) {
if (state.sessionMap[currSessionId]) { if (state.sessionMap[currSessionId]) {
nim.sendMsgReceipt({ nim.sendMsgReceipt({
msg: state.sessionMap[currSessionId].lastMsg, msg: state.sessionMap[currSessionId].lastMsg,
done: function sendMsgReceiptDone (error, obj) { done: function sendMsgReceiptDone(error, obj) {
// do something // do something
} }
}) })
...@@ -299,21 +342,27 @@ export function sendMsgReceipt ({state, commit}) { ...@@ -299,21 +342,27 @@ export function sendMsgReceipt ({state, commit}) {
} }
} }
function sendMsgReceiptDone (error, obj) { function sendMsgReceiptDone(error, obj) {
console.log('发送消息已读回执' + (!error ? '成功' : '失败'), error, obj) console.log('发送消息已读回执' + (!error ? '成功' : '失败'), error, obj)
} }
export function getHistoryMsgs ({state, commit}, obj) { export function getHistoryMsgs({
state,
commit
}, obj) {
const nim = state.nim const nim = state.nim
if (nim) { if (nim) {
let {scene, to} = obj let {
scene,
to
} = obj
let options = { let options = {
scene, scene,
to, to,
reverse: false, reverse: false,
asc: true, asc: true,
limit: config.localMsglimit || 20, limit: config.localMsglimit || 20,
done: function getHistoryMsgsDone (error, obj) { done: function getHistoryMsgsDone(error, obj) {
if (obj.msgs) { if (obj.msgs) {
if (obj.msgs.length === 0) { if (obj.msgs.length === 0) {
commit('setNoMoreHistoryMsgs') commit('setNoMoreHistoryMsgs')
...@@ -341,11 +390,15 @@ export function getHistoryMsgs ({state, commit}, obj) { ...@@ -341,11 +390,15 @@ export function getHistoryMsgs ({state, commit}, obj) {
} }
} }
export function resetNoMoreHistoryMsgs ({commit}) { export function resetNoMoreHistoryMsgs({
commit
}) {
commit('resetNoMoreHistoryMsgs') commit('resetNoMoreHistoryMsgs')
} }
// 继续与机器人会话交互 // 继续与机器人会话交互
export function continueRobotMsg ({commit}, robotAccid) { export function continueRobotMsg({
commit
}, robotAccid) {
commit('continueRobotMsg', robotAccid) commit('continueRobotMsg', robotAccid)
} }
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