no message

pages.json

@@ -232,8 +232,8 @@
 		"current": 0,
 		"list": [{
 			"name": "工具",
-			"path": "pages/index/mine"
-			// "path": "pages/service_packs/packs_details"//服务包
+			"path": "pages/index/mine"//我的
+			// "path": "pages/service_packs/introduce"//服务包
 		}]
 	}
 }

pages/common_tools/collection/collection.vue

@@ -1,8 +1,103 @@
 <template>
+	<view style="width: 100;height: 100%;background-color: #f6f6f6;padding: 20rpx 30rpx;">
+		<view class="list" v-for="item,index in listArray" :key='index' @click="open" :data-index="index">
+			<view class="text">
+				<view class="title">{{item.title}}</view>
+				<view class="type">{{item.type}}</view>
+			</view>
+			<view class="img">
+				<image :src="item.img" class="i" mode="aspectFit"></image>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				listArray: [{
+					title: '钢铁是怎样炼成的',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}, {
+					title: '成都富婆通讯录',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}, {
+					title: '迪迦变身器使用手册',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}, {
+					title: '小红书',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}, {
+					title: '小黄书',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}, {
+					title: '金瓶梅',
+					type: '文章类型',
+					img: 'https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/横占位图.png'
+				}]
+			}
+		},
+		methods: {
+			//点击文章
+			open(e) {
+				console.log(this.listArray[e.currentTarget.dataset.index].title)
+				uni.navigateTo({
+					url: '/pages/common_tools/collection/collection_details?title=' + this.listArray[e.currentTarget.dataset.index].title
+					// url: '/pages/customer/customer-datails?n=' + n
+				})
+			}
+		},
+
+	}
 </script>
 
-<style>
+<style lang="scss">
+	//每一条文章
+	.list {
+		margin-bottom: 20rpx;
+		border-radius: 12rpx;
+		background-color: #ffffff;
+		padding: 25rpx 20rpx;
+		display: flex;
+		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.04);
+
+		.text {
+			width: 60%;
+			height: 165rpx;
+			padding-right: 25rpx;
+
+			.title {
+				height: 80%;
+				font-size: 30rpx;
+				font-weight: bold;
+				// overflow: hidden; //超出一行文字自动隐藏 
+				// text-overflow: ellipsis; //文字隐藏后添加省略号
+				// white-space: nowrap; //强制不换行
+			}
+
+			.type {
+				font-size: 26rpx;
+				color: #666666;
+				font-weight: 400;
+				height: 20%;
+				bottom: 0;
+			}
+		}
+
+		.img {
+			width: 40%;
+			height: 100%;
+
+			.i {
+				width: 272rpx;
+				height: 157rpx;
+			}
+		}
+	}
 </style>

pages/common_tools/help_feedback/help_feedback.vue

@@ -8,7 +8,7 @@
 		<view class="list">
 			<u-collapse>
 				<u-collapse-item :title="item.head" v-for="(item, index) in itemList" :key="index" head-style="font-size: 28rpx;">
-					<view class="body">{{item.body}}</view>
+					<div class="body">{{item.body}}</div>
 				</u-collapse-item>
 			</u-collapse>
 		</view>
@@ -26,7 +26,7 @@
 			return {
 				itemList: [{
 					head: "赏识在于角度的转换",
-					body: "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
+					body: "1111111111\n11111111</br>11111111111111111111111111111111111111111111111111111111111111111111111111111111111111",
 					open: true,
 					disabled: true
 				}, {

pages/common_tools/help_feedback/opinion1.vue

@@ -1,8 +1,88 @@
-<template>
+<template style=" background-color: #FFFFFF">
+	<view style="height: 100%;width: 100%;background-color: #FFFFFF">
+		<view style="width: 100vw;height: 100vh;">
+			<view style="height: 20rpx;w^idth: 100%;background-color: #F6F6F6;"></view>
+			<!-- 标题 -->
+			<view class="title">请描述您遇到的问题</view>
+			<!-- 问题列表 -->
+			<view class="textArea">
+				<view class="body">
+					<textarea placeholder="请描述您遇到的问题" maxlength="200" @input="input" style="font-size: 28rpx;color: #666666;height: 250rpx;width: 100%;" />
+					<view style="height: 68rpx;width: 100%;color:#999999;padding: 20rpx 30rpx;font-size: 28rpx;text-align: right;">
+					{{problem_lenght}}/200
+				</view>
+			</view>
+		</view>
+		<view style="width: 100%;padding:40rpx 30rpx 0 30rpx;font-size: 26rpx;color: #999999;">请详细描述您的问题或建议，我们将及时跟你并解决。</view>
+		<view class="footer">
+			<view style="width: 100%;text-align: center;padding-bottom: 35rpx;">
+				<text style="color: #999999;font-size: 24rpx;">如有疑问，请联系客服\n08:30-22:00</text>
+			</view>
+			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
+				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF; font-size: 32rpx;" >提交反馈</view>
+			</view>
+		</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				problem:'',
+				problem_lenght:'0'
+			}
+		},
+		methods:{
+			//输入问题
+			input(e){
+				this.problem = e.detail.value
+				this.problem_lenght = this.problem.length
+				console.log(this.problem);
+				console.log(this.problem_lenght);
+			},
+			next(e){
+				// uni.navigateTo({
+					// url:'/pages/common_tools/help_feedback/opinion1'
+				// })
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss">
+	.title {
+		background-color: #FFFFFF;
+		height: auto;
+		display: flex;
+		align-items: center;
+		padding: 30rpx 30rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.textArea {
+		height: auto;
+		width: 100%;
+		padding: 0 30rpx;
+background-color: #FFFFFF;
+		.body {
+			width: 100%;
+			height: auto;
+			padding: 35rpx 20rpx;
+			word-break: break-all;
+			word-wrap: break-word;
+			background: #F6F6F6;
+			border-radius: 10rpx;
+		}
+	}
+
+	.footer {
+		width: 100%;
+		height: auto;
+		display: block;
+		position: fixed;
+		bottom: 0;
+	}
 </style>

pages/common_tools/home_doctor.vue

@@ -1,8 +1,251 @@
 <template>
+	<view style="height: 100%;width: 100%; padding: 20rpx 30rpx;">
+		<view class="list" v-for="item,index in tcTeam" :key='index' @click="clicklist" :data-index="index">
+			<!-- 头像 -->
+			<view class="portrait">
+				<view style="padding-top: 20rpx;">
+					<image class="img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/头像.png"></image>
+					<view class="bun_true" @click="follow"  v-if="!item.follow">关注</view>
+					<view class="bun_false" @click="follow" :data-index="index" v-else>已关注</view>
+				</view>
+			</view>
+			<!-- 文字 -->
+			<view class="text">
+				<!-- 名字+标签 -->
+				<view class="name">
+					<view style="margin-right: 15rpx;">{{item.name}}</view>
+					<view class="label">{{item.label1}}</view>
+					<view class="label">{{item.label2}}</view>
+				</view>
+				<!-- 科室 -->
+				<view class="department">
+					<text>科室:</text>
+					<text style="color: #333333;">{{item.department1}}</text>
+					<text style="color: #333333;">{{item.department2}}</text>
+				</view>
+				<!-- 选项 -->
+				<view class="option">
+					<view>图文</view>
+					<view>电话</view>
+					<view>门诊</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				//关注
+				isfollow: false,
+				//协议
+				num: 1,
+				imgitem: {
+					istrue: false,
+					name: "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
+				},
+				tcID: '套餐一', //ID
+				tcTime: '一年', //套餐有效期
+				tcContent: { //套餐内容
+					content: '套餐一包含包含疫苗接种、门诊预约、儿保预约三项服务', //内容
+					scope: '使用范围：家医团队可用，有效期内无限次、300元额度以内门诊预约与儿保预约无限制', //范围
+					giving: '赠送XXXX保险：保险介绍' //赠送
+				},
+				tcTeam: [{
+					id: '1',
+					name: '熊大',
+					label1: '熊',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '2',
+					name: '熊二',
+					label1: '熊',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '3',
+					name: '光头强',
+					label1: '人',
+					label2: '主角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '4',
+					name: '李老板',
+					label1: '人',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '5',
+					name: '吉吉国王',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '6',
+					name: '毛毛',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}, {
+					id: '7',
+					name: '蹦蹦',
+					label1: '猴子',
+					label2: '配角',
+					department1: '外科',
+					department2: '主任医师',
+					follow: false
+				}],
+				packs: {
+					id: '', //ID
+					name: '', //名称
+					intro: '', //简介
+					desc: '', //详细介绍
+					price: '', //价格(单位分)
+					team_id: '', //医生团队ID
+					phone_minutes: '', //电话分钟数
+					chat_num: '', //图文咨询次数
+					appoint_num: '', //门诊预约次数
+					vaccine_limit_amount: '', //疫苗总金额限制
+					nurses_limit_amount: '', //儿保总金额限制
+					effective_days: '', //有效天数
+					created_at: '', //创建时间
+					updated_at: '' //更新时间
+				}
+			}
+		},
+		methods: {
+			//关注
+			follow(e) {
+				console.log(this.tcTeam[e.currentTarget.dataset.index])
+
+			}
+		}
+	}
 </script>
 
-<style>
+<style lang="scss">
+	.list {
+		margin: 20rpx 0 10rpx 0;
+		display: flex;
+		width: 100%;
+		height: 200rpx;
+		border-radius: 15rpx;
+		background-color: #FFFFFF;
+		box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.08);
+
+		.portrait {
+			width: 30%;
+			height: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+
+
+			.img {
+				width: 100rpx;
+				height: 100rpx;
+				border-radius: 50%;
+			}
+
+			.bun_true {
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #D92975;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				padding: 3rpx 0;
+			}
+
+			.bun_false {
+				border: 1rpx solid #D92975;
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #FFFFFF;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #D92975;
+				padding: 3rpx 0;
+			}
+		}
+
+		//文字
+		.text {
+			width: 70%;
+			height: 100%;
+
+			padding: 20rpx 0;
+
+			//名字+标签
+			.name {
+				font-size: 30rpx;
+				font-weight: bold;
+				display: flex;
+				align-items: center;
+
+				.label {
+					font-weight: 400;
+					margin-right: 15rpx;
+					background-color: #E5F5FF;
+					color: #0B73B9;
+					width: 100rpx;
+					height: 28rpx;
+					font-size: 20rpx;
+					border-radius: 10rpx;
+					text-align: center;
+					align-items: center;
+				}
+			}
+
+			//科室
+			.department {
+				padding: 20rpx 0;
+				color: #666666;
+
+				text {
+					margin-right: 15rpx;
+				}
+			}
+
+			// 选项
+			.option {
+				display: flex;
+
+				view {
+					background-color: #E4E4E4;
+					width: 100rpx;
+					height: 48rpx;
+					border-radius: 12px;
+					margin-right: 15rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+				}
+			}
+		}
+	}
 </style>

pages/order/order.vue

@@ -1,5 +1,6 @@
 <template>
 	<view style="padding: 40rpx 30rpx; background-color: #f6f6f6;height: 100vh;width: 100vw;">
+		
 		<!-- 卡片 -->
 		<view class="card">
 			<!-- 图片 -->

pages/service_packs/packs_details.vue

@@ -24,7 +24,8 @@
 						<view class="portrait">
 							<view style="padding-top: 20rpx;">
 								<image class="img" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/头像.png"></image>
-								<view class="bun" @click="follow">关注</view>
+								<view class="bun_true" @click="follow" :data-index="index" v-if="!item.follow">关注</view>
+								<view class="bun_false" @click="follow" :data-index="index" v-else>已关注</view>
 							</view>
 						</view>
 						<!-- 文字 -->
@@ -53,8 +54,8 @@
 			</view>
 		</view>
 		<!-- 协议 -->
-		<view style="height: 200rpx;width: 100%;display: flex;justify-content: flex-end;">
-			<view style="height: 35rpx;width: auto;font-size: 24rpx;margin-right: 30rpx;display: flex;align-items: center;">
+		<view style="height: 200rpx;width: 100%;display: flex;justify-content: left;">
+			<view style="height: 35rpx;width: auto;font-size: 24rpx;margin-left: 30rpx;display: flex;align-items: center;">
 				<image @click="isqueren" :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
 				<text style="color: #999999;">已阅读并同意</text>
 				<text style="color: #0B73B9;">《超级宝妈宝》</text>
@@ -83,6 +84,8 @@
 		name: 'productdetailspage',
 		data() {
 			return {
+				//关注
+				isfollow: false,
 				//协议
 				num: 1,
 				imgitem: {
@@ -102,49 +105,56 @@
 					label1: '熊',
 					label2: '主角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '2',
 					name: '熊二',
 					label1: '熊',
 					label2: '主角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '3',
 					name: '光头强',
 					label1: '人',
 					label2: '主角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '4',
 					name: '李老板',
 					label1: '人',
 					label2: '配角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '5',
 					name: '吉吉国王',
 					label1: '猴子',
 					label2: '配角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '6',
 					name: '毛毛',
 					label1: '猴子',
 					label2: '配角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}, {
-					id: '1',
+					id: '7',
 					name: '蹦蹦',
 					label1: '猴子',
 					label2: '配角',
 					department1: '外科',
-					department2: '主任医师'
+					department2: '主任医师',
+					follow: false
 				}],
 				packs: {
 					id: '', //ID
@@ -167,6 +177,7 @@
 		methods: {
 			//关注
 			follow(e) {
+				console.log(this.tcTeam[e.currentTarget.dataset.index])
 
 			},
 			isqueren() {
@@ -187,9 +198,9 @@
 						position: 'bottom',
 						title: '请先同意《协议》'
 					});
-				}else{
+				} else {
 					uni.navigateTo({
-						url:'/pages/service_packs/packs_information'
+						url: '/pages/service_packs/packs_information'
 					})
 				}
 			}
@@ -267,7 +278,7 @@
 				border-radius: 50%;
 			}
 
-			.bun {
+			.bun_true {
 				text-align: center;
 				width: 80rpx;
 				height: 36rpx;
@@ -280,6 +291,21 @@
 				color: #FFFFFF;
 				padding: 3rpx 0;
 			}
+
+			.bun_false {
+				border: 1rpx solid #D92975;
+				text-align: center;
+				width: 80rpx;
+				height: 36rpx;
+				background-color: #FFFFFF;
+				margin: 0 10rpx;
+				border-radius: 60rpx;
+				position: relative;
+				top: -20rpx;
+				font-size: 20rpx;
+				color: #D92975;
+				padding: 3rpx 0;
+			}
 		}
 
 		//文字
@@ -318,7 +344,6 @@
 					margin-right: 15rpx;
 				}
 			}
-
 			// 选项
 			.option {
 				display: flex;
@@ -334,10 +359,6 @@
 					align-items: center;
 				}
 			}
-
 		}
-
-
-
 	}
 </style>