hjr 4 mesiacov pred
rodič
commit
8e6c76b882

+ 12 - 5
pages/tools/shengBoChuChen.vue

@@ -7,7 +7,7 @@
 			<view class="text-62 mgt-10">{{ statusNum }}%</view>
 			<view class="text-36 text-500 mgy-30">正在声波初尘中...</view>
 			<view class="text-24 text-555 mgb-80">手机音量调到最大,可以获得最后的除尘效果</view>
-			<view class="btn_s w-300" @click="handleClick">{{ open? '除尘结束':'开始除尘' }}</view>
+			<view class="btn_s w-300" @click="handleClick">{{ open? '结束除尘':'开始除尘' }}</view>
 		</view>
 	</view>
 </template>
@@ -20,8 +20,11 @@ const open = ref(false)
 const statusNum = ref(0)
 var timer = null
 const handleClick = () =>{
-	if(open.value) return
-	open.value = !open.value
+	if(!open.value){
+		open.value = true
+	}else{
+		return
+	}
 	if(open.value){
 		timer = setInterval(() => {
 			if(statusNum.value < 100){
@@ -29,10 +32,14 @@ const handleClick = () =>{
 				statusNum.value += statusNum.value + num > 100 ? 1 : num
 			}else{
 				clearInterval(timer)
+				open.value = false
+				statusNum.value = 0
+				timer = null
+				uni.showToast({
+					title:'除尘结束'
+				})
 			}
 		}, 30)
-	}else{
-		statusNum.value = 0
 	}
 }
 </script>

+ 1 - 1
pages/tools/shouJiQingLi.vue

@@ -36,7 +36,7 @@
 			</view>
 		</view>
 		<view class="w bg-white h-320 mgt-80 radio-30 pd-20">
-			<view v-for="(i,key) in info" class="bg-eee h-80 radio-20 mgb-20 flex jc_between pdx-20 pdy-20">
+			<view v-for="(i,key) in info" class="bg-eee h-80 radio-20 mgb-20 flex jc_between ai_center pdx-20">
 				<view>
 					<i v-if="key == '剩余内存'" style="color: #42aa87;" class="fas fa-rocket"></i>
 					<i v-else-if="key == '总计内存'" style="color: #42aa87;" class="fas fa-file"></i>

+ 20 - 13
pages/toolsMall/index.vue

@@ -11,11 +11,18 @@
 				{{ item.title }}
 			</view>
 			<view class="itemBox">
-				<view class="item" 
+				<view class="item p-rel" 
 				:style="{ background:`linear-gradient(to bottom, ${items.bg}, #fff)`, }"
 				v-for="(items,indexs) in item.list">
 					<view class="icon">
-						
+						<!-- <image class="w-100 h-100 p-abs left-20 radio-10"
+						style="top: -14rpx;" src="../../static/logo.png"></image> -->
+						 <i :class="`fas ${items.icon} p-abs left-20 radio-10`" 
+						 :style="`font-size: 46px;color:${ items.color };top:-7px;`"></i>
+					</view>
+					<view class="shadow p-abs bottom-90 left-10 w-60"
+						:style="`box-shadow: 15px 15px 15px 2px ${items.color}90;height: 2px;border-radius: 30rpx;`"
+					>
 					</view>
 					<view class="name"
 					:style="{ color:`${items.color}`, }">
@@ -39,27 +46,27 @@
 		{
 			title:'基础功能',
 			list:[
-				{name:'一键省电',icon:'',bg:'#cfffcd',color:'#60b956',path:'yiJianShengDian'},
-				{name:'声波除尘',icon:'',bg:'#ffd8db',color:'#fb5e53',path:'shengBoChuChen'},
-				{name:'网络信息',icon:'',bg:'#ccccfe',color:'#8370ee',path:'wangLuoXinXi'},
-				{name:'手机测距',icon:'',bg:'#80fafb',color:'#02cfdf',path:'shouJiCeJu'},
-				{name:'WiFi管理',icon:'',bg:'#9ed1fe',color:'#3d9aee',path:'wifiGuanLi'},
-				{name:'手机清理',icon:'',bg:'#fad2ec',color:'#ff4bb9',path:'shouJiQingLi'},
-				{name:'精选壁纸',icon:'',bg:'#fec2f8',color:'#c95884',path:'jingXuanBiZhi'},
+				{name:'一键省电',icon:'fa-battery',bg:'#cfffcd',color:'#60b956',path:'yiJianShengDian'},
+				{name:'声波除尘',icon:'fa-volume-control-phone',bg:'#ffd8db',color:'#fb5e53',path:'shengBoChuChen'},
+				{name:'网络信息',icon:'fa-rss-square',bg:'#ccccfe',color:'#8370ee',path:'wangLuoXinXi'},
+				{name:'手机测距',icon:'fa-hard-of-hearing',bg:'#80fafb',color:'#02cfdf',path:'shouJiCeJu'},
+				{name:'WiFi管理',icon:'fa-wifi',bg:'#9ed1fe',color:'#3d9aee',path:'wifiGuanLi'},
+				{name:'手机清理',icon:'fa-rocket',bg:'#fad2ec',color:'#ff4bb9',path:'shouJiQingLi'},
+				{name:'精选壁纸',icon:'fa-image',bg:'#fec2f8',color:'#c95884',path:'jingXuanBiZhi'},
 			],
 		},
 		{
 			title:'趣味测评',
 			list:[
-				{name:'趣味测评',icon:'',bg:'#e8ffc4',color:'#98ec05',path:'quWeiCePing'},
+				{name:'趣味测评',icon:'fa-search',bg:'#e8ffc4',color:'#98ec05',path:'quWeiCePing'},
 			],
 		},
 		{
 			title:'知识课堂',
 			list:[
-				{name:'养生课堂',icon:'',bg:'#fdd1c0',color:'#fc7f43',path:'yangShengKeTang'},
-				{name:'运动计步',icon:'',bg:'#9ce4fd',color:'#3d9afb',path:'yunDongJiBu'},
-				{name:'字体大小',icon:'',bg:'#edcbfd',color:'#d617d1',path:'ziTiDaXiao'},
+				{name:'养生课堂',icon:'fa-wheelchair',bg:'#fdd1c0',color:'#fc7f43',path:'yangShengKeTang'},
+				{name:'运动计步',icon:'fa-wheelchair-alt',bg:'#9ce4fd',color:'#3d9afb',path:'yunDongJiBu'},
+				{name:'字体大小',icon:'fa-text-width',bg:'#edcbfd',color:'#d617d1',path:'ziTiDaXiao'},
 			],
 		}
 	])