1

config.js

@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'http://192.168.1.4:8080',
+	baseUrl: 'http://192.168.1.17:8080',
 	// baseUrl: 'http://localhost:8080',
 	// 应用信息
 	appInfo: {

pages/components/notice-index.vue

@@ -85,7 +85,7 @@
 			<view class="scroll-view">
 				<scroll-view class="scroll-view-box" scroll-y="true">
 					<view class="info-content" @click="confirmItem(null)">
-						<image v-show="0==chooseCondition" class="image" :src="'/static/platform/xiaohongshu.png'"
+						<image v-show="0==chooseCondition" class="image" src="@/static/platform/quanbu.png"
 							mode="aspectFit"></image>
 						<view class="title">不限</view>
 					</view>

pages/index.vue

@@ -4,7 +4,8 @@
 		<view class="content-body">
 			<!-- 通告列表页 -->
 			<notice-index v-show="'home'==menuCode"></notice-index>
-			<mine-index v-show="'my'==menuCode"></mine-index>
+			<mine-index :nowUserType.sync="nowUserType" @update:params="updateParams"
+				v-show="'my'==menuCode"></mine-index>
 			<subscribe v-show="'dingyue'==menuCode"></subscribe>
 			<my-notice v-show="'myNotice'==menuCode"></my-notice>
 		</view>
@@ -13,6 +14,12 @@
 </template>
 
 <script>
+	import {
+		changeUserType,
+		getUserType,
+		formatNumberWithUnits,
+		calculateTimeDifference
+	} from '@/utils/common.js'
 	import tabBarVue from '@/components/tabbar/tabBar.vue'
 	import noticeIndex from '@/pages/components/notice-index.vue'
 	import subscribe from '@/pages/components/subscribe.vue'
@@ -28,6 +35,8 @@
 		},
 		data() {
 			return {
+				//当前用户类型
+				nowUserType: null,
 				menus: ['全部', '最新', '高奖励', '急招', '品牌置换'],
 				menuIndex: 0,
 				dataList: ['1', '2', '2', '2'],
@@ -42,9 +51,13 @@
 			}
 		},
 		onLoad: function() {
-
+			this.nowUserType = getUserType()
 		},
 		methods: {
+			updateParams(newVal) {
+				this.nowUserType = newVal;
+			},
+
 			itemClick(index, item) {
 				this.menuIndex = index
 			},

pages/mine/addr/addr-list.vue

@@ -1,5 +1,7 @@
 <template>
 	<view class="addr-box">
+		<navigation-bar-vue title="地址管理" style="width: 100%;" background-color="#ffffff"
+			title-color="#000000"></navigation-bar-vue>
 		<view class="opt-box">
 			<view v-if="!ifEdit" class="item-dom" @click="manager(true)"><uni-icons type="bars" color="#FC1F3E"
 					size="16"></uni-icons><text>管理</text></view>
@@ -11,40 +13,48 @@
 					size="16"></uni-icons><text>退出管理</text></view>
 		</view>
 		<view class="addr-list-box">
-				<view v-for="(item,index) in dataList" class="addr-item-box">
+			<view v-for="(item,index) in dataList" class="addr-item-box">
-					<view class="addr-item-top">
+				<view class="addr-item-top">
-						<view class="item-info">
+					<view class="item-info">
-							<view class="text little-1">{{ item.cityName }}</view>
+						<view class="text little-1">{{ item.cityName }}</view>
-							<view class="text">{{ item.detail }}</view>
+						<view class="text">{{ item.detail }}</view>
-							<view class="text little-2 item-flex">
+						<view class="text little-2 item-flex">
-								{{ item.name }} {{ item.tel }}
+							{{ item.name }} {{ item.tel }}
-								<view v-if="item.isDefault=='1'" class="item-icon">默认</view>
+							<view v-if="item.isDefault=='1'" class="item-icon">默认</view>
-							</view>
-						</view>
-						<view class="item-opt" @click="toEdit(item.id)">
-							<uni-icons type="compose" color="#565656" size="16" ></uni-icons><text>编辑</text>
 						</view>
 					</view>
-					<view class="addr-item-opt" v-if="ifEdit">
+					<view class="item-opt" @click="toEdit(item.id)">
-						<view class="opt-button choose" @click="setDefaultCity(item.id)" v-if="item.isDefault!='1'">设为默认</view>
+						<uni-icons type="compose" color="#565656" size="16"></uni-icons><text>编辑</text>
-						<view class="opt-button" @click="toCopy(item.id)">复制</view>
-						<view class="opt-button" @click="remove(item.id)">删除</view>
 					</view>
 				</view>
-				<view style="text-align: center" v-if="dataList.length==0">
+				<view class="addr-item-opt" v-if="ifEdit">
-					<image class="" src="@/static/images/nothing.png"></image>
+					<view class="opt-button choose" @click="setDefaultCity(item.id)" v-if="item.isDefault!='1'">设为默认
+					</view>
+					<view class="opt-button" @click="toCopy(item.id)">复制</view>
+					<view class="opt-button" @click="remove(item.id)">删除</view>
 				</view>
+			</view>
+			<view style="text-align: center" v-if="dataList.length==0">
+				<image class="" src="@/static/images/nothing.png"></image>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import navigationBarVue from '@/components/navigation/navigationBar.vue';
 	import {
-		getUserAddress,setDefault,removeAddress
+		getUserAddress,
+		setDefault,
+		removeAddress
 	} from '@/api/business/member.js'
 	export default {
+		components: {
+			navigationBarVue
+		},
 		data() {
 			return {
+
 				ifEdit: false,
 				queryParams: {
 					pageNum: 1,
@@ -57,11 +67,11 @@
 			}
 		},
 
-    onShow() {
+		onShow() {
-      this.initData();
+			this.initData();
-    },
+		},
 		methods: {
-		  /**初始化数据*/
+			/**初始化数据*/
 			initData() {
 				getUserAddress().then(res => {
 					this.dataList = res.data
@@ -73,56 +83,60 @@
 					});
 				})
 			},
-      /**设为默认方法*/
+			/**设为默认方法*/
-      setDefaultCity(id){
+			setDefaultCity(id) {
-        setDefault({id:id}).then(res => {
+				setDefault({
-          uni.showToast({
+					id: id
-            icon: 'success',
+				}).then(res => {
-            duration: 2000,
+					uni.showToast({
-            title: '设置成功'
+						icon: 'success',
-          });
+						duration: 2000,
-          this.ifEdit = false
+						title: '设置成功'
-          this.initData()
+					});
-        }).catch((e) => {
+					this.ifEdit = false
-          uni.showToast({
+					this.initData()
-            icon: 'error',
+				}).catch((e) => {
-            duration: 2000,
+					uni.showToast({
-            title: e
+						icon: 'error',
-          });
+						duration: 2000,
-        })
+						title: e
-      },
+					});
+				})
+			},
 
-      /**删除地址*/
+			/**删除地址*/
-      remove(id) {
+			remove(id) {
-        removeAddress({id:id}).then(res => {
+				removeAddress({
-          uni.showToast({
+					id: id
-            icon: 'success',
+				}).then(res => {
-            duration: 2000,
+					uni.showToast({
-            title: '删除成功'
+						icon: 'success',
-          });
+						duration: 2000,
-          this.ifEdit = false
+						title: '删除成功'
-          this.initData()
+					});
-        }).catch((e) => {
+					this.ifEdit = false
-          uni.showToast({
+					this.initData()
-            icon: 'error',
+				}).catch((e) => {
-            duration: 2000,
+					uni.showToast({
-            title: e
+						icon: 'error',
-          });
+						duration: 2000,
-        })
+						title: e
-      },
+					});
-      /**新增页面*/
+				})
+			},
+			/**新增页面*/
 			addNew() {
 				this.$tab.navigateTo(`/pages/mine/addr/addr-detail`)
 			},
-      /**编辑页面*/
+			/**编辑页面*/
-      toEdit(id){
+			toEdit(id) {
-        this.$tab.navigateTo(`/pages/mine/addr/addr-detail?id=`+id)
+				this.$tab.navigateTo(`/pages/mine/addr/addr-detail?id=` + id)
-      },
+			},
 
-      /**复制*/
+			/**复制*/
-      toCopy(id){
+			toCopy(id) {
-        this.$tab.navigateTo(`/pages/mine/addr/addr-detail?id=`+id+`&isCopy=1`)
+				this.$tab.navigateTo(`/pages/mine/addr/addr-detail?id=` + id + `&isCopy=1`)
-      },
+			},
 
 			/**
 			 * 进入管理
@@ -137,7 +151,7 @@
 
 <style lang="scss">
 	.addr-box {
-		border-top: 1rpx solid #F4F4F4;
+		padding-top: calc(90rpx + var(--status-bar-height));
 		background-color: white;
 		width: 100%;
 		color: #363636;
@@ -156,6 +170,7 @@
 			padding: 25rpx;
 			align-items: center;
 			justify-content: center;
+			border-top: 1rpx solid #F2F2F2;
 			border-bottom: 1rpx solid #F2F2F2;
 
 			.item-dom {
@@ -171,7 +186,8 @@
 		}
 
 		.addr-list-box {
-			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 57rpx);
+			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 191rpx);
+			overflow-y: scroll;
 			padding: 0 30rpx;
 			width: 100%;
 			display: flex;

pages/mine/card/my-card.vue

@@ -1,5 +1,7 @@
 <template>
 	<view :class="['my-card-box',ifChoose?'has-footer':'']">
+		<navigation-bar-vue title="我的名片" style="width: 100%;" background-color="#ffffff"
+			title-color="#000000"></navigation-bar-vue>
 		<view class="opt-box" v-if="!ifChoose">
 			<view v-if="!ifEdit" class="item-dom" @click="manager(true)"><uni-icons type="bars" color="#FC1F3E"
 					size="16"></uni-icons><text>管理</text></view>
@@ -37,13 +39,131 @@
 								<view class="fans-dom">
 									粉丝：{{ formatNumberWithUnits(item.fansNum) }}
 								</view>
-<!--								<view class="nickname-dom">-->
+								<!--								<view class="nickname-dom">-->
-<!--									昵称：{{ item.accountName }}-->
+								<!--									昵称：{{ item.accountName }}-->
-<!--								</view>-->
+								<!--								</view>-->
 							</view>
 						</view>
 					</view>
-					<view v-if="ifEdit" @click="remove(item.id)" :class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
+					<view v-if="ifEdit" @click="remove(item.id)"
+						:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
+					</view>
+					<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
+					</view>
+				</view>
+			</view>
+			<view class="card-dom " v-for="item in busiCardList">
+				<!-- 多选框--管理状态或者选择名片时使用 -->
+				<view class="choose-dom" v-if="ifChoose">
+					<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
+						:localdata="checkboxArray" />
+				</view>
+				<view :class="['right-content',item.choosed.length>0?'click':'']">
+					<view class="card-title">
+						<!-- 需要根据平台code取对应的图片 TODO -->
+						<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
+						<text>{{item.platformName}}博主</text>
+						<view class="edit-text" @click="edit()">
+							<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
+							<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
+							<text v-else>未通过</text>
+						</view>
+					</view>
+					<view class="card-content">
+						<view class="card-person-info">
+							<view class="card-name">
+								<view>{{ item.accountName }}</view>
+							</view>
+							<view class="detail-text">
+								<view class="fans-dom">
+									粉丝：{{ formatNumberWithUnits(item.fansNum) }}
+								</view>
+								<!--								<view class="nickname-dom">-->
+								<!--									昵称：{{ item.accountName }}-->
+								<!--								</view>-->
+							</view>
+						</view>
+					</view>
+					<view v-if="ifEdit" @click="remove(item.id)"
+						:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
+					</view>
+					<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
+					</view>
+				</view>
+			</view>
+			<view class="card-dom " v-for="item in busiCardList">
+				<!-- 多选框--管理状态或者选择名片时使用 -->
+				<view class="choose-dom" v-if="ifChoose">
+					<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
+						:localdata="checkboxArray" />
+				</view>
+				<view :class="['right-content',item.choosed.length>0?'click':'']">
+					<view class="card-title">
+						<!-- 需要根据平台code取对应的图片 TODO -->
+						<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
+						<text>{{item.platformName}}博主</text>
+						<view class="edit-text" @click="edit()">
+							<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
+							<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
+							<text v-else>未通过</text>
+						</view>
+					</view>
+					<view class="card-content">
+						<view class="card-person-info">
+							<view class="card-name">
+								<view>{{ item.accountName }}</view>
+							</view>
+							<view class="detail-text">
+								<view class="fans-dom">
+									粉丝：{{ formatNumberWithUnits(item.fansNum) }}
+								</view>
+								<!--								<view class="nickname-dom">-->
+								<!--									昵称：{{ item.accountName }}-->
+								<!--								</view>-->
+							</view>
+						</view>
+					</view>
+					<view v-if="ifEdit" @click="remove(item.id)"
+						:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
+					</view>
+					<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
+					</view>
+				</view>
+			</view>
+			<view class="card-dom " v-for="item in busiCardList">
+				<!-- 多选框--管理状态或者选择名片时使用 -->
+				<view class="choose-dom" v-if="ifChoose">
+					<uni-data-checkbox v-model="item.choosed" :disabled="1!=item.approvalStatus" multiple
+						:localdata="checkboxArray" />
+				</view>
+				<view :class="['right-content',item.choosed.length>0?'click':'']">
+					<view class="card-title">
+						<!-- 需要根据平台code取对应的图片 TODO -->
+						<image :src="'/static/platform/'+item.platformCode+'.png'" mode="aspectFit"></image>
+						<text>{{item.platformName}}博主</text>
+						<view class="edit-text" @click="edit()">
+							<text v-if="1==item.approvalStatus" style="color:#5986F2;">已审核</text>
+							<text v-else-if="0==item.approvalStatus" style="color:#FC1F3E ;">审核中</text>
+							<text v-else>未通过</text>
+						</view>
+					</view>
+					<view class="card-content">
+						<view class="card-person-info">
+							<view class="card-name">
+								<view>{{ item.accountName }}</view>
+							</view>
+							<view class="detail-text">
+								<view class="fans-dom">
+									粉丝：{{ formatNumberWithUnits(item.fansNum) }}
+								</view>
+								<!--								<view class="nickname-dom">-->
+								<!--									昵称：{{ item.accountName }}-->
+								<!--								</view>-->
+							</view>
+						</view>
+					</view>
+					<view v-if="ifEdit" @click="remove(item.id)"
+						:class="['edit-dom',item.choosed.length>0?'':'no-choose']">删除
 					</view>
 					<view v-else :class="['edit-dom',item.choosed.length>0?'':'no-choose']" @click="edit(item.id)">编辑
 					</view>
@@ -63,13 +183,18 @@
 </template>
 
 <script>
+	import navigationBarVue from '@/components/navigation/navigationBar.vue';
 	import {
 		formatNumberWithUnits
 	} from '@/utils/common.js'
 	import {
-		getUserBusiCard,removeBusiCard
+		getUserBusiCard,
+		removeBusiCard
 	} from '@/api/business/member.js'
 	export default {
+		components: {
+			navigationBarVue
+		},
 		data() {
 			return {
 				//是否是管理模式
@@ -105,7 +230,7 @@
 			},
 			//查询名片列表
 			initData() {
-        this.busiCardList = []
+				this.busiCardList = []
 				getUserBusiCard().then(res => {
 					if (res.data.length > 0) {
 						res.data.map((item) => {
@@ -121,24 +246,26 @@
 					});
 				})
 			},
-      /**删除名片*/
+			/**删除名片*/
-      remove(id) {
+			remove(id) {
-        removeBusiCard({id:id}).then(res => {
+				removeBusiCard({
-          uni.showToast({
+					id: id
-            icon: 'success',
+				}).then(res => {
-            duration: 2000,
+					uni.showToast({
-            title: '删除成功'
+						icon: 'success',
-          });
+						duration: 2000,
-          this.ifEdit = false
+						title: '删除成功'
-          this.initData()
+					});
-        }).catch((e) => {
+					this.ifEdit = false
-          uni.showToast({
+					this.initData()
-            icon: 'error',
+				}).catch((e) => {
-            duration: 2000,
+					uni.showToast({
-            title: e
+						icon: 'error',
-          });
+						duration: 2000,
-        })
+						title: e
-      },
+					});
+				})
+			},
 			/**
 			 * 全选
 			 * @param {Object} e
@@ -165,7 +292,7 @@
 			del(item) {},
 			//名片编辑
 			edit(id) {
-				this.$tab.navigateTo('/pages/mine/card/card-detail?id='+id)
+				this.$tab.navigateTo('/pages/mine/card/card-detail?id=' + id)
 			},
 			addCard() {
 				this.$tab.navigateTo('/pages/mine/card/card-detail')
@@ -187,7 +314,9 @@
 	}
 
 	.my-card-box {
-		border-top: 1rpx solid #F4F4F4;
+		padding-top: calc(90rpx + var(--status-bar-height));
+
+		background-color: white;
 		width: 100%;
 		color: #363636;
 		font-size: 32rpx;
@@ -205,6 +334,7 @@
 			padding: 25rpx;
 			align-items: center;
 			justify-content: center;
+			border-top: 1rpx solid #F2F2F2;
 			border-bottom: 1rpx solid #F2F2F2;
 
 			.item-dom {
@@ -220,7 +350,8 @@
 		}
 
 		.addr-list-box {
-			height: 100%;
+			height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 191rpx);
+			overflow-y: scroll;
 			padding: 20rpx 30rpx;
 			background-color: #F2F2F2;
 			width: 100%;

pages/mine/mine-index.vue

@@ -1,14 +1,15 @@
 <template>
 	<view class="mine-container">
 		<!-- 切换身份 -->
-		<view class="dl-title">
+		<view :class="['dl-title',ifHasCard?'has-member-card':''] ">
-			<view class="left-search" @click="changeUserType('bz'==nowUserType?'tgz':'bz')">
+			<view class="left-search" @click="changeUserType('01'==localUserType?'02':'01')">
-				<image 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>
-				<text class="dl-text">切换至{{'bz'==nowUserType?'通告主':'博主'}}</text>
+				<image v-else class="dl-image" src="@/static/mine/change_member.png" mode="aspectFit"></image>
+				<text class="dl-text">切换至{{'02'==localUserType?'通告主':'博主'}}</text>
 			</view>
 		</view>
 		<!-- 头像信息 -->
-		<view class="dl-person-box">
+		<view :class="['dl-person-box',ifHasCard?'has-member-card':''] ">
 			<view class="user-image-box">
 				<view class="dl-image-box">
 					<image v-if="!userInfo.avatar" class="touxiang" src="@/static/images/profile.jpg" mode="aspectFit">
@@ -17,19 +18,27 @@
 					<image class="sex" src="@/static/mine/sex_girl.png" mode="aspectFit"></image>
 				</view>
 				<view class="name-box">
-					<text style="margin-bottom: 10rpx;">{{userInfo.nickName||''}}</text>
+					<view class="title-box">
-					<view class="fans-box">
+						{{userInfo.nickName || ''}}
-						<image src="@/static/mine/fans.png" mode="aspectFit"></image>
+						<image v-if="ifHasCard" src="@/static/mine/huang.png" mode="aspectFit"></image>
-						<view class="fans-num">{{userInfo.tfansNum||'0'}}</view>
 					</view>
+					<view class="bottom-box">
+						<view class="fans-box">
+							<image src="@/static/mine/fans.png" mode="aspectFit"></image>
+							<view class="fans-num">{{userInfo.tfansNum||'0'}}</view>
+						</view>
+						<view v-if="ifHasCard" class="member-box">会员2025-12-21日到期</view>
+					</view>
+
 				</view>
 				<view class="edit-box">
-					<text style="margin-right: 10rpx;">编辑</text> <uni-icons type="right" color="#929292"
+					<text style="margin-right: 10rpx;">编辑</text>
-						size="12">{{item.unicode}}</uni-icons>
+					<uni-icons v-if="ifHasCard" type="right" color="#623109" size="12"></uni-icons>
+					<uni-icons v-else type="right" color="#929292" size="12"></uni-icons>
 				</view>
 			</view>
 			<!-- 会员开通 -->
-			<view class="dl-member-box" @click="goMemberCard()">
+			<view v-if="!ifHasCard && '02'==localUserType" class="dl-member-box" @click="goMemberCard()">
 				<view class="dl-left">
 					<image class="dl-icon" src="@/static/index/zuanshi.png" mode="aspectFit"></image>
 					<text>开通会员 解锁更多权益</text>
@@ -38,21 +47,43 @@
 					<view class="dl-go-view">立即开通</view>
 				</view>
 			</view>
+			<!-- 会员开通--通告主 -->
+			<view v-if="!ifHasCard && '01'==localUserType" class="dl-member-box" @click="goMemberCard()">
+				<view class="dl-left">
+					<image class="dl-icon" src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+					<text>获取通告主卡 体验高级特权</text>
+				</view>
+				<view class="dl-right">
+					<view class="dl-go-view">立即开通</view>
+				</view>
+			</view>
 			<!-- 积分 -->
-			<view class="points-box">
+			<view class="points-box" v-if="'02'==localUserType">
 				<view class="item-box">
 					<view class="item-text-box">
 						<view>积分<text class="red-text">{{userInfo.pointsBalance||'0'}}</text></view>
 						<view class="dl-little">赚积分<uni-icons type="right" size="10">{{item.unicode}}</uni-icons></view>
 					</view>
-					<image src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+					<image src="@/static/mine/baoming.png" mode="aspectFit"></image>
 				</view>
 				<view class="item-box">
 					<view class="item-text-box">
 						<view>报名<text class="red-text">{{userInfo.report||'0'}}</text>次</view>
 						<view class="dl-little">去提额<uni-icons type="right" size="10">{{item.unicode}}</uni-icons></view>
 					</view>
-					<image src="@/static/index/zuanshi.png" mode="aspectFit"></image>
+					<image src="@/static/mine/jifen.png" mode="aspectFit"></image>
+				</view>
+			</view>
+			<!-- 发布通告 -->
+			<view class="public-notice-box" v-if="'01'==localUserType">
+				<view class="left-box">
+					<view style="margin-bottom: 20rpx;">发布通告额度剩余3条</view>
+					<progress style="width: 90%;" border-radius="5" percent="40" activeColor="#FC1F3E"
+						backgroundColor="#DEDEDE" stroke-width="8" />
+				</view>
+				<view class="right-box">
+					获取更多
+					<uni-icons type="right" color="#623109" size="12"></uni-icons>
 				</view>
 			</view>
 		</view>
@@ -60,31 +91,36 @@
 		<view class="other-box">
 			<view class="box-room">
 				<view class="detail-title">个人信息</view>
-				<view class="menu-box">
+				<view class="menu-box top-column">
+					<view class="menu-item" v-if="'01'==localUserType">
+						<!-- <image src="@/static/mine/zuji.png" mode="aspectFit"></image> -->
+						<image src="@/static/mine/caise/renzheng.png" mode="aspectFit"></image>
+						<view class="text-dom">通告主认证</view>
+						<uni-icons type="right" color="#623109" size="12"></uni-icons>
+					</view>
+					<view class="menu-item" v-if="'01'==localUserType">
+						<!-- <image src="@/static/mine/zuji.png" mode="aspectFit"></image> -->
+						<image src="@/static/mine/caise/tonggaoquan.png" mode="aspectFit"></image>
+						<view class="text-dom">通告券</view>
+						<uni-icons type="right" color="#623109" size="12"></uni-icons>
+					</view>
 					<view class="menu-item">
 						<!-- <image src="@/static/mine/zuji.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/zuji.png" mode="aspectFit"></image>
-						<view>足迹</view>
+						<view class="text-dom">足迹</view>
+						<uni-icons type="right" color="#623109" size="12"></uni-icons>
 					</view>
-					<view class="menu-item">
+					<view class="menu-item" v-if="'02'==localUserType" @click="goMyAddr()">
-						<!-- <image src="@/static/mine/shezhi.png" mode="aspectFit"></image> -->
-						<image src="@/static/mine/caise/shezhi.png" mode="aspectFit"></image>
-						<view>设置</view>
-					</view>
-					<view class="menu-item" @click="goMyAddr()">
 						<!-- <image src="@/static/mine/dizhi.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/dizhi.png" mode="aspectFit"></image>
-						<view>地址</view>
+						<view class="text-dom">地址</view>
+						<uni-icons type="right" color="#623109" size="12"></uni-icons>
 					</view>
-					<view class="menu-item" @click="goMyCard()">
+					<view class="menu-item" v-if="'02'==localUserType" @click="goMyCard()">
 						<!-- <image src="@/static/mine/mingpian.png" mode="aspectFit"></image> -->
 						<image src="@/static/mine/caise/mingpian.png" mode="aspectFit"></image>
-						<view>名片</view>
+						<view class="text-dom">名片</view>
-					</view>
+						<uni-icons type="right" color="#623109" size="12"></uni-icons>
-					<view class="menu-item">
-						<!-- <image src="@/static/mine/tongyong.png" mode="aspectFit"></image> -->
-						<image src="@/static/mine/caise/tongyong.png" mode="aspectFit"></image>
-						<view>通用</view>
 					</view>
 				</view>
 			</view>
@@ -137,20 +173,38 @@
 	import {
 		getJSONData
 	} from '@/utils/auth.js'
-	import {bloggerDetail} from '@/api/business/member.js'
+	import {
+		bloggerDetail
+	} from '@/api/business/member.js'
 	export default {
+		props: {
+			nowUserType: {
+				type: String,
+				default: null
+			}
+		},
+		watch: {
+			// 'nowUserType': function(newVal, oldVal) {
+			// 	this.$emit('update:params', newVal);
+			// }
+		},
 		components: {
 			tabBarVue,
 		},
 		data() {
 			return {
-				//当前用户类型
+				localUserType: this.nowUserType,
-				nowUserType: null,
+				//是否已开通会员
+				ifHasCard: false,
 				userInfo: {}
 			}
+		},
+		mounted() {},
+		onShow() {
+
 		},
 		onLoad() {
-			this.nowUserType = getUserType()
+
 		},
 		mounted() {
 			if (null != getJSONData(constant.userInfo)) {
@@ -176,7 +230,9 @@
 			 */
 			changeUserType(type) {
 				changeUserType(type)
-				this.nowUserType = type
+				this.localUserType = type
+				this.$emit('update:nowUserType', this.localUserType)
+				this.$forceUpdate()
 			},
 			handleToInfo() {
 				this.$tab.navigateTo('/pages/mine/info/index')
@@ -247,6 +303,7 @@
 			}
 		}
 
+
 		.dl-person-box {
 			width: 100%;
 			background-color: white;
@@ -277,11 +334,12 @@
 					}
 
 					.sex {
-						width: 40rpx;
+						width: 30rpx;
-						height: 40rpx;
+						height: 30rpx;
 						position: absolute;
-						bottom: -5rpx;
+						bottom: 0rpx;
 						right: 0rpx;
+						border-radius: 50%;
 					}
 				}
 
@@ -293,22 +351,56 @@
 					align-items: self-start;
 					justify-content: center;
 
-					.fans-box {
+					.title-box {
-						font-size: 18rpx;
 						display: flex;
 						align-items: center;
 						justify-content: center;
-						background-color: #FEF4EF;
-						padding: 5rpx 10rpx;
-						color: #FE9860;
-						border-radius: 20rpx;
 
 						image {
-							height: 20rpx;
+							margin-left: 10rpx;
-							width: 20rpx;
+							width: 50rpx;
+							height: 50rpx;
 						}
 					}
 
+					.bottom-box {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						.fans-box {
+							max-width: 200rpx;
+							margin-right: 10rpx;
+							font-size: 18rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							background-color: #FEF4EF;
+							padding: 5rpx 10rpx;
+							color: #FE9860;
+							border-radius: 20rpx;
+
+							image {
+								height: 20rpx;
+								width: 20rpx;
+								margin-right: 8rpx;
+							}
+						}
+
+						.member-box {
+							flex: 1;
+							font-size: 18rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+							background-color: #FC1F3E;
+							color: white;
+							padding: 5rpx 10rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+
 
 					.fans-num {}
 				}
@@ -318,7 +410,7 @@
 					text-align: right;
 					padding-right: 20rpx;
 					font-size: 22rpx;
-					width: 200rpx;
+					width: 130rpx;
 
 				}
 			}
@@ -370,6 +462,31 @@
 			}
 		}
 
+		.has-member-card {
+			background-color: #FBE8CE !important;
+			color: #623109 !important;
+			border-bottom: 1px solid #F2E7D5 !important;
+
+			.points-box {
+				border-top: 1px solid #F2E7D5 !important;
+				padding-top: 10rpx;
+
+				.item-box {
+					background-color: white !important;
+					color: #623109 !important;
+
+					.dl-little {
+						background-color: #FED96E !important;
+						color: #363636;
+					}
+				}
+			}
+
+			.edit-box {
+				color: #623109 !important;
+			}
+		}
+
 		.points-box {
 			margin-top: 10rpx;
 			width: 100%;
@@ -415,6 +532,34 @@
 			}
 		}
 
+		.public-notice-box {
+			width: 100%;
+			padding: 30rpx;
+			display: flex;
+			align-items: center;
+			margin-top: 20rpx;
+			border-radius: 20rpx;
+			background-color: #FEF4EF;
+			font-size: 33rpx;
+			justify-content: center;
+
+			.left-box {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				justify-content: center;
+			}
+
+			.right-box {
+				font-size: 26rpx;
+				width: 200rpx;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+			}
+		}
+
 		.other-box {
 			background-color: #F6F6F6;
 			width: 100%;
@@ -467,6 +612,39 @@
 						}
 					}
 				}
+
+				.top-column {
+					flex-direction: column;
+
+					.menu-item {
+						width: 100%;
+						flex-direction: row;
+						border-bottom: 1rpx solid #F7F7F7;
+						padding-bottom: 10rpx;
+
+						image {
+							width: 60rpx;
+							height: 60rpx;
+							margin-bottom: 0 !important;
+						}
+
+						.text-dom {
+							display: flex;
+							align-items: center;
+							padding-left: 20rpx;
+							justify-content: flex-start;
+							font-size: 26rpx;
+							flex: 1;
+						}
+
+						.uni-icons {
+							width: 70rpx;
+							display: flex;
+							align-items: center;
+							justify-content: center;
+						}
+					}
+				}
 			}
 		}
 	}

pages/notice/detail.vue

@@ -23,7 +23,8 @@
 			<!-- 通告信息 -->
 			<view class="info-box notice-main">
 				<view class="dl-notice-title">
-					<image class="dl-image" :src="'/static/platform/'+platformCode+'.png'" mode="aspectFit"></image>
+					<image class="dl-image" :src="'/static/platform/'+noticeDetail.platformCode+'.png'"
+						mode="aspectFit"></image>
 					<view class="dl-text">{{noticeDetail.title}}</view>
 				</view>
 				<view class="end-time">截止日期：{{noticeDetail.endDate}}</view>