package-lock.json

@@ -13,6 +13,7 @@
         "element-ui": "^2.8.2",
         "js-cookie": "^3.0.1",
         "qrcodejs2": "0.0.2",
+        "vant": "^2.12.47",
         "vue": "^2.6.6",
         "vue-infinite-scroll": "^2.0.2",
         "vue-router": "^3.0.1",
@@ -957,7 +958,6 @@
       "version": "7.4.4",
       "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.4.4.tgz",
       "integrity": "sha1-3C40mC6yNoA6onoH/qaFevG5Fx0=",
-      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.2"
       }
@@ -1974,6 +1974,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -2195,6 +2204,19 @@
       "integrity": "sha1-mqMMBNshKpoGSdaub9UKzMQHSKE=",
       "dev": true
     },
+    "node_modules/@vant/icons": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
+      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+    },
+    "node_modules/@vant/popperjs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.1.0.tgz",
+      "integrity": "sha512-8MD1gz146awV/uPxYjz4pet22f7a9YVKqk7T+gFkWFwT9mEcrIUEg/xPrdOnWKLP9puXyYtm7oVfSDSefZ/p/w==",
+      "dependencies": {
+        "@popperjs/core": "^2.9.2"
+      }
+    },
     "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0-beta.3",
       "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0-beta.3.tgz",
@@ -8748,7 +8770,7 @@
     },
     "node_modules/fsevents/node_modules/code-point-at": {
       "version": "1.1.0",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+      "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8758,21 +8780,21 @@
     },
     "node_modules/fsevents/node_modules/concat-map": {
       "version": "0.0.1",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
       "inBundle": true,
       "optional": true
     },
     "node_modules/fsevents/node_modules/console-control-strings": {
       "version": "1.1.0",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
       "dev": true,
       "inBundle": true,
       "optional": true
     },
     "node_modules/fsevents/node_modules/core-util-is": {
       "version": "1.0.2",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -8800,14 +8822,14 @@
     },
     "node_modules/fsevents/node_modules/delegates": {
       "version": "1.0.0",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
       "dev": true,
       "inBundle": true,
       "optional": true
     },
     "node_modules/fsevents/node_modules/detect-libc": {
       "version": "1.0.3",
-      "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8830,14 +8852,14 @@
     },
     "node_modules/fsevents/node_modules/fs.realpath": {
       "version": "1.0.0",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true,
       "inBundle": true,
       "optional": true
     },
     "node_modules/fsevents/node_modules/gauge": {
       "version": "2.7.4",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
+      "integrity": "sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8872,7 +8894,7 @@
     },
     "node_modules/fsevents/node_modules/has-unicode": {
       "version": "2.0.1",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -8902,7 +8924,7 @@
     },
     "node_modules/fsevents/node_modules/inflight": {
       "version": "1.0.6",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8913,7 +8935,7 @@
     },
     "node_modules/fsevents/node_modules/inherits": {
       "version": "2.0.3",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -8931,7 +8953,7 @@
     },
     "node_modules/fsevents/node_modules/is-fullwidth-code-point": {
       "version": "1.0.0",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -8944,7 +8966,7 @@
     },
     "node_modules/fsevents/node_modules/isarray": {
       "version": "1.0.0",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -8964,7 +8986,7 @@
     },
     "node_modules/fsevents/node_modules/minimist": {
       "version": "0.0.8",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -8992,7 +9014,7 @@
     },
     "node_modules/fsevents/node_modules/mkdirp": {
       "version": "0.5.1",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
       "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)",
       "dev": true,
       "inBundle": true,
@@ -9054,7 +9076,7 @@
     },
     "node_modules/fsevents/node_modules/nopt": {
       "version": "4.0.1",
-      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
+      "integrity": "sha512-+5XZFpQZEY0cg5JaxLwGxDlKNKYxuXwGt8/Oi3UXm5/4ymrJve9d2CURituxv3rSrVCGZj4m1U1JlHTdcKt2Ng==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9099,7 +9121,7 @@
     },
     "node_modules/fsevents/node_modules/number-is-nan": {
       "version": "1.0.1",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+      "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9109,7 +9131,7 @@
     },
     "node_modules/fsevents/node_modules/object-assign": {
       "version": "4.1.1",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9119,7 +9141,7 @@
     },
     "node_modules/fsevents/node_modules/once": {
       "version": "1.4.0",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9129,7 +9151,7 @@
     },
     "node_modules/fsevents/node_modules/os-homedir": {
       "version": "1.0.2",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9139,7 +9161,7 @@
     },
     "node_modules/fsevents/node_modules/os-tmpdir": {
       "version": "1.0.2",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9160,7 +9182,7 @@
     },
     "node_modules/fsevents/node_modules/path-is-absolute": {
       "version": "1.0.1",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
       "inBundle": true,
       "optional": true,
@@ -9193,7 +9215,7 @@
     },
     "node_modules/fsevents/node_modules/rc/node_modules/minimist": {
       "version": "1.2.0",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
       "dev": true,
       "inBundle": true,
       "optional": true
@@ -16445,8 +16467,7 @@
     "node_modules/regenerator-runtime": {
       "version": "0.13.2",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc=",
-      "dev": true
+      "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc="
     },
     "node_modules/regenerator-transform": {
       "version": "0.13.4",
@@ -19236,6 +19257,26 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "node_modules/vant": {
+      "version": "2.12.47",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.47.tgz",
+      "integrity": "sha512-D9QgxirzWuSJbLqU+TGgXRZ88OTmGDEtwxDrBr2JuLCZyijrYzc5KIrErd4c1MJoZsmYupqydyLqotoBkbQDjQ==",
+      "dependencies": {
+        "@babel/runtime": "7.x",
+        "@vant/icons": "^1.7.1",
+        "@vant/popperjs": "^1.1.0",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "vue-lazyload": "1.2.3"
+      },
+      "peerDependencies": {
+        "vue": ">= 2.6.0"
+      }
+    },
+    "node_modules/vant/node_modules/@vue/babel-helper-vue-jsx-merge-props": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
+      "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA=="
+    },
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
@@ -19348,6 +19389,11 @@
         "vue-template-compiler": "^2.x"
       }
     },
+    "node_modules/vue-lazyload": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+      "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+    },
     "node_modules/vue-loader": {
       "version": "15.7.0",
       "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.7.0.tgz",
@@ -21891,7 +21937,6 @@
       "version": "7.4.4",
       "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.4.4.tgz",
       "integrity": "sha1-3C40mC6yNoA6onoH/qaFevG5Fx0=",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
       }
@@ -22673,6 +22718,11 @@
       "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=",
       "dev": true
     },
+    "@popperjs/core": {
+      "version": "2.11.5",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
+      "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.1.tgz",
@@ -22860,6 +22910,19 @@
       "integrity": "sha1-mqMMBNshKpoGSdaub9UKzMQHSKE=",
       "dev": true
     },
+    "@vant/icons": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.8.0.tgz",
+      "integrity": "sha512-sKfEUo2/CkQFuERxvkuF6mGQZDKu3IQdj5rV9Fm0weJXtchDSSQ+zt8qPCNUEhh9Y8shy5PzxbvAfOOkCwlCXg=="
+    },
+    "@vant/popperjs": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.1.0.tgz",
+      "integrity": "sha512-8MD1gz146awV/uPxYjz4pet22f7a9YVKqk7T+gFkWFwT9mEcrIUEg/xPrdOnWKLP9puXyYtm7oVfSDSefZ/p/w==",
+      "requires": {
+        "@popperjs/core": "^2.9.2"
+      }
+    },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.0.0-beta.3",
       "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0-beta.3.tgz",
@@ -34654,8 +34717,7 @@
     "regenerator-runtime": {
       "version": "0.13.2",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.2.tgz",
-      "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc=",
-      "dev": true
+      "integrity": "sha1-MuWcmm+5saSv8JtJMMotRHc0NEc="
     },
     "regenerator-transform": {
       "version": "0.13.4",
@@ -36970,6 +37032,25 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "vant": {
+      "version": "2.12.47",
+      "resolved": "https://registry.npmjs.org/vant/-/vant-2.12.47.tgz",
+      "integrity": "sha512-D9QgxirzWuSJbLqU+TGgXRZ88OTmGDEtwxDrBr2JuLCZyijrYzc5KIrErd4c1MJoZsmYupqydyLqotoBkbQDjQ==",
+      "requires": {
+        "@babel/runtime": "7.x",
+        "@vant/icons": "^1.7.1",
+        "@vant/popperjs": "^1.1.0",
+        "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
+        "vue-lazyload": "1.2.3"
+      },
+      "dependencies": {
+        "@vue/babel-helper-vue-jsx-merge-props": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
+          "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA=="
+        }
+      }
+    },
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz",
@@ -37064,6 +37145,11 @@
         "vue-template-es2015-compiler": "^1.6.0"
       }
     },
+    "vue-lazyload": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/vue-lazyload/-/vue-lazyload-1.2.3.tgz",
+      "integrity": "sha512-DC0ZwxanbRhx79tlA3zY5OYJkH8FYp3WBAnAJbrcuoS8eye1P73rcgAZhyxFSPUluJUTelMB+i/+VkNU/qVm7g=="
+    },
     "vue-loader": {
       "version": "15.7.0",
       "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.7.0.tgz",

package.json

@@ -16,6 +16,7 @@
     "element-ui": "^2.8.2",
     "js-cookie": "^3.0.1",
     "qrcodejs2": "0.0.2",
+    "vant": "^2.12.47",
     "vue": "^2.6.6",
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^3.0.1",

public/index.html

@@ -16,5 +16,6 @@
   <script src="https://ydcommon.51yund.com/vue/axios.min.js"></script>
   <!-- built files will be auto injected -->
 </body>
+<!-- <script type="text/javascript" src="https://ydcommon.51yund.com/test_web_hd/vendor/vconsole.min.js"></script> -->
 
 </html>

src/common/http.js

@@ -23,7 +23,6 @@ axios.defaults.timeout = 10000;
 
 // post请求头
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
-console.log(store.state.comVal.token, 'this.$store.state.comVal.token111', localStorage.getItem('token'));
 axios.defaults.headers.post['token'] = localStorage.getItem('token') || store.state.comVal.token;
 axios.defaults.headers.get['token'] = localStorage.getItem('token') || store.state.comVal.token;
 
@@ -120,7 +119,6 @@ function get (url, params) {
             type: 'error'
           });
         }
-        console.log(res.data);
         resolve(res.data);
       })
       .catch(err => {
@@ -141,7 +139,6 @@ function post (url, params) {
   return new Promise((resolve, reject) => {
     axios.post(reqUrl, QS.stringify(params))
       .then(res => {
-        console.log(res, 'resres');
         if (res.data.code != 200 && localStorage.getItem('token')) {
           Message({
             message: res.data.msg,
@@ -151,7 +148,6 @@ function post (url, params) {
         resolve(res.data);
       })
       .catch(err => {
-        console.log(err, 'errerrerr');
         reject(err.data)
       })
   });

src/common/utils.js

@@ -5,6 +5,7 @@ const utils = {
   },
   test: function () { },
   isBack: false,
+  //标准时间格式化
   formatTime: function (date, fmt) {
     var date = new Date(date);
     if (/(y+)/.test(fmt)) {
@@ -25,8 +26,6 @@ const utils = {
     }
     return fmt;
   },
-
-
 }
 
 export default () => {

src/components/common/layout/layout.vue

@@ -6,14 +6,17 @@
                  @changeIsBack="changeIsBack"></left-menu>
     </div>
     <div class="content">
-      <header :style="menuIndex==0?'justify-content: space-between;':''">
+      <header>
+
         <div class="back-icon"
              v-if="isback"
              @click="goBack"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/back.png"
                alt=""></div>
-        <div class="left"
-             v-if="menuIndex==0">
-          <div class="address">{{userInfo.store_name}}</div>
+        <div>
+          <div class="left"
+               v-if="menuIndex==0">
+            <div class="address">{{userInfo.store_name}}</div>
+          </div>
         </div>
         <div class="right">
           <div class="news"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/news.png"></div>
@@ -73,7 +76,7 @@ export default {
     },
     loginOut () {
       localStorage.removeItem('token');
-      location.reload();
+      this.$router.replace('/login')
     },
     changeMenu (index) {
       this.menuIndex = index
@@ -138,6 +141,7 @@ export default {
   overflow: hidden;
 
   header {
+    width: 100%;
     line-height: 50px;
     font-size: 16px;
     color: #409eff;
@@ -146,8 +150,7 @@ export default {
     height: 60px;
     display: flex;
     align-items: center;
-    justify-content: right;
-
+    justify-content: space-between;
     position: relative;
     .back-icon {
       position: absolute;
@@ -184,11 +187,13 @@ export default {
         border-radius: 50%;
         img {
           width: 100%;
+          border-radius: 50%;
           display: block;
         }
       }
       .el-dropdown-link {
         img {
+          margin-left: 20px;
           width: 28px;
           height: 28px;
           display: block;

src/components/common/layout/leftMenu.vue

@@ -49,12 +49,14 @@ export default {
           unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unhome.png',
           icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/home.png'
 
-        }, {
-          name: "测肤记录",
-          path: "/testSkin",
-          unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
-          icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
-        }, {
+        },
+        // {
+        //   name: "测肤记录",
+        //   path: "/testSkin",
+        //   unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/unskin.png',
+        //   icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/Skin.png',
+        // },
+        {
           name: "发券中心",
           path: "/coupon",
           unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/uncoupon.png',
@@ -75,7 +77,7 @@ export default {
         //   path: "/storeDetection",
         //   icon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/testing.png',
         //   unicon: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/untesting.png'
-        // }, 
+        // },   
         {
           name: "客户管理",
           path: "/customerMan",
@@ -88,8 +90,9 @@ export default {
   },
   watch: {
     $route (to, from) {
-      let patname = `/${window.location.hash.split('/')[1]}`
-      console.log(patname, 'patname', to);
+      let patname = `/${to.path.split('/')[1]}`
+      console.log(window.location, 'window.location.pathname', to);
+
       this.$emit('changeIsBack', to.meta.isback)
       this.menu.forEach((item, index) => {
         if (patname == item.path) {
@@ -100,8 +103,8 @@ export default {
     }
   },
   mounted () {
-    let patname = `/${window.location.pathname.split('/')[1]}`
-    console.log(patname, 'patname');
+    let patname = `/${window.location.hash.substr(1).split('/')[1]}`
+    console.log(window.location, 'window.location.pathname', patname);
     this.menu.forEach((item, index) => {
       if (patname == item.path) {
         this.nowIndex = index
@@ -143,7 +146,6 @@ export default {
 
 .el-menu-item {
   margin-left: 8px;
-  padding: 0;
   padding-left: 9px !important;
   height: auto;
   line-height: initial;

src/components/modules/helloWorld.vue

@@ -1,40 +1,40 @@
 <template>
-    <div class="hello">
-        <h1>{{ msg }}，样式由less书写</h1>
-        <input type="text" class="common">
-        <button @click="test()">点击</button>
-    </div>
+  <div class="hello">
+    <h1>{{ msg }}，样式由less书写</h1>
+    <input type="text"
+           class="common">
+    <button @click="test()">点击</button>
+  </div>
 </template>
 
 <script>
 export default {
-    name: 'HelloWorld',
-    props: {
-        msg: String
-    },
-    data() {
-        return {
-            
-        }
-    },
-    mounted: function () {
-    },
-    created: function () {
-    },
-    methods: {
-        test(){
-            console.log("点击了")
-        }
+  name: 'HelloWorld',
+  props: {
+    msg: String
+  },
+  data () {
+    return {
+
+    }
+  },
+  mounted: function () {
+  },
+  created: function () {
+  },
+  methods: {
+    test () {
     }
+  }
 }
 </script>
 
 <style lang='less' scoped>
-    @import url(../../style/root.less);
-    h1 {
-        .hei(60px);
-        &:hover {
-            color: #696;
-        }
-    }
+@import url(../../style/root.less);
+h1 {
+  .hei(60px);
+  &:hover {
+    color: #696;
+  }
+}
 </style>

src/pages/confirmOrder/details/index.vue

@@ -84,7 +84,8 @@
       <div class="project">
         <div class="project-title">
           <div>共<span>{{order_data.project_list?order_data.project_list.length:0}}个</span>项目</div>
-          <div class="add-project"
+          <div v-if="order_data.type!='one'"
+               class="add-project"
                @click="addProject">添加</div>
         </div>
         <div class="project-list">
@@ -95,12 +96,12 @@
             <div class="project-content">
               <div class="title-price">
                 <div class="project-tit">{{item.name | ellipsis(14)}}</div>
-                <div class="project-price"><span class="min-size">￥</span>{{item.price}}</div>
+                <div class="project-price"><span class="min-size">￥</span>{{Number(item.price).toFixed(2)}}</div>
               </div>
               <div class="project-tips">{{item.product_names}}</div>
               <div class="project-zoom">
                 <div> <span v-if="item.device_name">{{item.device_name}}（{{item.room}}）{{item.use_time}}分钟</span></div>
-                <div><img @click="eidt(item)"
+                <div v-if="order_data.type!='one'"><img @click="eidt(item)"
                        src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/eidt.png">
                   <img v-if="order_data.project_list.length>1"
                        @click="deleteProject(item)"
@@ -132,7 +133,6 @@
             <div class="on-icon">></div>
           </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"
@@ -143,25 +143,34 @@
           </div> -->
 
           <div v-if="1==1">
+            <div>
+              <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 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> -->
+                 v-if="discount!=0">
+              <div></div>
+              <div v-if="discount!=20"
+                   class="cou-price"> {{discount==100?'仪器免费体验':'新人5折优惠'}}</div>
+              <div class="cou-price"
+                   v-else-if=" isSelectCoup.length&&(order_data.project_list.length - isSelectCoup.length)>=3">{{'任意三个项目8折'}}</div>
             </div>
           </div>
-
-
-
-
-
         </div>
         <div class="over-price">
-          合计： <span class="price-num"><span class="min-size">￥</span>{{showMoney}}<span class="min-size"></span></span>
+          合计： <span class="price-num"><span class="min-size">￥</span>{{isSelectCoup.length>0?showMoney:discountPrice}}<span class="min-size"></span></span>
         </div>
       </div>
       <div class="payment"
@@ -178,7 +187,7 @@
           <li class="coupon-info"
               v-for="item,index in couponList"
               :key="index">
-  <!-- 1: '抵扣券',
+            <!-- 1: '抵扣券',
       2: '满减券',
       3: '全额减免券',
       4: '项目卡券' -->
@@ -332,11 +341,65 @@
         </div>
       </div>
     </mine-pupop>
+    <!-- 支付 -->
+    <mine-pupop :show="choicePayType">
+      <div class="pay-block">
+        <div class="delete-pupop"
+             @click="choicePayType=false"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt=""></div>
+        <div class="pay-title">选择支付方式</div>
+        <div class="pay-price">￥<span>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
+        <div class="pay-list">
+          <div class="pay-info"
+               v-for="item,index in payList"
+               @click="changeType(index)"
+               :style="item.isSelect?'border: 1px solid #FA7D22;':'border: 1px solid #D0D0D0;'"
+               :key="index">
+            <div class="pay-left">
+              <img :src="item.payImg"
+                   alt="">
+              <span>{{item.title}}</span>
+            </div>
+            <div class="pay-right">
+              <img :src="item.isSelect?select:unSelect"
+                   alt="">
+            </div>
+          </div>
+        </div>
+        <div class="pay-button"
+             @click="pay">确认</div>
+      </div>
+    </mine-pupop>
+    <!-- 支付状态 -->
+    <mine-pupop :show="PayStatus">
+      <div class="pay-block">
+        <div class="delete-pupop"
+             @click="changePayStatus"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/slices/delete.png"
+               alt=""></div>
+        <div v-if="isPayCode">
+          <div class="pay-title">请扫码支付</div>
+          <div class="pay-price">￥<span>{{isSelectCoup.length>0?showMoney:discountPrice}}</span></div>
+          <div class="banner">
+            <div id="qrCode"
+                 class="qrCode"
+                 ref="qrCodeDiv"></div>
+          </div>
+        </div>
+        <div v-else>
+          <div class="pay-title">支付成功</div>
+          <div class="pay-suc"><img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/paySuc.png"
+                 alt=""></div>
+          <div class="pay-button"
+               @click="toHome">返回首页</div>
+        </div>
+      </div>
+    </mine-pupop>
   </div>
 </template>
 
 <script>
 import minePupop from '../../../components/minePupop/index.vue'
+import QRCode from 'qrcodejs2'
 import api from '../../../server/home'
 
 export default {
@@ -367,21 +430,6 @@ export default {
       },
       //皮肤状态列表
       poreList: [
-        {
-          medium: 133,
-          small: 344,
-          mini: 242
-        },
-        {
-          medium: 133,
-          small: 344,
-          mini: 242
-        },
-        {
-          medium: 133,
-          small: 344,
-          mini: 242
-        }
       ],
       //优惠券列表
       couponList: [],
@@ -389,6 +437,27 @@ export default {
       selectCouponList: [],
       //已选择优惠券的id（同一个id只能选择一张优惠券）
       selectCouponListId: [],
+      //支付方式
+      payList: [
+        {
+          title: '储值支付',
+          pay_way: 'amount',
+          payImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/savingsPay.png',
+          isSelect: true
+        },
+        {
+          pay_way: 'weixin',
+          title: '微信支付',
+          payImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/weiXinPay.png',
+          isSelect: false
+        },
+        {
+          pay_way: 'alipay',
+          title: '支付宝支付',
+          payImg: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/zhifubaoPay.png',
+          isSelect: false
+        },
+      ],
       timesInfo: '',
       reservationPrice: 0,//预约费用
       projectInfo: '',
@@ -402,22 +471,25 @@ export default {
       isProject: false,//是否展示选择项目弹窗
       isTs: false,//是否展示选择时间弹窗
       isPore: false,//皮肤状态弹窗
+      choicePayType: false,//支付弹窗
+      PayStatus: false,//支付状态弹窗
+      isPayCode: true,//是否展示支付二维码
       id: 0,//订单id
+      lastProjectPrice: '',//项目已选择的升级包
       isChange: false,//项目是否有改变
       isEditProject: false,//是否编辑项目
+      payStatusInterval: null,//轮循拉支付状态
       page: 1,
       limit: 200,
-
-
-
-
-    needSelect: false,
-    coupSelectType: '',
-    productDiscount: '',
-    isSelectCoup: [], // 选择的优惠券
-    // 下面是支付的数据
-    showMoney: 0, // 价值总额
-    // showRuleText: 10086,
+      needSelect: false,
+      coupSelectType: '',
+      productDiscount: '',
+      isSelectCoup: [], // 选择的优惠券
+      // 下面是支付的数据
+      showMoney: 0, // 价值总额
+      discountPrice: 0,//活动后金额
+      discount: 0,//折扣类型
+      // showRuleText: 10086,
 
     };
   },
@@ -427,6 +499,9 @@ export default {
   watch: {},
 
   methods: {
+    toHome () {
+      this.$router.replace('/home')
+    },
     getOrderInfo () {
       api.getOrderInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user
@@ -434,8 +509,21 @@ 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.showMoney = res.data.order_data.price
         this.poreList = res.data.detail_list
+        this.order_data['discountPrice'] = 0
+        //折扣类型，0.无折扣，20.任意三个项目8折，50.新人五折活动，100.仪器免费使用权益
+        this.order_data.project_list.forEach(item => {
+          if (this.discount == 20) {
+            this.order_data.discountPrice += Number(item.price) * 0.8
+          } else if (this.discount == 50) {
+            this.order_data.discountPrice += Number(item.price) * 0.5
+          } else if (this.discount == 0) {
+            this.order_data.discountPrice = this.showMoney
+          }
+        })
+        console.log(Number(this.order_data.discountPrice).toFixed(2), 'this.order_data.discountPrice.toFixed(2)');
+        this.discountPrice = Number(this.order_data.discountPrice).toFixed(2)
         this.calculationPrice()
       })
     },
@@ -445,13 +533,19 @@ export default {
       })
     },
     getProducts (e) {
-      this.productsInfo = ''
+      // this.productsInfo = ''
       api.getProducts({ id: e }).then(res => {
         this.productsList = res.data.list
+        this.productsList.forEach(item => {
+          if (this.productsInfo == item.id) {
+            this.lastProjectPrice = Number(item.price)
+          }
+        })
       })
     },
     eidt (item) {
       this.projectInfo = item.id
+      this.productsInfo = item.product_ids == '' ? '' : Number(item.product_ids)
       this.getProducts(item.id)
       this.isEditProject = true
       this.isProject = true
@@ -469,6 +563,7 @@ export default {
     },
     addProject () {
       this.projectInfo = ''
+      this.productsInfo = ''
       this.isEditProject = false
       this.isProject = true
     },
@@ -477,16 +572,18 @@ export default {
       // 编辑
       if (this.isEditProject) {
         if (this.productsInfo != '') {
+
           this.order_data.project_list.forEach(e => {
             if (this.projectInfo == e.id) {
               this.productsList.forEach(item => {
-                if (e.product_ids != '') {
-                  e.price = Number(e.price) - Number(item.price)
-                }
                 e.product_ids = this.productsInfo
                 if (item.id == e.product_ids) {
+                  if (e.product_ids != '') {
+                    e.price = Number(e.price) - Number(this.lastProjectPrice)
+                  }
                   this.isChange = true
                   e.product_names = item.name
+                  console.log(Number(e.price), Number(item.price), 'Number(e.price) + Number(item.price)');
                   e.price = Number(e.price) + Number(item.price)
                   this.isProject = false
                   this.isEditProject = false
@@ -524,7 +621,6 @@ export default {
             }
           })
         }
-        console.log(nowProjectInfo, 'nowProjectInfo', productsInfo);
         projectInfo['name'] = nowProjectInfo.name
         projectInfo['id'] = nowProjectInfo.id
         projectInfo['cover_url'] = nowProjectInfo.cover_url
@@ -554,20 +650,18 @@ export default {
       let tsTableList = []
       for (let i = 0; i < 7; i++) {
         //显示周一
-        let ShowTime = nowTime + (i + 1) * oneDayTime;
+        let ShowTime = nowTime + (i) * 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
     },
@@ -580,14 +674,15 @@ export default {
         this.tsTableIndex = 0
         this.isTs = true
       } else {
-        debugger
+        this.choicePayType = true
       }
     },
     //确定时间选择
     comfigTs () {
       if (this.timeIndexText.length == 0) return
-      let order_data = [], order_data_info = {}
+      let order_data = []
       this.order_data.project_list.forEach(item => {
+        let order_data_info = {}
         order_data_info['id'] = item.id
         if (item.product_ids != "") {
           order_data_info['product_id'] = item.product_ids
@@ -614,12 +709,12 @@ export default {
         this.reservationPrice += Number(res.price)
       })
     },
+
     //获取订单优惠券
     onCoupon () {
-
-      if(this.couponList.length>0){
-         this.isCoupun = true
-         return
+      if (this.couponList.length > 0) {
+        this.isCoupun = true
+        return
       }
 
       let params = {
@@ -637,10 +732,82 @@ export default {
           this.onCoupon()
         }
       })
-      console.log(this.couponList)
       this.isCoupun = true
     },
+    //选择支付方式
+    changeType (i) {
+      this.payList.forEach((res, index) => {
+        if (index == i) {
+          res.isSelect = true
+        } else {
+          res.isSelect = false
+        }
+      })
+    },
+    pay () {
+      let that = this
+      let payWayList = this.payList.filter(res => {
+        return res.isSelect == true
+      })
+      // 卡券，项目券数据包, id：订单项目ID, coupon_id：优惠券ID, 如：[{ "id": 1220, coupon_id: 199 }]isSelectCoup
+      let params = {
+        id: this.id,
+        pay_way: payWayList[0].pay_way,
+        discount: this.discount
+      }
 
+      let coupon_data = []
+      if (this.isSelectCoup.length > 0) {
+        this.isSelectCoup.forEach(item => {
+          if (item.type != 4) {
+            params['coupon_id'] = item.id
+          } else {
+            let couponInfo = {}
+            couponInfo['id'] = item.projectids
+            couponInfo['coupon_id'] = item.id
+          }
+        })
+      }
+      params['coupon_data'] = coupon_data.length > 0 ? JSON.stringify(coupon_data) : null
+      api.orderPay(params).then(res => {
+        if (res.code == 200) {
+          this.choicePayType = false
+          this.PayStatus = true
+          if (res.data.pay_status == 1) {
+            this.isPayCode = false
+          } else {
+            this.$nextTick(() => {
+              new QRCode(that.$refs.qrCodeDiv, {
+                text: res.data.qr_code_string,
+                width: 140,
+                height: 140,
+                colorDark: "#333333", //二维码颜色
+                colorLight: "#ffffff", //二维码背景色
+                correctLevel: QRCode.CorrectLevel.L//容错率，L/M/H
+              })
+            })
+            this.payStatusInterval = setInterval(e => {
+              this.payStatus()
+            }, 1000)
+          }
+        }
+
+      })
+    },
+    changePayStatus () {
+      this.PayStatus = false
+      if (this.payStatusInterval) { //如果定时器在运行则关闭
+        clearInterval(this.payStatusInterval)
+      }
+    },
+    payStatus () {
+      api.payStatus({ id: this.id, }).then(res => {
+        if (res.data.pay_status == 1) {
+          clearInterval(this.payStatusInterval)
+          this.isPayCode = false
+        }
+      })
+    },
 
     //数组包含关系
     includes (arr1, arr2) {
@@ -658,191 +825,179 @@ export default {
     // },
 
 
-// 不可以用的不显示，如果同时有项目劵、抵扣劵、满减劵，只能用一种类型，其他劵不显示
-// 1、针对单个项目，项目劵可以多选
-// 2、抵扣劵、满减劵针对的是整个订单，当用户已使用了单个项目劵时，抵扣劵、满减劵就不能使用
-// 3、优惠劵可以给多个项目抵扣,
-// 4、默认抵扣金额最高的
-// 5、优惠劵排序，到期时间倒叙
-
+    // 不可以用的不显示，如果同时有项目劵、抵扣劵、满减劵，只能用一种类型，其他劵不显示
+    // 1、针对单个项目，项目劵可以多选
+    // 2、抵扣劵、满减劵针对的是整个订单，当用户已使用了单个项目劵时，抵扣劵、满减劵就不能使用
+    // 3、优惠劵可以给多个项目抵扣,
+    // 4、默认抵扣金额最高的
+    // 5、优惠劵排序，到期时间倒叙
 
-/**
-   * 点击使用按钮、勾选按钮
-   */
-  selectPupop: function (item, index) {
 
+    /**
+       * 点击使用按钮、勾选按钮
+       */
+    selectPupop: function (item, index) {
 
-    let CouPonIndex = this.couponList
+      let CouPonIndex = this.couponList
+      let selectIndex = index
+      let curreValue = !CouPonIndex[selectIndex].isSelect
+      let project_list = this.order_data.project_list //这里是项目列表
 
-    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 = ''
-      }
+      // 判断是否是不相同的项目券
+      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
+      } 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
+          }
+        }
+        if (numberSelect == this.order_data.project_list.length && curreValue) {
+          this.$message.error('最多选择' + this.order_data.project_list.length + '项目券!');
+          return
         }
       }
-      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].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 = ''
       }
-      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
+      let orderDetails1 = this.order_data
+      orderDetails1.project_list = project_list
 
-    console.log(this.order_data)
-    console.log(this.couponList)
 
-    this.selectCoup()
+      this.order_data = orderDetails1
+      this.couponList = CouPonIndex
+      this.coupSelectType = this.couponList[selectIndex].type
+      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)
+    // 选择项目进行绑定
+    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)
+      this.isSelectCoup = isSelectCoups
 
-    // 抵扣顺序按照项目金额计算
-    that.theMoneyBest()
-  },
+      // 抵扣顺序按照项目金额计算
+      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('没绑定过!')
+    // 抵扣顺序按照项目金额计算
+    // 卡券，项目券数据包,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(this.couponList, 'this.couponList');
+      (productDiscount)
+      if (isSelectCoup.length > 0 && isSelectCoup[0].type && isSelectCoup[0].type == 4) {
+        for (let i = 0; i < isSelectCoup.length; i++) { // 首先遍历卡券
+          if (!isSelectCoup[i].projectids) { // 如果卡券没绑定项目
 
-          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)
+            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) { // 如果卡券能够使用这个项目并且这个项目没有被绑定过
+                if (project_list[j].price * 1 > selectIndexMoney * 1) {
+                  selectIndex = j
+                  selectIndexMoney = project_list[j].price
+                }
+                // selectProjectList.push(project_list[i])
               }
-              // 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('没有适合的项目!');
+            if (selectIndex != 111) {
+              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
       }
-      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 //这里是项目列表
+      this.calculateMoney() //计算总额
+    },
 
-    if (isSelectCoup.length == 0) {
-        this.showMoney=money.toFixed(2)
-      return
-    }
+    // 计算总额
+    calculateMoney () {
+      let that = this
+      let money = Number(this.order_data.price)
+      let isSelectCoup = this.isSelectCoup
+      let project_list = this.order_data.project_list //这里是项目列表
 
-    // 如果是项目
-    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
+      if (isSelectCoup.length == 0) {
+        this.showMoney = money.toFixed(2)
+        return
       }
 
-    } else {
-      money = money - isSelectCoup[0].price
-    }
-
-        this.showMoney=money.toFixed(2)
+      // 如果是项目
+      if (isSelectCoup[0].type == 4) {
+        for (let i = 0; i < project_list.length; i++) {
+          if (project_list[i].cardId) {
+            money = money - Number(project_list[i].price)
+          }
+        }
+        this.showMoney = money.toFixed(2)
+        if (this.order_data.project_list.length - this.isSelectCoup.length >= 3) {
+          console.log(money, 'money');
+          money = (money * 0.8).toFixed(2)
+          console.log(money, 'money');
 
+        }
+      } else if (isSelectCoup[0].type == 3) {
+        for (let i = 0; i < project_list.length; i++) {
+          money = money - Number(project_list[i].price)
+        }
 
-  },
+      } else {
+        money = money - Number(isSelectCoup[0].price)
+      }
+      console.log(this.showMoney, 'showMoney', money);
+      this.showMoney = money
+    },
 
 
     changeActive (e) {
@@ -878,10 +1033,13 @@ export default {
         this.$set(this.programmeList[index], 'onSelect', true)
       }
     },
-    onSubmit () {
-
-    },
-    submitFrequency () { },
+    //获取订单折扣类型
+    getOrderDiscount () {
+      api.getOrderDiscount({ id: this.id }).then(res => {
+        this.discount = res.data.discount
+        this.getOrderInfo()
+      })
+    }
   },
 
   created () {
@@ -889,13 +1047,20 @@ export default {
     if (id) {
       this.id = id
     }
-    this.getOrderInfo()
+
     this.getProjectList()
+    this.getOrderDiscount()
+
   },
 
   mounted () {
 
   },
+  destroyed () {
+    if (this.payStatusInterval) { //如果定时器在运行则关闭
+      clearInterval(this.payStatusInterval)
+    }
+  }
 }
 
 </script>
@@ -1663,5 +1828,112 @@ export default {
       }
     }
   }
+  .pay-block {
+    width: 540px;
+    height: 400px;
+    background: #ffffff;
+    border-radius: 8px;
+    position: relative;
+    padding: 42px;
+    .delete-pupop {
+      width: 32px;
+      position: absolute;
+      right: 5px;
+      top: 5px;
+      img {
+        width: 100%;
+      }
+    }
+    .pay-title {
+      font-size: 14px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333333;
+      line-height: 20px;
+      text-align: center;
+    }
+    .pay-suc {
+      margin-top: 40px;
+      margin-bottom: 80px;
+      text-align: center;
+      img {
+        width: 140px;
+      }
+    }
+    .pay-price {
+      margin-top: 10px;
+      font-size: 14px;
+      font-family: OPPOSans-B, OPPOSans;
+      font-weight: normal;
+      color: #fa4622;
+      text-align: center;
+      line-height: 31px;
+      span {
+        font-size: 20px;
+      }
+    }
+    .banner {
+      margin-top: 24px;
+      .qrCode {
+        text-align: center;
+      }
+    }
+    .pay-list {
+      width: 338px;
+      margin-top: 8px;
+      position: relative;
+      left: 50%;
+      transform: translateX(-50%);
+      .pay-info {
+        margin-top: 16px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        height: 44px;
+        border-radius: 35px;
+        border: 1px solid #d0d0d0;
+
+        padding: 0 20px;
+        .pay-left {
+          margin-left: 8px;
+          font-size: 16px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #333333;
+          line-height: 22px;
+          display: flex;
+          align-items: center;
+          img {
+            width: 24px;
+          }
+          span {
+            margin-left: 20px;
+          }
+        }
+        .pay-right {
+          img {
+            width: 24px;
+          }
+        }
+      }
+    }
+    .pay-button {
+      margin-top: 28px;
+      width: 176px;
+      height: 28px;
+      background: #fa7d22;
+      border-radius: 14px;
+      font-size: 14px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #ffffff;
+      line-height: 28px;
+      text-align: center;
+      position: relative;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
 }
 </style>

src/pages/confirmOrder/index.vue

@@ -1,92 +1,100 @@
 <template>
   <div class="mine">
     <div class="qr-code">
-      <div id="qrCode"
-           ref="qrCodeDiv"></div>
+      <div id="qrCode" ref="qrCodeDiv"></div>
     </div>
   </div>
 </template>
 
 <script>
-import QRCode from 'qrcodejs2'
-import api from '../../server/home'
+import QRCode from "qrcodejs2";
+import api from "../../server/home";
 export default {
   components: {},
-  data () {
+  data() {
     return {
-      qrcode_string: '',
-      ticket: '',
+      qrcode_string: "",
+      ticket: "",
       checkCodeInterval: null,
-      checkCodeTimeout: null,
+      checkCodeTimeout: null
     };
   },
   computed: {},
   watch: {},
 
   methods: {
-    getAuthCode () {
+    getAuthCode() {
       api.getAuthCode().then(res => {
-        this.qrcode_string = res.data.qrcode_string
-        this.ticket = res.data.ticket
+        this.qrcode_string = res.data.qrcode_string;
+        this.ticket = res.data.ticket;
         this.$nextTick(() => {
           this.bindQRCode();
-          // this.checkCode()
-        })
-      })
+          this.checkCode();
+        });
+      });
     },
-    checkCode () {
+    checkCode() {
       this.checkCodeInterval = setInterval(e => {
         api.checkCode({ ticket: this.ticket }).then(res => {
           if (res.data.status == 1) {
-            clearInterval(this.checkCodeInterval)
+            clearInterval(this.checkCodeInterval);
+            this.getOrderByCode();
           }
-        })
-      }, 1000)
+        });
+      }, 1000);
       //十分钟强制清除，防止页面崩溃
       this.checkCodeTimeout = setTimeout(() => {
-        clearTimeout(this.checkCodeTimeout)
-      }, 600000)
+        clearTimeout(this.checkCodeTimeout);
+      }, 360000);
     },
-    getOrderByCode () {
+    getOrderByCode() {
       api.getOrderByCode({ ticket: this.ticket }).then(res => {
         if (res.code == 200) {
+          // 无订单入口
+          if (res.data.order_id == 0) {
+            this.$router.push({
+              path: "/confirmOrder/addOrder",
+              query: {   //user_id
+                data: JSON.stringify(res.data),
+                // user_id:res.data.user.user_id
+              }
+            });
+          return
+          }
+
           this.$router.push({
-            path: '/confirmOrder/details',
+            path: "/confirmOrder/details",
             query: {
-              id: res.order_id
+              id: res.data.order_id
             }
-          })
+          });
         }
-      })
+      });
     },
-    bindQRCode () {
+    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
-      })
+        correctLevel: QRCode.CorrectLevel.L //容错率，L/M/H
+      });
     }
   },
 
-  created () {
-    this.getAuthCode()
-
+  created() {
+    this.getAuthCode();
   },
 
-  mounted () {
-
-  },
-  destroyed () {
+  mounted() {},
+  destroyed() {
     if (this.checkCodeInterval) {
-      clearInterval(this.checkCodeInterval)
-      clearTimeout(this.checkCodeTimeout)
+      clearInterval(this.checkCodeInterval);
+      clearTimeout(this.checkCodeTimeout);
     }
   }
-}
-
+};
 </script>
 
 <style lang='less' scoped>

src/pages/coupon/index.vue

@@ -34,7 +34,7 @@
       <el-table ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
-                height="354"
+                height="500"
                 style="width: 100%;border-radius: 8px;"
                 @selection-change="handleSelectionChange">
         <el-table-column type="selection"
@@ -98,11 +98,9 @@ export default {
     },
     handleSelectionChange (val) {
       this.multipleSelection = val;
-      console.log(this.multipleSelection);
     },
     // 发送优惠券
     sendCoupon () {
-      console.log(this.coupon);
       let selectIds = "";
       for (let i = 0; i < this.multipleSelection.length; i++) {
         selectIds = selectIds + "," + this.multipleSelection[i].id;
@@ -112,12 +110,18 @@ export default {
         user_ids: selectIds.substring(1, selectIds.length),
         num: this.couponNum
       };
-      api.sendCoupon(params).then(res => { });
+      api.sendCoupon(params).then(res => {
+        if (res.code == 200) {
+          this.$message({
+            message: '发送成功',
+            type: 'success'
+          });
+        }
+      });
     },
 
     // 获取订单列表
     getUserList () {
-      console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -133,7 +137,6 @@ export default {
 
     // 获取优惠券列表
     getCouponInfo () {
-      console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
         limit: 100
@@ -148,11 +151,9 @@ export default {
     handleCurrentChange (e) {
       this.currentPage1 = e;
       this.getUserList();
-      console.log(e, "eeeeee");
     },
 
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`);
     }
   },
 

src/pages/customerMan/details/index.vue

@@ -3,7 +3,8 @@
     <div class="left">
       <div class="user-info">
         <div class="user-img">
-          <img :src="userInfo.avatar_url" alt />
+          <img :src="userInfo.avatar_url"
+               alt />
         </div>
         <div class="user-span">
           <div class="name">
@@ -82,7 +83,9 @@
           <div class="lable">
             <div class="lable-title">面诊标签</div>
             <div class="lable-list">
-              <div v-for="(item,index) in lableList" :key="index" class="lable-info">{{item.text}}</div>
+              <div v-for="(item,index) in lableList"
+                   :key="index"
+                   class="lable-info">{{item.text}}</div>
             </div>
           </div>
           <div class="ps">
@@ -91,18 +94,22 @@
           </div>
         </div>
         <div class="right-top-list">
-          <div class="dataList" @click="toOrder(1)">
-            <img :src="userInfo.image" />
+          <div class="dataList"
+               @click="toOrder(1)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/project_icon.png" />
             <p>项目订单</p>
             <span>{{order_total.project}}</span>
           </div>
-          <div class="dataList" style="margin:18px 0px" @click="toOrder(2)">
-            <img :src="userInfo.image" />
-            <p>卡券订单</p>
+          <div class="dataList"
+               style="margin:18px 0px"
+               @click="toOrder(2)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/coupon_icon.png" />
+            <p>优惠券</p>
             <span>{{order_total.coupon}}</span>
           </div>
-          <div class="dataList" @click="toOrder(3)">
-            <img :src="userInfo.image" />
+          <div class="dataList"
+               @click="toOrder(3)">
+            <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/icon/coupon/order_total_icon.png" />
             <p>商品订单</p>
             <span>{{order_total.goods}}</span>
           </div>
@@ -114,18 +121,14 @@
             <div class="tab-title">执行方案</div>
           </div>
           <div class="programme-list">
-            <div
-              :class="['programme-info',item.onSelect?'programme-active':'']"
-              v-for="(item,index) in programmeList"
-              :key="index"
-              @click="onOperation(index)"
-            >
+            <div :class="['programme-info',item.onSelect?'programme-active':'']"
+                 v-for="(item,index) in programmeList"
+                 :key="index"
+                 @click="onOperation(index)">
               <div class="programme-left">
                 <div class="programme-img">
-                  <img
-                    src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
-                    alt
-                  />
+                  <img src="https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png"
+                       alt />
                 </div>
                 <div class="programme-tips">
                   <div class="tips-title">{{'【清洁补水】华熙智慧…'|ellipsis(9)}}</div>
@@ -146,7 +149,8 @@
                   <span>28天</span>
                 </div>
               </div>
-              <div class="operation" v-if="item.onSelect">
+              <div class="operation"
+                   v-if="item.onSelect">
                 <div class="edit">编辑</div>
                 <div class="delete">删除</div>
               </div>
@@ -162,7 +166,7 @@
 import api from "../../../server/home";
 
 export default {
-  data() {
+  data () {
     return {
       userInfo: {
         image:
@@ -195,20 +199,19 @@ export default {
   watch: {},
 
   methods: {
-    getPadUserInfo() {
+    getPadUserInfo () {
       api.getPadUserInfo({ id: this.id }).then(res => {
         this.userInfo = res.data.user;
         this.remarks = res.data.remark;
         this.lableList = res.data.tags;
         this.order_total = res.data.order_total;
         this.programmeList = res.data.scheme_list;
-
         // this.programmeList = res.data.order_data.project_list;
         // this.coupon_list = res.data.order_data.coupon_list;
       });
     },
 
-    onOperation(index) {
+    onOperation (index) {
       if (this.programmeList[index].onSelect) {
         this.$set(
           this.programmeList[index],
@@ -219,27 +222,30 @@ export default {
         this.$set(this.programmeList[index], "onSelect", true);
       }
     },
-    toOrder(index) {
-      if (index === 1) {
+    toOrder (index) {
+      let activeName = 'first'
+      if (index == 3) {
+        activeName = 'third'
+      } else if (index == 2) {
+        activeName = 'second'
+      }
       this.$router.push({
         path: "/customerMan/projectOrder",
         query: {
-          id: this.id
+          id: this.id,
+          activeName: activeName
         }
       });
-      }
     },
-    onSubmit() {},
-    submitFrequency() {}
   },
 
-  created() {
+  created () {
     let id = this.$route.query.id;
     this.id = id;
     this.getPadUserInfo();
   },
 
-  mounted() {}
+  mounted () { }
 };
 </script>
 

src/pages/customerMan/index.vue

@@ -16,7 +16,7 @@
       <el-table ref="multipleTable"
                 :data="tableData"
                 tooltip-effect="dark"
-                height="354"
+                height="500"
                 style="width: 100%;border-radius: 8px;"
                 @row-click="handleSelectionChange">
         <el-table-column label="头像"
@@ -85,7 +85,6 @@ export default {
 
     // 获取订单列表
     getUserList () {
-      console.log("xxxxxxx");
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -102,11 +101,9 @@ export default {
     handleCurrentChange (e) {
       this.currentPage1 = e;
       this.getUserList();
-      console.log(e, "eeeeee");
     },
 
     handleSizeChange (val) {
-      console.log(`每页 ${val} 条`);
     },
     handleSelectionChange (row, column, event) {
       this.$router.push({

src/pages/customerMan/myOrder/index.vue

@@ -1,141 +1,169 @@
 <template>
   <div class="order">
     <div class="warp">
-      <el-tabs type="border-card">
-        <el-tab-pane label="项目订单">
+      <el-tabs type="border-card"
+               @tab-click="changeTab"
+               v-model="activeName">
+        <el-tab-pane label="项目订单"
+                     name="first">
           <div class="user-list">
-            <el-table
-              ref="multipleTable"
-              :data="projectData"
-              tooltip-effect="dark"
-              height="354"
-              style="width: 100%;border-radius: 8px;"
-              @row-click="handleSelectionChange"
-            >
-              <el-table-column prop="goods" label="项目名称" width="200">
+            <el-table ref="multipleTable"
+                      :data="projectData"
+                      tooltip-effect="dark"
+                      height="354"
+                      style="width: 100%;border-radius: 8px;"
+                      @row-click="handleSelectionChange">
+              <el-table-column prop="goods"
+                               label="项目名称"
+                               width="200">
                 <template slot-scope="scope">
-                  <div v-for="(val,index) in scope.row.goods" :key="index">
+                  <div v-for="(val,index) in scope.row.goods"
+                       :key="index">
                     <div>{{val.name}}</div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="goods" label="数量" show-overflow-tooltip>
+              <el-table-column prop="goods"
+                               label="数量"
+                               show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>{{scope.row.goods.length}}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="price" label="总价格" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="order_time" label="预约时间" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="store_name" label="预约店铺" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="status" label="状态" show-overflow-tooltip>
+              <el-table-column prop="price"
+                               label="总价格"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="order_time"
+                               label="预约时间"
+                               width="180"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="store_name"
+                               label="预约店铺"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="status"
+                               label="状态"
+                               show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'color'+scope.row.status">{{scope.row.status!=5?statusStr[scope.row.status]:statusStr[statusStr.length-1]}}</div>
                 </template>
               </el-table-column>
             </el-table>
 
             <div class="pagin">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page.sync="currentPage1"
-                :total="1000"
-              ></el-pagination>
+              <el-pagination background
+                             layout="prev, pager, next"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="currentPage1"
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="卡卷订单">
+        <el-tab-pane label="卡卷订单"
+                     name="second">
           <div class="user-list">
-            <el-table
-              ref="multipleTable"
-              :data="couponData"
-              tooltip-effect="dark"
-              height="354"
-              style="width: 100%;border-radius: 8px;"
-              @row-click="handleSelectionChange"
-            >
+            <el-table ref="multipleTable"
+                      :data="couponData"
+                      tooltip-effect="dark"
+                      height="354"
+                      style="width: 100%;border-radius: 8px;">
 
-<!-- create_time: "2022-03-10 10:39:19"
+              <!-- create_time: "2022-03-10 10:39:19"
 ex_time: "2022.03.17 23:59"
 id: 2517
 name: "新人体验券"
 status: 2
 type: "全额券" -->
 
-              <el-table-column prop="name" label="卡卷名称" width="200"></el-table-column>
-              <el-table-column prop="type" label="卡卷类型" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="price" label="总价格" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="create_time" label="到期时间" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="create_time" label="创建时间" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="status" label="状态" show-overflow-tooltip>
+              <el-table-column prop="name"
+                               label="卡卷名称"
+                               width="200"></el-table-column>
+              <el-table-column prop="type"
+                               label="卡卷类型"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="price"
+                               label="总价格"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time"
+                               label="到期时间"
+                               width="180"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time"
+                               label="创建时间"
+                               width="180"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="status"
+                               label="状态"
+                               show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'color'+scope.row.status">{{couponStatus[scope.row.status]}}</div>
                 </template>
               </el-table-column>
             </el-table>
 
             <div class="pagin">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page.sync="currentPage1"
-                :total="1000"
-              ></el-pagination>
+              <el-pagination background
+                             layout="prev, pager, next"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="currentPage1"
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
 
-        <el-tab-pane label="商品订单">
+        <el-tab-pane label="商品订单"
+                     name="third">
           <div class="user-list">
-            <el-table
-              ref="multipleTable"
-              :data="goodData"
-              tooltip-effect="dark"
-              height="354"
-              style="width: 100%;border-radius: 8px;"
-              @row-click="handleSelectionChange"
-            >
+            <el-table ref="multipleTable"
+                      :data="goodData"
+                      tooltip-effect="dark"
+                      height="354"
+                      style="width: 100%;border-radius: 8px;">
 
-<!-- create_time: "2022-03-19 22:53:40"
+              <!-- create_time: "2022-03-19 22:53:40"
 goods: [{order_id: 47, name: "润百颜玻尿酸屏障调理面膜", num: 1}]
 id: 47
 price: "0.01"
 status: 5 -->
 
-              <el-table-column prop="goods" label="商品名称" width="200">
+              <el-table-column prop="goods"
+                               label="商品名称"
+                               width="200">
                 <template slot-scope="scope">
-                  <div v-for="(val,index) in scope.row.goods" :key="index">
+                  <div v-for="(val,index) in scope.row.goods"
+                       :key="index">
                     <div>{{val.name}}</div>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="goods" label="数量" show-overflow-tooltip>
+              <el-table-column prop="goods"
+                               label="数量"
+                               show-overflow-tooltip>
                 <template slot-scope="scope">
                   <div>{{scope.row.goods.length}}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="price" label="实付款" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="create_time" label="下单时间" width="180" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="status" label="状态" show-overflow-tooltip>
+              <el-table-column prop="price"
+                               label="实付款"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="create_time"
+                               label="下单时间"
+                               width="180"
+                               show-overflow-tooltip></el-table-column>
+              <el-table-column prop="status"
+                               label="状态"
+                               show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div :class="'classShow'+scope.$index">{{statusStr[scope.row.status]}}</div>
+                  <div :class="'classShow'+scope.$index">{{scope.row.status==1||scope.row.status==2?goodStatus[scope.row.status]:goodStatus[goodStatus.length-1]}}</div>
                 </template>
               </el-table-column>
             </el-table>
 
             <div class="pagin">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page.sync="currentPage1"
-                :total="1000"
-              ></el-pagination>
+              <el-pagination background
+                             layout="prev, pager, next"
+                             @current-change="handleCurrentChange"
+                             :current-page.sync="currentPage1"
+                             :total="total"></el-pagination>
             </div>
           </div>
         </el-tab-pane>
@@ -148,7 +176,7 @@ status: 5 -->
 import api from "../../../server/home";
 
 export default {
-  data() {
+  data () {
     return {
       couponList: [
         {
@@ -185,19 +213,29 @@ export default {
         }
       ],
       statusStr: [
-        "已预约",
         "未支付",
-        "已支付",
         "待使用",
         "正在使用",
         "已结算",
         "已取消"
       ],
+      couponStatus: [
+        '待使用',
+        '已使用',
+        '已过期'
+      ],
+      goodStatus: [
+        '未支付',
+        '已支付',
+        '已取货'
+      ],
+      activeName: 'first',
       currentPage1: 1,
       couponData: [],
       goodData: [],
       projectData: [],
-      total: ""
+      total: 100,
+      limit: 10
     };
   },
   computed: {},
@@ -205,7 +243,7 @@ export default {
 
   methods: {
     // 获取优惠券订单
-    getUserCoupon() {
+    getUserCoupon () {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -218,7 +256,7 @@ export default {
     },
 
     // 获取商品订单
-    getUserGoods() {
+    getUserGoods () {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -231,7 +269,7 @@ export default {
     },
 
     // 获取获取项目订单
-    getUserProject() {
+    getUserProject () {
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -242,27 +280,53 @@ export default {
         this.total = res.data.total;
       });
     },
-
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    handleCurrentChange (val) {
+      this.currentPage1 = val
+      if (this.activeName == 'first') {
+        this.getUserProject();
+      } else if (this.activeName == 'second') {
+        this.getUserCoupon();
+      } else if (this.activeName == 'third') {
+        this.getUserGoods();
+      }
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    handleSelectionChange (row, column, event) {
+      this.$router.push({
+        path: "/historicalOrder/details",
+        query: {
+          id: row.id
+        }
+      });
     },
-    handleSelectionChange(row, column, event) {},
-    onSubmit() {},
-    submitFrequency() {}
+    onSubmit () { },
+    submitFrequency () { },
+    changeTab (e) {
+      this.currentPage1 = 1
+      if (e.index == 0) {
+        this.getUserProject();
+      } else if (e.index == 1) {
+        this.getUserCoupon();
+      } else if (e.index == 2) {
+        this.getUserGoods();
+      }
+    }
   },
 
-  created() {
+  created () {
     let id = this.$route.query.id;
+    let activeName = this.$route.query.activeName
+    this.activeName = activeName
     this.id = id;
-    this.getUserCoupon();
-    this.getUserGoods();
-    this.getUserProject();
+    if (this.activeName == 'first') {
+      this.getUserProject();
+    } else if (this.activeName == 'second') {
+      this.getUserCoupon();
+    } else if (this.activeName == 'third') {
+      this.getUserGoods();
+    }
   },
 
-  mounted() {}
+  mounted () { }
 };
 </script>
 

src/pages/historicalOrder/index.vue

@@ -1,63 +1,78 @@
 <template>
   <div class="mine">
     <div class="condition">
-      <el-date-picker
-        v-model="dates"
-        type="daterange"
-        range-separator="->"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-      ></el-date-picker>
+      <el-date-picker v-model="dates"
+                      type="daterange"
+                      range-separator="->"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"></el-date-picker>
 
-      <el-input placeholder="请输入项目" class="search" v-model="product">
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      <el-input placeholder="请输入项目"
+                class="search"
+                v-model="product">
+        <i slot="prefix"
+           class="el-input__icon el-icon-search"></i>
       </el-input>
 
-      <el-input placeholder="请输入优惠券" class="search" v-model="coupon">
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      <el-input placeholder="请输入优惠券"
+                class="search"
+                v-model="coupon">
+        <i slot="prefix"
+           class="el-input__icon el-icon-search"></i>
       </el-input>
 
-      <el-input placeholder="请输入内容" class="search" v-model="searchText">
-        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      <el-input placeholder="请输入内容"
+                class="search"
+                v-model="searchText">
+        <i slot="prefix"
+           class="el-input__icon el-icon-search"></i>
       </el-input>
-      <el-button type="primary" class="searchButton" @click="getOrderList()">搜索</el-button>
+      <el-button type="primary"
+                 class="searchButton"
+                 @click="getOrderList()">搜索</el-button>
     </div>
 
     <div class="user-list">
-      <el-table
-        ref="multipleTable"
-        :data="tableData"
-        tooltip-effect="dark"
-        height="354"
-        style="width: 100%;border-radius: 8px;"
-        @row-click="handleSelectionChange"
-      >
-        <el-table-column label="头像" width="120">
+      <el-table ref="multipleTable"
+                :data="tableData"
+                tooltip-effect="dark"
+                height="500"
+                style="width: 100%;border-radius: 8px;"
+                @row-click="handleSelectionChange">
+        <el-table-column label="头像"
+                         width="120">
           <template slot-scope="scope">
             <div class="head-img">
-              <img :src="scope.row.avatar_url" alt />
+              <img :src="scope.row.avatar_url"
+                   alt />
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="nickname" label="昵称" width="120"></el-table-column>
-        <el-table-column prop="mobile" label="联系电话" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="order_time" label="预约时间" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="date" label="状态" show-overflow-tooltip>
+        <el-table-column prop="nickname"
+                         label="昵称"
+                         width="120"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="联系电话"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="order_time"
+                         label="预约时间"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="date"
+                         label="状态"
+                         show-overflow-tooltip>
           <template slot-scope="scope">
-            <div :class="'color'+scope.row.status">{{statusStr[scope.row.status]}}</div>
+            <div :style="scope.row.status==0?'color: #FC3019':scope.row.status==5?'color: #A999EA':'color: #61D09D;'">{{ scope.row.status==0?'未支付':scope.row.status==5?'已取消':'待使用' }}</div>
           </template>
         </el-table-column>
       </el-table>
 
       <div class="pagin">
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="currentPage1"
-          :total="total"
-        ></el-pagination>
+        <el-pagination background
+                       layout="prev, pager, next"
+                       @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="currentPage1"
+                       :total="total"></el-pagination>
       </div>
     </div>
   </div>
@@ -68,24 +83,15 @@ import api from "../../server/home";
 
 export default {
   components: {},
-  data() {
+  data () {
     return {
       searchText: "",
       dates: "",
       coupon: "",
       limit: 10,
       total: 0,
-      product:"",
-      coupon:"",
-      statusStr: [
-        "已预约",
-        "未支付",
-        "已支付",
-        "待使用",
-        "正在使用",
-        "已结算",
-        "已取消"
-      ],
+      product: "",
+      coupon: "",
       couponList: [
         {
           value: "选项1",
@@ -123,21 +129,19 @@ export default {
 
   methods: {
     // 获取订单列表
-    getOrderList() {
-      console.log("xxxxxxx");
+    getOrderList () {
       let start_date = "",
         end_date = "";
       if (this.dates && this.dates.length > 0) {
         start_date = utils.formatTime(this.dates[0], "yyyy-MM-dd");
         end_date = utils.formatTime(this.dates[1], "yyyy-MM-dd");
       }
-      console.log(start_date, end_date, "end_date");
       let params = {
         page: this.currentPage1,
         limit: this.limit,
         keywords: this.searchText,
-        project_name:this.product,
-        coupon_name:this.coupon,
+        project_name: this.product,
+        coupon_name: this.coupon,
         start_date: start_date,
         end_date: end_date
       };
@@ -148,17 +152,15 @@ export default {
         }
       });
     },
-    
-    handleCurrentChange(e) {
+
+    handleCurrentChange (e) {
       this.currentPage1 = e;
       this.getOrderList();
-      console.log(e, "eeeeee");
     },
 
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+    handleSizeChange (val) {
     },
-    handleSelectionChange(row, column, event) {
+    handleSelectionChange (row, column, event) {
       this.$router.push({
         path: "/historicalOrder/details",
         query: {
@@ -168,11 +170,11 @@ export default {
     }
   },
 
-  created() {
+  created () {
     this.getOrderList();
   },
 
-  mounted() {}
+  mounted () { }
 };
 </script>
 
@@ -242,7 +244,7 @@ export default {
     color: #00eeee;
   }
   .color3 {
-    color: #61D09D;
+    color: #61d09d;
   }
   .color4 {
     color: #3115cc;
@@ -251,7 +253,7 @@ export default {
     color: #fc3019;
   }
   .color6 {
-    color: #A999EA;
+    color: #a999ea;
   }
 }
 </style>

src/pages/home/index.vue

@@ -3,6 +3,7 @@
     <div class="tab">
       <div class="make-order"
            v-for="item,index in tabList"
+           @click="changeTable(item.type)"
            :key="index">
         <div class="make-icon">
           <img :src="item.image">
@@ -15,44 +16,52 @@
     </div>
     <div class="order-list">
       <div class="title">预约订单列表</div>
-      <div v-if="orderList.length>0"
-           class="list-info">
-        <div class="user-info"
-             v-for="(item,index) in orderList"
-             :key="index"
-             @click="toOrderDetails(item)"
-             :style="index==orderList.length-1?'border-bottom:0px':''">
-          <div class="head-img">
-            <div class="new">新</div><img :src="item.avatar_url"
-                 alt="">
-          </div>
-          <div class="user-information">
-            <div class="name">客户昵称：<span>{{ item.nickname }}</span></div>
-            <div class="name">预约项目时间：<span>{{ item.order_time }}</span></div>
-            <div class="name">预约项目数量：<span>{{ item.project_num }}</span></div>
-          </div>
-          <ul class="product-list">
-            <li class="product-image"
-                v-for="value,i in item.project_list"
-                :key="i"><img :src="value.cover_url"
-                   alt=""></li>
-          </ul>
-          <div class="status"
-               :style="item.status==0?'color: #FC3019':item.status==5?'color: #A999EA':'color: #61D09D;'">
-            {{ item.status==0?'未支付':item.status==5?'已取消':'待使用' }}
+      <div class="list-info">
+        <van-list v-model="loading"
+                  :finished="finished"
+                  finished-text="没有更多了"
+                  @load=" getToday ">
+
+          <div class="user-info"
+               v-for="(item,index) in orderList"
+               :key="index"
+               @click="toOrderDetails(item)"
+               :style="index==orderList.length-1?'border-bottom:0px':''">
+            <div class="head-img">
+              <div class="new"
+                   v-if="item.is_new==1">新</div><img :src="item.avatar_url"
+                   alt="">
+            </div>
+            <div class="user-information">
+              <div class="name">客户昵称：<span>{{ item.nickname }}</span></div>
+              <div class="name">预约项目时间：<span>{{ item.order_time }}</span></div>
+              <div class="name">预约项目数量：<span>{{ item.project_num }}</span></div>
+            </div>
+            <ul class="product-list">
+              <li class="product-image"
+                  v-for="value,i in item.project_list"
+                  :key="i"><img :src="value.cover_url"
+                     alt=""></li>
+            </ul>
+            <div class="status"
+                 :style="item.status==0?'color: #FC3019':item.status==5?'color: #A999EA':'color: #61D09D;'">
+              {{ item.status==0?'未支付':item.status==5?'已取消':'待使用' }}
+            </div>
           </div>
-        </div>
+        </van-list>
       </div>
-      <div v-else
+      <!-- <div v-else
            class="empty">
         暂无数据
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
 
 <script>
 import api from '@/server/home'
+import vanList from 'vant/lib/list';
+import 'vant/lib/list/style';
 
 export default {
   name: 'home',
@@ -62,31 +71,39 @@ export default {
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/make.png',
           num: 0,
-          name: '预约订单'
+          name: '预约订单',
+          type: 0,
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/unpaid.png',
           num: 0,
-          name: '未支付订单'
+          name: '未支付订单',
+          type: 2,
         },
         {
           image: 'https://we-spa.oss-cn-shenzhen.aliyuncs.com/pad_clerk/home/cancelOrder.png',
           num: 0,
-          name: '取消订单'
+          name: '取消订单',
+          type: 3
         },
       ],
       orderList: [
       ],
+      loading: false,
+      finished: false,
+      page: 1,
+      limit: 10,
+      type: 0
 
     }
   },
+  components: { vanList },
   mounted: function () {
 
   },
   created: function () {
     this.getTotal()
-    this.getToday()
-    console.log(this.$store.state.comVal.token, 'this.$store.state.comVal.token');
+    // this.getToday()
   },
   methods: {
     getTotal () {
@@ -96,26 +113,46 @@ export default {
           this.tabList[1].num = res.data.wait_pay_num
           this.tabList[2].num = res.data.cancel_num
         }
-        console.log(res, 'res====');
       })
     },
+    changeTable (type) {
+      this.type = type
+      this.orderList = []
+      this.loading = false
+      this.finished = false
+      this.page = 1
+    },
     getToday () {
-      api.getToday().then(res => {
-        if (res.code = 200) {
-          this.orderList = res.data.list
-        }
-        console.log(res, 'res');
-      })
+      setTimeout(() => {
+        api.getToday({ page: this.page, limit: this.limit, type: this.type }).then(res => {
+          if (res.code = 200) {
+            this.orderList = [...this.orderList, ...res.data.list]
+            this.page++
+            this.loading = false;
+            if (this.orderList.length >= res.data.total) {
+              this.finished = true;
+            }
+          }
+        })
+      }, 1000);
+
     },
     toOrderDetails (e) {
-      console.log(e);
-      if (e.status != 0) return
-      this.$router.push({
-        path: '/confirmOrder/details',
-        query: {
-          id: e.id
-        }
-      })
+      if (e.status == 0) {
+        this.$router.push({
+          path: '/confirmOrder/details',
+          query: {
+            id: e.id
+          }
+        })
+      } else {
+        this.$router.push({
+          path: "/historicalOrder/details",
+          query: {
+            id: e.id
+          }
+        });
+      }
     },
     initData () {
 
@@ -193,7 +230,7 @@ export default {
     }
 
     .list-info {
-      height: 300px;
+      height: 450px;
       overflow: auto;
 
       .user-info {

src/pages/login/login.vue

@@ -53,11 +53,12 @@ export default {
       api.getToken(params).then(res => {
         if (res.code == 200) {
           this.$store.state.comVal.token = res.data.token
-          console.log(this.$store.state.comVal.token, 'this.$store.');
           localStorage.setItem("token", res.data.token)
           this.$router.push({
             path: '/home'
           })
+        } else {
+          this.$message.error('账号或密码错误，请核对后输入');
         }
       })
     }

src/pages/testSkin/index.vue

@@ -76,7 +76,6 @@ export default {
         start_date = utils.formatTime(this.dates[0], 'yyyy-MM-dd')
         end_date = utils.formatTime(this.dates[1], 'yyyy-MM-dd')
       }
-      console.log(start_date, end_date, 'end_date');
       let params = {
         page: this.currentPage1,
         limit: this.limit,
@@ -102,7 +101,6 @@ export default {
     handleCurrentChange (e) {
       this.currentPage1 = e
       this.getSkinList
-      console.log(e, 'eeeeee');
     }
   },
 

src/router/map/home.js

@@ -11,6 +11,7 @@ import HistoricalOrder from '@/pages/historicalOrder/index'
 import HistoricalOrderDetails from '@/pages/historicalOrder/details'
 import ConfirmOrder from '@/pages/confirmOrder/index'
 import ConfirmOrderDetails from '@/pages/confirmOrder/details'
+import ConfirmOrderAddOrder from '@/pages/confirmOrder/addOrder'
 import StoreDetection from '@/pages/storeDetection/index'
 import Coupon from '@/pages/coupon/index'
 import projectOrder from '@/pages/customerMan/myOrder'
@@ -19,9 +20,14 @@ export default {
   path: '/layout',
   name: '首页',
   component: layout,
-  children: [
-    { path: '/home', component: Home },
-    { path: '/testSkin', component: TestSkin },
+  children: [{
+      path: '/home',
+      component: Home
+    },
+    {
+      path: '/testSkin',
+      component: TestSkin
+    },
     {
       path: '/testSkin/details',
       meta: {
@@ -29,7 +35,10 @@ export default {
       },
       component: TestSkinDetails
     },
-    { path: '/customerMan', component: CustomerMan },
+    {
+      path: '/customerMan',
+      component: CustomerMan
+    },
     {
       path: '/customerMan/details',
       meta: {
@@ -37,8 +46,17 @@ export default {
       },
       component: CustomerManDetails
     },
-    { path: '/customerMan/projectOrder', component: projectOrder },
-    { path: '/historicalOrder', component: HistoricalOrder },
+    {
+      path: '/customerMan/projectOrder',
+      meta: {
+        isback: true,
+      },
+      component: projectOrder
+    },
+    {
+      path: '/historicalOrder',
+      component: HistoricalOrder
+    },
     {
       path: '/historicalOrder/details',
       meta: {
@@ -46,7 +64,10 @@ export default {
       },
       component: HistoricalOrderDetails
     },
-    { path: '/confirmOrder', component: ConfirmOrder },
+    {
+      path: '/confirmOrder',
+      component: ConfirmOrder
+    },
     {
       path: '/confirmOrder/details',
       meta: {
@@ -54,8 +75,22 @@ export default {
       },
       component: ConfirmOrderDetails
     },
-    { path: '/storeDetection', component: StoreDetection },
-    { path: '/coupon', component: Coupon },
+    {
+      path: '/confirmOrder/addOrder',
+      meta: {
+        isback: true,
+      },
+      component: ConfirmOrderAddOrder
+    },
+
+    {
+      path: '/storeDetection',
+      component: StoreDetection
+    },
+    {
+      path: '/coupon',
+      component: Coupon
+    },
 
   ]
 }

src/server/home.js

@@ -60,6 +60,15 @@ export default class Home {
   static getOrderByCode (parms) {
     return $http.get(url.getOrderByCode, parms);
   }
+  static orderPay (parms) {
+    return $http.post(url.orderPay, parms);
+  }
+  static payStatus (parms) {
+    return $http.get(url.payStatus, parms);
+  }
+  static getOrderDiscount (parms) {
+    return $http.get(url.getOrderDiscount, parms);
+  }
 
   // 获取历史订单
   static getOrderList (parms) {
@@ -95,7 +104,7 @@ export default class Home {
   static getPadUserInfo (parms) {
     return $http.get(url.getPadUserInfo, parms);
   }
-  
+
   // 获取优惠券订单
   static getUserCoupon (parms) {
     return $http.get(url.getUserCoupon, parms);
@@ -111,6 +120,11 @@ export default class Home {
     return $http.get(url.getUserProject, parms);
   }
 
+  // 新增项目订单
+  static padOrderAdd (parms) {
+    return $http.post(url.padOrderAdd, parms);
+  }
+
 }
 
 

src/server/urls.js

@@ -33,6 +33,12 @@ export default {
   checkCode: '/v2/pad/order/check_code',
   //通过授权码获取未支付订单
   getOrderByCode: '/v2/pad/order/get_order_by_code',
+  //支付
+  orderPay: '/v2/pad/order/pay',
+  //支付状态
+  payStatus: '/v2/pad/order/pay_status',
+  //活动折扣
+  getOrderDiscount: '/v2/pad/order/discount',
 
   /**
    *  by ListKer
@@ -68,5 +74,7 @@ export default {
   // 获取优惠券订单
   getUserCoupon: '/v2/pad/user/coupon',
 
+  // 获取优惠券订单
+  padOrderAdd: '/v2/pad/order/add',
 
 }