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

src/pages/system/dataStatistics/cardCouponUsedList/index.vue

@@ -202,9 +202,6 @@ export default {
       }, {
         value: '已使用',
         id: 'used'
-      }, {
-        value: '逾期核销',
-        id: 'late'
       }, {
         value: '已失效',
         id: 'expire'

src/pages/system/dataStatistics/courseVerifyList/index.vue

@@ -105,7 +105,7 @@
           prop="Status"
           label="状态">
           <template slot-scope="scope">
-            {{scope.row.Status === 'useable' ? '未使用' : scope.row.Status === 'used' ? '已使用' : scope.row.Status === 'late' ? '逾期核销' : ''}}
+            {{scope.row.VerifyStatus === 'useable' ? '未使用' : scope.row.VerifyStatus === 'used' ? '已使用' : scope.row.VerifyStatus === 'late' ? '逾期核销' : ''}}
           </template>
         </el-table-column>
       </el-table>

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 {