Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/projects/pension/views/Master/ExchangeRole.vue

src/assets/css/pension.css

@@ -265,7 +265,7 @@
 	color: #FF9474
 }
 
-.vongi-cashier-btn {
+.vongi-cashier-btn-white .vongi-cashier-btn {
 	background-color: #FF9474;
 }
 

src/assets/css/xpwyfyy.css

@@ -729,6 +729,7 @@ h3 {
 	border-radius: 50%;
 	margin: 5.5px 0;
 	float: right;
+	object-fit: cover;
 }
 
 .vongi-editme .mui-input-row input,
@@ -1717,7 +1718,8 @@ h3 {
 	margin-top: 0
 }
 
-.vongi-fklist .openfyy-list .mui-table-view-cell {
+.vongi-fklist .openfyy-list .mui-table-view-cell,
+.vongi-ylqhsf .openfyy-list .mui-table-view-cell {
 	margin: 10px;
 	line-height: 30px;
 	border-radius: 7px;
@@ -2224,7 +2226,13 @@ h3 {
 	border: 0;
 	width: 50%;
 }
-
+.vongi-popup-inner .vongi-login-btn button{
+	border:1px #ccc solid;
+	width:100%
+}
+.vongi-popup-inner .vongi-login-btn button .iconfont{
+	margin-right:5px
+}
 .vongi-popup-inner .mui-button-row:after {
 	width: 1px;
 	height: 100%;
@@ -2238,6 +2246,12 @@ h3 {
 	background-color: #c8c7cc;
 	left: 0
 }
+.vongi-zbfj-pop{
+	top:10%
+}
+.vongi-zbfj-pop img{
+	width:70%
+}
 
 .vongi-input-up {
 	padding: 0 10px

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

@@ -71,11 +71,13 @@
 			//获取列表
 			getList() {
 				API_Device.listOfDevice({
+					pageIndex: 1,
+					pageSize: 500,
 					schoolId: this.person_data.companyId
 				}).then(data => {
-					this.devices = data;
-					for (var i in data) {
-						if (data[i].isOnline) {
+					this.devices = data.data;
+					for (var i in data.data) {
+						if (data.data[i].isOnline) {
 							this.onNum++;
 						} else {
 							this.offNum++;

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

@@ -11,7 +11,7 @@
 						<div class="mui-col-xs-10  mui-pull-left ">
 							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
 							<div class="mui-media-body">
-								<h3>父亲的智能手表</h3>
+								<h3 class='mui-ellipsis'>父亲的智能手表</h3>
 								<p class='mui-ellipsis mui-h3'>JP01351704</p>
 							</div>
 						</div>
@@ -23,7 +23,7 @@
 						<div class="mui-col-xs-10  mui-pull-left ">
 							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
 							<div class="mui-media-body">
-								<h3>父亲的智能手表</h3>
+								<h3 class='mui-ellipsis'>父亲的智能手表父亲的智能手表父亲的智能手表父亲的智能手表父亲的智能手表</h3>
 								<p class='mui-ellipsis mui-h3'>JP01351704</p>
 							</div>
 						</div>

src/projects/pension/views/Master/Line/info.vue

@@ -1,8 +1,69 @@
 <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-fklist vongi-spkh">
+				<div class="vongi-spkh-title flew">
+					<div class="mui-media-body">
+						<span class="mui-media-object mui-pull-left"><img src="~$project/assets/img/02.jpg"></span> 郭睿阳
+					</div>
+					<p class='mui-ellipsis'>有效期至2021-08-31 <a href="">续期</a></p>
+				</div>
+				<ul class="mui-table-view openfyy-list">
+					<li class="mui-table-view-cell mui-media">
+						<a href="javascript:;">
+							<div class="vongi-video-img"><img src="~$project/assets/img/02.jpg" width="100%"></div>
+							<div class="mui-media-body flew">
+								小（2）班教室
+								<p class='mui-ellipsis'>[正在直播]</p>
+							</div>
+						</a>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<a href="javascript:;">
+							<div class="vongi-video-img"><img src="~$project/assets/img/02.jpg" width="100%"></div>
+							<div class="mui-media-body flew">
+								新世纪幼儿园多媒体教室
+								<p class='mui-ellipsis'>[未开播]</p>
+							</div>
+						</a>
+					</li>
+				</ul>
+			</div>
+			<!--未开通服务状态-->
+			<!-- <div class="mui-content vongi-spkh">
+				<div class="vongi-payyes-icon">
+					<img src="~$project/assets/img/gkke01.png" width="128" />
+					<h2>暂未开通公开课服务</h2>
+				</div>
+				<div class="vongi-rec-btn-white">
+					<div class="vongi-rec-btn">开通服务</div>
+				</div>
+			</div> -->
+			<!--已购买尚未开通状态-->
+			<!-- <div class="mui-content vongi-spkh">
+				<div class="vongi-payyes-icon">
+					<img src="~$project/assets/img/spkh.png" />
+					<h2>感谢您购买视频看护服务<br>现已加入安装排期计划</h2>
+				</div>
+			</div>
+			<div class="fyy-footer">
+				<div class="fyy-footer-text">
+					我们将会通过电话方式与您确定上门安装时间<br>
+					请保持联系方式的通讯畅通<br>
+					服务咨询电话: 400-8899-619
+				</div>
+			</div> -->
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Line/pay.vue

@@ -1,8 +1,77 @@
 <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">
+				<div class="vongi-cashier">
+					<img src="~$project/assets/img/03.jpg" alt="">
+					<div class="vongi-cashier-text">
+						<div class="vongi-text-tit">
+							<h3 class="flew-sp ellipsis">
+								视频看护摄像头设备与直播服务费</h3>
+							<p class="ellipsis">手机查看视频直播服务</p>
+						</div>
+						
+						<h3 class="flew-sp">￥499.00<p>×1</p></h3>
+					</div>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>长者姓名</label>
+						<span>郭源潮</span>
+					</div>
+					<div class="mui-input-row">
+						<label>家属姓名</label>
+						<span>郭大宝</span>
+					</div>
+					<div class="mui-input-row">
+						<label>支付订单号</label>
+						<span>80000000200900000000</span>
+					</div>
+					<div class="mui-input-row">
+						<label>合计金额</label>
+						<span style="color:#ED6A0C">￥75.00</span>
+					</div>
+				</form>
+				<div class="mui-content-padded"><h5>支付方式</h5></div>
+				<form class="mui-input-group margin10">
+					<div class="mui-input-row mui-radio">
+						<label>微信支付</label>
+						<input name="radio1" type="radio">
+					</div>
+					<div class="mui-input-row mui-radio">
+						<label>支付宝支付</label>
+						<input name="radio1" type="radio" checked>
+					</div>
+				</form>
+			<div class="vongi-qingjiadt vongi-editme">
+			<form class="mui-input-group">
+					
+					<div class="mui-input-row">
+						<label>推广人</label>
+						<input type="text" class="mui-input-clear" placeholder="请输入推广人编号，没有可不填">
+					</div>
+					
+				</form>
+			</div>
+
+				<div class="vongi-cashier-btn-row">
+					<div class="vongi-cashier-btn-white">
+						<span>合计：￥60.00</span>
+						<div class="vongi-cashier-btn">支付</div>
+					</div>
+				</div>
+			</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Line/paySucess.vue

@@ -1,8 +1,24 @@
 <template>
+  <div>
+    <div class="mui-content">
+      <div class="vongi-examineInfo">
+        <span class="mui-icon iconfont icon-gou"></span>
+        <h1>支付成功</h1>
+      </div>
+    </div>
+    <div class="fyy-footer">
+      <div class="bindfyy-btn">
+        <button type="submit" class="mui-btn mui-btn-pink">返回直播主页</button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Line/room.vue

@@ -1,8 +1,55 @@
 <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-zbfj">
+				<div class="mui-content-padded">
+					<div class="fyy-video">
+						<!--未开播状态-->
+						<!--<div class="mui-media-body">
+							<img src="~$project/assets/img/gkke02.png" width="50"/>
+							<h6>该直播间未开播</h6>
+						</div>-->
+						<video src="" width="100%" controls></video>
+					</div>
+					<div class="mui-table-view-cell flew-sp">
+						新世纪幼儿园小（2）班
+						<span class="color4fc5f7">[正在直播]</span>
+					</div>
+				</div>
+				<div class="mui-table-view-cell flew">
+					紧急联系热线
+					<button class="mui-btn" type='button'>0716-8121234<span class="iconfont icon-ziyuan1"></span></button>
+				</div>
+			</div>
+			<!--挂机弹窗-->
+			<!-- <div class="vongi-popup">
+				<div class="vongi-popup-bg"></div>
+				<div class="vongi-popup-ceter vongi-zbfj-pop" style="top:10%">
+					<div class="vongi-popup-inner">
+						<div class="vongi-popup-ma">
+							<img src="~$project/assets/img/lad.png" width="50%">
+							<h3>还在观看吗？</h3>
+
+						</div>
+						<div class="vongi-btn vongi-login-btn">
+							<button class="mui-btn mui-btn-pink"><spn class="iconfont icon-bofang"></spn>继续观看</button>
+							<button class="mui-btn "><spn class="iconfont icon-tuichu4"></spn>结束观看</button>
+						</div>
+					</div>
+
+				</div>
+			</div> -->
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

src/projects/pension/views/Master/Line/show.vue

@@ -1,8 +1,27 @@
 <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">
+        <div class="mui-content-padded">
+            <img src="~$project/assets/img/03.jpg" width="100%"/>
+        </div>
+    </div>
+    <div class="fyy-footer">
+      <div class="bindfyy-btn">
+        <button type="submit" class="mui-btn mui-btn-pink">开通服务</button>
+      </div>
+    </div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/pension.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>