Merge branch 'main' of http://git.wdklian.com/allen/uni_mattress

sleep/common/App.scss

@@ -27,6 +27,7 @@
 
 html {
   font-size: 16px;
+  height: 100%;
 }
 
 body {
@@ -36,6 +37,7 @@ body {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   background-color: #000000;
+  height: 100%;
 }
 
 view,

sleep/pages/alertSetting/alertSetting.vue

@@ -348,11 +348,13 @@ export default {
     background-image: url('http://wdklmall.oss-cn-shenzhen.aliyuncs.com/mallgoods/goods/3C62AD507C8345D49AEB2AAD8F7584BB.png');
     background-size: 100% 100%;
     background-repeat: no-repeat;
+	height: 100%;
 
     .section_2 {
       padding-bottom: 1.25rem;
       background-image: linear-gradient(180deg, #1e1ef7f2 0%, #1dbff79c 100%);
       backdrop-filter: blur(0.19rem);
+	  height: 100%;
 
       .section_3 {
         padding: 1.13rem 0.44rem 0.38rem;

sleep/pages/home/index.vue

@@ -415,8 +415,11 @@ export default {
 	methods: {
 		handleShareClick() {
 			uni.navigateTo({
-				url: '/pages/shareUser/shareUser'
+				url: '/pages/login/index'
 			})
+			// uni.navigateTo({
+			// 	url: '/pages/shareUser/shareUser'
+			// })
 		},
     API_getDeviceList() {
       const _this = this

sleep/pages/index/index.vue

@@ -181,9 +181,10 @@ export default {
 
 		.music-wrapper {
 			margin-top: 5px;
-			background: #000000;
+			// background: #000000;
 			box-sizing: border-box;
 			padding: 15px;
+			background: linear-gradient(90deg, rgba(86, 17, 247, 0.5) 0%, #4d9efa 100%);
 
 			&:last-of-type {
 				margin-bottom: 0;
@@ -214,9 +215,11 @@ export default {
 	      }
 	      .knowledge-item-title {
 	        opacity: 0.8;
+			line-height: 1.2rem;
 	      }
 	      .knowledge-item-desc {
-	        color: #4d4b5e;
+	        // color: #4d4b5e;
+			color: #ffffff;
 	        font-size: 0.63rem;
 	        font-family: PingFangSC;
 	        line-height: 0.88rem;
@@ -232,6 +235,8 @@ export default {
 	  .knowledge-item {
 		  margin-left: 3px;
 		  margin-bottom: 20px;
+		  padding-bottom: 10px;
+		  border-bottom: 1px solid #676666;
 	  }
 	}
 }

sleep/pages/login/index.vue

@@ -1,9 +1,14 @@
 <template>
 	<view class="login-container">
-		<!-- <image src="../../static/loginBg.png" class="background-img"></image> -->
+		<image src="http://wdklmall.oss-cn-shenzhen.aliyuncs.com/mallgoods/goods/C34A0AB308944EF9A3BB4135827924DF.png" class="background-img"></image>
 		<view class="absolve-wrapper">
 			<!-- <view class="logo"><image src="../../static/logo.png" class="logo-img"></image></view> -->
-			<view class="text-title">我有故事和歌，你听吗？</view>
+			
+			<view class="flex-col items-center group_3 space-y-20">
+			  <text class="text_2 text_3">UU睡眠</text>
+			  <text class="font_1 text_2">AI时代，全家人的睡眠健康顾问</text>
+			</view>
+			
 			<view class="login-main">
 				<view class="input-wrapper">
 					<i class="iconfont icon-phone icon"></i>
@@ -15,7 +20,7 @@
 					<input v-else type="password" placeholder="请输入密码" v-model="userFrom.password" />
 					<i class="iconfont eye" :class="isText ? 'icon-openEye' : 'icon-closeEye'" @click="isText = !isText"></i>
 				</view>
-				<button style="background-image: linear-gradient(45deg, #39b54a, #8dc63f);" class="cu-btn round login-button lg cu-load" :class="{ loading: loading }" @click="getUserInfo">登录</button>
+				<button style="background: linear-gradient(90deg, rgba(44, 37, 247, 0.6) 0%, rgba(6, 21, 153, 1) 100%);" class="cu-btn round login-button lg cu-load" :class="{ loading: loading }" @click="getUserInfo">登录</button>
 
         <button v-if="haslogin.loginType === 'auto'" class="cu-btn round login-button lg cu-load" :class="{ loading: loading }" @click="loginByHasLogin">
           微信快捷登录
@@ -63,7 +68,7 @@ export default {
     this.haslogin = Storage.getItem('haslogin')
     if (!this.haslogin) {
       uni.reLaunch({
-        url:'/pages/auth/auth'
+        // url:'/pages/auth/auth'
       })
       return
     }
@@ -169,6 +174,35 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.icon-password {
+	color: #fff;
+}
+.icon-phone {
+	color: #fff;
+}
+.eye {
+	color: #fff;
+}
+.group_3 {
+	padding: 4rem 0;
+	.text_2 {
+		opacity: 0.76;
+	}
+	.text_3 {
+	    color: #ffffff;
+	    font-size: 1.88rem;
+	    font-family: PingFangSC;
+	    line-height: 1.72rem;
+		margin-top: 1rem;
+	}
+	.font_1 {
+	  font-size: 1.13rem;
+	  font-family: PingFangSC;
+	  line-height: 1.06rem;
+	  color: #ffffff;
+	  margin-top: 4rem;
+	}
+}	
 .login-container {
 	width: 100%;
 	height: 100vh;
@@ -231,8 +265,7 @@ export default {
 		.login-button {
 			width: 100%;
 			color: #fff;
-			background-image: linear-gradient(to right, #ffa6b6, #ff7c93);
-			letter-spacing: 2px;
+			background: linear-gradient(90deg, rgba(5, 96, 232, 1) 0%, rgba(100, 158, 245, 1) 100%);			letter-spacing: 2px;
 			height: 45px;
 			margin-top: 75rpx !important;
 		}