Merge remote-tracking branch 'origin/dev' into dev

api/conversion.js

@@ -0,0 +1,29 @@
+export function getSex(idCard) {
+  if (idCard.length === 15) {
+    return ['女', '男'][idCard.substr(14, 1) % 2]
+  } else if (idCard.length === 18) {
+    return ['女', '男'][idCard.substr(16, 1) % 2]
+  }
+  return ''
+}
+
+export function getBirthday(idCard) {
+  var birthday = "";
+  if (idCard != null && idCard != "") {
+    if (idCard.length == 15) {
+      birthday = "19" + idCard.substr(6, 6);
+    } else if (idCard.length == 18) {
+      birthday = idCard.substr(6, 8);
+    }
+    // birthday = birthday.replace(/(.{4})(.{2})/, "$1-$2-");
+  }
+  return birthday;
+};
+// 出生日期转年龄
+export function getAgeFun(value) {
+  var birthdays = new Date(value.replace(/-/g, "/")); //value 是传入的值
+  var time = new Date(); //当前时间
+  var age = time.getFullYear() - birthdays.getFullYear() - (time.getMonth() < birthdays.getMonth() || (time.getMonth() == birthdays.getMonth() &&
+ time.getDate() < birthdays.getDate()) ? 1 : 0);
+  return age;
+}

api/pages/medicalservice/index.js

@@ -6,4 +6,11 @@ export function getPoserInfoListByType() {
 		method: 'GET'
 	})
 }
+// 获取当前预约详情
+export function getScreening(patientId) {
+	return request({
+		url: `/nurseApplet/screening/record/getScreening/${patientId}`,
+		method: 'GET'
+	})
+}
 

api/pagesB/orderlist/orderlist.js

@@ -0,0 +1,15 @@
+import request from "../../request.js"
+// 获取预约列表
+export function getOrderList(patientId,pageNum,pageSize) {
+	return request({
+		url: `/nurseApplet/screening/record/list?patientId=${patientId}&pageNum=${pageNum}&pageSize=${pageSize}`  ,
+		// data: data,
+		method: 'get'
+	})
+}
+// export function inviteFriends(patientId) {
+// 	return request({
+// 		url: `/nurseApplet/patientInfo/inviteFriends?inviteId=${patientId}`,
+// 		method: 'post'
+// 	})
+// }

api/pagesB/screenOrder/index.js

@@ -0,0 +1,242 @@
+// import request from '../jsIndex'
+import request from "../../request.js"
+
+
+// 济南
+// 预约
+export function screenOrder(data) {
+	return request({
+		url: '/nurseApplet/screening/record/save',
+		data: data,
+		method: 'post'
+	})
+}
+
+// 获取当前预约详情
+export function getScreening(registerId) {
+	return request({
+		url: `/screening/getScreening/${registerId}`,
+		method: 'GET'
+	})
+}
+
+// 取消预约
+export function cancelOrder(screeningId) {
+	return request({
+		url: `/screening/cancel/${screeningId}`,
+		method: 'GET'
+	})
+}
+
+// 保存血压
+export function saveBP(data) {
+	return request({
+		url: '/health/saveBP',
+		data: data,
+			method: 'post'
+	})
+}
+
+// 保存血糖
+export function saveBG(data) {
+	return request({
+		url: '/health/saveBG',
+		data: data,
+		method: 'post'
+	})
+}
+
+// 绑定设备
+export function jnBindDevice(data) { //bindDevice
+	return request({
+		url: '/bind/bindDevice',
+		data: data,
+		method: 'post'
+	})
+}
+
+// 查询绑定设备
+export function getbindDeviceList(registerId) {
+	return request({
+		url: `/bind/findList/${registerId}`,
+		method: 'get'
+	})
+}
+// 解绑设备
+export function deleteDevice(data) {
+	return request({
+		url: `/bind/del/${data.registerId}/${data.sn}`,
+		method: 'get'
+	})
+}
+
+// 激活服务
+export function activateServe(data) {
+	return request({
+		url: '/resident/activatePackage',
+		data: data,
+		method: 'post'
+	})
+}
+// 是否已激活服务
+export function whetherActivate(registerId) {
+	return request({
+		url: `/resident/getByResident/${registerId}`,
+		method: 'get'
+	})
+}
+// 获取最新的处方记录
+export function newPrescription(registerId) {
+	return request({
+		url: `/prescriptionRecord/getLastRecord/${registerId}`,
+		method: 'get'
+	})
+}
+// 查询处方记录
+export function prescriptionRecord(registerId) {
+	return request({
+		url: `/prescriptionRecord/getByResident/${registerId}`,
+		method: 'get'
+	})
+}
+// 查询处方详情
+export function prescriptionDetail(recordId) {
+	return request({
+		url: `/preRecordDetail/getByRecord/${recordId}`,
+		method: 'get'
+	})
+}
+// 获取筛查结果列表
+export function screeningResultList(registerId) {
+	return request({
+		url: `/screening/record?registerId=${registerId}`,
+		method: 'get'
+	})
+}
+// 获取最新的筛查结果
+export function lastScreeningResult(registerId) {
+	return request({
+		url: `/screening/last/${registerId}`,
+		method: 'get'
+	})
+}
+// 获取筛查结果详情
+export function screeningResultDetail(screeningId) {
+	return request({
+		url: `/screening/detail/${screeningId}`,
+		method: 'get'
+	})
+}
+// 每日健康 添加饮食
+export function addDiet(data) {
+	return request({
+		url: '/health/saveDiet',
+		data: data,
+		method: 'post'
+	})
+}
+// 每日健康 添加运动
+export function addSport(data) {
+	return request({
+		url: '/health/saveSport',
+		data: data,
+		method: 'get'
+	})
+}
+// 每日健康 添加用药
+export function addMedication(data) {
+	return request.post({
+		url: '/health/saveMedication',
+		data: data
+	})
+}
+// 获取每日健康记录
+export function getEverydayHealthRecord(data) {
+	return request.get({
+		url: `/health/getInfo/${data.registerId}/${data.date}`
+	})
+}
+// 获取某天饮食记录
+export function getDietOfDayHealthRecord(data) {
+	return request.get({
+		url: `/health/getDietOfDay/${data.registerId}/${data.date}`
+	})
+}
+// 获取某天运动记录
+export function getSportOfDayHealthRecord(data) {
+	return request.get({
+		url: `/health/getSportOfDay/${data.registerId}/${data.date}`
+	})
+}
+// 获取某天用药记录
+export function getMedicationOfDayHealthRecord(data) {
+	return request.get({
+		url: `/health/getMedicationOfDay/${data.registerId}/${data.date}`
+	})
+}
+// 获取筛查结果 图片
+export function getScreeningResultPic(fileId) {
+	return request.get({
+		url: `/system/file/view/${fileId}`
+	})
+}
+// 修改用户信息
+export function changeUserInfo(data) {
+	return request.post({
+		url: '/register/update',
+		data: data
+	})
+}
+// 获取机构列表
+export function getDeptList() {
+	return request({
+		url: `/nurseApplet/hospital/getList`,
+		method: 'get'
+	})
+}
+// 获取筛查项目列表
+export function getProlist(data) {
+	return request({
+		url: '/nurseApplet/screening/project/list',
+		data: data,
+		method: 'get'
+	})
+}
+// 获取预约列表
+export function getOrderList(data) {
+	return request.get({
+		url: '/screening/list',
+		data: data
+	})
+}
+// 获取最后一次血糖记录
+export function getLastBgRecord(registerId) {
+	return request.get({
+		url: `/health/getLastBG/${registerId}`,
+	})
+}
+// 获取最后一次血压 心率 记录
+export function getLastBpAndHrRecord(registerId) {
+	return request.get({
+		url: `/health/getLastBP/${registerId}`,
+	})
+}
+// 获取复诊记录时间轴
+export function getSubsequentVisitTime(identity) {
+	return request.get({
+		url: `/performance/timelineList/${identity}`,
+	})
+}
+// 获取复诊记录详情
+export function getSubsequentVisitDetail(perRecordId) {
+	return request.get({
+		url: `/performance/getDetail/${perRecordId}`,
+	})
+}
+// 推送筛查项目跳转查询推荐详情
+export function getScreeningDetail(assessRecordId) {
+	return request.get({
+		url: `/screening/getInfo/${assessRecordId}`,
+	})
+}
+// end

components/ld-select/ld-select.vue

@@ -99,7 +99,6 @@
 			}
 		},
 		created() {
-			console.log(this.value)
 		},
 		methods: {
 			get_value(val){ // 将数组值转换为以,隔开的字符串
@@ -141,7 +140,6 @@
 				let val = this.getValueKeyValue(item);
 				if(this.multiple){
 					let _value = this.value;
-					console.log(_value,this.value)
 					let index = _value.indexOf(val);
 					if(index!=-1){
 						_value.splice(index,1)

pages.json

@@ -65,10 +65,12 @@
 				}
 			},
 			{
-				"path": "disease/disease",
+				"path": "orderlist/orderlist",
 				"style": {
-					"navigationBarTitleText": "疾病类型选择",
+					"navigationBarTitleText": "预约详情",
-					"enablePullDownRefresh": false
+					"enablePullDownRefresh": false,
+					// "navigationStyle": "default",
+					"navigationBarBackgroundColor": "#4ac4ab"
 				}
 			},
 			{
@@ -419,13 +421,13 @@
 					"enablePullDownRefresh": false
 				}
 			},
-			// {
+			{
-			// 	"path": "Filinginformation/Filinginformation",
+				"path": "Filinginformation/Filinginformation",
-			// 	"style": {
+				"style": {
-			// 		"navigationBarTitleText": "查看建档信息"
+					"navigationBarTitleText": "查看建档信息"
-			// 		// "enablePullDownRefresh": false
+					// "enablePullDownRefresh": false
-			// 	}
+				}
-			// },
+			},
 			{
 				"path": "Onlinesigning/Onlinesigning",
 				"style": {

pages/medicalservice/medicalservice.vue

@@ -46,7 +46,8 @@
 		mapActions
 	} from "vuex";
 	import {
-		getPoserInfoListByType
+		getPoserInfoListByType,
+		getScreening
 	} from '@/api/pages/medicalservice/index.js'
 	import {
 		getHeathHousingList
@@ -58,6 +59,7 @@
 				pageNum: 1,
 				pageSize: 5,
 				informationCategoryVOList: [], //咨询信息
+				patientId:'',
 			};
 		},
 		onShow() {
@@ -66,9 +68,57 @@
 		},
 		methods: {
 			goAppointmentscreening(){
+				// 筛查预约
+
+					// this.userInfo
+					// let userInfo = uni.getStorageSync('userInfo')
+					// if (!userInfo) {
+					// 	uni.showModal({
+					// 		title: "提示",
+					// 		content: "您还未注册，是否去注册？",
+					// 		confirmText: '是',
+					// 		cancelText: '否',
+					// 		success(res) {
+					// 			if (res.confirm) {
+					// 				uni.redirectTo({
+					// 					url: "/pages/login/login?mode=注册"
+					// 				})
+					// 			} else {
+					// 				wx.exitMiniProgram()
+					// 			}
+					// 		},
+					// 	})
+					// } else {
+						// if (!uni.getStorageSync('userInfo').identity) {
+						// 	uni.navigateTo({
+						// 		url: '../../pagesB/modifyInfo/modifyInfo'
+						// 	})
+						// 	return
+						// }
+						this.patientId  = uni.getStorageSync('patientId');
+						getScreening(this.patientId).then(res => {
+							if (res.data.code == 200) {
+								// let userInfo = JSON.stringify(this.userInfo)
+								if (!res.data) {
 									uni.navigateTo({
 										url: '/pagesB/screenorder/screenorder'
 									})
+								} else {
+									uni.navigateTo({
+										url: '/pagesB/orderlist/orderlist'
+									})
+								}
+							}
+						})
+					// }
+
+
+				// uni.navigateTo({
+				// 		url: '/pagesB/screenorder/screenorder'
+				// })
+				uni.navigateTo({
+						url: '/pagesB/orderlist/orderlist'
+				})
 			},
 			//跳转健康常识item
 			gohealthitem(item) {

pagesB/orderlist/orderlist.vue

@@ -0,0 +1,150 @@
+<template>
+	<view class="orderlist">
+		<view class="orderbtn" @click="goScreenOrder">
+			新增预约
+		</view>
+		<template  v-for="(item, index) in pageList">
+			<view class="content" @click="goitemDetail(item)"  :key="index">
+				<view class="c_top" >
+					<view class="c_right">
+						<text>预约项目：{{ item.projectName }}</text>
+						<text>预约时间：{{ item.applyStartTime ? item.applyStartTime.substring(0, 16) : '' + '-' + item.applyEndTime ?  item.applyEndTime.substring(10, 16) : '' }}</text>
+						<text>预约机构：{{ item.hospitalName }}</text>
+						<text>登记状态：
+							<text v-if="item.screeningStatus < 3">未登记</text>
+							<!-- <text v-if="item.screeningStatus == 2">取消预约</text> -->
+							<text v-if="item.screeningStatus >= 3">已登记</text>
+							<!-- <text v-else>已完成</text> -->
+						</text>
+						<view style="color:#333;margin-bottom: 30rpx;">
+							预约状态：
+							<uni-tag v-if="item.exceedStatus == '0'" text="生效中" size="mini" type="success" />
+							<uni-tag v-if="item.exceedStatus == '1'" size="mini" text="已过期" />
+						</view>
+						<text v-if="item.registrationDate">登记时间：{{ item.registrationDate }}</text>
+					</view>
+					<image style="width: 100%;" :src="item.applyBarcode"></image>
+				</view>
+			</view>
+		</template>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderList
+	} from '@/api/pagesB/orderlist/orderlist.js'
+	export default {
+		data() {
+			return {
+				pageList: {},
+				patientId: "",
+				userInfo: {},
+				pageSize:10,
+				pageNum:1,
+			}
+		},
+		// onLoad(e) {
+			// if (e) {
+				// this.userInfo = JSON.parse(e.userInfo)
+				// this.registerId = this.userInfo.registerId
+			// }
+		// },
+		onShow() {
+			this.getOrderList()
+		},
+		// onUnload() {
+		// 	uni.navigateBack({
+		// 		delta: 1
+		// 	})
+		// },
+		methods: {
+			getOrderList() {
+				this.patientId = uni.getStorageSync('patientId');
+				console.log(this.pageNum,'55')
+				getOrderList(this.patientId,this.pageNum,this.pageSize).then(res => {
+					// console.log(res,'999')
+					if (res.code == 200) {
+						this.pageList = res.rows
+						console.log(this.pageList,'999')
+					}
+				})
+			},
+			goScreenOrder() {
+				// let userInfo = JSON.stringify(this.userInfo)
+				uni.navigateTo({
+					// url: `/pagesB/screenorder/screenorder?userInfo=${userInfo}`
+					url: '/pagesB/screenorder/screenorder'
+				})
+				// redirectTo
+
+			},
+			// goitemDetail(e) {
+			// 	uni.navigateTo({
+			// 		url: `../../pagesB/screensuccess/screensuccess?screenInfo=${encodeURIComponent(JSON.stringify(e))}`
+			// 	})
+			// }
+		}
+	}
+</script>
+
+<style lang="scss">
+	.orderlist {
+		padding: 20rpx 30rpx;
+
+		.orderbtn {
+			border: 2rpx solid #4AC4AB;
+			border-radius: 10rpx;
+			padding: 15rpx 0;
+			color: #4AC4AB;
+			text-align: center;
+		}
+
+		.content {
+			padding: 20rpx;
+			margin-top: 40rpx;
+			border-radius: 20rpx;
+			background: #fff;
+
+			.c_top {
+
+				// display: flex;
+				image {
+					// min-width: 220rpx;
+					// max-width: 220rpx;
+					// height: 220rpx;
+					height: 160rpx;
+				}
+
+				.c_right {
+					font-size: 28rpx;
+					margin-left: 25rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+
+					text {
+						// line-height: 75rpx;
+						color: #333;
+						margin-bottom: 30rpx;
+					}
+				}
+			}
+		}
+
+		button {
+			color: white;
+			background: red;
+		}
+	}
+
+	/deep/ .checklist-text {
+		font-size: 15px !important;
+	}
+
+	/deep/ .uni-tag--success.data-v-1516016e,
+	.uni-tag--mini.data-v-1516016e {
+		color: #fff !important;
+		border-radius: 10rpx !important;
+	}
+</style>

pagesB/screenorder/screenorder.vue

@@ -6,7 +6,7 @@
 				<view style="margin-right: 30rpx; color: #333">年龄：{{userInfo.age}}</view>
 				<view style="color: #333;">性别：{{userInfo.gender}}</view>
 			</view>
-      <view class="illness">
+			<!-- <view class="illness">
 				<view v-show="userInfo.disease.indexOf('0') != -1">
 					<span>无</span>
 				</view>
@@ -19,7 +19,7 @@
 				<view v-show="userInfo.disease.indexOf('3') != -1">
 					<span>高血脂</span>
 				</view>
-      </view>
+			</view> -->
 		</view>
 		<view class="line"></view>
 		<view class="title">
@@ -30,13 +30,15 @@
 		<u-form labelPosition="left" :model="formData" :rules="rules" ref="form1">
 			<u-form-item label="预约机构" labelWidth="80">
 				<view class="uniDataSelectClass">
-          <uni-data-select v-model="formData.deptId" :localdata="DeptList" @change="changeDept" :clear="false">
+					<uni-data-select v-model="formData.hospitalId" :localdata="DeptList" @change="changeDept"
+						:clear="false">
 					</uni-data-select>
 				</view>
 			</u-form-item>
 			<u-form-item label="预约项目" labelWidth="80">
 				<view class="uniDataSelectClass">
-          <uni-data-select v-model="formData.projectId" :localdata="ProList" @change="changePro" :clear="false">
+					<uni-data-select v-model="formData.projectId" :localdata="ProList" @change="changePro"
+						:clear="false">
 					</uni-data-select>
 				</view>
 			</u-form-item>
@@ -47,7 +49,7 @@
 		<!-- <view style="display: flex;justify-content: center;margin-top: 80rpx;"><uni-data-checkbox multiple v-model="test" :localdata="test1"></uni-data-checkbox></view> -->
 		<view style="height: 180rpx;"></view>
 		<view class="btn">
-      <u-button type="primary" text="提交预约信息" @click="submit"></u-button>
+			<u-button type="success" text="提交预约信息" @click="submit">提交预约信息</u-button>
 		</view>
 		<u-action-sheet :show="showSex" :actions="actions" title="请选择性别" @close="showSex = false" @select="sexSelect">
 		</u-action-sheet>
@@ -55,16 +57,16 @@
 </template>
 
 <script>
-  // import {
+	import {
-  //   screenOrder,
+		screenOrder,
-  //   getDeptList,
+		getDeptList,
-  //   getProlist
+		getProlist
-  // } from '@/service/api/jsApi.js'
+	} from '@/api/pagesB/screenOrder/index.js'
-  // import {
+	import {
-  //   getSex,
+		getSex,
-  //   getBirthday,
+		getBirthday,
-  //   getAgeFun
+		getAgeFun
-  // } from '@/utils/conversion.js'
+	} from '@/api/conversion.js'
 	export default {
 		data() {
 			return {
@@ -74,19 +76,19 @@
 				test: ['1'],
 				formData: {
 					residentName: '',
-          identity: '',
+					identity: '370921199810180329',
 					certType: '1',
 					gender: '',
-          birthday: '',
+					birthday: '1998-10-18',
-          phone: '',
+					phone: '18854188230',
 					address: '',
 					disease: '',
 					height: '',
 					weight: '',
 					applyStartTime: '',
 					applyEndTime: '',
-          deptId: '',
+					hospitalId: '',
-          deptName: '',
+					hospitalName: '',
 					projectId: '',
 					projectName: ''
 				},
@@ -181,47 +183,51 @@
 			}
 		},
 		onLoad(e) {
-      if (e) {
+			console.log(e, '55')
-        this.userInfo = JSON.parse(e.userInfo)
+			// if (e) {
-        this.diseaseValue = this.userInfo.disease.split(',')
+			//   this.userInfo = JSON.parse(e.userInfo)
-        if (this.userInfo.gender == '1') {
+			//   this.diseaseValue = this.userInfo.disease.split(',')
-          this.userInfo.gender = '男'
+			//   if (this.userInfo.gender == '1') {
-        } else {
+			//     this.userInfo.gender = '男'
-          this.userInfo.gender = '女'
+			//   } else {
-        }
+			//     this.userInfo.gender = '女'
-        this.userInfo.age = getAgeFun(this.userInfo.birthday)
+			//   }
-      }
+			// this.userInfo.age = getAgeFun(this.userInfo.birthday)
+			// }
 			// this.init()
 			this.getDeptAndPro()
 		},
 		methods: {
 			getDeptAndPro() {
-        getDeptList(this.userInfo.registerId).then(res => {
+				getDeptList().then(res => {
-          if (res.data.code == 200) {
+					console.log(res, '1')
-            this.DeptList = res.data.data.map(item => {
+					// if (res.data.code == 200) {
+					this.DeptList = res.data.map(item => {
+						console.log(item, '888')
 						return {
-                text: item.deptName,
+							text: item.hospitalName,
-                value: item.deptId
+							value: item.id
 						}
 					})
-          }
+					// }
 				})
 				getProlist({
 					projectType: 1,
 					status: 0
 				}).then(res => {
-          if (res.data.code == 200) {
+					// if (res.data.code == 200) {
-            this.ProList = res.data.data.map(item => {
+					this.ProList = res.data.map(item => {
+						console.log(item, '999')
 						return {
 							text: item.projectName,
 							value: item.projectId
 						}
 					})
-          }
+					// }
 				})
 			},
 			changeDept(e) {
-        this.formData.deptName = this.DeptList.find(item => item.value == e).text
+				this.formData.hospitalName = this.DeptList.find(item => item.value == e).text
 			},
 			changePro(e) {
 				this.formData.projectName = this.ProList.find(item => item.value == e).text
@@ -267,7 +273,9 @@
 			},
 			process() {
 				let _this = this
-        if (!this.formData.deptId) {
+				console.log(this.formData, '123')
+
+				if (!this.formData.hospitalId) {
 					uni.showModal({
 						title: '提示',
 						content: '请选择预约机构',
@@ -288,9 +296,10 @@
 					})
 					return
 				}
-        this.formData.registerId = this.userInfo.registerId
+
-        this.formData.identity = this.userInfo.identity
+				this.formData.patientId  = uni.getStorageSync('patientId');
-        this.formData.disease = this.userInfo.disease
+				// this.formData.identity = this.userInfo.identity
+				// this.formData.disease = this.userInfo.disease
 				this.formData.applyStartTime = this.datetimerange[0]
 				this.formData.applyEndTime = this.datetimerange[1]
 				if (this.formData.gender == '男') {
@@ -299,21 +308,23 @@
 					this.formData.gender = '2'
 				}
 				screenOrder(this.formData).then(res => {
-          this.formData.disease = this.formData.disease.split(',')
+					// this.formData.disease = this.formData.disease.split(',')
 					if (this.formData.gender == '1') {
 						this.formData.gender = '男'
 					} else {
 						this.formData.gender = '女'
 					}
-          if (res.data.code == '200') {
+					console.log(res,'55')
+					if (res.code == 200) {
 						uni.showToast({
 							title: '预约成功',
 							duration: 1000
 						});
 						setTimeout(() => {
 							// uni.navigateTo({
-              //   // url: `../screensuccess/screensuccess?registerId=${res.data.data}`
+							  // url: `../screensuccess/screensuccess?registerId=${res.data.data}`
-              //   url: `../orderlist/orderlist?registerId=${_this.userInfo.registerId}`
+							  // url: `/pageB/orderlist/orderlist?patientId=${this.formData.patientId}`
+							  // url: '/pageB/orderlist/orderlist'/
 							// })
 							uni.navigateBack({
 								delta: 1
@@ -323,11 +334,13 @@
 				})
 			},
 			submit() {
-        this.$refs.form1.validate().then(res => {
+				// console.log(8)
+				// this.$refs.form1.validate().then(res => {
+				// console.log(res,'555')
 				this.process()
-        }).catch(errors => {
+				// }).catch(errors => {
 				return
-        })
+				// })
 			},
 			IdentityBlur(e) {
 				this.formData.gender = getSex(e)
@@ -343,6 +356,11 @@
 	//         z-index: 99;
 	//     }
 	// }
+	::v-deep.u-btn--success.data-v-3bf2dba7 {
+		color: #ffffff;
+		border-color: #4AC4AB;
+		background-color: #4AC4AB !important;
+	}
 
 	.user_info {
 		border: 1px solid #4AC4AB;

pagesB/site/site.scss

@@ -3,6 +3,65 @@
 		padding: 20rpx 0 0;
 		background-color: #fff;
 	}
+	::v-deep .u-navbar-placeholder {
+				background-color: #F7F5F5;
+				z-index: 999;
+			}
+
+			.u-navbar {
+				display: block;
+				// height: 200rpx;
+
+				image {
+					margin: 0 4% 0 4%;
+					width: 20rpx;
+					height: 30rpx;
+				}
+
+				.title {
+					width: 31%;
+					font-size: 34rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+
+				.inputitem {
+					position: relative;
+					// margin-left: 4%;
+					box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+					width: 60%;
+					height: 65rpx;
+					border-radius: 31rpx;
+					z-index: 999;
+					background: #65c0a9;
+					color: #FFFFFF;
+
+					.placeholder {
+						color: #FFFFFF;
+					}
+
+					.input {
+						margin: 0 auto;
+						position: absolute;
+						height: 65rpx;
+						// top: 8%;
+						left: 18%;
+						width: 80%;
+						font-size: 26rpx;
+						color: #FFFFFF;
+					}
+
+					.icon {
+						background: url(@/static/pagesB/sousuo.png) no-repeat;
+						width: 30rpx;
+						height: 28rpx;
+						background-size: cover;
+						position: absolute;
+						top: 28%;
+						left: 4%;
+					}
+				}
+			}
 	::v-deep .u-swiper-item{
 	}
 	::v-deep .u-swiper-image {

pagesB/site/site.vue

@@ -1,9 +1,20 @@
 <template>
 	<view class="app">
-		<view class="inputs">
+		<!-- <view class="inputs">
 			<i class="icon"></i>
 			<input v-model="searchName" type="text" name="" id="" class="input" placeholder="请输入">
+		</view> -->
+		<u-navbar :is-back="false" :background="background" class="u-navbar">
+			<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
+			<view class="title" @tap="goprevious">
+				护理服务
 			</view>
+			<view class="inputitem">
+				<i class="icon"></i>
+				<input v-model="searchName" type="text" name="" id="" class="input" placeholder="搜索商品"
+					placeholder-class="placeholder">
+			</view>
+		</u-navbar>
 		<view class="Classificationlist">
 			<view v-for="(item,index) in nurseItemClassifyInfoList" :key="index" @tap='tapitemclass(item)'
 				:class="item.id == itemClassId?'itemclass':'item'">
@@ -71,6 +82,9 @@
 	export default {
 		data() {
 			return {
+				background: {
+					backgroundColor: '#26A888',
+				},
 				nurseAgencyClassifyInfoList: [], //护理站分类
 				conNewcurrent: 0,
 				nurseItemClassifyInfoList: [], //护理项目分类
@@ -92,6 +106,11 @@
 			}
 		},
 		methods: {
+			goprevious() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
 			//点击swiper
 			goswiper(index) {
 				if (this.lbinfo[index].jumpLink == '/pages/medicalservice/medicalservice' || this.lbinfo[index].jumpLink ==