package-lock.json

@@ -11,7 +11,10 @@
         "axios": "^0.27.2",
         "crypto-js": "^3.1.9-1",
         "element-ui": "^2.8.2",
+        "js-cookie": "^3.0.1",
+        "qrcodejs2": "0.0.2",
         "vue": "^2.6.6",
+        "vue-infinite-scroll": "^2.0.2",
         "vue-router": "^3.0.1",
         "vuex": "^3.0.1"
       },
@@ -8692,7 +8695,7 @@
     },
     "node_modules/fsevents/node_modules/ansi-regex": {
       "version": "2.1.1",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8720,7 +8723,7 @@
     },
     "node_modules/fsevents/node_modules/balanced-match": {
       "version": "1.0.0",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "integrity": "sha512-9Y0g0Q8rmSt+H33DfKv7FOc3v+iRI+o1lbzt8jGcIosYW37IIW/2XVYq5NPdmaD5NQ59Nk26Kl/vZbwW9Fr8vg==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -12681,6 +12684,14 @@
         "js-beautify": "js/bin/js-beautify.js"
       }
     },
+    "node_modules/js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz",
@@ -16144,6 +16155,11 @@
         "teleport": ">=0.2.0"
       }
     },
+    "node_modules/qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
+    },
     "node_modules/qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
@@ -19304,6 +19320,11 @@
       "integrity": "sha1-J1b0bLMlgFTF9HI96K5+hzAqHM8=",
       "dev": true
     },
+    "node_modules/vue-infinite-scroll": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz",
+      "integrity": "sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A=="
+    },
     "node_modules/vue-jest": {
       "version": "3.0.4",
       "resolved": "https://registry.npm.taobao.org/vue-jest/download/vue-jest-3.0.4.tgz",
@@ -28311,28 +28332,24 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
-          "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
-          "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28343,14 +28360,12 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28361,42 +28376,36 @@
         },
         "chownr": {
           "version": "1.1.1",
-          "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "debug": {
           "version": "4.1.1",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28406,28 +28415,24 @@
         },
         "deep-extend": {
           "version": "0.6.0",
-          "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-          "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28437,14 +28442,12 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28461,7 +28464,6 @@
         },
         "glob": {
           "version": "7.1.3",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28476,14 +28478,12 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28493,7 +28493,6 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28503,7 +28502,6 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28514,21 +28512,18 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
-          "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28538,14 +28533,12 @@
         },
         "isarray": {
           "version": "1.0.0",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28555,14 +28548,12 @@
         },
         "minimist": {
           "version": "0.0.8",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "minipass": {
           "version": "2.3.5",
-          "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28573,7 +28564,6 @@
         },
         "minizlib": {
           "version": "1.2.1",
-          "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28583,7 +28573,6 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28593,14 +28582,12 @@
         },
         "ms": {
           "version": "2.1.1",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
           "version": "2.3.0",
-          "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28612,7 +28599,6 @@
         },
         "node-pre-gyp": {
           "version": "0.12.0",
-          "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28631,7 +28617,6 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28642,14 +28627,12 @@
         },
         "npm-bundled": {
           "version": "1.0.6",
-          "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "npm-packlist": {
           "version": "1.4.1",
-          "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28660,7 +28643,6 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28673,21 +28655,18 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28697,21 +28676,18 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-          "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28722,21 +28698,18 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
-          "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28749,7 +28722,6 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "bundled": true,
               "dev": true,
               "optional": true
@@ -28758,7 +28730,6 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28774,7 +28745,6 @@
         },
         "rimraf": {
           "version": "2.6.3",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28784,49 +28754,42 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "semver": {
           "version": "5.7.0",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-          "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "string_decoder": {
           "version": "1.1.1",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28836,7 +28799,6 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28848,7 +28810,6 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28858,14 +28819,12 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
-          "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28881,14 +28840,12 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
-          "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -28898,14 +28855,12 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -31626,6 +31581,11 @@
         "nopt": "~4.0.1"
       }
     },
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
+    },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz",
@@ -34457,6 +34417,11 @@
       "integrity": "sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=",
       "dev": true
     },
+    "qrcodejs2": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha1-Rlr+Xjnxn6zsuTLBH3oYYQkUauE="
+    },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz",
@@ -37076,6 +37041,11 @@
       "integrity": "sha1-J1b0bLMlgFTF9HI96K5+hzAqHM8=",
       "dev": true
     },
+    "vue-infinite-scroll": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz",
+      "integrity": "sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A=="
+    },
     "vue-jest": {
       "version": "3.0.4",
       "resolved": "https://registry.npm.taobao.org/vue-jest/download/vue-jest-3.0.4.tgz",

package.json

@@ -15,7 +15,9 @@
     "crypto-js": "^3.1.9-1",
     "element-ui": "^2.8.2",
     "js-cookie": "^3.0.1",
+    "qrcodejs2": "0.0.2",
     "vue": "^2.6.6",
+    "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1"
   },

public/index.html

@@ -1,18 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>玖哩仪器操作平台</title>
-  </head>
-  <body>
-    <noscript>
-      <strong>您的浏览器版本较低，请升级最新版浏览器</strong>
-    </noscript>
-    <div id="app"></div>
-    <script src="https://ydcommon.51yund.com/vue/axios.min.js"></script>
-    <script src="https://ydcommon.51yund.com/vue/yd_collect2.js"></script>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <title>玖哩仪器操作平台</title>
+</head>
+
+<body>
+  <noscript>
+    <strong>您的浏览器版本较低，请升级最新版浏览器</strong>
+  </noscript>
+  <div id="app"></div>
+  <script src="https://ydcommon.51yund.com/vue/axios.min.js"></script>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>

src/common/utils.js

@@ -25,7 +25,7 @@ const utils = {
     }
     return fmt;
   },
- 
+
 
 }
 

src/components/common/layout/layout.vue

@@ -2,7 +2,8 @@
   <div class="layout">
     <div class="menu-wrapper">
       <left-menu :isCollapse='isFold'
-                 @changeMenu="changeMenu"></left-menu>
+                 @changeMenu="changeMenu"
+                 @changeIsBack="changeIsBack"></left-menu>
     </div>
     <div class="content">
       <header :style="menuIndex==0?'justify-content: space-between;':''">
@@ -41,6 +42,7 @@
 import leftMenu from './leftMenu'
 import api from '@/server/home'
 
+
 export default {
   data () {
     return {
@@ -76,6 +78,9 @@ export default {
     changeMenu (index) {
       this.menuIndex = index
     },
+    changeIsBack (isback) {
+      this.isback = isback
+    },
     goBack () {
       this.$router.back()
     }

src/components/common/layout/leftMenu.vue

@@ -88,8 +88,9 @@ export default {
   },
   watch: {
     $route (to, from) {
-      let patname = `/${window.location.pathname.split('/')[1]}`
-      console.log(patname, 'patname');
+      let patname = `/${window.location.hash.split('/')[1]}`
+      console.log(patname, 'patname', to);
+      this.$emit('changeIsBack', to.meta.isback)
       this.menu.forEach((item, index) => {
         if (patname == item.path) {
           this.nowIndex = index

src/main.js

@@ -7,6 +7,7 @@ import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import auth from './common/auth'
 import { injectGlobal } from './common/'
+import infiniteScroll from "vue-infinite-scroll";
 import './style/reset.less'
 import './style/common.less'
 import './assets/font/iconfont.css'
@@ -14,6 +15,8 @@ import './style/index.less'
 import './filters/filter'
 //全局注入
 Vue.use(ElementUI)
+Vue.use(infiniteScroll);
+
 injectGlobal()
 
 window.globalVue = "";

src/pages/confirmOrder/details/index.vue

@@ -12,7 +12,8 @@
         </div>
       </div>
       <div class="user-record">
-        <div class="fraction">
+        <div class="fraction"
+             @click="isPore=true">
           <div class="title">肌肤得分</div>
           <div class="num">{{userInfo.score}}分</div>
         </div>
@@ -82,7 +83,7 @@
       </div>
       <div class="project">
         <div class="project-title">
-          <div>共<span>{{order_data.project_list.length}}个</span>项目</div>
+          <div>共<span>{{order_data.project_list?order_data.project_list.length:0}}个</span>项目</div>
           <div class="add-project"
                @click="addProject">添加</div>
         </div>
@@ -116,25 +117,51 @@
            v-if="!isChange">
         <div class="cost-title">
           <div>预约费用</div>
-          <div>¥399</div>
+          <div>¥{{reservationPrice}}</div>
         </div>
         <div class="cost-coupon-list">
-          <div class="coupon">
+          <div class="coupon"
+               @click="onCoupon">
             <div class="coupon-tips">
               <div class="coupon-icon"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/couponIcon.png"
                      alt=""></div>
               <div class="coupon-title">优惠卷</div>
-              <div class="coupon-tip">已选推荐优惠</div>
+              <div class="coupon-tip"
+                   v-if="order_data.coupon_list&&order_data.coupon_list.length>0">已选推荐优惠</div>
             </div>
             <div class="on-icon">></div>
           </div>
-          <div class="coupon-ps">
-            <div>【敏感维稳】多元修护加乘维稳</div>
-            <div class="cou-price">-¥100</div>
+
+
+          <!-- <div v-if="order_data.coupon_list&&order_data.coupon_list.length>0">
+            <div class="coupon-ps"
+                 v-for="item,index in order_data.coupon_list"
+                 :key="index">
+              <div>{{item.coupon_name}}</div>
+              <div class="cou-price">-¥{{price}}</div>
+            </div>
+          </div> -->
+
+          <div v-if="1==1">
+            <div class="coupon-ps"
+                 v-for="item,index in isSelectCoup"
+                 :key="index">
+              <div>{{item.coupon_name}}</div>
+      <div class="cou-price" v-if="item.type==4?true:false">抵扣{{item.projectName}}</div>
+      <div class="cou-price" v-if="item.type==3?true:false">抵扣全部项目(除升级包)</div>
+      <div class="cou-price" v-if="item.type==2?true:false">¥{{item.price}}</div>
+      <div class="cou-price" v-if="item.type==1?true:false">¥{{item.price}}</div>
+                    <!-- <div class="cou-price">-¥{{price}}</div> -->
+            </div>
           </div>
+
+
+
+
+
         </div>
         <div class="over-price">
-          合计： <span class="price-num"><span class="min-size">￥</span>399<span class="min-size">.00</span></span>
+          合计： <span class="price-num"><span class="min-size">￥</span>{{showMoney}}<span class="min-size"></span></span>
         </div>
       </div>
       <div class="payment"
@@ -147,35 +174,43 @@
              @click="isCoupun=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
                alt=""></div>
         <div class="coupon-pupop-title">选择优惠券</div>
-        <div class="coupon-lists">
-          <div class="coupon-info">
+        <ul class="coupon-lists">
+          <li class="coupon-info"
+              v-for="item,index in couponList"
+              :key="index">
+  <!-- 1: '抵扣券',
+      2: '满减券',
+      3: '全额减免券',
+      4: '项目卡券' -->
+            <div class="coupon-tips-text">{{item.type==1?'抵扣券':item.type==2?'满减券':item.type==3?'全额减免券':'项目卡券'}}</div>
             <div class="top">
-              <div v-if="false"
-                   class="all-free">全免</div>
+              <div v-if="item.type==3"
+                   class="discount-over">全免</div>
               <div v-else
                    class="discount">
-                <div class="price-num"><span class="size">￥</span>10<span class="size">.00</span></div>
-                <div class="price-tips">满100元可用</div>
+                <div class="price-num"><span class="size">￥</span>{{item.price}}</div>
+                <div class="price-tips">{{item.full_price}}</div>
               </div>
               <div class="coupon-tip">
-                <div class="tips-title">仅限指定商品使用</div>
-                <div class="tips-ts">有效期至2022.02.07</div>
+                <div class="tips-title">{{item.coupon_name}}</div>
+                <div class="tips-ts">有效期至{{item.ex_time}}</div>
               </div>
-              <div class="choice-icon"><img :src="select"></div>
+              <div class="choice-icon"
+                   @click="selectPupop(item,index)"><img :src="item.isSelect?select:unSelect"></div>
             </div>
             <div class="bottom">
-              <div class="coupon-notes">
+              <div class="coupon-notes"
+                   @click="isOver=!isOver">
                 <div class="notes-text min-size">
-                  <span v-if="!isOver">{{'优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目' |ellipsis(20)}}</span>
-                  <span v-else>优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目优惠卷仅限试用项目优惠卷仅限试用项目优惠卷仅限项目</span>
+                  <span v-if="!isOver">{{item.coupon_desc |ellipsis(20)}}</span>
+                  <span v-else>{{item.coupon_desc}}</span>
                 </div>
-                <div class="notes-icon"
-                     @click="isOver=!isOver"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/openNotes.png"
+                <div class="notes-icon"><img :src="isOver?open:unOpen"
                        alt=""></div>
               </div>
             </div>
-          </div>
-        </div>
+          </li>
+        </ul>
       </div>
     </mine-pupop>
     <!-- 选择项目 -->
@@ -225,19 +260,45 @@
         <div class="ts-content">
           <ul class="ts-table">
             <li v-for="item,index in tsTableList"
-                :key="index">
+                :key="index"
+                @click="changetsTable(index)"
+                :class="tsTableIndex==index?'ts-table-active':''">
               <div>{{item.text}}</div>
               <div>{{item.ts}}</div>
             </li>
           </ul>
-          <ul class="ts-boty">
-            <li v-for="item,index in tsBodyList"
-                :key="index">
-              <div>{{item.ts}}</div>
-            </li>
-          </ul>
+          <div v-if="tsBodyList.day">
+            <div class="time-slot">
+              <div class="day"
+                   @click="changeActive(1)"
+                   :style="active==1?'color: #333333;font-weight: 600;':''">{{ tsBodyList.day.name}}</div>
+              <div class="night"
+                   @click="changeActive(0)"
+                   :style="active==0?'color: #333333;font-weight: 600;':''">{{tsBodyList.night.name}}</div>
+            </div>
+            <ul class="ts-boty"
+                v-if="active==1">
+              <li v-for="item,index in tsBodyList.day.list"
+                  :key="index">
+                <div :style="item.status==0?'color: #D3D3D3;':''"
+                     @click="selectTime(item)"
+                     :class="timeIndexText==item.order_time?'time-active':''">{{item.order_time}}</div>
+              </li>
+            </ul>
+            <ul class="ts-boty"
+                v-else>
+              <li v-for="item,index in tsBodyList.night.list"
+                  :key="index">
+                <div :style="item.status==0?'color: #D3D3D3;':''"
+                     @click="selectTime(item)"
+                     :class="timeIndexText==item.order_time?'time-active':''">{{item.order_time}}</div>
+              </li>
+            </ul>
+          </div>
         </div>
-        <div class="ts-button">确认</div>
+        <el-button class="ts-button"
+                   :style="this.timeIndexText.length == 0?'background: rgb(211, 211, 211);':''"
+                   @click="comfigTs">确认</el-button>
       </div>
     </mine-pupop>
     <!-- 皮肤状态 -->
@@ -253,17 +314,18 @@
                 :key="index">
               <div class="pore-top">
                 <div class="pore-title">
-                  <div>RGB毛孔：</div>
-                  <div class="pore-medium">粗大毛孔个数{{item.medium}}</div>
+                  <div>{{item.name}}</div>
+                  <div class="pore-medium"
+                       v-if="item.main_item">{{item.main_item.name}}{{item.main_item.num}}</div>
                 </div>
                 <div class="pore-over">
-                  <div class="min-size">粗大毛孔个数：{{item.medium}}个</div>
-                  <div class="min-size">中等毛孔个数：{{item.small}}个</div>
-                  <div class="min-size">细小毛孔个数：{{item.mini}}个</div>
+                  <div class="min-size"
+                       v-for="value,index in item.items"
+                       :key="index">{{value.name}}{{value.num}}个</div>
                 </div>
               </div>
               <div class="pore-bottom min-size">
-                {{'皮肤状态一般，污物阻塞导致，油脂分泌旺盛，皮肤状态一般，污物阻塞导致，油脂分泌旺盛皮肤状态一般，污物阻塞导致，油脂分泌旺盛，皮肤状态一般，污物阻塞导致，油脂分泌旺盛油脂分泌旺盛油脂分泌旺盛旺…' |ellipsis(85)}}
+                {{item.suggest | ellipsis(85)}}
               </div>
             </li>
           </ul>
@@ -281,6 +343,8 @@ export default {
   components: { minePupop },
   data () {
     return {
+      open: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/openNotes.png',
+      unOpen: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/upDate.png',
       select: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/select.png',
       unSelect: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/unSelect.png',
       userInfo: {
@@ -295,75 +359,12 @@ export default {
       //升级包列表
       productsList: [],
       //时间列表（头部）
-      tsTableList: [
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-        {
-          text: '今天',
-          ts: '10-27',
-        },
-      ],
+      tsTableList: [],
+      tsTableIndex: 0,
+      active: 1,
       //时间列表（body）
-      tsBodyList: [
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-        {
-          id: 0,
-          ts: '10:00'
-        },
-      ],
+      tsBodyList: {
+      },
       //皮肤状态列表
       poreList: [
         {
@@ -382,15 +383,17 @@ export default {
           mini: 242
         }
       ],
-
-      couponList: [
-        {
-
-        }
-      ],
+      //优惠券列表
+      couponList: [],
+      //已选择的优惠券
+      selectCouponList: [],
+      //已选择优惠券的id（同一个id只能选择一张优惠券）
+      selectCouponListId: [],
       timesInfo: '',
+      reservationPrice: 0,//预约费用
       projectInfo: '',
       productsInfo: '',
+      timeIndexText: "",//当前选择的时间
       weekInfo: '',
       programmeIndex: '',
       remarks: '',
@@ -402,6 +405,20 @@ export default {
       id: 0,//订单id
       isChange: false,//项目是否有改变
       isEditProject: false,//是否编辑项目
+      page: 1,
+      limit: 200,
+
+
+
+
+    needSelect: false,
+    coupSelectType: '',
+    productDiscount: '',
+    isSelectCoup: [], // 选择的优惠券
+    // 下面是支付的数据
+    showMoney: 0, // 价值总额
+    // showRuleText: 10086,
+
     };
   },
   computed: {
@@ -417,6 +434,9 @@ export default {
         this.remarks = res.data.remark
         this.programmeList = res.data.scheme_list
         this.order_data = res.data.order_data
+        this.showMoney=res.data.order_data.price
+        this.poreList = res.data.detail_list
+        this.calculationPrice()
       })
     },
     getProjectList () {
@@ -470,6 +490,7 @@ export default {
                   e.price = Number(e.price) + Number(item.price)
                   this.isProject = false
                   this.isEditProject = false
+                  this.calculationPrice()
                 }
               })
             }
@@ -521,14 +542,335 @@ export default {
         this.order_data.project_list.push(projectInfo)
         this.isChange = true
         this.isProject = false
+        this.calculationPrice()
       }
     },
+    //获取最近七天的时间
+    getWeekDate () {
+      //获取系统当前时间
+      let now = new Date();
+      let nowTime = now.getTime();
+      let oneDayTime = 24 * 60 * 60 * 1000;
+      let tsTableList = []
+      for (let i = 0; i < 7; i++) {
+        //显示周一
+        let ShowTime = nowTime + (i + 1) * oneDayTime;
+        //初始化日期时间
+        let myDate = new Date(ShowTime);
+        let year = myDate.getFullYear();
+        let month = myDate.getMonth() + 1;
+        let date = myDate.getDate();
+        console.log(year + "-" + month + "-" + date)
+        let str = "周" + "日一二三四五六".charAt(myDate.getDay());
+        let tsTableInfo = {}
+        tsTableInfo['text'] = i == 0 ? '今天' : i == 1 ? '明天' : str
+        tsTableInfo['ts'] = month + "-" + date
+        tsTableInfo['order_day'] = year + "-" + month + "-" + date
+        tsTableList.push(tsTableInfo)
+        console.log(str)
+      }
+      this.tsTableList = tsTableList
+    },
     //确定订单&支付
-    determine () { 
-      if (condition) {
-        
+    determine () {
+      if (this.isChange) {
+        this.getWeekDate()
+        this.getOrderTime()
+        this.order_time = ''
+        this.tsTableIndex = 0
+        this.isTs = true
+      } else {
+        debugger
       }
     },
+    //确定时间选择
+    comfigTs () {
+      if (this.timeIndexText.length == 0) return
+      let order_data = [], order_data_info = {}
+      this.order_data.project_list.forEach(item => {
+        order_data_info['id'] = item.id
+        if (item.product_ids != "") {
+          order_data_info['product_id'] = item.product_ids
+        }
+        order_data.push(order_data_info)
+      })
+      let params = {
+        id: this.id,
+        order_data: JSON.stringify(order_data),
+        order_day: this.tsTableList[this.tsTableIndex].order_day,
+        order_time: this.timeIndexText
+      }
+      api.setOrderUpdate(params).then(res => {
+        if (res.code == 200) {
+          this.getOrderInfo()
+          this.isTs = false
+          this.isChange = false
+        }
+      })
+    },
+    //计算预约费用
+    calculationPrice () {
+      this.order_data.project_list.forEach(res => {
+        this.reservationPrice += Number(res.price)
+      })
+    },
+    //获取订单优惠券
+    onCoupon () {
+
+      if(this.couponList.length>0){
+         this.isCoupun = true
+         return
+      }
+
+      let params = {
+        id: this.id,
+        page: this.page,
+        limit: this.limit
+      }
+      api.getOrderCoupon(params).then(res => {
+        this.couponList = [...this.couponList, ...res.data.list]
+        this.couponList.forEach(item => {
+          this.$set(item, 'isSelect', false)
+        })
+        this.page++
+        if (this.couponList.length < res.data.total) {
+          this.onCoupon()
+        }
+      })
+      console.log(this.couponList)
+      this.isCoupun = true
+    },
+
+
+    //数组包含关系
+    includes (arr1, arr2) {
+      return arr2.every(val => arr1.includes(val));
+    },
+    //选中优惠券
+    // selectPupop (item, index) {
+    //   this.couponList[index].Select = !this.couponList[index].Select
+    //   this.selectCouponList = this.couponList.filter(res => {
+    //     return res.Select == true
+    //   })
+    //   this.selectCouponList.forEach(res => {
+    //   })
+
+    // },
+
+
+// 不可以用的不显示，如果同时有项目劵、抵扣劵、满减劵，只能用一种类型，其他劵不显示
+// 1、针对单个项目，项目劵可以多选
+// 2、抵扣劵、满减劵针对的是整个订单，当用户已使用了单个项目劵时，抵扣劵、满减劵就不能使用
+// 3、优惠劵可以给多个项目抵扣,
+// 4、默认抵扣金额最高的
+// 5、优惠劵排序，到期时间倒叙
+
+
+/**
+   * 点击使用按钮、勾选按钮
+   */
+  selectPupop: function (item, index) {
+
+
+    let CouPonIndex = this.couponList
+
+    let selectIndex = index
+    let curreValue = !CouPonIndex[selectIndex].isSelect
+    let project_list = this.order_data.project_list //这里是项目列表
+
+    // 判断是否是不相同的项目券
+    if (this.couponList[selectIndex].type != 4) {
+      for (let i = 0; i < CouPonIndex.length; i++) {
+        CouPonIndex[i].isSelect = false
+      }
+      for (let i = 0; i < project_list.length; i++) {
+        project_list[i].cardId = ''
+      }
+
+    } else if (this.coupSelectType != 4) {
+      for (let i = 0; i < CouPonIndex.length; i++) {
+        CouPonIndex[i].isSelect = false
+      }
+      for (let i = 0; i < project_list.length; i++) {
+        project_list[i].cardId = ''
+      }
+    } else {
+      let numberSelect = 0
+      for (let i = 0; i < CouPonIndex.length; i++) {
+        if (CouPonIndex[i].isSelect) {
+          numberSelect = numberSelect + 1
+        }
+      }
+      console.log('numberSelect')
+      console.log(numberSelect)
+      if (numberSelect == this.order_data.project_list.length && curreValue) {
+            this.$message.error('最多选择' + this.order_data.project_list.length + '项目券!');
+        return
+      }
+    }
+    // 判断是否是取消选择项目券
+    CouPonIndex[selectIndex].isSelect = curreValue
+    if (!curreValue) {
+      for (let j = 0; j < project_list.length; j++) {
+        if (project_list[j].cardId && project_list[j].cardId == this.couponList[selectIndex].id) { // 如果是取消选择，那么也要取消绑定项目的id
+          project_list[j].cardId = ''
+        }
+      }
+      CouPonIndex[selectIndex].projectids = ''
+    }
+    let orderDetails1 = this.order_data
+    orderDetails1.project_list = project_list
+
+
+      this.order_data=orderDetails1
+      this.couponList=CouPonIndex
+      this.coupSelectType=this.couponList[selectIndex].type
+
+    console.log(this.order_data)
+    console.log(this.couponList)
+
+    this.selectCoup()
+
+  },
+
+// 选择项目进行绑定
+  selectCoup() {
+    let that = this
+    let isSelectCoups = []
+    for (let i = 0; i < this.couponList.length; i++) {
+      if (this.couponList[i].isSelect) {
+        let selectCoup = that.couponList[i]
+        isSelectCoups.push(selectCoup)
+      }
+    }
+      this.isSelectCoup=isSelectCoups
+    console.log(this.isSelectCoup)
+
+    // 抵扣顺序按照项目金额计算
+    that.theMoneyBest()
+  },
+
+  // 抵扣顺序按照项目金额计算
+  // 卡券，项目券数据包,id：订单项目ID,coupon_id：优惠券ID,如：[{"id":1220,coupon_id:199}]  
+  theMoneyBest() {
+    let that = this
+    let project_list = this.order_data.project_list //这里是项目列表
+    let isSelectCoup = this.isSelectCoup //这里选择了的卡券列表
+    let selectProjectList = [] // 适合的卡券列表
+    // let CouPonIndex = this.CouPonIndex // 卡券选择的Id
+    let productDiscount = this.couponList // 卡券列表
+    console.log(productDiscount)
+    // debugger
+    if (isSelectCoup[0].type == 4) {
+      for (let i = 0; i < isSelectCoup.length; i++) { // 首先遍历卡券
+        if (!isSelectCoup[i].projectids) { // 如果卡券没绑定项目
+          console.log('没绑定过!')
+
+          let selectIndexMoney = 0 // 初始值
+          let selectIndex = 111 // 初始金额
+          for (let j = 0; j < project_list.length; j++) { // 遍历项目
+            if (isSelectCoup[i].project_ids.indexOf(project_list[j].id) != -1 && !project_list[j].cardId) { // 如果卡券能够使用这个项目并且这个项目没有被绑定过
+              console.log('project_list[j].price')
+              console.log(project_list[j].price)
+              console.log(selectIndexMoney)
+              console.log(project_list[j].price > selectIndexMoney)
+              if (project_list[j].price * 1 > selectIndexMoney * 1) {
+                selectIndex = j
+                selectIndexMoney = project_list[j].price
+                console.log('--' + selectIndexMoney)
+              }
+              // selectProjectList.push(project_list[i])
+            }
+          }
+          if (selectIndex != 111) {
+            console.log('走了这里走了这里')
+            isSelectCoup[i].projectids = project_list[selectIndex].id
+            isSelectCoup[i].projectName = project_list[selectIndex].name
+            project_list[selectIndex].cardId = isSelectCoup[i].id
+          } else {
+            for (let k = 0; k < productDiscount.length; k++) {
+              if (productDiscount[k].id == isSelectCoup[i].id) {
+                // isSelectCoup.
+                productDiscount[k].isSelect = false
+                // isSelectCoup.splice(isSelectCoup.length-1,1);
+                this.$message.error('没有适合的项目!');
+              }
+            }
+          }
+
+        }
+      }
+      let orderDetails1 = this.order_data
+      orderDetails1.project_list = project_list
+        this.couponList= productDiscount
+        this.isSelectCoup= isSelectCoup
+        this.order_data= orderDetails1
+    }
+
+    this.calculateMoney() //计算总额
+  },
+
+  // 计算总额
+  calculateMoney() {
+    let that = this
+    let money = this.order_data.price
+    let isSelectCoup = this.isSelectCoup
+    let project_list = this.order_data.project_list //这里是项目列表
+
+    if (isSelectCoup.length == 0) {
+        this.showMoney=money.toFixed(2)
+      return
+    }
+
+    // 如果是项目
+    if (isSelectCoup[0].type == 4) {
+      for (let i = 0; i < project_list.length; i++) {
+        if (project_list[i].cardId) {
+          money = money - project_list[i].price
+        }
+      }
+        this.showMoney=money.toFixed(2)
+    } else if (isSelectCoup[0].type == 3) {
+      for (let i = 0; i < project_list.length; i++) {
+        money = money - project_list[i].price
+      }
+
+    } else {
+      money = money - isSelectCoup[0].price
+    }
+
+        this.showMoney=money.toFixed(2)
+
+
+  },
+
+
+    changeActive (e) {
+      this.active = e
+    },
+    selectTime (item) {
+      if (item.status == 0) return
+      this.timeIndexText = item.order_time
+    },
+    changetsTable (index) {
+      this.tsTableIndex = index
+      this.getOrderTime()
+    },
+    getOrderTime () {
+      let ids = '', idsList = []
+      this.order_data.project_list.forEach(res => {
+        idsList.push(res.id)
+      })
+      ids = idsList.toString()
+      let params = {
+        ids: ids,
+        order_day: this.tsTableList[this.tsTableIndex].order_day
+      }
+      api.getOrderTime(params).then(res => {
+        this.tsBodyList = res.data
+      })
+    },
+
     onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(this.programmeList[index], 'onSelect', !this.programmeList[index].onSelect)
@@ -1006,10 +1348,27 @@ export default {
       overflow: scroll;
       .coupon-info {
         width: 345px;
+        margin-bottom: 20px;
         padding: 20px 14px 10px 14px;
         position: relative;
         background: #fff4e6;
         border-radius: 12px;
+        .coupon-tips-text {
+          position: absolute;
+          left: 0;
+          top: 0;
+          padding: 0 8px;
+          height: 18px;
+          background: #875617;
+          border-radius: 12px 0px 12px 0px;
+          font-size: 12px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #ffffff;
+          line-height: 18px;
+          zoom: 0.83;
+          text-align: center;
+        }
         .top {
           display: flex;
           justify-content: space-between;
@@ -1043,6 +1402,13 @@ export default {
               line-height: 17px;
             }
           }
+          .discount-over {
+            font-size: 22px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #ff3007;
+            line-height: 30px;
+          }
           .coupon-tip {
             .tips-title {
               font-size: 16px;
@@ -1143,7 +1509,7 @@ export default {
   }
   .ts-block {
     width: 540px;
-    height: 400px;
+    height: 420px;
     background: #ffffff;
     border-radius: 8px;
     position: relative;
@@ -1178,15 +1544,32 @@ export default {
         li {
           text-align: center;
         }
+        .ts-table-active {
+          color: #fa7d22;
+          border-bottom: 4px solid #fa4622;
+        }
+      }
+
+      .time-slot {
+        margin-top: 20px;
+        display: flex;
+        justify-content: space-between;
+        font-size: 16px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999999;
+        line-height: 22px;
       }
       .ts-boty {
         margin-top: 10px;
+        margin-left: -19px;
         display: flex;
-        justify-content: space-between;
+        justify-content: unset;
         flex-wrap: wrap;
         li {
           margin-top: 10px;
           width: 68px;
+          margin-left: 19px;
           height: 30px;
           line-height: 30px;
           text-align: center;
@@ -1197,11 +1580,18 @@ export default {
           font-weight: 400;
           color: #333333;
         }
+        .time-active {
+          background: #fff0e6;
+          border: 1px solid #fa7d22;
+          font-weight: 500;
+          color: #fa7d22;
+        }
       }
     }
     .ts-button {
       position: absolute;
       bottom: 42px;
+      padding: 0;
       left: 50%;
       transform: translateX(-50%);
       width: 176px;

src/pages/confirmOrder/index.vue

@@ -1,30 +1,90 @@
 <template>
   <div class="mine">
     <div class="qr-code">
-      <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/orderQrCode.png"
-           alt="">
+      <div id="qrCode"
+           ref="qrCodeDiv"></div>
     </div>
   </div>
 </template>
 
 <script>
+import QRCode from 'qrcodejs2'
+import api from '../../server/home'
 export default {
   components: {},
   data () {
-    return {};
+    return {
+      qrcode_string: '',
+      ticket: '',
+      checkCodeInterval: null,
+      checkCodeTimeout: null,
+    };
   },
   computed: {},
   watch: {},
 
-  methods: {},
+  methods: {
+    getAuthCode () {
+      api.getAuthCode().then(res => {
+        this.qrcode_string = res.data.qrcode_string
+        this.ticket = res.data.ticket
+        this.$nextTick(() => {
+          this.bindQRCode();
+          // this.checkCode()
+        })
+      })
+    },
+    checkCode () {
+      this.checkCodeInterval = setInterval(e => {
+        api.checkCode({ ticket: this.ticket }).then(res => {
+          if (res.data.status == 1) {
+            clearInterval(this.checkCodeInterval)
+          }
+        })
+      }, 1000)
+      //十分钟强制清除，防止页面崩溃
+      this.checkCodeTimeout = setTimeout(() => {
+        clearTimeout(this.checkCodeTimeout)
+      }, 600000)
+    },
+    getOrderByCode () {
+      api.getOrderByCode({ ticket: this.ticket }).then(res => {
+        if (res.code == 200) {
+          this.$router.push({
+            path: '/confirmOrder/details',
+            query: {
+              id: res.order_id
+            }
+          })
+        }
+      })
+    },
+    bindQRCode () {
+      new QRCode(this.$refs.qrCodeDiv, {
+        text: this.qrcode_string,
+        width: 200,
+        height: 200,
+        colorDark: "#333333", //二维码颜色
+        colorLight: "#ffffff", //二维码背景色
+        correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
+      })
+    }
+  },
 
   created () {
+    this.getAuthCode()
 
   },
 
   mounted () {
 
   },
+  destroyed () {
+    if (this.checkCodeInterval) {
+      clearInterval(this.checkCodeInterval)
+      clearTimeout(this.checkCodeTimeout)
+    }
+  }
 }
 
 </script>

src/pages/customerMan/index.vue

@@ -73,7 +73,8 @@ export default {
       ],
       tableData: [],
       currentPage1: 1,
-      multipleSelection: ''
+      multipleSelection: '',
+      total: 0
 
     };
   },
@@ -81,9 +82,9 @@ export default {
   watch: {},
 
   methods: {
-    
-  // 获取订单列表
-    getUserList() {
+
+    // 获取订单列表
+    getUserList () {
       console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
@@ -97,17 +98,17 @@ export default {
         }
       });
     },
-    
-    handleCurrentChange(e) {
+
+    handleCurrentChange (e) {
       this.currentPage1 = e;
       this.getUserList();
       console.log(e, "eeeeee");
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
     },
-    handleSelectionChange(row, column, event) {
+    handleSelectionChange (row, column, event) {
       this.$router.push({
         path: '/customerMan/details',
         query: {
@@ -117,7 +118,7 @@ export default {
     }
   },
 
-  created() {
+  created () {
     this.getUserList();
   },
 

src/pages/testSkin/details/index.vue

@@ -93,7 +93,9 @@
           <div class="add"
                @click="isPupop=true">新增</div>
         </div>
-        <div class=""></div>
+        <div class="">
+
+        </div>
       </div>
       <div class="submit"
            @click="onSubmit">保存</div>

src/router/index.js

@@ -7,10 +7,10 @@ import login from "./map/login";
 Vue.use(Router)
 
 export default new Router({
-    mode: 'history',
-    base: process.env.BASE_URL,
-    routes: [
-        home,
-        ...login
-    ]
+  mode: 'hash',
+  base: process.env.BASE_URL,
+  routes: [
+    home,
+    ...login
+  ]
 })

src/router/map/home.js

@@ -22,14 +22,38 @@ export default {
   children: [
     { path: '/home', component: Home },
     { path: '/testSkin', component: TestSkin },
-    { path: '/testSkin/details', component: TestSkinDetails },
+    {
+      path: '/testSkin/details',
+      meta: {
+        isback: true,
+      },
+      component: TestSkinDetails
+    },
     { path: '/customerMan', component: CustomerMan },
-    { path: '/customerMan/details', component: CustomerManDetails },
+    {
+      path: '/customerMan/details',
+      meta: {
+        isback: true,
+      },
+      component: CustomerManDetails
+    },
     { path: '/customerMan/projectOrder', component: projectOrder },
     { path: '/historicalOrder', component: HistoricalOrder },
-    { path: '/historicalOrder/details', component: HistoricalOrderDetails },
+    {
+      path: '/historicalOrder/details',
+      meta: {
+        isback: true,
+      },
+      component: HistoricalOrderDetails
+    },
     { path: '/confirmOrder', component: ConfirmOrder },
-    { path: '/confirmOrder/details', component: ConfirmOrderDetails },
+    {
+      path: '/confirmOrder/details',
+      meta: {
+        isback: true,
+      },
+      component: ConfirmOrderDetails
+    },
     { path: '/storeDetection', component: StoreDetection },
     { path: '/coupon', component: Coupon },
 

src/server/home.js

@@ -42,6 +42,24 @@ export default class Home {
   static getProducts (parms) {
     return $http.get(url.getProducts, parms);
   }
+  static getOrderTime (parms) {
+    return $http.get(url.getOrderTime, parms);
+  }
+  static setOrderUpdate (parms) {
+    return $http.post(url.setOrderUpdate, parms);
+  }
+  static getOrderCoupon (parms) {
+    return $http.get(url.getOrderCoupon, parms);
+  }
+  static getAuthCode (parms) {
+    return $http.get(url.getAuthCode, parms);
+  }
+  static checkCode (parms) {
+    return $http.get(url.checkCode, parms);
+  }
+  static getOrderByCode (parms) {
+    return $http.get(url.getOrderByCode, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {

src/server/urls.js

@@ -21,6 +21,18 @@ export default {
   getProjectList: '/v2/pad/project/list',
   //获取升级包
   getProducts: '/v2/pad/project/product',
+  //获取当天的时间段
+  getOrderTime: '/v2/pad/order/order_time',
+  //保存、修改订单
+  setOrderUpdate: '/v2/pad/order/update',
+  //获取订单可用优惠券
+  getOrderCoupon: '/v2/pad/order/coupon',
+  //获取授权码
+  getAuthCode: '/v2/pad/order/get_auth_code',
+  //检查是否授权
+  checkCode: '/v2/pad/order/check_code',
+  //通过授权码获取未支付订单
+  getOrderByCode: '/v2/pad/order/get_order_by_code',
 
   /**
    *  by ListKer

vue.config.js

@@ -3,40 +3,40 @@
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
-    publicPath: process.env.env_config === 'prod' ? 'https://ydcommon.51yund.com/' : 
-    process.env.env_config === 'test' ? '/vapps/calory/' : '/', 
-    // 设置跨域
-    crossorigin: 'anonymous',
-    /**
-       * 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-       *  map文件的作用在于：项目打包后，代码都是经过压缩加密的，如果运行时报错，输出的错误信息无法准确得知是哪里的代码报错。
-       *  有了map就可以像未加密的代码一样，准确的输出是哪一行哪一列有错。
-       * */
-    productionSourceMap: false,
-    transpileDependencies: ['swiper', 'dom7'],
- 
-    // 它支持webPack-dev-server的所有选项
-    devServer: {
-        host: "0.0.0.0",
-        port: 8083, // 端口号
-        https: false, // https:{type:Boolean}
-        open: true, //配置自动启动浏览器
-        proxy: '' // 配置跨域处理
-    },
-    configureWebpack: {
-        externals: {
-            'axios': "axios"
-        }
-        // 这是七牛找不到资源时的紧急处理方法，通过修改hash位数修改编译后的资源文件名
-        // output: { 
-        //     filename: `js/[name].[hash:6].js`,
-        //     chunkFilename: `js/[name].[hash:6].js`
-        // },
-        // plugins: [
-        //     new MiniCssExtractPlugin({
-        //         filename: `css/[name].[hash:6].css`,
-        //         chunkFilename: `css/[name].[hash:6].css`
-        //     })
-        // ]
+  publicPath: process.env.env_config === 'prod' ? 'https://h5-cms-vue.ijolijoli.com/dist' :
+    process.env.env_config === 'test' ? '/vapps/calory/' : '/dist/',
+  // 设置跨域
+  crossorigin: 'anonymous',
+  /**
+     * 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
+     *  map文件的作用在于：项目打包后，代码都是经过压缩加密的，如果运行时报错，输出的错误信息无法准确得知是哪里的代码报错。
+     *  有了map就可以像未加密的代码一样，准确的输出是哪一行哪一列有错。
+     * */
+  productionSourceMap: false,
+  transpileDependencies: ['swiper', 'dom7'],
+
+  // 它支持webPack-dev-server的所有选项
+  devServer: {
+    host: "0.0.0.0",
+    port: 8083, // 端口号
+    https: false, // https:{type:Boolean}
+    open: true, //配置自动启动浏览器
+    proxy: '' // 配置跨域处理
+  },
+  configureWebpack: {
+    externals: {
+      'axios': "axios"
     }
+    // 这是七牛找不到资源时的紧急处理方法，通过修改hash位数修改编译后的资源文件名
+    // output: { 
+    //     filename: `js/[name].[hash:6].js`,
+    //     chunkFilename: `js/[name].[hash:6].js`
+    // },
+    // plugins: [
+    //     new MiniCssExtractPlugin({
+    //         filename: `css/[name].[hash:6].css`,
+    //         chunkFilename: `css/[name].[hash:6].css`
+    //     })
+    // ]
+  }
 }