Kaynağa Gözat

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

张延森 4 yıl önce
ebeveyn
işleme
46af094354

+ 27
- 32
package-lock.json Dosyayı Görüntüle

@@ -781,8 +781,7 @@
781 781
     "array-find-index": {
782 782
       "version": "1.0.2",
783 783
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
784
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
785
-      "dev": true
784
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
786 785
     },
787 786
     "array-flatten": {
788 787
       "version": "1.1.1",
@@ -5521,8 +5520,7 @@
5521 5520
         "ansi-regex": {
5522 5521
           "version": "2.1.1",
5523 5522
           "bundled": true,
5524
-          "dev": true,
5525
-          "optional": true
5523
+          "dev": true
5526 5524
         },
5527 5525
         "aproba": {
5528 5526
           "version": "1.2.0",
@@ -5543,14 +5541,12 @@
5543 5541
         "balanced-match": {
5544 5542
           "version": "1.0.0",
5545 5543
           "bundled": true,
5546
-          "dev": true,
5547
-          "optional": true
5544
+          "dev": true
5548 5545
         },
5549 5546
         "brace-expansion": {
5550 5547
           "version": "1.1.11",
5551 5548
           "bundled": true,
5552 5549
           "dev": true,
5553
-          "optional": true,
5554 5550
           "requires": {
5555 5551
             "balanced-match": "^1.0.0",
5556 5552
             "concat-map": "0.0.1"
@@ -5565,20 +5561,17 @@
5565 5561
         "code-point-at": {
5566 5562
           "version": "1.1.0",
5567 5563
           "bundled": true,
5568
-          "dev": true,
5569
-          "optional": true
5564
+          "dev": true
5570 5565
         },
5571 5566
         "concat-map": {
5572 5567
           "version": "0.0.1",
5573 5568
           "bundled": true,
5574
-          "dev": true,
5575
-          "optional": true
5569
+          "dev": true
5576 5570
         },
5577 5571
         "console-control-strings": {
5578 5572
           "version": "1.1.0",
5579 5573
           "bundled": true,
5580
-          "dev": true,
5581
-          "optional": true
5574
+          "dev": true
5582 5575
         },
5583 5576
         "core-util-is": {
5584 5577
           "version": "1.0.2",
@@ -5695,8 +5688,7 @@
5695 5688
         "inherits": {
5696 5689
           "version": "2.0.3",
5697 5690
           "bundled": true,
5698
-          "dev": true,
5699
-          "optional": true
5691
+          "dev": true
5700 5692
         },
5701 5693
         "ini": {
5702 5694
           "version": "1.3.5",
@@ -5708,7 +5700,6 @@
5708 5700
           "version": "1.0.0",
5709 5701
           "bundled": true,
5710 5702
           "dev": true,
5711
-          "optional": true,
5712 5703
           "requires": {
5713 5704
             "number-is-nan": "^1.0.0"
5714 5705
           }
@@ -5723,7 +5714,6 @@
5723 5714
           "version": "3.0.4",
5724 5715
           "bundled": true,
5725 5716
           "dev": true,
5726
-          "optional": true,
5727 5717
           "requires": {
5728 5718
             "brace-expansion": "^1.1.7"
5729 5719
           }
@@ -5731,14 +5721,12 @@
5731 5721
         "minimist": {
5732 5722
           "version": "0.0.8",
5733 5723
           "bundled": true,
5734
-          "dev": true,
5735
-          "optional": true
5724
+          "dev": true
5736 5725
         },
5737 5726
         "minipass": {
5738 5727
           "version": "2.2.4",
5739 5728
           "bundled": true,
5740 5729
           "dev": true,
5741
-          "optional": true,
5742 5730
           "requires": {
5743 5731
             "safe-buffer": "^5.1.1",
5744 5732
             "yallist": "^3.0.0"
@@ -5757,7 +5745,6 @@
5757 5745
           "version": "0.5.1",
5758 5746
           "bundled": true,
5759 5747
           "dev": true,
5760
-          "optional": true,
5761 5748
           "requires": {
5762 5749
             "minimist": "0.0.8"
5763 5750
           }
@@ -5838,8 +5825,7 @@
5838 5825
         "number-is-nan": {
5839 5826
           "version": "1.0.1",
5840 5827
           "bundled": true,
5841
-          "dev": true,
5842
-          "optional": true
5828
+          "dev": true
5843 5829
         },
5844 5830
         "object-assign": {
5845 5831
           "version": "4.1.1",
@@ -5851,7 +5837,6 @@
5851 5837
           "version": "1.4.0",
5852 5838
           "bundled": true,
5853 5839
           "dev": true,
5854
-          "optional": true,
5855 5840
           "requires": {
5856 5841
             "wrappy": "1"
5857 5842
           }
@@ -5937,8 +5922,7 @@
5937 5922
         "safe-buffer": {
5938 5923
           "version": "5.1.1",
5939 5924
           "bundled": true,
5940
-          "dev": true,
5941
-          "optional": true
5925
+          "dev": true
5942 5926
         },
5943 5927
         "safer-buffer": {
5944 5928
           "version": "2.1.2",
@@ -5974,7 +5958,6 @@
5974 5958
           "version": "1.0.2",
5975 5959
           "bundled": true,
5976 5960
           "dev": true,
5977
-          "optional": true,
5978 5961
           "requires": {
5979 5962
             "code-point-at": "^1.0.0",
5980 5963
             "is-fullwidth-code-point": "^1.0.0",
@@ -5994,7 +5977,6 @@
5994 5977
           "version": "3.0.1",
5995 5978
           "bundled": true,
5996 5979
           "dev": true,
5997
-          "optional": true,
5998 5980
           "requires": {
5999 5981
             "ansi-regex": "^2.0.0"
6000 5982
           }
@@ -6038,14 +6020,12 @@
6038 6020
         "wrappy": {
6039 6021
           "version": "1.0.2",
6040 6022
           "bundled": true,
6041
-          "dev": true,
6042
-          "optional": true
6023
+          "dev": true
6043 6024
         },
6044 6025
         "yallist": {
6045 6026
           "version": "3.0.2",
6046 6027
           "bundled": true,
6047
-          "dev": true,
6048
-          "optional": true
6028
+          "dev": true
6049 6029
         }
6050 6030
       }
6051 6031
     },
@@ -8619,6 +8599,16 @@
8619 8599
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
8620 8600
       "dev": true
8621 8601
     },
8602
+    "mint-ui": {
8603
+      "version": "2.2.13",
8604
+      "resolved": "https://registry.npmjs.org/mint-ui/-/mint-ui-2.2.13.tgz",
8605
+      "integrity": "sha512-Xz1SFagHSzKOprwQv3fcekXT5RJvhh939zwZHcWeazk1OJrCjsD4I2qm49AEUCfT1AoYzC+rsZIwGP/J6LwVVw==",
8606
+      "requires": {
8607
+        "array-find-index": "^1.0.2",
8608
+        "raf.js": "0.0.4",
8609
+        "vue-lazyload": "^1.0.1"
8610
+      }
8611
+    },
8622 8612
     "mississippi": {
8623 8613
       "version": "2.0.0",
8624 8614
       "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
@@ -12066,6 +12056,11 @@
12066 12056
       "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
12067 12057
       "dev": true
12068 12058
     },
12059
+    "raf.js": {
12060
+      "version": "0.0.4",
12061
+      "resolved": "https://registry.npmjs.org/raf.js/-/raf.js-0.0.4.tgz",
12062
+      "integrity": "sha1-8Vr0RdJBsn+nExpXRQtn75xAL+w="
12063
+    },
12069 12064
     "randomatic": {
12070 12065
       "version": "3.1.1",
12071 12066
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",

+ 1
- 0
package.json Dosyayı Görüntüle

@@ -18,6 +18,7 @@
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",
21 22
     "qs": "^6.9.4",
22 23
     "script-loader": "^0.7.2",
23 24
     "vant": "^2.10.6",

+ 1
- 1
src/pages/index/DaLeTouDingDan/index.vue Dosyayı Görüntüle

@@ -198,7 +198,7 @@ export default {
198 198
         this.TotalPrize = 0
199 199
         this.Multiple = 1
200 200
         this.DataLock = false
201
-        // window.location.href = `/api/app/order/alipay/buylottery?orderId=${res.data.data.orderId}&returlURL=${encodeURIComponent(`http://www.baidu.com`)}&token=${window.localStorage.Jwt}`
201
+        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}`
202 202
       }).catch((res) => {
203 203
         this.Toast(res.data.message)
204 204
         this.DataLock = false

+ 61
- 0
src/pages/index/DingDanZhiFuZhuangTai/index.vue Dosyayı Görüntüle

@@ -0,0 +1,61 @@
1
+<template>
2
+  <div class="Page">
3
+    <MainPageContainer :ShowMainHeader="true" :ShowMainTabBar="true" MainHeaderTitle="首页" :MainTabBarActiveId="1">
4
+      <div class="PageContainer">
5
+        订单支付状态
6
+      </div>
7
+    </MainPageContainer>
8
+  </div>
9
+</template>
10
+
11
+<script>
12
+import MainPageContainer from '../../../components/common/MainPageContainer'
13
+import { mapState, mapActions, createNamespacedHelpers } from 'vuex'
14
+const { mapState: mapIndexState, mapActions: mapIndexActions, mapMutations: mapIndexMutations } = createNamespacedHelpers('index')
15
+export default {
16
+  name: 'index',
17
+  data () {
18
+    return {
19
+    }
20
+  },
21
+  computed: {
22
+    ...mapState({
23
+      AllLotteryType: x => x.AllLotteryType // 所有彩种类型
24
+    }),
25
+    ...mapIndexState({
26
+      NewstLotteryRes: x => x.NewstLotteryRes // 最新数字彩开奖结果列表
27
+    })
28
+  },
29
+  components: {
30
+    MainPageContainer
31
+  },
32
+  created () {
33
+    this.Init()
34
+  },
35
+  mounted () {
36
+    this.$nextTick(() => {
37
+    })
38
+  },
39
+  methods: {
40
+    ...mapActions([
41
+      'GetAllLotteryType'
42
+    ]),
43
+    ...mapIndexActions([
44
+      'GetBanner',
45
+      'GetLotteryRes',
46
+      'GetNewstLotteryRes'
47
+    ]),
48
+    ...mapIndexMutations([
49
+      'EmptyBanner'
50
+    ]),
51
+    Init () { // 初始化
52
+
53
+    }
54
+  }
55
+}
56
+</script>
57
+
58
+<!-- Add "scoped" attribute to limit CSS to this component only -->
59
+<style lang="scss" scoped>
60
+@import "page.scss";
61
+</style>

+ 12
- 0
src/pages/index/DingDanZhiFuZhuangTai/page.scss Dosyayı Görüntüle

@@ -0,0 +1,12 @@
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
+  }
12
+}

+ 157
- 45
src/router/index.js Dosyayı Görüntüle

@@ -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
   }]