From f0c19a16ce29ad33b73358cb84b1ed49ec0f0b27 Mon Sep 17 00:00:00 2001
From: scout <1134087124@qq.com>
Date: Sat, 4 May 2024 12:14:58 +0800
Subject: [PATCH] FIXBUG

---
 App.vue                             |  2 ++
 components/page-animation/index.css | 28 ++++++++++++++++++++++
 components/page-animation/index.vue | 37 +++++++++++++++++++++++++++++
 http/interface.js                   |  2 +-
 pages/index/index.vue               |  7 ++++++
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 components/page-animation/index.css
 create mode 100644 components/page-animation/index.vue

diff --git a/App.vue b/App.vue
index 34ad575..c644317 100644
--- a/App.vue
+++ b/App.vue
@@ -1,5 +1,7 @@
 <script>
+import pageAnimation from './components/page-animation'
 	export default {
+		mixins: [pageAnimation],
 		onLaunch: function() {
 			console.log('App Launch')
 		},
diff --git a/components/page-animation/index.css b/components/page-animation/index.css
new file mode 100644
index 0000000..95f748a
--- /dev/null
+++ b/components/page-animation/index.css
@@ -0,0 +1,28 @@
+/* #ifdef H5 */
+uni-page {
+	opacity: 0;
+}
+
+uni-page.animation-before {
+	/* 在页面上使用 transform 会导致页面内的 fixed 定位渲染为 absolute，需要在动画完成后移除 */
+	transform: translateY(20px);
+}
+
+uni-page.animation-leave {
+	transition: all .3s ease;
+}
+
+uni-page.animation-enter {
+	transition: all .3s ease;
+}
+
+uni-page.animation-show {
+	opacity: 1;
+}
+
+uni-page.animation-after {
+	/* 在页面上使用 transform 会导致页面内的 fixed 定位渲染为 absolute，需要在动画完成后移除 */
+	transform: translateY(0);
+}
+
+/* #endif */
diff --git a/components/page-animation/index.vue b/components/page-animation/index.vue
new file mode 100644
index 0000000..97807ab
--- /dev/null
+++ b/components/page-animation/index.vue
@@ -0,0 +1,37 @@
+<script>
+	import './index.css'
+	export default {
+		// #ifdef H5
+		onLaunch: function() {
+			this.show()
+			this.$router.beforeEach((to, from, next) => {
+				this.hide(next)
+			})
+			this.$router.afterEach(() => {
+				setTimeout(this.show, 50)
+			})
+		},
+		methods: {
+			hide(callback) {
+				const classList = document.querySelector('uni-page').classList
+				classList.add('animation-before', 'animation-leave')
+				classList.remove('animation-show')
+				setTimeout(() => {
+					classList.remove('animation-before', 'animation-leave')
+					callback && callback()
+				}, 300)
+			},
+			show() {
+				const classList = document.querySelector('uni-page').classList
+				classList.add('animation-before')
+				setTimeout(() => {
+					classList.add('animation-enter', 'animation-after', 'animation-show')
+					setTimeout(() => {
+						classList.remove('animation-before', 'animation-after', 'animation-enter')
+					}, 300)
+				}, 20)
+			}
+		},
+		// #endif
+	}
+</script>
diff --git a/http/interface.js b/http/interface.js
index 207a064..cfd0020 100644
--- a/http/interface.js
+++ b/http/interface.js
@@ -4,7 +4,7 @@
  */
 export default {
   config: { 
-    baseUrl: "http://shop-test.szjixun.cn",
+    baseUrl: "https://shop.szjixun.cn",
     // baseUrl: "http://114.218.158.24:9022",
     header: {
       "Content-Type": "application/json;charset=UTF-8",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d4282b8..d5b36f7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -145,6 +145,13 @@ page {
         .name {
           font-size: 16px;
           color: #000000;
+          // 超出一行显示省略号
+          overflow: hidden;
+          text-overflow: ellipsis;
+          display: -webkit-box;
+          -webkit-line-clamp: 1;
+          -webkit-box-orient: vertical;
+
         }
         .intro {
           font-size: 14px;