Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -754,10 +754,6 @@ h3 {
 	padding: 3px 12px
 }
 
-.openfyy-list .flew-sp a {
-	padding-right:
-}
-
 .openfyy-list .flew-sp .mui-navigate-right:after,
 .openfyy-list .flew-sp .mui-push-right:after {
 	right: 0
@@ -1149,6 +1145,7 @@ h3 {
 .vongi-wordcard .mui-media-object img {
 	width: 100%;
 	object-fit: cover;
+	min-height:100%
 }
 
 .vongi-wordcard-top {
@@ -1296,8 +1293,8 @@ h3 {
 	right:20px;
 	top:50%;
 	margin:0;
-	margin-top:-6px;
-	color:#999	
+	margin-top:-6px;	
+	color:#999
 }
 .vongi-wordcard-sp .mui-input-group .mui-input-row {
 	background: 0;

src/projects/business/views/Guest/From/Add.vue

@@ -18,8 +18,8 @@
 						<input type="text" class="mui-input-clear" placeholder="请输入单位名称"  v-model="detail.unit">
 					</div>
 					<div class="mui-input-row">
-						<label>访问事由<span class="colorfe616c">*</span></label>
-						<input type="text" class="mui-input-clear" placeholder="请填写您的来访事由"  v-model="detail.visitReasons">
+						<label>邀访事由<span class="colorfe616c">*</span></label>
+						<input type="text" class="mui-input-clear" placeholder="请填写邀访事由"  v-model="detail.visitReasons">
 					</div>
 				</form>
 			</div>

src/projects/business/views/Guest/From/List.vue

@@ -16,7 +16,7 @@
 							<span>{{item.unit}}</span>
 						</li>
 						<li class="mui-table-view-cell"  >
-							<label>拜访事宜：</label>
+							<label>邀访事由：</label>
 							<span>{{item.visitReasons}}</span>
 						</li>
 						<li class="mui-table-view-cell"  >

src/projects/pension/views/Master/Live/Pay.vue

@@ -7,12 +7,12 @@
 	<div class="mui-content vongi-qingjiadt">
 				<div class="vongi-cashier">
 
-					<img   :src="detail.pic" alt="">
+					<img   :src="detail.goodsPic" alt="">
 					<div class="vongi-cashier-text">
 						<div class="vongi-text-tit">
 							<h3 class="flew-sp ellipsis">
-								{{detail.name}}</h3>
-							<p class="ellipsis">{{detail.desc}}</p>
+								{{detail.goodsName}}</h3>
+							<p class="ellipsis">{{detail.goodsDesc}}</p>
 						</div>
 						
 						<h3 class="flew-sp">￥{{detail.totalFee}}<p>×1</p></h3>
@@ -21,7 +21,7 @@
 				<form class="mui-input-group">
 					<div class="mui-input-row">
 						<label>购买者姓名</label>
-						<span>{{person_data.name}}</span>
+						<span>{{detail.name}}</span>
 					</div>
 
 					<div class="mui-input-row">
@@ -144,6 +144,9 @@
 				this.isLoading=true;
 				if(this.paytypeindex=="1"){
 					API_Pay.wxJsapiPay(this.detail.id,this.paycode).then(data=>{
+						//公共页面
+						data.url=window.location.href.split("#")[0]+"/#/master/live/paySuccess";
+
 						this.isLoading=false;
 						wxPayJs(data)
 					}).catch(error => {
@@ -188,10 +191,7 @@
 			},asynCallBack(){},
 		},
 		mounted() {
-			if(this.id){
-				this.detail.id=this.id;
-				this.getDetail();
-			}
+
 
 
 		},

src/projects/pension/views/Master/User/RelationPerson.vue

@@ -4,20 +4,16 @@
 			<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">
+		<div class="mui-content margin60">
 			<div class="mui-content-padded">
 				<h5>长者信息</h5>
 				<ul class="mui-table-view openfyy-list">
-					<li class="mui-table-view-cell">
-						<a href="#">
-							<div class="mui-pull-left flew-items">
-								<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/03.jpg" width="50" /></div>
-								<div class="mui-media-body">
-									<h3>赵双龙</h3>
-									<p class='mui-ellipsis mui-h4'>金色家园老年公寓 颐养楼 1-201</p>
-								</div>
-							</div>
-						</a>
+					<li class="mui-table-view-cell vongi-wordcard">
+						<div class="mui-media-object mui-pull-left "><img src="~$project/assets/img/03.jpg" width="50" /></div>
+						<div class="mui-media-body">
+							<h3>赵双龙</h3>
+							<p class='mui-ellipsis mui-h4'>金色家园老年公寓 颐养楼 1-201</p>
+						</div>	
 					</li>
 				</ul>
 			</div>
@@ -25,28 +21,23 @@
 			<div class="mui-content-padded vongi-qingjiadt">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
-						<label>姓名<i class="colorfe616c">*</i></label>
+						<label>姓名</label>
 						<span>赵刚</span>
 					</div>
 					<div class="mui-input-row">
-						<label>手机号码<i class="colorfe616c">*</i></label>
+						<label>手机号码</label>
 						<span>18600001111</span>
 					</div>
-					<div class="mui-input-row vongi-yzm">
-						<input type="text" class="mui-input-clear" placeholder="请输入验证码">
-						<a href="" class="mui-pull-right">发送验证码</a>
-					</div>
 				</form>
 			</div>
 			<div class="mui-content-padded 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>
 					<div class="mui-input-row">
-						<label>身份证号</label>
+						<label>联系地址</label>
 						<input type="text" class="mui-input-clear" placeholder="请填写联系人居住实际地址">
 					</div>
 				</form>
@@ -54,8 +45,8 @@
 			<div class="mui-content-padded">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
-						<label>我是长者的<i class="colorfe616c">*</i></label>
-						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
+						<label style="width:40%">我是长者的<i class="colorfe616c">*</i></label>
+						<button class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:60%">
 							儿子
 						</button>
 					</div>
@@ -64,8 +55,8 @@
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
-						<label style="width:50%">人脸识别照片</label>
-						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+						<label style="width:70%">上传我的人脸识别照片</label>
+						<button class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:30%">
 							<img src="~$project/assets/img/audit1.png" /> 
 						</button>
 					</div>

src/projects/pension/views/Master/User/RelationPersonRegister.vue

@@ -1,8 +1,39 @@
 <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">
+			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
+				<h5>第一步：验证手机号</h5>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>姓名<i class="colorfe616c">*</i></label>
+						<input type="text" class="mui-input-clear" placeholder="请输入姓名">
+					</div>
+					<div class="mui-input-row">
+						<label>手机号码<i class="colorfe616c">*</i></label>
+						<input type="text" class="mui-input-clear" placeholder="请输入手机号码">
+					</div>
+					<div class="mui-input-row vongi-yzm">
+						<input type="text" class="mui-input-clear" placeholder="请输入验证码">
+						<a href="" class="mui-pull-right">发送验证码</a>
+					</div>
+				</form>
+			</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/utils/wxpay.js

@@ -19,8 +19,6 @@ function onBridgeReady(params) {
 
 export const wxPayJs = (params) => {
 
-	//公共页面
-	params.url=window.location.href.split("#")[0]+"/#/master/live/paySuccess";
 
 	if (typeof window.WeixinJSBridge === 'undefined') {
 		if (document.addEventListener) {