Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-03-19 8effd8721c0d92bc912ece00b749e12edaef7791

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 src/views/healthcode/healthcode.vue

@@ -137,7 +137,6 @@
                }
              ],
            }
            
          ]
        },
        data: []
@@ -192,6 +191,12 @@
      },
      onLoad(page, params = {}) {
        this.loading = true;
        console.log("status="+this.$route.query.status);
        params ={
          status:this.$route.query.status,
          type:this.$route.query.type
        }
        console.log("params="+params);
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
          const data = res.data.data;
          this.page.total = data.total;

 src/views/home/home.vue

@@ -31,13 +31,13 @@
      handleStartAnimalHeat(data) {
        this.$router.push({
          path: `/animalHeat/animalHeatPage`,
          query: data
          query: data[0]
        });
      },
      handleStartHealthcode(data){
        this.$router.push({
          path: `/healthcode/healthcodePage`,
          query: data
          query: data[0]
        });
      }