Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

src/pages/system/newOrder/newOrderList/index.vue

@@ -257,11 +257,10 @@ export default {
     },
     initWebSocket () {
       // console.log(this.user)
-      const wsPath = this.$api.system.notify.newGoodsOrders.url
-      const wsRealPath = replaceURLParams(wsPath, { grps: caseid, id })
-
       let caseid = this.caseid
       let id = this.userInfo.UserId
+      const wsPath = this.$api.system.notify.newGoodsOrders.url
+      const wsRealPath = replaceURLParams(wsPath, { grps: caseid, id })
       const wsuri = `${window.location.origin.replace('http', 'ws')}${wsRealPath}?token=${localStorage.getItem('JWT')}`
       // const wsuri = `ws://192.168.0.11/api/guest/MQ/websocket/${caseid}/${id}`
       try {

src/util/ajax.js

@@ -81,7 +81,7 @@ const ajax = (...args) => {
 
 export default ajax
 
-export function replaceURLParams(url, params) {
+export function replaceURLParams (url, params) {
   const args = { ...(params || {}), org: 'MQ' }
 
   return Object.keys(args).reduce((acc, k) => { // 此方法对每个元素进行处理