bug fixes

src/modules/offices/src/reportPaper/edit.vue

@@ -118,6 +118,14 @@ export default {
       payVisible: false
     }
   },
+  watch: {
+    '$route.query': {
+      immediate: true,
+      handler(query) {
+        this.payVisible = query.pay === '1'
+      }
+    }
+  },
   computed: {
     productId() {
       const found = this.productList.find(item => item.value === this.ruleForm.number)
@@ -128,7 +136,7 @@ export default {
     handleSubmitSuccess(response) {
       if (!this.isEdit) {
         this.$router
-          .replace({ name: 'pareportEdit', params: { id: response.data.id }, query: { id: this.affairId } })
+          .replace({ name: 'pareportEdit', params: { id: response.data.id }, query: { id: this.affairId, pay: '1' } })
           .then(this.getDetail)
       }
       this.handlePay()
@@ -140,7 +148,6 @@ export default {
     // 支付成功
     handlePaySuccess() {
       api.paySuccess(this.pid).then(response => {
-        // this.$router.replace({ name: 'pareportView', params: { id: this.pid }, query: { id: this.affairId } })
         this.getDetail()
         this.payVisible = false
       })

src/modules/offices/src/retake/edit.vue

@@ -202,8 +202,6 @@ export default {
     handlePaySuccess() {
       api.paySuccess(this.pid).then(response => {
         this.$router.replace({ name: 'retakeView', params: { id: this.pid }, query: { id: this.affairId } })
-        this.getDetail()
-        this.payVisible = false
       })
     }
   },

src/pages/mainsite.vue

 <template>
-<!-- // 整体网站结构 -->
-<el-container :style="{height: containerStyle.height}">
-  <el-header><navigation /></el-header>
-  <el-container>
-    <sidebar :obj="sidebar" />
-    <el-main><router-view></router-view></el-main>
+  <!-- // 整体网站结构 -->
+  <el-container :style="{ height: containerStyle.height }">
+    <el-header><navigation /></el-header>
+    <el-container>
+      <sidebar :obj="sidebar" />
+      <el-main><router-view :key="$route.fullPath"></router-view></el-main>
+    </el-container>
   </el-container>
-</el-container>
 </template>
 
 <script>
@@ -15,7 +15,7 @@ import Sidebar from '@/components/learnSysLayout/sidebar.vue'
 
 export default {
   components: { Navigation, Sidebar },
-  data () {
+  data() {
     const clientHeight = document.documentElement.clientHeight - 1 + 'px'
     const clientWidth = document.documentElement.clientWidth + 'px'
     return {
@@ -42,12 +42,12 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     this.sidebar.containerStyle = this.containerStyle
     /* 监听侧边栏的当前状态 */
-    this.$root.$on('updateStatus', (status) => {
+    this.$root.$on('updateStatus', status => {
       this.sidebar.status = status
-      this.sidebar.sidebarStyle.width = (status ? 'auto' : '200px')
+      this.sidebar.sidebarStyle.width = status ? 'auto' : '200px'
     })
   }
 }