Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/projects/business/router/master.js

@@ -809,9 +809,32 @@ const routesMaster = [
 							requireAuth: true,
 							role: [],
 							title: '疫情上报',
+							form: true
+						}
+					},
+					//疫情上报列表
+					{
+						path: 'reportList',
+						name: 'MasterHealthReportList',
+						component: () => import('../views/Master/Health/ReportList.vue'),
+						meta: {
+							requireAuth: true,
+							role: [],
+							title: '疫情上报列表',
 							mode: true
 						}
 					},
+					//疫情上报详情
+					{
+						path: 'reportInfo',
+						name: 'MasterHealthReportInfo',
+						component: () => import('../views/Master/Health/ReportInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '疫情上报详情',
+						}
+					},
 					//健康档案
 					{
 						path: 'archives',

src/projects/business/views/Master/Health/ReportInfo.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Health/ReportList.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/business/views/Master/Property/Complaint/List.vue

@@ -46,7 +46,7 @@
 								<!--空状态-->
 								<div v-if="recordList.length==0" class="vongi-kong">
 									<img src="~$project/assets/img/no.png" />
-									<p>暂无报修记录</p>
+									<p>暂无投诉建议记录</p>
 								</div>
 							</div>
 						</div>
@@ -85,7 +85,7 @@
 		</div>
 
 		<div class="fyy-footer" style="z-index:99">
-			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="goToForm()">填写物业报修</button></div>
+			<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="goToForm()">填写物业投诉建议</button></div>
 		</div>
 
 		<loading :visible="isLoading"></loading>

src/utils/wxpay.js

@@ -1,6 +1,8 @@
 import store from '$project/store'
 
 function onBridgeReady(params) {
+	//记录要回跳的url
+	store.commit('SET_WX_PAY_BACK_URL', params.url)
 	window.WeixinJSBridge.invoke(
 		'getBrandWCPayRequest', {
 			'appId': params.appId, // 公众号名称，由商户传入
@@ -15,8 +17,6 @@ function onBridgeReady(params) {
 			if (res.err_msg == 'get_brand_wcpay_request:ok') {
 				//alert("支付成功") // 不会执行
 				//window.location.href = params.url
-				//记录要回跳的url
-				store.commit('SET_WX_PAY_BACK_URL', params.url)
 			} else if (res.err_msg == "get_brand_wcpay_request:cancel") {
 				//alert("支付取消") // 会执行
 			} else {