Merge branch 'master' of http://git.ycjcjy.com/xuchengxiang/niucai-user into master

config/index.js

@@ -11,16 +11,16 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-      // '/api': {
-      //   target: 'http://123.57.65.31:9004',
-      //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
-      //   pathRewrite: { '^/api': '/api' }
-      // },
       '/api': {
-        target: 'https://app.xnsport.cn',
+        target: 'http://123.57.65.31:9004',
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         pathRewrite: { '^/api': '/api' }
-      }
+      },
+      // '/api': {
+      //   target: 'https://app.xnsport.cn',
+      //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
+      //   pathRewrite: { '^/api': '/api' }
+      // }
       // '/app-api': {
       //   target: 'http://ycapi.jcjyhn.com',
       //   changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

index.html

@@ -5,7 +5,7 @@
   <meta charset='utf-8'>
   <meta content='width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0' name='viewport'>
   <meta name="referrer" content="no-referrer">
-  <link rel="stylesheet" href="//at.alicdn.com/t/font_2022160_w52az879v6.css">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_2022160_f7cp731cw5p.css">
   <title>牛彩</title>
   <script>
     let Width = document.documentElement.clientWidth / 375 * 100

package-lock.json

@@ -2380,8 +2380,8 @@
     },
     "buffer-alloc": {
       "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
       "requires": {
         "buffer-alloc-unsafe": "^1.1.0",
         "buffer-fill": "^1.0.0"
@@ -2389,12 +2389,12 @@
     },
     "buffer-alloc-unsafe": {
       "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA="
+      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
+      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
     },
     "buffer-fill": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
       "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
     },
     "buffer-from": {
@@ -4015,7 +4015,7 @@
     },
     "dijkstrajs": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/dijkstrajs/download/dijkstrajs-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
       "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
     },
     "dir-glob": {
@@ -5537,8 +5537,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5559,14 +5558,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5581,20 +5578,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5711,8 +5705,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5724,7 +5717,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5739,7 +5731,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5747,14 +5738,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5773,7 +5762,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5854,8 +5842,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5867,7 +5854,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5953,8 +5939,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5990,7 +5975,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6010,7 +5994,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6054,14 +6037,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -9764,8 +9745,8 @@
     },
     "pngjs": {
       "version": "3.4.0",
-      "resolved": "https://registry.npm.taobao.org/pngjs/download/pngjs-3.4.0.tgz",
-      "integrity": "sha1-mcp9clll+2VYFOr2XzjxK72/VV8="
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
     },
     "portfinder": {
       "version": "1.0.19",
@@ -12063,8 +12044,8 @@
     },
     "qrcode": {
       "version": "1.4.4",
-      "resolved": "https://registry.npm.taobao.org/qrcode/download/qrcode-1.4.4.tgz",
-      "integrity": "sha1-8MQ1aKfnUQpV78O4jZYC9xlj6oM=",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.4.4.tgz",
+      "integrity": "sha512-oLzEC5+NKFou9P0bMj5+v6Z40evexeE29Z9cummZXZ9QXyMr3lphkURzxjXgPJC5azpxcshoDWV1xE46z+/c3Q==",
       "requires": {
         "buffer": "^5.4.3",
         "buffer-alloc": "^1.2.0",
@@ -12077,13 +12058,13 @@
       "dependencies": {
         "ansi-regex": {
           "version": "4.1.0",
-          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
-          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
         "buffer": {
           "version": "5.6.0",
-          "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-5.6.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-5.6.0.tgz",
-          "integrity": "sha1-oxdJ3H2B2E2wir+Te2uMQDP2J4Y=",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
+          "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
           "requires": {
             "base64-js": "^1.0.2",
             "ieee754": "^1.1.4"
@@ -12091,13 +12072,13 @@
         },
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz?cache=0&sync_timestamp=1602349921044&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcamelcase%2Fdownload%2Fcamelcase-5.3.1.tgz",
-          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
         },
         "cliui": {
           "version": "5.0.0",
-          "resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz?cache=0&sync_timestamp=1602861359936&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-5.0.0.tgz",
-          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "requires": {
             "string-width": "^3.1.0",
             "strip-ansi": "^5.2.0",
@@ -12106,26 +12087,26 @@
         },
         "find-up": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
-          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
             "locate-path": "^3.0.0"
           }
         },
         "get-caller-file": {
           "version": "2.0.5",
-          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
-          "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
         },
         "isarray": {
           "version": "2.0.5",
-          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.5.tgz",
-          "integrity": "sha1-ivHkwSISRMxiRZ+vOJQNTmRKVyM="
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
         },
         "locate-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
-          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "requires": {
             "p-locate": "^3.0.0",
             "path-exists": "^3.0.0"
@@ -12133,34 +12114,34 @@
         },
         "p-limit": {
           "version": "2.3.0",
-          "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.3.0.tgz?cache=0&sync_timestamp=1594559696906&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-limit%2Fdownload%2Fp-limit-2.3.0.tgz",
-          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "requires": {
             "p-try": "^2.0.0"
           }
         },
         "p-locate": {
           "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
-          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "requires": {
             "p-limit": "^2.0.0"
           }
         },
         "p-try": {
           "version": "2.2.0",
-          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
-          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
         },
         "require-main-filename": {
           "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
-          "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
         },
         "string-width": {
           "version": "3.1.0",
-          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz",
-          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
           "requires": {
             "emoji-regex": "^7.0.1",
             "is-fullwidth-code-point": "^2.0.0",
@@ -12169,16 +12150,16 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
-          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "requires": {
             "ansi-regex": "^4.1.0"
           }
         },
         "wrap-ansi": {
           "version": "5.1.0",
-          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "requires": {
             "ansi-styles": "^3.2.0",
             "string-width": "^3.0.0",
@@ -12187,8 +12168,8 @@
         },
         "yargs": {
           "version": "13.3.2",
-          "resolved": "https://registry.npm.taobao.org/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1602805668950&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz",
-          "integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "requires": {
             "cliui": "^5.0.0",
             "find-up": "^3.0.0",
@@ -12204,8 +12185,8 @@
         },
         "yargs-parser": {
           "version": "13.1.2",
-          "resolved": "https://registry.npm.taobao.org/yargs-parser/download/yargs-parser-13.1.2.tgz?cache=0&sync_timestamp=1602861360075&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fyargs-parser%2Fdownload%2Fyargs-parser-13.1.2.tgz",
-          "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingShenFenZheng/index.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="Page">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="绑定身份证" @UserInfoChange="Init">
+      <div class="PageContainer">
+        <div class="Form">
+          <input type="text" placeholder="请输入身份证号码" v-model="IdCard">
+        </div>
+        <div class="Form">
+          <input type="text" placeholder="请确认您的姓名" v-model="RealName">
+        </div>
+        <div class="Btn">
+          <a @click="ToBindIdCard">确认</a>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import MainPageContainer from '../../../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: '',
+  data () {
+    return {
+      IdCard: '',
+      RealName: '',
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo
+    })
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserMutations([
+      'EditUserInfo'
+    ]),
+    ...mapUserActions([
+      'BindIdCard'
+    ]),
+    Init () {
+    },
+    ToBindIdCard () {
+      if (this.DataLock) return
+      this.DataLock = true
+      if (this.IdCard === '') {
+        this.Toast('身份证号不能为空')
+        this.DataLock = false
+        return false
+      }
+      if (this.RealName === '') {
+        this.Toast('姓名不能为空')
+        this.DataLock = false
+        return false
+      }
+      this.BindIdCard({ data: { idCard: this.IdCard, realName: this.RealName } }).then(() => {
+        this.Toast('绑定身份证成功')
+        this.EditUserInfo({ name: 'idCard', value: this.IdCard })
+        this.DataLock = false
+        this.$router.go(-1)
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingShenFenZheng/page.scss

@@ -0,0 +1,45 @@
+.Page {
+  background: #f2f2f2;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    > .Form {
+      padding: 0.15rem;
+      background: #fff;
+      > input {
+        display: block;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        width: 100%;
+      }
+    }
+    > span {
+      display: block;
+      font-size: 0.12rem;
+      color: #adadad;
+      line-height: 0.2rem;
+      margin-top: 0.05rem;
+      text-indent: 0.15rem;
+    }
+    > .Btn {
+      padding: 0 0.15rem;
+      margin-top: 0.5rem;
+      > a {
+        display: block;
+        text-align: center;
+        font-size: 0.16rem;
+        color: #fff;
+        background: #ff5200;
+        border-radius: 0.06rem;
+        line-height: 0.42rem;
+      }
+    }
+  }
+}

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingZhiFuBao/index.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="Page">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="绑定支付宝" @UserInfoChange="Init">
+      <div class="PageContainer">
+        <div class="Form">
+          <input type="text" placeholder="请输入支付宝账号" v-model="AliAccount">
+        </div>
+        <div class="Btn">
+          <a @click="ToBindIdCard">确认</a>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import MainPageContainer from '../../../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: '',
+  data () {
+    return {
+      AliAccount: '',
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo
+    })
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserMutations([
+      'EditUserInfo'
+    ]),
+    ...mapUserActions([
+      'UpdateUserInfo'
+    ]),
+    Init () {
+    },
+    ToBindIdCard () {
+      if (this.DataLock) return
+      this.DataLock = true
+      if (this.AliAccount === '') {
+        this.Toast('支付宝账号不能为空')
+        this.DataLock = false
+        return false
+      }
+      this.UpdateUserInfo({ urlData: { id: this.UserInfo.customerId }, data: { alipayUser: this.AliAccount } }).then(() => {
+        this.Toast('绑定支付宝成功')
+        this.EditUserInfo({ name: 'alipayUser', value: this.AliAccount })
+        this.DataLock = false
+        this.$router.go(-1)
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingZhiFuBao/page.scss

@@ -0,0 +1,45 @@
+.Page {
+  background: #f2f2f2;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    > .Form {
+      padding: 0.15rem;
+      background: #fff;
+      > input {
+        display: block;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        width: 100%;
+      }
+    }
+    > span {
+      display: block;
+      font-size: 0.12rem;
+      color: #adadad;
+      line-height: 0.2rem;
+      margin-top: 0.05rem;
+      text-indent: 0.15rem;
+    }
+    > .Btn {
+      padding: 0 0.15rem;
+      margin-top: 0.5rem;
+      > a {
+        display: block;
+        text-align: center;
+        font-size: 0.16rem;
+        color: #fff;
+        background: #ff5200;
+        border-radius: 0.06rem;
+        line-height: 0.42rem;
+      }
+    }
+  }
+}

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditTiXianMiMa/index.vue

@@ -0,0 +1,90 @@
+<template>
+  <div class="Page">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="设置提现密码" @UserInfoChange="Init">
+      <div class="PageContainer">
+        <div class="Form">
+          <input type="password" placeholder="请输入登录密码" v-model="LoginPassword" @input="LoginPassword = LoginPassword.substring(0, 12)">
+        </div>
+        <div class="Form">
+          <input type="password" placeholder="请输入2~12个字符" v-model="Password" @input="Password = Password.substring(0, 12)">
+        </div>
+        <div class="Form">
+          <input type="password" placeholder="请确认您的密码" v-model="PasswordAgain" @input="PasswordAgain = PasswordAgain.substring(0, 12)">
+        </div>
+        <div class="Btn">
+          <a @click="EditMiMa">确认</a>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import md5 from 'js-md5'
+import MainPageContainer from '../../../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: '',
+  data () {
+    return {
+      LoginPassword: '',
+      Password: '',
+      PasswordAgain: '',
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo
+    })
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserMutations([
+      'EditUserInfo'
+    ]),
+    ...mapUserActions([
+      'UpdateUserInfo'
+    ]),
+    Init () {
+    },
+    EditMiMa () {
+      if (this.DataLock || this.Password === '' || this.PasswordAgain === '' || (this.UserInfo.cashPass !== null && this.LoginPassword === '')) return
+      this.DataLock = true
+      if (this.LoginPassword === '') {
+        this.Toast('登录密码不能为空')
+        this.DataLock = false
+        return false
+      }
+      if (this.Password !== this.PasswordAgain) {
+        this.Toast('新密码与确认密码不一致')
+        this.DataLock = false
+        return false
+      }
+      this.UpdateUserInfo({ urlData: { id: this.UserInfo.customerId }, data: { cashPass: md5(this.Password), loginPass: md5(this.LoginPassword) } }).then(() => {
+        this.Toast('提现密码设置成功')
+        this.EditUserInfo({ name: 'cashPass', value: this.Password })
+        this.DataLock = false
+        this.$router.go(-1)
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditTiXianMiMa/page.scss

@@ -0,0 +1,45 @@
+.Page {
+  background: #f2f2f2;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    > .Form {
+      padding: 0.15rem;
+      background: #fff;
+      > input {
+        display: block;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        width: 100%;
+      }
+    }
+    > span {
+      display: block;
+      font-size: 0.12rem;
+      color: #adadad;
+      line-height: 0.2rem;
+      margin-top: 0.05rem;
+      text-indent: 0.15rem;
+    }
+    > .Btn {
+      padding: 0 0.15rem;
+      margin-top: 0.5rem;
+      > a {
+        display: block;
+        text-align: center;
+        font-size: 0.16rem;
+        color: #fff;
+        background: #ff5200;
+        border-radius: 0.06rem;
+        line-height: 0.42rem;
+      }
+    }
+  }
+}

src/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/UserInfo/index.vue

@@ -16,6 +16,21 @@
             <span>{{UserInfo.name || '未设置'}}</span>
             <i class="iconfont iconjiantouright"></i>
           </router-link>
+          <router-link tag="li" class="flex-h" :to="{name: 'EditTiXianMiMa'}">
+            <span class="flex-item">提现密码</span>
+            <span>{{UserInfo.cashPass === null ? '未设置' : ''}}</span>
+            <i class="iconfont iconjiantouright"></i>
+          </router-link>
+          <router-link tag="li" class="flex-h" :to="{name: 'BangDingShenFenZheng'}">
+            <span class="flex-item">绑定身份证</span>
+            <span>{{UserInfo.idCard === null ? '未绑定' : '已绑定'}}</span>
+            <i class="iconfont iconjiantouright"></i>
+          </router-link>
+          <router-link tag="li" class="flex-h" :to="{name: 'BangDingZhiFuBao'}">
+            <span class="flex-item">绑定支付宝</span>
+            <span>{{UserInfo.alipayUser === null ? '未绑定' : '已绑定'}}</span>
+            <i class="iconfont iconjiantouright"></i>
+          </router-link>
         </ul>
       </div>
     </MainPageContainer>

src/pages/WoDe/TiXian/index.vue

@@ -0,0 +1,89 @@
+<template>
+  <div class="Page">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="提现" @UserInfoChange="Init">
+      <div class="PageContainer">
+        <span v-if="UserInfo !== null">当前账户余额：{{UserInfo.account.cash === null ? 0 : UserInfo.account.cash / 100}}元</span>
+        <div class="Form">
+          <input type="number" placeholder="请输入提现金额" v-model="Amount">
+        </div>
+        <div class="Form">
+          <input type="password" placeholder="请输入提现密码" v-model="Password" @input="Password = Password.substring(0, 12)">
+        </div>
+        <span style="color: #999">未设置过提现密码？<router-link :to="{ name: 'EditTiXianMiMa' }">设置提现密码</router-link></span>
+        <div class="Btn">
+          <a @click="ToCashOut">提现</a>
+        </div>
+      </div>
+    </MainPageContainer>
+  </div>
+</template>
+
+<script>
+import md5 from 'js-md5'
+import MainPageContainer from '../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+export default {
+  name: '',
+  data () {
+    return {
+      Amount: '',
+      Password: '',
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo
+    })
+  },
+  components: {
+    MainPageContainer
+  },
+  created () {
+  },
+  mounted () {
+    this.$nextTick(() => {
+    })
+  },
+  methods: {
+    ...mapUserMutations([
+      'EditUserInfo'
+    ]),
+    ...mapUserActions([
+      'UpdateUserInfo',
+      'CashOut'
+    ]),
+    Init () {
+    },
+    ToCashOut () {
+      // if (this.Amount === '') {
+      //   this.Toast('提现金额不能为空')
+      //   return false
+      // }
+      // if (this.Amount - 0 > this.UserInfo.account.cash - 0) {
+      //   this.Toast('提现金额不能大于账户余额')
+      //   return false
+      // }
+      // if (this.Password === '') {
+      //   this.Toast('提现密码不能为空')
+      //   return false
+      // }
+      if (this.DataLock) return
+      this.DataLock = true
+      this.CashOut({ data: { amount: this.Amount * 100, cashPass: md5(this.Password) } }).then((res) => {
+        this.Toast('提现成功')
+        this.DataLock = false
+      }).catch((res) => {
+        this.Toast(res.data.message)
+        this.DataLock = false
+      })
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style lang="scss" scoped>
+@import "page.scss";
+</style>

src/pages/WoDe/TiXian/page.scss

@@ -0,0 +1,47 @@
+.Page {
+  background: #f2f2f2;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  .PageContainer {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    overflow-y: scroll;
+    -webkit-overflow-scrolling: touch;
+    > span {
+      display: block;
+      font-size: 0.14rem;
+      color: #333;
+      line-height: 0.4rem;
+      text-indent: 0.15rem;
+      > a {
+        color: #ff5200;
+      }
+    }
+    > .Form {
+      padding: 0.15rem;
+      background: #fff;
+      > input {
+        display: block;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        width: 100%;
+      }
+    }
+    > .Btn {
+      padding: 0 0.15rem;
+      margin-top: 0.5rem;
+      > a {
+        display: block;
+        text-align: center;
+        font-size: 0.16rem;
+        color: #fff;
+        background: #ff5200;
+        border-radius: 0.06rem;
+        line-height: 0.42rem;
+      }
+    }
+  }
+}

src/pages/WoDe/UserCenter/index.vue

@@ -10,6 +10,7 @@
             </div>
             <router-link :to="{ name: 'SignIn' }" v-if="UserInfo === null">点击注册/登录</router-link>
             <span v-else>{{UserInfo.name}}</span>
+            <span v-if="UserInfo !== null" style="margin-top: 0; line-height: 0.2rem;">账户余额：{{UserInfo.account.cash / 100}}元</span>
           </div>
         </div>
 
@@ -47,7 +48,8 @@ export default {
         { name: '账号明细', desc: '流水明细', img: require('../../../assets/img/icon10.png'), router: 'ZhangHaoMingXi' },
         { name: '安全中心', desc: '用户设置', img: require('../../../assets/img/icon9.png'), router: 'AnQuanZhongXin' },
         { name: '个人设置', desc: '关于我们', img: require('../../../assets/img/icon8.png'), router: 'GeRenSheZhi' },
-        { name: '下载二维码', desc: '分享好友', img: require('../../../assets/img/icon11.png'), router: 'XiaZaiErWeiMa' }
+        { name: '下载二维码', desc: '分享好友', img: require('../../../assets/img/icon11.png'), router: 'XiaZaiErWeiMa' },
+        { name: '提现', desc: '提取余额', img: require('../../../assets/img/tixian.png'), router: 'TiXian' }
       ]
     }
   },

src/pages/WoDe/ZhangHaoMingXi/index.vue

@@ -10,28 +10,22 @@
         <!-- 内容 -->
         <div class="flex-item">
           <div>
-            <swiper :options="SwiperOptions" ref="MySwiper">
-              <swiper-slide v-for="(item, index) in NavList" :key="index">
-                <div class="SwiperItem">
-                  <scroller :on-refresh="Refresh">
-                    <div class="Container">
-
-                      <!-- 全部 -->
-                      <ul>
-                        <li v-for="(item, index) in UserAccountDetails[ReturnType(item.id)]" :key="index" class="flex-h">
-                          <div class="flex-item">
-                            <span>{{item.type}}</span>
-                            <span>{{item.createDate}}</span>
-                          </div>
-                          <span>{{item.amount}}元</span>
-                        </li>
-                      </ul>
+            <scroller :on-refresh="Refresh" :on-infinite="Infinite" :ref="`MyScroller`">
+              <div class="Container">
 
+                <!-- 全部 -->
+                <ul>
+                  <li v-for="(item, index) in AccountBill" :key="index" class="flex-h">
+                    <div class="flex-item">
+                      <span>{{item.feeType === 'BETTING' ? '投注' : '提现'}}</span>
+                      <span>{{ToolClass.DateFormat(item.createDate)}}</span>
                     </div>
-                  </scroller>
-                </div>
-              </swiper-slide>
-            </swiper>
+                    <span>{{item.amount / 100}}元</span>
+                  </li>
+                </ul>
+
+              </div>
+            </scroller>
           </div>
         </div>
       </div>
@@ -44,20 +38,25 @@ import 'swiper/dist/css/swiper.css'
 import MainPageContainer from '../../../components/common/MainPageContainer'
 import { swiper, swiperSlide } from 'vue-awesome-swiper'
 import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState } = createNamespacedHelpers('user')
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: '',
   data () {
     let _that = this
     return {
-      DataLock: false, // 数据锁
+      PageData: {
+        pageNum: 0,
+        pageSize: 10
+      },
+      PageList: [],
+      Timer: null,
+      HasNextPage: true,
+      DataLock: false,
       NavActiveId: 1, // 导航选中id
       NavList: [ // 导航数据
         { name: '全部', id: 1 },
-        { name: '充值', id: 2 },
-        { name: '投注', id: 3 },
-        { name: '派奖', id: 4 },
-        { name: '提现', id: 5 }
+        { name: '投注', id: 2 },
+        { name: '提现', id: 3 }
       ],
       SwiperOptions: {
         on: {
@@ -73,7 +72,8 @@ export default {
       return this.$refs.MySwiper.swiper
     },
     ...mapUserState({
-      UserAccountDetails: x => x.UserAccountDetails // 用户账户明细
+      UserInfo: x => x.UserInfo, // 用户信息
+      AccountBill: x => x.AccountBill // 用户账户明细
     })
   },
   components: {
@@ -88,33 +88,59 @@ export default {
     })
   },
   methods: {
+    ...mapUserActions([
+      'GetAccountBill'
+    ]),
+    ...mapUserMutations([
+      'EmptyAccountBill'
+    ]),
+    Init (done = () => { }) { // 初始化
+      this.EmptyAccountBill()
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.DataLock = false
+      this.ToGetPageList(done)
+    },
+    ToGetPageList (done = () => { }) { // 获取页面列表
+      if (this.HasNextPage) {
+        let QueryData = { ...this.PageData }
+        if (this.NavActiveId - 0 === 2) {
+          QueryData.feeType = 'BETTING'
+        }
+        if (this.NavActiveId - 0 === 3) {
+          QueryData.feeType = 'CASH_OUT'
+        }
+        this.GetAccountBill({ urlData: { id: this.UserInfo.customerId }, queryData: { ...QueryData } }).then((res) => {
+          this.HasNextPage = res.data.data.total > this.AccountBill.length
+          done()
+        }).catch(() => {
+          done()
+        })
+      }
+    },
     CutNav (item, index) { // 切换nav
       if (this.DataLock) return
       this.DataLock = true
       this.NavActiveId = item.id
-      this.MySwiper.slideTo(index, 0, false)
+      this.Init()
       this.DataLock = false
     },
-    ReturnType (id) { // 返回明细类型
-      switch (id) {
-        case 1:
-          return 'All'
-        case 2:
-          return 'Pay'
-        case 3:
-          return 'Bet'
-        case 4:
-          return 'SendPrize'
-        case 5:
-          return 'WithDraw'
-        default:
-          return 'All'
-      }
+    Infinite (done) { // 上拉加载
+      this.Timer = window.setTimeout(() => {
+        if (this.HasNextPage) {
+          this.PageData.pageNum += 1
+          this.ToGetPageList(done)
+        } else {
+          this.$refs.MyScroller.finishInfinite(true)
+        }
+      }, 1000)
     },
     Refresh (done) { // 页面下拉刷新
-      window.setTimeout(() => {
+      if (!this.DataLock) {
+        this.Init(done)
+      } else {
         done()
-      }, 1000)
+      }
     }
   }
 }

src/pages/WoDe/ZhangHaoMingXi/page.scss

@@ -44,49 +44,39 @@
         top: 0;
         bottom: 0;
         overflow: hidden;
-        > div {
-          width: 100%;
-          height: 100%;
-          position: relative;
-          .SwiperItem {
-            width: 100%;
-            height: 100%;
-            position: relative;
-            .Container {
-              ul {
-                padding: 0 0.15rem;
-                > li {
-                  align-items: center;
-                  padding: 0.1rem 0;
-                  border-bottom: 0.01rem solid #f7f7f7;
-                  > div {
-                    > span {
-                      display: block;
-                      width: 100%;
-                      font-size: 0.12rem;
-                      color: #999;
-                      line-height: 0.2rem;
-                      white-space: nowrap;
-                      overflow: hidden;
-                      text-overflow: ellipsis;
-                      &:first-child {
-                        font-size: 0.15rem;
-                        color: #333;
-                        margin-bottom: 0.05rem;
-                      }
-                    }
-                  }
-                  > span {
+        .Container {
+          ul {
+            padding: 0 0.15rem;
+            > li {
+              align-items: center;
+              padding: 0.1rem 0;
+              border-bottom: 0.01rem solid #f7f7f7;
+              > div {
+                > span {
+                  display: block;
+                  width: 100%;
+                  font-size: 0.12rem;
+                  color: #999;
+                  line-height: 0.2rem;
+                  white-space: nowrap;
+                  overflow: hidden;
+                  text-overflow: ellipsis;
+                  &:first-child {
                     font-size: 0.15rem;
-                    font-weight: bold;
-                    color: #999;
-                    margin-left: 0.1rem;
-                    &.active {
-                      color: #ff5200;
-                    }
+                    color: #333;
+                    margin-bottom: 0.05rem;
                   }
                 }
               }
+              > span {
+                font-size: 0.15rem;
+                font-weight: bold;
+                color: #999;
+                margin-left: 0.1rem;
+                &.active {
+                  color: #ff5200;
+                }
+              }
             }
           }
         }

src/pages/index/DingDanZhiFuZhuangTai/index.vue

@@ -4,7 +4,7 @@
       <div class="PageContainer">
         <div class="centerLabel">
           <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
-          <span v-if="OrderStatus === 'Error'">支付失败</span>
+          <span v-if="OrderStatus === 'Error'">待支付</span>
           <i class="iconfont iconchenggong active" v-if="OrderStatus === 'Success'"></i>
           <span v-if="OrderStatus === 'Success'">支付成功</span>
           <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/betting?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}&routerName=${$route.query.routerName}`">重新支付</a>
@@ -45,8 +45,8 @@ export default {
       'GetAliPayStatus'
     ]),
     Init () { // 初始化
-      if (this.$route.query.id !== undefined) {
-        this.GetAliPayStatus({ urlData: { id: this.$route.query.id } }).then((res) => {
+      if (this.$route.query.orderId !== undefined) {
+        this.GetAliPayStatus({ urlData: { id: this.$route.query.orderId } }).then((res) => {
           this.OrderStatus = res.data.data === 1 ? 'Success' : 'Error'
         })
       }

src/router/index.js

@@ -309,11 +309,32 @@ let router = new Router({
                     }
                   },
                   {
-                    path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick', // 改修用户昵称
+                    path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick', // 修改用户昵称
                     name: 'EditUserNick',
                     component: resolve => {
                       require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick'], RouterLoading.resolve(resolve))
                     }
+                  },
+                  {
+                    path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditTiXianMiMa', // 修改提现密码
+                    name: 'EditTiXianMiMa',
+                    component: resolve => {
+                      require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditTiXianMiMa'], RouterLoading.resolve(resolve))
+                    }
+                  },
+                  {
+                    path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingShenFenZheng', // 绑定身份证
+                    name: 'BangDingShenFenZheng',
+                    component: resolve => {
+                      require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingShenFenZheng'], RouterLoading.resolve(resolve))
+                    }
+                  },
+                  {
+                    path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingZhiFuBao', // 绑定支付宝
+                    name: 'BangDingZhiFuBao',
+                    component: resolve => {
+                      require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/BangDingZhiFuBao'], RouterLoading.resolve(resolve))
+                    }
                   }
                 ]
               },
@@ -332,6 +353,13 @@ let router = new Router({
             component: resolve => {
               require(['@/pages/WoDe/XiaZaiErWeiMa'], RouterLoading.resolve(resolve))
             }
+          },
+          {
+            path: '/WoDe/TiXian', // 提现
+            name: 'TiXian',
+            component: resolve => {
+              require(['@/pages/WoDe/TiXian'], RouterLoading.resolve(resolve))
+            }
           }
         ]
       },

src/store/user/index.js

@@ -4,6 +4,7 @@ import ToolClass from '../../util/PublicMethod'
 export default {
   namespaced: true,
   state: {
+    AccountBill: [], // 账户明细
     StoreList: [], // 店铺列表
     LanQiuCart: [], // 篮球购物车
     ZuQiuCart: [], // 足球购物车
@@ -111,9 +112,35 @@ export default {
     },
     EmptyUserBettingList (state) { // 清空用户投注列表
       state.UserBettingList = []
+    },
+    UpdateAccountBill (state, data) { // 更新账户明细
+      state.AccountBill = state.AccountBill.concat(data.records || [])
+    },
+    EmptyAccountBill (state) { // 清空账户明细
+      state.AccountBill = []
     }
   },
   actions: {
+    BindAliAccount (context, payload) { // 绑定支付宝
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.BindAliAccount, context, payload, 1000)
+      })
+    },
+    BindIdCard (context, payload) { // 绑定身份证
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.BindIdCard, context, payload, 1000)
+      })
+    },
+    CashOut (context, payload) { // 提现
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.CashOut, context, payload, 1000)
+      })
+    },
+    GetAccountBill (context, payload) { // 获取账户明细
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.GetAccountBill, context, payload, 1000, 'UpdateAccountBill')
+      })
+    },
     GetAliPayStatus (context, payload) { // 获取支付宝支付结果
       return new Promise((resolve, reject) => {
         ToolClass.Axios(resolve, reject, Api.GetAliPayStatus, context, payload, 1000)

src/util/Api.js

@@ -2,6 +2,22 @@
 const prefix = process.env.NODE_ENV === 'production' ? '/api' : '/api'
 
 const $api = {
+  BindAliAccount: { // 绑定支付宝
+    method: 'post',
+    url: `${prefix}/shop/alipay/auth/user`
+  },
+  BindIdCard: { // 绑定身份证
+    method: 'put',
+    url: `${prefix}/app/bind/identity`
+  },
+  CashOut: { // 提现
+    method: 'post',
+    url: `${prefix}/app/account/cashout`
+  },
+  GetAccountBill: { // 获取账户明细
+    method: 'get',
+    url: `${prefix}/app/customer/:id/bill`
+  },
   CreateAliPayOrder: { // 创建支付宝订单
     method: 'get',
     url: `${prefix}/app/order/alipay/buylottery`

src/util/PublicMethod.js

@@ -135,13 +135,14 @@ const ToolClass = {
     return false
   },
   DateFormat (timestamp) { // 格式化时间
-    let Date = new Date(timestamp - 0)
+    timestamp = new Date(timestamp).getTime()
+    let aDate = new Date(timestamp - 0)
     let yy = new Date(timestamp).getFullYear()
     let mm = new Date(timestamp).getMonth() + 1
     let dd = new Date(timestamp).getDate()
-    let hh = Date.getHours()
-    let min = Date.getMinutes()
-    let ss = Date.getSeconds()
+    let hh = aDate.getHours()
+    let min = aDate.getMinutes()
+    let ss = aDate.getSeconds()
     return `${yy}-${mm}-${dd} ${hh}:${min}:${ss}`
   },
   WindowClick (callback) { // window点击事件