diff --git a/.gitignore b/.gitignore index a61968e..c0e638e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ .hbuilderx unpackage dist -node_modules \ No newline at end of file +node_modules + +manifest.json \ No newline at end of file diff --git a/src/components/geek-xd/components/geek-commodity/geek-commodity.vue b/src/components/geek-xd/components/geek-commodity/geek-commodity.vue new file mode 100644 index 0000000..53385d8 --- /dev/null +++ b/src/components/geek-xd/components/geek-commodity/geek-commodity.vue @@ -0,0 +1,127 @@ + + + + + + \ No newline at end of file diff --git a/src/pages_template/components/circle-menu.vue b/src/components/geek-xd/components/geek-menu/geek-menu.vue similarity index 66% rename from src/pages_template/components/circle-menu.vue rename to src/components/geek-xd/components/geek-menu/geek-menu.vue index bc477ee..e172fec 100644 --- a/src/pages_template/components/circle-menu.vue +++ b/src/components/geek-xd/components/geek-menu/geek-menu.vue @@ -1,5 +1,5 @@ - - diff --git a/src/pages_template/pages/comment/index.vue b/src/pages_template/pages/comment/index.vue index 34b856f..55497ce 100644 --- a/src/pages_template/pages/comment/index.vue +++ b/src/pages_template/pages/comment/index.vue @@ -45,7 +45,7 @@ export default { // 跳转到全部回复 toAllReply() { uni.navigateTo({ - url: '/pages/template/comment/reply' + url: '/pages_template/pages/comment/reply' }); }, // 点赞 diff --git a/src/pages_template/pages/index/index.vue b/src/pages_template/pages/index/index.vue deleted file mode 100644 index c6d5e55..0000000 --- a/src/pages_template/pages/index/index.vue +++ /dev/null @@ -1,38 +0,0 @@ - - - - - diff --git a/src/pages_template/pages/login/index2.vue b/src/pages_template/pages/login/index2.vue index cc6f0bb..8e80287 100644 --- a/src/pages_template/pages/login/index2.vue +++ b/src/pages_template/pages/login/index2.vue @@ -36,22 +36,22 @@ - + + :style="'animation-play-state:' + play[0]"> 欢迎使用 校园访客 预约系统 - + 访客登录 - - - + + + { this.page = 'login' }, 1000) }, back() { this.page = 'index' - this.play1 = "paused" - this.play2 = "paused" - this.play3 = "paused" - console.log("index") + this.play[0] = "paused" + this.play[1] = "paused" + this.play[2] = "paused" }, - play() { - this.play2 = "running" + startplay() { + this.play[1] = "running" this.isActive = true; setTimeout(() => { this.isActive = false; }, 300); if (this.isAnimating) { return; } this.isAnimating = false; // 开始动画执行 - this.play1 = "running" + this.play[0] = "running" this.isFixedViewVisible = !this.isFixedViewVisible; let fixedView = this.$refs.fixedView; if (fixedView) fixedView.addEventListener('transitionend', () => { this.isAnimating = false; }, { once: true }); - setTimeout(() => { uni.navigateBack({delta: 1 }); }, 1000) + setTimeout(() => { uni.navigateBack({ delta: 1 }); }, 1000) }, diff --git a/src/pages_template/pages/mallMenu/index1.vue b/src/pages_template/pages/mallMenu/index1.vue index 6e1d7f8..b6d677e 100644 --- a/src/pages_template/pages/mallMenu/index1.vue +++ b/src/pages_template/pages/mallMenu/index1.vue @@ -8,22 +8,24 @@ - - {{item.name}} + + {{ item.name }} - - + + - {{item.name}} + {{ item.name }} - + - {{item1.name}} + {{ item1.name }} @@ -35,172 +37,169 @@ diff --git a/src/pages_template/pages/mallMenu/index2.vue b/src/pages_template/pages/mallMenu/index2.vue index 0418b3b..0cc28a5 100644 --- a/src/pages_template/pages/mallMenu/index2.vue +++ b/src/pages_template/pages/mallMenu/index2.vue @@ -8,22 +8,24 @@ - - {{item.name}} + :scroll-into-view="itemId"> + + {{ item.name }} - + - + - {{item.name}} + {{ item.name }} - + - {{item1.name}} + {{ item1.name }} @@ -33,259 +35,259 @@