Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Live/Info.vue

@@ -43,7 +43,9 @@
 			 <div class="mui-content vongi-spkh" v-if="buystatus&&!list.length" >
 				<div class="vongi-payyes-icon">
 					<img src="~$project/assets/img/spkh.png" />
+					<h1 style="color:red">支付成功</h1>
 					<h2>感谢您购买视频监控服务<br>现已加入安装排期计划</h2>
+
 				</div>
 			</div>
 			<div class="fyy-footer" v-if="buystatus&&!list.length">

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

@@ -102,10 +102,11 @@ export default {
     methods: {
         //右上角点击事件
         edit() {
+        debugger
             this.$router.push({
                 name: "MasterHospitalArchives",
                 query: {
-                  id: this.info.personId
+                  id: this.info.id
                 },
             });
         },