From 011a9b2c587d5318572be4caaa73a527d9f3b869 Mon Sep 17 00:00:00 2001
From: Vion <leung@waynetechs.com>
Date: Sat, 22 Jan 2022 15:21:17 +0800
Subject: [PATCH] Page style update

---
 rc-busness/assets/css/global.less        |  2 +-
 rc-busness/assets/css/usermember.less    | 59 +++++++++++-------------
 rc-busness/components/header.vue         | 11 +++--
 rc-busness/pages/index.vue               |  4 +-
 rc-busness/pages/personal/usermember.vue | 21 +++++----
 rc-busness/pages/usersearch/search.vue   |  2 +-
 6 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index 318e01a0..d74a9234 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -289,7 +289,7 @@ img, picture {
 	background: #FFFFFF;
 	box-shadow: 0 0 10px rgba(0, 0, 0, 0.16);
 	border-radius: .25rem;
-	z-index:3;
+	z-index:11;
 	ul{
 		width: 60px;
 		height: 181px;
diff --git a/rc-busness/assets/css/usermember.less b/rc-busness/assets/css/usermember.less
index 5f708efa..1d08b84a 100644
--- a/rc-busness/assets/css/usermember.less
+++ b/rc-busness/assets/css/usermember.less
@@ -73,6 +73,8 @@ ul li ol li em strong i {
       border-bottom: 1px solid #D8D8D8;
       display: flex;
       align-items: center;
+	  padding-left:0;
+	  padding-bottom:0;
       .rc-image{
           height: 100%;
           display: flex;
@@ -106,9 +108,6 @@ ul li ol li em strong i {
 @media screen and (min-width: 769px) {
     
   .rc-main {
-    width: 92%;
-    margin: 0 auto;
-    overflow: hidden;
        .rc-center {
       width: 100%;
       height: 180px;
@@ -160,29 +159,28 @@ ul li ol li em strong i {
  }
 
   .usermember{
-      width: 23%;
-      float: left;
-      height: 160px;
+	  min-width:14.5rem;
+	  max-width:16.75rem;
+	  width:16vw;
+      height: 10rem;
       border: 1px solid #D7D7D7;
-      margin-top: 80px;
-      margin-left: 19px;
+      margin-top: 5rem;
+      margin-left: .75rem;
       .rc-image{
-          float: right;
-    overflow: hidden;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    margin-right:20px;
- 
+		float: right;
+		overflow: hidden;
+		height: 100%;
+		display: flex;
+		align-items: center;
       }
       img{
-          width: 80px;
-          height: 80px;
+          width: 5rem;
+          height: 5rem;
           display: block;
       }
       em{
         font-style: normal;
-        font-size: 20px;
+        font-size: 1.25rem;
         display: block;
        
         font-weight: 500;
@@ -190,22 +188,21 @@ ul li ol li em strong i {
       }
       span{
           color: #999999;
-           font-size: 14px;
+           font-size: .875rem;
          
       }
   }
-  .rc-userorder{
-      width: 60%;
-      height: 100%;
-    display: flex;
-    flex-direction: column;
-       justify-content: center;
-       align-items: flex-start;
-	   padding-left:2.5rem;
-       span{
-           margin-top: 8px;
-       }
-  }
+	.rc-userorder{
+		width: 60%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: flex-start;
+		span{
+			margin-top: .5rem;
+		}
+	}
 }
 
 }
\ No newline at end of file
diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue
index 920562f5..dc5a52c9 100644
--- a/rc-busness/components/header.vue
+++ b/rc-busness/components/header.vue
@@ -346,6 +346,7 @@
 </div>
 </template>
 <script>
+import { mapMutations } from "vuex";
 export default {
   data() {
     return {
@@ -358,13 +359,12 @@ export default {
   },
   mounted() {
 	  //判断用户有无登录显示红点
-	let usernot=JSON.parse(localStorage.getItem("userInfo"));
+	let usernot=this.checkIsLogin();
 	//console.log(usernot);
-	if(usernot==null ||usernot==undefined){
-		console.log(usernot);
-          this.loginornot=true
+	if(usernot){
+		this.loginornot=true
 	}else{
-		 this.loginornot=false
+		this.loginornot=false
 		this.usermessage=usernot;
 	}
 	//debugger;
@@ -390,6 +390,7 @@ export default {
   },
 
   methods: {
+	...mapMutations(["checkIsLogin"]),
 	refreshDesktopNav:function(){
 		RCDL.navigation.currentState=null;
 		RCDL.navigation.rebuild();
diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue
index 6c7ece85..86f85e71 100644
--- a/rc-busness/pages/index.vue
+++ b/rc-busness/pages/index.vue
@@ -1190,7 +1190,7 @@
 				var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce";
 				var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile";
 			if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) {
-				console.log("当前是电脑打开")
+				//console.log("当前是电脑打开")
 				this.stypechange=false;
 				//console.log(this.usertitle)
 
@@ -1206,7 +1206,7 @@
 			}
 			else
 			{
-				console.log("当前是手机打开")
+				//console.log("当前是手机打开")
 				this.showingBanners=this.banners.mobile;
 				this.stypechange=true;
 				this.onemao=true;
diff --git a/rc-busness/pages/personal/usermember.vue b/rc-busness/pages/personal/usermember.vue
index 09d41e13..2de300f1 100644
--- a/rc-busness/pages/personal/usermember.vue
+++ b/rc-busness/pages/personal/usermember.vue
@@ -31,16 +31,17 @@
                  <span>金牌铲屎官</span>
           </div>
       </div>
-
-      <div class="usermember" v-for="(item,index) in newlist" :key="index">
-          <div class="rc-image">
-         <img :src="item.catimage" alt="" />
-         </div>
-         <div class="rc-userorder">
-        <em>{{item.title}}</em>
-          <span>{{item.usereat}}</span>
-          </div>
-      </div>
+		<div class="rc-layout-container">
+			<div class="usermember rc-column" v-for="(item,index) in newlist" :key="index">
+				<div class="rc-image">
+					<img :src="item.catimage" alt="" />
+				</div>
+				<div class="rc-userorder">
+					<em>{{item.title}}</em>
+					<span>{{item.usereat}}</span>
+				</div>
+			</div>
+		</div>
       </div>
         </div>
 		
diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue
index 444087dd..c69c62a7 100644
--- a/rc-busness/pages/usersearch/search.vue
+++ b/rc-busness/pages/usersearch/search.vue
@@ -776,7 +776,7 @@ export default {
     onSearch(e) {
       this.usetmessage(this.activeIndex1, this.value);
     },
-	onCancel() {
+	onCancel(e) {
 		debugger;
 		this.value='';
 	},