7 лет назад · bbc8c27b68
--- a/src/main/java/com/izouma/awesomeadmin/web/MainController.java
+++ b/src/main/java/com/izouma/awesomeadmin/web/MainController.java
@@ -29,12 +29,12 @@ public class MainController {
 
				 
			
 
				     @RequestMapping("/index")
			
 
				     public ModelAndView index(HttpServletRequest request) {
			
 
				-        return new ModelAndView("html/index.html");
			
 
				+        return new ModelAndView("html/admin.html");
			
 
				     }
			
 
				 
			
 
				     @RequestMapping("/")
			
 
				     public ModelAndView autoIndex(HttpServletRequest request) {
			
 
				-        return new ModelAndView("html/index.html");
			
 
				+        return new ModelAndView("html/admin.html");
			
 
				     }
			
 
				 
			
 
				     @RequestMapping("/admin")
			
--- a/src/main/vue/src/assetsPre/bg.jpg
+++ b/src/main/vue/src/assetsPre/bg.jpg
--- a/src/main/vue/src/assetsPre/btu_xiao.png
+++ b/src/main/vue/src/assetsPre/btu_xiao.png
--- a/src/main/vue/src/assetsPre/icon_bofang.png
+++ b/src/main/vue/src/assetsPre/icon_bofang.png
--- a/src/main/vue/src/assetsPre/icon_zanting.png
+++ b/src/main/vue/src/assetsPre/icon_zanting.png
--- a/src/main/vue/src/assetsPre/img_bioati.png
+++ b/src/main/vue/src/assetsPre/img_bioati.png
--- a/src/main/vue/src/assetsPre/去除文件名中.bat
+++ b/src/main/vue/src/assetsPre/去除文件名中.bat
@@ -1,5 +0,0 @@
 
				-@echo off& setlocal enabledelayedexpansion
			
 
				-
			
 
				-for /f "delims=" %%1 in ('dir /a /b') do (set wind=%%1
			
 
				-
			
 
				-ren "%%~1" "!wind:@3x=!")
			
--- a/src/main/vue/src/entries/index.html
+++ b/src/main/vue/src/entries/index.html
@@ -1,65 +0,0 @@
 
				-<!DOCTYPE html>
			
 
				-<html>
			
 
				-
			
 
				-<head>
			
 
				-    <meta charset="utf-8">
			
 
				-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				-    <meta name="referrer" content="origin">
			
 
				-    <title>2018世界智能制造大会</title>
			
 
				-    <link rel="icon" href="/static/favicon.ico" />
			
 
				-    <script src="/static/polyfill.min.js"></script>
			
 
				-    <!-- <script src="/static/fontawesome-v5.2.0.js"></script> -->
			
 
				-    <script src="/static/RongIMLib-2.2.5.min.js"></script>
			
 
				-    <style>
			
 
				-        #app {
			
 
				-            width: 100%;
			
 
				-            height: 100%;
			
 
				-            overflow: auto;
			
 
				-            position: absolute;
			
 
				-            top: 0;
			
 
				-            left: 0;
			
 
				-        }
			
 
				-    </style>
			
 
				-</head>
			
 
				-
			
 
				-<body>
			
 
				-    <div id="app"></div>
			
 
				-    <!-- built files will be auto injected -->
			
 
				-</body>
			
 
				-
			
 
				-<script>
			
 
				-    var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				-    var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
			
 
				-    var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
			
 
				-    var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
			
 
				-    if (isIE) {
			
 
				-        var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
			
 
				-        reIE.test(userAgent);
			
 
				-        var fIEVersion = parseFloat(RegExp["$1"]);
			
 
				-        if (fIEVersion == 11) {
			
 
				-
			
 
				-        } else {
			
 
				-            alert('检测到浏览器使用的ie内核版本过低，为了更好的用户体验，请切换成极速模式，或者更换360等其他类型浏览器')
			
 
				-        }
			
 
				-    } else if (isEdge) {
			
 
				-
			
 
				-    } else if (isIE11) {
			
 
				-
			
 
				-    } else {
			
 
				-
			
 
				-    }
			
 
				-
			
 
				-
			
 
				-    document.oncontextmenu = function() {
			
 
				-        return false;
			
 
				-    };
			
 
				-    document.onkeydown = function() {
			
 
				-        if (window.event && window.event.keyCode == 123) {
			
 
				-            event.keyCode = 0;
			
 
				-            event.returnValue = false;
			
 
				-            return false;
			
 
				-        }
			
 
				-    };
			
 
				-</script>
			
 
				-
			
 
				-</html>
			
--- a/src/main/vue/src/entries/index.js
+++ b/src/main/vue/src/entries/index.js
@@ -1,320 +0,0 @@
 
				-import Vue from 'vue'
			
 
				-import Main from '../pagesPre/Main'
			
 
				-import router from '../routerPre'
			
 
				-import store from '../vuexPre'
			
 
				-import ElementUI from 'element-ui'
			
 
				-import axios from 'axios'
			
 
				-// import moment from 'moment'
			
 
				-import VueI18n from 'vue-i18n'
			
 
				-import RongIM from '../RongIM'
			
 
				-Vue.use(RongIM)
			
 
				-
			
 
				-import '../elementVariables.scss'
			
 
				-import 'normalize.css/normalize.css'
			
 
				-// import 'element-ui/lib/theme-chalk/index.css'
			
 
				-import '../mainPre.less'
			
 
				-import { format } from 'date-fns'
			
 
				-
			
 
				-import distanceInWordsToNow from 'date-fns/distance_in_words_to_now'
			
 
				-import zh from 'date-fns/locale/zh_cn'
			
 
				-var scale = (window.screen.width / 375).toFixed(2)
			
 
				-var meta = document.createElement('meta')
			
 
				-meta.name = 'viewport'
			
 
				-meta.content = 'width=375,initial-scale=' + scale + ',user-scalable=no'
			
 
				-document.head.appendChild(meta)
			
 
				-
			
 
				-
			
 
				-
			
 
				-Vue.config.productionTip = false;
			
 
				-Vue.use(ElementUI);
			
 
				-Vue.use(VueI18n);
			
 
				-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : `http://${location.hostname}:8080`;
			
 
				-Vue.prototype.$baseUrl = baseUrl;
			
 
				-axios.defaults.withCredentials = true;
			
 
				-axios.defaults.baseURL = baseUrl;
			
 
				-// axios.post('/auth/loginGuest').then(res => {
			
 
				-//     if (res.data.success) {
			
 
				-//         axios.defaults.headers.common['token'] = res.data.data
			
 
				-
			
 
				-//         if (store.state.serviceType.length == 0) {
			
 
				-//             axios.get('/serviceType/home').then(res => {
			
 
				-//                 if (res.data.success) {
			
 
				-//                     store.commit('updateServiceType', res.data.data)
			
 
				-//                 }
			
 
				-//             }).catch(e => {
			
 
				-//                 console.log(e)
			
 
				-//             })
			
 
				-
			
 
				-//         }
			
 
				-//     }
			
 
				-// })
			
 
				-Vue.prototype.$http = {
			
 
				-    get(params) {
			
 
				-        return new Promise((resolve, reject) => {
			
 
				-            if (params instanceof String) {
			
 
				-                params = { url: params };
			
 
				-            } else if (!params instanceof Object) {
			
 
				-                reject('params error');
			
 
				-                return;
			
 
				-            }
			
 
				-            if (!params.url) {
			
 
				-                reject('url error');
			
 
				-                return;
			
 
				-            } else if (!params.url instanceof String) {
			
 
				-                reject('url error');
			
 
				-                return;
			
 
				-            } else if (params.url.length === 0) {
			
 
				-                reject('url error');
			
 
				-                return;
			
 
				-            }
			
 
				-            // if (!/^(http:\/\/)|(https:\/\/)/.test(params.url)) {
			
 
				-            //     params.url = baseUrl + params.url;
			
 
				-            // }
			
 
				-            store.commit('updateFetchingData', true);
			
 
				-            axios.get(params.url, {
			
 
				-                params: params.data
			
 
				-            }, { withCredentials: true }).then(res => {
			
 
				-                store.commit('updateFetchingData', false);
			
 
				-                if (res.status === 200) {
			
 
				-                    resolve(res.data);
			
 
				-                } else {
			
 
				-                    reject(res);
			
 
				-                }
			
 
				-                try {
			
 
				-                    if (res.data.code === 10001) {
			
 
				-                        axios({
			
 
				-                            method: 'post',
			
 
				-                            url: '/auth/logout'
			
 
				-                        });
			
 
				-                        store.commit('updateUserInfo', null);
			
 
				-                        router.replace('/login');
			
 
				-                    }
			
 
				-                } catch (e) {
			
 
				-
			
 
				-                }
			
 
				-            }).catch(e => {
			
 
				-                store.commit('updateFetchingData', false);
			
 
				-                reject(e);
			
 
				-            });
			
 
				-        });
			
 
				-    },
			
 
				-    post(params) {
			
 
				-        if (params instanceof String) {
			
 
				-            params = { url: params };
			
 
				-        } else if (!params instanceof Object) {
			
 
				-            reject('params error');
			
 
				-            return;
			
 
				-        }
			
 
				-        if (!params.url) {
			
 
				-            reject('url error');
			
 
				-            return;
			
 
				-        } else if (!params.url instanceof String) {
			
 
				-            reject('url error');
			
 
				-            return;
			
 
				-        } else if (params.url.length === 0) {
			
 
				-            reject('url error');
			
 
				-            return;
			
 
				-        }
			
 
				-        // if (!/^(http:\/\/)|(https:\/\/)/.test(params.url)) {
			
 
				-        //     params.url = baseUrl + params.url;
			
 
				-        // }
			
 
				-        let data = new FormData();
			
 
				-        if (params.data) {
			
 
				-            for (let key in params.data) {
			
 
				-                if (params.data.hasOwnProperty(key)) {
			
 
				-                    if (params.data[key] instanceof Array) {
			
 
				-                        let hasObject = false;
			
 
				-                        params.data[key].forEach(i => {
			
 
				-                            if (i instanceof Object) {
			
 
				-                                hasObject = true;
			
 
				-                            }
			
 
				-                        });
			
 
				-                        if (!hasObject) {
			
 
				-                            data.append(key, params.data[key].join());
			
 
				-                        }
			
 
				-                    } else if (!(params.data[key] instanceof Object)) {
			
 
				-                        data.append(key, params.data[key]);
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        return new Promise((resolve, reject) => {
			
 
				-            store.commit('updateFetchingData', true);
			
 
				-            axios.post(params.url, data, { withCredentials: true }).then(res => {
			
 
				-                store.commit('updateFetchingData', false);
			
 
				-                if (res.status === 200) {
			
 
				-                    resolve(res.data);
			
 
				-                } else {
			
 
				-                    reject(res);
			
 
				-                }
			
 
				-                try {
			
 
				-                    if (res.data.code === 10001) {
			
 
				-                        axios({
			
 
				-                            method: 'post',
			
 
				-                            url: '/auth/logout'
			
 
				-                        });
			
 
				-                        store.commit('updateUserInfo', null);
			
 
				-                        router.replace('/login');
			
 
				-                    }
			
 
				-                } catch (e) {
			
 
				-
			
 
				-                }
			
 
				-            }).catch(e => {
			
 
				-                store.commit('updateFetchingData', false);
			
 
				-                reject(e);
			
 
				-            });
			
 
				-        });
			
 
				-    }
			
 
				-};
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-Vue.prototype.getTime = function(str) {
			
 
				-    if (str) {
			
 
				-        // return moment(str).format('YYYY-MM-DD HH:mm')
			
 
				-        return format(new Date(str), 'YYYY-MM-DD HH:mm', { locale: zh })
			
 
				-    } else {
			
 
				-        return ''
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-Vue.prototype.getPhone = function(phone) {
			
 
				-    if (phone) {
			
 
				-        if (phone.length == 11) {
			
 
				-            var str = phone.substr(0, 3)
			
 
				-            str += '****'
			
 
				-            str += phone.substr(phone.length - 4, 4)
			
 
				-            return str
			
 
				-        } else {
			
 
				-            return ''
			
 
				-        }
			
 
				-    } else {
			
 
				-        return ''
			
 
				-    }
			
 
				-
			
 
				-
			
 
				-}
			
 
				-Vue.prototype.getMail = function(mail) {
			
 
				-    if (mail) {
			
 
				-        var list = mail.split('@')
			
 
				-        var str = list[0].substr(0, 3)
			
 
				-        str += '****'
			
 
				-        str += list[0].substr(list[0].length - 2, 2)
			
 
				-        str += '@' + list[1]
			
 
				-        return str
			
 
				-    } else {
			
 
				-        return ''
			
 
				-    }
			
 
				-
			
 
				-}
			
 
				-
			
 
				-
			
 
				-Vue.prototype.sendMeg = function(phone, code) {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-        this.$http.get({
			
 
				-            url: '/aliapi/sendCode',
			
 
				-            data: {
			
 
				-                phone: phone,
			
 
				-                templateCode: code
			
 
				-            }
			
 
				-        }).then(res => {
			
 
				-            if (res.success) {
			
 
				-                resolve(res)
			
 
				-            } else {
			
 
				-                resolve(res)
			
 
				-            }
			
 
				-        }).catch(e => {
			
 
				-            resolve(e)
			
 
				-
			
 
				-        })
			
 
				-    })
			
 
				-
			
 
				-}
			
 
				-
			
 
				-//检查是否存在
			
 
				-Vue.prototype.checkHas = function(data) {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-        this.$http.get({
			
 
				-            url: '/userInfo/getOne',
			
 
				-            data: data
			
 
				-        }).then(res => {
			
 
				-            if (res.success) {
			
 
				-                if (res.data) {
			
 
				-                    resolve(true)
			
 
				-                } else {
			
 
				-                    resolve(false)
			
 
				-                }
			
 
				-
			
 
				-            } else {
			
 
				-                resolve(res.data)
			
 
				-            }
			
 
				-        }).catch(e => {
			
 
				-            resolve(e)
			
 
				-
			
 
				-        })
			
 
				-    })
			
 
				-
			
 
				-
			
 
				-}
			
 
				-
			
 
				-
			
 
				-//获取距离现在时间
			
 
				-Vue.prototype.forNow = function(str) {
			
 
				-    var time = ''
			
 
				-    if (str) {
			
 
				-        // time = moment(str).fromNow()
			
 
				-        time = distanceInWordsToNow(new Date(str), { locale: zh, addSuffix: true })
			
 
				-    }
			
 
				-    return time
			
 
				-}
			
 
				-
			
 
				-
			
 
				-
			
 
				-Vue.mixin({
			
 
				-    methods: {
			
 
				-        timeFormatter(row, column, cellValue, index) {
			
 
				-            return format(new Date(cellValue), 'HH:mm', { locale: zh })
			
 
				-        },
			
 
				-        datetimeFormatter(row, column, cellValue, index) {
			
 
				-            if (!cellValue) return ''
			
 
				-            return format(new Date(cellValue), 'YYYY/MM/DD HH:mm', { locale: zh })
			
 
				-        }
			
 
				-    }
			
 
				-});
			
 
				-
			
 
				-const updateTableHeight = () => {
			
 
				-    try {
			
 
				-        const total = document.getElementsByTagName('main')[0].clientHeight;
			
 
				-        const filter = document.getElementsByClassName('filters-container')[0].clientHeight;
			
 
				-        const page = document.getElementsByClassName('pagination-wrapper')[0].clientHeight;
			
 
				-        store.commit('updateTableHeight', total - filter - page - 44);
			
 
				-    } catch (e) {
			
 
				-        // console.error(e)
			
 
				-    }
			
 
				-};
			
 
				-
			
 
				-
			
 
				-
			
 
				-//校验手机号是否正确
			
 
				-Vue.prototype.checkPhone = function(phone) {
			
 
				-    var result = false
			
 
				-    if ((/^1[3|4|5|8|7|6|9][0-9]\d{8}$/.test(phone))) {
			
 
				-        result = true
			
 
				-    }
			
 
				-    return result
			
 
				-}
			
 
				-
			
 
				-
			
 
				-window.onload = updateTableHeight;
			
 
				-window.onresize = updateTableHeight;
			
 
				-setInterval(updateTableHeight, 500);
			
 
				-
			
 
				-var app = new Vue({
			
 
				-    el: '#app',
			
 
				-    router,
			
 
				-    store,
			
 
				-    components: { Main },
			
 
				-    template: '<Main/>'
			
 
				-});
			
--- a/src/main/vue/src/mainPre.less
+++ b/src/main/vue/src/mainPre.less
@@ -1,113 +0,0 @@
 
				-* {
			
 
				-
			
 
				-}
			
 
				-
			
 
				-html, body {
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
			
 
				-    -webkit-font-smoothing: antialiased;
			
 
				-    -moz-osx-font-smoothing: grayscale;
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-}
			
 
				-
			
 
				-html {
			
 
				-    background: white;
			
 
				-}
			
 
				-
			
 
				-a {
			
 
				-    text-decoration: none;
			
 
				-}
			
 
				-
			
 
				-a img {
			
 
				-    border: 0;
			
 
				-}
			
 
				-
			
 
				-input, textarea, button {
			
 
				-    border: none;
			
 
				-    outline: none;
			
 
				-    background: none;
			
 
				-    appearance: none;
			
 
				-}
			
 
				-
			
 
				-ul, li {
			
 
				-    appearance: none;
			
 
				-    margin: 0;
			
 
				-    padding: 0;
			
 
				-    list-style-type: none;
			
 
				-}
			
 
				-
			
 
				-//.el-menu-item {
			
 
				-//    background: #1F2D3D !important;
			
 
				-//}
			
 
				-//
			
 
				-//.el-submenu .el-submenu .el-submenu__title {
			
 
				-//    background: #1F2D3D !important;
			
 
				-//}
			
 
				-
			
 
				-.el-menu-vertical-demo .el-menu-item.is-active {
			
 
				-    // background: #1F2D3D !important;
			
 
				-    border-left: 6px solid #0B9EC0;
			
 
				-}
			
 
				-
			
 
				-.el-menu {
			
 
				-    i {
			
 
				-        color: #BFCBD9;
			
 
				-    }
			
 
				-    .svg-inline--fa {
			
 
				-        margin-right: 6px;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.el-pagination {
			
 
				-    display: flex;
			
 
				-    justify-content: center;
			
 
				-    background: #fff;
			
 
				-}
			
 
				-
			
 
				-.filters-container {
			
 
				-    .filter-item {
			
 
				-        margin-bottom: 10px;
			
 
				-        margin-right: 10px;
			
 
				-        margin-left: 0;
			
 
				-    }
			
 
				-    .filter-item.el-input {
			
 
				-        width: 200px;
			
 
				-    }
			
 
				-
			
 
				-    .filter-item.el-input {
			
 
				-        width: 200px;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.table-column-filter {
			
 
				-    cursor: pointer;
			
 
				-    color: #409eff;
			
 
				-    float: right;
			
 
				-    height: 36px;
			
 
				-    margin-bottom: 10px;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-}
			
 
				-
			
 
				-.table-column-filter-wrapper {
			
 
				-    padding: 10px 20px;
			
 
				-}
			
 
				-
			
 
				-.pagination-wrapper {
			
 
				-    padding-top: 20px;
			
 
				-    position: relative;
			
 
				-}
			
 
				-
			
 
				-.multiple-mode-wrapper {
			
 
				-    position: absolute;
			
 
				-    left: 0;
			
 
				-    top: 20px;
			
 
				-    bottom: 2px;
			
 
				-    display: flex;
			
 
				-    align-items: center;
			
 
				-}
			
 
				-
			
 
				-
			
 
				-
			
--- a/src/main/vue/src/pagesPre/404.vue
+++ b/src/main/vue/src/pagesPre/404.vue
@@ -1,233 +0,0 @@
 
				-<template>
			
 
				-    <div class="wscn-http404">
			
 
				-        <div class="pic-404">
			
 
				-            <img class="pic-404__parent" :src="img_404" alt="404">
			
 
				-            <img class="pic-404__child left" :src="img_404_cloud" alt="404">
			
 
				-            <img class="pic-404__child mid" :src="img_404_cloud" alt="404">
			
 
				-            <img class="pic-404__child right" :src="img_404_cloud" alt="404">
			
 
				-        </div>
			
 
				-        <div class="bullshit">
			
 
				-            <div class="bullshit__oops">OOPS!</div>
			
 
				-            <div class="bullshit__headline">{{ message }}</div>
			
 
				-            <div class="bullshit__info">请检查您输入的网址是否正确，请点击以下按钮返回</div>
			
 
				-            <span class="bullshit__return-home" @click="goBack">返回</span>
			
 
				-        </div>
			
 
				-    </div>
			
 
				-</template>
			
 
				-
			
 
				-<script>
			
 
				-    import img_404 from '../assets/404_images/404.png'
			
 
				-    import img_404_cloud from '../assets/404_images/404_cloud.png'
			
 
				-
			
 
				-    export default {
			
 
				-        name: 'page404',
			
 
				-        data() {
			
 
				-            return {
			
 
				-                img_404,
			
 
				-                img_404_cloud
			
 
				-            }
			
 
				-        },
			
 
				-        computed: {
			
 
				-            message() {
			
 
				-                return '鲁迅曾经说过："这个页面你不能进"'
			
 
				-            }
			
 
				-        },
			
 
				-        methods: {
			
 
				-            goBack() {
			
 
				-                this.$router.go(-1);
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-</script>
			
 
				-
			
 
				-<style lang="less" scoped>
			
 
				-    .wscn-http404 {
			
 
				-        background: #f0f2f5;
			
 
				-        margin: -20px;
			
 
				-        min-height: 100%;
			
 
				-        position: relative;
			
 
				-        padding: 20px 100px;
			
 
				-        overflow: hidden;
			
 
				-        height: 100%;
			
 
				-        .pic-404 {
			
 
				-            position: relative;
			
 
				-            float: left;
			
 
				-            width: 600px;
			
 
				-            padding: 150px 0;
			
 
				-            overflow: hidden;
			
 
				-            &__parent {
			
 
				-                width: 100%;
			
 
				-            }
			
 
				-            &__child {
			
 
				-                position: absolute;
			
 
				-                &.left {
			
 
				-                    width: 80px;
			
 
				-                    top: 17px;
			
 
				-                    left: 220px;
			
 
				-                    opacity: 0;
			
 
				-                    animation-name: cloudLeft;
			
 
				-                    animation-duration: 2s;
			
 
				-                    animation-timing-function: linear;
			
 
				-                    animation-fill-mode: forwards;
			
 
				-                    animation-delay: 1s;
			
 
				-                }
			
 
				-                &.mid {
			
 
				-                    width: 46px;
			
 
				-                    top: 10px;
			
 
				-                    left: 420px;
			
 
				-                    opacity: 0;
			
 
				-                    animation-name: cloudMid;
			
 
				-                    animation-duration: 2s;
			
 
				-                    animation-timing-function: linear;
			
 
				-                    animation-fill-mode: forwards;
			
 
				-                    animation-delay: 1.2s;
			
 
				-                }
			
 
				-                &.right {
			
 
				-                    width: 62px;
			
 
				-                    top: 100px;
			
 
				-                    left: 500px;
			
 
				-                    opacity: 0;
			
 
				-                    animation-name: cloudRight;
			
 
				-                    animation-duration: 2s;
			
 
				-                    animation-timing-function: linear;
			
 
				-                    animation-fill-mode: forwards;
			
 
				-                    animation-delay: 1s;
			
 
				-                }
			
 
				-                @keyframes cloudLeft {
			
 
				-                    0% {
			
 
				-                        top: 17px;
			
 
				-                        left: 220px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                    20% {
			
 
				-                        top: 33px;
			
 
				-                        left: 188px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    80% {
			
 
				-                        top: 81px;
			
 
				-                        left: 92px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    100% {
			
 
				-                        top: 97px;
			
 
				-                        left: 60px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                }
			
 
				-                @keyframes cloudMid {
			
 
				-                    0% {
			
 
				-                        top: 10px;
			
 
				-                        left: 420px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                    20% {
			
 
				-                        top: 40px;
			
 
				-                        left: 360px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    70% {
			
 
				-                        top: 130px;
			
 
				-                        left: 180px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    100% {
			
 
				-                        top: 160px;
			
 
				-                        left: 120px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                }
			
 
				-                @keyframes cloudRight {
			
 
				-                    0% {
			
 
				-                        top: 100px;
			
 
				-                        left: 500px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                    20% {
			
 
				-                        top: 120px;
			
 
				-                        left: 460px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    80% {
			
 
				-                        top: 180px;
			
 
				-                        left: 340px;
			
 
				-                        opacity: 1;
			
 
				-                    }
			
 
				-                    100% {
			
 
				-                        top: 200px;
			
 
				-                        left: 300px;
			
 
				-                        opacity: 0;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        .bullshit {
			
 
				-            position: relative;
			
 
				-            float: left;
			
 
				-            width: 330px;
			
 
				-            padding: 150px 0;
			
 
				-            overflow: hidden;
			
 
				-            &__oops {
			
 
				-                font-size: 32px;
			
 
				-                font-weight: bold;
			
 
				-                line-height: 40px;
			
 
				-                color: #1482f0;
			
 
				-                opacity: 0;
			
 
				-                margin-bottom: 20px;
			
 
				-                animation-name: slideUp;
			
 
				-                animation-duration: 0.5s;
			
 
				-                animation-fill-mode: forwards;
			
 
				-            }
			
 
				-            &__headline {
			
 
				-                font-size: 20px;
			
 
				-                line-height: 24px;
			
 
				-                color: #1482f0;
			
 
				-                opacity: 0;
			
 
				-                margin-bottom: 10px;
			
 
				-                animation-name: slideUp;
			
 
				-                animation-duration: 0.5s;
			
 
				-                animation-delay: 0.1s;
			
 
				-                animation-fill-mode: forwards;
			
 
				-            }
			
 
				-            &__info {
			
 
				-                font-size: 13px;
			
 
				-                line-height: 21px;
			
 
				-                color: grey;
			
 
				-                opacity: 0;
			
 
				-                margin-bottom: 30px;
			
 
				-                animation-name: slideUp;
			
 
				-                animation-duration: 0.5s;
			
 
				-                animation-delay: 0.2s;
			
 
				-                animation-fill-mode: forwards;
			
 
				-            }
			
 
				-            &__return-home {
			
 
				-                display: block;
			
 
				-                float: left;
			
 
				-                width: 110px;
			
 
				-                height: 36px;
			
 
				-                background: #1482f0;
			
 
				-                border-radius: 100px;
			
 
				-                text-align: center;
			
 
				-                color: #ffffff;
			
 
				-                opacity: 0;
			
 
				-                font-size: 14px;
			
 
				-                line-height: 36px;
			
 
				-                cursor: pointer;
			
 
				-                animation-name: slideUp;
			
 
				-                animation-duration: 0.5s;
			
 
				-                animation-delay: 0.3s;
			
 
				-                animation-fill-mode: forwards;
			
 
				-            }
			
 
				-            @keyframes slideUp {
			
 
				-                0% {
			
 
				-                    transform: translateY(60px);
			
 
				-                    opacity: 0;
			
 
				-                }
			
 
				-                100% {
			
 
				-                    transform: translateY(0);
			
 
				-                    opacity: 1;
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-</style>
			
--- a/src/main/vue/src/pagesPre/Home.vue
+++ b/src/main/vue/src/pagesPre/Home.vue
@@ -1,281 +0,0 @@
 
				-<template>
			
 
				-    <div class="container" :style="{backgroundImage:'url('+require('../assetsPre/bg.jpg')+')'}">
			
 
				-        <img class="topImg" @click="showBoxEve(0)" src="../assetsPre/img_bioati.png" alt="">
			
 
				-
			
 
				-        <div class="btns">
			
 
				-            <div @click="showBoxEve(1)" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">4号馆</div>
			
 
				-            <div @click="showBoxEve(2)" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">5号馆</div>
			
 
				-            <div @click="showBoxEve(3)" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">6号馆</div>
			
 
				-            <div @click="showBoxEve(4)" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">5A馆</div>
			
 
				-        </div>
			
 
				-        <audio ref='music' v-if="nowMessage==0" style="display:none" :src="message[0].voice" controls="controls">
			
 
				-        </audio>
			
 
				-        <audio ref='music' v-if="nowMessage==1" style="display:none" :src="message[1].voice" controls="controls">
			
 
				-        </audio>
			
 
				-        <audio ref='music' v-if="nowMessage==2" style="display:none" :src="message[2].voice" controls="controls">
			
 
				-        </audio>
			
 
				-        <audio ref='music' v-if="nowMessage==3" style="display:none" :src="message[3].voice" controls="controls">
			
 
				-        </audio>
			
 
				-
			
 
				-        <div class="box" v-if="showBox" @click="showBox=!showBox">
			
 
				-        </div>
			
 
				-        <transition name="slide-up">
			
 
				-
			
 
				-            <div class="box-content" v-if="showBox">
			
 
				-
			
 
				-                <div class="title">
			
 
				-                    <div class="voice-btn" style="visibility:hidden"></div>
			
 
				-                    <div class="name">{{message[nowMessage].title}}介绍</div>
			
 
				-                    <div class="voice-btn" v-if="isVoice" @click="changeVoice(false)">
			
 
				-                        <img src="../assetsPre/icon_zanting.png" alt="">
			
 
				-                    </div>
			
 
				-                    <div class="voice-btn" v-else @click="changeVoice(true)">
			
 
				-                        <img src="../assetsPre/icon_bofang.png" alt="">
			
 
				-                    </div>
			
 
				-
			
 
				-                </div>
			
 
				-                <div class="message">
			
 
				-                    {{message[nowMessage].content}}
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="showbtn" @click="goNext" v-if="nowMessage!=0">
			
 
				-                    查看参展企业列表
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-        </transition>
			
 
				-
			
 
				-    </div>
			
 
				-</template>
			
 
				-
			
 
				-<script>
			
 
				-
			
 
				-export default {
			
 
				-    name: 'home',
			
 
				-    data() {
			
 
				-        return {
			
 
				-            showBox: false,
			
 
				-            // message: {
			
 
				-            //     '展馆': {
			
 
				-            //         title: '2018世界智能制造大会简介',
			
 
				-            //         content: '2018世界智能制造大会于10月11日至13日在南京国际博览中心召开，本次大会由江苏省人民政府、工业和信息化部、中国工程院、中国科学技术协会共同主办，主题为“赋能升级，智造未来”，汇聚了世界智能制造领先企业、权威机构、卓越领袖与前沿专家，探讨智能制造新图景，培育经济发展新动能，引领全球产业新发展，是全球智能制造领域一次大规模、国际性交流研讨的顶级峰会。大会期间同步举办智能制造展览会。本届智能制造展览会展览面积约5万平方米，有来自德国、美国、日本、韩国等多个国家和地区的500多家企业参展参会，其中既有博西、菲尼克斯、安川电机、中国中车等世界500强及智能制造领域领军企业，也有在工业软件、工业互联、云制造、人工智能等领域积极探索的新技术企业代表。',
			
 
				-            //         voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
			
 
				-            //     },
			
 
				-            //     '4号馆': {
			
 
				-            //         title: '赋能智造馆',
			
 
				-            //         content: '“赋能智造馆”，在4号展馆，重点展示为智能制造实践提供相关动能的内容和领域，如5G应用，工业互联、云制造，人工智能，工业软件，智能终端，传感器、智能芯片等。',
			
 
				-            //         voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-36-53-4iej31bp.mp3'
			
 
				-            //     },
			
 
				-            //     '5号馆': {
			
 
				-            //         title: '生态智造馆',
			
 
				-            //         content: '“生态智造馆”。在5号展馆，重点展示围绕智能制造构建的政策、科技、人才、园区、平台、技术等生态支撑系统。',
			
 
				-            //         voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-37-29-0zhfed3z.mp3'
			
 
				-            //     },
			
 
				-            //     '6号馆': {
			
 
				-            //         title: '国际及综合应用馆',
			
 
				-            //         content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
			
 
				-            //         voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-09-10-37-54-1og69577.mp3'
			
 
				-            //     },
			
 
				-            //     '5A馆': {
			
 
				-            //         title: '登陆厅',
			
 
				-            //         content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
			
 
				-            //         voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
			
 
				-            //     }
			
 
				-            // },
			
 
				-            message: [{
			
 
				-                title: '2018世界智能制造大会简介',
			
 
				-                content: '2018世界智能制造大会于10月11日至13日在南京国际博览中心召开，本次大会由江苏省人民政府、工业和信息化部、中国工程院、中国科学技术协会共同主办，主题为“赋能升级，智造未来”，汇聚了世界智能制造领先企业、权威机构、卓越领袖与前沿专家，探讨智能制造新图景，培育经济发展新动能，引领全球产业新发展，是全球智能制造领域一次大规模、国际性交流研讨的顶级峰会。大会期间同步举办智能制造展览会。本届智能制造展览会展览面积约5万平方米，有来自德国、美国、日本、韩国等多个国家和地区的500多家企业参展参会，其中既有博西、菲尼克斯、安川电机、中国中车等世界500强及智能制造领域领军企业，也有在工业软件、工业互联、云制造、人工智能等领域积极探索的新技术企业代表。',
			
 
				-                voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-10-03-36-00-yhlq63wf.mp3'
			
 
				-            }, {
			
 
				-                title: '赋能智造馆',
			
 
				-                content: '“赋能智造馆”，在4号展馆，重点展示为智能制造实践提供相关动能的内容和领域，如5G应用，工业互联、云制造，人工智能，工业软件，智能终端，传感器、智能芯片等。',
			
 
				-                voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-10-03-36-46-7egiqun2.mp3'
			
 
				-            }, {
			
 
				-                title: '生态智造馆',
			
 
				-                content: '“生态智造馆”。在5号展馆，重点展示围绕智能制造构建的政策、科技、人才、园区、平台、技术等生态支撑系统。',
			
 
				-                voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-10-03-38-21-52v84m0e.mp3'
			
 
				-            }, {
			
 
				-                title: '国际及综合应用馆',
			
 
				-                content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
			
 
				-                voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-10-03-37-19-he1npih2.mp3'
			
 
				-            }, {
			
 
				-                title: '登陆厅',
			
 
				-                content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
			
 
				-                voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
			
 
				-            }],
			
 
				-            nowMessage: 4,
			
 
				-            isVoice: false
			
 
				-        }
			
 
				-    },
			
 
				-    watch: {
			
 
				-        showBox() {
			
 
				-            if (!this.showBox) {
			
 
				-                this.changeVoice(this.showBox)
			
 
				-            }
			
 
				-
			
 
				-        }
			
 
				-    },
			
 
				-    mounted() {
			
 
				-    },
			
 
				-    methods: {
			
 
				-        goBack() {
			
 
				-            this.$router.go(-1);
			
 
				-        },
			
 
				-        showBoxEve(str) {
			
 
				-            this.nowMessage = str
			
 
				-            if (str == 4) {
			
 
				-                this.goNext()
			
 
				-                return
			
 
				-            }
			
 
				-            this.showBox = true
			
 
				-            this.changeVoice(true)
			
 
				-
			
 
				-        },
			
 
				-        changeVoice(value) {
			
 
				-            if (this.$refs.music) {
			
 
				-                this.$refs.music.pause();
			
 
				-            }
			
 
				-            if (value) {
			
 
				-                setTimeout(() => {
			
 
				-                    this.$refs.music.play();
			
 
				-                }, 500)
			
 
				-                this.isVoice = true;
			
 
				-            }
			
 
				-            else {
			
 
				-                this.$refs.music.pause();
			
 
				-                this.isVoice = false;
			
 
				-            }
			
 
				-        },
			
 
				-        goNext() {
			
 
				-            var list = ['展馆', '4号馆', '5号馆', '6号馆', '5A馆']
			
 
				-            this.$router.push({
			
 
				-                name: 'list',
			
 
				-                query: {
			
 
				-                    title: list[this.nowMessage],
			
 
				-                    subTitle: this.message[this.nowMessage].title
			
 
				-                }
			
 
				-            })
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-</script>
			
 
				-
			
 
				-<style lang="less" scoped>
			
 
				-@import '../styles/variables.less';
			
 
				-.container {
			
 
				-    background-size: cover;
			
 
				-    background-position: center center;
			
 
				-    display: flex;
			
 
				-    flex-direction: column;
			
 
				-    justify-content: space-between;
			
 
				-    min-height: 480px;
			
 
				-
			
 
				-    .topImg {
			
 
				-        width: 100%;
			
 
				-
			
 
				-        align-self: center;
			
 
				-    }
			
 
				-
			
 
				-    .btns {
			
 
				-        padding: 34px 28px 90px;
			
 
				-        display: flex;
			
 
				-        flex-wrap: wrap;
			
 
				-        justify-content: space-between;
			
 
				-        overflow: hidden;
			
 
				-        height: 220px;
			
 
				-        min-height: 220px;
			
 
				-        .btn-item {
			
 
				-            width: 150px;
			
 
				-            height: 90px;
			
 
				-            background-size: 100% 100%;
			
 
				-            text-align: center;
			
 
				-            line-height: 90px;
			
 
				-            font-size: 30px;
			
 
				-            font-weight: 600;
			
 
				-            color: rgba(5, 20, 63, 1);
			
 
				-            letter-spacing: 1px;
			
 
				-            cursor: pointer;
			
 
				-            margin-top: 20px;
			
 
				-            position: relative;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.box {
			
 
				-    position: fixed;
			
 
				-    top: 0;
			
 
				-    left: 0;
			
 
				-    z-index: 500;
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    background-color: rgba(0, 0, 0, 0.5);
			
 
				-}
			
 
				-
			
 
				-.box-content {
			
 
				-    position: fixed;
			
 
				-    bottom: 0;
			
 
				-    left: 0;
			
 
				-    z-index: 550;
			
 
				-    width: 100%;
			
 
				-    height: 400px;
			
 
				-    background-color: @bgColor;
			
 
				-    display: flex;
			
 
				-    flex-direction: column;
			
 
				-
			
 
				-    .title {
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-        padding: 15px;
			
 
				-        justify-content: space-between;
			
 
				-        .name {
			
 
				-            font-size: 18px;
			
 
				-            font-weight: 600;
			
 
				-            color: rgba(0, 0, 0, 1);
			
 
				-            line-height: 25px;
			
 
				-        }
			
 
				-        .voice-btn {
			
 
				-            width: 32px;
			
 
				-            height: 32px;
			
 
				-            background: linear-gradient(90deg, rgba(118, 183, 255, 1) 0%, rgba(124, 255, 248, 1) 100%);
			
 
				-            border-radius: 18px;
			
 
				-            text-align: center;
			
 
				-            line-height: 35px;
			
 
				-            img {
			
 
				-                width: 16px;
			
 
				-                height: 16px;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-
			
 
				-    .message {
			
 
				-        font-size: 14px;
			
 
				-        font-weight: 400;
			
 
				-        color: rgba(0, 0, 0, 1);
			
 
				-        line-height: 20px;
			
 
				-        padding: 0 15px;
			
 
				-        flex-grow: 1;
			
 
				-        overflow: auto;
			
 
				-    }
			
 
				-
			
 
				-    .showbtn {
			
 
				-        margin: 0 15px 15px;
			
 
				-        height: 44px;
			
 
				-        background: linear-gradient(90deg, rgba(118, 183, 255, 1) 0%, rgba(124, 255, 248, 1) 100%);
			
 
				-        text-align: center;
			
 
				-        line-height: 44px;
			
 
				-        font-size: 15px;
			
 
				-        font-weight: 500;
			
 
				-        color: rgba(29, 40, 73, 1);
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.slide-up-enter,
			
 
				-.slide-up-leave-active {
			
 
				-    height: 0;
			
 
				-}
			
 
				-
			
 
				-.slide-up-enter-active,
			
 
				-.slide-up-leave-active {
			
 
				-    transition: all 0.3s;
			
 
				-}
			
 
				-</style>
			
--- a/src/main/vue/src/pagesPre/List.vue
+++ b/src/main/vue/src/pagesPre/List.vue
@@ -1,220 +0,0 @@
 
				-<template>
			
 
				-    <div class="container">
			
 
				-        <div class="list">
			
 
				-            <div class="item" v-for="(item,index) in message" @click="showBoxEve(index)">
			
 
				-                <div class="No">{{item.boothNo}}</div>
			
 
				-                <div class="name">{{item.companyName}}</div>
			
 
				-            </div>
			
 
				-        </div>
			
 
				-
			
 
				-        <div class="box" v-if="showBox" @click="showBox=!showBox">
			
 
				-        </div>
			
 
				-        <transition name="slide-up">
			
 
				-            <div class="box-content" v-if="showBox">
			
 
				-                <div class="title">
			
 
				-                    <div class="name">{{message[nowMessage].hall}} — {{subTitle}} {{message[nowMessage].boothNo}}</div>
			
 
				-                    <div class="voice-btn" v-if="isVoice" @click="changeVoice(false)">
			
 
				-                        <img src="../assetsPre/icon_zanting.png" alt="">
			
 
				-                    </div>
			
 
				-                    <div class="voice-btn" v-else @click="changeVoice(true)">
			
 
				-                        <img src="../assetsPre/icon_bofang.png" alt="">
			
 
				-                    </div>
			
 
				-
			
 
				-                </div>
			
 
				-                <div class="bigName">
			
 
				-                    {{message[nowMessage].companyName}}
			
 
				-                </div>
			
 
				-                <div class="message">
			
 
				-                    {{message[nowMessage].introduce}}
			
 
				-                </div>
			
 
				-
			
 
				-                <div class="showbtn" @click="showBox=false">
			
 
				-                    返回
			
 
				-                </div>
			
 
				-            </div>
			
 
				-
			
 
				-        </transition>
			
 
				-        <audio v-if="message[nowMessage]" style="display:none" ref='music' :src="message[nowMessage].voice" controls="controls">
			
 
				-        </audio>
			
 
				-    </div>
			
 
				-</template>
			
 
				-
			
 
				-<script>
			
 
				-
			
 
				-export default {
			
 
				-    name: 'home',
			
 
				-    data() {
			
 
				-        return {
			
 
				-            showBox: false,
			
 
				-            message: [],
			
 
				-            nowMessage: 0,
			
 
				-            isVoice: false,
			
 
				-            subTitle: ''
			
 
				-        }
			
 
				-    },
			
 
				-    watch: {
			
 
				-        showBox() {
			
 
				-            this.changeVoice(this.showBox)
			
 
				-        }
			
 
				-    },
			
 
				-    created() {
			
 
				-        this.subTitle = this.$route.query.subTitle
			
 
				-        this.$http.get({
			
 
				-            url: '/companyInfoDetail/all',
			
 
				-            data: {
			
 
				-                orderByStr: "booth_no_,asc",
			
 
				-                hall: this.$route.query.title
			
 
				-            }
			
 
				-        }).then(res => {
			
 
				-            if (res.success) {
			
 
				-                this.message = res.data
			
 
				-            }
			
 
				-        })
			
 
				-    },
			
 
				-    methods: {
			
 
				-        goBack() {
			
 
				-            this.$router.go(-1);
			
 
				-        },
			
 
				-        showBoxEve(str) {
			
 
				-            this.nowMessage = str
			
 
				-            this.showBox = true
			
 
				-            this.changeVoice(true)
			
 
				-        },
			
 
				-        changeVoice(value) {
			
 
				-            if (value) {
			
 
				-                setTimeout(() => {
			
 
				-                    this.$refs.music.play();
			
 
				-                })
			
 
				-                this.isVoice = true;
			
 
				-            }
			
 
				-            else {
			
 
				-                this.$refs.music.pause();
			
 
				-                this.isVoice = false;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-</script>
			
 
				-
			
 
				-<style lang="less" scoped>
			
 
				-@import '../styles/variables.less';
			
 
				-.container {
			
 
				-    background-color: #f2f4f5;
			
 
				-    padding-top: 18px;
			
 
				-    width: 100%;
			
 
				-    overflow: auto;
			
 
				-    -webkit-overflow-scrolling: touch;
			
 
				-
			
 
				-    .item {
			
 
				-        margin: 0 15px 10px;
			
 
				-        height: 60px;
			
 
				-        background: rgba(255, 255, 255, 1);
			
 
				-        padding: 0 20px;
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-        overflow: hidden;
			
 
				-
			
 
				-        .No {
			
 
				-            font-size: 14px;
			
 
				-            font-weight: 500;
			
 
				-            color: rgba(9, 169, 255, 1);
			
 
				-            line-height: 20px;
			
 
				-        }
			
 
				-
			
 
				-        .name {
			
 
				-            margin-left: 20px;
			
 
				-            flex-grow: 1;
			
 
				-            overflow: hidden;
			
 
				-            text-overflow: ellipsis;
			
 
				-            white-space: nowrap;
			
 
				-        }
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.box {
			
 
				-    position: fixed;
			
 
				-    top: 0;
			
 
				-    left: 0;
			
 
				-    z-index: 500;
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    background-color: rgba(0, 0, 0, 0.5);
			
 
				-}
			
 
				-
			
 
				-.box-content {
			
 
				-    position: fixed;
			
 
				-    bottom: 0;
			
 
				-    left: 0;
			
 
				-    z-index: 550;
			
 
				-    width: 100%;
			
 
				-    height: 400px;
			
 
				-    background-color: @bgColor;
			
 
				-    display: flex;
			
 
				-    flex-direction: column;
			
 
				-
			
 
				-    .title {
			
 
				-        display: flex;
			
 
				-        align-items: center;
			
 
				-        padding: 15px 15px 0;
			
 
				-        justify-content: space-between;
			
 
				-        .name {
			
 
				-            font-size: 15px;
			
 
				-            font-weight: 600;
			
 
				-            color: rgba(0, 0, 0, 1);
			
 
				-            line-height: 21px;
			
 
				-        }
			
 
				-        .voice-btn {
			
 
				-            width: 32px;
			
 
				-            height: 32px;
			
 
				-            background: linear-gradient(90deg, rgba(118, 183, 255, 1) 0%, rgba(124, 255, 248, 1) 100%);
			
 
				-            border-radius: 18px;
			
 
				-            text-align: center;
			
 
				-            line-height: 35px;
			
 
				-            img {
			
 
				-                width: 16px;
			
 
				-                height: 16px;
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-
			
 
				-    .bigName {
			
 
				-        padding: 0 15px 15px;
			
 
				-        font-size: 18px;
			
 
				-        font-weight: 600;
			
 
				-        color: rgba(0, 0, 0, 1);
			
 
				-        line-height: 25px;
			
 
				-    }
			
 
				-
			
 
				-    .message {
			
 
				-        font-size: 14px;
			
 
				-        font-weight: 400;
			
 
				-        color: rgba(0, 0, 0, 1);
			
 
				-        line-height: 20px;
			
 
				-        padding: 0 15px;
			
 
				-        flex-grow: 1;
			
 
				-        overflow: auto;
			
 
				-        padding-bottom: 10px;
			
 
				-    }
			
 
				-
			
 
				-    .showbtn {
			
 
				-        margin: 0 15px 15px;
			
 
				-        height: 44px;
			
 
				-        background: linear-gradient(90deg, rgba(118, 183, 255, 1) 0%, rgba(124, 255, 248, 1) 100%);
			
 
				-        text-align: center;
			
 
				-        line-height: 44px;
			
 
				-        font-size: 15px;
			
 
				-        font-weight: 500;
			
 
				-        color: rgba(29, 40, 73, 1);
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-.slide-up-enter,
			
 
				-.slide-up-leave-active {
			
 
				-    height: 0;
			
 
				-}
			
 
				-
			
 
				-.slide-up-enter-active,
			
 
				-.slide-up-leave-active {
			
 
				-    transition: all 0.3s;
			
 
				-}
			
 
				-</style>
			
--- a/src/main/vue/src/pagesPre/Main.vue
+++ b/src/main/vue/src/pagesPre/Main.vue
@@ -1,52 +0,0 @@
 
				-<template>
			
 
				-    <div class="main">
			
 
				-        <keep-alive include="*">
			
 
				-            <router-view class="router"> </router-view>
			
 
				-        </keep-alive>
			
 
				-    </div>
			
 
				-
			
 
				-</template>
			
 
				-<script>
			
 
				-import { mapState } from "vuex";
			
 
				-export default {
			
 
				-    name: '',
			
 
				-    data() {
			
 
				-        return {
			
 
				-
			
 
				-        }
			
 
				-    },
			
 
				-    computed: {
			
 
				-        ...mapState(["locationInfo"])
			
 
				-    },
			
 
				-    created() {
			
 
				-
			
 
				-    },
			
 
				-    mounted() {
			
 
				-
			
 
				-    },
			
 
				-    watch: {
			
 
				-
			
 
				-    },
			
 
				-    methods: {
			
 
				-    }
			
 
				-}
			
 
				-</script>
			
 
				-<style lang="less" scoped>
			
 
				-@import '../styles/variables.less';
			
 
				-.main {
			
 
				-    background-color: @bgColor;
			
 
				-    width: 100%;
			
 
				-    height: 100%;
			
 
				-    position: absolute;
			
 
				-    top: 0;
			
 
				-    left: 0;
			
 
				-    overflow: auto;
			
 
				-    -webkit-overflow-scrolling: touch;
			
 
				-    display: flex;
			
 
				-    .router{
			
 
				-        flex-grow: 1;
			
 
				-    }
			
 
				-}
			
 
				-</style>
			
 
				-
			
 
				-
			
--- a/src/main/vue/src/routerPre/index.js
+++ b/src/main/vue/src/routerPre/index.js
@@ -1,74 +0,0 @@
 
				-import Vue from 'vue'
			
 
				-import Router from 'vue-router'
			
 
				-import store from '../vuexPre'
			
 
				-import axios from 'axios'
			
 
				-import RongIM from '../RongIM'
			
 
				-
			
 
				-Vue.use(Router);
			
 
				-
			
 
				-const router = new Router({
			
 
				-    routes: [{
			
 
				-        path: '/',
			
 
				-        redirect: 'home'
			
 
				-    }, {
			
 
				-        path: '/home',
			
 
				-        name: 'home',
			
 
				-        component: () =>
			
 
				-            import ('../pagesPre/Home')
			
 
				-    }, {
			
 
				-        path: '/list',
			
 
				-        name: 'list',
			
 
				-        component: () =>
			
 
				-            import ('../pagesPre/List')
			
 
				-    }, {
			
 
				-        path: '/404',
			
 
				-        name: '404',
			
 
				-        component: () =>
			
 
				-            import ('../pagesPre/404')
			
 
				-    }]
			
 
				-});
			
 
				-router.beforeEach((to, from, next) => {
			
 
				-    console.log(to.path)
			
 
				-        //console.log(to);
			
 
				-    if (/^\/http/.test(to.path)) {
			
 
				-        console.log(Vue.$baseUrl);
			
 
				-        let url = to.path.replace('/', '');
			
 
				-        let params = [];
			
 
				-        if (to.query) {
			
 
				-            for (let key in to.query) {
			
 
				-                if (to.query.hasOwnProperty(key)) {
			
 
				-                    params.push(`${key}=${to.query[key]}`);
			
 
				-                }
			
 
				-            }
			
 
				-        }
			
 
				-        if (params.length > 0) {
			
 
				-            url += `?${params.join('&')}`;
			
 
				-        }
			
 
				-        window.open(url);
			
 
				-        return;
			
 
				-    }
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-
			
 
				-    if (!to.matched.length) {
			
 
				-        next('/404');
			
 
				-    } else {
			
 
				-        next();
			
 
				-    }
			
 
				-});
			
 
				-router.afterEach((to, from) => {
			
 
				-    window.onresize();
			
 
				-});
			
 
				-
			
 
				-function getQueryString(name) {
			
 
				-    let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')
			
 
				-    let r = window.location.search.substr(1).match(reg)
			
 
				-    if (r != null) return unescape(r[2])
			
 
				-    return null
			
 
				-}
			
 
				-
			
 
				-
			
 
				-export default router;
			
--- a/src/main/vue/src/vuexPre/index.js
+++ b/src/main/vue/src/vuexPre/index.js
@@ -1,146 +0,0 @@
 
				-import Vue from 'vue'
			
 
				-import Vuex from 'vuex'
			
 
				-import eventBus from '../eventBus'
			
 
				-
			
 
				-Vue.use(Vuex);
			
 
				-
			
 
				-export default new Vuex.Store({
			
 
				-    state: {
			
 
				-        tableHeight: 0,
			
 
				-        fetchingData: false,
			
 
				-        userInfo: null,
			
 
				-        locationInfo: null,
			
 
				-        serviceType: [],
			
 
				-        hrefHistory: [],
			
 
				-        typeFlag: ['修图', '实体商品'], //产品分类 0.修图; 1.实体商品
			
 
				-        orderStatus: {
			
 
				-            '修图': ['待付款', '待上传', '待修图', '待审片', '返修中', '待评论', '订单完成', '退款中', '取消'],
			
 
				-            '实体商品': ['待付款', '待发货', '已发货', '', '', '待评论', '订单完成', '退款中', '取消']
			
 
				-        }, //订单状态
			
 
				-        IMConnected: false,
			
 
				-        conversationList: [],
			
 
				-        myStoreInfo: {},
			
 
				-        storeConversationList: [],
			
 
				-        brefName: '',
			
 
				-        msgCode: {
			
 
				-            '身份验证': 'SMS_144435052',
			
 
				-            '登录确认': 'SMS_144435051',
			
 
				-            '登录异常': 'SMS_144435050',
			
 
				-            '用户注册': 'SMS_144435049',
			
 
				-            '修改密码': 'SMS_144435049',
			
 
				-            '信息变更': 'SMS_144435049',
			
 
				-        }
			
 
				-    },
			
 
				-    mutations: {
			
 
				-        updateBrefName(state, brefName) {
			
 
				-            state.brefName = brefName
			
 
				-        },
			
 
				-        updateTableHeight(state, height) {
			
 
				-            state.tableHeight = height;
			
 
				-        },
			
 
				-        updateFetchingData(state, fetchingData) {
			
 
				-            state.fetchingData = fetchingData
			
 
				-        },
			
 
				-        updateUserInfo(state, userInfo) {
			
 
				-            state.userInfo = userInfo
			
 
				-        },
			
 
				-        updateStoreInfo(state, myStoreInfo) {
			
 
				-            state.myStoreInfo = myStoreInfo
			
 
				-        },
			
 
				-        updateLocationInfo(state, location) {
			
 
				-            state.locationInfo = location
			
 
				-        },
			
 
				-        updateServiceType(state, serviceType) {
			
 
				-            state.serviceType = serviceType
			
 
				-        },
			
 
				-        updateHrefHistory(state, list) {
			
 
				-            state.hrefHistory = list
			
 
				-        },
			
 
				-        updateIMConnected(state, connected) {
			
 
				-            state.IMConnected = connected
			
 
				-        },
			
 
				-        addConversation(state, conversation) {
			
 
				-            state.conversationList.unshift(conversation)
			
 
				-        },
			
 
				-        updateOrAddConversation(state, conversation) {
			
 
				-            let index = _.findIndex(state.conversationList, chr => {
			
 
				-                return Number(chr.id) === Number(conversation.id)
			
 
				-            })
			
 
				-            if (index !== -1) {
			
 
				-                Vue.set(state.conversationList, index, conversation)
			
 
				-            } else {
			
 
				-                state.conversationList.unshift(conversation)
			
 
				-            }
			
 
				-        },
			
 
				-        removeConversation(state, conversation) {
			
 
				-            console.log(conversation)
			
 
				-            let index = _.findIndex(state.conversationList, chr => {
			
 
				-                return Number(chr.id) === Number(conversation.id)
			
 
				-            })
			
 
				-            if (index !== -1) {
			
 
				-                state.conversationList.splice(index, 1)
			
 
				-            }
			
 
				-        },
			
 
				-        updateStoreConversationList(state, conversationList) {
			
 
				-            state.storeConversationList = conversationList
			
 
				-        },
			
 
				-        updateConversationList(state, conversationList) {
			
 
				-            // state.conversationList = conversationList.map(item => {
			
 
				-            //     return {
			
 
				-            //         id: item.id,
			
 
				-            //         time: item.chattime,
			
 
				-            //         unread: item.amount,
			
 
				-            //         content: item.chatInfo ? item.chatInfo.content : '',
			
 
				-            //         name: item.nickName || '无名氏',
			
 
				-            //         avatar: item.icon || require('../assets/default-avatar.png'),
			
 
				-            //         toUserId: item.toUserId,
			
 
				-            //         projectId: item.projectId,
			
 
				-            //         projectInfo: item.projectInfo
			
 
				-            //     }
			
 
				-            // })
			
 
				-            state.conversationList = conversationList
			
 
				-        }
			
 
				-    },
			
 
				-    actions: {
			
 
				-        receiveMessage({ commit, state }, message) {
			
 
				-            eventBus.$emit('receiveMessage', message)
			
 
				-            let projectId = message.projectId
			
 
				-            let index = _.findIndex(state.conversationList, i => {
			
 
				-                if (Number(message.userId) === 1) {
			
 
				-                    return Number(i.toUserId) === Number(message.userId)
			
 
				-                } else {
			
 
				-                    return Number(i.toUserId) === Number(message.userId) && Number(i.projectId) === Number(projectId)
			
 
				-                }
			
 
				-            })
			
 
				-            let conversation
			
 
				-            if (index !== -1) {
			
 
				-                conversation = _.clone(state.conversationList[index])
			
 
				-                conversation.unread += 1
			
 
				-                conversation.time = message.receivedTime
			
 
				-                conversation.content = message.content
			
 
				-                commit('updateOrAddConversation', conversation)
			
 
				-            } else {
			
 
				-                // let newCon = {
			
 
				-                //     userId: state.userInfo.id,
			
 
				-                //     toUserId: message.userId
			
 
				-                // }
			
 
				-
			
 
				-                // if (projectId) {
			
 
				-                //     newCon.projectId = projectId
			
 
				-                // }
			
 
				-
			
 
				-                // axios.post('/usersSession/save', newCon)
			
 
				-                //     .then(res => {
			
 
				-                //         if (res.success) {
			
 
				-                //             commit('updateConversationList', res.data)
			
 
				-                //         }
			
 
				-                //     })
			
 
				-                //     .catch(e => {
			
 
				-                //         console.log(e);
			
 
				-                //     })
			
 
				-
			
 
				-
			
 
				-            }
			
 
				-        }
			
 
				-    }
			
 
				-});
			
--- a/src/main/webapp/WEB-INF/html/admin.html
+++ b/src/main/webapp/WEB-INF/html/admin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.14c4398f2fac4a790ab9.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.25d791b9cfdf7abfb5badc5c3be0b3d0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6d6407a59fb32a0cfab9.js></script><script type=text/javascript src=/static/js/vendor.ceb889fcdeb75f9549d6.js></script><script type=text/javascript src=/static/js/admin.34aae31bc05a250ce867.js></script></body></html>
			
--- a/src/main/webapp/WEB-INF/html/index.html
+++ b/src/main/webapp/WEB-INF/html/index.html
@@ -5,7 +5,7 @@
 
				             position: absolute;
			
 
				             top: 0;
			
 
				             left: 0;
			
 
				-        }</style><link href=/static/css/index.2ed282ab01a38b8227b781a50aa24445.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.d5f3af517363483af368.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				+        }</style><link href=/static/css/index.f6bfe0a257d23ee3665127f04af0f751.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.0f46de32cdc39e77af2e.js></script><script type=text/javascript src=/static/js/vendor.9fb702b106e375ea20e6.js></script><script type=text/javascript src=/static/js/index.1df4898248731b3c5db1.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
			
 
				     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
			
 
				     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
			
--- a/src/main/webapp/WEB-INF/html/loginAdmin.html
+++ b/src/main/webapp/WEB-INF/html/loginAdmin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.2d657bab663e639026bc.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6d6407a59fb32a0cfab9.js></script><script type=text/javascript src=/static/js/vendor.ceb889fcdeb75f9549d6.js></script><script type=text/javascript src=/static/js/loginAdmin.33fbdcfa8936a5b4a327.js></script></body></html>
			
--- a/src/main/webapp/static/css/admin.25d791b9cfdf7abfb5badc5c3be0b3d0.css
+++ b/src/main/webapp/static/css/admin.25d791b9cfdf7abfb5badc5c3be0b3d0.css
--- a/src/main/webapp/static/css/index.2ed282ab01a38b8227b781a50aa24445.css
+++ b/src/main/webapp/static/css/index.2ed282ab01a38b8227b781a50aa24445.css
--- a/src/main/webapp/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css
+++ b/src/main/webapp/static/css/loginAdmin.9647b664948af8f1752259b9d1c6528e.css
--- a/src/main/webapp/static/img/bg.bdf5691.jpg
+++ b/src/main/webapp/static/img/bg.bdf5691.jpg
--- a/src/main/webapp/static/img/btu_xiao.268c43a.png
+++ b/src/main/webapp/static/img/btu_xiao.268c43a.png
--- a/src/main/webapp/static/img/img_bioati.91eefe3.png
+++ b/src/main/webapp/static/img/img_bioati.91eefe3.png
--- a/src/main/webapp/static/js/0.4cfe4c30281a559392d8.js
+++ b/src/main/webapp/static/js/0.4cfe4c30281a559392d8.js
--- a/src/main/webapp/static/js/0.a871384da383340dabfb.js
+++ b/src/main/webapp/static/js/0.a871384da383340dabfb.js
--- a/src/main/webapp/static/js/1.0d2beeb58613b1c0f2d2.js
+++ b/src/main/webapp/static/js/1.0d2beeb58613b1c0f2d2.js
--- a/src/main/webapp/static/js/1.d25cf82cc2cd9436cdd8.js
+++ b/src/main/webapp/static/js/1.d25cf82cc2cd9436cdd8.js
--- a/src/main/webapp/static/js/10.08c7a2d48d5895950bf4.js
+++ b/src/main/webapp/static/js/10.08c7a2d48d5895950bf4.js
--- a/src/main/webapp/static/js/10.57102bfc91f8b13bc00f.js
+++ b/src/main/webapp/static/js/10.57102bfc91f8b13bc00f.js
--- a/src/main/webapp/static/js/100.1ab605ff415ad79fc3f3.js
+++ b/src/main/webapp/static/js/100.1ab605ff415ad79fc3f3.js
--- a/src/main/webapp/static/js/100.b1ff2f12e40c3f431616.js
+++ b/src/main/webapp/static/js/100.b1ff2f12e40c3f431616.js
--- a/src/main/webapp/static/js/101.0fb9d56c24f86b3a4637.js
+++ b/src/main/webapp/static/js/101.0fb9d56c24f86b3a4637.js
--- a/src/main/webapp/static/js/102.7fb0632c6cf1742b9fa3.js
+++ b/src/main/webapp/static/js/102.7fb0632c6cf1742b9fa3.js
--- a/src/main/webapp/static/js/102.ba8893aa289a2367193c.js
+++ b/src/main/webapp/static/js/102.ba8893aa289a2367193c.js
--- a/src/main/webapp/static/js/103.011cf8d314b61f16210a.js
+++ b/src/main/webapp/static/js/103.011cf8d314b61f16210a.js
--- a/src/main/webapp/static/js/103.b6019a910a316bbbd904.js
+++ b/src/main/webapp/static/js/103.b6019a910a316bbbd904.js
--- a/src/main/webapp/static/js/104.725c2bc8562e773899ad.js
+++ b/src/main/webapp/static/js/104.725c2bc8562e773899ad.js
--- a/src/main/webapp/static/js/105.4a1c9c54ba85798a8d3b.js
+++ b/src/main/webapp/static/js/105.4a1c9c54ba85798a8d3b.js
--- a/src/main/webapp/static/js/105.5bc4ab4dc5de11759335.js
+++ b/src/main/webapp/static/js/105.5bc4ab4dc5de11759335.js
--- a/src/main/webapp/static/js/106.ef26163e0023c677c8d9.js
+++ b/src/main/webapp/static/js/106.ef26163e0023c677c8d9.js
--- a/src/main/webapp/static/js/107.399abbbb6d17ffaa4e99.js
+++ b/src/main/webapp/static/js/107.399abbbb6d17ffaa4e99.js
--- a/src/main/webapp/static/js/107.5d4390185a628db7e34a.js
+++ b/src/main/webapp/static/js/107.5d4390185a628db7e34a.js
--- a/src/main/webapp/static/js/108.025d0b52ac086d968f58.js
+++ b/src/main/webapp/static/js/108.025d0b52ac086d968f58.js
--- a/src/main/webapp/static/js/108.4814f9ee04058c2603c6.js
+++ b/src/main/webapp/static/js/108.4814f9ee04058c2603c6.js
--- a/src/main/webapp/static/js/109.27d44b54ab418a809358.js
+++ b/src/main/webapp/static/js/109.27d44b54ab418a809358.js
--- a/src/main/webapp/static/js/109.f111ea4a7d689d267c8a.js
+++ b/src/main/webapp/static/js/109.f111ea4a7d689d267c8a.js
--- a/src/main/webapp/static/js/11.962f2c8507e16837b5b7.js
+++ b/src/main/webapp/static/js/11.962f2c8507e16837b5b7.js
--- a/src/main/webapp/static/js/11.eb2a8cb833dc87f5bcae.js
+++ b/src/main/webapp/static/js/11.eb2a8cb833dc87f5bcae.js
--- a/src/main/webapp/static/js/110.202ae55294234bfb1466.js
+++ b/src/main/webapp/static/js/110.202ae55294234bfb1466.js
--- a/src/main/webapp/static/js/110.d4c127a01c0c21da9877.js
+++ b/src/main/webapp/static/js/110.d4c127a01c0c21da9877.js
--- a/src/main/webapp/static/js/111.1168a436431b922ffd8c.js
+++ b/src/main/webapp/static/js/111.1168a436431b922ffd8c.js
--- a/src/main/webapp/static/js/111.cccb77babbc6d316ba64.js
+++ b/src/main/webapp/static/js/111.cccb77babbc6d316ba64.js
--- a/src/main/webapp/static/js/112.484f0c973e7ef74c0598.js
+++ b/src/main/webapp/static/js/112.484f0c973e7ef74c0598.js
--- a/src/main/webapp/static/js/112.a0156073bed141f824d1.js
+++ b/src/main/webapp/static/js/112.a0156073bed141f824d1.js
--- a/src/main/webapp/static/js/113.23e5d445b720f25a08ac.js
+++ b/src/main/webapp/static/js/113.23e5d445b720f25a08ac.js
--- a/src/main/webapp/static/js/113.470d96e4bcc6491d4468.js
+++ b/src/main/webapp/static/js/113.470d96e4bcc6491d4468.js
--- a/src/main/webapp/static/js/114.2a1213fd0785be054802.js
+++ b/src/main/webapp/static/js/114.2a1213fd0785be054802.js
--- a/src/main/webapp/static/js/114.f1aa63078cb31b869454.js
+++ b/src/main/webapp/static/js/114.f1aa63078cb31b869454.js
--- a/src/main/webapp/static/js/115.5d234d5580b461a55f2d.js
+++ b/src/main/webapp/static/js/115.5d234d5580b461a55f2d.js
--- a/src/main/webapp/static/js/115.d127005b961e89e7e4ad.js
+++ b/src/main/webapp/static/js/115.d127005b961e89e7e4ad.js
--- a/src/main/webapp/static/js/116.520e6c6b18e3ac683845.js
+++ b/src/main/webapp/static/js/116.520e6c6b18e3ac683845.js
--- a/src/main/webapp/static/js/116.6cf36cedfa57132bcb2d.js
+++ b/src/main/webapp/static/js/116.6cf36cedfa57132bcb2d.js
--- a/src/main/webapp/static/js/117.4ddd988ad12198a43188.js
+++ b/src/main/webapp/static/js/117.4ddd988ad12198a43188.js
--- a/src/main/webapp/static/js/117.d097a05aaeca1e86136f.js
+++ b/src/main/webapp/static/js/117.d097a05aaeca1e86136f.js
--- a/src/main/webapp/static/js/118.b067ba83d32e9ad799a3.js
+++ b/src/main/webapp/static/js/118.b067ba83d32e9ad799a3.js
--- a/src/main/webapp/static/js/119.4682b0e386ebe721f648.js
+++ b/src/main/webapp/static/js/119.4682b0e386ebe721f648.js
--- a/src/main/webapp/static/js/119.b58b744df03db6b538ef.js
+++ b/src/main/webapp/static/js/119.b58b744df03db6b538ef.js
--- a/src/main/webapp/static/js/12.3aebe4e9131e4d09a762.js
+++ b/src/main/webapp/static/js/12.3aebe4e9131e4d09a762.js
--- a/src/main/webapp/static/js/12.58e68bc215e21511f3a5.js
+++ b/src/main/webapp/static/js/12.58e68bc215e21511f3a5.js
--- a/src/main/webapp/static/js/120.5e6893d6ba9786153eb2.js
+++ b/src/main/webapp/static/js/120.5e6893d6ba9786153eb2.js
--- a/src/main/webapp/static/js/120.6a1d41970b2150a7d9fc.js
+++ b/src/main/webapp/static/js/120.6a1d41970b2150a7d9fc.js
--- a/src/main/webapp/static/js/121.e8dec353b3a89a51f1ad.js
+++ b/src/main/webapp/static/js/121.e8dec353b3a89a51f1ad.js
@@ -0,0 +1 @@
 
				+webpackJsonp([121],{"5LNU":function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("5LNU")},"data-v-3122cd72",null);t.default=s.exports}});
			
--- a/src/main/webapp/static/js/122.9457d15eacfc8a5c83e3.js
+++ b/src/main/webapp/static/js/122.9457d15eacfc8a5c83e3.js
--- a/src/main/webapp/static/js/123.b4b5aa0a40da28568335.js
+++ b/src/main/webapp/static/js/123.b4b5aa0a40da28568335.js
--- a/src/main/webapp/static/js/123.d3fb982ab50030508d16.js
+++ b/src/main/webapp/static/js/123.d3fb982ab50030508d16.js
--- a/src/main/webapp/static/js/124.ee349d973b0a438a8780.js
+++ b/src/main/webapp/static/js/124.ee349d973b0a438a8780.js
@@ -0,0 +1 @@
 
				+webpackJsonp([124],{"8abJ":function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("8abJ")},"data-v-293e7b8c",null);e.default=c.exports}});
			
--- a/src/main/webapp/static/js/125.1d85c880fbb66fc531ef.js
+++ b/src/main/webapp/static/js/125.1d85c880fbb66fc531ef.js
--- a/src/main/webapp/static/js/125.eff162f2757bed64a7ce.js
+++ b/src/main/webapp/static/js/125.eff162f2757bed64a7ce.js
--- a/src/main/webapp/static/js/126.07ffc6916642143c027e.js
+++ b/src/main/webapp/static/js/126.07ffc6916642143c027e.js
--- a/src/main/webapp/static/js/126.4a1b57cc3d56d8b43deb.js
+++ b/src/main/webapp/static/js/126.4a1b57cc3d56d8b43deb.js
--- a/src/main/webapp/static/js/127.0a8535aa59c1496f99dc.js
+++ b/src/main/webapp/static/js/127.0a8535aa59c1496f99dc.js
--- a/src/main/webapp/static/js/127.481b17153de7a5e880b8.js
+++ b/src/main/webapp/static/js/127.481b17153de7a5e880b8.js
--- a/src/main/webapp/static/js/128.57de3c6cd45cf73ad530.js
+++ b/src/main/webapp/static/js/128.57de3c6cd45cf73ad530.js
--- a/src/main/webapp/static/js/128.ce17584a4aaff128d344.js
+++ b/src/main/webapp/static/js/128.ce17584a4aaff128d344.js
--- a/src/main/webapp/static/js/129.0657cceb82e7c3f1439e.js
+++ b/src/main/webapp/static/js/129.0657cceb82e7c3f1439e.js
--- a/src/main/webapp/static/js/129.d0cc55246f1414efcd8a.js
+++ b/src/main/webapp/static/js/129.d0cc55246f1414efcd8a.js
--- a/src/main/webapp/static/js/13.5e57247bfd9282d1585d.js
+++ b/src/main/webapp/static/js/13.5e57247bfd9282d1585d.js
--- a/src/main/webapp/static/js/13.f0c3f9186a92c4ae5c46.js
+++ b/src/main/webapp/static/js/13.f0c3f9186a92c4ae5c46.js
--- a/src/main/webapp/static/js/130.2a3d3a7f6654865914e8.js
+++ b/src/main/webapp/static/js/130.2a3d3a7f6654865914e8.js
--- a/src/main/webapp/static/js/130.5be6c1fadac4b1797648.js
+++ b/src/main/webapp/static/js/130.5be6c1fadac4b1797648.js
--- a/src/main/webapp/static/js/131.81b6f189a832117816d1.js
+++ b/src/main/webapp/static/js/131.81b6f189a832117816d1.js
--- a/src/main/webapp/static/js/131.e46df9f748af20ba4b82.js
+++ b/src/main/webapp/static/js/131.e46df9f748af20ba4b82.js
--- a/src/main/webapp/static/js/132.c2888adc951015321b22.js
+++ b/src/main/webapp/static/js/132.c2888adc951015321b22.js
--- a/src/main/webapp/static/js/133.9c550b279997e1b31ddf.js
+++ b/src/main/webapp/static/js/133.9c550b279997e1b31ddf.js
--- a/src/main/webapp/static/js/134.94bc6cf6cb98161f01ff.js
+++ b/src/main/webapp/static/js/134.94bc6cf6cb98161f01ff.js
--- a/src/main/webapp/static/js/135.82ed2080dec0b899180d.js
+++ b/src/main/webapp/static/js/135.82ed2080dec0b899180d.js
--- a/src/main/webapp/static/js/136.256f9f539a51482750ac.js
+++ b/src/main/webapp/static/js/136.256f9f539a51482750ac.js
--- a/src/main/webapp/static/js/137.4fe901480c71e7adbe18.js
+++ b/src/main/webapp/static/js/137.4fe901480c71e7adbe18.js