充值跳转返回目录阅读页1

package-lock.json

@@ -308,6 +308,8 @@
     },
     "autoprefixer": {
       "version": "7.2.6",
+      "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-7.2.6.tgz",
+      "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==",
       "dev": true,
       "requires": {
         "browserslist": "^2.11.3",
@@ -397,6 +399,8 @@
     },
     "axios": {
       "version": "0.17.1",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.17.1.tgz",
+      "integrity": "sha512-mZzWRyJeJ0rtK7e1/6iYBUzmeXjzei+1h1IvbedyU0sB52++tU5AU6r6TLXpwNVR0ebXIpvTVW+9CpWNyc1n8w==",
       "requires": {
         "follow-redirects": "^1.2.5",
         "is-buffer": "^1.1.5"
@@ -639,6 +643,8 @@
     },
     "babel-loader": {
       "version": "7.1.5",
+      "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-7.1.5.tgz",
+      "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^1.0.0",
@@ -666,6 +672,8 @@
     },
     "babel-plugin-component": {
       "version": "0.10.1",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-component/-/babel-plugin-component-0.10.1.tgz",
+      "integrity": "sha512-lDnSRHmOyM2K/DWrusAgv04yDgoJVA0vJOiiNHTA6kP+VUzwqAjcjHQbFEQFgKE0WHxhb0mCsKrocOIjK1qgKQ==",
       "dev": true
     },
     "babel-plugin-syntax-async-functions": {
@@ -1029,6 +1037,8 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha512-cpGMVC1vt/772y3jx1gwSaTitQVZuFDlllgreMsZ+rTYC6jlYXRyf5FQOgSnckOiA5QmzbXTyBY2A5AmZXF1fA==",
       "dev": true,
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -1056,6 +1066,8 @@
     },
     "babel-preset-env": {
       "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
       "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "^6.22.0",
@@ -1118,6 +1130,8 @@
     },
     "babel-preset-stage-2": {
       "version": "6.24.1",
+      "resolved": "https://registry.npmmirror.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "integrity": "sha512-9F+nquz+37PrlTSBdpeQBKnQfAMNBnryXw+m4qBh35FNbJPfzZz+sjN2G5Uf1CRedU9PH7fJkTbYijxmkLX8Og==",
       "dev": true,
       "requires": {
         "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -1952,6 +1966,16 @@
       "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
       "dev": true
     },
+    "clipboard": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+      "requires": {
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
+      }
+    },
     "cliui": {
       "version": "3.2.0",
       "resolved": "https://registry.npmmirror.com/cliui/-/cliui-3.2.0.tgz",
@@ -2263,6 +2287,8 @@
     },
     "copy-webpack-plugin": {
       "version": "4.6.0",
+      "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz",
+      "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==",
       "dev": true,
       "requires": {
         "cacache": "^10.0.4",
@@ -2401,6 +2427,8 @@
     },
     "css-loader": {
       "version": "0.28.11",
+      "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-0.28.11.tgz",
+      "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "^6.26.0",
@@ -3478,6 +3506,8 @@
     },
     "eventsource-polyfill": {
       "version": "0.9.6",
+      "resolved": "https://registry.npmmirror.com/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz",
+      "integrity": "sha512-LyMFp2oPDGhum2lMvkjqKZEwWd2/AoXyt8aoyftTBMWwPHNgU+2tdxhTHPluDxoz+z4gNj0uHAPR9nqevATMbg==",
       "dev": true
     },
     "evp_bytestokey": {
@@ -3688,6 +3718,8 @@
     },
     "extract-text-webpack-plugin": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz",
+      "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==",
       "dev": true,
       "requires": {
         "async": "^2.4.1",
@@ -3774,6 +3806,8 @@
     },
     "file-loader": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmmirror.com/file-loader/-/file-loader-1.1.11.tgz",
+      "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.0.2",
@@ -3920,6 +3954,8 @@
     },
     "friendly-errors-webpack-plugin": {
       "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz",
+      "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.3",
@@ -4035,7 +4071,9 @@
       "dev": true
     },
     "fundebug-javascript": {
-      "version": "1.9.0"
+      "version": "1.9.0",
+      "resolved": "https://registry.npmmirror.com/fundebug-javascript/-/fundebug-javascript-1.9.0.tgz",
+      "integrity": "sha512-i+a9IIGyhIOPEBLbaH6plnMrPTukZ0YN7fXFZRQ6O+CwyQxNqQYye1PEax1LZeD3OJLp5UNRjtAlNSwb5grN3Q=="
     },
     "gauge": {
       "version": "2.7.4",
@@ -4500,6 +4538,8 @@
     },
     "html-webpack-plugin": {
       "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz",
+      "integrity": "sha512-TKQYvHTJYUwPgXzwUF3EwPPkyQyvzfz+6s8Fw2eamxl0cRin1tDnYppcDYWz8UIoYMX4CgatplRq18odzmpAWw==",
       "dev": true,
       "requires": {
         "bluebird": "^3.4.7",
@@ -4538,6 +4578,8 @@
     },
     "html2canvas": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+      "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
       "requires": {
         "css-line-break": "^2.1.0",
         "text-segmentation": "^1.0.3"
@@ -5165,7 +5207,9 @@
       "dev": true
     },
     "js-md5": {
-      "version": "0.7.3"
+      "version": "0.7.3",
+      "resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -5637,6 +5681,8 @@
     },
     "mint-ui": {
       "version": "2.2.13",
+      "resolved": "https://registry.npmmirror.com/mint-ui/-/mint-ui-2.2.13.tgz",
+      "integrity": "sha512-Xz1SFagHSzKOprwQv3fcekXT5RJvhh939zwZHcWeazk1OJrCjsD4I2qm49AEUCfT1AoYzC+rsZIwGP/J6LwVVw==",
       "requires": {
         "array-find-index": "^1.0.2",
         "raf.js": "0.0.4",
@@ -5880,6 +5926,8 @@
     },
     "node-notifier": {
       "version": "5.4.3",
+      "resolved": "https://registry.npmmirror.com/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
       "dev": true,
       "requires": {
         "growly": "^1.3.0",
@@ -5897,6 +5945,8 @@
     },
     "node-sass": {
       "version": "4.14.1",
+      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
+      "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -6300,6 +6350,8 @@
     },
     "optimize-css-assets-webpack-plugin": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmmirror.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.2.1.tgz",
+      "integrity": "sha512-FSoF15xKSEM2qCE3/y2gH92PysJSBY58Wx/hmSdIzVSOd0vg+FRS28NWZADId1wh6PDlbVt0lfPduV0IBufItQ==",
       "dev": true,
       "requires": {
         "cssnano": "^4.1.10",
@@ -6883,6 +6935,8 @@
     },
     "ora": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/ora/-/ora-1.4.0.tgz",
+      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
       "dev": true,
       "requires": {
         "chalk": "^2.1.0",
@@ -7792,6 +7846,8 @@
     },
     "postcss-import": {
       "version": "11.1.0",
+      "resolved": "https://registry.npmmirror.com/postcss-import/-/postcss-import-11.1.0.tgz",
+      "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==",
       "dev": true,
       "requires": {
         "postcss": "^6.0.1",
@@ -7864,6 +7920,8 @@
     },
     "postcss-loader": {
       "version": "2.1.6",
+      "resolved": "https://registry.npmmirror.com/postcss-loader/-/postcss-loader-2.1.6.tgz",
+      "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
@@ -9237,6 +9295,8 @@
     },
     "postcss-url": {
       "version": "7.3.2",
+      "resolved": "https://registry.npmmirror.com/postcss-url/-/postcss-url-7.3.2.tgz",
+      "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==",
       "dev": true,
       "requires": {
         "mime": "^1.4.1",
@@ -9479,7 +9539,9 @@
       "dev": true
     },
     "qrcodejs2": {
-      "version": "0.0.2"
+      "version": "0.0.2",
+      "resolved": "https://registry.npmmirror.com/qrcodejs2/-/qrcodejs2-0.0.2.tgz",
+      "integrity": "sha512-+Y4HA+cb6qUzdgvI3KML8GYpMFwB24dFwzMkS/yXq6hwtUGNUnZQdUnksrV1XGMc2mid5ROw5SAuY9XhI3ValA=="
     },
     "qs": {
       "version": "6.7.0",
@@ -10239,6 +10301,8 @@
     },
     "sass-loader": {
       "version": "6.0.7",
+      "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-6.0.7.tgz",
+      "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
       "dev": true,
       "requires": {
         "clone-deep": "^2.0.1",
@@ -10494,6 +10558,8 @@
     },
     "shelljs": {
       "version": "0.7.8",
+      "resolved": "https://registry.npmmirror.com/shelljs/-/shelljs-0.7.8.tgz",
+      "integrity": "sha512-/YF5Uk8hcwi7ima04ppkbA4RaRMdPMBfwAvAf8sufYOxsJRtbdoBsT8vGvlb+799BrlGdYrd+oczIA2eN2JdWA==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",
@@ -11565,6 +11631,8 @@
     },
     "url-loader": {
       "version": "0.5.9",
+      "resolved": "https://registry.npmmirror.com/url-loader/-/url-loader-0.5.9.tgz",
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.0.2",
@@ -11673,7 +11741,9 @@
       "dev": true
     },
     "vconsole": {
-      "version": "3.3.4"
+      "version": "3.3.4",
+      "resolved": "https://registry.npmmirror.com/vconsole/-/vconsole-3.3.4.tgz",
+      "integrity": "sha512-9yihsic96NPoMLQx/lCQwH9d89H0bbMW3LZPzo/t4yGQcS1X+vTCe9OHm1XSH7WNxzGDmcSwBiKLsFGwvJpQBg=="
     },
     "vendors": {
       "version": "1.0.4",
@@ -11704,10 +11774,14 @@
       "dev": true
     },
     "vue": {
-      "version": "2.6.12"
+      "version": "2.6.12",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz",
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
     },
     "vue-clipboard2": {
       "version": "0.3.1",
+      "resolved": "https://registry.npmmirror.com/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
+      "integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
       "requires": {
         "clipboard": "^2.0.0"
       },
@@ -11737,6 +11811,8 @@
     },
     "vue-loader": {
       "version": "13.7.3",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-13.7.3.tgz",
+      "integrity": "sha512-ACCwbfeC6HjY2pnDii+Zer+MZ6sdOtwvLmDXRK/BoD3WNR551V22R6KEagwHoTRJ0ZlIhpCBkptpCU6+Ri/05w==",
       "dev": true,
       "requires": {
         "consolidate": "^0.14.0",
@@ -11785,7 +11861,9 @@
       }
     },
     "vue-router": {
-      "version": "3.4.3"
+      "version": "3.4.3",
+      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-3.4.3.tgz",
+      "integrity": "sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A=="
     },
     "vue-style-loader": {
       "version": "3.1.2",
@@ -11799,6 +11877,8 @@
     },
     "vue-template-compiler": {
       "version": "2.6.12",
+      "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz",
+      "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==",
       "dev": true,
       "requires": {
         "de-indent": "^1.0.2",
@@ -11813,6 +11893,8 @@
     },
     "vue-touch": {
       "version": "2.0.0-beta.4",
+      "resolved": "https://registry.npmmirror.com/vue-touch/-/vue-touch-2.0.0-beta.4.tgz",
+      "integrity": "sha512-UvbKsqf7HHwtXzuEodtzeDEX/lkq6ul1QcdHhl8VUKlDTYne5ey15RjNVTkDvigJaKvtVU0UB0x5NURNyRC37A==",
       "requires": {
         "hammerjs": "^2.0.8",
         "rollup-plugin-cleanup": "^0.1.4",
@@ -11821,7 +11903,9 @@
       }
     },
     "vuex": {
-      "version": "3.5.1"
+      "version": "3.5.1",
+      "resolved": "https://registry.npmmirror.com/vuex/-/vuex-3.5.1.tgz",
+      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
     },
     "watchpack": {
       "version": "1.7.4",
@@ -11964,6 +12048,8 @@
     },
     "webpack": {
       "version": "3.12.0",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-3.12.0.tgz",
+      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
       "dev": true,
       "requires": {
         "acorn": "^5.0.0",
@@ -12227,6 +12313,8 @@
     },
     "webpack-bundle-analyzer": {
       "version": "2.13.1",
+      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+      "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {
         "acorn": "^5.3.0",
@@ -12266,6 +12354,8 @@
     },
     "webpack-dev-server": {
       "version": "2.11.5",
+      "resolved": "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-2.11.5.tgz",
+      "integrity": "sha512-7TdOKKt7G3sWEhPKV0zP+nD0c4V9YKUJ3wDdBwQsZNo58oZIRoVIu66pg7PYkBW8A74msP9C2kLwmxGHndz/pw==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -12425,6 +12515,8 @@
     },
     "webpack-merge": {
       "version": "4.2.2",
+      "resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.15"
@@ -12466,7 +12558,9 @@
       "dev": true
     },
     "weixin-js-sdk": {
-      "version": "1.6.0"
+      "version": "1.6.0",
+      "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.0.tgz",
+      "integrity": "sha512-3IYQH7aalJGFJrwdT3epvTdR1MboMiH7vIZ5BRL2eYOJ12BNah7csoMkmSZzkq1+l92sSq29XdTCVjCJoK2sBQ=="
     },
     "whet.extend": {
       "version": "0.9.9",

src/api/index.js

@@ -347,7 +347,7 @@ export function getProductList(bid) {
 }
 
 //充值
-export function recharge({ product_id, bid, cid, use_coupon }) {
+export function recharge({ product_id, bid, cid, use_coupon, from_detail_catalog, last_bid, last_cid, sequence, sendid, yun }) {
   const a = document.createElement("a");
   const redirect =
   bid && cid
@@ -357,14 +357,20 @@ export function recharge({ product_id, bid, cid, use_coupon }) {
         query: {
           bid,
           cid,
-          isRecharge: true // 是否从充值页面回去
+          from_detail_catalog,
+          last_bid,
+          last_cid,
+          sequence,
+          sendid,
+          yun,
+          isRecharge: true // 微信充值完回到充值中心,如果从目录或阅读页跳转过来，回去时需要传入上一页id或目录进行判断
         }
       }
     : {
         host: location.origin,
         pathname: "/pay",
         query: {
-          isRecharge: true // 是否从充值页面回去
+          isRecharge: true // 微信充值完回到充值中心，如果从个人中心来充值，无需传入其他参数
         }
       };
   const token = localStorage.getItem("token");

src/components/reader/menu.vue

@@ -91,7 +91,7 @@
         <v-touch class="x-reader-menu-foot__option-icon"
                  @tap="emit('next')"
                  @touchend.native.prevent> <img :src="icon.next">
-          <span class="x-reader-menu-foot__option-text">下一章</span>
+          <span class="x-reader-menu-foot__option-text">下一章11</span>
         </v-touch>
       </div>
     </div>

src/view/book-catalog.vue

@@ -196,7 +196,9 @@ export default {
         price: chapter_cost,
         chapter_is_vip: vip,
       } = chapter;
+      const from_detail_catalog = 2;
       if (!this.is_vip && !!vip && chapter_cost > this.balance) {
+        console.log('vip直接跳去付费，第',cid)
         // vip章节 且章节价格>余额
         this.$router.push({
           name: Pay.name,
@@ -205,7 +207,9 @@ export default {
             chapter_id: cid,
             fee: chapter_cost,
             code: 10021,
-            uuids:this.uuids
+            uuids:this.uuids,
+            from_detail_catalog,
+            sequence: this.sequence
           },
         });
       } else {
@@ -215,7 +219,9 @@ export default {
             bid,
             cid,
             uuids:this.uuids,
-            sendid:this.$route.query.sendid || localStorage.getItem('sendid') || sessionStorage.getItem('sendid')
+            sendid:this.$route.query.sendid || localStorage.getItem('sendid') || sessionStorage.getItem('sendid'),
+            from_detail_catalog,
+            sequence: this.sequence
           },
         });
       }

src/view/book-detail.vue

@@ -4,6 +4,7 @@
  * @LastEditors: Please set LastEditors
  * @LastEditTime: 2021-06-28 16:25:10
  * @Description: file content
+ * from_detail_catalog  判断是从详情页or目录跳转到阅读页面 1详情页 2目录
  -->
 <template>
   <div class="book-detail disable-copy" v-if="test">
@@ -69,7 +70,7 @@
     <div class="book-catalog-list">
       <router-link
         class="book-catalog-item"
-        :to="{ name: Reader.name, query: { bid: v.bid, cid: v.chapter_id } }"
+        :to="{ name: Reader.name, query: { bid: v.bid, cid: v.chapter_id, from_detail_catalog: 1 } }"
         v-for="v in catalogs"
         :key="v.chapter_id"
       >

src/view/pay.vue

@@ -406,7 +406,7 @@
   </div>
 </template>
 <script>
-import { Pay, HelpPayQrcode, Reader, Person } from "./namespace.js";
+import { Pay, HelpPayQrcode, Reader, Person, BookDetail, BookCatalog } from "./namespace.js";
 // import product from "../mock/pay.js";
 import { MessageBox } from "mint-ui";
 import {
@@ -513,10 +513,14 @@ export default {
       );
     },
     popup() {
-      // const from_where = this.$route.query.from_where;
-      const msg = "";
-      const bid = this.$route.query.book_id;
-      const cid = this.$route.query.chapter_id;
+      const from_detail_catalog = this.$route.query.from_detail_catalog; //判断是否是从详情页BookDetail or 目录BookCatalog 跳转到页面  1详情页  2目录
+      const last_bid = this.$route.query.last_bid; //如果是从上一页跳转，获取上一页bid和cid，跳转到上一页
+      const last_cid = this.$route.query.last_cid; 
+      const bid = this.$route.query.bid;
+      const cid = this.$route.query.cid;
+      const sendid = this.$route.query.sendid || localStorage.getItem("sendid");
+      const yun = this.$route.query.yun;
+      const sequence = this.$route.query.sequence
       if(this.$route.query.isRecharge){
         MessageBox({
           title: "支付确认",
@@ -529,18 +533,37 @@ export default {
           showConfirmButton: true //是否显示确认按钮
         }).then(action => {
           if (action === "confirm") {
-            console.log('123',bid && cid)
             if (bid && cid){
-              this.$router.replace({
-                name: Reader.name,
+              from_detail_catalog === '2' ? console.log('11') : console.log('nono')
+              from_detail_catalog === '1' ? 
+              this.$router.replace({ // 跳回书籍详情页
+                name: BookDetail.name,
                 query: {
-                  bid,
-                  cid
+                  id: bid
                 }
-              });
+              }) : ( from_detail_catalog === '2' ? 
+                this.$router.replace({ // 跳回目录
+                  name: BookCatalog.name,
+                  query: {
+                    id: bid,
+                    sequence,
+                    yun
+                  }
+                })
+                 :
+                //  console.log('跳回上一章',Reader.name)
+                this.$router.replace({ // 跳回上一章
+                  name: Reader.name,
+                  query: {
+                    bid: last_bid,
+                    cid: last_cid,
+                    sendid,
+                    yun,
+                  }
+                })
+              )
             }else {
-              // this.$router.back();
-              this.$router.replace({
+              this.$router.replace({ // 跳回个人中心
                 name: Person.name,
               });
             }
@@ -553,7 +576,13 @@ export default {
         product_id: this.product[this.selectedProduct].product_id,
         bid: this.$route.query.book_id,
         cid: this.$route.query.chapter_id,
-        use_coupon: this.currentCoupon.id
+        use_coupon: this.currentCoupon.id,
+        from_detail_catalog: this.$route.query.from_detail_catalog,
+        last_bid: this.$route.query.last_bid,
+        last_cid: this.$route.query.last_cid,
+        sequence: this.$route.query.sequence,
+        sendid: this.$route.query.sendid,
+        yun: this.$route.query.yun
       })
     },
     payForYear() {

src/view/reader.vue

@@ -393,6 +393,7 @@ export default {
       });
     },
     next() {
+      console.log('上一页cid',this.text)
       // 静默复制
       if (this.text.next_jump) {
         location.href = this.text.next_jump_url;
@@ -406,7 +407,9 @@ export default {
               uuids: this.uuids,
               sendid:
                 this.$route.query.sendid || localStorage.getItem("sendid"),
-              yun: this.yun
+              yun: this.yun,
+              last_bid: this.text.bid,
+              last_cid: this.text.chapter_id,
             }
           });
         } else if (this.text.next_cid === 0) {
@@ -494,7 +497,12 @@ export default {
         .catch(r => {
           this.loading = false;
           const data = r.data.data;
-          // const from_where = 1; // from_where判断从（阅读器or个人中心）到充值页，1代表从阅读器到充值页，不传代表从个人中心到充值页
+          const sequence = this.$route.query.sequence
+          const last_bid = this.$route.query.last_bid
+          const last_cid = this.$route.query.last_cid
+          const sendid = this.$route.query.sendid
+          const yun = this.$route.query.yun
+          const from_detail_catalog = 3
           switch (r.data.code) {
             case 10012:
               if (this.is_update) {
@@ -523,7 +531,7 @@ export default {
               break;
             case 10015:
               Chapter1(data).then(r => {
-                this.$router.push({ name: Pay.name, query: data });
+                this.$router.push({ name: Pay.name, query: data, sequence, last_bid, last_cid, sendid, yun, from_detail_catalog });
               });
               break;
             case 10016:
@@ -556,7 +564,7 @@ export default {
             case 10019:
               Book3(r.data.data)
                 .then(r => {
-                  this.$router.push({ name: Pay.name, query: data });
+                  this.$router.push({ name: Pay.name, query: data, sequence, last_bid, last_cid, sendid, yun, from_detail_catalog });
                 })
                 .catch(e => {
                   if (e === "close") {
@@ -571,7 +579,7 @@ export default {
             case 10021:
               this.$router.push({
                 name: Pay.name,
-                query: { ...data, code: r.data.code }
+                query: { ...data, code: r.data.code, sequence, last_bid, last_cid, sendid, yun, from_detail_catalog }
               });
               break;
             case 10022: