Merge remote-tracking branch 'origin/master'

src/components/Pagination/index.vue

@@ -96,7 +96,8 @@ export default {
     handleCurrentChange(val) {
       this.$emit('pagination', { page: val, limit: this.pageSize })
       if (this.autoScroll) {
-        scrollTo(0, 800)
+        //分页向上滚动效果
+        // scrollTo(0, 800)
       }
     }
   }

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.0.166:9991/`,
+        target: `http://192.168.0.66:9160/UDI_SPMS_SERVER/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",