瀏覽代碼

修复部分bug

宇宙无敌M1处理器的MacBook Pro 4 年之前
父節點
當前提交
c54d2cbb2c

+ 1 - 1
manifest.json

xqd
@@ -67,7 +67,7 @@
                 "version" : "1.1.5"
             }
         },
-        "appid" : "wx6131f74e623bf6bf",
+        "appid" : "wxd41dd232837996c4",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

+ 1 - 1
pages/childcare/child_care.vue

xqd
@@ -20,7 +20,7 @@
 			<view class="padding-sm bg-white" v-if="doctor!=''">
 				<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
 					<view class="flex flex-direction align-center justify-center margin-right-xs" @click="gotodoctorinfo(item.id)"
-					 style="width: 120rpx;height: 130rpx;" v-for="(item,index) in doctor.docter" :key="index">
+					 style="width: 168rpx;height: 130rpx;" v-for="(item,index) in doctor.docter" :key="index">
 						<u-avatar :src="item.avatar" mode="circle"></u-avatar>
 						<view class="">
 							{{item.name}}

+ 15 - 4
pages/childcare/child_careList.vue

xqd xqd
@@ -100,6 +100,9 @@
 				pageindex: 1
 			}
 		},
+		onReachBottom() {
+			this.getvaccinesList()
+		},
 		methods: {
 			//种类下拉
 			classtype(value) {
@@ -128,10 +131,18 @@
 					organization_id: this.org_id
 				})
 				if (res.status == 0) {
-					this.vaccineList = res.data.data
-					this.vaccineList.forEach(item => {
-						item.checked = false
-					})
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.vaccineList = this.vaccineList.concat(res.data.data)
+						this.vaccineList.forEach(item => {
+							item.checked = false
+						})
+						this.pageindex++
+					}
 					console.log(this.vaccineList)
 				}
 				if (this.vaccineList.length == 0) {

+ 1 - 1
pages/common_tools/home_doctor.vue

xqd
@@ -199,7 +199,7 @@
 					margin-right: 15rpx;
 					background-color: #E5F5FF;
 					color: #0B73B9;
-					width: 100rpx;
+					width: 120rpx;
 					height: 28rpx;
 					font-size: 20rpx;
 					border-radius: 10rpx;

+ 1 - 1
pages/common_tools/my_consulting/my_appointment.vue

xqd
@@ -268,7 +268,7 @@
 		margin-left: 15rpx;
 		background-color: #E5F5FF;
 		color: #0B73B9;
-		width: 100rpx;
+		width: 120rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		border-radius: 10rpx;

+ 1 - 1
pages/common_tools/my_consulting/my_consulting.vue

xqd
@@ -530,7 +530,7 @@
 		margin-left: 15rpx;
 		background-color: #E5F5FF;
 		color: #0B73B9;
-		width: 100rpx;
+		width: 120rpx;
 		height: 28rpx;
 		font-size: 20rpx;
 		border-radius: 10rpx;

+ 1 - 2
pages/index/mine.vue

xqd xqd
@@ -40,7 +40,7 @@
 				<navigator class="width25 m-ycenter overflow pr" v-for="(item,index) in icons" :key="index" hoverClass="none"
 				 @click="gotoinfoorder(item.name)">
 					<image style="width: 76rpx;height: 76rpx;" :src="item.image" mode=""></image>
-					<!-- <view class="tip"></view> -->
+					<view class="tip" v-if="mseeage!=''&&item.name=='我的咨询'"></view>
 					<view class="f14 m-gray-small mt10 line1">{{item.name}}</view>
 				</navigator>
 				<!-- <navigator class="width25 m-ycenter overflow pr" hoverClass="none" url="../common_tools/my_consulting/my_appointment">
@@ -220,7 +220,6 @@
 				})
 				if (res.status == 200) {
 					this.icons = res.data
-					console.log(this.icons, ">>>>>>>>>>>>>>>>>>>>")
 				}
 			},
 			gotoinfoorder(name) {

+ 1 - 1
pages/order/payment.vue

xqd
@@ -84,7 +84,7 @@
 			<view style="height: 100%;width: 100%;">
 				<!-- 标题占20% -->
 				<view style="height: 20%;width: auto;">
-					<text style="font-size: 30rpx;font-weight: bold;display: flex;justify-content: center;align-items: flex-end;height: 100%;">超级妈力</text>
+					<text style="font-size: 30rpx;font-weight: bold;display: flex;justify-content: center;align-items: flex-end;height: 100%;">熙宝健康</text>
 				</view>
 				<!-- 金额占30% -->
 				<view style="height: 30%;width: auto;border-bottom: 1rpx solid #EFEFEF;margin-left: 20rpx;margin-right: 20rpx;">

+ 376 - 376
pages/service_packs/packs_details.vue

xqd
@@ -1,377 +1,377 @@
-<template>
-	<view style="width: 100%;height: 100%;background-color: #ececec;">
-		<!-- 卡券 -->
-		<view class="card">
-			<view class="card_view">
-				<!-- 放图片 标题 -->
-				<view class="title">
-					<image :src="imghos+packs.image" class="img"></image>
-				</view>
-				<!-- 放描述 -->
-				<view class="describe">
-					<view style="font-size: 40rpx;font-weight: bold;">{{packs.name}}</view>
-					<view style="font-size: 28rpx;font-weight: bold;padding-top: 60rpx;">有效期</view>
-					<view style="font-size: 26rpx;color: #999999;padding-top: 30rpx;">自购买服务起{{packs.effective_days}}天</view>
-					<view style="font-size: 28rpx;font-weight: bold;padding-top: 50rpx;">服务包内容介绍</view>
-					<view style="font-size: 26rpx;color: #999999;">
-						<view style="padding: 27rpx 0 12rpx 0;">{{packs.intro}}</view>
-						<rich-text style="padding: 12rpx 0;" :nodes="packs.desc"></rich-text>
-					</view>
-					<view class="margin-top-sm" v-for="(item,index) in packs.team" :key="index">
-						<u-radio-group v-model="value" @change="radioGroupChange">
-							<u-radio :name="item.id" style="font-weight: bold;">
-								{{item.name}}
-							</u-radio>
-						</u-radio-group>
-						<!-- <view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{item.name}}</view> -->
-						<view class="list" v-for="(ite,idx) in item.docter" :key="idx">
-							<!-- 头像 -->
-							<view class="portrait">
-								<view style="padding-top: 20rpx;">
-									<image class="img" :src="ite.avatar"></image>
-									<view class="bun_true" @click="submitCollect" :data-itemindex="index" :data-index="idx" :data-id="ite.id" v-if="ite.is_collect==0">关注</view>
-									<view class="bun_false" @click="submitCollect" :data-itemindex="index" :data-index="idx" :data-id="ite.id"
-									 v-else>已关注</view>
-								</view>
-							</view>
-							<!-- 文字 -->
-							<view class="text">
-								<!-- 名字+标签 -->
-								<view class="name">
-									<view style="margin-right: 15rpx;">{{ite.name}}</view>
-									<view class="label" v-for="(itm,idex) in ite.label_texts" :key="idex">{{itm.label_name}}</view>
-								</view>
-								<!-- 科室 -->
-								<view class="department">
-									<text>科室:</text>
-									<text style="color: #333333;">{{ite.office.name||'暂无'}}</text>
-									<text style="color: #333333;">{{ite.qualification.name||'暂无'}}</text>
-								</view>
-								<!-- 选项 -->
-								<view class="option">
-									<view v-if="ite.is_chat">图文</view>
-									<view v-if="ite.is_phone">电话</view>
-									<view v-if="ite.is_appoint">门诊</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- 协议 -->
-		<view style="height: 200rpx;width: 100%;display: flex;justify-content: left;">
-			<view @click="isqueren" style="height: 35rpx;width: auto;font-size: 24rpx;margin-left: 30rpx;display: flex;align-items: center;">
-				<image :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
-				<text style="color: #999999;">已阅读并同意</text>
-				<text style="color: #0B73B9;" @click.stop="gotoxieyi">《熙宝HMO》</text>
-				<text style="color: #999999;">服务协议</text>
-			</view>
-		</view>
-		<!-- 两个半圆 -->
-		<view class="round" style="position:absolute;top: 25vh;right:0;"></view>
-		<view class="round" style="position:absolute;top: 25vh;"></view>
-		<!-- 底部按钮 -->
-		<view class="footer">
-			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
-				<button class="action" @click="show=true" style="width: 33%;">
-					<view class="cuIcon-service text-green">
-					</view>
-					客服
-				</button>
-				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">下一步</view>
-			</view>
-		</view>
-		<u-popup v-model="show" mode="bottom" border-radius="14" height="300rpx">
-			<u-button open-type="contact" :custom-style="customStyle">在线咨询</u-button>
-			<u-button @click="playphone" :custom-style="customStyle">电话咨询</u-button>
-		</u-popup>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: 'productdetailspage',
-		onLoad(op) {
-			this.serviceid = op.id
-			this.$util.getAgreement().then(res => {
-				this.service_protocol = res.data.service_protocol
-				this.phone = res.data.phone
-			}).catch(err => {
-
-			})
-			this.imghos = this.$imgHost
-		},
-		mounted() {
-			this.getservice()
-		},
-		data() {
-			return {
-				//关注
-				isfollow: false,
-				//协议
-				num: 1,
-				imgitem: {
-					istrue: false,
-					name: "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
-				},
-				packs: {},
-				serviceid: "",
-				show: false,
-				customStyle: {
-					width: '600rpx',
-					marginTop: "35rpx"
-				},
-				service_protocol: "",
-				phone: "",
-				imghos: "",
-				value: ""
-			}
-		},
-		methods: {
-			gotoxieyi() {
-				uni.navigateTo({
-					url: "../index/agreement?data=" + encodeURIComponent(this.service_protocol)
-				})
-			},
-			playphone() {
-				uni.makePhoneCall({
-					phoneNumber: this.phone
-				})
-				this.show = false
-			},
-			radioGroupChange(e) {
-				console.log(e)
-				this.value = e
-			},
-			//关注
-			submitCollect: async function(e) {
-				console.log(e)
-				let res = await this.$request.post("/api/v1/collection/submitCollect", {
-					type: 1,
-					relation_id: e.currentTarget.dataset.id
-				})
-				if (res.status == 0) {
-					if (res.data.is_collect == 0) {
-						uni.showToast({
-							title: "取消成功",
-							icon: "none"
-						})
-						this.packs.team[e.currentTarget.dataset.itemindex].docter[e.currentTarget.dataset.index].is_collect = res.data.is_collect
-					} else {
-						uni.showToast({
-							title: "关注成功",
-							icon: "none"
-						})
-						this.packs.team[e.currentTarget.dataset.itemindex].docter[e.currentTarget.dataset.index].is_collect = res.data.is_collect
-					}
-				}
-			},
-			getservice: async function() {
-				let res = await this.$request.post("/api/v1/ServicePack/servicePackDetail", {
-					service_pack_id: this.serviceid
-				})
-				console.log(res)
-				if (res.status == 0) {
-					this.packs = res.data
-				}
-			},
-			isqueren() {
-				this.num++
-				if (this.num % 2 == 0) {
-					this.imgitem.name = "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyixuan.png"
-					this.imgitem.istrue = true
-
-				} else {
-					this.imgitem.name = "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
-					this.imgitem.istrue = false
-				}
-			},
-			next(e) {
-				if (this.value == '') {
-					uni.showToast({
-						title: "请先选择服务团队",
-						icon: "none"
-					})
-					return false
-				}
-				if (!this.imgitem.istrue) {
-					uni.showToast({
-						icon: 'none',
-						position: 'bottom',
-						title: '请先同意《协议》'
-					});
-				} else {
-					let obj = {
-						id: this.packs.id,
-						price: this.packs.price,
-						is_need_insure: this.packs.is_need_insure,
-						service_pack_protocol: this.packs.service_pack_protocol,
-						team_id: this.value
-					}
-					uni.navigateTo({
-						url: '/pages/service_packs/packs_information?data=' + JSON.stringify(obj)
-					})
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.footer {
-		width: 100%;
-		height: auto;
-		display: flex;
-		position: fixed;
-		bottom: 0;
-	}
-
-	.round {
-		height: 45rpx;
-		width: 50rpx;
-		border-radius: 50%;
-		background-color: #ececec;
-	}
-
-	.card {
-		padding: 30rpx 30rpx;
-		box-sizing: border-box;
-
-		.card_view {
-			width: 100%;
-			background-color: #ffffff;
-			border-radius: 15rpx;
-
-			.title {
-				width: 100%;
-				height: 20vh;
-				display: flex;
-				justify-content: center;
-				align-items: flex-end;
-
-				.img {
-					width: 90%;
-					height: 90%;
-				}
-			}
-
-			.describe {
-				width: 100%;
-				height: 1;
-				padding: 100rpx 40rpx 20rpx 40rpx;
-			}
-		}
-	}
-
-	.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;
-					display: flex;
-					justify-content: 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;
-				}
-			}
-		}
-	}
+<template>
+	<view style="width: 100%;height: 100%;background-color: #ececec;">
+		<!-- 卡券 -->
+		<view class="card">
+			<view class="card_view">
+				<!-- 放图片 标题 -->
+				<view class="title">
+					<image :src="imghos+packs.image" class="img"></image>
+				</view>
+				<!-- 放描述 -->
+				<view class="describe">
+					<view style="font-size: 40rpx;font-weight: bold;">{{packs.name}}</view>
+					<view style="font-size: 28rpx;font-weight: bold;padding-top: 60rpx;">有效期</view>
+					<view style="font-size: 26rpx;color: #999999;padding-top: 30rpx;">自购买服务起{{packs.effective_days}}天</view>
+					<view style="font-size: 28rpx;font-weight: bold;padding-top: 50rpx;">服务包内容介绍</view>
+					<view style="font-size: 26rpx;color: #999999;">
+						<view style="padding: 27rpx 0 12rpx 0;">{{packs.intro}}</view>
+						<rich-text style="padding: 12rpx 0;" :nodes="packs.desc"></rich-text>
+					</view>
+					<view class="margin-top-sm" v-for="(item,index) in packs.team" :key="index">
+						<u-radio-group v-model="value" @change="radioGroupChange">
+							<u-radio :name="item.id" style="font-weight: bold;">
+								{{item.name}}
+							</u-radio>
+						</u-radio-group>
+						<!-- <view style="font-size: 28rpx;font-weight: bold;padding-top: 48rpx;">{{item.name}}</view> -->
+						<view class="list" v-for="(ite,idx) in item.docter" :key="idx">
+							<!-- 头像 -->
+							<view class="portrait">
+								<view style="padding-top: 20rpx;">
+									<image class="img" :src="ite.avatar"></image>
+									<view class="bun_true" @click="submitCollect" :data-itemindex="index" :data-index="idx" :data-id="ite.id" v-if="ite.is_collect==0">关注</view>
+									<view class="bun_false" @click="submitCollect" :data-itemindex="index" :data-index="idx" :data-id="ite.id"
+									 v-else>已关注</view>
+								</view>
+							</view>
+							<!-- 文字 -->
+							<view class="text">
+								<!-- 名字+标签 -->
+								<view class="name">
+									<view style="margin-right: 15rpx;">{{ite.name}}</view>
+									<view class="label" v-for="(itm,idex) in ite.label_texts" :key="idex">{{itm.label_name}}</view>
+								</view>
+								<!-- 科室 -->
+								<view class="department">
+									<text>科室:</text>
+									<text style="color: #333333;">{{ite.office.name||'暂无'}}</text>
+									<text style="color: #333333;">{{ite.qualification.name||'暂无'}}</text>
+								</view>
+								<!-- 选项 -->
+								<view class="option">
+									<view v-if="ite.is_chat">图文</view>
+									<view v-if="ite.is_phone">电话</view>
+									<view v-if="ite.is_appoint">门诊</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 协议 -->
+		<view style="height: 200rpx;width: 100%;display: flex;justify-content: left;">
+			<view @click="isqueren" style="height: 35rpx;width: auto;font-size: 24rpx;margin-left: 30rpx;display: flex;align-items: center;">
+				<image :src="imgitem.name" mode="" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;"></image>
+				<text style="color: #999999;">已阅读并同意</text>
+				<text style="color: #0B73B9;" @click.stop="gotoxieyi">《熙宝HMO》</text>
+				<text style="color: #999999;">服务协议</text>
+			</view>
+		</view>
+		<!-- 两个半圆 -->
+		<view class="round" style="position:absolute;top: 25vh;right:0;"></view>
+		<view class="round" style="position:absolute;top: 25vh;"></view>
+		<!-- 底部按钮 -->
+		<view class="footer">
+			<view class="cu-bar bg-white tabbar border shop" style="width: 100%;">
+				<button class="action" @click="show=true" style="width: 33%;">
+					<view class="cuIcon-service text-green">
+					</view>
+					客服
+				</button>
+				<view class="submit" @click="next" style="background-color: #0B73B9; color: #FFFFFF;">下一步</view>
+			</view>
+		</view>
+		<u-popup v-model="show" mode="bottom" border-radius="14" height="300rpx">
+			<u-button open-type="contact" :custom-style="customStyle">在线咨询</u-button>
+			<u-button @click="playphone" :custom-style="customStyle">电话咨询</u-button>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'productdetailspage',
+		onLoad(op) {
+			this.serviceid = op.id
+			this.$util.getAgreement().then(res => {
+				this.service_protocol = res.data.service_protocol
+				this.phone = res.data.phone
+			}).catch(err => {
+
+			})
+			this.imghos = this.$imgHost
+		},
+		mounted() {
+			this.getservice()
+		},
+		data() {
+			return {
+				//关注
+				isfollow: false,
+				//协议
+				num: 1,
+				imgitem: {
+					istrue: false,
+					name: "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
+				},
+				packs: {},
+				serviceid: "",
+				show: false,
+				customStyle: {
+					width: '600rpx',
+					marginTop: "35rpx"
+				},
+				service_protocol: "",
+				phone: "",
+				imghos: "",
+				value: ""
+			}
+		},
+		methods: {
+			gotoxieyi() {
+				uni.navigateTo({
+					url: "../index/agreement?data=" + encodeURIComponent(this.service_protocol)
+				})
+			},
+			playphone() {
+				uni.makePhoneCall({
+					phoneNumber: this.phone
+				})
+				this.show = false
+			},
+			radioGroupChange(e) {
+				console.log(e)
+				this.value = e
+			},
+			//关注
+			submitCollect: async function(e) {
+				console.log(e)
+				let res = await this.$request.post("/api/v1/collection/submitCollect", {
+					type: 1,
+					relation_id: e.currentTarget.dataset.id
+				})
+				if (res.status == 0) {
+					if (res.data.is_collect == 0) {
+						uni.showToast({
+							title: "取消成功",
+							icon: "none"
+						})
+						this.packs.team[e.currentTarget.dataset.itemindex].docter[e.currentTarget.dataset.index].is_collect = res.data.is_collect
+					} else {
+						uni.showToast({
+							title: "关注成功",
+							icon: "none"
+						})
+						this.packs.team[e.currentTarget.dataset.itemindex].docter[e.currentTarget.dataset.index].is_collect = res.data.is_collect
+					}
+				}
+			},
+			getservice: async function() {
+				let res = await this.$request.post("/api/v1/ServicePack/servicePackDetail", {
+					service_pack_id: this.serviceid
+				})
+				console.log(res)
+				if (res.status == 0) {
+					this.packs = res.data
+				}
+			},
+			isqueren() {
+				this.num++
+				if (this.num % 2 == 0) {
+					this.imgitem.name = "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyixuan.png"
+					this.imgitem.istrue = true
+
+				} else {
+					this.imgitem.name = "https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/img/xieyi.png"
+					this.imgitem.istrue = false
+				}
+			},
+			next(e) {
+				if (this.value == '' && this.packs.team_id != 0) {
+					uni.showToast({
+						title: "请先选择服务团队",
+						icon: "none"
+					})
+					return false
+				}
+				if (!this.imgitem.istrue) {
+					uni.showToast({
+						icon: 'none',
+						position: 'bottom',
+						title: '请先同意《协议》'
+					});
+				} else {
+					let obj = {
+						id: this.packs.id,
+						price: this.packs.price,
+						is_need_insure: this.packs.is_need_insure,
+						service_pack_protocol: this.packs.service_pack_protocol,
+						team_id: this.value
+					}
+					uni.navigateTo({
+						url: '/pages/service_packs/packs_information?data=' + JSON.stringify(obj)
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.footer {
+		width: 100%;
+		height: auto;
+		display: flex;
+		position: fixed;
+		bottom: 0;
+	}
+
+	.round {
+		height: 45rpx;
+		width: 50rpx;
+		border-radius: 50%;
+		background-color: #ececec;
+	}
+
+	.card {
+		padding: 30rpx 30rpx;
+		box-sizing: border-box;
+
+		.card_view {
+			width: 100%;
+			background-color: #ffffff;
+			border-radius: 15rpx;
+
+			.title {
+				width: 100%;
+				height: 20vh;
+				display: flex;
+				justify-content: center;
+				align-items: flex-end;
+
+				.img {
+					width: 90%;
+					height: 90%;
+				}
+			}
+
+			.describe {
+				width: 100%;
+				height: 1;
+				padding: 100rpx 40rpx 20rpx 40rpx;
+			}
+		}
+	}
+
+	.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: 120rpx;
+					height: 28rpx;
+					font-size: 20rpx;
+					border-radius: 10rpx;
+					display: flex;
+					justify-content: 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>

+ 195 - 192
pages/vaccines/vaccinesList.vue

xqd
@@ -1,193 +1,196 @@
-<template>
-	<view class="bg-white">
-		<u-dropdown>
-			<u-dropdown-item @change="classtype" v-model="value" :title="options1[value].label" :options="options1"></u-dropdown-item>
-			<u-dropdown-item @change="pricetype" v-model="price" :title="options3[price].label" :options="options3"></u-dropdown-item>
-			<u-dropdown-item @change="recomtype" v-model="recommend" :title="options2[recommend].label" :options="options2"></u-dropdown-item>
-		</u-dropdown>
-		<view class="padding-lr-sm">
-			<u-search :clearabled="false" shape="round" :show-action="false" placeholder="搜索疫苗名称" v-model="keyword"></u-search>
-		</view>
-		<view class="margin-sm">
-			<view v-for="(item,index) in vaccineList" :key="index" @click="xuanzephone(item)" class="padding bg-white margin-top-sm flex justify-between align-center"
-			 style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
-				<view class="">
-					<view class="text-bold" style="color: #333333;font-size: 30rpx;">
-						{{item.name}}
-					</view>
-					<view class="flex align-center margin-top-xs">
-						<view class="mianfei margin-right-xs" style="font-size:22rpx;color: #EEAA3F;">
-							{{item.type==1?'免费':'¥'+item.price/100}}
-						</view>
-						<view class="typestyle" style="font-size:22rpx;color: #0B73B9;">
-							{{item.type==1?'I类':'II类'}}
-						</view>
-					</view>
-					<view class="margin-top-xs" style="color: #999999; font-size: 26rpx;">
-						备注:<text style="color: #666666;">{{item.remark||'暂无'}}</text>
-					</view>
-					<view class="margin-top-xs" style="color: #999999; font-size: 26rpx;">
-						厂家:<text style="color: #666666;">{{item.supplier||'暂无厂家'}}</text>
-					</view>
-				</view>
-				<view class="">
-					<u-radio-group v-model="danxuan">
-						<u-radio @change="radioChange" :key="index" :name="item.id">
-						</u-radio>
-					</u-radio-group>
-				</view>
-			</view>
-		</view>
-		<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
-		<view class="cu-tabbar-height"></view>
-		<view class="cu-tabbar-height"></view>
-	</view>
-</template>
-
-<script>
-	export default {
-		onLoad(options) {
-			this.org_id = options.id
-			this.getvaccinesList()
-		},
-		onShow() {
-
-		},
-		data() {
-			return {
-				org_id: "",
-				vaccineList: [],
-				keyword: "",
-				value: 0, //种类
-				price: 0, //价格
-				recommend: 0, //推荐
-				options1: [{
-					value: 0,
-					label: "全部种类"
-				}, {
-					value: 1,
-					label: "I类"
-				}, {
-					value: 2,
-					label: "II类"
-				}, ],
-				options2: [{
-					value: 0,
-					label: "推荐排序"
-				}, {
-					value: 1,
-					label: "低价优先"
-				}, {
-					value: 2,
-					label: "高价优先"
-				}, ],
-				options3: [{
-					value: 0,
-					label: "全部价格"
-				}, {
-					value: 1,
-					label: "免费"
-				}, {
-					value: 2,
-					label: "收费"
-				}, ],
-				danxuan: "",
-				show: false,
-				pageindex: 1
-			}
-		},
-		methods: {
-			//种类下拉
-			classtype(value) {
-				this.value = value
-				this.pageindex = 1
-				this.vaccineList = []
-				this.getvaccinesList()
-			},
-			//价格下拉
-			pricetype(value) {
-				this.price = value
-				this.pageindex = 1
-				this.vaccineList = []
-				this.getvaccinesList()
-			},
-			//推荐下拉
-			recomtype(value) {
-				this.recommend = value
-				this.pageindex = 1
-				this.vaccineList = []
-				this.getvaccinesList()
-			},
-			getvaccinesList: async function() {
-				let res = await this.$request.post("/api/v1/vaccine/vaccineList", {
-					page: this.pageindex,
-					name: this.keyword,
-					type: this.value,
-					sort_type: this.recommend,
-					organization_id: this.org_id
-				})
-				if (res.status == 0) {
-					if (this.pageindex > res.data.last_page) {
-						uni.showToast({
-							title: "没有更多了",
-							icon: "none"
-						})
-					} else {
-						this.vaccineList = this.vaccineList.concat(res.data.data)
-						this.pageindex++
-					}
-				}
-				if (this.vaccineList.length == 0) {
-					this.show = true
-				} else {
-					this.show = false
-				}
-			},
-			xuanzephone(item) {
-				if (item.stock <= 0) {
-					uni.showToast({
-						title: "该疫苗库存不足",
-						icon: "none"
-					})
-					return false
-				}
-				this.danxuan = item.id
-				let pages = getCurrentPages(); //获取所有页面栈实例列表
-				let nowPage = pages[pages.length - 1]; //当前页页面实例
-				let prevPage = pages[pages.length - 2]; //上一页页面实例
-				prevPage.$vm.yimiaoInfo = item
-				uni.navigateBack({ //uni.navigateTo跳转的返回,默认1为返回上一级
-					delta: 1
-				});
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff;
-	}
-
-	.main {}
-
-	.mianfei {
-		width: 60rpx;
-		height: 30rpx;
-		background: #FFF0D9;
-		// border-radius: 16rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.typestyle {
-		width: 44rpx;
-		height: 30rpx;
-		background: #E5F5FF;
-		// border-radius: 16rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
+<template>
+	<view class="bg-white">
+		<u-dropdown>
+			<u-dropdown-item @change="classtype" v-model="value" :title="options1[value].label" :options="options1"></u-dropdown-item>
+			<u-dropdown-item @change="pricetype" v-model="price" :title="options3[price].label" :options="options3"></u-dropdown-item>
+			<u-dropdown-item @change="recomtype" v-model="recommend" :title="options2[recommend].label" :options="options2"></u-dropdown-item>
+		</u-dropdown>
+		<view class="padding-lr-sm">
+			<u-search :clearabled="false" shape="round" :show-action="false" placeholder="搜索疫苗名称" v-model="keyword"></u-search>
+		</view>
+		<view class="margin-sm">
+			<view v-for="(item,index) in vaccineList" :key="index" @click="xuanzephone(item)" class="padding bg-white margin-top-sm flex justify-between align-center"
+			 style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
+				<view class="">
+					<view class="text-bold" style="color: #333333;font-size: 30rpx;">
+						{{item.name}}
+					</view>
+					<view class="flex align-center margin-top-xs">
+						<view class="mianfei margin-right-xs" style="font-size:22rpx;color: #EEAA3F;">
+							{{item.type==1?'免费':'¥'+item.price/100}}
+						</view>
+						<view class="typestyle" style="font-size:22rpx;color: #0B73B9;">
+							{{item.type==1?'I类':'II类'}}
+						</view>
+					</view>
+					<view class="margin-top-xs" style="color: #999999; font-size: 26rpx;">
+						备注:<text style="color: #666666;">{{item.remark}}</text>
+					</view>
+					<view class="margin-top-xs" style="color: #999999; font-size: 26rpx;">
+						厂家:<text style="color: #666666;">{{item.supplier||'暂无厂家'}}</text>
+					</view>
+				</view>
+				<view class="">
+					<u-radio-group v-model="danxuan">
+						<u-radio @change="radioChange" :key="index" :name="item.id">
+						</u-radio>
+					</u-radio-group>
+				</view>
+			</view>
+		</view>
+		<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
+		<view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(options) {
+			this.org_id = options.id
+			this.getvaccinesList()
+		},
+		onShow() {
+
+		},
+		data() {
+			return {
+				org_id: "",
+				vaccineList: [],
+				keyword: "",
+				value: 0, //种类
+				price: 0, //价格
+				recommend: 0, //推荐
+				options1: [{
+					value: 0,
+					label: "全部种类"
+				}, {
+					value: 1,
+					label: "I类"
+				}, {
+					value: 2,
+					label: "II类"
+				}, ],
+				options2: [{
+					value: 0,
+					label: "推荐排序"
+				}, {
+					value: 1,
+					label: "低价优先"
+				}, {
+					value: 2,
+					label: "高价优先"
+				}, ],
+				options3: [{
+					value: 0,
+					label: "全部价格"
+				}, {
+					value: 1,
+					label: "免费"
+				}, {
+					value: 2,
+					label: "收费"
+				}, ],
+				danxuan: "",
+				show: false,
+				pageindex: 1
+			}
+		},
+		onReachBottom() {
+			this.getvaccinesList()
+		},
+		methods: {
+			//种类下拉
+			classtype(value) {
+				this.value = value
+				this.pageindex = 1
+				this.vaccineList = []
+				this.getvaccinesList()
+			},
+			//价格下拉
+			pricetype(value) {
+				this.price = value
+				this.pageindex = 1
+				this.vaccineList = []
+				this.getvaccinesList()
+			},
+			//推荐下拉
+			recomtype(value) {
+				this.recommend = value
+				this.pageindex = 1
+				this.vaccineList = []
+				this.getvaccinesList()
+			},
+			getvaccinesList: async function() {
+				let res = await this.$request.post("/api/v1/vaccine/vaccineList", {
+					page: this.pageindex,
+					name: this.keyword,
+					type: this.value,
+					sort_type: this.recommend,
+					organization_id: this.org_id
+				})
+				if (res.status == 0) {
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						this.vaccineList = this.vaccineList.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+				if (this.vaccineList.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
+				}
+			},
+			xuanzephone(item) {
+				if (item.stock <= 0) {
+					uni.showToast({
+						title: "该疫苗库存不足",
+						icon: "none"
+					})
+					return false
+				}
+				this.danxuan = item.id
+				let pages = getCurrentPages(); //获取所有页面栈实例列表
+				let nowPage = pages[pages.length - 1]; //当前页页面实例
+				let prevPage = pages[pages.length - 2]; //上一页页面实例
+				prevPage.$vm.yimiaoInfo = item
+				uni.navigateBack({ //uni.navigateTo跳转的返回,默认1为返回上一级
+					delta: 1
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.main {}
+
+	.mianfei {
+		width: 60rpx;
+		height: 30rpx;
+		background: #FFF0D9;
+		// border-radius: 16rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.typestyle {
+		width: 44rpx;
+		height: 30rpx;
+		background: #E5F5FF;
+		// border-radius: 16rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 </style>

+ 1 - 1
pages/vaccines/vaccines_info.vue

xqd
@@ -20,7 +20,7 @@
 			<view class="padding-sm bg-white" v-if="doctor!=''">
 				<scroll-view scroll-x="true" enable-flex="true" style="display: flex;height: 145rpx;">
 					<view class="flex flex-direction align-center justify-center margin-right-xs" @click="gotodoctorinfo(item.id)"
-					 style="width: 120rpx;height: 130rpx;" v-for="(item,index) in doctor.docter" :key="index">
+					 style="width: 168rpx;height: 130rpx;" v-for="(item,index) in doctor.docter" :key="index">
 						<u-avatar :src="item.avatar" mode="circle"></u-avatar>
 						<view class="">
 							{{item.name}}