1

components/navigation/navigationBar.vue

@@ -2,9 +2,15 @@
 	<!-- header -->
 	<view :style="{ backgroundColor:backgroundColor }" class="navigationBar">
 		<template>
+			<!-- #ifdef MP-WEIXIN -->
 			<view class="navigationBarBack" @click="back">
 				<uni-icons size="24" type="left" :color="titleColor"></uni-icons>
 			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="navigationBarBack">
+			</view>
+			<!-- #endif -->
 			<view class="navigationBarTitle" :style="{ color: titleColor }">
 				{{ title }}
 			</view>
@@ -71,6 +77,7 @@
 		z-index: 9;
 
 		.navigationBarBack {
+			padding-left: 20rpx;
 			width: 200rpx;
 		}
 

pages/components/my-notice-tg.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="my-notice-box">
 		<!-- 标题 -->
-		<view class="dl-title">
+		<view :class="['dl-title','01'==nowUserType?'dl-tgz':'']">
 			我的通告
 		</view>
 		<!-- 搜索框 -->
@@ -44,6 +44,12 @@
 		getCatgByCode
 	} from '@/api/system/config.js'
 	export default {
+		props: {
+			nowUserType: {
+				type: String,
+				default: null
+			}
+		},
 		components: {
 			myNoticeItemTg
 		},
@@ -186,7 +192,6 @@
 
 <style lang="scss">
 	.my-notice-box {
-		padding-top: var(--status-bar-height);
 		width: 100%;
 		color: #363636;
 		background-color: white;
@@ -198,14 +203,22 @@
 		justify-content: start;
 		position: relative;
 
+		.dl-tgz {
+			color: white !important;
+			background-color: #4260ff !important;
+		}
+
 		.dl-title {
+			padding-top: calc(var(--status-bar-height) + 62rpx);
+			padding-left: 15rpx;
+			padding-bottom: 15rpx;
 			font-size: 32rpx;
 			width: 100%;
 			position: relative;
 			text-align: center;
 			font-weight: bold;
 			z-index: 10;
-			padding: 62rpx 0 15rpx 15rpx;
+			// padding: 62rpx 0 15rpx 15rpx;
 			border-bottom: 1px solid #F4F4F4;
 		}
 

pages/components/my-notice.vue

@@ -175,7 +175,7 @@
 
 <style lang="scss">
 	.my-notice-box {
-		padding-top: var(--status-bar-height);
+		// padding-top: var(--status-bar-height);
 		width: 100%;
 		color: #363636;
 		background-color: white;
@@ -188,13 +188,16 @@
 		position: relative;
 
 		.dl-title {
+			padding-top: calc(var(--status-bar-height) + 62rpx);
+			padding-left: 15rpx;
+			padding-bottom: 15rpx;
 			font-size: 32rpx;
 			width: 100%;
 			position: relative;
 			text-align: center;
 			font-weight: bold;
 			z-index: 10;
-			padding: 62rpx 0 15rpx 15rpx;
+			// padding: 62rpx 0 15rpx 15rpx;
 			border-bottom: 1px solid #F4F4F4;
 		}
 
@@ -243,4 +246,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/components/notice-index.vue

@@ -3,7 +3,7 @@
 		<!-- 标题 -->
 		<view :class="['dl-title','01'==nowUserType?'dl-tgz':'']">
 			<view class="right-text">
-				<text class="dl-text">通告</text>
+				<text :class="['dl-text','01'==nowUserType?'dl-tgz-text':'']">通告</text>
 			</view>
 			<view class="left-search">
 				<view class="left-search-box" style="width: 90%;" @click="goSeach">
@@ -638,6 +638,10 @@
 			background-color: #4260ff !important;
 		}
 
+		.dl-tgz-text {
+			color: white !important;
+		}
+
 		.dl-title {
 			width: 100%;
 			display: flex;

pages/components/subscribe.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="dingyue-box">
 		<!-- 标题 -->
-		<view class="dl-title">
+		<view :class="['dl-title','01'==nowUserType?'dl-tgz':'']">
 			订阅
 		</view>
 		<!-- 操作按钮 -->
@@ -45,6 +45,12 @@
 		getLoveList
 	} from '@/api/business/notice.js'
 	export default {
+		props: {
+			nowUserType: {
+				type: String,
+				default: null
+			}
+		},
 		components: {
 			noticeItem
 		},
@@ -205,7 +211,7 @@
 
 <style lang="scss">
 	.dingyue-box {
-		padding-top: var(--status-bar-height);
+		// padding-top: var(--status-bar-height);
 		width: 100%;
 		color: #363636;
 		background-color: white;
@@ -217,14 +223,22 @@
 		justify-content: center;
 		position: relative;
 
+		.dl-tgz {
+			color: white !important;
+			background-color: #4260ff !important;
+		}
+
 		.dl-title {
+			padding-top: calc(var(--status-bar-height) + 62rpx);
+			padding-left: 15rpx;
+			padding-bottom: 15rpx;
 			font-size: 32rpx;
 			width: 100%;
 			position: relative;
 			text-align: center;
 			font-weight: bold;
 			z-index: 10;
-			padding: 62rpx 0 15rpx 15rpx;
+			// padding: 62rpx 0 15rpx 15rpx;
 			border-bottom: 1px solid #F4F4F4;
 		}
 
@@ -287,4 +301,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/index.vue

@@ -7,9 +7,11 @@
 				@openVip="openVip"></notice-index>
 			<mine-index ref="minePage" :key="nowUserType" :nowUserType="nowUserType" v-if="'my'==menuCode"
 				@refreshUserType="refreshUserType()"></mine-index>
-			<subscribe v-if="'dingyue'==menuCode"></subscribe>
+			<subscribe :nowUserType="nowUserType" v-if="'dingyue'==menuCode"></subscribe>
-			<my-notice ref="myNotice" v-if="'myNotice'==menuCode && '02'==nowUserType"></my-notice>
+			<my-notice ref="myNotice" :nowUserType="nowUserType"
-			<my-notice-tg ref="myNoticeTg" v-if="'myNotice'==menuCode && '01'==nowUserType"></my-notice-tg>
+				v-if="'myNotice'==menuCode && '02'==nowUserType"></my-notice>
+			<my-notice-tg ref="myNoticeTg" :nowUserType="nowUserType"
+				v-if="'myNotice'==menuCode && '01'==nowUserType"></my-notice-tg>
 		</view>
 		<tabBarVue :menuCode="menuCode" :nowUserType="nowUserType" ref="tarBar" @changeMenu="changeMenu"></tabBarVue>
 		<!-- 普通弹窗 -->

pages/mine/member/member-card.vue

@@ -616,4 +616,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/mine/mine-index.vue

@@ -3,8 +3,8 @@
 		<!-- 切换身份 -->
 		<view :class="['dl-title','01'==localUserType?'dl-tgz':''] ">
 			<view class="left-search" @click="changeUserType('01'==localUserType?'02':'01')">
-				<image v-if="!ifHasCard" class="dl-image" src="@/static/mine/qiehuan.png" mode="aspectFit"></image>
+				<!-- <image v-if="!ifHasCard" class="dl-image" src="@/static/mine/qiehuan.png" mode="aspectFit"></image> -->
-				<image v-else class="dl-image" src="@/static/mine/change_member.png" mode="aspectFit"></image>
+				<image class="dl-image" src="@/static/mine/qiehuan.png" mode="aspectFit"></image>
 				<text class="dl-text">切换至{{'02'==localUserType?'通告主':'博主'}}</text>
 			</view>
 		</view>