1002884655 4 年 前
コミット
d1ce096842

+ 1
- 1
index.html ファイルの表示

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

+ 209
- 28
package-lock.json ファイルの表示

@@ -426,7 +426,6 @@
426 426
       "version": "3.2.1",
427 427
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
428 428
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
429
-      "dev": true,
430 429
       "requires": {
431 430
         "color-convert": "^1.9.0"
432 431
       }
@@ -781,8 +780,7 @@
781 780
     "array-find-index": {
782 781
       "version": "1.0.2",
783 782
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
784
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
785
-      "dev": true
783
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
786 784
     },
787 785
     "array-flatten": {
788 786
       "version": "1.1.1",
@@ -2091,8 +2089,7 @@
2091 2089
     "base64-js": {
2092 2090
       "version": "1.3.0",
2093 2091
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
2094
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
2095
-      "dev": true
2092
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
2096 2093
     },
2097 2094
     "batch": {
2098 2095
       "version": "0.6.1",
@@ -2381,11 +2378,29 @@
2381 2378
         "isarray": "^1.0.0"
2382 2379
       }
2383 2380
     },
2381
+    "buffer-alloc": {
2382
+      "version": "1.2.0",
2383
+      "resolved": "https://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz",
2384
+      "integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
2385
+      "requires": {
2386
+        "buffer-alloc-unsafe": "^1.1.0",
2387
+        "buffer-fill": "^1.0.0"
2388
+      }
2389
+    },
2390
+    "buffer-alloc-unsafe": {
2391
+      "version": "1.1.0",
2392
+      "resolved": "https://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz",
2393
+      "integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA="
2394
+    },
2395
+    "buffer-fill": {
2396
+      "version": "1.0.0",
2397
+      "resolved": "https://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz",
2398
+      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
2399
+    },
2384 2400
     "buffer-from": {
2385 2401
       "version": "1.1.1",
2386 2402
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
2387
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
2388
-      "dev": true
2403
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
2389 2404
     },
2390 2405
     "buffer-indexof": {
2391 2406
       "version": "1.1.1",
@@ -2981,7 +2996,6 @@
2981 2996
       "version": "1.9.3",
2982 2997
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
2983 2998
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
2984
-      "dev": true,
2985 2999
       "requires": {
2986 3000
         "color-name": "1.1.3"
2987 3001
       }
@@ -2989,8 +3003,7 @@
2989 3003
     "color-name": {
2990 3004
       "version": "1.1.3",
2991 3005
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
2992
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
2993
-      "dev": true
3006
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
2994 3007
     },
2995 3008
     "color-string": {
2996 3009
       "version": "0.3.0",
@@ -3781,8 +3794,7 @@
3781 3794
     "decamelize": {
3782 3795
       "version": "1.2.0",
3783 3796
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
3784
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
3785
-      "dev": true
3797
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
3786 3798
     },
3787 3799
     "decode-uri-component": {
3788 3800
       "version": "0.2.0",
@@ -4001,6 +4013,11 @@
4001 4013
         "randombytes": "^2.0.0"
4002 4014
       }
4003 4015
     },
4016
+    "dijkstrajs": {
4017
+      "version": "1.0.1",
4018
+      "resolved": "https://registry.npm.taobao.org/dijkstrajs/download/dijkstrajs-1.0.1.tgz",
4019
+      "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
4020
+    },
4004 4021
     "dir-glob": {
4005 4022
       "version": "2.0.0",
4006 4023
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
@@ -4231,8 +4248,7 @@
4231 4248
     "emoji-regex": {
4232 4249
       "version": "7.0.3",
4233 4250
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
4234
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
4235
-      "dev": true
4251
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
4236 4252
     },
4237 4253
     "emojis-list": {
4238 4254
       "version": "2.1.0",
@@ -6756,8 +6772,7 @@
6756 6772
     "ieee754": {
6757 6773
       "version": "1.1.12",
6758 6774
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
6759
-      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
6760
-      "dev": true
6775
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA=="
6761 6776
     },
6762 6777
     "iferr": {
6763 6778
       "version": "0.1.5",
@@ -7081,8 +7096,7 @@
7081 7096
     "is-fullwidth-code-point": {
7082 7097
       "version": "2.0.0",
7083 7098
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
7084
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
7085
-      "dev": true
7099
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
7086 7100
     },
7087 7101
     "is-generator-fn": {
7088 7102
       "version": "1.0.0",
@@ -8619,6 +8633,16 @@
8619 8633
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
8620 8634
       "dev": true
8621 8635
     },
8636
+    "mint-ui": {
8637
+      "version": "2.2.13",
8638
+      "resolved": "https://registry.npmjs.org/mint-ui/-/mint-ui-2.2.13.tgz",
8639
+      "integrity": "sha512-Xz1SFagHSzKOprwQv3fcekXT5RJvhh939zwZHcWeazk1OJrCjsD4I2qm49AEUCfT1AoYzC+rsZIwGP/J6LwVVw==",
8640
+      "requires": {
8641
+        "array-find-index": "^1.0.2",
8642
+        "raf.js": "0.0.4",
8643
+        "vue-lazyload": "^1.0.1"
8644
+      }
8645
+    },
8622 8646
     "mississippi": {
8623 8647
       "version": "2.0.0",
8624 8648
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -9628,8 +9652,7 @@
9628 9652
     "path-exists": {
9629 9653
       "version": "3.0.0",
9630 9654
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
9631
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
9632
-      "dev": true
9655
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
9633 9656
     },
9634 9657
     "path-is-absolute": {
9635 9658
       "version": "1.0.1",
@@ -9739,6 +9762,11 @@
9739 9762
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
9740 9763
       "dev": true
9741 9764
     },
9765
+    "pngjs": {
9766
+      "version": "3.4.0",
9767
+      "resolved": "https://registry.npm.taobao.org/pngjs/download/pngjs-3.4.0.tgz",
9768
+      "integrity": "sha1-mcp9clll+2VYFOr2XzjxK72/VV8="
9769
+    },
9742 9770
     "portfinder": {
9743 9771
       "version": "1.0.19",
9744 9772
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.19.tgz",
@@ -12033,6 +12061,158 @@
12033 12061
       "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
12034 12062
       "dev": true
12035 12063
     },
12064
+    "qrcode": {
12065
+      "version": "1.4.4",
12066
+      "resolved": "https://registry.npm.taobao.org/qrcode/download/qrcode-1.4.4.tgz",
12067
+      "integrity": "sha1-8MQ1aKfnUQpV78O4jZYC9xlj6oM=",
12068
+      "requires": {
12069
+        "buffer": "^5.4.3",
12070
+        "buffer-alloc": "^1.2.0",
12071
+        "buffer-from": "^1.1.1",
12072
+        "dijkstrajs": "^1.0.1",
12073
+        "isarray": "^2.0.1",
12074
+        "pngjs": "^3.3.0",
12075
+        "yargs": "^13.2.4"
12076
+      },
12077
+      "dependencies": {
12078
+        "ansi-regex": {
12079
+          "version": "4.1.0",
12080
+          "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-4.1.0.tgz",
12081
+          "integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
12082
+        },
12083
+        "buffer": {
12084
+          "version": "5.6.0",
12085
+          "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",
12086
+          "integrity": "sha1-oxdJ3H2B2E2wir+Te2uMQDP2J4Y=",
12087
+          "requires": {
12088
+            "base64-js": "^1.0.2",
12089
+            "ieee754": "^1.1.4"
12090
+          }
12091
+        },
12092
+        "camelcase": {
12093
+          "version": "5.3.1",
12094
+          "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",
12095
+          "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
12096
+        },
12097
+        "cliui": {
12098
+          "version": "5.0.0",
12099
+          "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",
12100
+          "integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
12101
+          "requires": {
12102
+            "string-width": "^3.1.0",
12103
+            "strip-ansi": "^5.2.0",
12104
+            "wrap-ansi": "^5.1.0"
12105
+          }
12106
+        },
12107
+        "find-up": {
12108
+          "version": "3.0.0",
12109
+          "resolved": "https://registry.npm.taobao.org/find-up/download/find-up-3.0.0.tgz",
12110
+          "integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
12111
+          "requires": {
12112
+            "locate-path": "^3.0.0"
12113
+          }
12114
+        },
12115
+        "get-caller-file": {
12116
+          "version": "2.0.5",
12117
+          "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz",
12118
+          "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
12119
+        },
12120
+        "isarray": {
12121
+          "version": "2.0.5",
12122
+          "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.5.tgz",
12123
+          "integrity": "sha1-ivHkwSISRMxiRZ+vOJQNTmRKVyM="
12124
+        },
12125
+        "locate-path": {
12126
+          "version": "3.0.0",
12127
+          "resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
12128
+          "integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
12129
+          "requires": {
12130
+            "p-locate": "^3.0.0",
12131
+            "path-exists": "^3.0.0"
12132
+          }
12133
+        },
12134
+        "p-limit": {
12135
+          "version": "2.3.0",
12136
+          "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",
12137
+          "integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
12138
+          "requires": {
12139
+            "p-try": "^2.0.0"
12140
+          }
12141
+        },
12142
+        "p-locate": {
12143
+          "version": "3.0.0",
12144
+          "resolved": "https://registry.npm.taobao.org/p-locate/download/p-locate-3.0.0.tgz",
12145
+          "integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
12146
+          "requires": {
12147
+            "p-limit": "^2.0.0"
12148
+          }
12149
+        },
12150
+        "p-try": {
12151
+          "version": "2.2.0",
12152
+          "resolved": "https://registry.npm.taobao.org/p-try/download/p-try-2.2.0.tgz",
12153
+          "integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
12154
+        },
12155
+        "require-main-filename": {
12156
+          "version": "2.0.0",
12157
+          "resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
12158
+          "integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
12159
+        },
12160
+        "string-width": {
12161
+          "version": "3.1.0",
12162
+          "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz",
12163
+          "integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
12164
+          "requires": {
12165
+            "emoji-regex": "^7.0.1",
12166
+            "is-fullwidth-code-point": "^2.0.0",
12167
+            "strip-ansi": "^5.1.0"
12168
+          }
12169
+        },
12170
+        "strip-ansi": {
12171
+          "version": "5.2.0",
12172
+          "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz",
12173
+          "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
12174
+          "requires": {
12175
+            "ansi-regex": "^4.1.0"
12176
+          }
12177
+        },
12178
+        "wrap-ansi": {
12179
+          "version": "5.1.0",
12180
+          "resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz",
12181
+          "integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
12182
+          "requires": {
12183
+            "ansi-styles": "^3.2.0",
12184
+            "string-width": "^3.0.0",
12185
+            "strip-ansi": "^5.0.0"
12186
+          }
12187
+        },
12188
+        "yargs": {
12189
+          "version": "13.3.2",
12190
+          "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",
12191
+          "integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
12192
+          "requires": {
12193
+            "cliui": "^5.0.0",
12194
+            "find-up": "^3.0.0",
12195
+            "get-caller-file": "^2.0.1",
12196
+            "require-directory": "^2.1.1",
12197
+            "require-main-filename": "^2.0.0",
12198
+            "set-blocking": "^2.0.0",
12199
+            "string-width": "^3.0.0",
12200
+            "which-module": "^2.0.0",
12201
+            "y18n": "^4.0.0",
12202
+            "yargs-parser": "^13.1.2"
12203
+          }
12204
+        },
12205
+        "yargs-parser": {
12206
+          "version": "13.1.2",
12207
+          "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",
12208
+          "integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
12209
+          "requires": {
12210
+            "camelcase": "^5.0.0",
12211
+            "decamelize": "^1.2.0"
12212
+          }
12213
+        }
12214
+      }
12215
+    },
12036 12216
     "qs": {
12037 12217
       "version": "6.9.4",
12038 12218
       "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.9.4.tgz",
@@ -12066,6 +12246,11 @@
12066 12246
       "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
12067 12247
       "dev": true
12068 12248
     },
12249
+    "raf.js": {
12250
+      "version": "0.0.4",
12251
+      "resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
12252
+      "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
12253
+    },
12069 12254
     "randomatic": {
12070 12255
       "version": "3.1.1",
12071 12256
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
@@ -12748,8 +12933,7 @@
12748 12933
     "require-directory": {
12749 12934
       "version": "2.1.1",
12750 12935
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
12751
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
12752
-      "dev": true
12936
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
12753 12937
     },
12754 12938
     "require-from-string": {
12755 12939
       "version": "2.0.2",
@@ -13535,8 +13719,7 @@
13535 13719
     "set-blocking": {
13536 13720
       "version": "2.0.0",
13537 13721
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
13538
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
13539
-      "dev": true
13722
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
13540 13723
     },
13541 13724
     "set-value": {
13542 13725
       "version": "2.0.0",
@@ -15772,8 +15955,7 @@
15772 15955
     "which-module": {
15773 15956
       "version": "2.0.0",
15774 15957
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
15775
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
15776
-      "dev": true
15958
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
15777 15959
     },
15778 15960
     "wide-align": {
15779 15961
       "version": "1.1.3",
@@ -15902,8 +16084,7 @@
15902 16084
     "y18n": {
15903 16085
       "version": "4.0.0",
15904 16086
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
15905
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
15906
-      "dev": true
16087
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="
15907 16088
     },
15908 16089
     "yallist": {
15909 16090
       "version": "2.1.2",

+ 2
- 0
package.json ファイルの表示

@@ -18,6 +18,8 @@
18 18
     "axios": "^0.18.0",
19 19
     "exports-loader": "^0.7.0",
20 20
     "js-md5": "^0.7.3",
21
+    "mint-ui": "^2.2.13",
22
+    "qrcode": "^1.4.4",
21 23
     "qs": "^6.9.4",
22 24
     "script-loader": "^0.7.2",
23 25
     "vant": "^2.10.6",

バイナリ
src/assets/img/yaoqing.jpg ファイルの表示


+ 1
- 1
src/components/common/MainPageContainer/index.vue ファイルの表示

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

+ 1
- 2
src/pages/Register/index.vue ファイルの表示

@@ -74,7 +74,7 @@ export default {
74 74
     return {
75 75
       Phone: '',
76 76
       Code: '',
77
-      InviteCode: '',
77
+      InviteCode: this.$route.query.code || null,
78 78
       Password: '',
79 79
       DataLock: false,
80 80
       Timer: null,
@@ -100,7 +100,6 @@ export default {
100 100
       'SignIn'
101 101
     ]),
102 102
     Init () { // 初始化
103
-      // this.GetRegPhoneCode({ urlData: { phone: 18267901393 } })
104 103
     },
105 104
     ToReg () { // 去注册
106 105
       if (this.DataLock || !this.IsPhone(this.Phone) || this.Code === '' || this.Password === '') return

+ 26
- 2
src/pages/WoDe/XiaZaiErWeiMa/index.vue ファイルの表示

@@ -1,22 +1,39 @@
1 1
 <template>
2 2
   <div class="Page">
3
-    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="下载二维码">
3
+    <MainPageContainer @UserInfoChange="Init" :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="邀请注册">
4 4
       <div class="PageContainer">
5
-        下载二维码
5
+        <img src="../../../assets/img/yaoqing.jpg" width="100%" alt="">
6
+        <div class="centerLabel">
7
+          <span>您的邀请码为</span>
8
+          <span v-if="UserInfo !== null">{{UserInfo.inviteCode}}</span>
9
+          <span>好友也可在注册时直接填写邀请码</span>
10
+          <div class="QrCode">
11
+            <div>
12
+              <img v-if="QrCodeUrl !== null" :src="QrCodeUrl" class="contain" alt="">
13
+            </div>
14
+          </div>
15
+        </div>
6 16
       </div>
7 17
     </MainPageContainer>
8 18
   </div>
9 19
 </template>
10 20
 
11 21
 <script>
22
+import QRCode from 'qrcode'
12 23
 import MainPageContainer from '../../../components/common/MainPageContainer'
24
+import { createNamespacedHelpers } from 'vuex'
25
+const { mapState: mapUserState } = createNamespacedHelpers('user')
13 26
 export default {
14 27
   name: '',
15 28
   data () {
16 29
     return {
30
+      QrCodeUrl: null
17 31
     }
18 32
   },
19 33
   computed: {
34
+    ...mapUserState({
35
+      UserInfo: x => x.UserInfo
36
+    })
20 37
   },
21 38
   components: {
22 39
     MainPageContainer
@@ -28,6 +45,13 @@ export default {
28 45
     })
29 46
   },
30 47
   methods: {
48
+    Init () {
49
+      QRCode.toDataURL(`https://app.xnsport.cn/#/Register?code=${this.UserInfo.inviteCode}`).then((res) => {
50
+        this.QrCodeUrl = res
51
+      }).catch((res) => {
52
+        console.log(res)
53
+      })
54
+    }
31 55
   }
32 56
 }
33 57
 </script>

+ 43
- 0
src/pages/WoDe/XiaZaiErWeiMa/page.scss ファイルの表示

@@ -7,5 +7,48 @@
7 7
     width: 100%;
8 8
     height: 100%;
9 9
     position: relative;
10
+    > div {
11
+      z-index: 2;
12
+      width: 70%;
13
+      background: #fff;
14
+      box-shadow: 0 0 0.02rem 0.02rem rgba(0, 0, 0, 0.05);
15
+      border-radius: 0.06rem;
16
+      padding: 0.15rem;
17
+      > span {
18
+        display: block;
19
+        text-align: center;
20
+        line-height: 1.5;
21
+        margin-top: 0.02rem;
22
+        &:nth-child(1) {
23
+          font-size: 0.16rem;
24
+          font-weight: bold;
25
+        }
26
+        &:nth-child(2) {
27
+          font-size: 0.2rem;
28
+          font-weight: bold;
29
+          color: #ff5100;
30
+        }
31
+        &:nth-child(3) {
32
+          font-size: 0.12rem;
33
+          color: #999;
34
+        }
35
+      }
36
+      > .QrCode {
37
+        border-top: 0.01rem dashed #ccc;
38
+        margin-top: 0.15rem;
39
+        padding-bottom: 100%;
40
+        position: relative;
41
+        overflow: hidden;
42
+        height: 0;
43
+        > div {
44
+          width: 50%;
45
+          position: absolute;
46
+          left: 25%;
47
+          top: 25%;
48
+          bottom: 25%;
49
+          overflow: hidden;
50
+        }
51
+      }
52
+    }
10 53
   }
11 54
 }

+ 25
- 2
src/pages/index/DaLeTouDingDan/index.vue ファイルの表示

@@ -57,6 +57,18 @@
57 57
 
58 58
         <div class="Layer" v-if="ShowStore">
59 59
           <div class="centerLabel">
60
+            <span v-if="MyStoreList.length">我的店铺:</span>
61
+            <ul v-if="MyStoreList.length">
62
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
63
+                <div class="flex-item">
64
+                  <div>
65
+                    <span>{{item.name}}</span>
66
+                  </div>
67
+                </div>
68
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
69
+                <i class="iconfont iconyigouxuan active" v-else></i>
70
+              </li>
71
+            </ul>
60 72
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
61 73
             <ul v-if="RecommendStoreList.length">
62 74
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
@@ -102,6 +114,7 @@ export default {
102 114
   name: '',
103 115
   data () {
104 116
     return {
117
+      MyStoreList: [], // 我的店铺
105 118
       CurrentStoreName: null, // 当前选择店铺名称
106 119
       CurrentStoreId: null, // 当前选择店铺id
107 120
       RecommendStoreList: [], // 推荐店铺列表
@@ -135,6 +148,17 @@ export default {
135 148
     }).then((res) => {
136 149
       this.StoreList = res.data.data.nearest || []
137 150
       this.RecommendStoreList = res.data.data.recommend || []
151
+      this.MyStoreList = res.data.data.mine || []
152
+      if (this.MyStoreList.length) {
153
+        this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
154
+        this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
155
+      } else if (this.RecommendStoreList.length) {
156
+        this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
157
+        this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
158
+      } else if (this.StoreList.length) {
159
+        this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
160
+        this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
161
+      }
138 162
     })
139 163
   },
140 164
   mounted () {
@@ -198,8 +222,7 @@ export default {
198 222
         this.TotalPrize = 0
199 223
         this.Multiple = 1
200 224
         this.DataLock = false
201
-        // window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${`www.baidu.com`}`
202
-        window.js2native.openPay('1', { ...res.data.data })
225
+        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}`
203 226
       }).catch((res) => {
204 227
         this.Toast(res.data.message)
205 228
         this.DataLock = false

+ 62
- 0
src/pages/index/DingDanZhiFuZhuangTai/index.vue ファイルの表示

@@ -0,0 +1,62 @@
1
+<template>
2
+  <div class="Page">
3
+    <MainPageContainer :ShowMainHeader="true" :ShowMainHeaderBack="true" MainHeaderTitle="订单状态">
4
+      <div class="PageContainer">
5
+        <div class="centerLabel">
6
+          <i class="iconfont iconshibai" v-if="OrderStatus === 'Error'"></i>
7
+          <span v-if="OrderStatus === 'Error'">支付失败</span>
8
+          <i class="iconfont iconchenggong active" v-if="OrderStatus === 'Success'"></i>
9
+          <span v-if="OrderStatus === 'Success'">支付成功</span>
10
+          <a v-if="OrderStatus === 'Error'" :href="`/api/app/order/alipay/buylottery?orderId=${$route.query.id}&returlURL=${LocationOrigin}&token=${Jwt}`">重新支付</a>
11
+          <router-link :to="{ name: 'index' }">返回首页</router-link>
12
+          <a @click="$router.go(-1)">继续投注</a>
13
+        </div>
14
+      </div>
15
+    </MainPageContainer>
16
+  </div>
17
+</template>
18
+
19
+<script>
20
+import MainPageContainer from '../../../components/common/MainPageContainer'
21
+import { createNamespacedHelpers } from 'vuex'
22
+const { mapActions: mapUserActions } = createNamespacedHelpers('user')
23
+export default {
24
+  name: 'index',
25
+  data () {
26
+    return {
27
+      OrderStatus: null,
28
+      LocationOrigin: encodeURIComponent(`${window.location.origin}/#/index/DingDanZhiFuZhuangTai?orderId=${this.$route.query.id}`),
29
+      Jwt: window.localStorage.Jwt
30
+    }
31
+  },
32
+  computed: {
33
+  },
34
+  components: {
35
+    MainPageContainer
36
+  },
37
+  created () {
38
+    this.Init()
39
+  },
40
+  mounted () {
41
+    this.$nextTick(() => {
42
+    })
43
+  },
44
+  methods: {
45
+    ...mapUserActions([
46
+      'GetAliPayStatus'
47
+    ]),
48
+    Init () { // 初始化
49
+      if (this.$route.query.id !== undefined) {
50
+        this.GetAliPayStatus({ urlData: { id: this.$route.query.id } }).then((res) => {
51
+          this.OrderStatus = res.data.data === 1 ? 'Success' : 'Error'
52
+        })
53
+      }
54
+    }
55
+  }
56
+}
57
+</script>
58
+
59
+<!-- Add "scoped" attribute to limit CSS to this component only -->
60
+<style lang="scss" scoped>
61
+@import "page.scss";
62
+</style>

+ 43
- 0
src/pages/index/DingDanZhiFuZhuangTai/page.scss ファイルの表示

@@ -0,0 +1,43 @@
1
+.Page {
2
+  width: 100%;
3
+  height: 100%;
4
+  position: relative;
5
+  overflow: hidden;
6
+  .PageContainer {
7
+    width: 100%;
8
+    height: 100%;
9
+    position: relative;
10
+    overflow: hidden;
11
+    > div {
12
+      width: 100%;
13
+      text-align: center;
14
+      > i {
15
+        font-size: 1rem;
16
+        color: #f10404;
17
+        &.active {
18
+          color: #39ce09;
19
+        }
20
+      }
21
+      > span {
22
+        display: block;
23
+        text-align: center;
24
+        font-size: 0.14rem;
25
+        line-height: 0.2rem;
26
+        margin-top: 0.2rem;
27
+        + a {
28
+          margin-top: 0.4rem;
29
+        }
30
+      }
31
+      > a {
32
+        width: 80%;
33
+        display: block;
34
+        font-size: 0.14rem;
35
+        color: #fff;
36
+        line-height: 0.4rem;
37
+        border-radius: 0.06rem;
38
+        background: #ff5100;
39
+        margin: 0.2rem auto 0;
40
+      }
41
+    }
42
+  }
43
+}

+ 30
- 1
src/pages/index/LanQiuDingDan/index.vue ファイルの表示

@@ -75,6 +75,18 @@
75 75
 
76 76
         <div class="Layer" v-if="ShowStore">
77 77
           <div class="centerLabel">
78
+            <span v-if="MyStoreList.length">我的店铺:</span>
79
+            <ul v-if="MyStoreList.length">
80
+              <li v-for="(item, index) in MyStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
81
+                <div class="flex-item">
82
+                  <div>
83
+                    <span>{{item.name}}</span>
84
+                  </div>
85
+                </div>
86
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
87
+                <i class="iconfont iconyigouxuan active" v-else></i>
88
+              </li>
89
+            </ul>
78 90
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
79 91
             <ul v-if="RecommendStoreList.length">
80 92
               <li v-for="(item, index) in RecommendStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
@@ -122,6 +134,7 @@ export default {
122 134
   name: '',
123 135
   data () {
124 136
     return {
137
+      MyStoreList: [],
125 138
       PriceArr: [0, 0], // 奖金区间
126 139
       AllParts: [], // 投注生成结果
127 140
       CurrentPassUnitNum: 0,
@@ -172,7 +185,6 @@ export default {
172 185
     ]),
173 186
     Init () { // 初始化
174 187
       this.PageList = [...this.LanQiuCart] // 赋值页面数据
175
-      console.log(this.PageList)
176 188
       this.ToGetStoreList() // 获取店铺列表
177 189
       if (this.$route.query.type === 'single') { // 单关
178 190
         this.CurrentPassCode = '1*1'
@@ -219,6 +231,7 @@ export default {
219 231
         this.TotalPrice = 0
220 232
         this.Multiple = 1
221 233
         this.DataLock = false
234
+        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}`
222 235
       }).catch((res) => {
223 236
         this.Toast(res.data.message)
224 237
         this.DataLock = false
@@ -233,6 +246,7 @@ export default {
233 246
       }).then((res) => {
234 247
         let StoreList = res.data.data.nearest || []
235 248
         let RecommendStoreList = res.data.data.recommend || []
249
+        let MyStoreList = res.data.data.mine || []
236 250
         StoreList.map((item) => {
237 251
           if (item.status - 0 === 1) {
238 252
             this.StoreList.push(item)
@@ -243,6 +257,21 @@ export default {
243 257
             this.RecommendStoreList.push(item)
244 258
           }
245 259
         })
260
+        MyStoreList.map((item) => {
261
+          if (item.status - 0 === 1) {
262
+            this.MyStoreList.push(item)
263
+          }
264
+        })
265
+        if (this.MyStoreList.length) {
266
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
267
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
268
+        } else if (this.RecommendStoreList.length) {
269
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
270
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
271
+        } else if (this.StoreList.length) {
272
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
273
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
274
+        }
246 275
       })
247 276
     },
248 277
     ToGetAllParts () { // 枚举投注

+ 25
- 0
src/pages/index/PaiLie3DingDan/index.vue ファイルの表示

@@ -103,6 +103,18 @@
103 103
 
104 104
         <div class="Layer" v-if="ShowStore">
105 105
           <div class="centerLabel">
106
+            <span v-if="MyStoreList.length">我的店铺:</span>
107
+            <ul v-if="MyStoreList.length">
108
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
109
+                <div class="flex-item">
110
+                  <div>
111
+                    <span>{{item.name}}</span>
112
+                  </div>
113
+                </div>
114
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
115
+                <i class="iconfont iconyigouxuan active" v-else></i>
116
+              </li>
117
+            </ul>
106 118
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
107 119
             <ul v-if="RecommendStoreList.length">
108 120
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
@@ -147,6 +159,7 @@ export default {
147 159
   name: '',
148 160
   data () {
149 161
     return {
162
+      MyStoreList: [],
150 163
       CurrentStoreName: null, // 当前选择店铺名称
151 164
       CurrentStoreId: null, // 当前选择店铺id
152 165
       RecommendStoreList: [], // 推荐店铺列表
@@ -194,6 +207,17 @@ export default {
194 207
       }).then((res) => {
195 208
         this.StoreList = res.data.data.nearest || []
196 209
         this.RecommendStoreList = res.data.data.recommend || []
210
+        this.MyStoreList = res.data.data.mine || []
211
+        if (this.MyStoreList.length) {
212
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
213
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
214
+        } else if (this.RecommendStoreList.length) {
215
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
216
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
217
+        } else if (this.StoreList.length) {
218
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
219
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
220
+        }
197 221
       })
198 222
     },
199 223
     ReturnType (type) { // 投注类型返回值
@@ -265,6 +289,7 @@ export default {
265 289
         this.TotalPrize = 0
266 290
         this.Multiple = 1
267 291
         this.DataLock = false
292
+        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}`
268 293
       }).catch((res) => {
269 294
         this.Toast(res.data.message)
270 295
         this.DataLock = false

+ 25
- 0
src/pages/index/PaiLie5DingDan/index.vue ファイルの表示

@@ -94,6 +94,18 @@
94 94
 
95 95
         <div class="Layer" v-if="ShowStore">
96 96
           <div class="centerLabel">
97
+            <span v-if="MyStoreList.length">我的店铺:</span>
98
+            <ul v-if="MyStoreList.length">
99
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
100
+                <div class="flex-item">
101
+                  <div>
102
+                    <span>{{item.name}}</span>
103
+                  </div>
104
+                </div>
105
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
106
+                <i class="iconfont iconyigouxuan active" v-else></i>
107
+              </li>
108
+            </ul>
97 109
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
98 110
             <ul v-if="RecommendStoreList.length">
99 111
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
@@ -138,6 +150,7 @@ export default {
138 150
   name: '',
139 151
   data () {
140 152
     return {
153
+      MyStoreList: [],
141 154
       CurrentStoreName: null, // 当前选择店铺名称
142 155
       CurrentStoreId: null, // 当前选择店铺id
143 156
       RecommendStoreList: [], // 推荐店铺列表
@@ -193,6 +206,17 @@ export default {
193 206
       }).then((res) => {
194 207
         this.StoreList = res.data.data.nearest || []
195 208
         this.RecommendStoreList = res.data.data.recommend || []
209
+        this.MyStoreList = res.data.data.mine || []
210
+        if (this.MyStoreList.length) {
211
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
212
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
213
+        } else if (this.RecommendStoreList.length) {
214
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
215
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
216
+        } else if (this.StoreList.length) {
217
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
218
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
219
+        }
196 220
       })
197 221
     },
198 222
     ToPostBetting () { // 去下注
@@ -237,6 +261,7 @@ export default {
237 261
         this.TotalPrize = 0
238 262
         this.Multiple = 1
239 263
         this.DataLock = false
264
+        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}`
240 265
       }).catch((res) => {
241 266
         this.Toast(res.data.message)
242 267
         this.DataLock = false

+ 25
- 0
src/pages/index/ShuangSeQiuDingDan/index.vue ファイルの表示

@@ -56,6 +56,18 @@
56 56
 
57 57
         <div class="Layer" v-if="ShowStore">
58 58
           <div class="centerLabel">
59
+            <span v-if="MyStoreList.length">我的店铺:</span>
60
+            <ul v-if="MyStoreList.length">
61
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
62
+                <div class="flex-item">
63
+                  <div>
64
+                    <span>{{item.name}}</span>
65
+                  </div>
66
+                </div>
67
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
68
+                <i class="iconfont iconyigouxuan active" v-else></i>
69
+              </li>
70
+            </ul>
59 71
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
60 72
             <ul v-if="RecommendStoreList.length">
61 73
               <li v-for="(item, index) in RecommendStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
@@ -101,6 +113,7 @@ export default {
101 113
   name: '',
102 114
   data () {
103 115
     return {
116
+      MyStoreList: [],
104 117
       CurrentStoreName: null, // 当前选择店铺名称
105 118
       CurrentStoreId: null, // 当前选择店铺id
106 119
       RecommendStoreList: [], // 推荐店铺列表
@@ -134,6 +147,17 @@ export default {
134 147
     }).then((res) => {
135 148
       this.StoreList = res.data.data.nearest || []
136 149
       this.RecommendStoreList = res.data.data.recommend || []
150
+      this.MyStoreList = res.data.data.mine || []
151
+      if (this.MyStoreList.length) {
152
+        this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
153
+        this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
154
+      } else if (this.RecommendStoreList.length) {
155
+        this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
156
+        this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
157
+      } else if (this.StoreList.length) {
158
+        this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
159
+        this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
160
+      }
137 161
     })
138 162
   },
139 163
   mounted () {
@@ -188,6 +212,7 @@ export default {
188 212
         this.TotalPrize = 0
189 213
         this.Multiple = 1
190 214
         this.DataLock = false
215
+        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}`
191 216
       }).catch((res) => {
192 217
         this.Toast(res.data.message)
193 218
         this.DataLock = false

+ 30
- 0
src/pages/index/ZuQiuDingDan/index.vue ファイルの表示

@@ -75,6 +75,18 @@
75 75
 
76 76
         <div class="Layer" v-if="ShowStore">
77 77
           <div class="centerLabel">
78
+            <span v-if="MyStoreList.length">我的店铺:</span>
79
+            <ul v-if="MyStoreList.length">
80
+              <li v-for="(item, index) in MyStoreList" :key="index" v-if="item.status - 0 === 1" class="flex-h" @click="SelectStore(item)">
81
+                <div class="flex-item">
82
+                  <div>
83
+                    <span>{{item.name}}</span>
84
+                  </div>
85
+                </div>
86
+                <i class="iconfont iconweigouxuan" v-if="item.shopId !== CurrentStoreId"></i>
87
+                <i class="iconfont iconyigouxuan active" v-else></i>
88
+              </li>
89
+            </ul>
78 90
             <span v-if="RecommendStoreList.length">推荐店铺:</span>
79 91
             <ul v-if="RecommendStoreList.length">
80 92
               <li v-for="(item, index) in RecommendStoreList" :key="index" class="flex-h" @click="SelectStore(item)">
@@ -122,6 +134,7 @@ export default {
122 134
   name: '',
123 135
   data () {
124 136
     return {
137
+      MyStoreList: [],
125 138
       PriceArr: [0, 0], // 奖金区间
126 139
       AllParts: [], // 投注生成结果
127 140
       CurrentPassUnitNum: 0,
@@ -219,6 +232,7 @@ export default {
219 232
         this.TotalPrice = 0
220 233
         this.Multiple = 1
221 234
         this.DataLock = false
235
+        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}`
222 236
       }).catch((res) => {
223 237
         this.Toast(res.data.message)
224 238
         this.DataLock = false
@@ -233,6 +247,7 @@ export default {
233 247
       }).then((res) => {
234 248
         let StoreList = res.data.data.nearest || []
235 249
         let RecommendStoreList = res.data.data.recommend || []
250
+        let MyStoreList = res.data.data.mine || []
236 251
         StoreList.map((item) => {
237 252
           if (item.status - 0 === 1) {
238 253
             this.StoreList.push(item)
@@ -243,6 +258,21 @@ export default {
243 258
             this.RecommendStoreList.push(item)
244 259
           }
245 260
         })
261
+        MyStoreList.map((item) => {
262
+          if (item.status - 0 === 1) {
263
+            this.MyStoreList.push(item)
264
+          }
265
+        })
266
+        if (this.MyStoreList.length) {
267
+          this.CurrentStoreName = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].name
268
+          this.CurrentStoreId = this.MyStoreList[0].shopId === this.CurrentStoreId ? null : this.MyStoreList[0].shopId
269
+        } else if (this.RecommendStoreList.length) {
270
+          this.CurrentStoreName = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].name
271
+          this.CurrentStoreId = this.RecommendStoreList[0].shopId === this.CurrentStoreId ? null : this.RecommendStoreList[0].shopId
272
+        } else if (this.StoreList.length) {
273
+          this.CurrentStoreName = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].name
274
+          this.CurrentStoreId = this.StoreList[0].shopId === this.CurrentStoreId ? null : this.StoreList[0].shopId
275
+        }
246 276
       })
247 277
     },
248 278
     ToGetAllParts () { // 枚举投注

+ 157
- 45
src/router/index.js ファイルの表示

@@ -1,74 +1,126 @@
1 1
 /* eslint-disable */
2 2
 import Vue from 'vue'
3 3
 import Router from 'vue-router'
4
+import { Indicator } from 'mint-ui'
4 5
 
5 6
 Vue.use(Router)
6 7
 
8
+let RouterLoading = {
9
+  show () { // 加载中显示loading组件
10
+    Indicator.open({ spinnerType: 'fading-circle' }) // 开启loading组件,这里我用的mint-ui
11
+  },
12
+  resolve (resolve) { // 加载完成隐藏loading组件
13
+    return component => {
14
+      setTimeout(() => {
15
+        Indicator.close() // 关闭loading组件
16
+        resolve(component)
17
+      }, 10)
18
+    }
19
+  }
20
+
21
+}
22
+
7 23
 let router = new Router({
8 24
   routes: [{
9 25
     path: '/', // 框架页
10 26
     name: 'sys',
11 27
     redirect: '/index',
12
-    component: resolve => (require(['@/pages/index'], resolve)),
28
+    component: resolve => {
29
+      require(['@/pages/index'], RouterLoading.resolve(resolve))
30
+    },
13 31
     children: [
14 32
       {
15 33
         path: '/index', // 首页
16 34
         name: 'index',
17 35
         redirect: '/index/ShouYe',
18
-        component: resolve => (require(['@/pages/index/index'], resolve)),
36
+        component: resolve => {
37
+          require(['@/pages/index/index'], RouterLoading.resolve(resolve))
38
+        },
19 39
         children: [
20 40
           {
21 41
             path: '/index/ShouYe', // 首页
22 42
             name: 'ShouYe',
23
-            component: resolve => (require(['@/pages/index/ShouYe'], resolve))
43
+            component: resolve => {
44
+              require(['@/pages/index/ShouYe'], RouterLoading.resolve(resolve))
45
+            }
24 46
           }, {
25 47
             path: '/index/ZuQiu', // 足球
26 48
             name: 'ZuQiu',
27
-            component: resolve => (require(['@/pages/index/ZuQiu'], resolve))
49
+            component: resolve => {
50
+              require(['@/pages/index/ZuQiu'], RouterLoading.resolve(resolve))
51
+            }
28 52
           }, {
29 53
             path: '/index/ZuQiuDingDan', // 足球订单
30 54
             name: 'ZuQiuDingDan',
31
-            component: resolve => (require(['@/pages/index/ZuQiuDingDan'], resolve))
55
+            component: resolve => {
56
+              require(['@/pages/index/ZuQiuDingDan'], RouterLoading.resolve(resolve))
57
+            }
32 58
           }, {
33 59
             path: '/index/LanQiu', // 篮球
34 60
             name: 'LanQiu',
35
-            component: resolve => (require(['@/pages/index/LanQiu'], resolve))
61
+            component: resolve => {
62
+              require(['@/pages/index/LanQiu'], RouterLoading.resolve(resolve))
63
+            }
36 64
           }, {
37 65
             path: '/index/LanQiuDingDan', // 篮球订单
38 66
             name: 'LanQiuDingDan',
39
-            component: resolve => (require(['@/pages/index/LanQiuDingDan'], resolve))
67
+            component: resolve => {
68
+              require(['@/pages/index/LanQiuDingDan'], RouterLoading.resolve(resolve))
69
+            }
40 70
           }, {
41 71
             path: '/index/DaLeTou', // 大乐透
42 72
             name: 'DaLeTou',
43
-            component: resolve => (require(['@/pages/index/DaLeTou'], resolve))
73
+            component: resolve => {
74
+              require(['@/pages/index/DaLeTou'], RouterLoading.resolve(resolve))
75
+            }
44 76
           }, {
45 77
             path: '/index/DaLeTouDingDan', // 大乐透订单
46 78
             name: 'DaLeTouDingDan',
47
-            component: resolve => (require(['@/pages/index/DaLeTouDingDan'], resolve))
79
+            component: resolve => {
80
+              require(['@/pages/index/DaLeTouDingDan'], RouterLoading.resolve(resolve))
81
+            }
48 82
           }, {
49 83
             path: '/index/ShuangSeQiu', // 双色球
50 84
             name: 'ShuangSeQiu',
51
-            component: resolve => (require(['@/pages/index/ShuangSeQiu'], resolve))
85
+            component: resolve => {
86
+              require(['@/pages/index/ShuangSeQiu'], RouterLoading.resolve(resolve))
87
+            }
52 88
           }, {
53 89
             path: '/index/ShuangSeQiuDingDan', // 双色球订单
54 90
             name: 'ShuangSeQiuDingDan',
55
-            component: resolve => (require(['@/pages/index/ShuangSeQiuDingDan'], resolve))
91
+            component: resolve => {
92
+              require(['@/pages/index/ShuangSeQiuDingDan'], RouterLoading.resolve(resolve))
93
+            }
56 94
           }, {
57 95
             path: '/index/PaiLie3', // 排列3
58 96
             name: 'PaiLie3',
59
-            component: resolve => (require(['@/pages/index/PaiLie3'], resolve))
97
+            component: resolve => {
98
+              require(['@/pages/index/PaiLie3'], RouterLoading.resolve(resolve))
99
+            }
60 100
           }, {
61 101
             path: '/index/PaiLie3DingDan', // 排列3订单
62 102
             name: 'PaiLie3DingDan',
63
-            component: resolve => (require(['@/pages/index/PaiLie3DingDan'], resolve))
103
+            component: resolve => {
104
+              require(['@/pages/index/PaiLie3DingDan'], RouterLoading.resolve(resolve))
105
+            }
64 106
           }, {
65 107
             path: '/index/PaiLie5', // 排列5
66 108
             name: 'PaiLie5',
67
-            component: resolve => (require(['@/pages/index/PaiLie5'], resolve))
109
+            component: resolve => {
110
+              require(['@/pages/index/PaiLie5'], RouterLoading.resolve(resolve))
111
+            }
68 112
           }, {
69 113
             path: '/index/PaiLie5DingDan', // 排列5订单
70 114
             name: 'PaiLie5DingDan',
71
-            component: resolve => (require(['@/pages/index/PaiLie5DingDan'], resolve))
115
+            component: resolve => {
116
+              require(['@/pages/index/PaiLie5DingDan'], RouterLoading.resolve(resolve))
117
+            }
118
+          }, {
119
+            path: '/index/DingDanZhiFuZhuangTai', // 订单支付状态
120
+            name: 'DingDanZhiFuZhuangTai',
121
+            component: resolve => {
122
+              require(['@/pages/index/DingDanZhiFuZhuangTai'], RouterLoading.resolve(resolve))
123
+            }
72 124
           }
73 125
         ]
74 126
       },
@@ -76,62 +128,86 @@ let router = new Router({
76 128
         path: '/KaiJiangZhanShi', // 开奖展示
77 129
         name: 'KaiJiangZhanShi',
78 130
         redirect: '/KaiJiangZhanShi/SubIndex',
79
-        component: resolve => (require(['@/pages/KaiJiangZhanShi/index'], resolve)),
131
+        component: resolve => {
132
+          require(['@/pages/KaiJiangZhanShi/index'], RouterLoading.resolve(resolve))
133
+        },
80 134
         children: [
81 135
           {
82 136
             path: '/KaiJiangZhanShi/SubIndex', // 开奖展示-首页
83 137
             name: 'KaiJiangZhanShiSubIndex',
84
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/SubIndex'], resolve))
138
+            component: resolve => {
139
+              require(['@/pages/KaiJiangZhanShi/SubIndex'], RouterLoading.resolve(resolve))
140
+            }
85 141
           },
86 142
           {
87 143
             path: '/KaiJiangZhanShi/ZuQiu', // 开奖展示-足球
88 144
             name: 'KaiJiangZhanShiZuQiu',
89
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/ZuQiu'], resolve))
145
+            component: resolve => {
146
+              require(['@/pages/KaiJiangZhanShi/ZuQiu'], RouterLoading.resolve(resolve))
147
+            }
90 148
           },
91 149
           {
92 150
             path: '/KaiJiangZhanShi/LanQiu', // 开奖展示-篮球
93 151
             name: 'KaiJiangZhanShiLanQiu',
94
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/LanQiu'], resolve))
152
+            component: resolve => {
153
+              require(['@/pages/KaiJiangZhanShi/LanQiu'], RouterLoading.resolve(resolve))
154
+            }
95 155
           },
96 156
           {
97 157
             path: '/KaiJiangZhanShi/ShuangSeQiu', // 开奖展示-双色球
98 158
             name: 'KaiJiangZhanShiShuangSeQiu',
99
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/ShuangSeQiu'], resolve))
159
+            component: resolve => {
160
+              require(['@/pages/KaiJiangZhanShi/ShuangSeQiu'], RouterLoading.resolve(resolve))
161
+            }
100 162
           },
101 163
           {
102 164
             path: '/KaiJiangZhanShi/ShuangSeQiuXiangQing', // 开奖展示-双色球详情
103 165
             name: 'ShuangSeQiuXiangQing',
104
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/ShuangSeQiuXiangQing'], resolve))
166
+            component: resolve => {
167
+              require(['@/pages/KaiJiangZhanShi/ShuangSeQiuXiangQing'], RouterLoading.resolve(resolve))
168
+            }
105 169
           },
106 170
           {
107 171
             path: '/KaiJiangZhanShi/DaLeTou', // 开奖展示-大乐透
108 172
             name: 'KaiJiangZhanShiDaLeTou',
109
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/DaLeTou'], resolve))
173
+            component: resolve => {
174
+              require(['@/pages/KaiJiangZhanShi/DaLeTou'], RouterLoading.resolve(resolve))
175
+            }
110 176
           },
111 177
           {
112 178
             path: '/KaiJiangZhanShi/DaLeTouXiangQing', // 开奖展示-大乐透详情
113 179
             name: 'DaLeTouXiangQing',
114
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/DaLeTouXiangQing'], resolve))
180
+            component: resolve => {
181
+              require(['@/pages/KaiJiangZhanShi/DaLeTouXiangQing'], RouterLoading.resolve(resolve))
182
+            }
115 183
           },
116 184
           {
117 185
             path: '/KaiJiangZhanShi/PaiLie3', // 开奖展示-排列3
118 186
             name: 'KaiJiangZhanShiPaiLie3',
119
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/PaiLie3'], resolve))
187
+            component: resolve => {
188
+              require(['@/pages/KaiJiangZhanShi/PaiLie3'], RouterLoading.resolve(resolve))
189
+            }
120 190
           },
121 191
           {
122 192
             path: '/KaiJiangZhanShi/PaiLie3XiangQing', // 开奖展示-排列3详情
123 193
             name: 'PaiLie3XiangQing',
124
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/PaiLie3XiangQing'], resolve))
194
+            component: resolve => {
195
+              require(['@/pages/KaiJiangZhanShi/PaiLie3XiangQing'], RouterLoading.resolve(resolve))
196
+            }
125 197
           },
126 198
           {
127 199
             path: '/KaiJiangZhanShi/PaiLie5', // 开奖展示-排列5
128 200
             name: 'KaiJiangZhanShiPaiLie5',
129
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/PaiLie5'], resolve))
201
+            component: resolve => {
202
+              require(['@/pages/KaiJiangZhanShi/PaiLie5'], RouterLoading.resolve(resolve))
203
+            }
130 204
           },
131 205
           {
132 206
             path: '/KaiJiangZhanShi/PaiLie5XiangQing', // 开奖展示-排列5详情
133 207
             name: 'PaiLie5XiangQing',
134
-            component: resolve => (require(['@/pages/KaiJiangZhanShi/PaiLie5XiangQing'], resolve))
208
+            component: resolve => {
209
+              require(['@/pages/KaiJiangZhanShi/PaiLie5XiangQing'], RouterLoading.resolve(resolve))
210
+            }
135 211
           }
136 212
         ]
137 213
       },
@@ -139,48 +215,66 @@ let router = new Router({
139 215
         path: '/WoDe', // 我的
140 216
         name: 'WoDe',
141 217
         redirect: '/WoDe/UserCenter',
142
-        component: resolve => (require(['@/pages/WoDe/index'], resolve)),
218
+        component: resolve => {
219
+          require(['@/pages/WoDe/index'], RouterLoading.resolve(resolve))
220
+        },
143 221
         children: [
144 222
           {
145 223
             path: '/WoDe/UserCenter', // 个人中心
146 224
             name: 'UserCenter',
147
-            component: resolve => (require(['@/pages/WoDe/UserCenter'], resolve))
225
+            component: resolve => {
226
+              require(['@/pages/WoDe/UserCenter'], RouterLoading.resolve(resolve))
227
+            }
148 228
           },
149 229
           {
150 230
             path: '/WoDe/WoDeCaiPiao', // 我的彩票
151 231
             name: 'WoDeCaiPiao',
152
-            component: resolve => (require(['@/pages/WoDe/WoDeCaiPiao'], resolve))
232
+            component: resolve => {
233
+              require(['@/pages/WoDe/WoDeCaiPiao'], RouterLoading.resolve(resolve))
234
+            }
153 235
           },
154 236
           {
155 237
             path: '/WoDe/CaiPiaoXiangQing', // 彩票详情
156 238
             name: 'CaiPiaoXiangQing',
157
-            component: resolve => (require(['@/pages/WoDe/CaiPiaoXiangQing'], resolve))
239
+            component: resolve => {
240
+              require(['@/pages/WoDe/CaiPiaoXiangQing'], RouterLoading.resolve(resolve))
241
+            }
158 242
           },
159 243
           {
160 244
             path: '/WoDe/ZhangHaoMingXi', // 账号明细
161 245
             name: 'ZhangHaoMingXi',
162
-            component: resolve => (require(['@/pages/WoDe/ZhangHaoMingXi'], resolve))
246
+            component: resolve => {
247
+              require(['@/pages/WoDe/ZhangHaoMingXi'], RouterLoading.resolve(resolve))
248
+            }
163 249
           },
164 250
           {
165 251
             path: '/WoDe/AnQuanZhongXin', // 安全中心
166 252
             name: 'AnQuanZhongXin',
167 253
             redirect: '/WoDe/AnQuanZhongXin/SubIndex',
168
-            component: resolve => (require(['@/pages/WoDe/AnQuanZhongXin'], resolve)),
254
+            component: resolve => {
255
+              require(['@/pages/WoDe/AnQuanZhongXin'], RouterLoading.resolve(resolve))
256
+            },
169 257
             children: [
170 258
               {
171 259
                 path: '/WoDe/AnQuanZhongXin/SubIndex', // 安全中心-首页
172 260
                 name: 'ZhangHaoMingXiSubIndex',
173
-                component: resolve => (require(['@/pages/WoDe/AnQuanZhongXin/SubIndex'], resolve))
261
+                component: resolve => {
262
+                  require(['@/pages/WoDe/AnQuanZhongXin/SubIndex'], RouterLoading.resolve(resolve))
263
+                }
174 264
               },
175 265
               {
176 266
                 path: '/WoDe/AnQuanZhongXin/YaoQingZhuCe', // 邀请注册
177 267
                 name: 'YaoQingZhuCe',
178
-                component: resolve => (require(['@/pages/WoDe/AnQuanZhongXin/YaoQingZhuCe'], resolve))
268
+                component: resolve => {
269
+                  require(['@/pages/WoDe/AnQuanZhongXin/YaoQingZhuCe'], RouterLoading.resolve(resolve))
270
+                }
179 271
               },
180 272
               {
181 273
                 path: '/WoDe/AnQuanZhongXin/BangDingShouJi', // 绑定手机
182 274
                 name: 'BangDingShouJi',
183
-                component: resolve => (require(['@/pages/WoDe/AnQuanZhongXin/BangDingShouJi'], resolve))
275
+                component: resolve => {
276
+                  require(['@/pages/WoDe/AnQuanZhongXin/BangDingShouJi'], RouterLoading.resolve(resolve))
277
+                }
184 278
               }
185 279
             ]
186 280
           },
@@ -188,54 +282,72 @@ let router = new Router({
188 282
             path: '/WoDe/GeRenSheZhi', // 个人设置
189 283
             name: 'GeRenSheZhi',
190 284
             redirect: '/WoDe/GeRenSheZhi/SheZhi',
191
-            component: resolve => (require(['@/pages/WoDe/GeRenSheZhi'], resolve)),
285
+            component: resolve => {
286
+              require(['@/pages/WoDe/GeRenSheZhi'], RouterLoading.resolve(resolve))
287
+            },
192 288
             children: [
193 289
               {
194 290
                 path: '/WoDe/GeRenSheZhi/SheZhi', // 设置
195 291
                 name: 'SheZhi',
196
-                component: resolve => (require(['@/pages/WoDe/GeRenSheZhi/SheZhi'], resolve))
292
+                component: resolve => {
293
+                  require(['@/pages/WoDe/GeRenSheZhi/SheZhi'], RouterLoading.resolve(resolve))
294
+                }
197 295
               },
198 296
               {
199 297
                 path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi', // 账户设置
200 298
                 name: 'ZhangHuSheZhi',
201 299
                 redirect: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/UserInfo',
202
-                component: resolve => (require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi'], resolve)),
300
+                component: resolve => {
301
+                  require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi'], RouterLoading.resolve(resolve))
302
+                },
203 303
                 children: [
204 304
                   {
205 305
                     path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/UserInfo', // 用户信息
206 306
                     name: 'UserInfo',
207
-                    component: resolve => (require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/UserInfo'], resolve))
307
+                    component: resolve => {
308
+                      require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/UserInfo'], RouterLoading.resolve(resolve))
309
+                    }
208 310
                   },
209 311
                   {
210 312
                     path: '/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick', // 改修用户昵称
211 313
                     name: 'EditUserNick',
212
-                    component: resolve => (require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick'], resolve))
314
+                    component: resolve => {
315
+                      require(['@/pages/WoDe/GeRenSheZhi/ZhangHuSheZhi/EditUserNick'], RouterLoading.resolve(resolve))
316
+                    }
213 317
                   }
214 318
                 ]
215 319
               },
216 320
               {
217 321
                 path: '/WoDe/GeRenSheZhi/GuanYuWoMen', // 关于我们
218 322
                 name: 'GuanYuWoMen',
219
-                component: resolve => (require(['@/pages/WoDe/GeRenSheZhi/GuanYuWoMen'], resolve))
323
+                component: resolve => {
324
+                  require(['@/pages/WoDe/GeRenSheZhi/GuanYuWoMen'], RouterLoading.resolve(resolve))
325
+                }
220 326
               }
221 327
             ]
222 328
           },
223 329
           {
224 330
             path: '/WoDe/XiaZaiErWeiMa', // 下载二维码
225 331
             name: 'XiaZaiErWeiMa',
226
-            component: resolve => (require(['@/pages/WoDe/XiaZaiErWeiMa'], resolve))
332
+            component: resolve => {
333
+              require(['@/pages/WoDe/XiaZaiErWeiMa'], RouterLoading.resolve(resolve))
334
+            }
227 335
           }
228 336
         ]
229 337
       },
230 338
       {
231 339
         path: '/SignIn', // 登录
232 340
         name: 'SignIn',
233
-        component: resolve => (require(['@/pages/SignIn'], resolve))
341
+        component: resolve => {
342
+          require(['@/pages/SignIn'], RouterLoading.resolve(resolve))
343
+        }
234 344
       },
235 345
       {
236 346
         path: '/Register', // 注册
237 347
         name: 'Register',
238
-        component: resolve => (require(['@/pages/Register'], resolve))
348
+        component: resolve => {
349
+          require(['@/pages/Register'], RouterLoading.resolve(resolve))
350
+        }
239 351
       }
240 352
     ]
241 353
   }]

+ 5
- 0
src/store/user/index.js ファイルの表示

@@ -114,6 +114,11 @@ export default {
114 114
     }
115 115
   },
116 116
   actions: {
117
+    GetAliPayStatus (context, payload) { // 获取支付宝支付结果
118
+      return new Promise((resolve, reject) => {
119
+        ToolClass.Axios(resolve, reject, Api.GetAliPayStatus, context, payload, 1000)
120
+      })
121
+    },
117 122
     CreateAliPayOrder (context, payload) { // 创建支付宝订单
118 123
       return new Promise((resolve, reject) => {
119 124
         ToolClass.Axios(resolve, reject, Api.CreateAliPayOrder, context, payload, 1000)

+ 5
- 1
src/util/Api.js ファイルの表示

@@ -1,5 +1,5 @@
1 1
 
2
-const prefix = process.env.NODE_ENV === 'production' ? '' : '/api'
2
+const prefix = process.env.NODE_ENV === 'production' ? '/api' : '/api'
3 3
 
4 4
 const $api = {
5 5
   CreateAliPayOrder: { // 创建支付宝订单
@@ -77,6 +77,10 @@ const $api = {
77 77
   UpdateUserInfo: { // 更新用户信息
78 78
     method: 'put',
79 79
     url: `${prefix}/app/customer/:id`
80
+  },
81
+  GetAliPayStatus: { // 获取支付宝支付结果
82
+    method: 'get',
83
+    url: `${prefix}/app/order/:id/paystatus`
80 84
   }
81 85
 }
82 86