6.16

components/navBar/navBar.vue

@@ -19,7 +19,7 @@
          <up-icon name="search" size="26" color="#999" @click="search"></up-icon>
       </view>
       <up--image
-        :src="headImg"
+        :src="userHeadImg"
 		@click="goMy"
         mode="widthFix"
         width="62rpx"
@@ -34,6 +34,9 @@
 import { ref, watch} from "vue";
 import headImg from "@/static/headImg.png";
 import logoImg from "@/static/logo.png";
+import navTo  from "@/utils/navTo.js";
+import { onShow,onLoad } from "@dcloudio/uni-app";
+const userHeadImg = ref('');
 const keyWord = ref('');
 const  props=defineProps({
    searchWord:{
@@ -64,17 +67,17 @@ watch(()=>props.searchWord,(newVal)=>{
   keyWord.value=newVal
 })
 const goMy=()=>{
-	uni.navigateTo({
+	navTo({
 		url:'/pages/my/my'
 	})
 }
 const search=()=>{
 	if(props.type=='home'){
-		uni.navigateTo({
+		navTo({
 		  url: `/pages/search/search?keyWord=${keyWord.value}`,
 		});
 	}else if(props.type=='caseTalk'){
-		uni.navigateTo({
+		navTo({
 		  url: `/pages/specialList/specialList?keyWord=${keyWord.value}`,
 		});
 	}
@@ -87,6 +90,16 @@ const search=()=>{
 
  
 }
+onLoad(()=>{
+  let userInfo = uni.getStorageSync('userInfo');
+  if(userInfo && userInfo.avatar){
+    userHeadImg.value=userInfo.avatar
+  }else{
+    userHeadImg.value=headImg;
+  }
+
+
+})
 </script>
 
 <style lang="scss" scoped>

components/navBarSearch/navBarSearch.vue

@@ -37,7 +37,10 @@
 import { ref, watch,defineEmits} from "vue";
 import headImg from "@/static/headImg.png";
 import logoImg from "@/static/logo.png";
+import { onShow,onLoad } from "@dcloudio/uni-app";
+import navTo  from "@/utils/navTo.js";
 const keyWord = ref('');
+const userHeadImg = ref('');
 const  props=defineProps({
    searchWord:{
     type:String,
@@ -69,7 +72,7 @@ watch(()=>props.searchWord,(newVal)=>{
 })
 const emit = defineEmits(['changeWord'])
 const goMy=()=>{
-	uni.navigateTo({
+	navTo({
 		url:'/pages/my/my'
 	})
 }
@@ -79,6 +82,16 @@ const goBack = () => {
     delta: 1,
   });
 };
+onLoad(()=>{
+  let userInfo = uni.getStorageSync('userInfo');
+  if(userInfo && userInfo.avatar){
+    userHeadImg.value=userInfo.avatar
+  }else{
+    userHeadImg.value=headImg;
+  }
+
+
+})
 const search=()=>{
   // if (!keyWord.value) {
   //     return uni.showToast({
@@ -87,7 +100,7 @@ const search=()=>{
   //     });
   // }
  emit('changeWord',keyWord.value)
-  // uni.navigateTo({
+  // navTo({
   //   url: `/pages/search/search?keyWord=${keyWord.value}`,
   // });
 }

components/tabBar/tabBar.vue

@@ -1,26 +1,29 @@
 <template>
-  <up-tabbar
+  
+    <up-tabbar
+    class="u-page"
     :value="value"
     :fixed="true"
     :zIndex="99"
-    :placeholder="true"
+    :placeholder="false"
     activeColor="#3CC7C0"
-    :safeAreaInsetBottom="true"
+    :safeAreaInsetBottom="false"
   >
-    <up-tabbar-item text="临床病例库"  @click="handleClick">
-         <image
+    <up-tabbar-item text="临床病例库"  @click="handleClick" :activeIcon="ku_on" :inactiveIcon="ku">
+      <!-- <view class="aa"  slot="active-icon">222</view> -->
+         <!-- <image
       class="u-page__item__slot-icon"
       slot="active-icon"
-      :src="ku_on"
-    ></image>
-     <image
+      src="https://www4.bing.com//th?id=OHR.RheaDad_ZH-CN6706868651_1920x1080.jpg&rf=LaDigue_1920x1080.jpg&pid=hp"
+    ></image> -->
+     <!-- <image
       class="u-page__item__slot-icon"
       slot="inactive-icon"
        :src="ku"
-    ></image>
+    ></image> -->
     </up-tabbar-item>
-    <up-tabbar-item text="互动病例"  @click="handleClick">
-        <image
+    <up-tabbar-item text="互动病例" :activeIcon="group_on" :inactiveIcon="group"  @click="handleClick">
+        <!-- <image
       class="u-page__item__slot-icon"
       slot="active-icon"
       :src="group_on"
@@ -29,10 +32,10 @@
       class="u-page__item__slot-icon"
       slot="inactive-icon"
        :src="group"
-    ></image>
+    ></image> -->
     </up-tabbar-item>
-    <up-tabbar-item text="病例交流"  @click="handleClick">
-       <image
+    <up-tabbar-item text="病例交流" :activeIcon="talk_on" :inactiveIcon="talk"  @click="handleClick">
+       <!-- <image
       class="u-page__item__slot-icon"
       slot="active-icon"
       width="47rpx"
@@ -42,12 +45,13 @@
     <image
        width="47rpx"
        height="47rpx"
-      class="u-page__item__slot-icon"
-      slot="inactive-icon"
+       class="u-page__item__slot-icon"
+       slot="inactive-icon"
       :src="talk"
-    ></image>
+    ></image> -->
     </up-tabbar-item>
   </up-tabbar>
+
 </template>
 
 <script setup>
@@ -57,6 +61,7 @@ import ku_on from "@/static/ku_on.png";
 import group_on from "@/static/group_on.png";
 import talk from "@/static/talk.png";
 import talk_on from "@/static/talk_on.png";
+import navTo  from "@/utils/navTo.js";
 import { ref } from "vue";
 const props=defineProps({
   value: {
@@ -66,24 +71,36 @@ const props=defineProps({
 });
 const handleClick = (e) => {
 	if(e==0){
-		uni.navigateTo({
+		navTo({
 		  url: "/pages/index/index",
 		});
 	}else if(e==1){
-      uni.navigateTo({
+      navTo({
       url: "/pages/case/case",
     });
    }else if(e==2){
-       uni.navigateTo({
+       navTo({
       url: "/pages/caseTalk/caseTalk",
     });
    }
 };
 </script>
 
-<style scoped>
+<style >
 .u-page__item__slot-icon{
   width: 47rpx;
   height: 47rpx;
 }
+ .u-tabbar__content__item-wrapper{
+    border-top: 2rpx solid #f3f4f6!important;
+  }
+/* .page{
+  :deep(.u-tabbar){
+    border-top: 2rpx solid #f3f4f6!important;
+  }
+  :deep(.u-tabbar--fixed){
+     border-top: 2rpx solid #f3f4f6!important;
+  }
+} */
+
 </style>