diff --git a/config/index.js b/config/index.js
index d7efe3862e7418a989268609b0f3c90c29fd11ab..489ddce99dc77034858668a1671f67df57d729e2 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,7 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/': {
-                target: 'http://47.93.219.145:8888', // Service URL
+                target: 'http://175.27.138.106:3001', // Service URL
                 changeOrigin: true, // 在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题
                 // pathRewrite: { // 路径重写，
                 //     '^/api': '/' // 替换target中的请求地址，也就是说以后你在请求http://api.jisuapi.com/XXXXX这个地址的时候直接写成/api即可。
diff --git a/src/utils/http.js b/src/utils/http.js
index e6c46c914a3ac0a344a433b06a866aaa8cabe3bc..5c0f7739f5ff1437a78d484c912abfcaec64b432 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -23,7 +23,7 @@ export const warning = async msg => {
  * @type {number}
  */
 axios.defaults.timeout = 5000 //请求超时5秒
-// axios.defaults.baseURL = '/wsvtp'  //请求base url
+// axios.defaults.baseURL = '/api'  //请求base url
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded' //设置post请求是的header信息
 
 /**
diff --git a/src/views/Content/News.vue b/src/views/Content/News.vue
index fa76422d7c88a4aef54912a2816995884d1dc0f7..a7be5dc86ea6cf8f102f1219c6eb47e7fd5ef660 100644
--- a/src/views/Content/News.vue
+++ b/src/views/Content/News.vue
@@ -33,8 +33,8 @@
       <el-table-column sortable prop="type" label="新闻种类" width="120" show-overflow-tooltip/>
       <el-table-column align="center" label="操作" min-width="150">
         <template slot-scope="scope">
-          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">预览</el-button>
-          <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">退款</el-button>
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+          <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -47,13 +47,20 @@
           <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入新闻标题"></el-input>
         </el-form-item>
         <el-form-item label="新闻正文" prop="content">
-          <el-input size="small" v-model="editForm.content" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+          <el-input disabled size="small" v-model="editForm.content" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
         </el-form-item>
         <el-form-item label="新闻附件路径" prop="file">
-          <el-input size="small" v-model="editForm.file" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
+          <el-input disabled size="small" v-model="editForm.file" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
         </el-form-item>
         <el-form-item label="新闻种类" prop="type">
-          <el-input size="small" v-model="editForm.type" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-select size="small" v-model="editForm.type" placeholder="请选择新闻种类">
+            <el-option
+              v-for="item in newsOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -72,6 +79,24 @@ import { get } from '../../utils/http'
 export default {
   data () {
     return {
+      newsOptions: [
+        {
+          value: 0,
+          label: '未知'
+        },
+        {
+          value: 1,
+          label: '通知公告'
+        },
+        {
+          value: 2,
+          label: '实验室动态'
+        },
+        {
+          value: 3,
+          label: '交流合作'
+        }
+      ],
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
@@ -106,16 +131,10 @@ export default {
       userparm: [], //搜索权限
       listData: [
         {
-          title: '猪肉又涨价了',
-          content: '吴亦凡说猪肉又涨价了',
-          file: '-',
-          type: '通知公告',
-        },
-        {
-          title: '鸡肉又跌价了',
-          content: '蔡徐坤说鸡肉又跌价了',
-          file: '-',
-          type: '交流合作',
+          title: '',
+          content: '',
+          file: '',
+          type: '',
         },
       ], //用户数据
       // 分页参数
@@ -145,41 +164,43 @@ export default {
    * 里面的方法只有被调用才会执行
    */
   methods: {
+    newsMapping(num) {
+      let n = parseInt(num)
+      switch (n) {
+        case 0:
+          return '未知'
+        case 1:
+          return '通知公告'
+        case 2:
+          return '实验室动态'
+        case 3:
+          return '交流合作'
+        default:
+          this.$message.error('错误新闻种类')
+      }
+    },
+
     // 获取公司列表
     getdata (parameter) {
       this.loading = true
-      this.loading = false
-      get(`/news/`, { page: 1, page_size: 5 }).then(value => {
+      let that = this
+      let params = {
+        page: parameter.page,
+        page_size: parameter.limit,
+      }
+      get(`/news/`, params).then(value => {
+        let results = value.results
+        this.listData = results.map(item => {
+          item.type = that.newsMapping(item.type)
+          return item
+        })
+        that.pageparm.currentPage = that.formInline.page
+        that.pageparm.pageSize = that.formInline.pageSize
+        that.pageparm.total = value.count
         this.loading = false
-        console.log('value', value)
-
-        this.pageparm.currentPage = this.formInline.page
-        this.pageparm.pageSize = this.formInline.limit
-        this.pageparm.total = res.count
+      }).catch(err => {
+        this.$message.error('加载失败')
       })
-      /***
-       * 调用接口，注释上面模拟数据 取消下面注释
-       */
-      // OrderList(parameter)
-      //   .then(res => {
-      //     this.loading = false
-      //     if (res.success == false) {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg
-      //       })
-      //     } else {
-      //       this.listData = res.data
-      //       // 分页赋值
-      //       this.pageparm.currentPage = this.formInline.page
-      //       this.pageparm.pageSize = this.formInline.limit
-      //       this.pageparm.total = res.count
-      //     }
-      //   })
-      //   .catch(err => {
-      //     this.loading = false
-      //     this.$message.error('菜单加载失败，请稍后再试！')
-      //   })
     },
     // 分页插件事件
     callFather (parm) {
@@ -243,38 +264,30 @@ export default {
     },
     // 删除公司
     deleteUser (index, row) {
-      this.$message({
-        type: 'success',
-        message: '删除操作成功',
+      this.$confirm('确定要删除该新闻?', '信息', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+
+        // ConfigDelete(row.deptId).then(res => {
+        //   if (res.success) {
+        //     this.$message({
+        //       type: 'success',
+        //       message: '公司已删除!',
+        //     })
+        //     this.getdata(this.formInline)
+        //   } else {
+        //     this.$message({
+        //       type: 'info',
+        //       message: res.msg,
+        //     })
+        //   }
+        // }).catch(err => {
+        //   this.loading = false
+        //   this.$message.error('支付配置信息删除失败，请稍后再试！')
+        // })
       })
-      // this.$confirm('确定要删除吗?', '信息', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning',
-      // }).then(() => {
-      //   ConfigDelete(row.deptId).then(res => {
-      //     if (res.success) {
-      //       this.$message({
-      //         type: 'success',
-      //         message: '公司已删除!',
-      //       })
-      //       this.getdata(this.formInline)
-      //     } else {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg,
-      //       })
-      //     }
-      //   }).catch(err => {
-      //     this.loading = false
-      //     this.$message.error('支付配置信息删除失败，请稍后再试！')
-      //   })
-      // }).catch(() => {
-      //   this.$message({
-      //     type: 'info',
-      //     message: '已取消删除',
-      //   })
-      // })
     },
     // 关闭编辑、增加弹出框
     closeDialog (formName) {
diff --git a/src/views/login.vue b/src/views/login.vue
index fb7ec297fbf426f7c85e93f2423954327d9c0769..1a10f97178406ae91703b75444c5d01beb9dbe39 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="login-wrap">
-    <el-form label-position="left" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="0px" class="demo-ruleForm login-container">
+    <el-form label-position="left" :model="ruleForm" :rules="rules" ref="ruleForm" label-width="0px"
+             class="demo-ruleForm login-container">
       <h3 class="title">用户登录</h3>
       <el-form-item prop="username">
         <el-input type="text" v-model="ruleForm.username" auto-complete="off" placeholder="账号"></el-input>
@@ -19,9 +20,11 @@
 import { login } from '../api/userMG'
 import { setCookie, getCookie, delCookie } from '../utils/util'
 import md5 from 'js-md5'
+import { post } from '../utils/http'
+
 export default {
   name: 'login',
-  data() {
+  data () {
     return {
       //定义loading默认为false
       logining: false,
@@ -33,20 +36,20 @@ export default {
         password: '',
         code: '',
         randomStr: '',
-        codeimg: ''
+        codeimg: '',
       },
       //rules前端验证
       rules: {
         username: [{ required: true, message: '请输入账号', trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
-      }
+      },
     }
   },
   // 创建完毕状态(里面是操作)
-  created() {
+  created () {
     this.$message({
       message: '账号密码及验证码不为空即可',
-      type: 'success'
+      type: 'success',
     })
     // 获取图形验证码
     this.getcode()
@@ -57,7 +60,7 @@ export default {
   // 里面的函数只有调用才会执行
   methods: {
     // 获取用户名密码
-    getuserpwd() {
+    getuserpwd () {
       if (getCookie('user') != '' && getCookie('pwd') != '') {
         this.ruleForm.username = getCookie('user')
         this.ruleForm.password = getCookie('pwd')
@@ -65,17 +68,23 @@ export default {
       }
     },
     //获取info列表
-    submitForm(formName) {
+    submitForm (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.logining = true
-          // 测试通道，不为空直接登录
-          setTimeout(() => {
+          // setTimeout(() => {
+          //   this.logining = false
+          //   this.$store.commit('login', 'true')
+          //   this.$router.push({ path: '/goods/Goods' })
+          // }, 1000)
+
+          post(`user/login/`, { username: 'admin', password: 'admin123456' }).then(value => {
             this.logining = false
             this.$store.commit('login', 'true')
+            localStorage.setItem('accessToken', value.token)
             this.$router.push({ path: '/goods/Goods' })
-          }, 1000)
-          // 注释
+          })
+
           // login(this.ruleForm).then(res => {
           //   if (res.success) {
           //     if (this.rememberpwd) {
@@ -112,7 +121,7 @@ export default {
         }
       })
     },
-  }
+  },
 }
 </script>
 
@@ -128,6 +137,7 @@ export default {
   background-position: center right;
   background-size: 100%;
 }
+
 .login-container {
   border-radius: 10px;
   margin: 0px auto;
@@ -138,17 +148,21 @@ export default {
   text-align: left;
   box-shadow: 0 0 20px 2px rgba(0, 0, 0, 0.1);
 }
+
 .title {
   margin: 0px auto 40px auto;
   text-align: center;
   color: #505458;
 }
+
 .remember {
   margin: 0px 0px 35px 0px;
 }
+
 .code-box {
   text-align: right;
 }
+
 .codeimg {
   height: 40px;
 }