Merge remote-tracking branch 'origin/master'

src/assets/css/pension.css

@@ -136,7 +136,9 @@
 }
 
 .vongi-sblist .mui-checkbox input[type=checkbox],
-.vongi-sblist .mui-radio input[type=radio] {
+.vongi-sblist .mui-radio input[type=radio],
+.vongi-qqhm .mui-checkbox input[type=checkbox],
+.vongi-qqhm .mui-radio input[type=radio] {
 	top: 26px
 }
 
@@ -283,3 +285,8 @@
 .vongi-index-top a{
 	color:#FF9474
 }
+.vongi-ylqhsf .mui-media-object {
+    line-height: 64px;
+    max-width: 64px;
+    height: 64px;
+}

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

@@ -118,13 +118,7 @@
 			checkForm(url) {
 				debugger
 				var sz=url.split("#");
-				var ck1=window.location.href.split("#")[0];
-				var ck2=sz[0];
 
-				if(ck1!=ck2){
-					mui.toast('非访客二维码');
-					return false
-				}
 				var sz1=sz[1].toLowerCase();
 				if(!sz1.indexOf('/guest/to/info?id=')==0){
 					mui.toast('非访客二维码');

src/projects/pension/views/Master/ExchangeRole.vue

@@ -1,6 +1,37 @@
 <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 class="mui-content vongi-qqhm vongi-fklist vongi-ylqhsf">
+			<ul class="mui-table-view openfyy-list ">
+				<li class="mui-table-view-cell">
+					<a href="#" class="mui-radio">
+						<div class="mui-col-xs-10  mui-pull-left flew-items">
+							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
+							<div class="mui-media-body">
+								<h1>赵大宝</h1>
+								<p class='mui-ellipsis mui-h3'>长者  居家养老</p>
+							</div>
+						</div>
+						<input name="radio1" type="radio" checked>
+					</a>
+				</li>
+				<li class="mui-table-view-cell">
+					<a href="#" class="mui-radio">
+						<div class="mui-col-xs-10  mui-pull-left flew-items">
+							<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/02.jpg" width="50" /></div>
+							<div class="mui-media-body">
+								<h1>父亲的智能手表</h1>
+								<p class='mui-ellipsis mui-h3'>JP01351704</p>
+							</div>
+						</div>
+						<input name="radio1" type="radio" checked>
+					</a>
+				</li>
+			</ul>	
+		</div>
 </div>
 </template>