Merge branches 'update' and 'zyz' of http://git.shengws.com/zhangbj/xt_pad into update

src/pages/advice/NormalAdviceTable.vue

     },
     methods: {
       clickfunction: function(val) {
-        console.log(val);
+        // console.log(val);
         this.$router.push({
           path: "/details",
           query: {