Merge branch 'feature/task1.0.0-0507-zz' into msb_test

merge-requests/89/merge
张征 2 years ago
commit ae326e6f6b

@ -78,12 +78,13 @@
</div> </div>
<div class="address__msg-line flex flex-middle"> <div class="address__msg-line flex flex-middle">
<span class="address__msg-line--type">收货人</span> <span class="address__msg-line--type">收货人</span>
<el-input v-model="addressUser" class="min-ipt"></el-input> <el-input v-model="addressUser" class="min-ipt" maxlength="8"></el-input>
<span class="address__msg-line--type">手机号码</span> <span class="address__msg-line--type">手机号码</span>
<el-input <el-input
v-model="addressPhone" v-model="addressPhone"
oninput="value=value.replace(/[^\d]/g,'')" oninput="value=value.replace(/[^\d]/g,'')"
class="min-ipt" class="min-ipt"
maxlength="18"
></el-input> ></el-input>
</div> </div>
</article> </article>

@ -12,7 +12,7 @@ function guid() {
Vue.prototype.$startWebSockets = function () { Vue.prototype.$startWebSockets = function () {
console.log(); console.log();
let token = this.$cookies.get(TOKEN_KEY); let token = this.$cookies.get(TOKEN_KEY);
if (token&&!Vue.prototype.Socket) { if (token && !Vue.prototype.Socket) {
let url = `wss://k8s-horse-gateway.mashibing.cn/ws?client=${token}&type=1`; let url = `wss://k8s-horse-gateway.mashibing.cn/ws?client=${token}&type=1`;
Vue.prototype.Socket = new WebSocket(url); Vue.prototype.Socket = new WebSocket(url);
Vue.prototype.Socket.onopen = () => { Vue.prototype.Socket.onopen = () => {
@ -40,17 +40,19 @@ Vue.prototype.$startWebSockets = function () {
if (msg.traceType == 1) { if (msg.traceType == 1) {
let traceId = guid(); let traceId = guid();
let sys = msg.content.sessionVOS.find((item) => item.type != 3); let sys = msg.content.sessionVOS.find((item) => item.type != 3);
let str = `{"traceId":"${traceId}",traceType:2,"content":{"sessionId":${sys.id}}}`; if (sys) {
Vue.prototype.Socket.send(str); let str = `{"traceId":"${traceId}",traceType:2,"content":{"sessionId":${sys.id}}}`;
this.$store.commit("setUnreadCount", msg.content.totalUnreadCount); Vue.prototype.Socket.send(str);
this.$store.commit("setUnreadCount", msg.content.totalUnreadCount);
}
} }
// 获取消息列表 // 获取消息列表
if (msg.traceType == 2) { if (msg.traceType == 2) {
this.$store.commit("setSocketMsgData", msg.content); this.$store.commit("setSocketMsgData", msg.content);
setTimeout(()=>{ setTimeout(() => {
console.log(this.$store.state) console.log(this.$store.state);
},500) }, 500);
} }
// 接收消息 // 接收消息

Loading…
Cancel
Save