Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Guest/Approval.vue

@@ -220,7 +220,7 @@
 					this.isLoading = false;
 					this.person=response.person;
 					this.detail = response.info;
-					this.isNoToday=this.daysDistance(new Date(),this.detail.visitDate)
+					this.isNoToday=response.isNoToday;
 
 					if(!this.isNoToday){
 						mui.toast("请注意，访问时间不是今天");

src/projects/business/views/Master/Mine/Bill/Info.vue

@@ -1,6 +1,45 @@
 <template>
 <div>
-
+    <header class="mui-bar mui-bar-nav">
+				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+				<h1 class="mui-title">账单详情</h1>
+			</header>
+			<div class="mui-content vongi-qingjiadt">
+				<form class="mui-input-group vongi-cd-payli">
+					<div class="mui-input-row flew-sp">
+						<h3>2021年物业管理费</h3>
+						<h3>-1998.00</h3>
+					</div>
+					<div class="mui-input-row">
+						<label>缴费单位</label>
+						<span>沙市花园XX物业</span>
+					</div>
+					<div class="mui-input-row">
+						<label>缴费户号</label>
+						<span>1-2-1101</span>
+					</div>
+					<div class="mui-input-row">
+						<label>户名</label>
+						<span>111</span>
+					</div>
+					<div class="mui-input-row">
+						<label>住址信息</label>
+						<span>沙市花园1-2-1101</span>
+					</div>
+					<div class="mui-input-row">
+						<label>创建时间</label>
+						<span>2020-09-18 18:15</span>
+					</div>
+					<div class="mui-input-row">
+						<label style="width:25%">订单号</label>
+						<span style="width:75%" class="mui-ellipsis">202009180000300018150060415263</span>
+					</div>
+					<div class="mui-input-row">
+						<label>完成时间</label>
+						<span>2020-09-18 18:15</span>
+					</div>
+				</form>
+			</div>
 </div>
 </template>
 

src/projects/business/views/Master/Mine/Bill/List.vue

@@ -1,6 +1,93 @@
 <template>
 <div>
-
+    <header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">账单记录</h1>
+		</header>
+		<div class="mui-content vongi-zd">
+			<div class="mui-content-padded">
+				<h5>本月</h5>
+			</div>
+			<ul class="mui-table-view vongi-zd-list">
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_dian.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_shui.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_fang.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+			</ul>
+			<div class="mui-content-padded">
+				<h5>九月</h5>
+			</div>
+			<ul class="mui-table-view vongi-zd-list">
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_dian.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_shui.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a>
+						<div class="mui-media-object mui-pull-left">
+							<img src="~$project/assets/img/zd_fang.png">
+						</div>
+						<div class="mui-media-body">
+							<div class='mui-ellipsis flew-sp flew-items'>9月电费账单<span class="mui-h2">56.06</span></div>
+							<p>生活缴费</p>
+							<p>09-16 15:00</p>
+						</div>
+					</a>
+				</li>
+			</ul>
+		</div>
 </div>
 </template>
 

src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -63,7 +63,7 @@
 				</form>
 				<div class="vongi-cashier-btn-row">
 					<div class="vongi-cashier-btn-white">
-						<span>合计：￥60.00</span>
+						<span>合计：<b class="colorfe616c">￥60.00</b></span>
 						<div class="vongi-cashier-btn">支付</div>
 					</div>
 				</div>

src/projects/business/views/Master/Property/Contact.vue

@@ -19,7 +19,7 @@
 				</li>
 			</ul>
 		</div>
-		<NullList :remark="'没有配置物业的联系方式'" v-if="!list"></NullList>
+		<NullList :remark="'没有配置物业的联系方式，快去提醒一下吧'" v-if="!list"></NullList>
 		<loading :visible="isLoading"></loading>
 
 	</div>

src/projects/pension/views/Common/Device/List.vue

@@ -19,6 +19,7 @@
 				</li>
 			</ul>
 		</div>
+		<NullList :remark="'暂无设备，来关联一下吧'" v-if="!watchList.length"></NullList>
 		<div class="fyy-footer">
 			<div class="bindfyy-btn" @click="addDevice"><button type="submit" class="mui-btn mui-btn-pink ">关联新设备</button></div>
 		</div>
@@ -31,6 +32,7 @@
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
 	import NavMenu from '@/components/NavMenu.vue'
+	import NullList from '$project/components/NullList.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -41,7 +43,7 @@
 			Common,
 			Loading,
 			TopHeader,
-			NavMenu
+			NavMenu,NullList
 		},
 		data() {
 			return {

src/projects/pension/views/Common/Notice/Home.vue

@@ -17,6 +17,7 @@
 				</ul>
 			</div>
 		</div>
+		<NullList :remark="'暂无消息'" v-if="!recordList.length"></NullList>
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -28,6 +29,7 @@
 	import Loading from '$project/components/Loading.vue'
 	import isReachBottom from '$project/utils/isReachBottom'
 	import TopHeader from '$project/components/TopHeader.vue'
+	import NullList from '$project/components/NullList.vue'
 	import {
 		mapGetters,
 		mapMutations
@@ -37,7 +39,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,NullList
 		},
 		data() {
 			return {

src/projects/pension/views/Master/Health/Archives.vue

@@ -21,14 +21,14 @@
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChart',query:{type:'oxygen',title:'血氧浓度'}})">
-						<span class="vongi-color-unit">浓度</span>
+						<span class="vongi-color-unit"></span>
 						<div class="mui-h1" v-text="healthData.oxygen?healthData.oxygen:'暂无'"></div>
-						<div class="mui-media-body">血氧</div>
+						<div class="mui-media-body">血氧浓度</div>
 					</div>
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-8">
 					<div class="vongi-color-block block-green" @click="goToInfo({name:'MasterHealthChart',query:{type:'temperature',title:'体温'}})">
-						<span class="vongi-color-unit">摄氏度</span>
+						<span class="vongi-color-unit"></span>
 						<div class="mui-h1">{{healthData.temperature?(healthData.temperature+'℃'):'暂无'}}</div>
 						<div class="mui-media-body">体温</div>
 					</div>
@@ -42,7 +42,7 @@
 				</li>
 				<li class="mui-table-view-cell mui-col-xs-4">
 					<div class="vongi-color-block block-yellowe" @click="goToInfo({name:'MasterHealthChart',query:{type:'step',title:'运动'}})">
-						<span class="vongi-color-unit"></span>
+						<span class="vongi-color-unit">步</span>
 						<div class="mui-h1" v-text="healthData.step?healthData.step:'暂无'"></div>
 						<div class="mui-media-body">运动</div>
 					</div>