홈 탐색 도움말
로그인
lrf402788946
/
llh_project
1
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

合并

LinHGL 5 년 전
부모
beff841d51 03554cf84f
커밋
3cd2a29a7f
6개의 변경된 파일과 83개의 추가작업 그리고 2개의 파일을 삭제
분할 보기 변경상태 보기
  1. 5 0
      src/components/SideBar.vue
  2. 11 0
      src/router.js
  3. 34 0
      src/views/account/register.vue
  4. 31 0
      src/views/certificate/index.vue
  5. 1 1
      src/views/login.vue
  6. 1 1
      vue.config.js

+ 5 - 0
src/components/SideBar.vue
파일 보기 

@@ -6,7 +6,12 @@
 
     </div>
 
     <el-menu mode="vertical" :show-timeout="200" :router="true" background-color="#00142a" text-color="hsla(0, 0%, 100%, .65)" active-text-color="#409EFF">
 
       <el-menu-item index="/404">404</el-menu-item>
 
+<<<<<<< HEAD
 
       <el-menu-item index="/user">User</el-menu-item>
 
+=======
 
+      <el-menu-item index="/views/certificate/index">凭证管理</el-menu-item>
 
+      <el-menu-item index="/account/register">账号管理</el-menu-item>
 
+>>>>>>> 03554cf84ff0c10f54dbfe84a7de1d30ea0129b8
 
     </el-menu>
 
   </scroll-bar>
 
 </template>

+ 11 - 0
src/router.js
파일 보기 

@@ -23,9 +23,20 @@ export default new Router({
 
           component: () => import('./views/NotFound.vue'),
 
         },
 
         {
 
+<<<<<<< HEAD
 
           path: '/user',
 
           name: 'User',
 
           component: () => import('./views/UserMes/userMes.vue'),
 
+=======
 
+          path: '/views/certificate/index',
 
+          name: 'certificate',
 
+          component: () => import('./views/certificate/index.vue'),
 
+        },
 
+        {
 
+          path: '/account/register',
 
+          name: 'register',
 
+          component: () => import('./views/account/register.vue'),
 
+>>>>>>> 03554cf84ff0c10f54dbfe84a7de1d30ea0129b8
 
         },
 
       ],
 
     },

+ 34 - 0
src/views/account/register.vue
파일 보기 

@@ -0,0 +1,34 @@
 
+<template lang="html">
 
+  <div id="register">
 
+    <el-row class="register">
 
+      <el-col :span="24">
 
+        标题
 
+      </el-col>
 
+      <el-col :span="24">
 
+        搜索
 
+      </el-col>
 
+      <el-col :span="24">
 
+        列表
 
+      </el-col>
 
+    </el-row>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  name: 'register',
 
+  props: {},
 
+  components: {},
 
+  data: () => ({}),
 
+  created() {},
 
+  computed: {},
 
+  methods: {},
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.register {
 
+  width: 100%;
 
+  padding: 20px;
 
+}
 
+</style>

+ 31 - 0
src/views/certificate/index.vue
파일 보기 

@@ -0,0 +1,31 @@
 
+<template lang="html">
 
+  <div id="certificate">
 
+    <el-row :span="12">
 
+      <el-input placeholder="请输入内容" v-model="input">
 
+        <el-select v-model="select" slot="prepend" placeholder="请选择">
 
+          <el-option label="餐厅名" value="1"></el-option>
 
+          <el-option label="订单号" value="2"></el-option>
 
+          <el-option label="用户电话" value="3"></el-option>
 
+        </el-select>
 
+        <el-button slot="append" icon="el-icon-search"></el-button>
 
+      </el-input>
 
+    </el-row>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  name: 'certificate',
 
+  props: {},
 
+  components: {},
 
+  data: () => ({
 
+    input: '',
 
+    select: '',
 
+  }),
 
+  created() {},
 
+  computed: {},
 
+  methods: {},
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped></style>

+ 1 - 1
src/views/login.vue
파일 보기 

@@ -3,7 +3,7 @@
 
     <body :style="'overflow-y: auto;background-image: url(' + img.bg + '); background-repeat:no-repeat; background-size:auto;'">
 
       <div class="page-container">
 
         <div>
 
-          <h1 style="letter-spacing:4px; padding-bottom:20px; font-weight:bold; color:#fff;">科技厅中台系统</h1>
 
+          <h1 style="letter-spacing:4px; padding-bottom:20px; font-weight:bold; color:#fff;">信任管理系统</h1>
 
         </div>
 
         <el-form :model="form" :rules="rules" ref="form" style="background:#ffffff;padding:5% 2%;" class="row">
 
           <el-row>

+ 1 - 1
vue.config.js
파일 보기 

@@ -1,7 +1,7 @@
 
 const path = require('path');
 
 
 module.exports = {
 
-  publicPath: process.env.NODE_ENV === 'production' ? '/kjtAdmin/' : './',
 
+  publicPath: '/',
 
   // pages: {
 
   //   index: 'src/pages/login/main.js',
 
   // },