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

components/BsAddress.vue

@@ -78,12 +78,13 @@
         </div>
         <div class="address__msg-line flex flex-middle">
           <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>
           <el-input
             v-model="addressPhone"
             oninput="value=value.replace(/[^\d]/g,'')"
             class="min-ipt"
+            maxlength="18"
           ></el-input>
         </div>
       </article>

plugins/im.js

@@ -12,7 +12,7 @@ function guid() {
 Vue.prototype.$startWebSockets = function () {
   console.log();
   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`;
     Vue.prototype.Socket = new WebSocket(url);
     Vue.prototype.Socket.onopen = () => {
@@ -40,17 +40,19 @@ Vue.prototype.$startWebSockets = function () {
       if (msg.traceType == 1) {
         let traceId = guid();
         let sys = msg.content.sessionVOS.find((item) => item.type != 3);
-        let str = `{"traceId":"${traceId}",traceType:2,"content":{"sessionId":${sys.id}}}`;
-        Vue.prototype.Socket.send(str);
-        this.$store.commit("setUnreadCount", msg.content.totalUnreadCount);
+        if (sys) {
+          let str = `{"traceId":"${traceId}",traceType:2,"content":{"sessionId":${sys.id}}}`;
+          Vue.prototype.Socket.send(str);
+          this.$store.commit("setUnreadCount", msg.content.totalUnreadCount);
+        }
       }
 
       // 获取消息列表
       if (msg.traceType == 2) {
         this.$store.commit("setSocketMsgData", msg.content);
-        setTimeout(()=>{
-          console.log(this.$store.state)
-        },500)
+        setTimeout(() => {
+          console.log(this.$store.state);
+        }, 500);
       }
 
       // 接收消息