From aa48abc6ac71cfdf47bcc7794e507ee280708509 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 7 Apr 2024 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 34 +++++++++++++++-------------------
 pages/line/line.vue   |  2 +-
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 04865d3..038b184 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,10 +5,14 @@
 		<image class="container-bg" :src="require('@/static/index-bg.png')"></image>
 		<view class="animations" ref="apiAnimateDemo">
 			<view v-for="(item,index) in animations">
-				<gal-css-animate v-if="item.show" :animateName="item.name" :style="{'top':item.class=='logo1'?navBarBoxHeight+'px':''}" :class='item.class' :duration="item.duration"
+				<!-- <gal-css-animate v-if="item.show" :animateName="item.name" :style="{'top':item.class=='logo1'?navBarBoxHeight+'px':''}" :class='item.class' :duration="item.duration"
 					:autoPlay="item.autoplay" timingFunction="ease-in">
 					<image :src="item.content" :style="{'width':item.width,'height':item.height}"></image>
-				</gal-css-animate>
+				</gal-css-animate> -->
+				<view :animateName="item.name" :style="{'top':item.class=='logo1'?navBarBoxHeight+'px':''}" :class='item.class' :duration="item.duration"
+					:autoPlay="item.autoplay" timingFunction="ease-in">
+					<image :src="item.content" :style="{'width':item.width,'height':item.height}"></image>
+				</view>
 			</view>
 		</view>
 
@@ -19,11 +23,13 @@
 					<view class="progress-bar" :style="{'width':progressPercentage+'%'}"></view>
 				</view>
 			</view>
-			<view   @click="toHome">
-				<gal-css-animate v-if="showBtn" :animateName="'wobble'" class="title-btn" :duration="'1s'"
+			<view @click="toHome">
+				<image v-if="showBtn" style="width: 322rpx;height: 211rpx;margin-top:70rpx" :src="require('@/static/index-btn.png')"></image>
+				
+				<!-- <gal-css-animate v-if="showBtn" :animateName="'wobble'" class="title-btn" :duration="'1s'"
 					 timingFunction="ease-in">
 					<image style="width: 322rpx;height: 211rpx;margin-top:70rpx" :src="require('@/static/index-btn.png')"></image>
-				</gal-css-animate>
+				</gal-css-animate> -->
 			</view>
 
 
@@ -52,7 +58,8 @@
 				isShare: false,
 				showBtn:false,
 				navBarBoxHeight:0,
-				animations: [{
+				animations: [
+					{
 						name: 'flipInX',
 						duration: '2s',
 						timer: 1500,
@@ -62,18 +69,7 @@
 						show: false,
 						width: '745rpx',
 						height: '857rpx'
-					}, 
-					// {
-					// 	name: 'fadeIn',
-					// 	duration: '1s',
-					// 	timer: 1000,
-					// 	content: require('../../static/index-icon.png'),
-					// 	autoplay: false,
-					// 	class: 'logo1',
-					// 	show: false,
-					// 	width: '58rpx',
-					// 	height: '86rpx'
-					// },
+					}, 
 					{
 						name: 'zoomIn',
 						duration: '1s',
@@ -90,7 +86,7 @@
 		},
 		async onLoad() {
 			// await this.$onLaunched;
-			this.play(0)
+			// this.play(0)
 			this.start();
 			const MenuButton = uni.getMenuButtonBoundingClientRect()
 			this.navBarBoxHeight = MenuButton.top + MenuButton.height + 10
diff --git a/pages/line/line.vue b/pages/line/line.vue
index c8f9492..b1a2129 100644
--- a/pages/line/line.vue
+++ b/pages/line/line.vue
@@ -73,7 +73,7 @@
 			return {
 				navBarTop: 0,
 				listLine: [],
-				colorList: ['#dbd0ba','#960909'],
+				colorList: ['#dbd0ba','#666d95','#82818e','#6d7c4c'],
 			}
 
 		},