Merge remote-tracking branch 'origin/master'

src/assets/css/xpgj.css

@@ -163,6 +163,9 @@
 	padding-left:37px;
 	text-align: left;
 }
+.vongi-me-top h4 span{
+	margin-left:5px
+}
 .vongi-me-name{
 	position:relative;
 	padding:0 15px 20px 15px

src/projects/business/views/Master/Mine/Center.vue

@@ -15,7 +15,7 @@
 							</div>
 							<h2>{{wellcomme}}{{person_data.name}}</h2>
 						</div>
-						<h4 v-text="person_data.phone"></h4>
+						<h4 v-text="person_data.phone"><span>编号:000000</span></h4>
 					</div>
 					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">
 						编辑资料

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

@@ -95,32 +95,19 @@
 					</div>
 				</div>
 			</div>
-			<div class="vongi-index-floor kfz">
+			<div class="vongi-index-floor ">
 				<h4 class="vongi-floor-title">优品推荐</h4>
 				<div class="vongi-index-inter flew-sp">
 					<div class="mui-col-xs-12">
 						<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-floor-padded">
 							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="javascript:void(0)">
+								<a  @click="toPay()" >
 									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
 									<div class="mui-media-body">老人防丢手环</div>
-									<div class="mui-media-body color-yellow">¥299.0</div>
-								</a>
-							</li>
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="javascript:void(0)">
-									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
-									<div class="mui-media-body">老人防丢手环</div>
-									<div class="mui-media-body color-yellow">¥299.0</div>
-								</a>
-							</li>
-							<li class="mui-table-view-cell mui-media mui-col-xs-4">
-								<a href="javascript:void(0)">
-									<div class="vongi-shop-img"><img src="~$project/assets/img/01.png" width="100%" /></div>
-									<div class="mui-media-body">老人防丢手环</div>
-									<div class="mui-media-body color-yellow">¥299.0</div>
+									<div class="mui-media-body color-yellow">¥0.01</div>
 								</a>
 							</li>
+
 						</ul>
 					</div>
 				</div>
@@ -135,6 +122,7 @@
 
 <script>
 	require('$project/assets/js/mui.picker.min.js');
+	import * as API  from '@/apis/Master/live'
 	import * as API_Notice from '@/apis/Common/notice'
 	import * as API_User from '$project/apis/user'
 	import Common from '$project/components/Common.vue'
@@ -165,6 +153,28 @@
 		},
 		created() {},
 		methods: {
+			toPay() {
+				this.isLoading = true;
+
+				API.submit({
+					"personId": this.person_data.id,
+					"payPersonId": this.person_data.id,
+					"goodsId":"2",
+				}).then(data => {
+
+					var url = window.location.href.split("#")[0];
+					var param = JSON.stringify(data).replace("{", "").replace("}", "").replace(/\",\"/g, "&").replace(/,\"/g, "&").replace(
+							/:/g, "=").replace(/\":\"/g, "=").replace(/\"/g, "");
+					param = param.replace('=//', '://');
+					window.location = url + "?#/master/live/pay?" + param;
+
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+
+
+			},
 			//获取用户角色列表
 			getRoleList() {
 				this.isLoading = true;

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

@@ -74,6 +74,7 @@
                 API.submit({
                     "personId": this.person_data.id,
                     "payPersonId": this.person_data.id,
+                    "goodsId":"1",
                 }).then(data => {
 
                     var url = window.location.href.split("#")[0];

src/projects/pension/views/Master/Mine/Center.vue

@@ -15,7 +15,7 @@
 							</div>
 							<h2>{{wellcomme}}{{person_data.name}}</h2>
 						</div>
-						<h4 v-text="person_data.phone"></h4>
+						<h4 v-text="person_data.phone"><span>编号:000000</span></h4>
 					</div>
 					<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined" @click="editInfo">
 						编辑资料