Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

# Conflicts:
#	src/main.js

src/main.js

@@ -78,7 +78,7 @@ router.beforeEach((to, from, next) => {
     let token = Util.getCookie('token') || '';
     if (!token) {
       window.location.href = '/#/login?referer=' + encodeURI(to.path);
-      history.go(0)
+      history.go(0);
     } else {
       next();
     }

src/router/index.js

@@ -49,6 +49,17 @@ const routes = [
     component: () => import('../views/Store/list.vue')
   },
   {
+    path: '/listDetail',
+    name: 'ListDetail',
+    meta: {
+      title: '库存列表详情'
+    
+    },
+    component: () => import('../views/Store/listDetail.vue')
+  },
+
+  
+  {
     path: '/enter',
     name: 'Enter',
     meta: {

src/views/Store/list.vue

@@ -48,7 +48,7 @@
           </el-table-column>
           <el-table-column fixed  label="型号" width="200">
             <template slot-scope="scope">
-                <a href="" class="f-blue">{{scope.row.goods_name}}</a>
+                <a :href="'/#/listDetail?id='+scope.row.id" class="f-blue">{{scope.row.goods_name}}</a>
               </template>
           </el-table-column>
           <el-table-column fixed prop="inquiry_sn" label="供应商内部型号编码" width="200">

src/views/Store/listDetail.vue

+<template>
+    <div class="index">
+        我是库存列表详情
+        <Menu/>
+    </div>
+
+</template>
+<script>
+  import Vue from 'vue';
+  import Menu from "@/components/menu.vue";
+  import Tool from '../../tool'
+  import {
+    Button,
+    Message 
+  } from 'element-ui'
+  Vue.use(Button)
+  export default {
+    name: "listDetail",
+
+    data() {
+      return {};
+    },
+    watch: {},
+    created() {
+
+    },
+    computed: {},
+    methods: {
+      ceshi() {
+          //this.$message.error('上传头像图片只能是 JPG 格式!');
+        Message('这是一条消息提示');
+        this.$http('get', "/getJoke1", {
+          page: 1, count: 2, type: 'video'
+        })
+          .then(res => {
+            console.log(res)
+          })
+          .catch(err => {
+            console.log(err.message);
+          })
+
+      }
+    },
+    components: {
+      Menu
+    }
+  };
+</script>
+<style scoped>
+    /* @import "../../assets/css/index/index.min.css"; */
+</style>
\ No newline at end of file