签到相关

App.vue

@@ -239,14 +239,14 @@
 		height: 40rpx !important;
 	}
 	
-	.pages-visitors-visitors /deep/ .uni-actionsheet__cell{
+	.pages-visitors-visitors ::v-deep .uni-actionsheet__cell{
 		color:#31333B !important;
 		font-size: 34rpx;
 		line-height: 112rpx;
 		height: 112rpx;
 		padding: 0rpx 6rpx;
 	}
-	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet {
+	.pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet {
 		left: 0;
 		right: 0;
 		bottom: 0;
@@ -255,15 +255,15 @@
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
-	.pages-visitors-visitors /deep/ .uni-actionsheet__menu{
+	.pages-visitors-visitors ::v-deep .uni-actionsheet__menu{
 		border-radius: 20rpx 20rpx 0 0;
 	}
 	
-	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__cell:before {
+	.pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet__cell:before {
 	    border-top: 2rpx solid #EEEEEE;
 	    color: #EEEEEE;
 	}
-	.pages-visitors-visitors /deep/ uni-actionsheet .uni-actionsheet__action{
+	.pages-visitors-visitors ::v-deep uni-actionsheet .uni-actionsheet__action{
 		    margin-top: 24rpx;
 				margin-bottom: 10rpx;
 	}

components/preBookList.vue

@@ -13,7 +13,7 @@
 					<view :class="statusStyleList[item.status_desc]+' status'"><view class="over">{{item.status_desc}}</view></view>
 					<view class="queue-num" v-if="item.status_desc=='候诊' && item.wait_visit_count && item.wait_visit_count>0"><view>前方<text class="PfScSemibold">{{item.wait_visit_count}}</text>人</view> </view>
 
-					<view class="bedDesc">2诊室13床</view>
+					<view class="bedDesc" v-if="item.bed_desc">{{item.bed_desc}}</view>
 				</view>
 			</view>
 		</view>

components/userCard.vue

@@ -86,7 +86,7 @@ export default {
 		overflow: hidden;
 
 		&.popup-user-card{
-			/deep/ {
+			::v-deep {
 				.uni-card__header{
 					display: none !important;
 				}
@@ -109,7 +109,7 @@ export default {
 			}
 		}
 
-		/deep/ {
+		::v-deep {
 				.uni-easyinput{
 					margin-bottom: 24rpx;
 					.uni-easyinput__content-input{

components/visitorAccount.vue

@@ -104,7 +104,7 @@ export default {
 		height: auto;
 		overflow: hidden;
 		&.default-open{
-			/deep/{
+			::v-deep{
 				.uni-collapse-item__title{
 					display: none !important;
 				}
@@ -120,7 +120,7 @@ export default {
 				}
 			}
 		}
-		/deep/{
+		::v-deep{
 			.uni-collapse-item__wrap{
 				background: #F9FAFB;
 				.uni-collapse-item__wrap-content{

pages/book_detail/book_detail.vue

@@ -199,7 +199,7 @@
 	box-sizing: border-box;
 	.ccpop{
 		&.bed-edit-pop{
-			/deep/{
+			::v-deep{
 				.uni-data-checklist{
 					display: none !important;
 				}
@@ -211,7 +211,7 @@
 				}
 			}
 		}
-		/deep/{
+		::v-deep{
 			uni-view[name="content"]{
 				border-radius: 40rpx;
 			}
@@ -253,7 +253,7 @@
 
 	.list-box{
 		.item-wrapper{
-			.item-inner /deep/{
+			.item-inner ::v-deep{
 					.bi{
 						align-items: center;
 						column-gap: 12rpx;

pages/index/index.vue

@@ -47,7 +47,7 @@
 								  <!-- 科室 -->
 								</text>
 
-								<view class="fixed_hospital">医保定点</view>
+								<!-- <view class="fixed_hospital">医保定点</view> -->
 							<!-- <img :src="cssUrl+'index_comback.svg'" v-if="item.hospital_pos" @click="toLocation(item)"> -->
 						</view>
 						<view class="date over2 over4" v-if="item.address">
@@ -85,13 +85,13 @@
 					</uni-collapse-item>
 				</uni-collapse>
 
-				<view class="bot primary btn btn2" hover-class="hover" @click="toVisitors(item)">
+				<view class="bot primary btn btn2" hover-class="hover" @click="toVisitors(item)" v-if="item.type==0">
 					预约看病
 				</view>
 			</view>
 		</view>
 
-		<view class="block visit-wrapper" v-if="recentAppoint">
+		<view class="block visit-wrapper" v-if="recentAppoint && this.doctorInfo && !this.doctorInfo.is_all_card">
 			<view class="header flex">
 				<view class="title-wrapper flex booklist">
 					<view class="title">
@@ -105,9 +105,9 @@
 				</view>
 			</view>
 		</view>
-		<pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true"></pre-book-list>
+		<pre-book-list class="preg-books" :dataList="recentAppoint" :topnopadding="true" v-if="this.doctorInfo && !this.doctorInfo.is_all_card"></pre-book-list>
 
-		<tabbar current="1" leftButtonText="主页"></tabbar>
+		<tabbar current="1" leftButtonText="主页" v-if="this.doctorInfo && !this.doctorInfo.is_all_card"></tabbar>
 	</view>
 </template>
 
@@ -177,6 +177,14 @@
 			preBookList,
 		},
 		onLoad(option) {
+		// 	define('DEPART_TYPE_FULL', 0);      // 全功能
+    //  define('DEPART_TYPE_COUNT', 1);     // 仅计数
+    //  define('DEPART_TYPE_CARD', 2);      // 仅名片
+    //  $GLOBALS['depart_type_list'] = array(
+    //      DEPART_TYPE_FULL => '全功能',
+    //      DEPART_TYPE_COUNT => '仅计数',
+    //      DEPART_TYPE_CARD => '仅名片'
+    //  );
 			if(option.code && option.state) {
 				this.code = option.code
 				this.state = option.state
@@ -267,7 +275,6 @@
 					this.pageShow = true;
 					let visitFlag = true;
 					this.doctorInfo = data;
-					console.log(data)
 					if(this.doctorInfo.doctor_info &&  this.doctorInfo.doctor_info.depart_name && this.doctorInfo.doctor_info.depart_name.length>0){
 						this.doctor_dept = this.doctorInfo.doctor_info.depart_name;
 					}
@@ -542,7 +549,7 @@
 				}
 				.notice-collapse {
 					margin-top: 24rpx;
-					/deep/ {
+					::v-deep {
 						.uni-collapse-item__title-box{
 							padding: 0;
 							display: flex;

pages/modify_visitor/modify_visitor.vue

@@ -58,7 +58,6 @@
 				  title: '新增就诊人'
 				});
 			}
-			console.log(88888)
 		},
 		onShow() {
 			if(this.vid) this.getVisitorInfo()
@@ -89,7 +88,10 @@
 					if(this.vid){
 						uni.removeStorageSync('visitor_info_'+ this.vid)
 					}
-					this.$func.toPage('/pages/visitors/visitors?type='+this.type)
+
+					uni.navigateBack()
+
+					// this.$func.toPage('/pages/visitors/visitors?type='+this.type)
 				});
 			},
 			getVisitorInfo() {

pages/visit_detail/visit_detail.vue

@@ -208,7 +208,7 @@
 	box-sizing: border-box;
 	.ccpop{
 		&.bed-edit-pop{
-			/deep/{
+			::v-deep{
 				.uni-data-checklist{
 					display: none !important;
 				}
@@ -220,7 +220,7 @@
 				}
 			}
 		}
-		/deep/{
+		::v-deep{
 			uni-view[name="content"]{
 				border-radius: 40rpx;
 			}
@@ -262,7 +262,7 @@
 	
 	.list-box{
 		.item-wrapper{
-			.item-inner /deep/{
+			.item-inner ::v-deep{
 					.bi{
 						align-items: center;
 						column-gap: 12rpx;

pages/visitors/visitors.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class='add-visitor-page'>
+	<view class='add-visitor-page' v-show="pageshow">
 		<view class="h-name over PfScSemibold">
 			{{hospital_depart_name}}
 		</view>
@@ -28,20 +28,19 @@
 			<text>今日没有预约哦，请先预约时间</text>
 		</view>
 
-		
 		<view class="submit flex baodao-submit"  v-if="type == 3 && !hasBaoDaoData">
 			<view :class="'btn cancel btn1 PfScMedium'" hover-class="hover" @click="reback">返回</view>
 			<view class="btn primary btn1 PfScMedium" hover-class="hover"  @click="appointTime">预约时间</view>
 		</view>
 
-		<view class="submit"  v-if="type == 1" @click="toPrebook">
+		<view class="submit"  v-if="type == 0" @click="toPrebook">
 			<view class="bot primary btn btn2 submitbtn" hover-class="hover">
 				确认预约（已选{{selectCount}}位）
 			</view>
 			<view class="tip height40">请确保预约就诊前在门诊先挂号</view>
 		</view>
 
-		<view class="submit"  v-if="type == 3 && hasBaoDaoData" @click="toPrebook">
+		<view class="submit"  v-if="type == 1" @click="toPrebook">
 			<view class="bot primary btn btn2 submitbtn" hover-class="hover">
 				确认以上患者已到（已选{{selectCount}}位）
 			</view>
@@ -101,7 +100,7 @@
 		data() {
 			return {
 				cssUrl:this.cssUrl,
-				type:1,
+				type:-1,
 				res:true,
 				popContent:'删除张杨明后，就诊记录还可以查到，确定删除吗？',
 				popTitle:'确认删除',
@@ -114,7 +113,9 @@
 				popIndex:0,
 				depart_id:0,
 				hospital_depart_name:'',
-				hasBaoDaoData:false
+				hasBaoDaoData:false,
+				type:-1,
+				pageshow:false,
 			}
 		},
 		components:{
@@ -142,6 +143,14 @@
 				this.$pop.modelShow('请先选择要预约的医院科室', '/pages/index/index')
 				return
 			}
+
+			if(this.type == 3 && !option.depart_id) {
+				this.$pop.modelShow('签到二维码有误或已过期！', '/pages/index/index')
+				return
+			}
+
+			if(this.type == 3) this.depart_id = option.depart_id
+
 		},
 		onReady() {
 			if(this.type == 2){
@@ -152,11 +161,13 @@
 				uni.setNavigationBarTitle({
 					title:'确认报到'
 				})
+				this.getDepartInfo();
 			}else{
 				uni.setNavigationBarTitle({
 					title:'请选择就诊人'
 				})
 			}
+
 		},
 		methods: {
 			reback(){
@@ -231,6 +242,16 @@
 					}
 				});
 			},
+			getDepartInfo() {
+				this.$http.req('user/get_depart_info', {depart_id:this.depart_id}, 'POST').then(data=>{
+					this.type = data.type
+					if(this.type == 2){
+						this.$pop.modelShow('签到二维码已过期', '/pages/index/index')
+						return;
+					}
+					this.pageshow = true
+				});
+			},
 			showPopCom() {
 				this.$refs.popcom.open()
 			},

pages/visitors_new/visitors_new.vue

@@ -73,7 +73,7 @@
 <style lang="scss" scoped>
 .waiting-method-page{
 	overflow: hidden;
-	/deep/ {
+	::v-deep {
 		.uni-card{
 			border-radius: 0;
 			padding: 34rpx 42rpx !important;