!11 2022-1-13 JiaMIn PC导航栏

Merge pull request !11 from Admin/sit-jiamin-v2

rc-busness/assets/css/global.less

@@ -4,6 +4,19 @@ body{
 	line-height: 1.5;
 	color: #666;
 }
+//用户光点
+.rc-screen-reader{
+	width: 0.81rem;
+	height: 0.81rem;
+	border-radius: 50%;
+    position: absolute;
+    background-color: red;
+	top: 16%;
+    left: 66%;
+    display: block;
+    width: 0.37rem;
+    height: 0.37rem;
+}
 img, picture {
     display: block;
     max-width: 100%;

rc-busness/components/header.vue

@@ -41,10 +41,14 @@
 				</div>
 			</a>
 			
-			<a href="userlogin/login" class="rc-md-up rc-btn rc-btn--icon rc-icon ts-login--xs rc-iconography rc-interactive" aria-label="login">
+			<a class="rc-md-up rc-btn rc-btn--icon rc-icon ts-login--xs rc-iconography rc-interactive" aria-label="login" @click="turnlogin">
 				<span class="rc-screen-reader-text">
 					登录
 				</span>
+				 <em class="rc-screen-reader" v-show="loginornot">
+				    
+				 </em>
+				 
 			</a>
 			
 			<!--
@@ -59,7 +63,7 @@
 					translations.feature.headerbar.pin
 				</span>
 	        </a>
-	        <button data-js-trigger="search-bar" onclick='bindTracking(this)' evt-name='页内弹窗' evt-cat='headerBtnClick' evt-val='全文搜索' class="rc-btn rc-btn--icon rc-icon rc-search--xs rc-iconography rc-interactive" aria-label="Search" role="menuitem" data-click-modifier=".rc-hidden">
+	        <button data-js-trigger="search-bar" @click='searchturn' evt-name='页内弹窗' evt-cat='headerBtnClick' evt-val='全文搜索' class="rc-btn rc-btn--icon rc-icon rc-search--xs rc-iconography rc-interactive" aria-label="Search" role="menuitem" data-click-modifier=".rc-hidden">
 	          <span class="rc-screen-reader-text">translations.feature.headerbar.search</span>
 	        </button>
 	      </li>
@@ -375,22 +379,62 @@
 </template>
 <script>
 
+
 export default {
   data() {
     return {
-  headerScroll:false
+  headerScroll:false,
+  loginornot:true,//用户是否登录提示点
+  usermessage:null,//存储用户信息
 
     };
   },
   mounted() {
-	
+	  //判断用户有无登录显示红点
+	let usernot=JSON.parse(localStorage.getItem("userInfo"));
+	console.log(usernot);
+	if(usernot==null ||usernot==undefined){
+		console.log(usernot);
+          this.loginornot=true
+	}else{
+		 this.loginornot=false
+		this.usermessage=usernot;
+	}
+	console.log(this.loginornot);
   },
 
   methods: {
+	  
 	bindTracking: function(){
 		console.log('bindTracking');
+	},
+
+	//
+	//跳转搜索
+	searchturn(){
+     this.$router.push({ name: "usersearch-search",
+					
+					})
+	},
+     //判断有无登录跳转不同页面
+	turnlogin(){
+        if(this.usermessage==null||this.usermessage==undefined){
+			this.$router.push({ name: "userlogin-login",
+			params:{id:12,key:'222'}
+					})
+		}else{
+			this.$router.push({ name: "personal-mypersonal",
+					
+					})
+		}
 	}
  
   },
 };
-</script>
+
+
+</script>
+<style lang="less" scoped>
+@import url("../assets/css/global.less");
+
+</style>

rc-busness/pages/index.vue

@@ -4,7 +4,7 @@
 <div>
 	<!-- Suppose in header end -->
 	<Myheader></Myheader>
-    <tabs></tabs>
+
     <unlogin></unlogin>
 	<!-- Suppose in header end -->
 	<van-swipe :autoplay="3000">
@@ -712,7 +712,6 @@
   import Myheader from "~/components/header.vue";
   import Myfooter from "~/components/rc-footer.vue";
   import unlogin from "~/components/unlogin.vue";
-  import tabs from "@/components/tabs.vue";
   import '@vant/touch-emulator';
   import { userquery,postCourseId,biaomessage,userque,searchchanpin } from "../ajax/getData";
   const settings = require("@/config");
@@ -1087,7 +1086,6 @@ activeInde3:0,
        components:{
     Myheader,
     Myfooter,
-    tabs,
     unlogin,
     // userswiper
      },
@@ -1105,9 +1103,6 @@ vm=this;
       //   }, 500);
     
       // }
-       
-
-  
              this.usermessage= JSON.parse(localStorage.getItem("userInfo"));
            
             if(this.usermessage==null ||this.usermessage==undefined){

rc-busness/pages/personal/discount.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <Myheader></Myheader>
+     <tabs></tabs>
     <div class="rc-main">
       <div class="rc-usermain">
         <div class="rc-header">
@@ -55,7 +56,11 @@
 
 <script>
  import {allConfig,getdraw} from "../../ajax/getData";
+ import tabs from "@/components/tabs.vue";
 export default {
+     middleware: 'metaTitle',
+    // middleware: 'metaTitle',
+  meta: {title: '优惠券'},
   data() {
     return {
       userload: true,
@@ -246,6 +251,7 @@ export default {
   },
   components: {
     Myheader,
+    tabs
   },
 };
 import Myheader from "~/components/header.vue";

rc-busness/pages/personal/mypersonal.vue

@@ -1,6 +1,7 @@
 <template>
 <div>
 <Myheader></Myheader>
+ <tabs></tabs>
 <div class="rc-top"></div>
   <div class="rc-layout-container rc-one-column rc-full-width ts-mypersonal">
     <div class="rc-column">
@@ -137,7 +138,11 @@
 
 <script>
 import Myheader from '~/components/header.vue' 
+import tabs from "@/components/tabs.vue";
 export default {
+     middleware: 'metaTitle',
+    // middleware: 'metaTitle',
+  meta: {title: '个人中心'},
   data() {
     return {
       userlog:false,
@@ -196,6 +201,7 @@ export default {
   },
     components: {
     Myheader,
+      tabs,
   },
   watch:{
 

rc-busness/pages/personal/settlement.vue

@@ -1,11 +1,10 @@
 <template>
   <div>
     <Myheader></Myheader>
- <div class="online" style="height:3px;width:93%;background:#DDDDDD;margin:0 auto"></div>
-    <div class="rc-header">
+     <tabs></tabs>
+ <div class="online"></div>
       <div class="rc-main"  v-for="(item,index) in goldmedal" :key="index" >
         <div class="rc-border"></div>
- 
         <div
           class="mypersonal"
           v-for="(dataaddress, index) in useraddress"
@@ -91,7 +90,7 @@
 
         </div>
       </div>
-    </div>
+ 
     <div class="rc-button">
         <div class="rc-left">
             <span>总计：</span>
@@ -105,8 +104,11 @@
 
 <script>
 import Myheader from "~/components/header.vue";
-  import { userin} from "../../ajax/getData";
+  import {userin} from "../../ajax/getData";
+  import tabs from "@/components/tabs.vue";
 export default {
+     middleware: 'metaTitle',
+  meta: {title: '订单结算'},
   data() {
     return {
       goldmedal:[],
@@ -164,7 +166,7 @@ export default {
   },
   methods: {
 jiesuan(){
-   let userdata=this.$route.query.wxdata
+  //  let userdata=this.$route.query.wxdata
         this.$router.push({
         path: "/personal/userpay",
            query: {
@@ -189,6 +191,7 @@ jiesuan(){
   },
   components: {
     Myheader,
+    tabs
   },
 };
 </script>

rc-busness/pages/userlogin/login.vue

@@ -183,7 +183,9 @@ export default {
   },
 
   components: {},
-  mounted() {},
+  mounted() {
+    console.log(this.$route.params);
+  },
   // watch: function () {
   //   console.log(this.inRank);
   // },