Browse Source

组件修改

wgl 4 years ago
parent
commit
46dc4b3bed

+ 15 - 31
src/projects/pension/components/DrugCalendar.vue

@@ -1,24 +1,4 @@
 <template>
-	<!-- <div class="canlender">
-		<div class="title">
-			
-			<div class="left btn" @click="editMonth('sub')"></div>
-			<div class="date-title">{{ dateFormat }}</div>
-			
-			<div class="right btn" @click="editMonth('add')"></div>
-		</div>
-		
-		<div class="week-day">
-			<div v-for="i in weekDay">{{ i }}</div>
-		</div>
-	
-		<div class="date-container">
-			<div v-for="item in canlender">
-				{{ item.dateNum }}
-			</div>
-		</div>
-	</div> -->
-
 	<div class="mui-content-padded vongi-cytx-time">
 		<ul class="mui-table-view mui-grid-view mui-grid-9">
 			<li v-for="i in weekDay" class="mui-table-view-cell mui-media">
@@ -28,15 +8,13 @@
 		<div class="vongi-cytx-date vongi-center">2020年10月</div>
 		<ul class="mui-table-view mui-grid-view mui-grid-9">
 			<li v-for="item in canlender" class="mui-table-view-cell mui-media">
-				<a href="#" class="">
+				<a :class="today==item.date?'mui-active':''">
 					<span>{{ item.dateNum }}</span>
 					<div class="mui-media-body"></div>
 				</a>
 			</li>
-			<!-- <a href="#" class="mui-active"> -->
 		</ul>
 	</div>
-
 </template>
 
 <script>
@@ -61,11 +39,8 @@
 			editMonth(type) {
 				const num = type === "sub" ? -1 : 1;
 				this.currentDate.setMonth(this.currentDate.getMonth() + num);
-				// 清空canlender日期容器
-				this.canlenderObj.clear();
-				// 重新生成canlender日期容器
-				this.canlenderObj.init(this.currentDate);
-				this.canlender = this.canlenderObj.canlender;
+				this.canlender = [];
+				this.init(this.currentDate);
 			},
 			//切换日
 			editDate(date, type = "add", number = 1) {
@@ -115,15 +90,24 @@
 						dateNum: date.getDate()
 					})
 				}
-				console.log(this.canlender)
+				//console.log(this.canlender)
 			},
 		},
 		mounted() {
 			this.init();
 		},
 		computed: {
-			
-		},
+			today: {
+				// getter
+				get: function() {
+					return this.formatDate(currentTimeStamp());
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
+		}
 	}
 </script>
 

+ 61 - 14
src/projects/pension/views/Master/Serve/Home.vue

@@ -1,65 +1,112 @@
 <template>
-<div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">养老服务</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+	<div>
+		<common ref="common" @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
 		<div class="mui-content vongi-color">
 			<ul class="mui-table-view vongi-ylfuwu">
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-violet">
+					<div class="vongi-color-block block-violet" @click="goToServe">
 						<div class="mui-h1 iconfont icon-shouye3"></div>
 						<div class="mui-media-body">在线问诊</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-greene">
+					<div class="vongi-color-block block-greene" @click="goToServe">
 						<div class="mui-h1 iconfont icon-riqi"></div>
 						<div class="mui-media-body">挂号预约</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-yellowe">
+					<div class="vongi-color-block block-yellowe" @click="goToServe">
 						<div class="mui-h1 iconfont icon-diancan"></div>
 						<div class="mui-media-body">点餐服务</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-pink">
+					<div class="vongi-color-block block-pink" @click="goToServe">
 						<div class="mui-h1 iconfont icon-jiazhengfuwu"></div>
 						<div class="mui-media-body">家政服务</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-blue">
+					<div class="vongi-color-block block-blue" @click="goToServe">
 						<div class="mui-h1 iconfont icon-weixiu"></div>
 						<div class="mui-media-body">家电维修</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-greene">
+					<div class="vongi-color-block block-greene" @click="goToServe">
 						<div class="mui-h1 iconfont icon-liliao"></div>
 						<div class="mui-media-body">康复理疗</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-light">
+					<div class="vongi-color-block block-light" @click="goToServe">
 						<div class="mui-h1 iconfont icon-xin"></div>
 						<div class="mui-media-body">生活照料</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-6">
-					<div class="vongi-color-block block-blue">
+					<div class="vongi-color-block block-blue" @click="goToServe">
 						<div class="mui-h1 iconfont icon-renshu"></div>
 						<div class="mui-media-body">陪同就医</div>
 					</div>
 				</li>
 			</ul>
 		</div>
-</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
 </template>
 
 <script>
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import {
+		currentTimeStamp,
+		parseUnixTime
+	} from '$project/utils'
+	export default {
+		name: 'MasterServe',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				isLoading: false,
+
+				pageTitle: '养老服务',
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			goToServe() {
+				mui.toast('养老服务筹备中,尽情期待!');
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+			})
+		}
+	}
 </script>
 
 <style scoped src="$project/assets/css/pension.css"></style>