Merge branch 'XK_AD_PAGE_UPDATE20191118' into Development
# Conflicts: # view/10.js # view/13.js # view/14.js # view/15.js # view/16.js # view/18.js # view/19.js # view/20.js # view/21.js # view/22.js # view/23.js # view/3.js # view/38.js # view/39.js # view/48.js # view/7.js # view/8.js # view/9.js # view/app.js # view/index.html
Showing
with
2673 additions
and
315 deletions
This diff is collapsed.
Click to expand it.
src/assets/css/news/down.css
0 → 100644
src/assets/css/news/down.css.map
0 → 100644
src/assets/css/news/down.less
0 → 100644
src/assets/css/news/down.min.css
0 → 100644
src/assets/css/risk/index.css
0 → 100644
src/assets/css/risk/index.css.map
0 → 100644
src/assets/css/risk/index.scss
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/assets/css/special/index.css
0 → 100644
src/assets/css/special/index.css.map
0 → 100644
src/assets/css/special/index.scss
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/assets/images/download/loading.png
0 → 100644

4.35 KB
src/assets/images/download/logo.png
0 → 100644

4.48 KB
src/assets/images/risk/1.gif
0 → 100644

11.2 KB
src/assets/images/risk/1.png
0 → 100644

10.5 KB
src/assets/images/risk/2.png
0 → 100644

11 KB
src/assets/images/risk/3.png
0 → 100644

10.2 KB
src/assets/images/risk/4.png
0 → 100644

10.9 KB
src/assets/images/risk/bg.png
0 → 100644

164 KB
src/assets/images/risk/share.png
0 → 100644

11.7 KB
src/assets/images/special/1.jpg
0 → 100644

4.14 KB
src/assets/images/special/1.png
0 → 100644

41.6 KB
src/assets/images/special/10.jpg
0 → 100644

3.17 KB
src/assets/images/special/11.jpg
0 → 100644

2.96 KB
src/assets/images/special/12.jpg
0 → 100644

3.97 KB
src/assets/images/special/13.jpg
0 → 100644

4.31 KB
src/assets/images/special/14.jpg
0 → 100644

3.74 KB
src/assets/images/special/15.jpg
0 → 100644

3.96 KB
src/assets/images/special/2.jpg
0 → 100644

4.01 KB
src/assets/images/special/2.png
0 → 100644

28.6 KB
src/assets/images/special/3.jpg
0 → 100644

3.55 KB
src/assets/images/special/3.png
0 → 100644

31.4 KB
src/assets/images/special/4.jpg
0 → 100644

4.19 KB
src/assets/images/special/4.png
0 → 100644

23.3 KB
src/assets/images/special/5.jpg
0 → 100644

3.13 KB
src/assets/images/special/5.png
0 → 100644

31.2 KB
src/assets/images/special/6.jpg
0 → 100644

3.85 KB
src/assets/images/special/6.png
0 → 100644

37.1 KB
src/assets/images/special/7.jpg
0 → 100644

3.79 KB
src/assets/images/special/8.jpg
0 → 100644

3.99 KB
src/assets/images/special/9.jpg
0 → 100644

4.18 KB
src/assets/images/special/banner.jpg
0 → 100644

451 KB
src/assets/images/special/bb.png
0 → 100644

5.61 KB
src/assets/images/special/btn.png
0 → 100644

38.2 KB
src/assets/images/special/cc.png
0 → 100644

5.74 KB
src/assets/images/special/mobile.png
0 → 100644

1.35 KB
src/assets/images/special/msg.png
0 → 100644

2.36 KB
src/assets/images/special/v.png
0 → 100644

24 KB
src/assets/images/special/v1.png
0 → 100644

2.08 KB
src/assets/images/special/v2.png
0 → 100644

2.78 KB
src/assets/images/special/v3.png
0 → 100644

2.38 KB
src/assets/images/special/v4.png
0 → 100644

2.42 KB
src/store/modules/download/index.js
0 → 100644
src/store/modules/special/index.js
0 → 100644
src/views/download/Index.vue
0 → 100644
src/views/risk/Index.vue
0 → 100644
src/views/risk/Success.vue
0 → 100644
src/views/special/Index.vue
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
view/49.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
view/50.js
0 → 100644
This diff is collapsed.
Click to expand it.
view/51.js
0 → 100644
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
view/img/1.4c2b0ee0.jpg
0 → 100644

4.14 KB
view/img/1.ebdedfbb.gif
0 → 100644

11.2 KB
view/img/1.ff4c469f.png
0 → 100644

41.6 KB
view/img/13.6657ff15.jpg
0 → 100644

4.31 KB
view/img/2.15966fa4.png
0 → 100644

28.6 KB
view/img/2.df7fef19.jpg
0 → 100644

4.01 KB
view/img/3.92fe1328.png
0 → 100644

31.4 KB
view/img/4.77762d4c.png
0 → 100644

23.3 KB
view/img/4.c1cafdb5.jpg
0 → 100644

4.19 KB
view/img/5.d8656e96.png
0 → 100644

31.2 KB
view/img/6.61b442eb.png
0 → 100644

37.1 KB
view/img/9.46e125c2.jpg
0 → 100644

4.18 KB
view/img/banner.cf5e324b.jpg
0 → 100644

451 KB
view/img/bb.c381dd07.png
0 → 100644

5.61 KB
view/img/bg.03ae2c7b.png
0 → 100644

164 KB
view/img/btn.efa0c9d7.png
0 → 100644

38.2 KB
view/img/cc.7b0884d6.png
0 → 100644

5.74 KB
view/img/loading.39d6dfa5.png
0 → 100644

4.35 KB
view/img/logo.c9d871ad.png
0 → 100644

4.48 KB
view/img/p2.0eb7e15f.jpg
deleted
100644 → 0

431 KB
view/img/p2.449607fa.jpg
0 → 100644

441 KB
view/img/p5.3f5f107e.jpg
deleted
100644 → 0

462 KB
view/img/p5.aed8b6d3.jpg
0 → 100644

615 KB
view/img/share.378ace17.png
0 → 100644

11.7 KB
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment