diff --git a/components/our-loading/loaders/bounce.vue b/components/our-loading/loaders/bounce.vue new file mode 100644 index 0000000..a745339 --- /dev/null +++ b/components/our-loading/loaders/bounce.vue @@ -0,0 +1,66 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/double-bounce.vue b/components/our-loading/loaders/double-bounce.vue new file mode 100644 index 0000000..742d710 --- /dev/null +++ b/components/our-loading/loaders/double-bounce.vue @@ -0,0 +1,61 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/double-cube.vue b/components/our-loading/loaders/double-cube.vue new file mode 100644 index 0000000..dc19c69 --- /dev/null +++ b/components/our-loading/loaders/double-cube.vue @@ -0,0 +1,69 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/double-dot.vue b/components/our-loading/loaders/double-dot.vue new file mode 100644 index 0000000..367af35 --- /dev/null +++ b/components/our-loading/loaders/double-dot.vue @@ -0,0 +1,70 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/loop.vue b/components/our-loading/loaders/loop.vue new file mode 100644 index 0000000..2c4c430 --- /dev/null +++ b/components/our-loading/loaders/loop.vue @@ -0,0 +1,147 @@ + + + + + diff --git a/components/our-loading/loaders/rotate-plane.vue b/components/our-loading/loaders/rotate-plane.vue new file mode 100644 index 0000000..8017afc --- /dev/null +++ b/components/our-loading/loaders/rotate-plane.vue @@ -0,0 +1,46 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/scale-out.vue b/components/our-loading/loaders/scale-out.vue new file mode 100644 index 0000000..708fcf2 --- /dev/null +++ b/components/our-loading/loaders/scale-out.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/loaders/shrink-rect.vue b/components/our-loading/loaders/shrink-rect.vue new file mode 100644 index 0000000..12f1f93 --- /dev/null +++ b/components/our-loading/loaders/shrink-rect.vue @@ -0,0 +1,76 @@ + + + + + \ No newline at end of file diff --git a/components/our-loading/our-loading.vue b/components/our-loading/our-loading.vue new file mode 100644 index 0000000..61dcb8e --- /dev/null +++ b/components/our-loading/our-loading.vue @@ -0,0 +1,131 @@ + + + + + diff --git a/main.js b/main.js index 0f49971..83af2ae 100644 --- a/main.js +++ b/main.js @@ -7,6 +7,9 @@ import uView from '@/uni_modules/uview-ui' import store from '@/store' import request from '@/config/request.js' +import ourLoading from '@/components/our-loading/our-loading.vue' +Vue.component('ourLoading', ourLoading) + Vue.use(uView) Vue.use(request) diff --git a/pages.json b/pages.json index 0717810..5641528 100644 --- a/pages.json +++ b/pages.json @@ -81,13 +81,6 @@ { "navigationBarTitleText" : "" } - }, - { - "path" : "pages/index/indexs/indexs", - "style" : - { - "navigationBarTitleText" : "" - } } ], // "tabBar": { diff --git a/pages/index/index.vue b/pages/index/index.vue index a144667..a21328f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,6 +1,8 @@