标签展示修改

pages.json

@@ -179,6 +179,13 @@
 			"style": {
 				"navigationBarTitleText": "我的评价"
 			}
+		},
+		/*******医生标签******/
+		{
+			"path": "pages/information/doctor_label",
+			"style": {
+				"navigationBarTitleText": "标签管理"
+			}
 		}
 	],
 	"globalStyle": {

pages/index/index.vue

@@ -8,21 +8,18 @@
 				<view class="plr15">
 					<!-- 登录切换 -->
 					<view v-if="true" class="m-bg-white bdr4 pb20 header-box" style="border-radius: 32rpx;">
-						<view class="plr20 pt20 m-dpflex m-justify-start " style="margin-bottom: 60rpx;">
+						<view class="plr20 pt20 m-dpflex m-justify-start " style="margin-bottom: 20rpx;">
 							<view>
 								<image binderror="_binderror" mode="scaleToFill" :src="src" style="width: 100rpx;height: 100rpx;border-radius: 50%;"></image>
-								<view v-if="hasLogin&&docterInfo.is_then!='1'" class="flex justify-center align-center" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx;background-color: #EEAA3F;color: #FFFFFF;position: relative;top: -20rpx;">未认证</view>
-								<view v-else-if="hasLogin&&docterInfo.is_then!='2'" class="flex justify-center align-center" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx;background-color: #84BB43;color: #FFFFFF;position: relative;top: -20rpx;">已认证</view>
+
 							</view>
 							<view style="margin-left: 30rpx;">
-								<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;">
-									{{docterInfo.name| ellipsis}}
-									<u-tag style="margin-left: 10rpx;" :text="lable1" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff"
-									 v-if="!lable1==''" />
-									<u-tag style="margin-left: 10rpx;" :text="lable2" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff"
-									 v-if="!lable2==''" />
+								<view style="font-size: 32rpx;font-weight: 600;margin-bottom: 20rpx;margin-top: 10rpx;display: flex;">
+									<view style="display: flex;align-items: center;margin-right: 20rpx;">{{docterInfo.name| ellipsis}}</view>
+									<view v-if="hasLogin&&docterInfo.is_then!='1'" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx 20rpx;background-color: #EEAA3F;color: #FFFFFF;position: relative;">未认证</view>
+									<view v-else-if="hasLogin&&docterInfo.is_then!='2'" style="border-radius:30rpx ;font-size: 20rpx;padding: 10rpx 20rpx;background-color: #84BB43;color: #FFFFFF;position: relative;">已认证</view>
 								</view>
-								<view style="color:#666666 ;" v-if="hasLogin">
+								<view style="color:#666666 ;font-size:22rpx;" v-if="hasLogin">
 									{{docterInfo.sign}}
 								</view>
 								<view v-else @click="judgerenzheng" style="color: #007AFF;">
@@ -34,13 +31,16 @@
 									<image class="header-img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/bianji.png"
 									 @click="grxx"></image>
 								</navigator>
-								<view style="margin-top: 50rpx;">
-									<text @click="gorz" style="color: #096CBB;">认证中心</text>
-								</view>
 							</view>
 
 						</view>
-						<view class="pr m-xcenter mt30 plr20">
+						<!-- 标签 -->
+						<view style="height: 60rpx;padding-left: 40rpx;padding-right: 40rpx;display: flex;" >
+							<view v-for="item,index in doctorlabel" :key="index">
+								<u-tag :show="index<4" style="margin-left: 10rpx;" :text="doctorlabel[index].lable" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff" shape="circle " size="mini"/>
+							</view>
+						</view>
+						<view class="pr m-xcenter plr20">
 							<view class="m-flex tl f14 m-ycenter dpb">
 								<view class="m-gray-big f20 fb pr10">{{docterInfo.service_days}}</view>
 								<view class="m-gray-letter mt5 f12">服务天数</view>
@@ -129,10 +129,10 @@
 							 shape="circle"></u-image>
 							<view class="grid-text margin-top-xs">我的评价</view>
 						</u-grid-item>
-						<u-grid-item>
-							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/jqqd.png"
+						<u-grid-item  @click="gorz">
+							<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/home/zzzx.png"
 							 shape="circle"></u-image>
-							<view class="grid-text margin-top-xs">敬请期待</view>
+							<view class="grid-text margin-top-xs">认证中心</view>
 						</u-grid-item>
 					</u-grid>
 				</view>
@@ -228,6 +228,7 @@
 					service_persons: "0"
 				},
 				page: 1,
+				doctorlabel:[{lable:'最多六个中文'},{lable:'和十二个英文'},{lable:'aaaaaaaaaaaa'},{lable:'只显示四个'},{lable:'不显示'}],
 				docterMessageList: [],
 				//认证弹窗
 				rzModal: false,
@@ -308,7 +309,7 @@
 				console.log('认证', this.docterInfo.is_then)
 			},
 			getDocterMessage: async function() {
- 
+
 				let res = await this.$request.post("docterMessage/docterMessageList", {
 					curPage: this.page,
 					pageSize: 10
@@ -340,7 +341,7 @@
 					})
 					return false
 				}
-				if(this.docterMessageList.every((item)=>item.status==1? false: true)){
+				if (this.docterMessageList.every((item) => item.status == 1 ? false : true)) {
 					uni.showToast({
 						title: "暂无未读消息",
 						icon: "none"
@@ -412,9 +413,9 @@
 			 * @param {Object} e
 			 */
 			navt(e) {
-				
-				 this.readTong(e.id);
-				 e.status=2;
+
+				this.readTong(e.id);
+				e.status = 2;
 				// 1.确认接单通知 2.订单逾期通知 3.订单完成通知 4.评价通知 5.服务包通知 
 				// 6.社区端发送的通知 7.总后台发送的通知，8.认证申请通知，9.认证结果通知，
 				// 10服务开通通知，11。服务开通结果通知，12，提醒排班，13.排班通知
@@ -486,7 +487,7 @@
 					})
 				} else if (e.type == 6) {
 					// 6.社区端发送的通知
-					
+
 					uni.showModal({
 						title: "社区通知",
 						content: e.content,
@@ -534,26 +535,28 @@
 						confirmText: "知道了",
 						showCancel: false,
 					})
-					
+
 				} else if (e.type == 12) {
 					// 12，提醒排班 跳转到排班
 					uni.navigateTo({
 						url: '/pages/Scheduling'
 					})
-				 
+
 				} else if (e.type == 13) {
 					// 13.排班通知 跳转到排班
 					uni.navigateTo({
 						url: '/pages/Scheduling'
 					})
-			 
+
 				}
 				return false;
 				console.log(e);
 			},
-			
-			readTong:async function(id){
-				let res = this.$request.post("docterMessage/readOk",{'id':id});
+
+			readTong: async function(id) {
+				let res = this.$request.post("docterMessage/readOk", {
+					'id': id
+				});
 				this.getDocterMessage()
 				console.log(res);
 			},

pages/information/information.vue

@@ -9,7 +9,7 @@
 				<u-icon name="arrow-right" color="#C0C0C0"></u-icon>
 			</view>
 		</view>
-		<!-- 个人标签 -->
+		<!-- 个人简介 -->
 		<view style="margin: 36rpx 28rpx;" class="flex align-center justify-around">
 			<view style="width: 40%;font-size: 28rpx;">个人签名</view>
 			<view class="flex align-center" style="width: 60%;">
@@ -17,6 +17,13 @@
 				 :clearable="false" :customStyle="inputStyle" />
 			</view>
 		</view>
+		<!-- 标签 -->
+		<view style="margin: 36rpx 28rpx;font-size: 28rpx;" class="flex align-center justify-between" @click="doctorLabel">
+			<view>标签管理</view>
+			<view class="flex align-center">
+				<u-icon name="arrow-right" color="#C0C0C0"></u-icon>
+			</view>
+		</view>
 		<!-- 服务简介和输入域 -->
 		<view style="margin: 40rpx 28rpx;">
 			<view style="font-size: 28rpx;margin-bottom: 20rpx;">服务简介</view>
@@ -33,7 +40,6 @@
 				<u-icon name="arrow-right" color="#C0C0C0"></u-icon>
 			</view>
 		</view>
-		<u-gap height="30" bg-color="#e1e1e1"></u-gap>
 		<view style="padding: 36rpx 28rpx;" class="flex align-center justify-around" @click="modalShow=true">
 			<view style="width: 95%;font-size: 28rpx;background-color: ;">退出登录</view>
 			<view class="flex align-center">
@@ -95,6 +101,12 @@
 						url:'modifypassword'
 					})
 				},
+				//标签管理
+				doctorLabel(){
+					uni.navigateTo({
+						url:'doctor_label'
+					})
+				},
 				//退出登录
 				edit(){
 					let that = this

uview-ui/components/u-tag/u-tag.vue

@@ -168,6 +168,7 @@
 		display: inline-block;
 		/* #endif */
 		line-height: 1;
+		margin-bottom: 10rpx;
 	}
 	
 	.u-size-default {