Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

package-lock.json

@@ -5191,8 +5191,13 @@
     },
     "echarts": {
       "version": "5.2.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.2.1.tgz",
+      "integrity": "sha512-OJ79b22eqRfbSV8vYmDKmA+XWfNbr0Uk/OafWcFNIGDWti2Uw9A6eVCiJLmqPa9Sk+EWL+t5v26aak0z3gxiZw==",
+=======
       "resolved": "https://registry.nlark.com/echarts/download/echarts-5.2.1.tgz?cache=0&sync_timestamp=1632191214180&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fecharts%2Fdownload%2Fecharts-5.2.1.tgz",
       "integrity": "sha1-vVjsARzYLe9KcU5AOO9Lc7hBe8M=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
       "requires": {
         "tslib": "2.3.0",
         "zrender": "5.2.1"
@@ -5200,8 +5205,13 @@
       "dependencies": {
         "tslib": {
           "version": "2.3.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+=======
           "resolved": "https://registry.nlark.com/tslib/download/tslib-2.3.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.0.tgz",
           "integrity": "sha1-gDuM2rPhK6WBpMpByIObuw2ssJ4="
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
         }
       }
     },
@@ -6228,8 +6238,13 @@
     },
     "fork-ts-checker-webpack-plugin-v5": {
       "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
+      "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
+=======
       "resolved": "https://registry.npmmirror.com/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-5.2.1.tgz",
       "integrity": "sha1-eTJthpeXkG+osk4qvPlCH8gFRQ0=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
       "dev": true,
       "optional": true,
       "requires": {
@@ -6248,8 +6263,13 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+=======
           "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6258,8 +6278,13 @@
         },
         "chalk": {
           "version": "4.1.2",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+=======
           "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
           "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6269,8 +6294,13 @@
         },
         "color-convert": {
           "version": "2.0.1",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+=======
           "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6279,8 +6309,13 @@
         },
         "cosmiconfig": {
           "version": "6.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+          "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+=======
           "resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-6.0.0.tgz?cache=0&sync_timestamp=1629602330801&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-6.0.0.tgz",
           "integrity": "sha1-2k/uhTxS9rHmk19BwaL8UL1KmYI=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6293,15 +6328,25 @@
         },
         "deepmerge": {
           "version": "4.2.2",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+=======
           "resolved": "https://registry.nlark.com/deepmerge/download/deepmerge-4.2.2.tgz",
           "integrity": "sha1-RNLqNnm49NT/ujPwPYZfwee/SVU=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true
         },
         "fs-extra": {
           "version": "9.1.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+=======
           "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-9.1.0.tgz",
           "integrity": "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6313,15 +6358,25 @@
         },
         "has-flag": {
           "version": "4.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+=======
           "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true
         },
         "jsonfile": {
           "version": "6.1.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+=======
           "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
           "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6331,8 +6386,13 @@
         },
         "lru-cache": {
           "version": "6.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+=======
           "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz",
           "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6341,8 +6401,13 @@
         },
         "schema-utils": {
           "version": "2.7.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+=======
           "resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1626694835325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz",
           "integrity": "sha1-FxUfdtjq5n+793lgwzxnatn078c=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6353,8 +6418,13 @@
         },
         "semver": {
           "version": "7.3.5",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+=======
           "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
           "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6363,8 +6433,13 @@
         },
         "supports-color": {
           "version": "7.2.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+=======
           "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -6373,8 +6448,13 @@
         },
         "universalify": {
           "version": "2.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+=======
           "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
           "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true
         }
@@ -8565,8 +8645,13 @@
     },
     "memfs": {
       "version": "3.3.0",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz",
+      "integrity": "sha512-BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg==",
+=======
       "resolved": "https://registry.nlark.com/memfs/download/memfs-3.3.0.tgz",
       "integrity": "sha1-TaLR/ECgSxcKVmIscWTGvixMvvI=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
       "dev": true,
       "optional": true,
       "requires": {
@@ -12901,8 +12986,13 @@
     },
     "vue-loader-v16": {
       "version": "npm:vue-loader@16.8.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
+      "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
+=======
       "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632349858333&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
       "integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
       "dev": true,
       "optional": true,
       "requires": {
@@ -12913,8 +13003,13 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+=======
           "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -12923,8 +13018,13 @@
         },
         "chalk": {
           "version": "4.1.2",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+=======
           "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
           "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -12934,8 +13034,13 @@
         },
         "color-convert": {
           "version": "2.0.1",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+=======
           "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -12944,15 +13049,25 @@
         },
         "has-flag": {
           "version": "4.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+=======
           "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true
         },
         "loader-utils": {
           "version": "2.0.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+=======
           "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
           "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -12963,8 +13078,13 @@
         },
         "supports-color": {
           "version": "7.2.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+=======
           "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
           "dev": true,
           "optional": true,
           "requires": {
@@ -13955,16 +14075,26 @@
     },
     "zrender": {
       "version": "5.2.1",
+<<<<<<< HEAD
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.2.1.tgz",
+      "integrity": "sha512-M3bPGZuyLTNBC6LiNKXJwSCtglMp8XUEqEBG+2MdICDI3d1s500Y4P0CzldQGsqpRVB7fkvf3BKQQRxsEaTlsw==",
+=======
       "resolved": "https://registry.nlark.com/zrender/download/zrender-5.2.1.tgz",
       "integrity": "sha1-X0u9qRW6bUErCxncJDG+qtBUF7s=",
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
       "requires": {
         "tslib": "2.3.0"
       },
       "dependencies": {
         "tslib": {
           "version": "2.3.0",
+<<<<<<< HEAD
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+          "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+=======
           "resolved": "https://registry.nlark.com/tslib/download/tslib-2.3.0.tgz?cache=0&sync_timestamp=1628722556410&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftslib%2Fdownload%2Ftslib-2.3.0.tgz",
           "integrity": "sha1-gDuM2rPhK6WBpMpByIObuw2ssJ4="
+>>>>>>> d75268513425dcf4c74db37b8a6dd59085c59e8e
         }
       }
     }

src/services/socket/quota/adapter/index.ts

@@ -9,6 +9,7 @@ import { Package40 } from '@/utils/websocket/package';
 import Long from 'long';
 import { SubscribeInfoType } from '../interface';
 import { byteArrayToUInt, subscribeInfosToByteArrary } from './byteUtils';
+import moment from 'moment';
 
 /**
  * 构建行情订阅请求包
@@ -43,10 +44,13 @@ export function parseSubscribeRsp(rspPackage: any): Promise<string | SubscribeIn
         switch (count) {
             case -1:
                 reject('订阅失败');
+                break;
             case -2:
                 reject('Token校验失败');
+                break;
             case -3:
                 reject('无对应商品信息');
+                break;
             default:
                 break;
         }
@@ -161,6 +165,8 @@ export function parseReceivePush(quotationData: any) {
                 goodsQuoteTik.preclose = goodsQuoteTik.preclose ? (fn(goodsQuoteTik.preclose)) : '--'
                 goodsQuoteTik.settle = goodsQuoteTik.settle ? (fn(goodsQuoteTik.settle)) : '--'
                 goodsQuoteTik.strikeprice = goodsQuoteTik.strikeprice ? (fn(goodsQuoteTik.strikeprice)) : '--'
+                
+                goodsQuoteTik.lasttime = moment(goodsQuoteTik.date + goodsQuoteTik.time, 'YYYYMMDDHHmmss').format('YYYY-MM-DD HH:mm:ss')
 
                 // !goodsQuoteTik.bidvolume && (goodsQuoteTik.bidvolume = '--')
                 // !goodsQuoteTik.askvolume && (goodsQuoteTik.askvolume = '--')
@@ -175,7 +181,13 @@ export function parseReceivePush(quotationData: any) {
 
             // 注意：此处已 go 服务查询出来的盘面数据为基准，查询盘面 先修改成go 服务，第一次进入项目时候回查询一次所有盘面
             // 之前是 通过 websocket 查询的，故 可能存在字段发生变化问题，如遇到，则进行优化处理
-            mergeObj(itemQuote, goodsQuoteTik);
+            
+            // 判断是一下行情时间是否比现在的要早
+            const quoteTime = moment(goodsQuoteTik.lasttime, 'YYYY-MM-DD HH:mm:ss')
+            const localTime = moment(itemQuote.lasttime, 'YYYY-MM-DD HH:mm:ss')
+            if (quoteTime >= localTime) {
+                mergeObj(itemQuote, goodsQuoteTik);
+            }
         } else {
             // 此处 待优化（存在字段变化问题）
             quoteDayInfo.push(itemQuote);