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

index.html

   <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_zgncjv2mcd.css">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_2022160_w52az879v6.css">
   <title>牛彩</title>
   <script>
     let Width = document.documentElement.clientWidth / 375 * 100

package-lock.json

       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "requires": {
         "color-convert": "^1.9.0"
       }
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "batch": {
       "version": "0.6.1",
         "isarray": "^1.0.0"
       }
     },
+    "buffer-alloc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz",
+      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
+      "requires": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "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="
+    },
+    "buffer-fill": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz",
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
+    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
     },
     "buffer-indexof": {
       "version": "1.1.1",
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "requires": {
         "color-name": "1.1.3"
       }
     "color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
     },
     "color-string": {
       "version": "0.3.0",
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
         "randombytes": "^2.0.0"
       }
     },
+    "dijkstrajs": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/dijkstrajs/download/dijkstrajs-1.0.1.tgz",
+      "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
+    },
     "dir-glob": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "emojis-list": {
       "version": "2.1.0",
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
     "ieee754": {
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
-      "dev": true
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="
     },
     "iferr": {
       "version": "0.1.5",
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
     },
     "is-generator-fn": {
       "version": "1.0.0",
     "path-exists": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
     },
     "path-is-absolute": {
       "version": "1.0.1",
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
       "dev": true
     },
+    "pngjs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npm.taobao.org/pngjs/download/pngjs-3.4.0.tgz",
+      "integrity": "sha1-mcp9clll+2VYFOr2XzjxK72/VV8="
+    },
     "portfinder": {
       "version": "1.0.19",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.19.tgz",
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
       "dev": true
     },
+    "qrcode": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npm.taobao.org/qrcode/download/qrcode-1.4.4.tgz",
+      "integrity": "sha1-8MQ1aKfnUQpV78O4jZYC9xlj6oM=",
+      "requires": {
+        "buffer": "^5.4.3",
+        "buffer-alloc": "^1.2.0",
+        "buffer-from": "^1.1.1",
+        "dijkstrajs": "^1.0.1",
+        "isarray": "^2.0.1",
+        "pngjs": "^3.3.0",
+        "yargs": "^13.2.4"
+      },
+      "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="
+        },
+        "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=",
+          "requires": {
+            "base64-js": "^1.0.2",
+            "ieee754": "^1.1.4"
+          }
+        },
+        "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="
+        },
+        "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=",
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
+          "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="
+        },
+        "isarray": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.5.tgz",
+          "integrity": "sha1-ivHkwSISRMxiRZ+vOJQNTmRKVyM="
+        },
+        "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=",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "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=",
+          "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=",
+          "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="
+        },
+        "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="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz",
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "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=",
+          "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=",
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "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=",
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
+          }
+        },
+        "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=",
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "qs": {
       "version": "6.9.4",
       "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz",
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-value": {
       "version": "2.0.0",
     "which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
     "wide-align": {
       "version": "1.1.3",
     "y18n": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
     },
     "yallist": {
       "version": "2.1.2",

package.json

     "exports-loader": "^0.7.0",
     "js-md5": "^0.7.3",
     "mint-ui": "^2.2.13",
+    "qrcode": "^1.4.4",
     "qs": "^6.9.4",
     "script-loader": "^0.7.2",
     "vant": "^2.10.6",

src/components/common/MainPageContainer/index.vue

     <!-- tabbar -->
     <div class="TabBar flex-h" :style="{paddingBottom: `${MainPaddingBottom}px`}" v-if="ShowMainTabBar">
       <div class="flex-item" v-for="(item, index) in MainTabBar" :key="index">
-        <router-link :to="{name: item.router}" :class="{'active': item.id === MainTabBarActiveId}">
+        <router-link :to="{name: item.router}" :class="{'active': item.id === MainTabBarActiveId}" :replace="true">
           <i class="iconfont" :class="item.icon"></i>
           <span>{{item.name}}</span>
         </router-link>

src/pages/Register/index.vue

     return {
       Phone: '',
       Code: '',
-      InviteCode: '',
+      InviteCode: this.$route.query.code || null,
       Password: '',
       DataLock: false,
       Timer: null,
       'SignIn'
     ]),
     Init () { // 初始化
-      // this.GetRegPhoneCode({ urlData: { phone: 18267901393 } })
     },
     ToReg () { // 去注册
       if (this.DataLock || !this.IsPhone(this.Phone) || this.Code === '' || this.Password === '') return

src/pages/WoDe/XiaZaiErWeiMa/index.vue

 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="下载二维码">
+    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="邀请注册">
       <div class="PageContainer">
-        下载二维码
+        <img src="../../../assets/img/yaoqing.jpg" width="100%" alt="">
+        <div class="centerLabel">
+          <span>您的邀请码为</span>
+          <span v-if="UserInfo !== null">{{UserInfo.inviteCode}}</span>
+          <span>好友也可在注册时直接填写邀请码</span>
+          <div class="QrCode">
+            <div>
+              <img v-if="QrCodeUrl !== null" :src="QrCodeUrl" class="contain" alt="">
+            </div>
+          </div>
+        </div>
       </div>
     </MainPageContainer>
   </div>
 </template>
 
 <script>
+import QRCode from 'qrcode'
 import MainPageContainer from '../../../components/common/MainPageContainer'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState } = createNamespacedHelpers('user')
 export default {
   name: '',
   data () {
     return {
+      QrCodeUrl: null
     }
   },
   computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo
+    })
   },
   components: {
     MainPageContainer
     })
   },
   methods: {
+    Init () {
+      QRCode.toDataURL(`https://app.xnsport.cn/#/Register?code=${this.UserInfo.inviteCode}`).then((res) => {
+        this.QrCodeUrl = res
+      }).catch((res) => {
+        console.log(res)
+      })
+    }
   }
 }
 </script>

src/pages/WoDe/XiaZaiErWeiMa/page.scss

     width: 100%;
     height: 100%;
     position: relative;
+    > div {
+      z-index: 2;
+      width: 70%;
+      background: #fff;
+      box-shadow: 0 0 0.02rem 0.02rem rgba(0, 0, 0, 0.05);
+      border-radius: 0.06rem;
+      padding: 0.15rem;
+      > span {
+        display: block;
+        text-align: center;
+        line-height: 1.5;
+        margin-top: 0.02rem;
+        &:nth-child(1) {
+          font-size: 0.16rem;
+          font-weight: bold;
+        }
+        &:nth-child(2) {
+          font-size: 0.2rem;
+          font-weight: bold;
+          color: #ff5100;
+        }
+        &:nth-child(3) {
+          font-size: 0.12rem;
+          color: #999;
+        }
+      }
+      > .QrCode {
+        border-top: 0.01rem dashed #ccc;
+        margin-top: 0.15rem;
+        padding-bottom: 100%;
+        position: relative;
+        overflow: hidden;
+        height: 0;
+        > div {
+          width: 50%;
+          position: absolute;
+          left: 25%;
+          top: 25%;
+          bottom: 25%;
+          overflow: hidden;
+        }
+      }
+    }
   }
 }

src/pages/index/DaLeTouDingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [], // 我的店铺
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
       RecommendStoreList: [], // 推荐店铺列表
     }).then((res) => {
       this.StoreList = res.data.data.nearest || []
       this.RecommendStoreList = res.data.data.recommend || []
+      this.MyStoreList = res.data.data.mine || []
+      if (this.MyStoreList.length) {
+        this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+        this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+      } else if (this.RecommendStoreList.length) {
+        this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+        this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+      } else if (this.StoreList.length) {
+        this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+        this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+      }
     })
   },
   mounted () {

src/pages/index/DingDanZhiFuZhuangTai/index.vue

 <template>
   <div class="Page">
-    <MainPageContainer :ShowMainHeader="true" :ShowMainTabBar="true" MainHeaderTitle="首页" :MainTabBarActiveId="1">
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="订单状态">
       <div class="PageContainer">
-        订单支付状态
+        <div class="centerLabel">
+          <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
+          <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/buylottery?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}`">重新支付</a>
+          <router-link :to="{ name: 'index' }">返回首页</router-link>
+          <a @click="$router.go(-1)">继续投注</a>
+        </div>
       </div>
     </MainPageContainer>
   </div>
 
 <script>
 import MainPageContainer from '../../../components/common/MainPageContainer'
-import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
-const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
+import { createNamespacedHelpers } from 'vuex'
+const { mapActions: mapUserActions } = createNamespacedHelpers('user')
 export default {
   name: 'index',
   data () {
     return {
+      OrderStatus: null,
+      LocationOrigin: encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${this.$route.query.id}`),
+      Jwt: window.localStorage.Jwt
     }
   },
   computed: {
-    ...mapState({
-      AllLotteryType: x => x.AllLotteryType // 所有彩种类型
-    }),
-    ...mapIndexState({
-      NewstLotteryRes: x => x.NewstLotteryRes // 最新数字彩开奖结果列表
-    })
   },
   components: {
     MainPageContainer
     })
   },
   methods: {
-    ...mapActions([
-      'GetAllLotteryType'
-    ]),
-    ...mapIndexActions([
-      'GetBanner',
-      'GetLotteryRes',
-      'GetNewstLotteryRes'
-    ]),
-    ...mapIndexMutations([
-      'EmptyBanner'
+    ...mapUserActions([
+      'GetAliPayStatus'
     ]),
     Init () { // 初始化
-
+      if (this.$route.query.id !== undefined) {
+        this.GetAliPayStatus({ urlData: { id: this.$route.query.id } }).then((res) => {
+          this.OrderStatus = res.data.data === 1 ? 'Success' : 'Error'
+        })
+      }
     }
   }
 }

src/pages/index/DingDanZhiFuZhuangTai/page.scss

     height: 100%;
     position: relative;
     overflow: hidden;
+    > div {
+      width: 100%;
+      text-align: center;
+      > i {
+        font-size: 1rem;
+        color: #f10404;
+        &.active {
+          color: #39ce09;
+        }
+      }
+      > span {
+        display: block;
+        text-align: center;
+        font-size: 0.14rem;
+        line-height: 0.2rem;
+        margin-top: 0.2rem;
+        + a {
+          margin-top: 0.4rem;
+        }
+      }
+      > a {
+        width: 80%;
+        display: block;
+        font-size: 0.14rem;
+        color: #fff;
+        line-height: 0.4rem;
+        border-radius: 0.06rem;
+        background: #ff5100;
+        margin: 0.2rem auto 0;
+      }
+    }
   }
 }

src/pages/index/LanQiuDingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [],
       PriceArr: [0, 0], // 奖金区间
       AllParts: [], // 投注生成结果
       CurrentPassUnitNum: 0,
     ]),
     Init () { // 初始化
       this.PageList = [...this.LanQiuCart] // 赋值页面数据
-      console.log(this.PageList)
       this.ToGetStoreList() // 获取店铺列表
       if (this.$route.query.type === 'single') { // 单关
         this.CurrentPassCode = '1＊1'
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
+        window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
       }).then((res) => {
         let StoreList = res.data.data.nearest || []
         let RecommendStoreList = res.data.data.recommend || []
+        let MyStoreList = res.data.data.mine || []
         StoreList.map((item) => {
           if (item.status - 0 === 1) {
             this.StoreList.push(item)
             this.RecommendStoreList.push(item)
           }
         })
+        MyStoreList.map((item) => {
+          if (item.status - 0 === 1) {
+            this.MyStoreList.push(item)
+          }
+        })
+        if (this.MyStoreList.length) {
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+        } else if (this.RecommendStoreList.length) {
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+        } else if (this.StoreList.length) {
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+        }
       })
     },
     ToGetAllParts () { // 枚举投注

src/pages/index/PaiLie3DingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
       RecommendStoreList: [], // 推荐店铺列表
       }).then((res) => {
         this.StoreList = res.data.data.nearest || []
         this.RecommendStoreList = res.data.data.recommend || []
+        this.MyStoreList = res.data.data.mine || []
+        if (this.MyStoreList.length) {
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+        } else if (this.RecommendStoreList.length) {
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+        } else if (this.StoreList.length) {
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+        }
       })
     },
     ReturnType (type) { // 投注类型返回值
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
+        window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/PaiLie5DingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
       RecommendStoreList: [], // 推荐店铺列表
       }).then((res) => {
         this.StoreList = res.data.data.nearest || []
         this.RecommendStoreList = res.data.data.recommend || []
+        this.MyStoreList = res.data.data.mine || []
+        if (this.MyStoreList.length) {
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+        } else if (this.RecommendStoreList.length) {
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+        } else if (this.StoreList.length) {
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+        }
       })
     },
     ToPostBetting () { // 去下注
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
+        window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/ShuangSeQiuDingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [],
       CurrentStoreName: null, // 当前选择店铺名称
       CurrentStoreId: null, // 当前选择店铺id
       RecommendStoreList: [], // 推荐店铺列表
     }).then((res) => {
       this.StoreList = res.data.data.nearest || []
       this.RecommendStoreList = res.data.data.recommend || []
+      this.MyStoreList = res.data.data.mine || []
+      if (this.MyStoreList.length) {
+        this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+        this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+      } else if (this.RecommendStoreList.length) {
+        this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+        this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+      } else if (this.StoreList.length) {
+        this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+        this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+      }
     })
   },
   mounted () {
         this.TotalPrize = 0
         this.Multiple = 1
         this.DataLock = false
+        window.location.href = `/api/app/order/alipay/betting?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false

src/pages/index/ZuQiuDingDan/index.vue

 
         <div class="Layer" v-if="ShowStore">
           <div class="centerLabel">
+            <span v-if="MyStoreList.length">我的店铺：</span>
+            <ul v-if="MyStoreList.length">
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
+                <div class="flex-item">
+                  <div>
+                    <span>{{item.name}}</span>
+                  </div>
+                </div>
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
+                <i class="iconfont iconyigouxuan active" v-else></i>
+              </li>
+            </ul>
             <span v-if="RecommendStoreList.length">推荐店铺：</span>
             <ul v-if="RecommendStoreList.length">
               <li v-for="(item, index) in RecommendStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
   name: '',
   data () {
     return {
+      MyStoreList: [],
       PriceArr: [0, 0], // 奖金区间
       AllParts: [], // 投注生成结果
       CurrentPassUnitNum: 0,
         this.TotalPrice = 0
         this.Multiple = 1
         this.DataLock = false
+        window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${res.data.data.orderId}`)}&token=${window.localStorage.Jwt}`
       }).catch((res) => {
         this.Toast(res.data.message)
         this.DataLock = false
       }).then((res) => {
         let StoreList = res.data.data.nearest || []
         let RecommendStoreList = res.data.data.recommend || []
+        let MyStoreList = res.data.data.mine || []
         StoreList.map((item) => {
           if (item.status - 0 === 1) {
             this.StoreList.push(item)
             this.RecommendStoreList.push(item)
           }
         })
+        MyStoreList.map((item) => {
+          if (item.status - 0 === 1) {
+            this.MyStoreList.push(item)
+          }
+        })
+        if (this.MyStoreList.length) {
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
+        } else if (this.RecommendStoreList.length) {
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
+        } else if (this.StoreList.length) {
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
+        }
       })
     },
     ToGetAllParts () { // 枚举投注

src/store/user/index.js

     }
   },
   actions: {
+    GetAliPayStatus (context, payload) { // 获取支付宝支付结果
+      return new Promise((resolve, reject) => {
+        ToolClass.Axios(resolve, reject, Api.GetAliPayStatus, context, payload, 1000)
+      })
+    },
     CreateAliPayOrder (context, payload) { // 创建支付宝订单
       return new Promise((resolve, reject) => {
         ToolClass.Axios(resolve, reject, Api.CreateAliPayOrder, context, payload, 1000)

src/util/Api.js

   UpdateUserInfo: { // 更新用户信息
     method: 'put',
     url: `${prefix}/app/customer/:id`
+  },
+  GetAliPayStatus: { // 获取支付宝支付结果
+    method: 'get',
+    url: `${prefix}/app/order/:id/paystatus`
   }
 }