智能大会

src/main/java/com/izouma/awesomeadmin/web/CompanyInfoDetailController.java

@@ -30,7 +30,7 @@ public class CompanyInfoDetailController {
     /**
     * <p>获取全部记录。</p>
     */
-    @RequiresAuthentication
+//    @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
     public Result all(CompanyInfoDetail record) {

src/main/vue/src/assetsPre/去除文件名中.bat

@@ -0,0 +1,5 @@
+@echo off& setlocal enabledelayedexpansion
+
+for /f "delims=" %%1 in ('dir /a /b') do (set wind=%%1
+
+ren "%%~1" "!wind:@3x=!")

src/main/vue/src/entries/index.html

@@ -5,11 +5,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="referrer" content="origin">
-    <title>图途象</title>
+    <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> -->
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.8&key=dd8f1d46b89cb06d842c321d0d021672"></script>
     <script src="/static/RongIMLib-2.2.5.min.js"></script>
     <style>
         #app {

src/main/vue/src/entries/index.js

@@ -4,9 +4,6 @@ import router from '../routerPre'
 import store from '../vuexPre'
 import ElementUI from 'element-ui'
 import axios from 'axios'
-import MultiUpload from '../components/MultiUpload'
-import SingleUpload from '../components/SingleUpload'
-import SingleUploadTitle from '../components/SingleUploadTitle'
 // import moment from 'moment'
 import VueI18n from 'vue-i18n'
 import RongIM from '../RongIM'
@@ -16,40 +13,41 @@ import '../elementVariables.scss'
 import 'normalize.css/normalize.css'
 // import 'element-ui/lib/theme-chalk/index.css'
 import '../mainPre.less'
-import '../emUI.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);
-Vue.component('multi-upload', MultiUpload);
-Vue.component('single-upload', SingleUpload);
-Vue.component('single-upload-title', SingleUploadTitle);
 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)
-            })
-
-        }
-    }
-})
+// 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) => {

src/main/vue/src/mainPre.less

@@ -108,3 +108,6 @@ ul, li {
     display: flex;
     align-items: center;
 }
+
+
+

src/main/vue/src/pages/CompanyInfoDetail.vue

@@ -19,9 +19,9 @@
                 <el-input type="textarea" v-model="formData.introduce" :disabled="'introduce'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="voice" label="语音介绍">
-                <el-upload class="upload-demo" action="../assets/uploadFile" :on-change="handleChange" :file-list="fileList3">
-                    <el-button size="small" type="primary" :disabled="'voice'==subColumn">点击上传</el-button>
-                    <div slot="tip" class="el-upload__tip">只能上传jpg/png文件 ，且不超过500kb</div>
+                <el-upload class="upload-demo" :file-list="fileList" :multiple="false" :action="$baseUrl+'/assets/uploadFile'" :on-success='haleSuccess'>
+                    <el-button size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传Mp4文件 </div>
                 </el-upload>
             </el-form-item>
             <el-form-item prop="rank" label="排序">
@@ -60,6 +60,12 @@ export default {
                     if (this.$route.query.column) {
                         this.formData[this.subColumn] = this.subValue;
                     }
+                    var nameList = res.data.voice.split('/')
+                    var jsonp = {
+                        name: nameList[nameList.length - 1],
+                        url: res.data.voice
+                    }
+                    this.fileList.push(jsonp)
                 }
             })
         } else {
@@ -90,6 +96,8 @@ export default {
             hallOptions: [{ label: '4号馆', value: '4号馆' }, { label: '5号馆', value: '5号馆' }, { label: '6号馆', value: '6号馆' }, { label: '5A馆', value: '5A馆' }],
             subColumn: '',
             subValue: '',
+            fileList: []
+
         }
     },
     methods: {
@@ -133,6 +141,18 @@ export default {
                 }
             })
         },
+        haleSuccess(file) {
+            // console.log(file)
+            file.data.forEach(item => {
+                var nameList = item.split('/')
+                var jsonp = {
+                    name: nameList[nameList.length - 1],
+                    url: item
+                }
+                this.fileList.splice(0, 1, jsonp)
+                this.formData.voice = item
+            })
+        }
     }
 }
 </script>

src/main/vue/src/pagesPre/About.vue

@@ -1,145 +0,0 @@
-<template>
-    <div class="conatiner">
-          <el-carousel class="swiper banner" :class="[bannerList.length==1?'noButton':'']" height="220px" :interval="4000">
-            <template v-for="item in bannerList">
-                <el-carousel-item  :style="{backgroundImage:'url('+item.imageUrl+')'}">
-                    <a v-if="item.url" :href="item.url"></a>
-                </el-carousel-item>
-            </template>
-
-        </el-carousel>
-
-        <div class="content">
-            <div class="name">
-                <div class="kuai"></div>
-                <span>关于我们</span>
-            </div>
-            <div class="content-content">
-                <div class="content-img" :style="{backgroundImage:'url('+aboutInfo.image+')'}"></div>
-
-                <div class="content-text">
-                    <div class="title">{{aboutInfo.title}}</div>
-                    <div class="content-all" v-html="aboutInfo.description">
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'home',
-    data() {
-        return {
-            aboutInfo: {},
-            bannerList:[]
-        }
-    },
-    mounted() {
-        this.$http.get({
-            url: '/aboutUs/getOne',
-            data: {
-                id: 1
-            }
-        }).then(res => {
-            if (res.success) {
-                this.aboutInfo = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/bannerInfo/all',
-            data: {
-                location: 16
-            }
-        }).then(res => {
-            if (res.success) {
-               this.bannerList=res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-    },
-    computed: {
-    },
-    methods: {
-        scrollMenu() { }
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.banner {
-    width: 1190px;
-    height: 220px;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    margin: auto;
-}
-
-.content {
-    width: 1146px;
-    margin: 20px auto;
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(234, 234, 234, 1);
-    padding: 0 22px;
-    .name {
-        height: 36px;
-        line-height: 36px;
-        border-bottom: 1px solid #ebebeb;
-        .kuai {
-            width: 7px;
-            height: 15px;
-            background: rgba(11, 158, 192, 1);
-            display: inline-block;
-            vertical-align: middle;
-        }
-
-        span {
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-left: 13px;
-            vertical-align: middle;
-        }
-    }
-    .content-content {
-        overflow: hidden;
-        padding: 16px 0 100px;
-        .content-img {
-            width: 414px;
-            height: 316px;
-            background-position: center center;
-            background-repeat: no-repeat;
-            background-size: cover;
-            float: left;
-        }
-
-        .content-text {
-            width: 680px;
-            float: right;
-
-            .title {
-                font-size: 18px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 24px;
-            }
-
-            .content-all {
-                font-size: 14px;
-                font-family: PingFangSC-Regular;
-                color: rgba(102, 102, 102, 1);
-                line-height: 24px;
-                margin-top: 13px;
-            }
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/App.vue

@@ -1,553 +0,0 @@
-<template>
-    <div class="container" @scroll="menu" id='container' @resize='getSize'>
-        <div style="min-width:1190px">
-            <mini-head></mini-head>
-            <div style="background-color:#fff;box-shadow: 0px 1px 2px 0px rgba(199, 199, 199, 0.5);">
-                <div class="Head">
-                    <div class="HeadTop">
-                        <img class="logo" @click="goNext('index')" src="../assetsPre/logo.png" alt="">
-                        <div class="Head-right">
-                            <el-input class="search" v-model="searchKey" placeholder="搜索店铺">
-                                <template slot="append">
-                                    <button @click="search">搜索</button>
-                                </template>
-                            </el-input>
-
-                            <div class="shop-enter" @click="goNext('userCertification')">
-                                <img src="../assetsPre/shop.png" alt="">
-                                <span>入驻接单</span>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="HeadBottom">
-                        <div class="service-list" @mousemove="showMenu=true" @mouseout="showMenu=false">
-                            <div class="name">
-                                <span>服务列表</span>
-                                <img src="../assetsPre/menu.png" alt="">
-                            </div>
-                            <transition name='slide-down' v-if="showMenu">
-                                <div class="service-content">
-                                    <div class="serive-item" v-for="(item,index) in serviceType">
-                                        <div class="title">{{item.serviceType}}</div>
-                                        <div class="serive-val-list">
-                                            <router-link :to='{name:"business",query:{serviceId:(index+1),littleId:todo.id}}' class="service-val" v-for="todo in item.serviceTypeDetailList">{{todo.typeName}}</router-link>
-                                        </div>
-                                    </div>
-                                </div>
-                            </transition>
-
-                        </div>
-
-                        <div class="menuList">
-                            <router-link id='menuItem0' class="menu-item" :style="{color:nowMenu==0?'#0B9EC0':'#333'}" :to='{name:"index"}'>首页</router-link>
-                            <div :id='"menuItem"+(index+1)' v-for="(item,index) in serviceType" class="menu-item" :style="{color:nowMenu==(index+1)?'#0B9EC0':'#333'}" @click="goMenu(index+1)">{{item.shortName}}</div>
-                            <!-- <router-link id='menuItem2' class="menu-item" :style="{color:nowMenu==2?'#0B9EC0':'#333'}" :to='{name:"business",query:{id:2}}'>影楼</router-link>
-                            <router-link id='menuItem3' class="menu-item" :style="{color:nowMenu==3?'#0B9EC0':'#333'}" :to='{name:"business",query:{id:3}}'>样片</router-link>
-                            <router-link id='menuItem4' class="menu-item" :style="{color:nowMenu==4?'#0B9EC0':'#333'}" :to='{name:"business",query:{id:4}}'>营销</router-link>
-                            <router-link id='menuItem5' class="menu-item" :style="{color:nowMenu==5?'#0B9EC0':'#333'}" :to='{name:"business",query:{id:5}}'>周边</router-link> -->
-                            <div class="menu-line" :style="{left:lineLeft+'px',width:lineWidth+'px'}"></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <keep-alive exclude="shop,product">
-                <router-view ref='child' @showHide='showHide' @startChat='startChat'></router-view>
-            </keep-alive>
-            <logo-foot :isBottom='false'></logo-foot>
-        </div>
-
-        <div class="little-menu">
-            <div class="little-item" v-if='hideShow1' @click="showHide({index:1,hide:false})">
-                <img src="../assetsPre/newShop.png" style="width:20px;height:18px;" alt="">
-                <div>新入驻</div>
-            </div>
-            <div class="little-item" v-if="hideShow2" @click="showHide({index:2,hide:false})">
-                <img src="../assetsPre/newInfo.png" style="width:20px;height:18px;" alt="">
-                <div>新订单</div>
-            </div>
-
-            <div class="little-item" @click="sendMsg" style="text-align:center">
-                <el-badge is-dot :hidden="hasNew==0">
-                    <img src="../assetsPre/fankui1.png" style="width:17px;height:18px;" alt="">
-                    <div>咨询</div>
-                </el-badge>
-            </div>
-            <!-- <div class="little-item">
-                <img src="../assetsPre/fankui2.png" style="width:20px;height:20px;" alt="">
-                <div>反馈</div>
-            </div> -->
-            <div class="little-item" @click="goTop">
-                <img src="../assetsPre/fankui3.png" style="width:24px;height:20px;" alt="">
-            </div>
-        </div>
-
-        <chatContent ref='chatContent'></chatContent>
-
-    </div>
-</template>
-
-<script>
-import logo from '../components/Logo'
-import { mapState } from 'vuex'
-import logoFoot from '../pagesPre/LogoFoot'
-import miniHead from '../components/MiniHead'
-import chatContent from '../pagesPre/ChatContent'
-import eventBus from '../eventBus'
-export default {
-    name: 'App',
-    created() {
-        eventBus.$on('receiveMessage', this.onReceiveMessage)
-        setTimeout(() => {
-
-            console.log(this.$route.name)
-            if (this.$route.name == 'index') {
-                this.nowMenu = 0
-                this.isBottom = false
-            } else if (this.$route.name == 'business') {
-                this.nowMenu = parseInt(this.$route.query.serviceId)
-                this.isBottom = true
-            } else {
-                this.nowMenu = -1
-                this.isBottom = true
-            }
-
-            if (this.hrefHistory.length > 0) {
-                this.nowMenu = 0
-            }
-
-            if (this.hrefHistory.length > 1) {
-                if (this.hrefHistory[1].href == 'business') {
-                    this.serviceType.forEach((item, index) => {
-                        console.log(this.hrefHistory[1].name, item.shortName)
-                        if (item.shortName == this.hrefHistory[1].name) {
-                            this.nowMenu = index + 1
-                        }
-                    })
-                }
-            }
-
-
-
-            console.log(this.nowMenu)
-
-
-
-
-
-            var length = -2
-            for (var i = 0; i < this.nowMenu; i++) {
-                if (document.getElementById('menuItem' + i)) {
-                    length += document.getElementById('menuItem' + i).offsetWidth + 36
-                }
-            }
-            this.lineLeft = length
-        }, 500)
-    },
-    mounted() {
-
-
-
-    },
-    data() {
-        return {
-            showMenu: false,
-            nowMenu: 0,
-            searchKey: '',
-            lineLeft: -2,
-            isBottom: false,
-            hideShow1: false,
-            hideShow2: false
-        }
-    },
-    beforeDestroy() {
-        eventBus.$off('receiveMessage', this.onReceiveMessage)
-    },
-    computed: {
-        ...mapState(['userInfo', 'serviceType', 'conversationList', 'IMConnected', 'myStoreInfo']),
-        lineWidth() {
-            var width = 40
-            if (document.getElementById('menuItem' + this.nowMenu)) {
-                width = document.getElementById('menuItem' + this.nowMenu).offsetWidth + 4
-            }
-
-            if (this.nowMenu === -1) {
-                width = 0
-            }
-
-            return width
-        },
-        hrefHistory() {
-            var list = []
-            var breHrefs = []
-            if (this.$route.query.breHref) {
-                breHrefs = this.$route.query.breHref.split('_;')
-            }
-
-            breHrefs.forEach(item => {
-                if (item) {
-                    var jsonp = {
-                        name: item.split(',')[0],
-                        href: item.split(',')[1]
-                    }
-                    list.push(jsonp)
-                }
-            })
-            return list
-        },
-        routeName() {
-            return this.$route.name
-        },
-        hasNew() {
-            var num = 0
-            this.conversationList.forEach(item => {
-                num += item.amount
-            })
-            return num
-        }
-    },
-    methods: {
-        showHide(style){
-            console.log(style)
-            if(style.index==1){
-                this.hideShow1=style.hide
-                this.$refs.child.hideShow1=style.hide
-            }
-            else{
-                 this.hideShow2=style.hide
-                 this.$refs.child.hideShow2=style.hide
-            }
-        },
-        search() {
-            if (!this.searchKey) {
-                this.$message.warning('搜索内容不能为空！');
-                return
-            }
-
-            this.$router.push({
-                name: 'search',
-                query: {
-                    searchKey: this.searchKey
-                }
-            })
-        },
-        menu() {
-            this.$refs.child.scrollMenu()
-        },
-        getSize() {
-            console.log('bvbbbbbbbbb')
-        },
-        goTop() {
-            document.getElementById('container').scrollTop = 0
-        },
-        goMenu(index) {
-            this.$router.replace({
-                name: "business",
-                query: {
-                    serviceId: index
-                }
-            })
-        },
-        goNext(str) {
-            this.$router.push({
-                name: str
-            })
-        },
-        onReceiveMessage(message) {
-            this.$http.get({
-                url: '/usersSession/all',
-                data: {
-                    userId: this.userInfo.id,
-                    type: 1
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.$store.commit('updateConversationList', res.data)
-                }
-            })
-
-        },
-        sendMsg() {
-            if (!this.userInfo) {
-                this.$router.push({
-                    name: 'login'
-                })
-            }
-            else if (this.userInfo.storeFlag == 'Y') {
-                window.open(window.location.origin + window.location.pathname + '?storeId=' + this.myStoreInfo.id + '#/storeChat')
-            }
-            else {
-                this.$refs.chatContent.showBox = true
-                this.$refs.chatContent.isLeft = true
-                this.$refs.chatContent.storeId = 0
-                this.$refs.chatContent.canBack = true
-            }
-
-        },
-        startChat(id) {
-            if (!this.userInfo) {
-                this.$router.push({
-                    name: 'login'
-                })
-            }
-            else {
-                this.$refs.chatContent.showBox = true
-                this.$refs.chatContent.storeId = id
-                this.$refs.chatContent.getChatInfo(id)
-                this.$refs.chatContent.canBack = false
-            }
-        }
-    },
-    watch: {
-        $route() {
-            if (this.$route.name == 'index') {
-                this.nowMenu = 0
-                this.isBottom = false
-            }
-            else if (this.$route.name == 'business') {
-                this.nowMenu = parseInt(this.$route.query.serviceId)
-                this.isBottom = true
-            }
-            else {
-                this.nowMenu = -1
-                this.isBottom = true
-            }
-
-            if (this.hrefHistory.length > 0) {
-                this.nowMenu = 0
-            }
-
-            if (this.hrefHistory.length > 1) {
-                if (this.hrefHistory[1].href == 'business') {
-                    this.serviceType.forEach((item, index) => {
-                        console.log(this.hrefHistory[1].name, item.shortName)
-                        if (item.shortName == this.hrefHistory[1].name) {
-                            this.nowMenu = index + 1
-                        }
-                    })
-                }
-            }
-
-
-
-            var length = -2
-            for (var i = 0; i < this.nowMenu; i++) {
-                if (document.getElementById('menuItem' + i)) {
-                    length += document.getElementById('menuItem' + i).offsetWidth + 36
-                }
-            }
-            this.lineLeft = length
-            document.getElementById('container').scrollTop = 0
-        }
-    },
-    components: {
-        logo, logoFoot, miniHead, chatContent
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.container {
-    background: rgba(249, 249, 249, 1);
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    overflow: auto;
-}
-
-.Head {
-    // overflow: hidden;
-    width: 1196px;
-    margin: auto;
-    background-color: #fff;
-
-    .HeadTop {
-        overflow: hidden;
-        padding: 32px 0 30px;
-        .logo {
-            float: left;
-            width: 300px;
-            height: 54px;
-            cursor: pointer;
-        }
-
-        .Head-right {
-            float: right;
-            margin: 7px 0 4px;
-
-            .shop-enter {
-                width: 105px;
-                height: 45px;
-                background: rgba(254, 168, 60, 1);
-                float: left;
-                margin-left: 5px;
-                cursor: pointer;
-                img {
-                    width: 19px;
-                    height: 19px;
-                    display: block;
-                    float: left;
-                    margin: 13px 5px 14px 12px;
-                }
-                span {
-                    font-size: 14px;
-                    font-family: MicrosoftYaHei-Bold;
-                    color: rgba(255, 255, 255, 1);
-                    line-height: 45px;
-                    font-weight: bold;
-                }
-            }
-        }
-
-        .search {
-            float: left;
-            width: 681px;
-            height: 45px;
-
-            button {
-                width: 100%;
-                color: #fff;
-                font-size: 14px;
-                cursor: pointer;
-            }
-        }
-    }
-    .HeadBottom {
-        // overflow: hidden;
-        height: 40px;
-        .service-list {
-            width: 220px;
-            height: 40px;
-            position: relative;
-            float: left;
-            .name {
-                width: 220px;
-                height: 40px;
-                background: rgba(26, 205, 225, 1);
-                background: linear-gradient(112.5deg, rgba(26, 205, 225, 1), rgba(11, 158, 192, 1));
-                cursor: pointer;
-                span {
-                    font-size: 16px;
-                    font-family: MicrosoftYaHei-Bold;
-                    color: rgba(255, 255, 255, 1);
-                    line-height: 40px;
-                    font-weight: bold;
-                    margin-left: 12px;
-                    float: left;
-                }
-
-                img {
-                    width: 17px;
-                    height: 15px;
-                    float: right;
-                    margin: 14px 12px;
-                }
-            }
-            .service-content {
-                position: absolute;
-                top: 40px;
-                left: 0;
-                background: #f1f7fe;
-                padding: 0 14px 10px 10px;
-                width: 196px;
-                z-index: 500;
-
-                .serive-item {
-                    .title {
-                        font-size: 12px;
-                        font-family: MicrosoftYaHei;
-                        color: rgba(51, 51, 51, 1);
-                        line-height: 16px;
-                        margin-top: 12px;
-                    }
-
-                    .serive-val-list {
-                        padding-bottom: 12px;
-                        display: -webkit-box;
-                        display: -webkit-flex;
-                        display: -ms-flexbox;
-                        display: flex;
-                        -webkit-flex-wrap: wrap;
-                        -webkit-box-lines: multiple;
-                        -moz-flex-wrap: wrap;
-                        flex-wrap: wrap;
-                        a {
-                            font-size: 12px;
-                            font-family: MicrosoftYaHei;
-                            color: rgba(102, 102, 102, 1);
-                            line-height: 16px;
-                            margin-top: 6px;
-                            text-decoration: none;
-                            padding: 0 5px;
-                        }
-                    }
-
-                    &:not(:last-child) {
-                        border-bottom: 1px solid rgba(223, 237, 236, 1);
-                    }
-                }
-            }
-        }
-
-        .menuList {
-            float: left;
-            margin-left: 78px;
-            position: relative;
-            font-size: 0;
-
-            .menu-item {
-                margin-right: 36px;
-                font-size: 18px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 40px;
-                font-weight: bold;
-                display: inline-block;
-                cursor: pointer;
-            }
-
-            .menu-line {
-                width: 40px;
-                height: 7px;
-                background: rgba(11, 158, 192, 1);
-                transition: all 0.3s ease-in-out;
-                position: absolute;
-                bottom: 0;
-                left: -2px;
-            }
-        }
-    }
-}
-
-.little-menu {
-    position: fixed;
-    right: 0px;
-    bottom: 30px;
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(234, 234, 234, 1);
-    cursor: pointer;
-    z-index: 999;
-    .little-item {
-        padding: 8px 11px 8px;
-        &:not(:last-child) {
-            border-bottom: 1px solid rgba(234, 234, 234, 1);
-        }
-
-        img {
-            display: block;
-            margin: auto;
-        }
-
-        div {
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 16px;
-            margin-top: 4px;
-            text-align: center;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/BackPassword.vue

@@ -1,324 +0,0 @@
-<template>
-    <div style="padding:0 24px 0 24px;">
-        <div class="stepContent">
-            <certificationStep :list='stepList' :nowStep='nowStep'></certificationStep>
-        </div>
-
-        <div class="content">
-            <template v-if="nowStep==1">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="100px" label-position="right" style="max-width: 420px;margin-top:20px;margin:auto">
-
-                    <el-form-item prop="phone" label="手机号码">
-                        <el-input v-model="formData.phone" placeholder="请输入手机号码" maxlength="11"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="imgCode" label="图片验证码">
-                        <el-input v-model="formData.imgCode" placeholder="请输入验证码" style="width:137px;vertical-align: middle;"></el-input>
-                        <img style="widdth:108px;height:39px;vertical-align: middle;margin-left:30px;" :src="baseUrl+'/auth/image?'+autoString" alt="">
-                        <el-button type="text" @click="randomString" style="vertical-align: middle;">换一张</el-button>
-                    </el-form-item>
-                    <el-form-item prop="code" label="短信验证码">
-                        <el-input v-model="formData.code" placeholder="请输入验证码" style="width:204px;"></el-input>
-                        <el-button plain style="width:110px;" :disabled='isSend' @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" style="width:204px" @click="onSave">下一步</el-button>
-                    </el-form-item>
-
-                </el-form>
-            </template>
-            <template v-if="nowStep==2">
-                <el-form :model="formData" :rules="rules2" ref="form" label-width="100px" label-position="right" style="max-width: 420px;margin-top:20px;margin:auto">
-                    <el-form-item prop="password" label="设置密码">
-                        <el-input type="password" name='psd' placeholder="6-20位的字母或者数字（必须包含数字字母的组合）" v-model="formData.password" maxlength="20"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="surePassword" label="确认密码">
-                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData.surePassword" maxlength="20"></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" :loading="loading" style="width:320px" @click="onSave">提交修改</el-button>
-                    </el-form-item>
-
-                </el-form>
-            </template>
-
-            <template v-if="nowStep==3">
-
-                <systemState style="margin:auto" class="certain" :next='"login"' :type='"success"' :title="'修改密码成功！'" :subtitle='""'></systemState>
-            </template>
-
-        </div>
-
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-import systemState from '../pagesPre/SystemState'
-import certificationStep from '../components/CertificationStep'
-import { mapState } from 'vuex'
-
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : `http://${location.hostname}:8080`;
-export default {
-    created() {
-        this.randomString()
-        // this.getNext(5)
-    },
-    data() {
-        return {
-            baseUrl,
-            imgCode: {},
-            autoString: '',
-            stepList: ['输入手机号码', '输入新密码', '完成'],
-            nowStep: 1,
-            saving: false,
-            formData: {
-                isRead: false,
-            },
-            rules: {
-
-                phone: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入手机号'));
-                            } else if (/^1[3-9]\d{9}$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('请输入正确的手机号'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                code: [
-                    { required: true, message: '请输入短信验证码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入图片验证码'));
-                            }
-                            else if (!this.backCode) {
-                                callback(new Error('请发送验证码'));
-                            } else {
-                                callback();
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                imgCode: [
-                    { required: true, message: '请输入图片验证码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入图片验证码'));
-                            } else {
-                                this.$http.get({
-                                    url: '/auth/verify',
-                                    data: {
-                                        code: value,
-                                    }
-                                }).then(res => {
-                                    if (res.success) {
-                                        callback();
-                                    } else {
-                                        callback(new Error('验证码错误'));
-                                    }
-                                });
-                            }
-                        }, trigger: 'blur'
-                    }
-                ]
-            },
-            rules2: {
-
-                password: [
-                    { required: true, message: '请输入密码', trigger: 'blur' },
-                    {
-
-                        validator: (rule, value, callback) => {
-                              if (!value) {
-                                callback(new Error('请输入密码'));
-                            } else if (!/^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('6-20位的字母、数字和特殊字符（必须包含数字母、数字和特殊字符）'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                surePassword: [
-                    { required: true, message: '请输入确认密码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入确认密码'));
-                            } else if (value == this.formData.password) {
-                                callback();
-                            } else {
-                                callback(new Error('两次密码输入不一致！'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-
-            },
-            roles: [],
-            departs: [],
-            backCode: '',
-            startNum: 60,
-            isSend: false,
-            isSuccess: false,
-            isSuccess1: false,
-            loading: false,
-            nowIndex: 5
-        }
-    },
-    computed: {
-        ...mapState(['msgCode']),
-    },
-    methods: {
-        onSave() {
-            this.loading = true
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.nowStep == 1) {
-                        this.checkMes().then((result) => {
-                            this.loading = false
-                            if (result) {
-                                this.nowStep++
-                            }
-                        })
-                    }
-                    else {
-                        this.submit()
-                    }
-
-
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            this.$http.post({
-                url: '/userInfo/updatePassword',
-                data: {
-                    phone: this.formData.phone,
-                    password: this.formData.password,
-                }
-            }).then(res => {
-                this.loading = false
-                if (res.success) {
-                    this.nowStep++
-                    this.getNext(5)
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-
-
-        },
-        getNext(i) {
-            this.nowIndex = i
-            if (i == 0) {
-                if (this.$route.query.name == 'backPassword') {
-                   this.$router.go(-1)
-                }
-            }
-            else {
-                setTimeout(() => {
-                    this.getNext(i - 1)
-                }, 1000)
-            }
-        },
-        startSend() {
-            if (!this.checkPhone(this.formData.phone)) {
-                this.$message.warning('手机号格式错误')
-                return
-            }
-
-
-
-            this.checkHas({ phone: this.formData.phone }).then((result) => {
-                console.log(result)
-                if (result) {
-                    this.sendMeg(this.formData.phone,this.msgCode['信息变更']).then((json) => {
-                        if (json.success) {
-                            this.$message.success('发送成功')
-                            this.backCode = json.data
-                            this.startNum = 61
-                            this.isSend = true
-                            this.setTime()
-                        }
-                        else {
-                            this.$message.warning(json.error)
-                        }
-                    })
-                }
-                else {
-                    this.$message.warning('该手机号未绑定用户')
-                }
-            })
-
-
-        },
-        setTime() {
-            if (this.startNum == 0) {
-                this.isSend = false
-                return
-            }
-            this.startNum--
-            setTimeout(() => {
-                this.setTime()
-            }, 1000)
-        },
-        checkMes() {
-            return new Promise((resolve, reject) => {
-                if (!this.backCode) {
-                    this.$message.warning('请发送验证码')
-                    resolve(false)
-                }
-                else if (!this.formData.code) {
-                    this.$message.warning('请输入验证码')
-                    resolve(false)
-                }
-                else {
-                    this.$http.get({
-                        url: '/aliapi/verifyMsgCode',
-                        data: {
-                            // sessionId: this.backCode,
-                            code: this.formData.code
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            resolve(true)
-                        } else {
-                            this.$message.warning(res.error)
-                            resolve(false)
-                        }
-                    });
-                }
-
-            })
-
-
-        },
-        randomString(len) {
-            var pwd = Math.random().toString(36).substr(2);
-
-            console.log(pwd)
-            this.autoString = pwd
-        }
-    },
-    components: {
-        systemState, certificationStep
-    }
-}
-</script>
-<style lang="less" scoped>
-.stepContent {
-    padding: 90px 300px 49px;
-}
-
-</style>

src/main/vue/src/pagesPre/Business.vue

@@ -1,619 +0,0 @@
-<template>
-    <div class="conatiner">
-        <el-carousel class="swiper" :class="[bannerList.length==1?'noButton':'']" height="420px" :interval="4000">
-            <template v-for="item in bannerList">
-                <el-carousel-item @click="goBanner(item.url)" :style="{backgroundImage:'url('+item.imageUrl+')'}">
-                    <a v-if="item.url" :href="item.url"></a>
-                </el-carousel-item>
-            </template>
-
-        </el-carousel>
-        <el-breadcrumb v-if="serviceType.length>0" separator-class="el-icon-arrow-right" class="Breadcrumb">
-            <el-breadcrumb-item :replace='true' :to="{ path: '/' }">首页</el-breadcrumb-item>
-            <el-breadcrumb-item>{{serviceType[nowIndex].shortName}}</el-breadcrumb-item>
-        </el-breadcrumb>
-
-        <div class="content">
-            <div class="content-left">
-                <div class="flift-content">
-                    <div class="flift-title">筛选条件</div>
-
-                    <div class="flift-item">
-                        <div class="flift-name">
-                            区域：
-                        </div>
-                        <div class="flift-list">
-                            <div id='filit_address0' :class="{isActive:(address==0)}" @click="address=0">全部</div>
-                            <div id='filit_address1' :class="{isActive:(address==1)}" v-if="this.locationCity" @click="address=1">定位所在地:{{this.locationCity}}</div>
-                            <div v-for="(item,index) in cityList" :class="{isActive:(address==(index+2))}" :id='"filit_address"+(index+2)' @click="address=(index+2)">{{item.districtName}}</div>
-                            <div class="box" :style="{width:addressFiliftLocation.width+'px',height:addressFiliftLocation.height+'px',top:addressFiliftLocation.top+'px',left:addressFiliftLocation.left+'px'}"></div>
-                        </div>
-                    </div>
-
-                    <div class="flift-item">
-                        <div class="flift-name">
-                            信誉等级:
-                        </div>
-                        <div class="flift-list">
-                            <div id='filit_level0' :class="{isActive:(level==0)}" @click="level=0">全部</div>
-                            <div :id='"filit_level"+(index+1)' v-for="(item,index) in creditList" :class="{isActive:(level==(index+1))}" @click="level=(index+1)">{{item.credit}}</div>
-                            <!-- <div id='filit_level2' :class="{isActive:(level==2)}" @click="level=2">B</div>
-                            <div id='filit_level3' :class="{isActive:(level==3)}" @click="level=3">C</div>
-                            <div id='filit_level4' :class="{isActive:(level==4)}" @click="level=4">D</div>
-                            <div id='filit_level5' :class="{isActive:(level==5)}" @click="level=5">E</div> -->
-                            <div class="box" :style="{width:levelFiliftLocation.width+'px',height:levelFiliftLocation.height+'px',top:levelFiliftLocation.top+'px',left:levelFiliftLocation.left+'px'}"></div>
-                        </div>
-                    </div>
-
-                    <div class="flift-item">
-                        <div class="flift-name">
-                            响应时间:
-                        </div>
-                        <div class="flift-list">
-                            <div id='filit_time0' :class="{isActive:(time==0)}" @click="time=0">全部</div>
-                            <div :id='"filit_time"+item.id' :class="{isActive:(time==item.id)}" @click="time=item.id" v-for="item in timeList">{{item.name}}</div>
-                            <div class="box" :style="{width:timeFiliftLocation.width+'px',height:timeFiliftLocation.height+'px',top:timeFiliftLocation.top+'px',left:timeFiliftLocation.left+'px'}"></div>
-                        </div>
-                    </div>
-                    <div class="flift-item">
-                        <div class="flift-name">
-                            排序:
-                        </div>
-                        <div class="flift-list">
-                            <div style="padding-right:15px;" @click="creditOrder=(creditOrder==1?2:1)">
-                                信誉等级
-                                <i class="el-icon-caret-top top-icon" :class="{isActive:creditOrder==1}"></i>
-                                <i class="el-icon-caret-bottom bottom-icon" :class="{isActive:creditOrder==2}"></i>
-                            </div>
-                            <div style="padding-right:15px;" @click="responseOrder=(responseOrder==1?2:1)">
-                                响应时间
-                                <i class="el-icon-caret-top top-icon" :class="{isActive:responseOrder==1}"></i>
-                                <i class="el-icon-caret-bottom bottom-icon" :class="{isActive:responseOrder==2}"></i>
-                            </div>
-                            <div style="padding-right:15px;" @click="reworkOrder=(reworkOrder==1?2:1)">
-                                返片率
-                                <i class="el-icon-caret-top top-icon" :class="{isActive:reworkOrder==1}"></i>
-                                <i class="el-icon-caret-bottom bottom-icon" :class="{isActive:reworkOrder==2}"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="goodsList">
-                    <goods-large :info='item' v-for="item in goodsList"></goods-large>
-                </div>
-
-            </div>
-
-            <div class="content-right" v-if="hotList.length>0">
-                <div class="right-title">
-                    热门{{serviceType[this.nowIndex].serviceType}}
-                </div>
-                <goods-little v-for="item in hotList" :info='item' style="border-top:1px solid #EAEAEA;padding:15px 0 29px"></goods-little>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import goodsLittle from '../components/GoodsLittle'
-import goodsLarge from '../components/GoodsLarge'
-import { mapState } from "vuex";
-export default {
-    name: 'home',
-    data() {
-        return {
-            address: 0,
-            level: 0,
-            time: 0,
-            nowIndex: 0,
-            bannerList: [],
-            hotList: [],
-            currentPage: 0,
-            flag: true,
-            goodsList: [],
-            cityList: [],
-            district: '',
-            credit: '',
-            advancedQuery: '',
-            timeList: [{
-                id: 1,
-                name: '0-15分钟',
-                key: 'AND_,response_time_,>=_,0_;AND_,response_time_,<_,15'
-            }, {
-                id: 2,
-                name: '15-30分钟',
-                key: 'AND_,response_time_,>=_,15_;AND_,response_time_,<_,30'
-            }, {
-                id: 3,
-                name: '30-45分钟',
-                key: 'AND_,response_time_,>=_,30_;AND_,response_time_,<_,45'
-            }, {
-                id: 4,
-                name: '45-60分钟',
-                key: 'AND_,response_time_,>=_,45_;AND_,response_time_,<_,60'
-            }, {
-                id: 5,
-                name: '60分钟以上',
-                key: 'AND_,response_time_,>=_,60'
-            }],
-            orderType: ['', 'asc', 'desc'],
-            orderByStr: '',
-            creditOrder: '',
-            responseOrder: '',
-            reworkOrder: '',
-            queryId: 0,
-            creditList: []
-        }
-    },
-    computed: {
-        ...mapState(["locationInfo", "serviceType"]),
-        locationCity() {
-            var city = '南京'
-            if (this.locationInfo) {
-               if(this.locationInfo.addressComponent){
-                    city = this.locationInfo.addressComponent.city.split('市')[0]
-                if (!city) {
-                    city = this.locationInfo.addressComponent.province.split('省')[0]
-                }
-               }
-            }
-            return city
-        },
-        addressFiliftLocation() {
-            var location = {
-                width: 46,
-                height: 26,
-                top: 7,
-                left: 0
-            }
-            if (document.getElementById("filit_address" + this.address)) {
-                var width = document.getElementById("filit_address" + this.address).offsetWidth
-                var height = document.getElementById("filit_address" + this.address).offsetHeight
-                var top = document.getElementById("filit_address" + this.address).offsetTop
-                var left = document.getElementById("filit_address" + this.address).offsetLeft
-                location = {
-                    width: width,
-                    height: height,
-                    top: top,
-                    left: left
-                }
-            }
-            return location
-        },
-        levelFiliftLocation() {
-            var location = {
-                width: 46,
-                height: 26,
-                top: 7,
-                left: 0
-            }
-            if (document.getElementById("filit_level" + this.level)) {
-                var width = document.getElementById("filit_level" + this.level).offsetWidth
-                var height = document.getElementById("filit_level" + this.level).offsetHeight
-                var top = document.getElementById("filit_level" + this.level).offsetTop
-                var left = document.getElementById("filit_level" + this.level).offsetLeft
-                location = {
-                    width: width,
-                    height: height,
-                    top: top,
-                    left: left
-                }
-            }
-            return location
-        },
-        timeFiliftLocation() {
-            var location = {
-                width: 46,
-                height: 26,
-                top: 7,
-                left: 0
-            }
-            if (document.getElementById("filit_time" + this.time)) {
-                var width = document.getElementById("filit_time" + this.time).offsetWidth
-                var height = document.getElementById("filit_time" + this.time).offsetHeight
-                var top = document.getElementById("filit_time" + this.time).offsetTop
-                var left = document.getElementById("filit_time" + this.time).offsetLeft
-                location = {
-                    width: width,
-                    height: height,
-                    top: top,
-                    left: left
-                }
-            }
-            return location
-        }
-    },
-    mounted() {
-
-        this.$http.get({
-            url: '/creditRating/all'
-        }).then(res => {
-            if (res.success) {
-                this.creditList = res.data;
-            }
-        });
-
-        this.$http.get({
-            url: '/districtInfo/all',
-            data: {
-            }
-        }).then(res => {
-            if (res.success) {
-                this.cityList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        setTimeout(() => {
-            this.freash()
-        }, 500)
-    },
-    watch: {
-        "$route.query"() {
-            console.log(this.$route.query.serviceId)
-            if (this.$route.query.serviceId) {
-                if (this.nowIndex != parseInt(this.$route.query.serviceId) - 1) {
-                    this.freash()
-                }
-
-            }
-
-
-        },
-        address() {
-            if (this.address == 0) {
-                this.district = ''
-            }
-            else if (this.address == 1) {
-                this.district = this.locationCity
-            }
-            else {
-                this.district = this.cityList[this.address - 2].districtName
-            }
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-        level() {
-            if (this.level == 0) {
-                this.credit = ''
-            }
-            else {
-                this.credit = this.creditList[this.level - 1].credit
-            }
-            // else if (this.level == 2) {
-            //     this.credit = 'B'
-            // }
-            // else if (this.level == 3) {
-            //     this.credit = 'C'
-            // }
-            // else if (this.level == 4) {
-            //     this.credit = 'D'
-            // }
-            // else if (this.level == 5) {
-            //     this.credit = 'E'
-            // }
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-        time() {
-            if (this.time == 0) {
-                this.advancedQuery = ''
-            }
-            else {
-                this.timeList.forEach(item => {
-                    if (item.id == this.time) {
-                        this.advancedQuery = item.key
-                    }
-                })
-            }
-
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-        creditOrder() {
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-        responseOrder() {
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-        reworkOrder() {
-            this.currentPage = 0
-            this.flag = true
-            this.getInfo()
-        },
-    },
-    methods: {
-        freash() {
-            if (this.$route.query.serviceId) {
-                this.nowIndex = parseInt(this.$route.query.serviceId) - 1
-            }
-
-            document.title = this.serviceType[this.nowIndex].shortName
-
-            this.address = 0
-            this.level = 0
-            this.time = 0
-
-            this.creditOrder = ''
-            this.responseOrder = ''
-            this.reworkOrder = ''
-
-            this.$http.get({
-                url: '/bannerInfo/all',
-                data: {
-                    location: this.nowIndex + 8
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.bannerList = res.data
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-            var list = [{
-                name: '首页',
-                href: '/'
-            }]
-            list.push({
-                name: this.serviceType[this.nowIndex].shortName,
-                href: this.$route.name
-            })
-            // this.$store.commit('updateHrefHistory', list)
-
-
-            this.$http.get({
-                url: '/storeInfo/page',
-                data: {
-                    currentPage: 1,
-                    pageNumber: 20,
-                    serviceType: this.serviceType[this.nowIndex].id,
-                    hotFlag: 1,
-                    useFlag: 'Y'
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.hotList = res.data.pp
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-            this.flag = true
-            this.currentPage = 0
-            this.getInfo()
-        },
-        getInfo() {
-            if (!this.flag) {
-                return
-            }
-            else {
-                this.flag = false
-            }
-            if (this.currentPage == 0) {
-                this.goodsList = []
-            }
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: 20,
-                serviceType: this.serviceType[this.nowIndex].id,
-                useFlag: 'Y',
-                advancedQuery: ''
-            }
-            if (this.$route.query.littleId) {
-                data.subclass = this.$route.query.littleId
-            }
-
-
-
-
-            if (this.district) {
-                data.advancedQuery += 'AND_,citye_,like_,' + JSON.parse(JSON.stringify(this.district))
-            }
-
-            if (this.credit) {
-                data.credit = this.credit
-            }
-
-            if (this.advancedQuery) {
-                if (data.advancedQuery) {
-                    data.advancedQuery += '_;'
-                }
-                data.advancedQuery += JSON.parse(JSON.stringify(this.advancedQuery))
-            }
-
-            console.log(this.advancedQuery)
-
-            data.orderByStr = ''
-
-
-            if (this.creditOrder) {
-                data.orderByStr += 'credit_,' + this.orderType[this.creditOrder]
-            }
-
-            if (this.responseOrder) {
-                if (data.orderByStr) {
-                    data.orderByStr += '_;'
-                }
-                data.orderByStr += 'response_time_,' + this.orderType[this.responseOrder]
-            }
-
-            if (this.reworkOrder) {
-                if (data.orderByStr) {
-                    data.orderByStr += '_;'
-                }
-                data.orderByStr += 'rework_rate_,' + this.orderType[this.reworkOrder]
-            }
-
-
-
-            this.currentPage++
-            this.$http.get({
-                url: '/storeInfo/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.goodsList = this.goodsList.concat(res.data.pp)
-                    if (res.data.page.currentPage < res.data.page.totalPage) {
-                        this.flag = true
-                    }
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-        },
-        scrollMenu() {
-            if (document.getElementById('container').scrollTop + document.body.clientHeight + 100 >= document.getElementById('container').scrollHeight) {
-                this.getInfo()
-                console.log('到底了')
-            }
-        }
-    },
-    components: {
-        goodsLittle, goodsLarge
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.swiper {
-    width: 1196px;
-    height: 420px;
-    margin: auto;
-}
-.Breadcrumb {
-    width: 1196px;
-    margin: 13px auto 10px;
-}
-
-.content {
-    width: 1196px;
-    overflow: hidden;
-    margin: auto;
-    min-height: 800px;
-
-    .content-left {
-        width: 925px;
-        float: left;
-        .flift-content {
-            background: rgba(255, 255, 255, 1);
-            border-radius: 4px;
-            border: 1px solid rgba(234, 234, 234, 1);
-            .flift-title {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-                padding: 9px 17px 4px;
-                border-bottom: 1px solid rgba(234, 234, 234, 1);
-            }
-
-            .flift-item {
-                overflow: hidden;
-                .flift-name {
-                    width: 70px;
-                    padding-right: 13px;
-                    font-size: 12px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(51, 51, 51, 1);
-                    line-height: 40px;
-                    text-align: right;
-                    float: left;
-                }
-                .flift-list {
-                    width: 826px;
-                    float: left;
-                    font-size: 0;
-                    padding-top: 7px;
-                    position: relative;
-                    div {
-                        padding: 5px 11px;
-                        font-size: 12px;
-                        font-family: MicrosoftYaHei;
-                        color: #333;
-                        line-height: 16px;
-                        display: inline-block;
-                        margin-bottom: 7px;
-                        margin-right: 10px;
-                        cursor: pointer;
-                        z-index: 2;
-                        position: relative;
-
-                        &.isActive {
-                            color: #fff;
-                        }
-                    }
-
-                    .box {
-                        width: 45px;
-                        height: 22px;
-                        background: rgba(11, 158, 192, 1);
-                        border-radius: 2px;
-                        position: absolute;
-                        left: 0;
-                        top: 10px;
-                        padding: 0;
-                        transition: all ease-in-out 0.3s;
-                        z-index: 1;
-                    }
-
-                    .top-icon {
-                        position: absolute;
-                        top: 5px;
-                        right: 0;
-                        color: #d6d6d6;
-
-                        &.isActive {
-                            color: #0b9ec0;
-                        }
-                    }
-
-                    .bottom-icon {
-                        position: absolute;
-                        bottom: 2px;
-                        right: 0;
-                        color: #d6d6d6;
-
-                        &.isActive {
-                            color: #0b9ec0;
-                        }
-                    }
-                }
-
-                &:not(:last-child) {
-                    .flift-list {
-                        border-bottom: 1px solid #eaeaea;
-                    }
-                }
-            }
-        }
-
-        .goodsList {
-            padding-top: 5px;
-            padding-bottom: 20px;
-        }
-    }
-
-    .content-right {
-        width: 211px;
-        float: right;
-        background-color: #fff;
-        border-radius: 4px;
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding-left: 29px;
-        .right-title {
-            font-size: 16px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 42px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/ChangePhone.vue

@@ -1,383 +0,0 @@
-<template>
-    <div style="padding:0 24px 0 24px;">
-        <div class="stepContent">
-            <certificationStep :list='stepList' :nowStep='nowStep'></certificationStep>
-        </div>
-
-        <div class="content">
-            <template v-if="nowStep==1">
-                <el-form :model="formData" :rules="rules" ref="form" label-width="100px" label-position="right" style="max-width: 420px;margin-top:20px;margin:auto">
-
-                    <el-form-item prop="phone" label="手机号码">
-                        <el-input v-model="formData.phone" placeholder="请输入手机号码" maxlength="11"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="imgCode" label="图片验证码">
-                        <el-input v-model="formData.imgCode" placeholder="请输入验证码" style="width:137px;vertical-align: middle;"></el-input>
-                        <img style="widdth:108px;height:39px;vertical-align: middle;margin-left:30px;" :src="baseUrl+'/auth/image?'+autoString" alt="">
-                        <el-button type="text" @click="randomString" style="vertical-align: middle;">换一张</el-button>
-                    </el-form-item>
-                    <el-form-item prop="code" label="短信验证码">
-                        <el-input v-model="formData.code" placeholder="请输入验证码" style="width:204px;"></el-input>
-                        <el-button plain style="width:110px;" :disabled='isSend' @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" style="width:204px" @click="onSave">下一步</el-button>
-                    </el-form-item>
-
-                </el-form>
-            </template>
-            <template v-if="nowStep==2">
-                <el-form :model="formData2" :rules="rules2" ref="form2" label-width="100px" label-position="right" style="max-width: 420px;margin-top:20px;margin:auto">
-                    <el-form-item prop="phone2" label="手机号码">
-                        <el-input v-model="formData2.phone2" placeholder="请输入手机号码" maxlength="11"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="code2" label="短信验证码">
-                        <el-input v-model="formData2.code2" placeholder="请输入验证码" style="width:204px;"></el-input>
-                        <el-button plain style="width:110px;" :disabled='isSend' @click="startSendChange">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" :loading="loading" style="width:320px" @click="onSave2">提交修改</el-button>
-                    </el-form-item>
-
-                </el-form>
-            </template>
-
-            <template v-if="nowStep==3">
-
-                <systemState style="margin:auto" class="certain" :next='"index"' :type='"success"' :title="'手机号绑定成功'" :subtitle='""'></systemState>
-            </template>
-
-        </div>
-
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-import systemState from '../pagesPre/SystemState'
-import certificationStep from '../components/CertificationStep'
-import { mapState } from 'vuex'
-
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : `http://${location.hostname}:8080`;
-export default {
-    created() {
-        this.randomString()
-        // this.getNext(5)
-    },
-    data() {
-        return {
-            baseUrl,
-            imgCode: {},
-            autoString: '',
-            stepList: ['输入手机号码', '绑定新手机号', '完成'],
-            nowStep: 1,
-            saving: false,
-            formData: {
-                isRead: false,
-            },
-            formData2: {},
-            rules: {
-
-                phone: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入手机号'));
-                            } else if (this.userInfo.phone == value) {
-                                callback();
-                            } else {
-                                callback(new Error('手机号与用户不匹配'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                code: [
-                    { required: true, message: '请输入短信验证码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入图片验证码'));
-                            }
-                            else if (!this.backCode) {
-                                callback(new Error('请发送验证码'));
-                            } else {
-                                callback();
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                imgCode: [
-                    { required: true, message: '请输入图片验证码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入图片验证码'));
-                            } else {
-                                this.$http.get({
-                                    url: '/auth/verify',
-                                    data: {
-                                        code: value,
-                                    }
-                                }).then(res => {
-                                    if (res.success) {
-                                        callback();
-                                    } else {
-                                        callback(new Error('验证码错误'));
-                                    }
-                                });
-                            }
-                        }, trigger: 'blur'
-                    }
-                ]
-            },
-            rules2: {
-
-                phone2: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入手机号'));
-                            }
-                            else if (/^1[3-9]\d{9}$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('请输入正确的手机号'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                code2: [
-                    { required: true, message: '请输入短信验证码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入图片验证码'));
-                            }
-                            else if (!this.backCode) {
-                                callback(new Error('请发送验证码'));
-                            } else {
-                                callback();
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-
-            },
-            roles: [],
-            departs: [],
-            backCode: '',
-            startNum: 60,
-            isSend: false,
-            isSuccess: false,
-            isSuccess1: false,
-            loading: false,
-            nowIndex: 5
-        }
-    },
-    computed: {
-        ...mapState(['msgCode', 'userInfo']),
-    },
-    methods: {
-        onSave() {
-            this.loading = true
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.nowStep == 1) {
-                        this.checkMes(this.formData.code).then((result) => {
-                            this.loading = false
-                            if (result) {
-                                this.nowStep++
-                                this.backCode = ''
-                                this.startNum = 60
-                                this.isSend = false
-                            }
-                        })
-                    }
-                    else {
-                        // this.submit()
-                    }
-
-
-                } else {
-                    return false;
-                }
-            });
-        },
-        onSave2() {
-            this.loading = true
-            this.$refs.form2.validate((valid) => {
-                if (valid) {
-                    this.checkMes(this.formData2.code2).then((result) => {
-                        this.loading = false
-                        if (result) {
-                            this.submit()
-                        }
-                    })
-
-
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-
-            var data = {};
-            data.id = this.userInfo.id
-            data.phone = this.formData2.phone2
-            this.$http.post({
-                url: '/userInfo/update',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    this.nowStep++
-                    // this.getNext(5)
-                    this.$http.get({
-                        url: '/userInfo/getUserInfo',
-                        data: {}
-                    }).then(res => {
-                        if (res.success) {
-                            this.$store.commit('updateUserInfo', res.data);
-                        }
-                    })
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-
-
-        },
-        getNext(i) {
-            this.nowIndex = i
-            if (i == 0) {
-                this.$router.go(-1)
-            }
-            else {
-                setTimeout(() => {
-                    this.getNext(i - 1)
-                }, 1000)
-            }
-        },
-        startSend() {
-            if (this.formData.phone != this.userInfo.phone) {
-                this.$message.warning('手机号与用户不匹配')
-                return
-            }
-
-
-
-            this.checkHas({ phone: this.formData.phone }).then((result) => {
-                console.log(result)
-                if (result) {
-                    this.sendMeg(this.formData.phone, this.msgCode['身份验证']).then((json) => {
-                        if (json.success) {
-                            this.$message.success('发送成功')
-                            this.backCode = json.data
-                            this.startNum = 61
-                            this.isSend = true
-                            this.setTime()
-                        }
-                        else {
-                            this.$message.warning(json.error)
-                        }
-                    })
-                }
-                else {
-                    this.$message.warning('该手机号未绑定用户')
-                }
-            })
-
-
-        },
-        startSendChange() {
-            if (!this.checkPhone(this.formData2.phone2)) {
-                this.$message.warning('手机号格式错误')
-                return
-            }
-
-
-
-            this.checkHas({ phone: this.formData2.phone2 }).then((result) => {
-                console.log(result)
-                if (result) {
-                    this.$message.warning('该手机号已绑定用户')
-                }
-                else {
-                    this.sendMeg(this.formData2.phone2, this.msgCode['信息变更']).then((json) => {
-                        if (json.success) {
-                            this.$message.success('发送成功')
-                            this.backCode = json.data
-                            this.startNum = 61
-                            this.isSend = true
-                            this.setTime()
-                        }
-                        else {
-                            this.$message.warning(json.error)
-                        }
-                    })
-
-                }
-            })
-        },
-        setTime() {
-            if (this.startNum == 0) {
-                this.isSend = false
-                return
-            }
-            this.startNum--
-            setTimeout(() => {
-                this.setTime()
-            }, 1000)
-        },
-        checkMes(code) {
-            return new Promise((resolve, reject) => {
-                if (!this.backCode) {
-                    this.$message.warning('请发送验证码')
-                    resolve(false)
-                }
-                else if (!code) {
-                    this.$message.warning('请输入验证码')
-                    resolve(false)
-                }
-                else {
-                    this.$http.get({
-                        url: '/aliapi/verifyMsgCode',
-                        data: {
-                            // sessionId: this.backCode,
-                            code: code
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            resolve(true)
-                        } else {
-                            this.$message.warning(res.error)
-                            resolve(false)
-                        }
-                    });
-                }
-
-            })
-
-
-        },
-        randomString(len) {
-            var pwd = Math.random().toString(36).substr(2);
-
-            console.log(pwd)
-            this.autoString = pwd
-        }
-    },
-    components: {
-        systemState, certificationStep
-    }
-}
-</script>
-<style lang="less" scoped>
-.stepContent {
-    padding: 90px 300px 49px;
-}
-</style>

src/main/vue/src/pagesPre/ChatContent.vue

@@ -1,551 +0,0 @@
-<template>
-    <div class='box' v-if="showBox">
-        <div class="chatContent">
-            <div class="left" v-if="isLeft">
-                <div class="topContent">
-                    <img class="icon" :src="userInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
-                    <span>{{userInfo.nickname}}</span>
-                </div>
-                <div class='leftList' v-if="conversationList.length>0">
-
-                    <div class="left-item" v-for="(item,index) in conversationList" @click="readAll(item)">
-                        <img class="icon" :src="item.storeInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
-                        <div class="content">
-                            <div class="name">{{item.storeInfo.storeName}}</div>
-                            <div class="subtitle" v-if="item.chatInfo">{{item.chatInfo.content}}</div>
-                        </div>
-                        <div class="time" v-if="item.amount">
-                            <el-badge :value="item.amount" :hidden='item.amount?false:true' class='item'>
-                            </el-badge>
-                            <span>{{forNow(item.updateTime)}}</span>
-                        </div>
-                        <div class="close" @click.stop='del(item,index)'>
-                            <i class="el-icon-error"></i>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="nothing" v-else>
-                    还没有聊天记录哦，快去咨询店铺吧~
-                </div>
-
-            </div>
-
-            <div class="right" v-else>
-                <div class="topContent">
-                    <el-button v-if='canBack' style="color:#fff;font-size:20px;margin-right:10px" @click="isLeft=true,storeId=0,chatList=[]" icon="el-icon-back" type="text" circle></el-button>
-                    <img class="icon" :src="storeInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
-                    <span>{{storeInfo.storeName}}</span>
-                    <span style="font-size:14px;margin-left:20px;">{{storeInfo.citye}}</span>
-                </div>
-                <div class="chatList" ref='chatList' @scroll='scrollChat'>
-                    <div class="chat-item" v-for="item in orderedHistory" :style="{flexDirection:item.typeFlag?'row':'row-reverse'}">
-                        <img class="icon" :src="(item.typeFlag?storeInfo.icon:userInfo.icon)+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
-                        <div class="chatInfo">{{item.content}}</div>
-                    </div>
-                </div>
-                <div class="inputContent">
-                    <el-input type="textarea" @keydown="keyDownEvent" maxlength="200" resize='none' :autosize="{ minRows:6}" placeholder="请输入内容" v-model="textarea3">
-                    </el-input>
-
-                    <el-button type="primary" class="submit" @click="send">发送</el-button>
-                </div>
-            </div>
-
-            <div class="floatRight">
-
-                <el-button @click="showBox=false" style="color:#fff;font-size:30px" icon="el-icon-close" type="text" circle></el-button>
-            </div>
-        </div>
-    </div>
-
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import eventBus from '../eventBus'
-export default {
-    created() {
-        eventBus.$on('receiveMessage', this.onReceiveMessage)
-        // if (this.$route.name == 'shop') {
-        //     this.storeId = this.$route.query.id
-        //     this.getChatInfo(this.storeId)
-        //     this.canBack = false
-        // }
-        // else if (this.$route.name == 'product') {
-        //     this.storeId = this.$route.query.storeId
-        //     this.getChatInfo(this.storeId)
-        //     this.canBack = false
-        // }
-        // else {
-
-        // }
-        this.isLeft = true
-        this.storeId = 0
-        this.canBack = true
-    },
-    name: 'chatContent',
-    data() {
-        return {
-            storeId: 0,
-            chatList: [],
-            storeInfo: {},
-            textarea3: '',
-            customerList: [],
-            currentPage: 1,
-            isLeft: true,
-            showBox: false,
-            canBack: true,
-            chatFlag: false
-        }
-    },
-    computed: {
-        ...mapState(['userInfo', 'conversationList']),
-        orderedHistory() {
-            return this.chatList.sort((a, b) => {
-                return a.time - b.time
-            })
-        },
-        coventIndex() {
-            var index = -1
-            if (this.storeId) {
-                this.conversationList.forEach((item, i) => {
-                    if (item.storeId == this.storeId && item.userId == this.userInfo.id) {
-                        index = i
-                    }
-                });
-            }
-            return index
-        }
-    },
-    watch: {
-        // $route() {
-        //     console.log(this.$route.name)
-        //     if (this.$route.name == 'shop') {
-        //         this.storeId = this.$route.query.id
-        //         this.getChatInfo(this.storeId)
-        //         this.canBack = false
-        //     }
-        //     else if (this.$route.name == 'product') {
-        //         this.storeId = this.$route.query.storeId
-        //         this.getChatInfo(this.storeId)
-        //         this.canBack = false
-        //     }
-        //     else {
-        //         this.isLeft = true
-        //         this.storeId = 0
-        //         this.canBack = true
-        //     }
-        // },
-        isLeft() {
-            if (!this.isLeft) {
-                this.goBottom()
-            }
-        },
-        showBox() {
-            if (this.showBox) {
-                this.goBottom()
-            }
-        }
-    },
-    beforeDestroy() {
-        eventBus.$off('receiveMessage', this.onReceiveMessage)
-    },
-    methods: {
-        readAll(item, type) {
-            this.$http.get({
-                url: '/chatInfo/readAll',
-                data: {
-                    storeId: item.storeId,
-                    userId: item.userId,
-                    typeFlag: 1
-                }
-            })
-            if (type) {
-                return
-            }
-            this.storeId = item.storeId
-            this.getChatInfo(item.storeId)
-        },
-        getChatInfo(id) {
-            this.isLeft = false
-            this.chatList = []
-            this.storeInfo = {}
-            this.customerList = []
-            this.$http.get({
-                url: '/storeInfo/getOne',
-                data: {
-                    id: id,
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.storeInfo = res.data
-
-
-
-
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-            this.$http.get({
-                url: '/customerService/recently',
-                data: {
-                    storeId: id,
-                }
-            }).then(res => {
-                if (res.success) {
-                    res.data.forEach((item, index) => {
-                        if (item.checkOnlineResult.status == '1') {
-                            res.data.splice(0, 0, item)
-                        }
-                    })
-                    console.log(res.data)
-                    this.customerList = res.data
-                    console.log(this.customerList)
-
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-
-            this.currentPage = 1
-            this.getPageChat()
-
-
-        },
-        getPageChat() {
-            this.chatFlag = false
-            this.$http.get({
-                url: '/chatInfo/page',
-                data: {
-                    currentPage: this.currentPage,
-                    pageNumber: 10,
-                    storeId: this.storeId,
-                    userId: this.userInfo.id
-                }
-            }).then(res => {
-                if (res.success) {
-                    res.data.pp.forEach(item => {
-                        this.chatList.push(item)
-                    });
-
-                    if (res.data.currentPage < res.data.totalPage) {
-                        this.chatFlag = true
-                    }
-
-                    if (this.chatList.length == 0) {
-                        setTimeout(() => {
-                            // this.$IM.newConversation({
-                            //     userId: this.userInfo.id,
-                            //     type: 0,
-                            //     storeId: this.storeId,
-                            //     success: (res) => {
-
-                            //     }
-                            // })
-
-                            // this.$IM.newConversation({
-                            //     userId: this.userInfo.id,
-                            //     type: 1,
-                            //     storeId: this.storeId,
-                            //     success: (res) => {
-
-                            //     }
-                            // })
-                            this.$http.post({
-                                url: '/chatInfo/save',
-                                data: {
-                                    'content': '您好，感谢您对' + this.storeInfo.storeName + '的关注，我们会尽快回复您的咨询。',
-                                    'contentType': 0,
-                                    'state': 1,
-                                    'storeId': this.storeId,
-                                    'userId': this.userInfo.id,
-                                    'typeFlag': 1
-                                }
-                            }).then(res2 => {
-                                if (res2.success) {
-                                    this.chatList.push(res2.data)
-                                }
-                            })
-                        }, 1000)
-                    }
-
-
-
-
-                    // this.chatList = res.data.pp
-
-                }
-            }).catch(e => {
-                console.log(e)
-            })
-        },
-        goBottom() {
-            setTimeout(() => {
-                if (this.$refs.chatList) {
-                    this.$refs.chatList.scrollTop = this.$refs.chatList.scrollHeight
-                }
-
-            }, 50)
-
-        },
-        send() {
-            if(!this.textarea3){
-                return
-            }
-
-
-            var customer = ''
-            if (this.customerList.length > 0) {
-                customer = this.customerList[0].username
-            }
-            this.$IM.sendMessage({
-                target: this.storeId,
-                content: {
-                    content: this.textarea3,
-                    extra: {
-                        storeId: this.storeId,
-                        typeFlag: "0",
-                        userId: this.userInfo.id.toString()
-                    }
-                },
-                userId: this.userInfo.id,
-                typeFlag: 0,
-                customer: customer,
-                success: (res) => {
-                    this.textarea3 = ''
-                    console.log(res)
-                    this.chatList.push(res)
-                    this.goBottom()
-                }
-            })
-        },
-        onReceiveMessage(message) {
-            if (!this.isLeft && message.storeId == this.storeId) {
-                this.chatList.push(message)
-                console.log('收到啦' + JSON.stringify(message))
-                this.goBottom()
-                this.readAll({
-                    storeId: this.storeId,
-                    userId: this.userInfo.userId,
-                }, 1)
-            }
-        },
-        del(item, index) {
-            console.log(item)
-
-
-            this.$http.post({
-                url: '/usersSession/del',
-                data: {
-                    id: item.id
-                }
-            }).then(res => {
-                if (res.success) {
-                    var list = [...this.conversationList]
-                    list.splice(index, 1)
-                    this.$store.commit('updateConversationList', list);
-                }
-            })
-        },
-        scrollChat() {
-            if (this.$refs.chatList.scrollTop == 0 && this.chatFlag) {
-                this.getChatInfo()
-            }
-        },
-        keyDownEvent(e) {
-            console.log(e)
-        }
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.box {
-    background-color: rgba(0, 0, 0, 0.3);
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    z-index: 600;
-
-    .chatContent {
-        display: flex;
-        background: rgba(254, 254, 254, 1);
-        box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
-        border-radius: 4px;
-        position: absolute;
-        top: 20vh;
-        left: 50%;
-        transform: translateX(-50%);
-        height: 60vh;
-        min-height: 360px;
-    }
-
-    .topContent {
-        background: linear-gradient(151deg, rgba(27, 184, 172, 1) 0%, rgba(0, 142, 205, 1) 100%);
-        box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.2);
-        height: 55px;
-        padding: 0 15px;
-        line-height: 55px;
-        .icon {
-            border-radius: 100%;
-            vertical-align: middle;
-        }
-        span {
-            font-size: 22px;
-            font-weight: 400;
-            color: rgba(255, 255, 255, 1);
-            vertical-align: middle;
-            margin-left: 8px;
-        }
-    }
-
-    .leftList {
-        padding: 0 15px;
-        // height: 583px;
-        overflow: auto;
-    }
-
-    .left {
-        width: 300px;
-        min-height: 583px;
-
-        .item {
-            display: block;
-            width: 100%;
-        }
-
-        .left-item {
-            padding: 10px 0;
-            display: flex;
-            align-items: center;
-            cursor: pointer;
-
-            .icon {
-                border-radius: 100%;
-                min-width: 40px;
-            }
-
-            .content {
-                flex-grow: 1;
-                margin-left: 5px;
-                overflow: hidden;
-                .name {
-                    font-size: 16px;
-                    color: #333;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                }
-
-                .subtitle {
-                    font-size: 12px;
-                    color: #999;
-                    margin-top: 5px;
-                    overflow: hidden;
-                    text-overflow: ellipsis;
-                    white-space: nowrap;
-                }
-            }
-
-            .time {
-                font-size: 12px;
-                color: #999;
-                display: flex;
-                flex-direction: column;
-                text-align: right;
-                min-width: 60px;
-            }
-
-            &:not(:last-child) {
-                border-bottom: 1px solid #ebebeb;
-            }
-
-            .close {
-                color: #999;
-                display: none;
-            }
-
-            &:hover {
-                .close {
-                    display: block;
-                }
-            }
-        }
-
-        .nothing {
-            text-align: center;
-            padding: 30px;
-            color: #999;
-            font-size: 18px;
-        }
-    }
-
-    .right {
-        width: 800px;
-        display: -webkit-box;
-        display: -webkit-flex;
-        display: -ms-flexbox;
-        display: flex;
-        -webkit-box-orient: column;
-        -webkit-flex-direction: column;
-        -ms-flex-direction: column;
-        flex-direction: column;
-
-        .chatList {
-            // height: 425px;
-            overflow: auto;
-            // border-bottom: 1px solid #ebebeb;
-            padding-bottom: 20px;
-            -webkit-box-flex: 1;
-            -webkit-flex: 1;
-            -ms-flex: 1;
-            flex: 1;
-        }
-        .inputContent {
-            position: relative;
-            .submit {
-                position: absolute;
-                bottom: 16px;
-                right: 23px;
-                width: 93px;
-            }
-        }
-        .chat-item {
-            display: flex;
-            align-items: flex-start;
-            margin-top: 10px;
-            padding: 0 15px;
-            .icon {
-                min-width: 40px;
-                margin: 0 20px;
-                border-radius: 100%;
-            }
-
-            .chatInfo {
-                // flex-grow: 1;
-
-                padding: 10px 20px;
-                font-size: 14px;
-                font-weight: 400;
-                color: rgb(12, 4, 4);
-                line-height: 20px;
-                border: 1px solid #979797;
-                border-radius: 4px;
-                margin-top: 18px;
-            }
-        }
-    }
-
-    .floatRight {
-        position: absolute;
-        right: 0px;
-        top: 0px;
-    }
-}
-</style>

src/main/vue/src/pagesPre/CommentItem.vue

@@ -1,137 +0,0 @@
-<template>
-    <div class="comment" @click="goNext">
-        <div class='icon' :style="{backgroundImage:'url('+(type=='store'?userInfo.icon:productInfo.image)+')'}">
-        </div>
-        <div class="content">
-            <div class="name">{{type=='store'?userInfo.nickname:productInfo.title}}</div>
-            <el-rate v-model="starLevel" disabled show-score text-color="#ff9900" score-template="{value}">
-            </el-rate>
-
-            <div class="message">
-                {{info.context}}
-            </div>
-
-            <div class="imgList" v-if="info.productCommentImageList.length>0">
-                <imgItemLittle :img='item.imageUrl' v-for="item in info.productCommentImageList"></imgItemLittle>
-            </div>
-
-        </div>
-        <span class="time">{{getTime(info.createTime)}}</span>
-
-    </div>
-
-</template>
-
-<script>
-import imgItemLittle from '../components/ImgItemLittle'
-export default {
-    name: 'commentItem',
-    props: {
-        info: {
-            type: Object,
-            default: {}
-        },
-        type: {
-            type: String,
-            default: 'store'
-        }
-    },
-    data() {
-        return {
-            nowStep: 1,
-        }
-    },
-    watch: {
-        $route() {
-            this.getStep()
-        }
-    },
-    computed: {
-        userInfo() {
-            var jsonp = {}
-            if (this.info.userInfo) {
-                jsonp = this.info.userInfo
-            }
-            return jsonp
-        },
-        productInfo(){
-             var jsonp = {}
-            if (this.info.productInfo) {
-                jsonp = this.info.productInfo
-            }
-            return jsonp
-        },
-        starLevel(){
-            var num=0
-            if(this.info.starLevel){
-                num=parseFloat(this.info.starLevel)
-            }
-            return num
-        }
-    },
-    mounted() {
-
-    },
-    methods: {
-        goNext() {
-            // if (this.type == 'user') {
-            //     this.$router.push({
-            //         name: 'product',
-            //         query: {
-            //             id: this.info.productId,
-            //             // breHref:
-            //         }
-            //     })
-            // }
-        }
-    },
-    components: {
-        imgItemLittle
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.comment {
-    padding: 20px 30px;
-    position: relative;
-    .icon {
-        width: 66px;
-        height: 66px;
-        border-radius: 100%;
-        display: inline-block;
-        background-position: center center;
-        background-size: cover;
-        vertical-align: top;
-        background-color: #ebebeb;
-    }
-    .content {
-        display: inline-block;
-        vertical-align: center;
-        margin-left: 22px;
-
-        .name {
-            font-size: 14px;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-bottom: 9px;
-        }
-
-        .message {
-            font-size: 12px;
-            color: rgba(51, 51, 51, 1);
-            line-height: 20px;
-            margin-top: 8px;
-        }
-    }
-
-    .time {
-        position: absolute;
-        right: 30px;
-        top: 20px;
-        font-size: 12px;
-        color: rgba(153, 153, 153, 1);
-        line-height: 16px;
-    }
-}
-</style>

src/main/vue/src/pagesPre/Contact.vue

@@ -1,203 +0,0 @@
-<template>
-    <div class="conatiner">
-        <el-carousel class="swiper banner" :class="[bannerList.length==1?'noButton':'']" height="220px" :interval="4000">
-            <template v-for="item in bannerList">
-                <el-carousel-item :style="{backgroundImage:'url('+item.imageUrl+')'}">
-                    <a v-if="item.url" :href="item.url"></a>
-                </el-carousel-item>
-            </template>
-
-        </el-carousel>
-
-        <div class="content">
-            <div class="name">
-                <div class="kuai"></div>
-                <span>加入我们</span>
-            </div>
-
-            <div class="content-content">
-
-                <div class="content-text">
-                    <div class="title">{{contactInfo.companyName}}</div>
-                    <div class="content-all">
-                        <div v-if="contactInfo.telephone">
-                            <img style="width:18px;height:18px" src="../assetsPre/contact2.png" alt="">
-                            <span>电话：{{contactInfo.telephone}}</span>
-                        </div>
-                        <div v-if="contactInfo.faxes">
-                            <img style="width:17px;height:17px" src="../assetsPre/contact4.png" alt="">
-                            <span>传真：{{contactInfo.faxes}} </span>
-                        </div>
-                        <div v-if="contactInfo.postcode">
-                            <img style="width:15px;height:12px" src="../assetsPre/contact3.png" alt="">
-                            <span>邮编：{{contactInfo.postcode}} </span>
-                        </div>
-                        <div v-if="contactInfo.address">
-                            <img style="width:12px;height:17px" src="../assetsPre/contact5.png" alt="">
-                            <span>地址：{{contactInfo.address}}</span>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="line"></div>
-
-                <div class="content-img">
-                    <img src="../assetsPre/contact1.png" alt="">
-                    <div class="ps" style="margin-top:23px;" v-if="contactInfo.servicePhone">
-                        全国免费服务热线 {{contactInfo.servicePhone}}
-                    </div>
-                    <div class="ps" style="margin-top:8px;" v-if="contactInfo.serviceTime">
-                        客服时间 {{contactInfo.serviceTime}}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'home',
-    data() {
-        return {
-            contactInfo: {},
-            bannerList: []
-        }
-    },
-    mounted() {
-        this.$http.get({
-            url: '/contactUs/getOne',
-            data: {
-                id: 1
-            }
-        }).then(res => {
-            if (res.success) {
-                this.contactInfo = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/bannerInfo/all',
-            data: {
-                location: 15
-            }
-        }).then(res => {
-            if (res.success) {
-                this.bannerList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-    },
-    computed: {
-    },
-    methods: {
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.banner {
-    width: 1191px;
-    height: 220px;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    margin: auto;
-}
-
-.content {
-    width: 1146px;
-    margin: 20px auto;
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(234, 234, 234, 1);
-    padding: 0 22px;
-    .name {
-        height: 36px;
-        line-height: 36px;
-        border-bottom: 1px solid #ebebeb;
-        .kuai {
-            width: 7px;
-            height: 15px;
-            background: rgba(11, 158, 192, 1);
-            display: inline-block;
-            vertical-align: middle;
-        }
-
-        span {
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-left: 13px;
-            vertical-align: middle;
-        }
-    }
-    .content-content {
-        overflow: hidden;
-        padding: 30px 0;
-        .content-img {
-            width: 383px;
-            height: 248px;
-            background-position: center center;
-            background-repeat: no-repeat;
-            background-size: cover;
-            display: inline-block;
-            vertical-align: middle;
-
-            img {
-                width: 137px;
-                height: 99px;
-                display: block;
-                margin: auto;
-            }
-
-            .ps {
-                font-size: 12px;
-                font-family: PingFangSC-Regular;
-                color: rgba(102, 102, 102, 1);
-                line-height: 17px;
-                text-align: center;
-            }
-        }
-
-        .line {
-            width: 1px;
-            height: 248px;
-            display: inline-block;
-            vertical-align: middle;
-            background-color: #eaeaea;
-        }
-        .content-text {
-            width: 720px;
-            display: inline-block;
-            vertical-align: middle;
-            .title {
-                font-size: 18px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 24px;
-            }
-
-            .content-all {
-                div {
-                    img {
-                        vertical-align: middle;
-                    }
-                    span {
-                        vertical-align: middle;
-                        margin-left: 5px;
-                    }
-                }
-                font-size: 14px;
-                font-family: PingFangSC-Regular;
-                color: rgba(102, 102, 102, 1);
-                line-height: 41px;
-                margin-top: 13px;
-            }
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/CustomerService.vue

@@ -1,200 +0,0 @@
-<template>
-    <div class="container">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 500px;">
-            <!-- <el-form-item prop="storeId" label="店铺">
-                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
-            </el-form-item> -->
-            <el-form-item prop="serviceName" label="昵称">
-                <el-input v-model="formData.serviceName" :disabled="'serviceName'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="icon" label="头像">
-                <single-upload v-model="formData.icon" :disabled="'icon'==subColumn"></single-upload>
-                <span style='color:#999;fonts-size:12px;'>注：建议尺寸 180*180</span>
-            </el-form-item>
-            <el-form-item prop="username" label="账号名">
-                <el-input v-model="formData.username" :disabled="'username'==subColumn" placeholder="英文字母加数字不能含有中文字符"></el-input>
-            </el-form-item>
-            <!-- <el-form-item prop="password" label="密码">
-                <el-input v-model="formData.password" :disabled="'password'==subColumn"></el-input>
-            </el-form-item> -->
-            <el-form-item prop="useFlag" label="是否可用">
-                <el-switch v-model="formData.useFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'useFlag'==subColumn">
-                </el-switch>
-            </el-form-item>
-            <!-- <el-form-item prop="statusFlag" label="状态">
-                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
-            </el-form-item> -->
-            <!-- <el-form-item prop="loginTime" label="登录时间">
-                <template>
-                    <div class="block">
-                        <el-date-picker v-model="formData.loginTime" type="datetime" value-format="timestamp" placeholder="选择日期">
-                        </el-date-picker>
-                    </div>
-                </template>
-            </el-form-item> -->
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-import { mapState } from 'vuex'
-export default {
-    created() {
-        this.formData.storeId = this.myStoreInfo.id
-        if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
-
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/customerService/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
-
-
-                    this.formData = res.data;
-
-                    if (this.$route.query.column) {
-                        this.formData[this.subColumn] = this.subValue;
-                    }
-
-                    this.formData.useFlag = this.formData.useFlag == 'Y' ? true : false;
-
-                }
-            })
-        } else {
-            if (this.$route.query.column) {
-                this.formData[this.subColumn] = this.subValue;
-            }
-        }
-
-    },
-    data() {
-        return {
-            saving: false,
-            formData: {
-                useFlag: true,
-            },
-            rules: {
-                serviceName: [
-                    { required: true, message: '请输入客服名', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入用户名'));
-                            } else {
-                                 callback();
-
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                icon: [
-                    { required: true, message: '请上传客服头像', trigger: 'blur' },
-                ],
-                username: [
-                    { required: true, message: '请输入客服账号名', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入用户名'));
-                            } else if (!/^[a-zA-Z0-9_]{0,}$/.test(value)) {
-                                callback(new Error('不能含有中文'));
-                            }
-                            else {
-                                this.$http.get({
-                                    url: '/customerService/getOne',
-                                    data: {
-                                        username: value
-                                    }
-                                }).then(res => {
-                                    if (res.data) {
-                                        if (res.data.id != this.formData.id) {
-                                            callback(new Error('已存在该账号名'));
-                                        }
-                                        else {
-                                            callback();
-                                        }
-
-                                    } else {
-                                        callback();
-                                    }
-                                });
-
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-            },
-            subColumn: '',
-            subValue: '',
-        }
-    },
-    computed: {
-        ...mapState(['userInfo', 'myStoreInfo']),
-
-    },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-
-            data.useFlag = this.formData.useFlag ? 'Y' : 'N';
-
-            this.$http.post({
-                url: this.formData.id ? '/customerService/update' : '/customerService/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/customerService/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background-color: #fff;
-    border: 1px solid #ebebeb;
-    padding: 20px;
-    border-radius: 4px;
-}
-</style>

src/main/vue/src/pagesPre/CustomerServices.vue

@@ -1,386 +0,0 @@
-<template>
-    <div class="container">
-
-        <div class="pageTitle">
-            客服管理
-            <el-button type="primary" class="add" size="mini" @click="goNext">添加客服</el-button>
-        </div>
-
-        <div class="content" style="min-height:450px">
-            <el-table class="table" :data="tableData" row-key="id" ref="table">
-                <el-table-column type="index" align="center">
-                </el-table-column>
-                <el-table-column prop="icon" label="头像" align="center">
-                    <template slot-scope="{row}">
-                        <img :src="row.icon+'?x-oss-process=image/resize,m_mfit,h_50,w_50'" style="border-radius:100%;width:50px;height:50px" />
-                    </template>
-
-                </el-table-column>
-
-                <el-table-column prop="serviceName" label="客服名" align="center">
-                </el-table-column>
-
-                <!-- <el-table-column v-if="isColumnShow('password')" prop="password" label="密码" min-width="100">
-            </el-table-column> -->
-
-                <el-table-column prop="username" label="登录名" align="center">
-                </el-table-column>
-
-                <el-table-column prop="useFlag" label="可用标识" align="center">
-                </el-table-column>
-
-                <el-table-column prop="statusFlag" label="状态" align="center">
-                </el-table-column>
-
-                <el-table-column prop="loginTime" :formatter="DateTimeFormatter" min-width="140" label="登录时间" align="center">
-                </el-table-column>
-                <el-table-column label="操作" align="center" fixed="right" min-width="150">
-                    <template slot-scope="scope">
-                        <el-button @click="editRow(scope.row)" type="primary" size="mini" plain>编辑</el-button>
-                        <el-button @click="deleteRow(scope.row)" type="danger" size="mini" plain>删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-
-        <div class="pagination-wrapper" v-if="totalNumber>10">
-
-            <el-pagination background @current-change="currentPageChange" :current-page="currentPage" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-        </div>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-
-export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 10,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '店铺',
-                    value: 'storeId',
-                    show: true
-                },
-                {
-                    label: '客服名',
-                    value: 'serviceName',
-                    show: true
-                },
-                {
-                    label: '密码',
-                    value: 'password',
-                    show: true
-                },
-                {
-                    label: '登录名',
-                    value: 'username',
-                    show: true
-                },
-                {
-                    label: '头像',
-                    value: 'icon',
-                    show: true
-                },
-                {
-                    label: '可用标识',
-                    value: 'useFlag',
-                    show: true
-                },
-                {
-                    label: '状态',
-                    value: 'statusFlag',
-                    show: true
-                },
-                {
-                    label: '登录时间',
-                    value: 'loginTime',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '店铺',
-                    value: 'store_id'
-                },
-                {
-                    label: '客服名',
-                    value: 'service_name'
-                },
-                {
-                    label: '密码',
-                    value: 'password'
-                },
-                {
-                    label: '登录名',
-                    value: 'username'
-                },
-                {
-                    label: '头像',
-                    value: 'icon'
-                },
-                {
-                    label: '可用标识',
-                    value: 'use_flag'
-                },
-                {
-                    label: '状态',
-                    value: 'status_flag'
-                },
-                {
-                    label: '登录时间',
-                    value: 'login_time'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-        }
-    },
-    computed: {
-        ...mapState(['myStoreInfo']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getData();
-        },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                searchKey: this.filter1,
-                advancedQuery: this.advancedQuerySearchKey,
-                orderByStr: this.orderByStr,
-                storeId:this.myStoreInfo.id
-            }
-
-            if (this.$route.query.column) {
-                var tempColumn = this.$route.query.column;
-                data[tempColumn.split(',')[1]] = tempColumn.split(',')[0];
-            }
-
-            this.$http.get({
-                url: '/customerService/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
-        },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        goNext() {
-            this.$router.push({
-                path: '/customerService',
-            })
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/customerService',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
-                }
-            })
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
-        },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
-        },
-        advancedQuery() {
-
-            this.advancedQuerySearchKey = '';
-
-            if (this.advancedQueryFields.length > 0) {
-
-                var templist = [];
-
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.advancedQuerySearchKey = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
-
-            this.orderByStr = '';
-
-            if (this.tableSortFields.length > 0) {
-
-                var templist = [];
-
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.orderByStr = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/customerService/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/customerService/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
-        },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
-
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    min-height: 598px;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-    padding: 24px;
-
-    .table {
-        border-top: 1px solid #ebebeb;
-        border-right: 1px solid #ebebeb;
-        border-left: 1px solid #ebebeb;
-        margin: 0 20px;
-        width: 95%;
-    }
-
-    .pageTitle {
-        font-size: 14px;
-        font-family: MicrosoftYaHei-Bold;
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 19px;
-        padding-bottom: 9px;
-        margin-bottom: 30px;
-        border-bottom: 1px solid #ebebeb;
-        position: relative;
-
-        .add {
-            position: absolute;
-            right: 20px;
-            top: -10px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/GuaranteeMoney.vue

@@ -1,169 +0,0 @@
-<template>
-    <el-form ref="GuaranteeMoney" :model="form" :rules="rules" label-width="100px" style="max-width:400px">
-        <el-alert v-if="formatMoney" title="企业店铺缴纳服务质保金，有助于提高自身的竞争力。" type="warning" show-icon :closable='false'>
-        </el-alert>
-        <el-form-item v-if="formatMoney" prop="money" label="需缴纳金额" style="margin-top:30px;">
-            <el-input v-model="form.money" style="width:146px"></el-input>
-            <span style='font-size:12px;color:rgba(253,149,1,1);'>注：{{formatMoney}}元起。</span>
-        </el-form-item>
-        <el-alert v-else title="店铺新开免质保金" type="success" style="margin-bottom:20px;" :closable='false'>
-        </el-alert>
-        <el-form-item label-width="0" prop='isRead' style="border-bottom:1px solid #ebebeb;">
-
-            <el-button type="text" style="margin-right:30px" @click="dialogVisible=true">* 开店协议</el-button>
-            <el-switch v-model="form.isRead"></el-switch>
-            <span v-if='form.isRead'>已阅读</span>
-        </el-form-item>
-        <div class="ps">
-            您已签署《开店协议》包含的诚信承诺经营书以及消费者保障协议，若发生服务与描述不符合，货物质量有问题，纠纷等情况，图途象有权动用质保金对买家进行补偿等处理。
-        </div>
-        <el-form-item label-width="0px" style="margin-top:58px;">
-            <el-button :loading="$store.state.fetchingData" v-if="formatMoney" type="primary" @click="onSave" style="width:400px">缴纳</el-button>
-
-        </el-form-item>
-        <el-form-item label-width="0px" style="margin-top:20px;" v-if="formatMoney==0">
-            <el-button @click="pass" style="width:400px;">提交申请</el-button>
-
-        </el-form-item>
-
-        <el-dialog title="开店协议" class="xieyi" :visible.sync="dialogVisible" width="636px">
-            <div class="window" v-html="agreement">
-
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false,form.isRead=false">不同意</el-button>
-                <el-button type="primary" @click="dialogVisible = false,form.isRead=true">同 意</el-button>
-            </span>
-        </el-dialog>
-    </el-form>
-
-</template>
-
-<script>
-import { mapState } from 'vuex'
-export default {
-    name: 'guaranteeMoney',
-    data() {
-        return {
-            form: {
-                money: '',
-                isRead: false
-            },
-            rules: {
-                money: [
-                    { required: true, message: '请输入缴纳金额', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请填写缴纳金额'));
-                            } else if (parseInt(value) >= this.formatMoney) {
-                                callback();
-                            }
-                            else {
-                                callback(new Error('缴纳金额' + this.formatMoney + '元起'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                isRead: [
-                    { required: true, message: '请阅读并同意开店协议', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请阅读并同意开店协议'));
-                            } else {
-                                callback();
-                            }
-                        }, trigger: 'blur'
-                    }
-                ]
-            },
-            dialogVisible: false,
-            systemConfig: {},
-            formatMoney: 0,
-            agreement: ''
-        }
-    },
-    computed: {
-        ...mapState(['userInfo']),
-    },
-    mounted() {
-        this.$http.get({
-            url: '/systemConfig/getOne?id=1',
-        }).then(res => {
-            if (res.success) {
-                if (res.data) {
-                    this.systemConfig = res.data
-                    this.formatMoney = this.userInfo.companyFlag == 'Y' ? res.data.companyDeposit : res.data.personalDeposit
-                }
-
-            }
-        })
-        this.$http.get({
-            url: '/shopAgreement/getOne?id=1',
-        }).then(res => {
-            if (res.success) {
-                if (res.data) {
-                    this.agreement = res.data.agreement
-                }
-
-            }
-        })
-    },
-    methods: {
-        onSave() {
-            this.$refs.GuaranteeMoney.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            this.$emit('nextStep')
-        },
-        pass() {
-            this.$refs.GuaranteeMoney.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        }
-
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.ps {
-    font-size: 12px;
-    font-family: PingFangSC-Regular;
-    font-weight: 400;
-    color: rgba(153, 153, 153, 1);
-    line-height: 17px;
-}
-
-.window {
-    max-height: 50vh;
-    overflow: auto;
-    border-top: 1px solid #ebebeb;
-    padding-top: 20px;
-}
-
-.title {
-    font-size: 14px;
-    color: #333;
-    line-height: 19px;
-    margin-top: 10px;
-}
-
-.content {
-    color: #666;
-    font-size: 12px;
-    line-height: 19px;
-    margin-top: 10px;
-}
-</style>

src/main/vue/src/pagesPre/Home.vue

@@ -0,0 +1,240 @@
+<template>
+    <div class="container" :style="{backgroundImage:'url('+require('../assetsPre/bg.png')+')'}">
+        <img class="topImg" @click="showBoxEve('展馆')" src="../assetsPre/img_bioati.png" alt="">
+
+        <div class="btns">
+            <div @click="showBoxEve('4号馆')" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">4号馆</div>
+            <div @click="showBoxEve('5号馆')" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">5号馆</div>
+            <div @click="showBoxEve('6号馆')" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">6号馆</div>
+            <div @click="showBoxEve('5A馆')" :style="{backgroundImage:'url('+require('../assetsPre/btu_xiao.png')+')'}" class="btn-item">5A馆</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="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!='展馆'">
+                            查看参展企业列表
+                        </div>
+                    </div>
+
+        </transition>
+        <audio style="display:none" ref='music' :src="message[nowMessage].voice" controls="controls">
+        </audio>
+    </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-08-11-27-16-eoxqhm99.mp3'
+                },
+                '5号馆': {
+                    title: '生态智造馆',
+                    content: '“生态智造馆”。在5号展馆，重点展示围绕智能制造构建的政策、科技、人才、园区、平台、技术等生态支撑系统。',
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                },
+                '6号馆': {
+                    title: '国际及综合应用馆',
+                    content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                },
+                '5A馆': {
+                    title: '登陆厅',
+                    content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
+                    voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
+                }
+            },
+            nowMessage: '展馆',
+            isVoice: false
+        }
+    },
+    watch: {
+        showBox() {
+            this.changeVoice(this.showBox)
+        }
+    },
+    methods: {
+        goBack() {
+            this.$router.go(-1);
+        },
+        showBoxEve(str) {
+            this.nowMessage = str
+            if (str == '5A馆') {
+                this.goNext()
+                return
+            }
+            this.showBox = true
+            // this.$refs.music.play();
+
+
+        },
+        changeVoice(value) {
+            if (value) {
+                this.$refs.music.play();
+                this.isVoice = true;
+            }
+            else {
+                this.$refs.music.pause();
+                this.isVoice = false;
+            }
+        },
+        goNext() {
+            this.$router.push({
+                name: 'list',
+                query: {
+                    title: 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;
+        }
+    }
+}
+
+.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;
+    }
+
+    .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>

src/main/vue/src/pagesPre/Index.vue

@@ -1,771 +0,0 @@
-<template>
-    <div class="conatiner" id='allConatiner'>
-        <el-carousel class="banner swiper" :class="[bannerList.length==1?'noButton':'']" height="420px" :interval="4000">
-            <template v-for="item in bannerList">
-                <el-carousel-item :style="{backgroundImage:'url('+item.imageUrl+')'}">
-                    <a v-if="item.url" :href="item.url"></a>
-                </el-carousel-item>
-            </template>
-
-        </el-carousel>
-
-        <div class="content" id='content'>
-            <div class="content-step">
-                <div class="step-item">
-                    <div class="num">1</div>
-                    <div class="text">
-                        <div class="title">选择所需服务</div>
-                        <div class="subTitle">100+服务项目</div>
-                    </div>
-                    <img src="../assetsPre/more.png" alt="">
-                </div>
-                <div class="step-item">
-                    <div class="num">2</div>
-                    <div class="text">
-                        <div class="title">服务商对接服务</div>
-                        <div class="subTitle">专人客服对接办理</div>
-                    </div>
-                    <img src="../assetsPre/more.png" alt="">
-                </div>
-                <div class="step-item">
-                    <div class="num">3</div>
-                    <div class="text">
-                        <div class="title">在线下单支付</div>
-                        <div class="subTitle">款项支付到平台</div>
-                    </div>
-                    <img src="../assetsPre/more.png" alt="">
-                </div>
-                <div class="step-item">
-                    <div class="num">4</div>
-                    <div class="text">
-                        <div class="title">验收服务</div>
-                        <div class="subTitle">验收后商家才能收到款项</div>
-                    </div>
-                </div>
-
-            </div>
-
-            <div class="content-box" :id="'box'+index" v-for="(item,index) in serviceType">
-                <div class="box-top">
-                    <div class="title">
-                        {{item.shortName}}
-                    </div>
-                    <div class="subTitle">
-                        {{item.description}}
-                    </div>
-                    <router-link class='more' :to='{name:"business",query:{serviceId:(index+1)}}'>查看更多 ></router-link>
-                </div>
-                <div class="box-content">
-                    <div class="box-left" :style="{backgroundImage:'url('+item.image+')'}"></div>
-                    <div class="box-right">
-                        <div class="box-right-top" :style="{backgroundColor:item.color}">
-                            <div class="box-ad">
-                                <span>消息提醒：{{allAd[serviceBanner[index]]}}</span>
-                            </div>
-                            <div class="box-hot">热门{{item.shortName}}</div>
-                            <img src="../assetsPre/hot.png" alt="">
-                        </div>
-                        <div class="box-right-content">
-                            <div class="box-goodsList" v-loading="loading">
-
-                                <goods-little v-for="(todo,todoIndex) in item.homeStoreInfoList" :info='todo' style="padding-left:30px;display:inline-block"></goods-little>
-
-                            </div>
-                            <div class="box-rankList" v-loading="loading">
-
-                                <router-link :to='{name:"shop",query:{id:todo.id,breHref:breHref}}' class="box-rankItem" v-for="(todo,todoIndex) in item.hotStoreInfoList">
-                                    <div class="num" :style="{backgroundImage:'url('+(todoIndex<3?require('../assetsPre/num_bg_pre.png'):require('../assetsPre/num_bg.png'))+')'}">{{todoIndex+1}}</div>
-                                    <div class="name">{{todo.storeName}}</div>
-                                </router-link>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="quickMenu" id="quickMenu" :style="{position:quickFixed?'fixed':'absolute'}">
-                <div class="quickTop">
-                    <img src="../assetsPre/quckmenu.png" alt="">
-                </div>
-                <div class="quck-item" @click="goMenu(index)" :class="{active:(nowShort==index)}" v-for="(item,index) in serviceType">
-                    <span>{{item.shortName}}</span>
-                </div>
-
-                <img class="sanjiao" :style="{top:quickTop}" src="../assetsPre/quckmenu_sanjiao.png" alt="">
-            </div>
-
-            <div class="newRight" id='newRight' :style="{position:quickFixed?'fixed':'absolute'}">
-                <div class="newShop" v-if="!hideShow1" style="margin-bottom:10px">
-                    <div class="newShop-name">
-                        <img src="../assetsPre/newShop.png" alt="">
-                        <span>新入驻</span>
-                        <i class="el-icon-close" id='close1' @click="showHide(1)"></i>
-                    </div>
-                    <div class="newShop-list">
-                        <router-link :to='{name:"shop",query:{id:item.id,breHref:breHref}}' class="newShop-item" v-for="item in newShop">
-                            <span>{{item.storeName}}</span>
-                            <span style="color:#1BB8AC">{{forNow(item.createTime)}}</span>
-                            <span>入住了平台</span>
-                        </router-link>
-                    </div>
-                </div>
-
-                <div class="newShop" v-if="!hideShow2">
-                    <div class="newShop-name">
-                        <img src="../assetsPre/newInfo.png" alt="">
-                        <span>新订单</span>
-                        <i class="el-icon-close" id='close1' @click="showHide(2)"></i>
-                    </div>
-
-                    <div class="newShop-list">
-                        <div class="newShop-item" v-for="item in orderList">
-                            <span>{{item.userInfo?item.userInfo.nickname:''}}</span>
-                            <span style="color:#1BB8AC">{{forNow(item.createTime)}}</span>
-                            <span>提交了订单</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-        </div>
-
-        <!-- <div class="minRight">
-            <el-tooltip v-if="hideShow1" content="新入驻" placement="left" effect="light">
-                <div class="minRight-item" @click="hideShow1=false">
-                    <img src="../assetsPre/newShop.png" alt="">
-                </div>
-            </el-tooltip>
-
-            <el-tooltip v-if="hideShow2" content="新订单" placement="left" effect="light">
-                <div class="minRight-item" @click="hideShow2=false">
-                    <img src="../assetsPre/newInfo.png" alt="">
-                </div>
-            </el-tooltip>
-        </div> -->
-
-        <menuFoot></menuFoot>
-
-    </div>
-</template>
-
-<script>
-var newShopLeft = 100;
-window.onresize = function () {
-    // console.log(document.getElementById('container').scrollTop)
-    if (document.getElementById('container')) {
-        if (document.getElementById('container').scrollTop < 600) {
-            if (document.getElementById('allConatiner')) {
-                if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                    document.getElementById('newRight').style.right = 0 - (document.getElementById('allConatiner').offsetWidth - 1390) / 2 + 'px'
-                }
-                else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-                    document.getElementById('newRight').style.right = 0
-                }
-                else {
-                    document.getElementById('newRight').style.right = '-180px'
-
-                }
-            }
-        }
-        else {
-            document.getElementById('newRight').style.top = '100px'
-            if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                document.getElementById('newRight').style.right = 0
-            }
-            else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-                document.getElementById('newRight').style.right = 0
-            }
-            else {
-                document.getElementById('newRight').style.right = '90px'
-
-            }
-        }
-    }
-
-
-};
-import goodsLittle from '../components/GoodsLittle'
-import menuFoot from '../pagesPre/MenuFoot'
-import { mapState } from 'vuex'
-export default {
-    name: 'home',
-    data() {
-        return {
-            newShopLeft,
-            hideShow1: false,
-            hideShow2: false,
-            nowShort: 0,
-            quickFixed: false,
-            bannerList: [],
-            serviceGoods: {},
-            loading: true,
-            newShop: [],
-            orderList: [],
-            allAd: {},
-            serviceBanner: ["2", "4", "5", "6", "7", "17"]
-        }
-    },
-    mounted() {
-
-        this.$http.get({
-            url: '/storeInfo/all',
-            data: {
-
-                orderByStr: 'create_time_,desc',
-                useFlag: 'Y',
-                limitNum: 4
-            }
-        }).then(res => {
-            if (res.success) {
-                this.newShop = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/userOrder/all',
-            data: {
-                limitNum: 4
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-
-        })
-
-
-        setTimeout(() => {
-            if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                console.log('a')
-                document.getElementById('newRight').style.right = 0 - (document.getElementById('allConatiner').offsetWidth - 1390) / 2 + 'px'
-            }
-            else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-                console.log('b')
-                document.getElementById('newRight').style.right = 0
-            }
-            else {
-                console.log('c')
-                document.getElementById('newRight').style.right = '-180px'
-
-            }
-
-            this.loading = false
-
-
-
-        }, 500)
-
-
-
-        this.$http.get({
-            url: '/bannerInfo/all',
-            data: {
-                location: '1'
-            }
-        }).then(res => {
-            if (res.success) {
-                this.bannerList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/bannerInfo/all',
-            data: {}
-        }).then(res => {
-            if (res.success) {
-                var jsonp = {}
-                res.data.forEach(item => {
-                    jsonp[item.location] = item.subtitle
-                })
-                this.allAd = jsonp
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-
-        var list = [{
-            name: '首页',
-            href: '/'
-        }]
-
-
-
-        // this.$store.commit('updateHrefHistory', list)
-    },
-    computed: {
-        ...mapState(['serviceType']),
-        quickTop() {
-            var val = 65
-            val = this.nowShort * 50 + 65
-            return val + 'px'
-        },
-        breHref() {
-            var str = '首页,/index_;'
-            if (this.$route.name == 'business') {
-                str += document.title + ',' + this.$route.name + '_;'
-            }
-            return str
-        }
-    },
-    methods: {
-        // getTime(str) {
-        //     var time = ''
-        //     if (str) {
-        //         // time = moment(str).fromNow()
-        //         time= distanceInWordsToNow(new Date(str), { locale: cn, addSuffix: true })
-        //     }
-        //     return time
-        // },
-        showHide(style) {
-            if (style == 1) {
-                this.hideShow1 = true
-                this.$emit('showHide', { index: 1, hide: true })
-            }
-            else {
-                this.hideShow2 = true
-                this.$emit('showHide', { index: 2, hide: true })
-            }
-        },
-        goBanner(banner) {
-            console.log(banner)
-            if (banner) {
-                this.$router.push(banner)
-            }
-        },
-        scrollMenu() {
-            // console.log(document.getElementById('content').offsetLeft)
-            if (document.getElementById('container').scrollTop >= 600) {
-                this.quickFixed = true
-                document.getElementById('quickMenu').style.left = document.getElementById('content').offsetLeft + 'px'
-            }
-            else {
-                this.quickFixed = false
-                document.getElementById('quickMenu').style.left = 0
-            }
-
-            // console.log(document.getElementById('box0').offsetTop,document.getElementById('container').scrollTop)
-
-            for (var i = 0; i < this.serviceType.length; i++) {
-                if (document.getElementById('container').scrollTop >= document.getElementById('box' + i).offsetTop + (document.body.clientHeight / 3)) {
-                    this.nowShort = i
-                }
-            }
-
-            if (this.nowShort == -1) {
-                this.nowShort = 0
-            }
-
-            console.log(this.quickFixed)
-            if (this.quickFixed) {
-                document.getElementById('newRight').style.top = '100px'
-                if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                    document.getElementById('newRight').style.right = 0
-                }
-                else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-                    document.getElementById('newRight').style.right = 0
-                }
-                else {
-                    document.getElementById('newRight').style.right = '90px'
-
-                }
-            }
-            else {
-                if (document.getElementById('allConatiner')) {
-                    if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                        document.getElementById('newRight').style.right = 0 - (document.getElementById('allConatiner').offsetWidth - 1390) / 2 + 'px'
-                    }
-                    else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-                        document.getElementById('newRight').style.right = 0
-                    }
-                    else {
-                        document.getElementById('newRight').style.right = '-180px'
-
-                    }
-                }
-            }
-
-
-        },
-        goMenu(index) {
-            document.getElementById('container').scrollTop = document.getElementById('box' + index).offsetTop + 730 - 250
-        }
-    },
-    activated() {
-        this.quickFixed = false
-        document.getElementById('quickMenu').style.left = 0
-
-    },
-    components: {
-        goodsLittle, menuFoot
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.conatiner {
-    // min-width: 1190px;
-}
-.banner {
-    height: 420px;
-    width: 100%;
-    background-size: cover;
-    background-repeat: no-repeat;
-    background-position: center center;
-    min-width: 1196px;
-}
-
-.content {
-    width: 100%;
-    max-width: 1390px;
-    margin: auto;
-    position: relative;
-    .content-step {
-        width: 1196px;
-        height: 80px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        margin: 30px auto 0;
-
-        .step-item {
-            display: inline-block;
-            width: 24%;
-            height: 100%;
-
-            .num {
-                width: 40px;
-                height: 40px;
-                border: 1px solid rgba(11, 158, 192, 1);
-                border-radius: 100%;
-                font-size: 20px;
-                font-family: MicrosoftYaHei;
-                color: rgba(11, 158, 192, 1);
-                line-height: 40px;
-                text-align: center;
-                font-weight: bold;
-                float: left;
-                margin: 20px 0 20px 50px;
-            }
-
-            .text {
-                float: left;
-                margin: 0 19px;
-                padding: 20px 0;
-
-                .title {
-                    font-size: 14px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(11, 158, 192, 1);
-                    line-height: 19px;
-                    font-weight: bold;
-                }
-
-                .subTitle {
-                    font-size: 12px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(153, 153, 153, 1);
-                    line-height: 16px;
-                    margin-top: 4px;
-                }
-            }
-
-            img {
-                width: 16.8px;
-                height: 29px;
-                display: block;
-                float: right;
-                margin: 27px 0;
-            }
-        }
-    }
-
-    .content-box {
-        overflow: hidden;
-        width: 1190px;
-        margin: 40px auto 0;
-        background-color: #fff;
-        border: 1px solid rgba(234, 234, 234, 1);
-        .box-top {
-            padding: 8px 10px 11px 20px;
-            overflow: hidden;
-            .title {
-                font-size: 24px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 31px;
-                float: left;
-            }
-
-            .subTitle {
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(102, 102, 102, 1);
-                line-height: 16px;
-                margin: 13px 8px 2px;
-                float: left;
-            }
-
-            .more {
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(153, 153, 153, 1);
-                line-height: 16px;
-                float: right;
-                margin: 13px 0px 2px;
-            }
-        }
-
-        .box-content {
-            overflow: hidden;
-            height: 500px;
-            width: 100%;
-            .box-left {
-                background: rgba(40, 208, 235, 1);
-                width: 230px;
-                float: left;
-                height: 100%;
-            }
-            .box-right {
-                width: 960px;
-                height: 100%;
-                float: right;
-                .box-right-top {
-                    height: 40px;
-                    overflow: hidden;
-                    position: relative;
-                    .box-ad {
-                        font-size: 14px;
-                        font-family: MicrosoftYaHei;
-                        color: rgba(255, 255, 255, 1);
-                        line-height: 19px;
-                        margin: 11px 0;
-                        float: left;
-                        width: 716px;
-
-                        span {
-                            margin-left: 30px;
-                        }
-                    }
-
-                    .box-hot {
-                        font-size: 14px;
-                        font-family: MicrosoftYaHei;
-                        font-weight: bold;
-                        color: rgba(255, 255, 255, 1);
-                        line-height: 19px;
-                        margin: 11px 26px;
-                    }
-
-                    img {
-                        width: 29px;
-                        height: 35px;
-                        position: absolute;
-                        right: 0;
-                        top: 0;
-                    }
-                }
-
-                .box-right-content {
-                    overflow: hidden;
-                    padding-top: 14px;
-                    height: 484px;
-
-                    .box-goodsList {
-                        font-size: 0;
-                        width: 716px;
-                        float: left;
-                        height: 100%;
-                    }
-                }
-
-                .box-rankList {
-                    width: 241px;
-                    float: right;
-                    border-left: 1px solid #ebebeb;
-                    height: 100%;
-
-                    .box-rankItem {
-                        margin-left: 26px;
-                        font-size: 0;
-                        overflow: hidden;
-                        margin-top: 12px;
-                        margin-bottom: 6px;
-                        display: block;
-                        .num {
-                            width: 15px;
-                            height: 20px;
-                            background-size: contain;
-                            font-size: 10px;
-                            font-family: MicrosoftYaHei;
-                            color: rgba(255, 255, 255, 1);
-                            line-height: 14px;
-                            font-weight: bold;
-                            text-align: center;
-                            padding-left: 3px;
-                            line-height: 20px;
-                            float: left;
-                        }
-                        .name {
-                            font-size: 12px;
-                            font-family: MicrosoftYaHei;
-                            color: rgba(153, 153, 153, 1);
-                            line-height: 19px;
-                            font-weight: bold;
-                            margin-left: 10px;
-                            width: 180px;
-                            overflow: hidden;
-                            text-overflow: ellipsis;
-                            white-space: nowrap;
-                            float: left;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    .quickMenu {
-        position: absolute;
-        top: 120px;
-        left: 0px;
-        background-color: #fff;
-
-        .quickTop {
-            background: rgba(255, 255, 255, 1);
-            img {
-                width: 55px;
-                height: 45px;
-                display: block;
-                margin: auto;
-            }
-        }
-
-        .quck-item {
-            width: 55px;
-            height: 50px;
-            background: rgba(255, 255, 255, 1);
-            border: 1px solid rgba(234, 234, 234, 1);
-            text-align: center;
-            border-top: 0;
-            line-height: 51px;
-            cursor: pointer;
-            span {
-                vertical-align: middle;
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(153, 153, 153, 1);
-                line-height: 16px;
-                max-width: 24px;
-            }
-
-            &.active {
-                // border-color: #0b9ec0;
-                border: 1px solid #81bcd4;
-                span {
-                    color: #0b9ec0;
-                }
-            }
-        }
-
-        .sanjiao {
-            position: absolute;
-            right: -8px;
-            top: 65px;
-            width: 9px;
-            height: 11px;
-            transition: top ease-in-out 0.3s;
-        }
-    }
-
-    .newRight {
-        position: absolute;
-        right: -180px;
-        top: 0;
-    }
-
-    .newShop {
-        width: 250px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-
-        .newShop-name {
-            border-bottom: 1px solid rgba(234, 234, 234, 1);
-            height: 40px;
-            line-height: 40px;
-            img {
-                width: 20px;
-                height: 18px;
-                vertical-align: middle;
-                margin: 0 7px 0 12px;
-            }
-
-            span {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-                vertical-align: middle;
-            }
-
-            i {
-                float: right;
-                line-height: 40px;
-                padding: 0 10px;
-                font-size: 18px;
-                cursor: pointer;
-            }
-        }
-        .newShop-list {
-            padding-left: 25px;
-
-            .newShop-item {
-                line-height: 33px;
-                height: 33px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                display: block;
-                span {
-                    vertical-align: middle;
-                    font-size: 12px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(102, 102, 102, 1);
-                    line-height: 16px;
-                }
-                &:not(:last-child) {
-                    border-bottom: 1px solid rgba(234, 234, 234, 1);
-                }
-            }
-        }
-    }
-}
-
-.minRight {
-    position: absolute;
-    top: 680px;
-    right: 0;
-    background-color: #fff;
-    border: 1px solid #ebebeb;
-
-    .minRight-item {
-        padding: 10px;
-        img {
-            width: 20px;
-            height: 18px;
-            display: block;
-            cursor: pointer;
-        }
-
-        &:not(:last-child) {
-            border-bottom: 1px solid #ebebeb;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/Join.vue

@@ -1,174 +0,0 @@
-<template>
-    <div class="conatiner">
-        <el-carousel class="swiper banner" :class="[bannerList.length==1?'noButton':'']" height="220px" :interval="4000">
-            <template v-for="item in bannerList">
-                <el-carousel-item :style="{backgroundImage:'url('+item.imageUrl+')'}">
-                    <a v-if="item.url" :href="item.url"></a>
-                </el-carousel-item>
-            </template>
-
-        </el-carousel>
-
-        <div class="content">
-            <div class="name">
-                <div class="kuai"></div>
-                <span>加入我们</span>
-            </div>
-
-            <div class="content-content">
-
-                <div class="content-text">
-                    <div v-html='joinInfo.manifesto'>
-
-                    </div>
-                    邮箱：{{joinInfo.email}}
-                    <br/> 联系方式：{{joinInfo.telephone}}
-                </div>
-
-                <div class="line"></div>
-
-                <div class="content-img">
-                    <img src="../assetsPre/join.png" alt="">
-                    <div class="button" @click="goNext">诚聘英才</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'home',
-    data() {
-        return {
-            joinInfo: {},
-            bannerList: []
-        }
-    },
-    mounted() {
-        this.$http.get({
-            url: '/joinUs/getOne',
-            data: {
-                id: 1
-            }
-        }).then(res => {
-            if (res.success) {
-                this.joinInfo = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/bannerInfo/all',
-            data: {
-                location: 14
-            }
-        }).then(res => {
-            if (res.success) {
-                this.bannerList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-    },
-    computed: {
-    },
-    methods: {
-        goNext(){
-            window.open(this.joinInfo.zhaopin)
-        }
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.banner {
-    width: 1191px;
-    height: 220px;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    margin: auto;
-}
-
-.content {
-    width: 1146px;
-    margin: 20px auto;
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(234, 234, 234, 1);
-    padding: 0 22px;
-    .name {
-        height: 36px;
-        line-height: 36px;
-        border-bottom: 1px solid #ebebeb;
-        .kuai {
-            width: 7px;
-            height: 15px;
-            background: rgba(11, 158, 192, 1);
-            display: inline-block;
-            vertical-align: middle;
-        }
-
-        span {
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-left: 13px;
-            vertical-align: middle;
-        }
-    }
-    .content-content {
-        overflow: hidden;
-        padding: 30px 0;
-        .content-img {
-            width: 383px;
-            height: 248px;
-            background-position: center center;
-            background-repeat: no-repeat;
-            background-size: cover;
-            display: inline-block;
-            vertical-align: middle;
-
-            img {
-                width: 137px;
-                height: 99px;
-                display: block;
-                margin: auto;
-            }
-
-            .button {
-                width: 149px;
-                height: 50px;
-                border: 1px solid rgba(11, 158, 192, 1);
-                font-size: 24px;
-                font-family: PingFangSC-Regular;
-                color: rgba(11, 158, 192, 1);
-                line-height: 50px;
-                text-align: center;
-                margin: 37px auto;
-                cursor: pointer;
-            }
-        }
-
-        .line {
-            width: 1px;
-            height: 248px;
-            display: inline-block;
-            vertical-align: middle;
-            background-color: #eaeaea;
-        }
-        .content-text {
-            width: 720px;
-            display: inline-block;
-            vertical-align: middle;
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 30px;
-            padding-left: 30px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/List.vue

@@ -0,0 +1,217 @@
+<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="opacity:0" 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.$refs.music.play();
+        },
+        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;
+
+    .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>

src/main/vue/src/pagesPre/Login.vue

@@ -1,355 +0,0 @@
-<template>
-    <div class="container">
-        <logo-head></logo-head>
-        <div class="loginCenter" :style="{backgroundImage:'url('+require('../assetsPre/loginBanner.jpg')+')'}">
-            <div class="login">
-                <div class="login-wrapper" @keyup.enter="login">
-                    <div class="tabLine" :style="{left:activeName=='first'?'33px':'177px'}"></div>
-                    <el-tabs class="myTab" v-model="activeName">
-
-                        <el-tab-pane label="用户名登陆" name="first">
-                            <el-form :model="userInfo" style="width: 288px;margin-top:27px;" ref="form">
-                                <el-form-item prop="username">
-                                    <el-input v-model="userInfo.username" placeholder="用户名/手机号/邮箱">
-
-                                        <template slot="prepend">
-                                            <div style="padding: 0 12px">
-                                                <img style="width:19px;" src="../assetsPre/yonghuming.png" alt="">
-                                            </div>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                                <el-form-item prop="password">
-                                    <el-input v-model="userInfo.password" placeholder="密码" type="password">
-
-                                        <template slot="prepend">
-                                            <div style="padding: 0 15px">
-                                                <img style="width:13.6px;" src="../assetsPre/password.png" alt="">
-                                            </div>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                                <el-form-item class='isRemenber' label="" style="line-height:16px;">
-                                    <el-checkbox v-model="rememberMe">记住我</el-checkbox>
-                                    <router-link :to="{name:'backPassword'}">忘记密码？</router-link>
-                                </el-form-item>
-                                <el-form-item>
-                                    <el-button :loading="loading" @click="login" type="color" style="width: 100%;">登录</el-button>
-                                </el-form-item>
-
-                            </el-form>
-                        </el-tab-pane>
-                        <el-tab-pane label="验证码登陆" name="second">
-                            <el-form :model="userInfo" style="width: 288px;margin-top:27px;" ref="form">
-                                <el-form-item prop="phone">
-                                    <el-input v-model="userInfo.phone" placeholder="手机号">
-
-                                        <template slot="prepend">
-                                            <div style="padding: 0 12px">
-                                                <img style="width:19px;" src="../assetsPre/yonghuming.png" alt="">
-                                            </div>
-                                        </template>
-                                    </el-input>
-                                </el-form-item>
-                                <el-form-item prop="code">
-                                    <el-input v-model="userInfo.code" placeholder="验证码" type="text">
-
-                                        <template slot="prepend">
-                                            <div style="padding: 0 15px">
-                                                <img style="width:13.6px;" src="../assetsPre/password.png" alt="">
-                                            </div>
-                                        </template>
-                                        <template slot='append'>
-                                            <div class="send" :disabled='isSend' @click="sendCode">{{isSend?'已发送('+num+')S':'发送验证码'}}</div>
-                                        </template>
-                                    </el-input>
-
-                                </el-form-item>
-                                <el-form-item class='isRemenber' label="" style="line-height:16px;">
-                                    <el-checkbox v-model="rememberMe">记住我</el-checkbox>
-                                    <router-link :to="{name:'backPassword'}">忘记密码？</router-link>
-                                </el-form-item>
-                                <el-form-item>
-                                    <el-button :loading="loading" @click="login" type="color" style="width: 100%;">登录</el-button>
-                                </el-form-item>
-
-                            </el-form>
-                        </el-tab-pane>
-                    </el-tabs>
-                    <div class="regest">
-                        <router-link :to="{name:'register'}">没有账户，立即注册>></router-link>
-                    </div>
-
-                </div>
-            </div>
-
-        </div>
-
-        <logo-foot :isBottom='false'></logo-foot>
-    </div>
-</template>
-<script>
-import logoHead from '../pagesPre/LogoHead'
-import logoFoot from '../pagesPre/LogoFoot'
-import { mapState } from 'vuex'
-export default {
-    data() {
-        return {
-            rememberMe: false,
-            loading: false,
-            userInfo: {
-                username: '',
-                password: '',
-                phone: '',
-                code: '',
-            },
-            activeName: 'first',
-            realCode: '',
-            num: 61,
-            isSend: false,
-        }
-    },
-    computed: {
-        ...mapState(['brefName', 'msgCode']),
-    },
-
-    methods: {
-        login() {
-            this.$refs.form.validate(valid => {
-                if (this.activeName == 'first') {
-                    if (!this.userInfo.username || !this.userInfo.password) {
-                        this.$message({
-                            message: '用户名或密码不能为空！',
-                            type: 'warning'
-                        });
-                        return
-                    }
-                    this.loading = true;
-                    this.$http.post({
-                        url: '/auth/login',
-                        data: {
-                            username: this.userInfo.username,
-                            password: this.userInfo.password,
-                            remember: this.rememberMe
-                        }
-                    }).then(res => {
-                        this.loading = false;
-                        if (res.success) {
-                            this.$message.success('登录成功')
-                            if (this.$route.query.next) {
-                                this.$router.replace({
-                                    name: this.$route.query.next
-                                })
-                                return
-                            }
-                            if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
-
-                                history.back()
-
-                            }
-                            else {
-                                this.$router.replace({
-                                    name: 'index'
-                                })
-                            }
-                        } else {
-                            this.$message.error('用户名或密码错误');
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                    })
-                }
-                else {
-                    if (!this.userInfo.phone || !this.userInfo.code) {
-                        this.$message({
-                            message: '手机号验证码不能为空',
-                            type: 'warning'
-                        });
-                        return
-                    }
-                    if (!this.realCode) {
-                        this.$message({
-                            message: '验证码获取失败，请重新发送',
-                            type: 'warning'
-                        });
-                        return
-                    }
-                    this.loading = true;
-                    this.$http.post({
-                        url: '/auth/loginSms',
-                        data: {
-                            phone: this.userInfo.phone,
-                            code: this.userInfo.code,
-                            remember: this.rememberMe,
-                        }
-                    }).then(res => {
-                        this.loading = false;
-                        if (res.success) {
-                            this.$message.success('登录成功')
-                            if (this.$route.query.next) {
-                                this.$router.replace({
-                                    name: this.$route.query.next
-                                })
-                                return
-                            }
-                            if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
-
-                                history.back()
-
-                            }
-                            else {
-                                this.$router.replace({
-                                    name: 'index'
-                                })
-                            }
-                        } else {
-                            this.$message.error('用户名或密码错误');
-                        }
-                    }).catch(() => {
-                        this.loading = false;
-                    })
-                }
-            })
-        },
-        sendCode() {
-            if (this.isSend) {
-                return
-            }
-            if (!this.checkPhone(this.userInfo.phone)) {
-                this.$message.error('手机号格式错误');
-                return
-            }
-
-            // this.isSend = true
-            // this.getTime()
-            this.checkHas({ phone: this.userInfo.phone }).then((result) => {
-
-                if (result) {
-                    this.sendMeg(this.userInfo.phone, this.msgCode['登录确认']).then((json) => {
-                        if (json.success) {
-                            this.$message.success('发送成功')
-                            this.realCode = json.data
-                            this.isSend = true
-                            this.getTime()
-                        }
-                        else {
-                            this.$message.warning(json.error)
-                        }
-                    })
-                }
-                else {
-                    this.$message.warning('该手机号未绑定用户')
-                }
-            })
-        },
-        sendMessage() {
-            this.checkHas({ phone: this.userInfo.phone }).then((result) => {
-                console.log(result)
-                if (result) {
-                    // this.sendMeg(this.userInfo.phone, this.msgCode['登录确认']).then((json) => {
-                    //     if (json.success) {
-
-                    //         this.$message.success('验证码发送成功！');
-                    //         this.realCode = json.data
-                    //         this.isSend = true
-                    //         this.getTime()
-                    //     }
-                    //     else {
-                    //         this.$message.warning(json.error)
-                    //     }
-                    // })
-                }
-                else {
-                    this.$message.warning('该手机号未绑定用户')
-                }
-            })
-
-        },
-        getTime() {
-            if (this.num > 0) {
-                this.num--
-                setTimeout(() => {
-                    this.getTime()
-                }, 1000);
-            }
-            else {
-                this.num = 61
-                this.isSend = false
-            }
-        }
-    },
-    components: {
-        logoHead, logoFoot
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    height: 100%;
-    background-color: #fff;
-    min-width: 1190px;
-}
-.loginCenter {
-    overflow: hidden;
-    padding: 96px 0 129px;
-    background-repeat: no-repeat;
-    background-size: cover;
-    width: 100%;
-    position: relative;
-
-    .login {
-        width: 1138px;
-        overflow: hidden;
-        margin: auto;
-    }
-
-    .login-wrapper {
-        padding: 0 33px;
-        width: 288px;
-        height: 375px;
-        background: rgba(255, 255, 255, 1);
-        box-shadow: 0px 2px 3px 2px rgba(4, 115, 165, 0.47);
-        border-radius: 2px;
-        float: right;
-    }
-}
-
-.isRemenber {
-    a {
-        float: right;
-        font-size: 12px;
-        color: rgba(11, 158, 192, 1);
-        line-height: 16px;
-    }
-}
-
-.regest {
-    height: 40px;
-    background: rgba(238, 242, 243, 1);
-    border-radius: 2px;
-    // padding: 0 26px;
-    position: absolute;
-    width: 100%;
-    bottom: 0;
-    left: 0;
-
-    a {
-        font-size: 12px;
-        font-family: MicrosoftYaHei;
-        color: rgba(251, 110, 8, 1);
-        line-height: 40px;
-        text-decoration: none;
-        float: right;
-        margin-right: 26px;
-    }
-}
-
-.send {
-    height: 100%;
-    // background-color: #0b9ec0;
-    font-size: 12px;
-    color: #000;
-    padding: 0 10px;
-    cursor: pointer;
-}
-</style>

src/main/vue/src/pagesPre/LogoFoot.vue

@@ -1,206 +0,0 @@
-<template>
-    <div class='FootBox'>
-        <div class="FootContent" :class="{FootBottom:isBottom}">
-            <div class="Foot">
-                <div class="foot-top">
-                    <ul class='short-enter'>
-                        <li>
-                            <router-link :to='{name:"index"}'>首页</router-link>
-                        </li>
-                        <li v-for="(item,index) in serviceType">
-                            <router-link :to='{name:"business",query:{serviceId:(index+1)}}' class="service-val">{{item.shortName}}</router-link>
-                        </li>
-                        <!-- <li>
-                            <a href="#">修图商</a>
-                        </li>
-                        <li>
-                            <a href="#">影楼|样片</a>
-                        </li>
-                        <li>
-                            <a href="#">营销</a>
-                        </li>
-                        <li>
-                            <a href="#">周边</a>
-                        </li> -->
-                        <li>
-                            <router-link :to='{name:"contact"}'>联系我们</router-link>
-                        </li>
-                        <li>
-                            <router-link :to='{name:"join"}'>加入我们</router-link>
-                        </li>
-                        <li>
-                            <router-link :to='{name:"about"}'>关于我们</router-link>
-                        </li>
-                    </ul>
-
-                    <div class="foot-right" v-if="ICP.length>0">
-                        <a href='javascript:void(0)' @click="goHref(ICP[0].url)">
-                            {{ICP[0].linkName}}
-                        </a>
-                    </div>
-                </div>
-                <div class="foot-bottom">
-                    <ul>
-                        <li>
-                            友情链接
-                        </li>
-                        <li v-for="item in linkList">
-                            <a href='javascript:void(0)' @click="goHref(item.url)">{{item.linkName}}</a>
-                        </li>
-
-                    </ul>
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-</template>
-
-<script>
-
-import { mapState } from 'vuex'
-export default {
-    props: {
-        isBottom: {
-            type: Boolean,
-            default: true
-        }
-    },
-    name: 'page404',
-    data() {
-        return {
-            linkList: [],
-            ICP: []
-        }
-    },
-    computed: {
-        ...mapState(['serviceType']),
-    },
-    mounted() {
-        // if (this.serviceType.length == 0) {
-        //     this.$http.get({
-        //         url: '/serviceType/home',
-        //         data: {}
-        //     }).then(res => {
-        //         if (res.success) {
-        //             this.$store.commit('updateServiceType', res.data)
-
-        //         }
-        //     }).catch(e => {
-        //         console.log(e)
-        //     })
-
-        // }
-        this.$http.get({
-            url: '/quickLinks/all',
-            data: {
-                typeFlag: 1
-            }
-        }).then(res => {
-            if (res.success) {
-                this.linkList = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/quickLinks/all',
-            data: {
-                typeFlag: 3
-            }
-        }).then(res => {
-            if (res.success) {
-                this.ICP = res.data
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-
-    },
-    methods: {
-        goHref(href) {
-            window.open(href)
-        }
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.FootBox {
-    height: 104px;
-    width: 100%;
-}
-.FootContent {
-    background: rgba(255, 255, 255, 1);
-}
-.Foot {
-    width: 1183px;
-    margin: auto;
-    overflow: hidden;
-
-    .foot-top {
-        overflow: hidden;
-        padding: 19px 0;
-        border-bottom: 1px solid rgba(233, 233, 233, 1);
-        .short-enter {
-            float: left;
-            li {
-                display: inline-block;
-                padding-right: 12px;
-                margin-right: 10px;
-                a {
-                    font-size: 12px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(153, 153, 153, 1);
-                    line-height: 12px;
-                    display: block;
-                    color: #999;
-                    text-decoration: none;
-                }
-
-                &:not(:last-child) {
-                    border-right: 1px solid #999;
-                }
-            }
-        }
-        .foot-right {
-            float: right;
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            color: rgba(153, 153, 153, 1);
-            line-height: 16px;
-
-            a {
-                color: rgba(153, 153, 153, 1);
-            }
-        }
-    }
-
-    .foot-bottom {
-        padding: 13px 0;
-        ul {
-            li {
-                display: inline-block;
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(153, 153, 153, 1);
-                line-height: 16px;
-                margin-right: 10px;
-                a {
-                    color: rgba(153, 153, 153, 1);
-                    text-decoration: none;
-                }
-            }
-        }
-    }
-}
-
-.FootBottom {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-}
-</style>

src/main/vue/src/pagesPre/LogoHead.vue

@@ -1,112 +0,0 @@
-<template>
-    <div style="background:#fff">
-        <div class="HeadContent" :style="{height:isLogin?'119px':'100px',lineHeight:isLogin?'119px':'100px'}">
-            <div class="Head">
-                <img class="logo" @click="goIndex" src="../assetsPre/logo.png" alt="">
-                <div class="line">
-                    |
-                </div>
-                <div class="welcome">
-                    {{title?title:'欢迎登陆'}}
-                </div>
-            </div>
-
-        </div>
-    </div>
-
-</template>
-
-<script>
-import logo from '../components/Logo'
-export default {
-    name: 'page404',
-    data() {
-        return {
-            title: ''
-        }
-    },
-    created() {
-        if (this.$route.name == 'login') {
-            this.isLogin = true
-            this.title = ''
-        } else if (this.$route.query.title) {
-            this.isLogin = false
-            this.title = this.$route.query.title
-            document.title = this.$route.query.title
-        }
-        else {
-            this.isLogin = false
-            this.title = this.$route.meta.title
-        }
-    },
-    watch: {
-        $route() {
-            if (this.$route.name == 'login') {
-                this.isLogin = true
-                this.title = ''
-            } else if (this.$route.query.title) {
-                this.isLogin = false
-                this.title = this.$route.query.title
-                document.title = this.$route.query.title
-            }
-            else {
-                this.isLogin = false
-                this.title = this.$route.meta.title
-            }
-        }
-    },
-    computed: {
-
-    },
-    methods: {
-        goIndex() {
-            this.$router.push('/index')
-        }
-    },
-    components: {
-        logo
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.HeadContent {
-    box-shadow: 0px 1px 2px 0px rgba(199, 199, 199, 0.5);
-    width: 100%;
-}
-.Head {
-    width: 1183px;
-    margin: auto;
-    overflow: hidden;
-    background: rgba(255, 255, 255, 1);
-    height: 100%;
-    font-size: 0;
-
-    .logo {
-        width: 300px;
-        height: 54px;
-        vertical-align: middle;
-        display: inline-block;
-        cursor: pointer;
-    }
-
-    .line {
-        font-size: 30px;
-        font-family: PingFangSC-Regular;
-        color: rgba(102, 102, 102, 1);
-        line-height: 42px;
-        margin: 8px 0 8px 22px;
-        vertical-align: middle;
-        display: inline-block;
-    }
-    .welcome {
-        line-height: 40px;
-        font-size: 30px;
-        font-family: MicrosoftYaHei;
-        color: rgba(102, 102, 102, 1);
-        margin: 9px 0 9px 14px;
-        vertical-align: middle;
-        display: inline-block;
-    }
-}
-</style>

src/main/vue/src/pagesPre/Main.vue

@@ -1,7 +1,10 @@
 <template>
-    <keep-alive include="*">
-        <router-view></router-view>
-    </keep-alive>
+    <div class="main">
+        <keep-alive include="*">
+            <router-view class="router"> </router-view>
+        </keep-alive>
+    </div>
+
 </template>
 <script>
 import { mapState } from "vuex";
@@ -16,59 +19,34 @@ export default {
         ...mapState(["locationInfo"])
     },
     created() {
-        // this.$http.post({
-        //     url: '/auth/login',
-        //     data: {
-        //         username: 'root',
-        //         password: '123456',
-        //     }
-        // }).then(res => {
-
-        // }).catch(() => {
-
-        // })
-
 
     },
     mounted() {
-        // var geolocation = new qq.maps.Geolocation(
-        //     "GLFBZ-ZR2W6-76XSA-MF7CQ-GDJ6Z-6FB5K",
-        //     "图途象"
-        // );
-        // if (!this.locationInfo) {
-        //     geolocation.getLocation(res => {
-        //         console.log(res)
-        //         this.$store.commit('updateLocationInfo', res)
-
-        //     })
-        // }
 
-        var mapObj = new AMap.Map('iCenter');
-        mapObj.plugin('AMap.Geolocation', ()=> {
-            var geolocation = new AMap.Geolocation({
-                enableHighAccuracy: false,//是否使用高精度定位，默认:true
-                // timeout: 10000,          //超过10秒后停止定位，默认：无穷大
-                maximumAge: 0,           //定位结果缓存0毫秒，默认：0
-            });
-            mapObj.addControl(geolocation);
-            geolocation.getCurrentPosition();
-            AMap.event.addListener(geolocation, 'complete', (result)=>{
-                console.log(result)
-                this.$store.commit('updateLocationInfo', result)
-            });//返回定位信息
-        });
     },
     watch: {
-        $route() {
-            if (this.$route.meta.title) {
-                document.title = this.$route.meta.title
-            }
-            else {
-                document.title = '图途象'
-            }
-        }
+
     },
     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>
+
+

src/main/vue/src/pagesPre/MemberMoney.vue

@@ -1,525 +0,0 @@
-<template>
-    <div class="container">
-
-        <div class="pageTitle">
-            我的余额
-        </div>
-
-        <div class="point">
-
-            <div class="point-item">
-                <div class="title">
-                    账户余额
-                </div>
-                <div class="val">
-                    {{userInfo.moneyCoin}}
-                </div>
-            </div>
-
-            <el-button type="primary" class="apply" @click="imageDialogVisible=true" v-if="userInfo.storeFlag=='Y'">申请提现</el-button>
-
-        </div>
-
-        <el-table class="pointTable" :data="tableData" row-key="id" ref="table" style="margin-top:10px">
-
-            <el-table-column prop="remark" label="来源/用途" min-width="320" align="center">
-            </el-table-column>
-
-            <el-table-column prop="money" label="余额变化" min-width="100" align="center">
-            </el-table-column>
-
-            <el-table-column prop="createTime" label="日期" min-width="200" align="center">
-                <template slot-scope="scope">
-                    {{getTime(scope.row.createTime)}}
-                </template>
-            </el-table-column>
-
-            <!-- <el-table-column prop="typeFlag" label="备注" min-width="100" align="center">
-            </el-table-column> -->
-
-        </el-table>
-        <div class="pagination-wrapper" style="padding:20px 0;">
-
-            <el-pagination v-if="totalNumber>pageSize" background @current-change="currentPageChange" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-        </div>
-
-        <el-dialog class="applyContent" title="申请提现" width="30%" :visible.sync="imageDialogVisible">
-            <el-tabs v-model="activeName">
-                <el-tab-pane label="微信" name="0">
-                    <el-form :model="formData" ref="form" :rules="rules" label-width="80px" label-position="right" style="max-width:300px;">
-                        <el-form-item prop="money" label="提现金额">
-                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
-                        </el-form-item>
-
-                        <el-form-item prop="wechat" label="微信号">
-                            <el-input v-model="formData.wechat" placeholder="提现到的微信账号"></el-input>
-                        </el-form-item>
-
-                    </el-form>
-
-                </el-tab-pane>
-                <el-tab-pane label="支付宝" name="1">
-                    <el-form :model="formData" ref="form1" :rules="rules1" label-width="80px" label-position="right" style="max-width:300px;">
-                        <el-form-item prop="money" label="提现金额">
-                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="alipay" label="支付宝">
-                            <el-input v-model="formData.alipay" placeholder="提现到的支付宝账号"></el-input>
-                        </el-form-item>
-
-                    </el-form>
-                </el-tab-pane>
-                <el-tab-pane label="银行卡" name="2">
-                    <el-form :model="formData" ref="form2" :rules="rules2" label-width="80px" label-position="right" style="max-width:300px;">
-                        <el-form-item prop="money" label="提现金额">
-                            <el-input-number v-model="formData.money" :step="100" :min="0"></el-input-number>
-                        </el-form-item>
-                        <el-form-item prop="bankCard" label="银行卡">
-                            <el-input v-model="formData.bankCard" placeholder="提现到的银行卡"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="bankName" label="银行名称">
-                            <el-input v-model="formData.bankName" placeholder="银行名称"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="openName" label="开户行">
-                            <el-input v-model="formData.openName" placeholder="开户行名称"></el-input>
-                        </el-form-item>
-                    </el-form>
-                </el-tab-pane>
-
-            </el-tabs>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="imageDialogVisible = false">取 消</el-button>
-                <el-button @click="onsave" type="primary">确认</el-button>
-            </span>
-
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-
-export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            formData: {
-                money: ''
-            },
-            rules: {
-                money: [
-                    { required: true, message: '提现金额不能为空', trigger: 'blur' },
-                ],
-                wechat: [
-                    {
-                        required: true, message: '微信账号不能为空', trigger: 'blur'
-                    }
-                ]
-            },
-            rules1: {
-                money: [
-                    { required: true, message: '提现金额不能为空', trigger: 'blur' },
-                ],
-                alipay: [
-                    {
-                        required: true, message: '支付宝账号不能为空', trigger: 'blur'
-                    }
-                ]
-            },
-            rules2: {
-                money: [
-                    { required: true, message: '提现金额不能为空', trigger: 'blur' },
-                ],
-                bankCard: [
-                    {
-                        required: true, message: '银行卡号不能为空', trigger: 'blur'
-                    }
-                ],
-                bankName: [
-                    {
-                        required: true, message: '银行名称不能为空', trigger: 'blur'
-                    }
-                ],
-                openName: [
-                    {
-                        required: true, message: '开户行不能为空', trigger: 'blur'
-                    }
-                ]
-            },
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 10,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '用户',
-                    value: 'userId',
-                    show: true
-                },
-                {
-                    label: '订单',
-                    value: 'orderId',
-                    show: true
-                },
-                {
-                    label: '变化数量',
-                    value: 'money',
-                    show: true
-                },
-                {
-                    label: '剩余金额',
-                    value: 'balance',
-                    show: true
-                },
-                {
-                    label: '类型',
-                    value: 'typeFlag',
-                    show: true
-                },
-                {
-                    label: '备注',
-                    value: 'remark',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '用户',
-                    value: 'user_id'
-                },
-                {
-                    label: '订单',
-                    value: 'order_id'
-                },
-                {
-                    label: '变化数量',
-                    value: 'money'
-                },
-                {
-                    label: '剩余金额',
-                    value: 'balance'
-                },
-                {
-                    label: '类型',
-                    value: 'type_flag'
-                },
-                {
-                    label: '备注',
-                    value: 'remark'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-            activeName: '0'
-        }
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        onsave() {
-            var data = {
-                userId: this.userInfo.id,
-                money: this.formData.money
-            }
-            if (this.activeName == '0') {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        data.wechat = this.formData.wechat
-                        this.submit(data);
-                    } else {
-                        return false;
-                    }
-                });
-            }
-            else if (this.activeName == '1') {
-                this.$refs.form1.validate((valid) => {
-                    if (valid) {
-                        data.alipay = this.formData.alipay
-                        this.submit(data);
-                    } else {
-                        return false;
-                    }
-                });
-            }
-            else {
-                this.$refs.form2.validate((valid) => {
-                    if (valid) {
-                        data.bankCard = this.formData.bankCard
-                        data.bankName = this.formData.bankName
-                        data.openName = this.formData.openName
-                        this.submit(data);
-                    } else {
-                        return false;
-                    }
-                });
-            }
-        },
-        submit(data) {
-
-            this.$http.post({
-                url: '/memberCoinTixian/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.imageDialogVisible = false
-                    this.$alert('您的申请已提交，请耐心等待', '提交成功', {
-                        confirmButtonText: '确定',
-                        callback: action => {
-                        }
-                    });
-                }
-            })
-        },
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getData();
-        },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                userId: this.userInfo.id
-            }
-
-
-
-            this.$http.get({
-                url: '/memberCoin/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
-        },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/memberPoint',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
-                }
-            })
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
-        },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
-        },
-        advancedQuery() {
-
-            this.advancedQuerySearchKey = '';
-
-            if (this.advancedQueryFields.length > 0) {
-
-                var templist = [];
-
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.advancedQuerySearchKey = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
-
-            this.orderByStr = '';
-
-            if (this.tableSortFields.length > 0) {
-
-                var templist = [];
-
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.orderByStr = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/memberPoint/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/memberPoint/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
-        },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
-
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-    min-height: 612px;
-    padding: 0 25px 0 39px;
-
-    .pageTitle {
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 19px;
-        padding: 21px 0 9px;
-        border-bottom: 1px solid #ebebeb;
-    }
-
-    .point {
-        // width: 953px;
-        height: 106px;
-        background: rgba(255, 253, 236, 1);
-        line-height: 106px;
-        margin-top: 5px;
-        box-sizing: border-box;
-        font-size: 0;
-        text-align: center;
-
-        position: relative;
-
-        .apply {
-            position: absolute;
-            right: 100px;
-            top: 30px;
-        }
-
-        .point-item {
-            display: inline-block;
-
-            vertical-align: middle;
-            text-align: center;
-
-            .title {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-            }
-
-            .val {
-                font-size: 36px;
-                font-family: MicrosoftYaHei;
-                color: rgba(251, 110, 8, 1);
-                line-height: 47px;
-            }
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/MemberPoint.vue

@@ -1,379 +0,0 @@
-<template>
-    <div class="container">
-
-        <div class="pageTitle">
-            我的积分
-        </div>
-
-        <div class="point">
-            <div class="point-item">
-                <div class="title">
-                    可用积分
-                </div>
-                <div class="val" style="color:#0B9EC0">
-                    {{userInfo.moneyPoint}}
-                </div>
-            </div>
-            <div class="point-item">
-                <div class="title">
-                    将要过期的积分
-                </div>
-                <div class="val">
-                    {{userInfo.moneyPoint}}
-                </div>
-            </div>
-            <div class="point-item">
-                <el-button type="warning" style="width:248px;" disabled plain round>积分兑换</el-button>
-            </div>
-        </div>
-
-        <el-table class="pointTable" :data="tableData" row-key="id" ref="table" style="margin-top:10px">
-
-            <el-table-column prop="orderId" label="来源/用途" min-width="320" align="center">
-            </el-table-column>
-
-            <el-table-column prop="money" label="积分变化" min-width="100" align="center">
-            </el-table-column>
-
-            <el-table-column prop="createTime" label="日期" min-width="200" align="center">
-            </el-table-column>
-
-            <el-table-column prop="typeFlag" label="备注" min-width="100"  align="center">
-            </el-table-column>
-
-        </el-table>
-        <div class="pagination-wrapper">
-
-            <el-pagination v-if="totalNumber>pageSize" background @current-change="currentPageChange" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-        </div>
-
-        <el-dialog title="查看图片" :visible.sync="imageDialogVisible" size="small">
-            <img width="100%" :src="imgSrc" alt="">
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import { format } from 'date-fns'
-import zh from 'date-fns/locale/zh_cn'
-
-export default {
-    created() {
-        this.getData();
-    },
-    data() {
-        return {
-            totalNumber: 0,
-            totalPage: 10,
-            currentPage: 1,
-            pageSize: 5,
-            tableData: [],
-            filter1: '',
-            filter2: '',
-            tableColumns: [
-                {
-                    label: '用户',
-                    value: 'userId',
-                    show: true
-                },
-                {
-                    label: '订单',
-                    value: 'orderId',
-                    show: true
-                },
-                {
-                    label: '变化数量',
-                    value: 'money',
-                    show: true
-                },
-                {
-                    label: '剩余金额',
-                    value: 'balance',
-                    show: true
-                },
-                {
-                    label: '类型',
-                    value: 'typeFlag',
-                    show: true
-                },
-                {
-                    label: '备注',
-                    value: 'remark',
-                    show: true
-                },
-            ],
-            multipleMode: false,
-            showAdvancedQueryDialog: false,
-            advancedQueryFields: [],
-            showTableSortDialog: false,
-            tableSortFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
-            advancedQueryColumns: [
-                {
-                    label: '用户',
-                    value: 'user_id'
-                },
-                {
-                    label: '订单',
-                    value: 'order_id'
-                },
-                {
-                    label: '变化数量',
-                    value: 'money'
-                },
-                {
-                    label: '剩余金额',
-                    value: 'balance'
-                },
-                {
-                    label: '类型',
-                    value: 'type_flag'
-                },
-                {
-                    label: '备注',
-                    value: 'remark'
-                },
-            ],
-            advancedQuerySearchKey: '',
-            orderByStr: '',
-            imgSrc: '',
-            imageDialogVisible: false,
-        }
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        selection() {
-            return this.$refs.table.selection.map(i => i.id);
-        }
-    },
-    methods: {
-        pageSizeChange(size) {
-            this.currentPage = 1;
-            this.pageSize = size;
-            this.getData();
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getData();
-        },
-        getData() {
-
-            var data = {
-                currentPage: this.currentPage,
-                pageNumber: this.pageSize,
-                userId: this.userInfo.id
-            }
-
-
-
-            this.$http.get({
-                url: '/memberPoint/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.tableData = res.data.pp;
-                }
-            })
-        },
-        isColumnShow(column) {
-            var row = this.tableColumns.find(i => i.value === column);
-            return row ? row.show : false;
-        },
-        toggleMultipleMode(multipleMode) {
-            this.multipleMode = multipleMode;
-            if (!multipleMode) {
-                this.$refs.table.clearSelection();
-            }
-        },
-        editRow(row) {
-            this.$router.push({
-                path: '/memberPoint',
-                query: {
-                    id: row.id,
-                    column: this.$route.query.column,
-                }
-            })
-        },
-        operation1() {
-            this.$notify({
-                title: '提示',
-                message: this.selection
-            });
-        },
-        operation2() {
-            this.$message('操作2');
-        },
-        addField() {
-            this.advancedQueryFields.push({
-                link: 'AND',
-                name: '',
-                searchMethod: '=',
-                value: '',
-            });
-        },
-        removeField(i) {
-            if (this.advancedQueryFields.length > 0) {
-                this.advancedQueryFields.splice(i, 1);
-            }
-        },
-        advancedQuery() {
-
-            this.advancedQuerySearchKey = '';
-
-            if (this.advancedQueryFields.length > 0) {
-
-                var templist = [];
-
-                this.advancedQueryFields.forEach(item => {
-                    if (item.link && item.name && item.searchMethod && item.value) {
-                        var tempItem = item.link + '_,' + item.name + '_,' + item.searchMethod + '_,' + item.value;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.advancedQuerySearchKey = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showAdvancedQueryDialog = false;
-        },
-        addSortField() {
-            this.tableSortFields.push({
-                name: '',
-                order: 'asc',
-            });
-        },
-        removeSortField(i) {
-            if (this.tableSortFields.length > 0) {
-                this.tableSortFields.splice(i, 1);
-            }
-        },
-        tableSortQuery() {
-
-            this.orderByStr = '';
-
-            if (this.tableSortFields.length > 0) {
-
-                var templist = [];
-
-                this.tableSortFields.forEach(item => {
-                    if (item.name && item.order) {
-                        var tempItem = item.name + '_,' + item.order;
-                        templist.push(tempItem);
-                    }
-                })
-
-                if (templist.length > 0) {
-
-                    this.orderByStr = templist.join('_;');
-                }
-            }
-
-            this.getData();
-            this.showTableSortDialog = false;
-        },
-        exportExcel() {
-            window.location.href = this.$baseUrl + "/memberPoint/exportExcel?searchKey="
-                + this.filter1 + "&advancedQuery=" + this.advancedQuerySearchKey + "&orderByStr=" + this.orderByStr;
-        },
-        searchData() {
-            this.currentPage = 1;
-            this.getData();
-        },
-        deleteRow(row) {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/memberPoint/del',
-                    data: { id: row.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.getData();
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        DateTimeFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD HH:mm', { locale: zh })
-            }
-
-        },
-        DateFormatter(row, column, cellValue) {
-            if (cellValue) {
-                return format(cellValue, 'YYYY/MM/DD', { locale: zh })
-            }
-
-        },
-        showImg(img) {
-            this.imgSrc = img;
-            this.imageDialogVisible = true;
-        },
-
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-    min-height: 612px;
-    padding: 0 25px 0 39px;
-
-    .pageTitle {
-        font-size: 14px;
-        font-family: MicrosoftYaHei;
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 19px;
-        padding: 21px 0 9px;
-        border-bottom: 1px solid #ebebeb;
-    }
-
-    .point {
-        width: 953px;
-        height: 106px;
-        background: rgba(255, 253, 236, 1);
-        line-height: 106px;
-        margin-top: 5px;
-        box-sizing: border-box;
-        font-size: 0;
-
-        .point-item {
-            display: inline-block;
-            width: 33%;
-            vertical-align: middle;
-            text-align: center;
-
-            .title {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-            }
-
-            .val {
-                font-size: 36px;
-                font-family: MicrosoftYaHei;
-                color: rgba(251, 110, 8, 1);
-                line-height: 47px;
-            }
-
-            &:not(:last-child) {
-                border-right: 1px solid #ebebeb;
-            }
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/MenuFoot.vue

@@ -1,113 +0,0 @@
-<template>
-    <div class='menuList'>
-        <div class="menu-item">
-            <img src="../assetsPre/Group1.png" alt="">
-            <div class="text">
-                <div class="title">7*24</div>
-                <div class="subTitle">全天候服务支持</div>
-            </div>
-        </div>
-         <div class="menu-item">
-            <img src="../assetsPre/Group2.png" alt="">
-            <div class="text">
-                <div class="title">一对一客服</div>
-                <div class="subTitle">商家客服一对一</div>
-            </div>
-        </div>
-         <div class="menu-item">
-            <img src="../assetsPre/Group3.png" alt="">
-            <div class="text">
-                <div class="title">交易担保</div>
-                <div class="subTitle">入驻商家全担保</div>
-            </div>
-        </div>
-         <div class="menu-item">
-            <img src="../assetsPre/Group4.png" alt="">
-            <div class="text">
-                <div class="title">可靠交付</div>
-                <div class="subTitle">交付验收自主审核</div>
-            </div>
-        </div>
-         <div class="menu-item">
-            <img src="../assetsPre/Group5.png" alt="">
-            <div class="text">
-                <div class="title">售后保障</div>
-                <div class="subTitle">不满意随时找我们</div>
-            </div>
-        </div>
-
-    </div>
-
-</template>
-
-<script>
-
-export default {
-    props: {
-        isBottom: {
-            type: Boolean,
-            default: true
-        }
-    },
-    name: 'page404',
-    data() {
-        return {
-
-        }
-    },
-    computed: {
-
-    },
-    methods: {
-
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.menuList {
-    width: 1196px;
-    margin: 50px auto;
-    height: 90px;
-    font-size: 0;
-
-    .menu-item {
-        width: 228px;
-        height: 90px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        display: inline-block;
-
-        &:not(:last-child){
-            margin-right: 10px;
-        }
-        img {
-            display: block;
-            width: 44px;
-            height: 41px;
-            float: left;
-            margin: 29px 0 20px 27px;
-        }
-
-        .text {
-            float: right;
-            margin: 26px 34px 19px 0;
-            .title {
-                font-size: 16px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 21px;
-                text-align: center;
-            }
-            .subTitle {
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(153, 153, 153, 1);
-                line-height: 16px;
-                text-align: center;
-                margin-top: 8px;
-            }
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/Order.vue

@@ -1,148 +0,0 @@
-<template>
-    <div class="conatiner">
-        <mini-head></mini-head>
-        <div class="Head">
-            <div class="HeadContent">
-                <img class="logo" src="../assetsPre/logo.png" alt="">
-            </div>
-        </div>
-
-        <orderStep></orderStep>
-        <div class="order">
-            <router-view ref='child'></router-view>
-        </div>
-
-        <menuFoot></menuFoot>
-
-        <logo-foot :isBottom='isBottom'></logo-foot>
-    </div>
-</template>
-
-<script>
-import miniHead from '../components/MiniHead'
-import menuFoot from '../pagesPre/MenuFoot'
-import logoFoot from '../pagesPre/LogoFoot'
-import orderStep from '../pagesPre/OrderStep'
-export default {
-    name: 'order',
-    data() {
-        return {
-            nowStep: 1,
-            isBottom: true
-        }
-    },
-    watch: {
-        $route() {
-            this.getStep()
-        }
-    },
-    computed: {
-    },
-    mounted() {
-        this.getStep()
-    },
-    methods: {
-        getStep() {
-            if (this.$route.name == 'submit') {
-                this.nowStep = 1
-            }
-            else if (this.$route.name == 'payOrder') {
-                this.nowStep = 2
-            }
-        }
-
-    },
-    components: {
-        miniHead, menuFoot, logoFoot, orderStep
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.Head {
-    height: 70px;
-    background: rgba(255, 255, 255, 1);
-    box-shadow: 0px 1px 2px 0px rgba(199, 199, 199, 0.5);
-    .HeadContent {
-        width: 1190px;
-        margin: auto;
-        height: 70px;
-        line-height: 70px;
-
-        img {
-            width: 300px;
-            height: 54px;
-            vertical-align: middle;
-        }
-    }
-}
-
-.lineContent {
-    width: 1190px;
-    margin: auto;
-    padding: 37px 0 41px;
-    font-size: 0;
-    position: relative;
-    .line-item {
-        width: 25%;
-        display: inline-block;
-        z-index: 2;
-        position: relative;
-
-        .title {
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 16px;
-            text-align: center;
-        }
-
-        .ball {
-            width: 20px;
-            height: 20px;
-            background: rgba(198, 198, 198, 1);
-            border: 2px solid rgba(151, 151, 151, 0.5);
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            font-weight: bold;
-            color: rgba(255, 255, 255, 1);
-            line-height: 20px;
-            text-align: center;
-            border-radius: 100%;
-            margin: 8px auto 0;
-        }
-
-        &.active {
-            .title {
-                color: #0b9ec0;
-            }
-            .ball {
-                background: #1bb8ac;
-                border-color: #0b9ec0;
-            }
-        }
-    }
-
-    .line {
-        width: 100%;
-        height: 8px;
-        background: rgba(204, 204, 204, 1);
-        border-radius: 4px;
-        position: absolute;
-        bottom: 49px;
-        left: 0;
-        z-index: 1;
-
-        .line-color {
-            height: 8px;
-            background: linear-gradient(141deg, rgba(27, 184, 172, 1) 0%, rgba(0, 142, 205, 1) 100%);
-            border-radius: 4px;
-        }
-    }
-}
-
-.order {
-    width: 1190px;
-    margin: auto;
-}
-</style>

src/main/vue/src/pagesPre/OrderDetail.vue

@@ -1,71 +0,0 @@
-<template>
-    <div class="container">
-        <div class="top">
-            <div class="right" :style="{width:isLeft?'246px':'1158px'}">
-                <div class="pageTitle">
-                    订单信息
-                </div>
-                <div class="order-item">
-                    <div class="title">收货地址</div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-
-import orderStep from '../pagesPre/OrderStep'
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-                this.productInfo = res.data.productInfo
-            }
-        }).catch(e => {
-            console.log(e)
-
-        })
-
-
-    },
-    data() {
-        return {
-            isLeft: false,
-            orderInfo: {},
-            productInfo: {}
-        }
-    },
-    methods: {
-
-    },
-    components: {
-        orderStep
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    width: 1190px;
-
-    .right {
-        min-height: 383px;
-        padding: 15px;
-        background-color: #fff;
-        border: 1px solid rgba(234, 234, 234, 1);
-    }
-
-    .pageTitle {
-        font-weight: bold;
-        color: rgba(51, 51, 51, 1);
-        line-height: 19px;
-        padding-bottom: 15px;
-    }
-}
-</style>

src/main/vue/src/pagesPre/OrderExamine.vue

@@ -1,474 +0,0 @@
-<template>
-    <div class="container">
-        <template v-if="isFinish">
-
-        </template>
-        <template v-else>
-            <div class="top" v-if="orderInfo.productInfo">
-                <span>订单号:{{orderInfo.orderCode}}</span>
-                <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-                <template v-if="!isChange">
-                    <span style="font-size:14px;color:#666;margin-left:20px">已审核/全部：{{orderInfo.quantity-needCheckNum}}/{{orderInfo.quantity}}</span>
-                    <el-button style="float:right;margin:20px 20px 0 30px;" v-if="isSuccess" type="primary" class="btn" @click="submit">审核通过</el-button>
-                    <el-button style="float:right;margin:20px 20px 0 30px;" v-if="isFail" type="warning" class="btn" @click="getRepair">确认提交第{{repairNum}}次返修</el-button>
-                </template>
-                <el-select v-if="!isChange" size="mini" style="float:right;margin-top:25px;width:120px" clearable v-model="statusFlag" placeholder="筛选状态" @change="getImage">
-                    <el-option key="0" label="未审核" value="0">
-                    </el-option>
-                    <el-option key="1" label="审核通过" value="1">
-                    </el-option>
-                    <el-option key="2" label="审核失败" value="2">
-                    </el-option>
-                </el-select>
-            </div>
-
-            <div class="content">
-
-                <template v-if="orderImage.length>0">
-                    <div class="imgList">
-                        <div class="title">原<br/>片</div>
-
-                        <img-item v-for="(item,index) in orderImage" @changeRemark="getImage" :label='"originalImage"' :index='index' :img='item' :imgStyle='"examine"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-
-                    </div>
-
-                    <div class="imgList" style="margin-top:50px;">
-                        <div class="title" style="color:#FB6E08">成<br/>片</div>
-                        <img-item :isChange='isChange' v-for="(item,index) in orderImage" @changeRemark="changeRemark" :label='"finishedImage"' :index='index' :img='item' :imgStyle='"examine"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-                    </div>
-                </template>
-                <div v-else class="nothing">
-                    <img src="../assetsPre/nothingImg.png" alt="">
-                    <p>没有图片哦!</p>
-                </div>
-
-            </div>
-
-            <el-pagination style="padding:0 0 20px" background :page-size="7" @current-change="currentPageChange" :current-page="currentPage" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-
-            <!-- <div class="bottom">
-                <el-button type="warning" v-if="!isChange" plain @click="goShare">他人审片</el-button>
-            </div> -->
-        </template>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import imgItem from '../components/ImgItem'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-                if (res.data) {
-                    if (res.data.orderRepairList.length != 0) {
-                        if (res.data.orderRepairList[0].statusFlag != 0) {
-                            this.isFirstCheck = false
-                        }
-                    }
-                }
-
-                if (this.$route.query.repairId) {
-                    this.repairId = this.$route.query.repairId
-                    res.data.orderRepairList.forEach(item => {
-                        if (this.repairId == item.id) {
-                            console.log(item.statusFlag)
-                            if (item.statusFlag ===3) {
-                                this.isFinish = true
-                            }
-                        }
-
-                    })
-                }
-                else {
-                    if (this.orderInfo.orderRepairList.length > 0) {
-                        this.repairId = this.orderInfo.orderRepairList[0].id
-                    }
-
-                    if (!this.isFirstCheck) {
-                        this.isFinish = true
-                    }
-
-                }
-                if (this.isFinish) {
-                    this.$alert('该阶段审核已经结束', '审核结束', {
-                        confirmButtonText: '确定',
-                        callback: action => {
-                            history.back()
-                        }
-                    });
-                }
-                else {
-                    this.getImage()
-                }
-            }
-        })
-
-        if (this.$route.query.isChange) {
-            this.isChange = true
-        }
-
-
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        url() {
-            return baseUrl + '/assets/uploadFile'
-        },
-        allImage() {
-            var list = []
-            this.addImage.forEach(item => {
-                list.push(item.originalImage)
-            })
-            return list
-        },
-        canUploadNum() {
-            var num = 0
-            if (this.orderInfo.quantity) {
-                num = this.orderInfo.quantity - this.orderImage.length
-            }
-            return num
-        },
-        repairNum() {
-            var num = 0
-            if (this.orderInfo.orderRepairList.length) {
-                num = this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].typeFlag + 1
-                if (this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].statusFlag != 0) {
-                    num++
-                }
-            }
-
-            return num
-        }
-    },
-    data() {
-        return {
-            orderInfo: {},
-            dialogVisible: false,
-            addImage: [],
-            orderImage: [],
-            currentPage: 1,
-            totalNumber: 0,
-            isSuccess: false,
-            isFail: false,
-            repairId: 0,
-            isChange: false,
-            statusFlag: '',
-            needCheckNum: 0,
-            isFirstCheck: true,
-            isFinish: false
-        }
-    },
-    methods: {
-        changeRemark() {
-            if (!this.repairId) {
-                this.$http.get({
-                    url: '/userOrder/getOne',
-                    data: {
-                        id: this.$route.query.orderId
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.orderInfo = res.data
-                        if (this.$route.query.repairId) {
-                            this.repairId = this.$route.query.repairId
-                        }
-                        else {
-                            if (this.orderInfo.orderRepairList.length > 0) {
-                                this.repairId = this.orderInfo.orderRepairList[0].id
-                            }
-
-                        }
-                        this.getImage()
-                    }
-                })
-
-
-            }
-            else {
-                this.getImage()
-            }
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getImage();
-        },
-        getImage() {
-            var data = {
-                orderId: this.$route.query.orderId,
-                currentPage: this.currentPage,
-                pageNumber: 7,
-            }
-            if (this.repairId) {
-                data.repairId = this.repairId
-            }
-            if (this.$route.query.repairId) {
-                data.baseRepairId = this.$route.query.repairId
-            }
-            if (this.statusFlag) {
-                data.statusFlag = this.statusFlag
-            }
-            this.orderImage = []
-            this.$http.get({
-                url: '/orderImage/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.orderImage = res.data.pp
-                    this.totalNumber = res.data.page.totalNumber;
-                }
-            })
-            this.isSuccess = false
-            this.isFail = false
-            this.$http.get({
-                url: '/orderImage/all',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    statusFlag: 0
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.needCheckNum = res.data.length
-                    if (res.data.length == 0) {
-                        this.$http.get({
-                            url: '/orderImage/all',
-                            data: {
-                                orderId: this.$route.query.orderId,
-                                statusFlag: 2
-                            }
-                        }).then(res => {
-                            if (res.data.length == 0) {
-                                this.isSuccess = true
-                            }
-                            else {
-                                this.isFail = true
-                            }
-                        })
-                    }
-                }
-            })
-
-
-        },
-        chooseImg(index) {
-            console.log(index)
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-            var list = []
-            fileList.forEach(item => {
-                item.response.data.forEach(todo => {
-                    var jsop = {
-                        originalImage: todo,
-                        remark: ''
-                    }
-                    list.push(jsop)
-                })
-            })
-            this.addImage = list
-        },
-        handleSuccess(res) {
-            res.data.forEach(item => {
-                if (this.allImage.indexOf(item) == -1 && this.addImage.length <= this.canUploadNum) {
-                    var jsop = {
-                        originalImage: item,
-                        remark: ""
-                    }
-                    this.addImage.push(jsop)
-                }
-                else if (this.addImage.length > this.canUploadNum) {
-                    this.$message({
-                        message: '已经上传' + this.addImage.length + '张图片了，请预览后确认图片',
-                        type: 'warning'
-                    });
-                }
-            })
-        },
-        delImg(index) {
-            this.addImage.splice(index, 1)
-        },
-        upload() {
-            this.saveImage(0)
-        },
-        saveImage(i) {
-            if (i == this.allImage.length) {
-                this.$message.success('成功');
-                this.dialogVisible = false
-                this.getImage()
-            }
-            else {
-                var data = {
-                    originalImage: this.allImage[i],
-                    orderId: this.orderInfo.id,
-                    userId: this.userInfo.id,
-                    storeId: this.orderInfo.storeId
-
-                }
-                this.$http.post({
-                    url: '/orderImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(i + 1)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        submit() {
-            if (this.$route.query.repairId) {
-                this.$http.post({
-                    url: '/orderRepair/update',
-                    data: {
-                        id: this.$route.query.repairId,
-                        statusFlag: 3
-                    }
-                }).then(res => {
-                    if (res.success) {
-
-                    }
-                })
-            }
-            this.$http.post({
-                url: '/userOrder/update',
-                data: {
-                    id: this.orderInfo.id,
-                    statusFlag: 3
-                }
-            }).then(res => {
-                if (res.success) {
-                    // this.$message.success('提交成功');
-                    // history.back()
-
-                    this.$http.post({
-                        url: '/userOrder/confirm',
-                        data: {
-                            id: this.orderInfo.id,
-                        }
-                    }).then(res2 => {
-                        if (res2.success) {
-                            this.$message.success('提交成功');
-                            history.back()
-                        }
-                    })
-                }
-            })
-
-        },
-        getRepair() {
-            this.$http.post({
-                url: '/userOrder/repair',
-                data: {
-                    id: this.orderInfo.id,
-                    statusFlag: 4
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('提交成功');
-                    history.back()
-
-                }
-            })
-        },
-        goShare() {
-            var repair = ''
-            if (this.$route.query.repairId) {
-                repair = '&repairId=' + this.$route.query.repairId
-            }
-            this.$alert('点击确定转到下列分享链接：<br/> http://localhost:8081/index.html#/OrderExamineShare?orderId=' + this.$route.query.orderId + repair, '分享链接', {
-                confirmButtonText: '确定',
-                dangerouslyUseHTMLString: true,
-                callback: action => {
-                    window.open('http://localhost:8081/index.html#/OrderExamineShare?orderId=' + this.$route.query.orderId + repair)
-                }
-            });
-        }
-    },
-    components: {
-        imgItem
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-bottom: 1px solid rgba(234, 234, 234, 1);
-    .top {
-        height: 78px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 0 30px;
-        span {
-            font-size: 18px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 78px;
-        }
-        .btn {
-            float: right;
-            margin-top: 20px;
-        }
-    }
-
-    .content {
-        padding: 0 30px;
-        min-height: 450px;
-        .title {
-            font-size: 14px;
-            font-family: MicrosoftYaHei-Bold;
-            font-weight: bold;
-            color: rgba(11, 158, 192, 1);
-            line-height: 19px;
-            margin-bottom: 20px;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 20px;
-        }
-
-        .imgList {
-            margin-top: 20px;
-        }
-    }
-
-    .bottom {
-        height: 58px;
-        border-top: 1px solid rgba(234, 234, 234, 1);
-        line-height: 58px;
-        padding: 0 30px;
-        margin-top: 20px;
-        span {
-            font-size: 14px;
-            color: #999;
-        }
-    }
-
-    .nothing {
-        margin-top: 20px;
-        img {
-            width: 167px;
-            height: 167px;
-            display: block;
-            margin: auto;
-        }
-
-        p {
-            font-size: 14px;
-            text-align: center;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-top: 24px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/OrderExamineShare.vue

@@ -1,460 +0,0 @@
-<template>
-    <div class="container">
-        <template v-if="isFinish">
-
-        </template>
-        <template v-else>
-            <div class="top" v-if="orderInfo.productInfo">
-                <span>订单号:{{orderInfo.orderCode}}</span>
-                <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-                <template v-if="!isChange">
-                    <span style="font-size:14px;color:#666;margin-left:20px">已审核/全部：{{orderInfo.quantity-needCheckNum}}/{{orderInfo.quantity}}</span>
-                    <el-button style="float:right;margin:20px 20px 0 30px;" v-if="isSuccess" type="primary" class="btn" @click="submit">审核通过</el-button>
-                    <el-button style="float:right;margin:20px 20px 0 30px;" v-if="isFail" type="warning" class="btn" @click="getRepair">确认提交第{{repairNum}}次返修</el-button>
-                </template>
-                <el-select v-if="!isChange" size="mini" style="float:right;margin-top:25px;width:120px" clearable v-model="statusFlag" placeholder="筛选状态" @change="getImage">
-                    <el-option key="0" label="未审核" value="0">
-                    </el-option>
-                    <el-option key="1" label="审核通过" value="1">
-                    </el-option>
-                    <el-option key="2" label="审核失败" value="2">
-                    </el-option>
-                </el-select>
-            </div>
-
-            <div class="content">
-
-                <template v-if="orderImage.length>0">
-                    <div class="imgList">
-                        <div class="title">原<br/>片</div>
-
-                        <img-item v-for="(item,index) in orderImage" @changeRemark="getImage" :label='"originalImage"' :index='index' :img='item' :imgStyle='"examine"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-
-                    </div>
-
-                    <div class="imgList" style="margin-top:50px;">
-                        <div class="title" style="color:#FB6E08">成<br/>片</div>
-                        <img-item :isChange='isChange' v-for="(item,index) in orderImage" @changeRemark="changeRemark" :label='"finishedImage"' :index='index' :img='item' :imgStyle='"examine"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-                    </div>
-                </template>
-                <div v-else class="nothing">
-                    <img src="../assetsPre/nothingImg.png" alt="">
-                    <p>没有图片哦!</p>
-                </div>
-
-            </div>
-
-            <el-pagination style="padding:0 0 20px" background :page-size="7" @current-change="currentPageChange" :current-page="currentPage" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-        </template>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import imgItem from '../components/ImgItem'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-                if (res.data) {
-                    if (res.data.orderRepairList.length != 0) {
-                        if (res.data.orderRepairList[0].statusFlag != 0) {
-                            this.isFirstCheck = false
-                        }
-                    }
-                }
-
-                if (this.$route.query.repairId) {
-                    this.repairId = this.$route.query.repairId
-                    res.data.orderRepairList.forEach(item => {
-                        if (this.repairId == item.id) {
-                            if (item.statusFlag == 3) {
-                                this.isFinish = true
-                            }
-                        }
-
-                    })
-                }
-                else {
-                    if (this.orderInfo.orderRepairList.length > 0) {
-                        this.repairId = this.orderInfo.orderRepairList[0].id
-                    }
-
-                    if (!this.isFirstCheck) {
-                        this.isFinish = true
-                    }
-
-                }
-
-                if (this.isFinish) {
-                    this.$alert('该阶段审核已经结束', '审核结束', {
-                        confirmButtonText: '确定',
-                        callback: action => {
-                           window.close()
-                        }
-                    });
-                }
-                else {
-                    this.getImage()
-                }
-
-            }
-        })
-
-        if (this.$route.query.isChange) {
-            this.isChange = true
-        }
-
-
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        url() {
-            return baseUrl + '/assets/uploadFile'
-        },
-        allImage() {
-            var list = []
-            this.addImage.forEach(item => {
-                list.push(item.originalImage)
-            })
-            return list
-        },
-        canUploadNum() {
-            var num = 0
-            if (this.orderInfo.quantity) {
-                num = this.orderInfo.quantity - this.orderImage.length
-            }
-            return num
-        },
-        repairNum() {
-            var num = 0
-            if (this.orderInfo.orderRepairList.length) {
-                num = this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].typeFlag + 1
-                if (this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].statusFlag != 0) {
-                    num++
-                }
-            }
-
-            return num
-        }
-    },
-    data() {
-        return {
-            orderInfo: {},
-            dialogVisible: false,
-            addImage: [],
-            orderImage: [],
-            currentPage: 1,
-            totalNumber: 0,
-            isSuccess: false,
-            isFail: false,
-            repairId: 0,
-            isChange: false,
-            statusFlag: '',
-            needCheckNum: 0,
-            isFirstCheck: true,
-            isFinish: false
-        }
-    },
-    methods: {
-        changeRemark() {
-            if (!this.repairId) {
-                this.$http.get({
-                    url: '/userOrder/getOne',
-                    data: {
-                        id: this.$route.query.orderId
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.orderInfo = res.data
-                        if (this.$route.query.repairId) {
-                            this.repairId = this.$route.query.repairId
-                        }
-                        else {
-                            if (this.orderInfo.orderRepairList.length > 0) {
-                                this.repairId = this.orderInfo.orderRepairList[0].id
-                            }
-
-                        }
-                        this.getImage()
-                    }
-                })
-
-
-            }
-            else {
-                this.getImage()
-            }
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getImage();
-        },
-        getImage() {
-            var data = {
-                orderId: this.$route.query.orderId,
-                currentPage: this.currentPage,
-                pageNumber: 7,
-            }
-            if (this.repairId) {
-                data.repairId = this.repairId
-            }
-            if (this.$route.query.repairId) {
-                data.baseRepairId = this.$route.query.repairId
-            }
-            if (this.statusFlag) {
-                data.statusFlag = this.statusFlag
-            }
-            this.orderImage = []
-            this.$http.get({
-                url: '/orderImage/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.orderImage = res.data.pp
-                    this.totalNumber = res.data.page.totalNumber;
-                }
-            })
-            this.isSuccess = false
-            this.isFail = false
-            this.$http.get({
-                url: '/orderImage/all',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    statusFlag: 0
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.needCheckNum = res.data.length
-                    if (res.data.length == 0) {
-                        this.$http.get({
-                            url: '/orderImage/all',
-                            data: {
-                                orderId: this.$route.query.orderId,
-                                statusFlag: 2
-                            }
-                        }).then(res => {
-                            if (res.data.length == 0) {
-                                this.isSuccess = true
-                            }
-                            else {
-                                this.isFail = true
-                            }
-                        })
-                    }
-                }
-            })
-
-
-        },
-        chooseImg(index) {
-            console.log(index)
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-            var list = []
-            fileList.forEach(item => {
-                item.response.data.forEach(todo => {
-                    var jsop = {
-                        originalImage: todo,
-                        remark: ''
-                    }
-                    list.push(jsop)
-                })
-            })
-            this.addImage = list
-        },
-        handleSuccess(res) {
-            res.data.forEach(item => {
-                if (this.allImage.indexOf(item) == -1 && this.addImage.length <= this.canUploadNum) {
-                    var jsop = {
-                        originalImage: item,
-                        remark: ""
-                    }
-                    this.addImage.push(jsop)
-                }
-                else if (this.addImage.length > this.canUploadNum) {
-                    this.$message({
-                        message: '已经上传' + this.addImage.length + '张图片了，请预览后确认图片',
-                        type: 'warning'
-                    });
-                }
-            })
-        },
-        delImg(index) {
-            this.addImage.splice(index, 1)
-        },
-        upload() {
-            this.saveImage(0)
-        },
-        saveImage(i) {
-            if (i == this.allImage.length) {
-                this.$message.success('成功');
-                this.dialogVisible = false
-                this.getImage()
-            }
-            else {
-                var data = {
-                    originalImage: this.allImage[i],
-                    orderId: this.orderInfo.id,
-                    userId: this.userInfo.id,
-                    storeId: this.orderInfo.storeId
-
-                }
-                this.$http.post({
-                    url: '/orderImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(i + 1)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        submit() {
-            if (this.$route.query.repairId) {
-                this.$http.post({
-                    url: '/orderRepair/update',
-                    data: {
-                        id: this.$route.query.repairId,
-                        statusFlag: 3
-                    }
-                }).then(res => {
-                    if (res.success) {
-
-                    }
-                })
-            }
-            this.$http.post({
-                url: '/userOrder/update',
-                data: {
-                    id: this.orderInfo.id,
-                    statusFlag: 3
-                }
-            }).then(res => {
-                if (res.success) {
-                    // this.$message.success('提交成功');
-                    // history.back()
-
-                    this.$http.post({
-                        url: '/userOrder/confirm',
-                        data: {
-                            id: this.orderInfo.id,
-                        }
-                    }).then(res2 => {
-                        if (res2.success) {
-                            this.$message.success('提交成功');
-                            location.reload()
-                        }
-                    })
-                }
-            })
-
-        },
-        getRepair() {
-            this.$http.post({
-                url: '/userOrder/repair',
-                data: {
-                    id: this.orderInfo.id,
-                    statusFlag: 4
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('提交成功');
-                     location.reload()
-
-                }
-            })
-        }
-    },
-    components: {
-        imgItem
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    max-width: 1190px;
-    margin: 15vh auto;
-    background: rgba(255, 255, 255, 1);
-    border-bottom: 1px solid rgba(234, 234, 234, 1);
-    .top {
-        height: 78px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 0 30px;
-        span {
-            font-size: 18px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 78px;
-        }
-        .btn {
-            float: right;
-            margin-top: 20px;
-        }
-    }
-
-    .content {
-        padding: 0 30px;
-        min-height: 450px;
-        .title {
-            font-size: 14px;
-            font-family: MicrosoftYaHei-Bold;
-            font-weight: bold;
-            color: rgba(11, 158, 192, 1);
-            line-height: 19px;
-            margin-bottom: 20px;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 20px;
-        }
-
-        .imgList {
-            margin-top: 20px;
-        }
-    }
-
-    .bottom {
-        height: 58px;
-        border-top: 1px solid rgba(234, 234, 234, 1);
-        line-height: 58px;
-        padding: 0 30px;
-        margin-top: 20px;
-        span {
-            font-size: 14px;
-            color: #999;
-        }
-    }
-
-    .nothing {
-        margin-top: 20px;
-        img {
-            width: 167px;
-            height: 167px;
-            display: block;
-            margin: auto;
-        }
-
-        p {
-            font-size: 14px;
-            text-align: center;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-top: 24px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/OrderPreview.vue

@@ -1,282 +0,0 @@
-<template>
-    <div class="container">
-        <div class="top" v-if="orderInfo.productInfo">
-            <span>照片预览</span>
-            <span style="margin-left:10px;">订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-        </div>
-
-        <div class="content">
-
-            <div class="imgList">
-                <div class="title">原<br/>片</div>
-                <img-item v-for="(item,index) in orderImage" @changeRemark="getImage" :label='"originalImage"' :index='index' :img='item' :imgStyle='"preView"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-            </div>
-
-            <div class="imgList" style="margin-top:50px;" v-if="orderInfo.statusFlag>2">
-                <div class="title" style="color:#FB6E08">成<br/>片</div>
-                <img-item v-for="(item,index) in orderImage" @changeRemark="getImage" :label='"finishedImage"' :index='index' :img='item' :imgStyle='"preView"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-            </div>
-
-        </div>
-        <div v-if='totalNumber>7'>
-            <el-pagination background @current-change="currentPageChange" :current-page="currentPage" :page-size="7" layout="total, prev, pager, next" :total="totalNumber">
-            </el-pagination>
-        </div>
-
-        <div class="bottom">
-            <span v-if="canUploadNum>0">当前已上传{{orderImage.length}}张图片，还需上传{{canUploadNum}}张</span>
-            <span v-else>全部{{orderImage.length}}张图片</span>
-            <!-- <el-button style="float:right;margin:10px;" v-if="isSuccess" type="primary" class="btn" @click="submit">审核通过</el-button> -->
-            <!-- <el-button style="float:right;margin:10px;" v-if="isFail" type="warning" class="btn" @click="submit">确认提交第{{orderInfo.orderRepairList.length+1}}次返修</el-button> -->
-        </div>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import imgItem from '../components/ImgItem'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-
-            }
-        })
-
-        this.getImage()
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        url() {
-            return baseUrl + '/assets/uploadFile'
-        },
-        allImage() {
-            var list = []
-            this.addImage.forEach(item => {
-                list.push(item.originalImage)
-            })
-            return list
-        },
-        canUploadNum() {
-            var num = 0
-            if (this.orderInfo.quantity) {
-                num = this.orderInfo.quantity - this.orderImage.length
-            }
-            return num
-        }
-    },
-    data() {
-        return {
-            orderInfo: {},
-            dialogVisible: false,
-            addImage: [],
-            orderImage: [],
-            currentPage: 1,
-            totalNumber: 0,
-            isSuccess: false,
-            isFail: false
-        }
-    },
-    methods: {
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getImage();
-        },
-        getImage() {
-            this.orderImage = []
-            this.$http.get({
-                url: '/orderImage/page',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    currentPage: this.currentPage,
-                    pageNumber: 7,
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.orderImage = res.data.pp
-                    this.totalNumber = res.data.page.totalNumber;
-                }
-            })
-            this.isSuccess = false
-            this.isFail = false
-            this.$http.get({
-                url: '/orderImage/all',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    statusFlag: 0
-                }
-            }).then(res => {
-                if (res.success) {
-                    if (res.data.length == 0) {
-                        this.$http.get({
-                            url: '/orderImage/all',
-                            data: {
-                                orderId: this.$route.query.orderId,
-                                statusFlag: 2
-                            }
-                        }).then(res => {
-                            if (res.data.length == 0) {
-                                this.isSuccess = true
-                            }
-                            else {
-                                this.isFail = true
-                            }
-                        })
-                    }
-                }
-            })
-        },
-        chooseImg(index) {
-            console.log(index)
-        },
-        changeRemark(json) {
-            // if(this.changeRemark.j)
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-            var list = []
-            fileList.forEach(item => {
-                item.response.data.forEach(todo => {
-                    var jsop = {
-                        originalImage: todo,
-                        remark: ''
-                    }
-                    list.push(jsop)
-                })
-            })
-            this.addImage = list
-        },
-        handleSuccess(res) {
-            res.data.forEach(item => {
-                if (this.allImage.indexOf(item) == -1 && this.addImage.length <= this.canUploadNum) {
-                    var jsop = {
-                        originalImage: item,
-                        remark: ""
-                    }
-                    this.addImage.push(jsop)
-                }
-                else if (this.addImage.length > this.canUploadNum) {
-                    this.$message({
-                        message: '已经上传' + this.addImage.length + '张图片了，请预览后确认图片',
-                        type: 'warning'
-                    });
-                }
-            })
-        },
-        delImg(index) {
-            this.addImage.splice(index, 1)
-        },
-        upload() {
-            this.saveImage(0)
-        },
-        saveImage(i) {
-            if (i == this.allImage.length) {
-                this.$message.success('成功');
-                this.dialogVisible = false
-                this.getImage()
-            }
-            else {
-                var data = {
-                    originalImage: this.allImage[i],
-                    orderId: this.orderInfo.id,
-                    userId: this.userInfo.id,
-                    storeId: this.orderInfo.storeId
-
-                }
-                this.$http.post({
-                    url: '/orderImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(i + 1)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        submit() {
-            this.$http.post({
-                url: '/userOrder/update',
-                data: {
-                    id: this.orderInfo.id,
-                    statusFlag: 5
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.$message.success('提交成功');
-                    history.back()
-
-                }
-            })
-        }
-    },
-    components: {
-        imgItem
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-bottom: 1px solid rgba(234, 234, 234, 1);
-    .top {
-        height: 78px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 0 30px;
-        span {
-            font-size: 16px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 78px;
-        }
-        .btn {
-            float: right;
-            margin-top: 20px;
-        }
-    }
-
-    .content {
-        padding: 0 30px;
-        min-height: 450px;
-        .title {
-            font-size: 14px;
-            font-family: MicrosoftYaHei-Bold;
-            font-weight: bold;
-            color: rgba(11, 158, 192, 1);
-            line-height: 19px;
-            margin-bottom: 20px;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 20px;
-        }
-
-        .imgList {
-            margin-top: 20px;
-        }
-    }
-
-    .bottom {
-        height: 58px;
-        border-top: 1px solid rgba(234, 234, 234, 1);
-        line-height: 58px;
-        padding: 0 30px;
-        margin-top: 20px;
-        span {
-            font-size: 14px;
-            color: #999;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/OrderStep.vue

@@ -1,149 +0,0 @@
-<template>
-
-    <div class="lineContent">
-        <div class="line-item" :class="{active:nowStep>=1}">
-            <div class="title">提交订单</div>
-            <div class="ball">1</div>
-        </div>
-        <div class="line-item" :class="{active:nowStep>=2}">
-            <div class="title">支付到第三方平台</div>
-            <div class="ball">2</div>
-        </div>
-        <div class="line-item" :class="{active:nowStep>=3}">
-            <div class="title">物流发货</div>
-            <div class="ball">3</div>
-        </div>
-        <div class="line-item" :class="{active:nowStep>=4}">
-            <div class="title">评价</div>
-            <div class="ball">4</div>
-        </div>
-        <div class="line">
-            <div class="line-color" :style="{width:(nowStep*25)+'%'}"></div>
-        </div>
-    </div>
-
-</template>
-
-<script>
-export default {
-    name: 'orderStep',
-    data() {
-        return {
-            nowStep: 1,
-        }
-    },
-    watch: {
-        $route() {
-            this.getStep()
-        }
-    },
-    computed: {
-    },
-    mounted() {
-        this.getStep()
-    },
-    methods: {
-        getStep() {
-            if (this.$route.name == 'submit') {
-                this.nowStep = 1
-            }
-            else if (this.$route.name == 'payOrder') {
-                this.nowStep = 2
-            }
-            else if (this.$route.name == 'orderDetail') {
-                this.nowStep = 3
-            }
-        }
-
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.Head {
-    height: 70px;
-    background: rgba(255, 255, 255, 1);
-    box-shadow: 0px 1px 2px 0px rgba(199, 199, 199, 0.5);
-    .HeadContent {
-        width: 1190px;
-        margin: auto;
-        height: 70px;
-        line-height: 70px;
-
-        img {
-            width: 300px;
-            height: 54px;
-            vertical-align: middle;
-        }
-    }
-}
-
-.lineContent {
-    width: 1190px;
-    margin: auto;
-    padding: 37px 0 41px;
-    font-size: 0;
-    position: relative;
-    .line-item {
-        width: 25%;
-        display: inline-block;
-        z-index: 2;
-        position: relative;
-
-        .title {
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 16px;
-            text-align: center;
-        }
-
-        .ball {
-            width: 20px;
-            height: 20px;
-            background: rgba(198, 198, 198, 1);
-            border: 2px solid rgba(151, 151, 151, 0.5);
-            font-size: 12px;
-            font-family: MicrosoftYaHei;
-            font-weight: bold;
-            color: rgba(255, 255, 255, 1);
-            line-height: 20px;
-            text-align: center;
-            border-radius: 100%;
-            margin: 8px auto 0;
-        }
-
-        &.active {
-            .title {
-                color: #0b9ec0;
-            }
-            .ball {
-                background: #1bb8ac;
-                border-color: #0b9ec0;
-            }
-        }
-    }
-
-    .line {
-        width: 100%;
-        height: 8px;
-        background: rgba(204, 204, 204, 1);
-        border-radius: 4px;
-        position: absolute;
-        bottom: 49px;
-        left: 0;
-        z-index: 1;
-
-        .line-color {
-            height: 8px;
-            background: linear-gradient(141deg, rgba(27, 184, 172, 1) 0%, rgba(0, 142, 205, 1) 100%);
-            border-radius: 4px;
-        }
-    }
-}
-
-.order {
-    width: 1190px;
-    margin: auto;
-}
-</style>

src/main/vue/src/pagesPre/OrderUpload.vue

@@ -1,399 +0,0 @@
-<template>
-    <div class="container">
-        <div class="top" v-if="orderInfo.productInfo">
-            <span>订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-            <span style="font-size:14px;margin-left:20px;">已上传/总张数：{{orderImage.length}} / {{orderInfo.quantity}}</span>
-            <span v-if="canUploadNum<0" style="font-size:14px;color:red;margin-left:10px">超出{{0-canUploadNum}}张</span>
-            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="tip=[],dialogVisible=true,upLoadImg=[],addImage=[],num=0,maxNum=orderInfo.quantity-orderImage.length,chooseName=[]">上传图片</el-button>
-
-            <el-button style="float:right;margin:20px;" v-if='canSubmit&&canUploadNum==0' type="warning" class="btn" @click="submit">确定</el-button>
-        </div>
-
-        <!-- <el-upload class="upload-demo" :file-list="upLoadImg" drag :limit="canUploadNum" :action="url" :before-upload="handleOn" multiple :on-success='handleSuccess' :on-remove="handleRemove">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text">将文件拖到此处，或
-                <em>点击上传</em>
-            </div>
-            <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
-        </el-upload> -->
-
-        <el-dialog title="上传图片" class="uploadDialog" :class="{uploadSmall:(maxNum<15)}" :visible.sync="dialogVisible" :show-close='(orderInfo.quantity-maxNum+num)==orderImage.length' :width="maxNum>50?'80%':'50%'" :top="maxNum>50?'50px':'15vh'" :close-on-click-modal='false'>
-            <div v-if="tip.length>0" class="tip" style="margin-bottom:10px;">
-                <template v-if="tip[0].indexOf('正在压缩')!=-1">
-                    <i class="el-icon-loading"></i>{{tip[0]}}请不要关闭窗口耐心等待
-                </template>
-                <template v-else>
-                    {{tip[0]}}
-                </template>
-            </div>
-            <el-upload class="upload-demo" style="width:100%" :limit="maxNum" :file-list="upLoadImg" drag :action="url" :before-upload="handleOn" :on-progress='handleProgress' multiple :on-success='handleSuccess' :on-remove="handleRemove" :on-error='handleError'>
-                <i class="el-icon-upload"></i>
-                <div class="el-upload__text">将文件拖到此处，或
-                    <em>点击上传</em>
-                </div>
-                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件,已上传/总张数：{{orderImage.length}} / {{orderInfo.quantity}}&nbsp;&nbsp;&nbsp;还可以选择{{maxNum-num}}张</div>
-            </el-upload>
-        </el-dialog>
-
-        <div class="content">
-            <template v-if="orderImage.length>0">
-                <div class="title">原片</div>
-                <div class="imgList">
-                    <img-item v-for="(item,index) in orderImage" @changeRemark="changeRemark" :canCancel='canSubmit' :storeType='true' :label='"originalImage"' :index='index' :img='item' :imgStyle='"upload"' @delImg='delImg' style="display:inline-block;margin:0 30px 30px 0;"></img-item>
-                </div>
-            </template>
-
-            <div v-else class="nothing">
-                <img src="../assetsPre/nothingImg.png" alt="">
-                <p>还没有图片哦，快去上传吧～</p>
-            </div>
-
-        </div>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import imgItem from '../components/ImgItem'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-
-                if (this.orderInfo.statusFlag != 1) {
-
-
-                    this.canSubmit = false
-                }
-
-            }
-        })
-
-        this.getImage()
-
-
-
-
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        url() {
-            return baseUrl + '/orderImage/uploadFileForOrder?storeId=' + this.orderInfo.storeId + '&orderId=' + this.orderInfo.id + '&userId=' + this.userInfo.id + '&typeFlag=original'
-        },
-        allImage() {
-            var list = []
-            this.addImage.forEach(item => {
-                list.push(item.url)
-            })
-            return list
-        },
-        canUploadNum() {
-            var num = 0
-            if (this.orderInfo.quantity) {
-                num = this.orderInfo.quantity - this.orderImage.length
-            }
-
-            return num
-        },
-        orderImgId() {
-            var list = []
-            this.orderImage.forEach(item => {
-                list.push(item.id)
-            })
-            return list
-        },
-        orderImgName() {
-            var list = []
-            this.orderImage.forEach(item => {
-                list.push(item.imageName)
-            })
-            return list
-        },
-    },
-    data() {
-        return {
-            orderInfo: {},
-            dialogVisible: false,
-            addImage: [],
-            orderImage: [],
-            canSubmit: true,
-            upLoadImg: [],
-            num: 0,
-            loading: false,
-            tip: [],
-            realNum: 0,
-            maxNum: 0,
-            AddImageloading: false,
-            chooseName: []
-        }
-    },
-    methods: {
-        getImage() {
-            const loading = this.$loading({
-                lock: true,
-                text: '正在加载中',
-            });
-
-            this.orderImage = []
-            this.$http.get({
-                url: '/orderImage/all',
-                data: {
-                    orderId: this.$route.query.orderId
-                }
-            }).then(res => {
-                if (res.success) {
-
-                    res.data.forEach(item => {
-                        item.isSuccess = true
-                    })
-                    this.orderImage = res.data
-                    this.realNum = res.data.length
-                    loading.close();
-
-
-                }
-            })
-        },
-        chooseImg(index) {
-            // console.log(index)
-        },
-        changeRemark(json) {
-            if (this.orderImgId.indexOf(json.id) != -1) {
-                this.addImage[this.orderImgId.indexOf(json.id)].remark = json.remark
-            }
-        },
-        handleRemove(file, fileList) {
-
-        },
-        handleSuccess(res) {
-            // console.log(res)
-            var tips = [...this.tip]
-            tips.forEach((item, index) => {
-                var list = item.split('文件正在压缩')
-                if (list[0] === res.data[0].imageName) {
-                    tips.splice(index, 1)
-                }
-            })
-            tips.splice(0, 0, res.data[0].imageName + '文件上传成功')
-            this.tip = tips
-            setTimeout(() => {
-                var tips = [...this.tip]
-                tips.forEach((item, index) => {
-                    if (item.indexOf('文件上传成功') != -1) {
-                        tips.splice(index, 1)
-                    }
-                })
-                this.tip = tips
-            }, 1000)
-
-
-            if (this.orderImgId.indexOf(res.data[0].id) == -1) {
-                this.orderImage.splice(0, 0, res.data[0])
-            }
-            else {
-                this.orderImage.splice(this.orderImgId.indexOf(res.data[0].id), 1, res.data[0])
-            }
-
-        },
-        handleError(file, fileList) {
-            this.num = fileList.length
-        },
-        handleProgress(e, file) {
-            // console.log(e, file)
-            if (e.percent == 100) {
-                this.tip.splice(0, 0, file.name + '文件正在压缩')
-            }
-
-        },
-        handleOn(file, fileList) {
-            // console.log(fileList)
-            const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
-            if (!isJPG) {
-                // this.$message.error('上传头像图片只能是 JPG 格式!');
-            }
-            else {
-                if (this.chooseName.indexOf(file.name) != -1) {
-                    return false
-                }
-                else {
-                    if (this.orderImgName.indexOf(file.name) != -1) {
-                        return false
-                    }
-
-                    this.chooseName.push(file.name)
-                }
-
-
-                this.loading = true
-                this.num++
-            }
-
-
-
-
-            return isJPG
-        },
-        delImg(id) {
-
-            if (this.orderImgId.indexOf(id) != -1) {
-                this.orderImage.splice(this.orderImgId.indexOf(id), 1)
-            }
-
-        },
-        upload() {
-            this.saveImage(0)
-        },
-        saveImage(i) {
-            if (i == this.allImage.length) {
-                this.$message.success('成功');
-                this.dialogVisible = false
-                this.getImage()
-            }
-            else {
-                var data = {
-                    originalImage: this.addImage[i].url,
-                    orderId: this.orderInfo.id,
-                    userId: this.userInfo.id,
-                    storeId: this.orderInfo.storeId,
-                    imageName: this.addImage[i].imageName,
-                    originalSize: this.addImage[i].imageSize,
-                    originalArtwork: this.addImage[i].artworkUrl
-
-                }
-                this.$http.post({
-                    url: '/orderImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(i + 1)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        submit() {
-
-
-            this.$http.get({
-                url: '/orderImage/getTotalNum',
-                data: {
-                    orderId: this.orderInfo.id,
-                }
-            }).then(res => {
-                if (res.data.totalNum != res.data.orderNum) {
-                    this.$alert('图片数量有问题，不能上传哦！', '提示', {
-                        confirmButtonText: '确定',
-                        callback: action => {
-                            this.getImage()
-                        }
-                    });
-                }
-                else {
-                    this.$http.post({
-                        url: '/userOrder/update',
-                        data: {
-                            id: this.orderInfo.id,
-                            statusFlag: this.orderInfo.statusFlag + 1
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            this.$http.post({
-                                url: '/orderImage/delOssImage',
-                                data: {
-                                    orderId: this.orderInfo.id
-                                }
-                            })
-                            this.$message.success('上传图片成功');
-                            history.back()
-
-                        }
-                    })
-                }
-            })
-
-
-        }
-    },
-    components: {
-        imgItem
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-bottom: 1px solid rgba(234, 234, 234, 1);
-    .top {
-        height: 78px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 0 30px;
-        span {
-            font-size: 18px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 78px;
-        }
-        .btn {
-            float: right;
-            margin-top: 20px;
-        }
-    }
-
-    .content {
-        padding: 0 30px;
-        min-height: 500px;
-        .title {
-            font-size: 14px;
-            font-family: MicrosoftYaHei-Bold;
-            font-weight: bold;
-            color: rgba(11, 158, 192, 1);
-            line-height: 19px;
-            padding: 19px 0 10px;
-        }
-
-        .imgList {
-        }
-    }
-
-    .bottom {
-        height: 58px;
-        border-top: 1px solid rgba(234, 234, 234, 1);
-        line-height: 58px;
-        padding: 0 30px;
-        span {
-            font-size: 14px;
-            color: #999;
-        }
-    }
-
-    .nothing {
-        margin-top: 136px;
-        img {
-            width: 167px;
-            height: 167px;
-            display: block;
-            margin: auto;
-        }
-
-        p {
-            font-size: 14px;
-            text-align: center;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-top: 24px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/OrderUploadChange.vue

@@ -1,607 +0,0 @@
-<template>
-    <div class="container" v-loading='loading' element-loading-text="上传图片中，时间或许会很久，请耐心等待哦！">
-        <div class="top" v-if="orderInfo.productInfo">
-            <span>订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-            <span style="color:#666;font-size:14px;margin-left:20px">全部{{allNumber}}张图片,还需上传{{notUp}}张</span>
-            <el-button style="float:right;margin:15px 10px 0 20px;width:100px" v-if="!notUp" type="primary" class="btn" @click="submit">提交</el-button>
-            <el-select v-if="!isChange" size="mini" style="float:right;margin-top:25px;width:120px" clearable v-model="unFinished" placeholder="筛选状态" @change="getImage">
-                <el-option key="1" label="未上传" value="1">
-                </el-option>
-                <el-option key="0" label="已上传" value="0">
-                </el-option>
-            </el-select>
-            <el-button type="primary" size="mini" style="float:right;margin-top:25px;margin-right:20px" class="btn" plain @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">批量上传</el-button>
-        </div>
-
-        <div class="content">
-
-            <template v-if="orderImage.length>0">
-                <div class="imgList">
-                    <div class="title">原<br/>片</div>
-                    <img-item v-for="(item,index) in orderImage" @changeRemark="getImage" :label='"originalImage"' :index='index' :img='item' :imgStyle='"showInfo"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-                </div>
-
-                <div class="imgList" style="margin-top:50px;">
-                    <div class="title" style="color:#FB6E08">成<br/>片</div>
-                    <div style="display:inline-block;vertical-align: middle" v-for="(item,index) in orderImage">
-                        <single-upload-title v-if="!item.finishedImage||item.statusFlag==2" class="box" :needName='item.imageName' :nowIndex='index' :url='url' @input="changeImg" @start='loading=true' :title='"上传成片"' :width='120' :height='150'>
-                        </single-upload-title>
-                        <img-item v-if="item.finishedImage" :isChange='isChange' @changeRemark="changeRemark" :label='"finishedImage"' :index='index' :img='item' :imgStyle='"storeUpload"' @delImg='getImage' style="display:inline-block;margin:0 30px 0 0;vertical-align: middle;"></img-item>
-
-                    </div>
-                </div>
-            </template>
-            <div v-else class="nothing">
-                <img src="../assetsPre/nothingImg.png" alt="">
-                <p>没有图片哦!</p>
-            </div>
-
-        </div>
-
-        <el-pagination v-if="totalNumber>7" background :page-size="7" @current-change="currentPageChange" :current-page="currentPage" layout="total, prev, pager, next" :total="totalNumber">
-        </el-pagination>
-
-        <div class="bottom">
-            <template v-if="!isChange">
-                <!-- <span v-if="canUploadNum>0">当前已上传{{orderImage.length}}张图片，还需上传{{canUploadNum}}张</span> -->
-
-            </template>
-
-        </div>
-
-        <el-dialog title="上传图片" class="uploadDialog" :visible.sync="dialogVisible" width="80%" top="50px" :close-on-click-modal='false'>
-            <div v-if="tip.length>0" class="tip" style="margin-bottom:10px;">
-                <template v-if="tip[0].indexOf('正在压缩')!=-1">
-                    <i class="el-icon-loading"></i>{{tip[0]}}请不要关闭窗口耐心等待
-                </template>
-                <template v-else>
-                    {{tip[0]}}
-                </template>
-            </div>
-            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" multiple :before-upload="handleOn" :on-success='handleSuccess' :on-progress='handleProgress' :on-remove="handleRemove">
-                <i class="el-icon-upload"></i>
-                <div class="el-upload__text">将文件拖到此处，或
-                    <em>点击上传</em>
-                </div>
-                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件,已上传/总张数：{{orderInfo.quantity-notUp}} / {{orderInfo.quantity}}</div>
-            </el-upload>
-
-            <!-- <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="upload" :loading="isLoading">确 定</el-button>
-            </span> -->
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import imgItem from '../components/ImgItem'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-export default {
-    created() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-                if (this.$route.query.repairId) {
-                    this.repairId = this.$route.query.repairId
-                }
-                else {
-                    if (this.orderInfo.orderRepairList.length > 0) {
-                        this.repairId = this.orderInfo.orderRepairList[0].id
-                    }
-
-                }
-                this.getImage()
-            }
-        })
-
-        if (this.$route.query.isChange) {
-            this.isChange = true
-        }
-
-        // //获取全部修图数量
-        // this.$http.get({
-        //     url: '/orderImage/page',
-        //     data: {
-        //         orderId: this.$route.query.orderId,
-        //         currentPage: 1,
-        //         pageNumber: 1,
-        //         repairId: this.$route.query.repairId,
-        //     }
-        // }).then(res => {
-        //     if (res.success) {
-
-        //         this.allNumber = res.data.page.totalNumber;
-        //     }
-        // })
-
-
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        url() {
-            return baseUrl + '/orderImage/uploadFileForOrder?storeId=' + this.orderInfo.storeId + '&orderId=' + this.orderInfo.id + '&userId=' + this.userInfo.id + '&typeFlag=finished'
-        },
-        repairNum() {
-            var num = 0
-            if (this.orderInfo.orderRepairList.length) {
-                num = this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].typeFlag + 1
-                if (this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].statusFlag != 0) {
-                    num++
-                }
-            }
-
-            return num
-        },
-        orderImgId() {
-            var list = []
-            this.orderImage.forEach(item => {
-                list.push(item.id)
-            })
-            return list
-        }
-    },
-    data() {
-        return {
-            tip: [],
-            orderInfo: {},
-            dialogVisible: false,
-            addImage: [],
-            orderImage: [],
-            currentPage: 1,
-            totalNumber: 0,
-            isSuccess: false,
-            isFail: false,
-            repairId: 0,
-            isChange: false,
-            unFinished: '',
-            upLoadImg: [],
-            notUp: 0,
-            allNumber: 0,
-            num: 0,
-            isLoading: false,
-            loading: false,
-        }
-    },
-    methods: {
-        handleOn(file) {
-            const isJPG = (file.type === 'image/jpeg' || file.type === 'image/png');
-            if (!isJPG) {
-                return isJPG
-            }
-
-
-            return new Promise((resolve, reject) => {
-                this.$http.get({
-                    url: '/orderImage/getOne',
-                    data: {
-                        orderId: this.$route.query.orderId,
-                        imageName: file.name
-                    }
-                }).then(res => {
-                    if (res.data) {
-                        if (res.data.statusFlag == 1) {
-
-                            reject()
-                        }
-                        else {
-                            this.num++
-                            resolve()
-                        }
-
-                    }
-                    else {
-                        this.$message({
-                            message: file.name + '图片不在任务中，不能上传',
-                            type: 'warning'
-                        });
-                        reject()
-                    }
-                })
-            })
-
-
-
-
-        },
-        changeRemark() {
-            if (!this.repairId) {
-                this.$http.get({
-                    url: '/userOrder/getOne',
-                    data: {
-                        id: this.$route.query.orderId
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.orderInfo = res.data
-                        if (this.$route.query.repairId) {
-                            this.repairId = this.$route.query.repairId
-                        }
-                        else {
-                            if (this.orderInfo.orderRepairList.length > 0) {
-                                this.repairId = this.orderInfo.orderRepairList[0].id
-                            }
-
-                        }
-                        this.getImage()
-                    }
-                })
-
-
-            }
-            else {
-                this.getImage()
-            }
-        },
-        currentPageChange(page) {
-            this.currentPage = page;
-            this.getImage();
-        },
-        getImage() {
-            var data = {
-                orderId: this.$route.query.orderId,
-                currentPage: this.currentPage,
-                pageNumber: 7,
-            }
-
-            //普通审核筛选
-            if (this.unFinished) {
-                data.unFinished = this.unFinished
-            }
-
-            //返修筛选
-            if (this.$route.query.repairId) {
-                data.repairId = this.$route.query.repairId
-                if (data.unFinished == '1') {
-                    data.statusFlag = 2
-                }
-                else if (data.unFinished == '0') {
-                    data.statusFlag = 0
-                }
-                data.unFinished = ''
-                data.baseRepairId = this.$route.query.repairId
-
-
-            }
-
-            this.orderImage = []
-            this.$http.get({
-                url: '/orderImage/page',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.orderImage = res.data.pp
-                    this.totalNumber = res.data.page.totalNumber;
-                    this.allNumber = res.data.page.totalNumber;
-                }
-            })
-
-            //未上传数量
-            this.$http.get({
-                url: '/orderImage/all',
-                data: {
-                    orderId: this.$route.query.orderId,
-                    unFinished: this.$route.query.repairId ? '' : 1,
-                    repairId: this.$route.query.repairId,
-                    statusFlag: this.$route.query.repairId ? 2 : ''
-                }
-            }).then(res => {
-                this.notUp = res.data.length
-            })
-
-
-        },
-        chooseImg(index) {
-            console.log(index)
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-            // var list = []
-            // fileList.forEach(item => {
-            //     item.response.data.forEach(todo => {
-            //         var jsop = {
-            //             originalImage: todo,
-            //             remark: ''
-            //         }
-            //         list.push(jsop)
-            //     })
-            // })
-            // this.addImage = list
-            this.num = this.addImage.length
-        },
-        handleProgress(e, file) {
-            if (e.percent == 100) {
-                this.tip.splice(0, 0, file.name + '文件正在压缩')
-            }
-        },
-        handleSuccess(res, flie) {
-            console.log(res)
-            var tips = [...this.tip]
-            tips.forEach((item, index) => {
-                var list = item.split('文件正在压缩')
-                if (list[0] === flie.name) {
-                    tips.splice(index, 1)
-                }
-            })
-            tips.splice(0, 0, flie.name + (res.success ? '文件上传成功' : '上传失败'))
-            this.tip = tips
-            setTimeout(() => {
-                var tips = [...this.tip]
-                tips.forEach((item, index) => {
-                    if (item.indexOf((res.success ? '文件上传成功' : '上传失败')) != -1) {
-                        tips.splice(index, 1)
-                    }
-                })
-                this.tip = tips
-            }, 1000)
-            if (res.success) {
-                if (this.orderImgId.indexOf(res.data[0].id) != -1) {
-                    this.$http.get({
-                        url: '/orderImage/all',
-                        data: {
-                            orderId: this.$route.query.orderId,
-                            unFinished: this.$route.query.repairId ? '' : 1,
-                            repairId: this.$route.query.repairId,
-                            statusFlag: this.$route.query.repairId ? 2 : ''
-                        }
-                    }).then(res => {
-                        this.notUp = res.data.length
-                    })
-                    this.orderImage.splice(this.orderImgId.indexOf(res.data[0].id), 1, res.data[0])
-                }
-            }
-            else {
-                return false
-            }
-
-        },
-        delImg(index) {
-            this.addImage.splice(index, 1)
-        },
-        upload() {
-            const loading = this.$loading({
-                lock: true,
-                text: '加载中',
-            });
-            var id = []
-            this.addImage.forEach(item => {
-                id.push(item.id)
-            })
-            this.$http.post({
-                url: '/orderImage/updateFinishedImages',
-                data: {
-                    imageIds: id.toString(),
-                    orderId: this.orderInfo.id
-                }
-            }).then(res => {
-                if (res.success) {
-                    loading.close();
-                    this.$message.success('成功');
-                    this.dialogVisible = false
-                    this.getImage()
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        saveImage(i) {
-            if (i == this.allImage.length) {
-                this.$message.success('成功');
-                this.dialogVisible = false
-                this.getImage()
-            }
-            else {
-                var data = {
-                    originalImage: this.allImage[i],
-                    orderId: this.orderInfo.id,
-                    userId: this.userInfo.id,
-                    storeId: this.orderInfo.storeId
-
-                }
-                this.$http.post({
-                    url: '/orderImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(i + 1)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        submit() {
-            this.$http.post({
-                url: '/orderImage/delOssImage',
-                data: {
-                    orderId: this.orderInfo.id
-                }
-            })
-            if (this.$route.query.repairId) {
-                if (this.orderInfo.orderRepairList.length == 3 && this.orderInfo.orderRepairList[this.orderInfo.orderRepairList.length - 1].typeFlag == 2) {
-                    this.$http.post({
-                        url: '/orderRepair/update',
-                        data: {
-                            id: this.$route.query.repairId,
-                            statusFlag: 3
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            this.$http.post({
-                                url: '/userOrder/update',
-                                data: {
-                                    id: this.orderInfo.id,
-                                    statusFlag: 3
-                                }
-                            }).then(res2 => {
-                                if (res2.success) {
-                                    // this.$message.success('提交成功');
-                                    // history.back()
-
-                                    this.$http.post({
-                                        url: '/userOrder/confirm',
-                                        data: {
-                                            id: this.orderInfo.id,
-                                        }
-                                    }).then(res3 => {
-                                        if (res3.success) {
-                                            this.$message.success('提交成功');
-                                            history.back()
-                                        }
-                                    })
-                                }
-                            })
-
-                        }
-                    })
-                }
-                else {
-                    this.$http.post({
-                        url: '/orderRepair/update',
-                        data: {
-                            id: this.$route.query.repairId,
-                            statusFlag: 2
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            this.$message.success('提交成功');
-                            history.back()
-
-                        }
-                    })
-                }
-
-            }
-            else {
-                this.$http.post({
-                    url: '/userOrder/update',
-                    data: {
-                        id: this.orderInfo.id,
-                        statusFlag: 3
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('提交成功');
-                        history.back()
-
-                    }
-                })
-            }
-
-        },
-        changeImg(newVal) {
-            this.$message.success('提交成功');
-            this.loading = false
-            this.getImage()
-        },
-        updateImg(index, img, size, artworkUrl) {
-            this.$http.post({
-                url: '/orderImage/update',
-                data: {
-                    id: this.orderImage[index].id,
-                    finishedImage: img,
-                    finishedSize: size,
-                    statusFlag: 0,
-                    finishedArtwork: artworkUrl
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.getImage()
-
-                }
-            })
-        }
-    },
-    components: {
-        imgItem
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background: rgba(255, 255, 255, 1);
-    border-bottom: 1px solid rgba(234, 234, 234, 1);
-    .top {
-        height: 78px;
-        background: rgba(255, 255, 255, 1);
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 0 30px;
-        span {
-            font-size: 18px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 78px;
-        }
-        .btn {
-            float: right;
-            margin-top: 20px;
-        }
-    }
-
-    .content {
-        padding: 0 30px;
-        min-height: 450px;
-        .title {
-            font-size: 14px;
-            font-family: MicrosoftYaHei-Bold;
-            font-weight: bold;
-            color: rgba(11, 158, 192, 1);
-            line-height: 19px;
-            margin-bottom: 20px;
-            display: inline-block;
-            vertical-align: middle;
-            margin-right: 20px;
-        }
-
-        .imgList {
-            margin-top: 20px;
-        }
-    }
-
-    .bottom {
-        height: 58px;
-        border-top: 1px solid rgba(234, 234, 234, 1);
-        line-height: 58px;
-        padding: 0 30px;
-        margin-top: 20px;
-        span {
-            font-size: 14px;
-            color: #999;
-        }
-    }
-
-    .nothing {
-        margin-top: 20px;
-        img {
-            width: 167px;
-            height: 167px;
-            display: block;
-            margin: auto;
-        }
-
-        p {
-            font-size: 14px;
-            text-align: center;
-            color: rgba(51, 51, 51, 1);
-            line-height: 19px;
-            margin-top: 24px;
-        }
-    }
-
-    .box {
-        width: 120px;
-        height: 150px;
-        margin-right: 30px;
-        border-radius: 4px;
-    }
-}
-</style>

src/main/vue/src/pagesPre/PageBottom.vue

@@ -1,78 +0,0 @@
-<template>
-
-    <el-container class="conatinerPage">
-        <el-header height='100px'>
-            <logo-head></logo-head>
-        </el-header>
-        <el-main>
-            <div class="order">
-                <router-view ref='child'></router-view>
-            </div>
-        </el-main>
-        <el-footer height='104px'>
-            <logo-foot :isBottom='isBottom'></logo-foot>
-        </el-footer>
-    </el-container>
-
-</template>
-
-<script>
-import logoHead from '../pagesPre/LogoHead'
-import menuFoot from '../pagesPre/MenuFoot'
-import logoFoot from '../pagesPre/LogoFoot'
-export default {
-    name: 'order',
-    data() {
-        return {
-            isBottom: false,
-        }
-    },
-    watch: {
-    },
-    computed: {
-
-    },
-    mounted() {
-    },
-    methods: {
-        goNext(nextName) {
-            if (nextName) {
-                this.$router.push({
-                    name: nextName,
-                })
-            }
-
-        }
-    },
-    components: {
-        logoHead, menuFoot, logoFoot
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.conatinerPage {
-    background: #f9f9f9;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    min-width: 1190px;
-}
-
-.order {
-    width: 1190px;
-    margin: 20px auto;
-    background: rgba(255, 255, 255, 1);
-    border: 1px solid rgba(234, 234, 234, 1);
-    min-height: 700px;
-}
-
-.aside {
-    background: rgba(255, 255, 255, 1);
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-    padding: 10px 0;
-}
-</style>

src/main/vue/src/pagesPre/PayOrder.vue

@@ -1,232 +0,0 @@
-<template>
-    <div class="conatiner">
-        <div class="orderInfo">
-            <span style="margin-left:25px;">订单：{{orderInfo.orderCode}}</span>
-            <span style="margin-left:25px;">{{productInfo.title}}</span>
-            <span style="float:right">
-                <span>应付金额</span>
-
-                <span class="price" style="margin-left:10px;">¥</span>
-                <span class="price" style="color:#FC2703;margin-right:24px;font-weight:bold;">{{orderInfo.dealPrice}}</span>
-            </span>
-        </div>
-
-        <div class="orderTitle">
-            选择支付方式
-        </div>
-
-        <div class="orderWayTitle">
-            第三方账户支付
-        </div>
-
-        <div class="payStyle">
-            <template>
-                <el-radio v-model="payStyle" label="余额">
-                    <img style="width:45px;height:45px;margin-left:8px;border-radius:100%;vertical-align: middle;" src="../assetsPre/quckmenu.png" alt="">
-                    <span style="">余额支付</span>
-                </el-radio>
-                <el-radio v-model="payStyle" label="支付宝">
-                    <img style="width:88px;height:30px;margin-left:14px;" src="../assetsPre/pay1.png" alt="">
-                </el-radio>
-                <el-radio v-model="payStyle" label="微信">
-                    <img style="width:125px;height:43px;margin-left:8px;" class="payIcon" src="../assetsPre/pay2.png" alt="">
-                </el-radio>
-                <el-radio v-model="payStyle" label="银联">
-                    <img style="width:150px;height:39px;margin-left:8px;" class="payIcon" src="../assetsPre/pay3.png" alt="">
-                </el-radio>
-            </template>
-        </div>
-
-        <div class="pay-btn">
-            <el-button class="pay" type="primary" @click="payOrder">立即支付</el-button>
-        </div>
-    </div>
-</template>
-
-<script>
-import miniHead from '../components/MiniHead'
-import menuFoot from '../pagesPre/MenuFoot'
-import { mapState } from 'vuex'
-export default {
-    name: 'submit',
-    data() {
-        return {
-            tableData3: [],
-            productInfo: {},
-            num: 1,
-            remark: '',
-            orderInfo: {},
-            payStyle: '余额'
-        }
-    },
-    mounted() {
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-                this.productInfo = res.data.productInfo
-            }
-        }).catch(e => {
-            console.log(e)
-
-        })
-
-    },
-    computed: {
-        ...mapState(['userInfo']),
-    },
-    methods: {
-        payOrder() {
-
-            this.pay().then((value) => {
-                console.log(value)
-                if (value.success) {
-                    var confirmButtonText = '立即上传'
-                    if (this.productInfo.typeFlag == 1) {
-                        confirmButtonText = '查看订单详情'
-                    }
-                    this.$confirm('<img src="' + require('../assetsPre/success.png') + '" style="width:48px;height:47px;vertical-align: middle;"><span style="font-size:24px;font-family:MicrosoftYaHei;color:rgba(51,51,51,1);margin-left:12px;line-height:17px;vertical-align: middle;">订单支付成功！</span>', '', {
-                        confirmButtonText: confirmButtonText,
-                        cancelButtonText: '返回订单管理',
-                        dangerouslyUseHTMLString: true,
-                        center: true,
-                        cancelButtonClass: 'btn-cancel',
-                        confirmButtonClass: 'btn-confirm',
-                        closeOnClickModal: false,
-                    }).then(() => {
-                        if (this.productInfo.typeFlag == 1) {
-                            this.$router.replace({
-                                name: 'userOrder',
-                            })
-                        }
-                        else {
-                            this.$router.replace({
-                                name: 'orderUpload',
-                                query: {
-                                    orderId: this.$route.query.orderId
-                                }
-                            })
-                        }
-
-
-                    }).catch(() => {
-                        this.$router.replace({
-                            name: 'userOrder',
-                        })
-
-                    });
-                }
-                else {
-                    this.$confirm('<img src="' + require('../assetsPre/fail.png') + '" style="width:48px;height:47px;vertical-align: middle;"><span style="font-size:24px;font-family:MicrosoftYaHei;color:rgba(51,51,51,1);margin-left:12px;line-height:17px;vertical-align: middle;">' + value.error + '</span>', '', {
-                        confirmButtonText: '重新支付',
-                        cancelButtonText: '返回订单管理',
-                        dangerouslyUseHTMLString: true,
-                        center: true,
-                        cancelButtonClass: 'btn-cancel',
-                        confirmButtonClass: 'btn-confirm',
-                        closeOnClickModal: false,
-                    }).then(() => {
-
-                    }).catch(() => {
-                        this.$router.push({
-                            name: 'userOrder',
-                        })
-
-                    });
-                }
-            })
-
-
-
-        },
-        pay() {
-            return new Promise((resolve, reject) => {
-                if (this.payStyle == '余额') {
-                    this.$http.post({
-                        url: '/userOrder/pay',
-                        data: {
-                            orderId: this.$route.query.orderId,
-                            coin: 0,
-                            point: 0,
-                            cash: 0,
-                        }
-                    }).then(res => {
-                        resolve(res)
-                    }).catch(e => {
-                        console.log(e)
-
-                    })
-                }
-            })
-
-        }
-    },
-    components: {
-        miniHead, menuFoot
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.conatiner {
-    background-color: #fff;
-    padding: 18px 33px 31px 29px;
-    .orderInfo {
-        height: 50px;
-        background: rgba(246, 246, 246, 1);
-        line-height: 50px;
-
-        span {
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 50px;
-
-            &.price {
-                font-size: 24px;
-                font-family: MicrosoftYaHei;
-                color: rgba(153, 153, 153, 1);
-            }
-        }
-    }
-
-    .orderTitle {
-        margin: 26px 0 17px 25px;
-        font-size: 18px;
-        font-family: MicrosoftYaHei;
-        color: rgba(51, 51, 51, 1);
-        line-height: 24px;
-    }
-    .orderWayTitle {
-        width: 1131px;
-        height: 24px;
-        background: rgba(246, 246, 246, 1);
-        font-size: 12px;
-        font-family: MicrosoftYaHei;
-        color: rgba(51, 51, 51, 1);
-        line-height: 24px;
-        padding-left: 28px;
-    }
-
-    .payStyle {
-        margin-left: 25px;
-        line-height: 84px;
-        border-bottom: 1px solid #eaeaea;
-    }
-
-    .pay-btn {
-        overflow: hidden;
-
-        .pay {
-            width: 176px;
-            border-radius: 2px;
-            float: right;
-            margin-top: 86px;
-        }
-    }
-}
-</style>

src/main/vue/src/pagesPre/Product.vue

@@ -1,644 +0,0 @@
-<template>
-    <div class="conatiner">
-        <el-breadcrumb separator-class="el-icon-arrow-right" class="Breadcrumb">
-            <template v-for="(item,index) in hrefHistory">
-                <el-breadcrumb-item v-if="index<hrefHistory.length-1" :replace='true'>
-                    <a href="javaScript:void(0)" @click="goHistory(index)"> {{item.name}}</a>
-                </el-breadcrumb-item>
-                <el-breadcrumb-item v-else>{{item.name}}</el-breadcrumb-item>
-            </template>
-
-        </el-breadcrumb>
-
-        <div class="goods">
-            <div class="goodsImg" :style="{backgroundImage:'url('+shopInfo.image+')'}">
-
-            </div>
-
-            <div class="infos">
-                <div class="title">
-                    {{shopInfo.title}}
-                </div>
-                <div class="price" v-if="shopInfo.productPriceList.length>0">
-                    <div class="left">
-                        <div class="price-text">价格</div>
-                        <div class="price-text">起定量</div>
-                    </div>
-                    <div class="price-item" v-for="item in shopInfo.productPriceList">
-                        <div class="priceNum">
-                            <small>¥</small>{{item.price}}</div>
-                        <div class="price-text" v-if="item.maxCounts&&(item.minCounts||item.minCounts==0)">{{item.minCounts}}-{{item.maxCounts}}张</div>
-                        <div class="price-text" v-else-if='item.minCounts||item.minCounts==0'>{{item.minCounts}}张以上</div>
-                        <div class="price-text" v-else-if='item.maxCounts'>{{item.maxCounts}}张以下</div>
-                    </div>
-
-                </div>
-
-                <div v-else style="font-size:24px;color:rgba(251,110,8,1);line-height:26px;margin-top:10px;">¥{{shopInfo.price}}</div>
-
-                <div class="comment">
-                    <span>评价</span>
-                    <el-rate allow-half class="star" disabled v-model="commentVal" :colors="['#E96400', '#E96400', '#E96400']" disabled-void-color="#D4D4D4"></el-rate>
-                    <span style="color:#999999;">{{commentCount}}个评价</span>
-                    <span style="color:#666;margin-left:12px;">已售</span>
-                    <span style="color:#FB6E08;margin-left:5px;">{{shopInfo.salesVolume}}份</span>
-                </div>
-                <!-- <div class="comment">
-
-                </div> -->
-                <div class="comment">
-                    <span>数量</span>
-                    <el-input-number class="buyNum" size="mini" v-model="num" :min="1"></el-input-number>
-                    <span style="margin-left:20px">库存</span>
-                    <span style="color:#FB6E08;margin-left:5px;">{{shopInfo.inventory||0}}</span>
-                </div>
-
-                <!-- <button  @click="buy">立即购买</button> -->
-                <el-button type="warning" class="buy-btn" @click="buy">立即购买</el-button>
-            </div>
-            <div class="goodsInfo">
-                <div class="goodsTop">
-                    <div class="kuai"></div>
-                    <span>商家信息</span>
-                </div>
-                <div class="title">
-                    <div class="name">{{storeInfo.storeName}}</div>
-                    <img src="../assetsPre/location_pre.png" alt="">
-                    <div class="address">{{storeInfo.citye}}</div>
-                </div>
-                <div class="titlesub">
-                    {{storeInfo.description}}
-                </div>
-                <div class="subtitle">
-                    <span>响应时间 :</span>
-                    <span>{{storeInfo.responseTime}}分钟</span>
-                </div>
-                <div class="subtitle">
-                    <span>返片率 :</span>
-                    <span>{{storeInfo.reworkRate}}%</span>
-                </div>
-
-                <div class="ask" v-if="storeFlag">
-                    <img src="../assetsPre/kefu.png" alt="">
-                    <span>在线咨询</span>
-                </div>
-
-                <!-- <img src="../assetsPre/levelA.png" alt="" class="level"> -->
-                <div class="level" :style="{backgroundImage:'url('+require('../assetsPre/startLogo.png')+')'}">{{storeInfo.credit}}</div>
-            </div>
-
-        </div>
-
-        <div class="goodsList">
-            <el-tabs class="goodsTab" v-model="activeName">
-                <el-tab-pane label="商品详情" name="first">
-                    <div class="imgList productInfo">
-                        <div v-html="shopInfo.productDetail"></div>
-                        <!-- <img :src="item.image" v-for="item in shopInfo.productImageList" alt=""> -->
-                    </div>
-                </el-tab-pane>
-                <el-tab-pane label="服务详情" name="second">
-                    <div class="serviceDetai">
-                        {{shopInfo.serviceDetail}}
-                    </div>
-                </el-tab-pane>
-            </el-tabs>
-        </div>
-    </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-export default {
-    name: 'product',
-    data() {
-        return {
-            shopInfo: {
-                productPriceList: []
-            },
-            activeName: 'first',
-            goodsList: [],
-            commentCount: 0,
-            commentVal: 4,
-            num: 1,
-            storeInfo: {},
-            hrefHistory: []
-        }
-    },
-    computed: {
-        ...mapState(['userInfo']),
-        storeFlag() {
-            var result = false
-            if (this.userInfo) {
-                if (this.userInfo.storeFlag == 'N') {
-                    result = true
-                }
-            }
-            return result
-        }
-    },
-    mounted() {
-        console.log(this.userInfo)
-        console.log(this.$route.query.breHref)
-        var breHrefs = this.$route.query.breHref.split('_;')
-        breHrefs.forEach(item => {
-            if (item) {
-                var jsonp = {
-                    name: item.split(',')[0],
-                    href: item.split(',')[1]
-                }
-                this.hrefHistory.push(jsonp)
-            }
-        })
-
-        this.$http.get({
-            url: '/productInfo/getOne',
-            data: {
-                id: this.$route.query.id
-            }
-        }).then(res => {
-            if (res.success) {
-                this.shopInfo = res.data
-                this.storeInfo = res.data.storeInfo
-                document.title = res.data.title
-                var jsonp = {
-                    name: res.data.title,
-                    href: this.$route.name
-                }
-                this.hrefHistory.push(jsonp)
-
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-        this.$http.get({
-            url: '/productComment/count',
-            data: {
-                productId: this.$route.query.id,
-                typeFlag: 0
-            }
-        }).then(res => {
-            if (res.success) {
-                this.commentCount = res.data.commentCount
-                this.commentVal = parseFloat(res.data.starLevel)
-            }
-        }).catch(e => {
-            console.log(e)
-        })
-
-
-        // this.$http.get({
-        //     url: '/productInfo/all',
-        //     data: {
-        //         storeId: this.$route.query.id,
-        //         onShelf: 'Y',
-        //         useFlag: 'Y'
-        //     }
-        // }).then(res => {
-        //     if (res.success) {
-        //         this.goodsList = res.data
-        //     }
-        // }).catch(e => {
-        //     console.log(e)
-        // })
-
-    },
-    methods: {
-        scrollMenu() {
-
-        },
-        goHistory(i) {
-            this.$router.go(i - this.hrefHistory.length + 1)
-        },
-        buy() {
-            if (!this.userInfo) {
-                this.$router.push({
-                    name: 'login'
-                })
-                return
-            }
-
-            var inventory = this.shopInfo.inventory || 0
-
-            if (this.num > inventory) {
-                this.$message({
-                    message: '库存不足不能购买',
-                    type: 'warning'
-                });
-            }
-            else {
-                if (this.shopInfo.typeFlag == 1) {
-                    this.$alert('实体商品类目暂未开通购买，尽请期待', '暂未开通购买', {
-                        confirmButtonText: '确定',
-                        callback: action => {
-
-                        }
-                    });
-                    return
-                }
-
-
-                this.$router.push({
-                    name: 'submit',
-                    query: {
-                        productId: this.shopInfo.id,
-                        storeId: this.shopInfo.storeId,
-                        num: this.num
-                    }
-                })
-            }
-
-        }
-    }
-}
-</script>
-
-<style lang="less" scoped>
-.Breadcrumb {
-    padding: 21px 0 14px;
-    margin: auto;
-    width: 1190px;
-}
-
-.goods {
-    margin: auto;
-    width: 1146px;
-    overflow: hidden;
-    height: 270px;
-    padding: 22px;
-    position: relative;
-    font-size: 0;
-    height: 268px;
-    background-color: #fff;
-    display: block;
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-
-    .shop {
-        width: 350px;
-        display: inline-block;
-        height: 274px;
-        vertical-align: middle;
-        border-left: 1px solid #eaeaea;
-    }
-
-    .level {
-        display: inline-block;
-        vertical-align: top;
-
-        position: absolute;
-        right: 0;
-        top: 0;
-
-        width: 50px;
-        height: 30px;
-
-        background-position: center center;
-        background-size: cover;
-        color: #fff;
-        font-size: 16px;
-        font-weight: bold;
-        line-height: 30px;
-        padding-right: 5px;
-        text-align: right;
-    }
-
-    .goodsImg {
-        width: 360px;
-        height: 270px;
-        border-radius: 4px;
-        background-position: center center;
-        background-size: cover;
-        background-repeat: no-repeat;
-        display: inline-block;
-        vertical-align: middle;
-    }
-
-    .infos {
-        width: 385px;
-        height: 270px;
-        display: inline-block;
-        vertical-align: middle;
-        padding: 0 26px 0 21px;
-
-        .title {
-            font-size: 24px;
-            font-family: MicrosoftYaHei;
-            color: rgba(51, 51, 51, 1);
-            line-height: 31px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-            width: 385px;
-        }
-
-        .price {
-            padding: 0 17px;
-            width: 324px;
-            height: 88px;
-            background: rgba(254, 168, 60, 0.15);
-            margin-top: 15px;
-
-            .left {
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(102, 102, 102, 1);
-                line-height: 44px;
-                display: inline-block;
-                vertical-align: middle;
-                width: 60px;
-            }
-
-            .price-item {
-                width: 88px;
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(102, 102, 102, 1);
-                line-height: 44px;
-                display: inline-block;
-                vertical-align: middle;
-
-                .priceNum {
-                    font-size: 20px;
-                    color: #fb6e08;
-
-                    small {
-                        font-size: 14px;
-                        margin-right: 5px;
-                    }
-                }
-            }
-        }
-
-        .comment {
-            margin-top: 15px;
-            span {
-                font-size: 12px;
-                font-family: MicrosoftYaHei;
-                color: rgba(102, 102, 102, 1);
-                line-height: 16px;
-                vertical-align: middle;
-            }
-
-            .star {
-                display: inline-block;
-                vertical-align: middle;
-                margin-left: 16px;
-            }
-        }
-
-        .buyNum {
-            display: inline-block;
-            vertical-align: middle;
-            margin-left: 20px;
-            width: 103px;
-            height: 27px;
-        }
-
-        .buy-btn {
-            display: block;
-            margin: 15px 0 0 44px;
-            width: 106px;
-            // height: 36px;
-            // background: rgba(251, 110, 8, 1);
-            border-radius: 3px;
-            font-size: 14px;
-        }
-    }
-
-    .goodsInfo {
-        padding-left: 32px;
-        width: 320px;
-        display: inline-block;
-        vertical-align: middle;
-        height: 270px;
-        overflow: hidden;
-        position: relative;
-        border-left: 1px solid #eaeaea;
-        .goodsTop {
-            .kuai {
-                width: 4px;
-                height: 14px;
-                background: rgba(11, 158, 192, 1);
-                display: inline-block;
-                vertical-align: middle;
-            }
-            span {
-                font-size: 16px;
-                font-family: MicrosoftYaHei;
-                color: rgba(11, 158, 192, 1);
-                line-height: 21px;
-                vertical-align: middle;
-                margin-left: 8px;
-            }
-        }
-        .title {
-            overflow: hidden;
-            margin-top: 10px;
-
-            .name {
-                display: inline-block;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                font-size: 18px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 24px;
-                vertical-align: middle;
-                max-width: 250px;
-            }
-
-            img {
-                width: 12px;
-                height: 15px;
-                margin: 0 6px 0px 8px;
-                vertical-align: middle;
-            }
-
-            .address {
-                display: inline-block;
-                font-size: 12px;
-                font-family: PingFangSC;
-                font-weight: bold;
-                color: rgba(11, 158, 192, 1);
-                line-height: 17px;
-                vertical-align: middle;
-            }
-        }
-
-        .titlesub {
-            font-size: 14px;
-            font-family: MicrosoftYaHei;
-            color: rgba(153, 153, 153, 1);
-            line-height: 19px;
-            margin-top: 12px;
-        }
-
-        .subtitle {
-            margin-top: 10px;
-            span {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-
-                line-height: 16px;
-                &:first-child {
-                    color: #666666;
-                }
-                &:last-child {
-                    color: #fb6e08;
-                }
-            }
-        }
-
-        .collection {
-            width: 152px;
-            height: 39px;
-            border-radius: 3px;
-            border: 1px solid rgba(253, 149, 1, 1);
-            text-align: center;
-            line-height: 39px;
-            margin-top: 20px;
-            cursor: pointer;
-            span {
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: #fb6e08;
-                line-height: 19px;
-                vertical-align: middle;
-            }
-
-            img {
-                width: 20px;
-                height: 20px;
-                margin-right: 10px;
-                vertical-align: middle;
-            }
-        }
-        .ask {
-            line-height: 32px;
-            position: absolute;
-            bottom: 0;
-            left: 32px;
-            cursor: pointer;
-            span {
-                font-size: 12px;
-                font-family: PingFangSC;
-                font-weight: 500;
-                color: rgba(153, 153, 153, 1);
-                line-height: 17px;
-                vertical-align: middle;
-                margin-left: 10px;
-            }
-
-            img {
-                width: 38px;
-                height: 32px;
-                vertical-align: middle;
-            }
-        }
-    }
-}
-
-.goodsList {
-    width: 1190px;
-    margin: 22px auto;
-    background: rgba(255, 255, 255, 1);
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-
-    .goodsTab {
-        margin-left: 20px;
-    }
-
-    .allGoods {
-        font-size: 0;
-        .goods-item {
-            display: inline-block;
-            width: 25%;
-            padding: 35px 0 68px;
-            box-sizing: border-box;
-            -moz-box-sizing: border-box; /* Firefox */
-            -webkit-box-sizing: border-box; /* Safari */
-
-            .icon {
-                width: 176px;
-                height: 100px;
-                border-radius: 4px;
-                background-position: center center;
-                background-repeat: no-repeat;
-                background-size: cover;
-                margin: auto;
-            }
-
-            .title {
-                margin: auto;
-                font-size: 14px;
-                font-family: MicrosoftYaHei;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-                margin-top: 8.6px;
-                width: 176px;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-
-            .subTitle {
-                margin: auto;
-                line-height: 26px;
-                margin-top: 7px;
-                width: 176px;
-                span {
-                    &:first-child {
-                        font-size: 20px;
-                        font-family: MicrosoftYaHei;
-                        color: rgba(251, 110, 8, 1);
-                        line-height: 20px;
-                        vertical-align: bottom;
-                    }
-                    font-size: 12px;
-                    font-family: MicrosoftYaHei;
-                    color: rgba(102, 102, 102, 1);
-                    line-height: 16px;
-                    vertical-align: bottom;
-                }
-            }
-
-            &:not(:last-child) {
-                border-right: 1px solid #eaeaea;
-            }
-
-            &:nth-child(4n) {
-                border-right: 0;
-            }
-        }
-
-        .line {
-            width: 100%;
-            height: 1px;
-            background: #eaeaea;
-        }
-    }
-}
-
-.imgList {
-    padding-right: 20px;
-    padding-bottom: 20px;
-    img {
-        display: block;
-        width: 100%;
-        height: auto;
-    }
-}
-
-.serviceDetai {
-    padding-right: 20px;
-    padding-bottom: 20px;
-    font-size: 14px;
-    font-family: MicrosoftYaHei;
-    color: rgba(51, 51, 51, 1);
-    line-height: 19px;
-}
-</style>

src/main/vue/src/pagesPre/ProductComment.vue

@@ -1,294 +0,0 @@
-<template>
-    <div class="container">
-        <div class="top">
-            <span>评价服务</span>
-            <span>和大家来分享你的购物心得吧～</span>
-        </div>
-        <div class="content">
-            <div class="img" v-if="orderInfo.productInfo">
-                <div class="icon" :style="{backgroundImage:'url('+orderInfo.productInfo.image+')'}"></div>
-                <div class="title">{{orderInfo.productName}}</div>
-                <div class="price">¥{{orderInfo.totlePrice}}</div>
-            </div>
-
-            <div class="comment">
-                <el-rate v-model="start" :colors="['#99A9BF', '#F7BA2A', '#FF9900']" show-text>
-
-                </el-rate>
-                <el-input type="textarea" :autosize="{ minRows: 10, maxRows: 50}" placeholder="写写您的感受吧，你的心得对大家很重要哦." v-model="remark" style="margin-top:20px" maxlength="500">
-                </el-input>
-
-                <div class="upload">
-
-                    <el-button icon="el-icon-picture" type="text" @click="dialogVisible=true">上传照片</el-button>
-                    <span>,还能上传{{5-addImage.length}}张哦</span>
-                    <el-checkbox style="float:right;margin-top:10px" v-model="isHide">匿名评论</el-checkbox>
-
-                </div>
-
-                <div style="margin-top:110px">
-                    <el-button type="primary" @click="submit" style="float:right;width:190px">提交</el-button>
-                </div>
-
-                <el-dialog title="提示" :visible.sync="dialogVisible" width="50%">
-                    <el-upload :limit='5' :action="url" list-type="picture-card" :on-preview="handlePictureCardPreview" :on-remove="handleRemove" :on-success='handleSuccess'>
-                        <i class="el-icon-plus"></i>
-                    </el-upload>
-                    <div class="ps">已经上传{{addImage.length}}张，还可以上传{{5-addImage.length}}张</div>
-
-                </el-dialog>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-
-export default {
-    created() {
-        if (this.$route.query.column) {
-            this.subColumn = this.$route.query.column.split(',')[1];
-            this.subValue = this.$route.query.column.split(',')[0];
-        }
-
-        this.$http.get({
-            url: '/userOrder/getOne',
-            data: {
-                id: this.$route.query.orderId
-            }
-        }).then(res => {
-            if (res.success) {
-                this.orderInfo = res.data
-            }
-        })
-
-
-
-    },
-    data() {
-        return {
-            saving: false,
-            formData: {},
-            rules: {
-            },
-            subColumn: '',
-            subValue: '',
-            orderInfo: {},
-            start: 5,
-            remark: '',
-            dialogImageUrl: '',
-            dialogVisible: false,
-            addImage: [],
-            isHide: false
-        }
-    },
-    computed: {
-        url() {
-            return baseUrl + '/assets/uploadFile'
-        },
-    },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-            this.$http.post({
-                url: '/productComment/save',
-                data: {
-                    productId: this.orderInfo.productId,
-                    orderId: this.orderInfo.id,
-                    userId: this.orderInfo.userId,
-                    storeId: this.orderInfo.storeId,
-                    context: this.remark,
-                    starLevel: this.start,
-                    anonymous: this.isHide ? 'Y' : 'N',
-                    typeFlag: 0,
-                }
-            }).then(res => {
-                if (res.success) {
-                    this.saveImg(0, res.data)
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        saveImg(i, id) {
-            if (i >= this.addImage.length) {
-                this.$http.post({
-                    url: '/userOrder/update',
-                    data: {
-                        id: this.orderInfo.id,
-                        statusFlag: 6
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('评论成功');
-                        history.back()
-
-                    }
-                })
-            }
-            else {
-                this.$http.post({
-                    url: '/productCommentImage/save',
-                    data: {
-                        productId: this.orderInfo.productId,
-                        orderId: this.orderInfo.id,
-                        userId: this.orderInfo.userId,
-                        storeId: this.orderInfo.storeId,
-                        commentId: id,
-                        imageUrl: this.addImage[i],
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImg(i + 1, id)
-
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/productComment/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        handleRemove(file, fileList) {
-            console.log(file, fileList);
-            var list = []
-            fileList.forEach(item => {
-                item.response.data.forEach(todo => {
-
-                    list.push(todo)
-                })
-            })
-            this.addImage = list
-        },
-        handleSuccess(res) {
-            res.data.forEach(item => {
-                if (this.addImage.indexOf(item) == -1 && this.addImage.length < 5) {
-
-                    this.addImage.push(item)
-                }
-                else if (this.addImage.length >= 5) {
-                    this.$message({
-                        message: '已经上传' + this.addImage.length + '张图片了，请预览后确认图片',
-                        type: 'warning'
-                    });
-                }
-            })
-        },
-        handlePictureCardPreview(file) {
-            this.dialogImageUrl = file.url;
-            this.dialogVisible = true;
-        }
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    .top {
-        padding-bottom: 18px;
-        span {
-            &:first-child {
-                font-size: 16px;
-                font-weight: bold;
-                color: rgba(51, 51, 51, 1);
-                line-height: 21px;
-                vertical-align: middle;
-            }
-
-            &:last-child {
-                font-size: 12px;
-                color: rgba(153, 153, 153, 1);
-                line-height: 16px;
-                vertical-align: middle;
-            }
-        }
-    }
-
-    .content {
-        height: 505px;
-        background: rgba(255, 255, 255, 1);
-        border-radius: 4px;
-        border: 1px solid rgba(234, 234, 234, 1);
-        padding: 22px 60px 52px 33px;
-        font-size: 0;
-
-        .img {
-            width: 153px;
-            display: inline-block;
-            vertical-align: top;
-
-            .icon {
-                width: 153px;
-                height: 115px;
-                background-position: center center;
-                background-size: cover;
-                background-repeat: no-repeat;
-            }
-
-            .title {
-                width: 100%;
-                font-size: 14px;
-                color: rgba(51, 51, 51, 1);
-                line-height: 19px;
-                margin-top: 10px;
-                text-align: center;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-            }
-
-            .price {
-                font-size: 14px;
-                font-weight: bold;
-                color: rgba(251, 110, 8, 1);
-                line-height: 19px;
-                margin-top: 10px;
-                text-align: center;
-            }
-        }
-
-        .comment {
-            display: inline-block;
-            vertical-align: middle;
-            width: 862px;
-            margin-left: 66px;
-        }
-    }
-
-    .ps {
-        margin-top: 20px;
-        font-size: 14px;
-    }
-
-    .upload {
-        font-size: 12px;
-        color: #999999;
-        line-height: 16px;
-        position: relative;
-    }
-}
-</style>

src/main/vue/src/pagesPre/ProductInfo.vue

@@ -1,459 +0,0 @@
-<template>
-    <div class="container">
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small" style="max-width: 800px;">
-
-            <!-- <el-form-item prop="storeId" label="店铺">
-                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
-            </el-form-item> -->
-            <el-form-item prop="typeFlag"  label="店铺类型" style="max-width:400px">
-                <template>
-                    <el-select disabled v-model="formData.serviceType" clearable placeholder="请选择">
-                        <el-option v-for="item in serviceTypeList" :key="item.id" :label="item.shortName" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item>
-            <!-- <el-form-item prop="typeFlag" label="类型" style="max-width:400px">
-                <template>
-                    <el-select v-model="formData.typeFlag" clearable placeholder="请选择">
-                        <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
-                        </el-option>
-                    </el-select>
-                </template>
-            </el-form-item> -->
-
-            <!-- <el-form-item prop="serviceType" label="服务大类">
-                <el-select v-model="formData.serviceType" filterable placeholder="请选择" size="small">
-                    <el-option v-for="item in serviceTypes" :key="item.id" :label="item.shortName" :value="item.id">
-                    </el-option>
-                </el-select>
-
-            </el-form-item>
-
-            <el-form-item prop="subclass" label="服务小类">
-                <el-select v-model="formData.subclass" filterable placeholder="请选择" size="small">
-                    <el-option v-for="item in serviceTypeDetails[formData.serviceType]" :key="item.id" :label="item.typeName" :value="item.id">
-                    </el-option>
-                </el-select>
-
-            </el-form-item> -->
-
-            <el-form-item prop="title" label="标题" style="max-width:400px">
-                <el-input v-model="formData.title" :disabled="'title'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="image" label="商品主图">
-                <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
-                <span style="color:#999;font-size:12px;">最佳尺寸 352*200</span>
-            </el-form-item>
-            <el-form-item prop="serviceDetail" label="服务详情" style="max-width:400px">
-                <el-input type="textarea" v-model="formData.serviceDetail" :disabled="'serviceDetail'==subColumn"></el-input>
-            </el-form-item>
-            <el-form-item prop="inventory" label="库存" style="max-width:400px">
-                <!-- <el-input v-model="formData.inventory" :disabled="'inventory'==subColumn"></el-input> -->
-                <el-input-number v-model="formData.inventory" :min="0"></el-input-number>
-            </el-form-item>
-            <el-form-item prop="price" label="默认价格">
-                <el-input-number v-model="formData.price" :min="0"></el-input-number>
-                <template v-if="levelNum.length<3">
-                    <el-button type="danger" icon="el-icon-plus" @click="addLevel" circle plain size="mini" style="margin-left:20px"></el-button>
-                    <span style="font-size:12px;color:#999;margin-left:5px;">添加梯级价格</span>
-
-                </template>
-                <span style="font-size:12px;color:rgb(255, 73, 73);margin-left:5px;">(阶梯价格提交时，最后一项的最大值会自动清空)</span>
-
-                <el-table v-if="levelNum.length>0" :data="levelNum" style="width: 100%">
-                    <el-table-column prop="name" label="名称" align="center">
-                        <template slot-scope="scope">
-                            <el-input v-model="scope.row.name" size="mini" style="width:100%"></el-input>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="price" label="价格" align="center">
-                        <template slot-scope="scope">
-                            <el-input-number v-model="scope.row.price" :min="0" size="mini" style="width:100%"></el-input-number>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="minCounts" label="最小值" align="center">
-                        <template slot-scope="scope">
-                            <el-input-number v-model="scope.row.minCounts" :disabled="true" size="mini" :min="getMini(scope.$index)" style="width:100%"></el-input-number>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="maxCounts" label="最大值" align="center">
-                        <template slot-scope="scope">
-                            <el-input-number v-model="scope.row.maxCounts" @change='changeLevel(scope.$index)' size="mini" :min="scope.row.minCounts+1" style="width:100%"></el-input-number>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="maxCounts" label="操作" align="center">
-                        <template slot-scope="scope">
-                            <el-button type="danger" @click="delLevel(scope.$index)" icon="el-icon-delete" circle plain size="mini"></el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-form-item>
-            <el-form-item label="商品详情">
-                <rich-text :height='500' v-model="formData.productDetail"></rich-text>
-                <!-- <el-upload :action="url" :file-list="fileList" list-type="picture-card" :on-success="handleSuccess" :on-remove="handleRemove">
-                    <i class="el-icon-plus"></i>
-                </el-upload> -->
-                <span style="color:#999;font-size:12px;">最佳尺寸 宽度大于1150px 高度不限</span>
-            </el-form-item>
-            <el-form-item prop="onShelf" label="上下架">
-                <el-switch v-model="formData.onShelf" active-color="#13ce66" inactive-color="#ff4949" :disabled="'onShelf'==subColumn">
-                </el-switch>
-            </el-form-item>
-            <!-- <el-form-item prop="useFlag" label="可用">
-                <el-switch v-model="formData.useFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'useFlag'==subColumn">
-                </el-switch>
-            </el-form-item> -->
-            <!-- <el-form-item prop="hotFlag" label="热门">
-                <el-switch v-model="formData.hotFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'hotFlag'==subColumn">
-                </el-switch>
-            </el-form-item>
-            <el-form-item prop="homeFlag" label="首页">
-                <el-switch v-model="formData.homeFlag" active-color="#13ce66" inactive-color="#ff4949" :disabled="'homeFlag'==subColumn">
-                </el-switch>
-            </el-form-item> -->
-            <!-- <el-form-item prop="rank" label="排序">
-                <el-input v-model="formData.rank" :disabled="'rank'==subColumn"></el-input>
-            </el-form-item> -->
-
-            <!-- <el-form-item prop="salesVolume" label="销量">
-                <el-input v-model="formData.salesVolume" :disabled="'salesVolume'==subColumn"></el-input>
-            </el-form-item>-->
-
-            <el-form-item>
-                <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
-                <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
-                <el-button @click="$router.go(-1)">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-<script>
-import { mapState } from 'vuex'
-import formValidator from '../formValidator'
-const baseUrl = process.env.NODE_ENV === 'production' ? '../' : 'http://localhost:8080';
-import RichText from '../components/RichText'
-export default {
-    created() {
-
-        this.$http.get({
-            url: '/serviceType/all',
-            data: {}
-        }).then(res => {
-            if (res.success) {
-                this.serviceTypeList = res.data
-
-            }
-        })
-
-        if (this.$route.query.id) {
-            this.$http.get({
-                url: '/productInfo/getOne',
-                data: {
-                    id: this.$route.query.id
-                }
-            }).then(res => {
-                if (res.success) {
-
-                    res.data.serviceType = Number(res.data.serviceType)
-                    this.formData = res.data;
-                    this.levelNum = res.data.productPriceList
-                    // res.data.productImageList.forEach(item => {
-                    //     item.url = item.image
-                    // })
-                    // this.fileList = res.data.productImageList
-
-
-                    this.formData.hotFlag = this.formData.hotFlag == 1 ? true : false;
-                    this.formData.homeFlag = this.formData.homeFlag == 1 ? true : false;
-                    this.formData.useFlag = this.formData.useFlag == 'Y' ? true : false;
-                    this.formData.onShelf = this.formData.onShelf == 'Y' ? true : false;
-
-
-                }
-            })
-        }
-
-
-        this.$http.get({
-            url: '/serviceType/all'
-        }).then(res => {
-            if (res.success) {
-                this.serviceTypes = res.data;
-
-                this.serviceTypes.forEach(element => {
-
-                    this.serviceTypeDetails[element.id] = element.serviceTypeDetailList
-
-                });
-            }
-        });
-
-        this.formData.storeId = this.myStoreInfo.id
-        this.formData.serviceType = Number(this.myStoreInfo.serviceType)
-        this.formData.subclass = this.myStoreInfo.subclass
-
-    },
-    data() {
-        return {
-            serviceTypeList: [],
-            saving: false,
-            formData: {
-                typeFlag: 0,
-                rank: 0,
-                responseTime: 0,
-                reworkRate: 0,
-                useFlag: true,
-                serviceType: 1,
-                onShelf: false,
-                price: 0,
-                inventory: 0
-            },
-            rules: {
-                typeFlag: [
-                    { required: true, message: '请选择类型', trigger: 'blur' },
-                ],
-                title: [
-                    { required: true, message: '请输入商品标题', trigger: 'blur' },
-                ],
-                image: [
-                    { required: true, message: '请上传商品主图', trigger: 'blur' },
-                ],
-                inventory: [
-                    { required: true, message: '请上传商品主图', trigger: 'blur' },
-                ],
-                price: [
-                    { required: true, message: '请输入默认价格', trigger: 'blur' },
-                ],
-            },
-            subColumn: '',
-            subValue: '',
-            serviceTypes: [],
-            serviceTypeDetails: {},
-            typeFlagOptions: [{ label: '修图', value: 0 }, { label: '实体商品', value: 1 }],
-            levelNum: [],
-            fileList: []
-        }
-    },
-    computed: {
-        ...mapState(['userInfo', 'myStoreInfo']),
-        url() {
-            return baseUrl + '/assets/uploadFile'
-        }
-    },
-    methods: {
-        onSave() {
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    this.submit();
-                } else {
-                    this.$message.warning('数据录入不全')
-                    return false;
-                }
-            });
-        },
-        submit() {
-            var data = JSON.parse(JSON.stringify(this.formData));
-
-            delete data.productImageList
-            delete data.productPriceList
-            delete data.storeInfo
-
-            data.hotFlag = this.formData.hotFlag ? 1 : 0;
-            data.homeFlag = this.formData.homeFlag ? 1 : 0;
-            data.useFlag = this.formData.useFlag ? 'Y' : 'N';
-            data.onShelf = this.formData.onShelf ? 'Y' : 'N';
-
-            console.log(data)
-            this.$http.post({
-                url: this.formData.id ? '/productInfo/update' : '/productInfo/save',
-                data: data
-            }).then(res => {
-                if (res.success) {
-                    this.savePrice(0, this.formData.id ? this.formData.id : res.data)
-                    // this.saveImage(0, this.formData.id ? this.formData.id : res.data)
-                    this.$message.success('成功');
-                    this.$router.go(-1);
-                } else {
-                    this.$message.warning('失败')
-                }
-            });
-        },
-        savePrice(index, id) {
-            if (index >= this.levelNum.length) {
-                return
-            }
-            else {
-                var data = JSON.parse(JSON.stringify(this.levelNum[index]));
-                data.productId = id
-                data.typeFlag = index
-                if (index == this.levelNum.length - 1) {
-                    data.maxCounts = -1
-                }
-                this.$http.post({
-                    url: data.id ? '/productPrice/update' : '/productPrice/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.savePrice(index + 1, id)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                })
-            }
-        },
-        saveImage(index, id) {
-            if (index >= this.fileList.length) {
-                return
-            }
-            else if (!this.fileList[index].id) {
-                var data = JSON.parse(JSON.stringify(this.fileList[index]));
-                data.productId = id
-                delete data.url
-                this.$http.post({
-                    url: '/productImage/save',
-                    data: data
-                }).then(res => {
-                    if (res.success) {
-                        this.saveImage(index + 1, id)
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                })
-            }
-            else {
-                this.saveImage(index + 1, id)
-            }
-        },
-        onDelete() {
-            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                return this.$http.post({
-                    url: '/productInfo/del',
-                    data: { id: this.formData.id }
-                })
-            }).then(() => {
-                this.$message.success('删除成功');
-                this.$router.go(-1);
-            }).catch(action => {
-                if (action === 'cancel') {
-                    this.$message.info('删除取消');
-                } else {
-                    this.$message.error('删除失败');
-                }
-            })
-        },
-        addLevel() {
-            if (this.levelNum.length > 0) {
-                if (!this.levelNum[this.levelNum.length - 1].maxCounts) {
-                    this.$message({
-                        message: '最后一项最大值未输入不能添加新的阶梯价格',
-                        type: 'warning'
-                    });
-                    return
-                }
-            }
-            this.levelNum.push({
-                name: '',
-                price: '',
-                minCounts: '',
-                maxCounts: ''
-            })
-        },
-        changeLevel(index) {
-            if (index < this.levelNum.length - 1) {
-                if (!this.levelNum[index].maxCounts) {
-                    // this.levelNum[index].maxCounts = Number(this.levelNum[index + 1].minCounts) - 1
-                    var jsonp = { ...this.levelNum[index] }
-                    jsonp.maxCounts = Number(this.levelNum[index + 1].minCounts) - 1
-                    this.$set(this.levelNum, index, jsonp)
-                    this.$message({
-                        message: '当前并不是最后一项不能清空最大值',
-                        type: 'warning'
-                    });
-
-                    return
-                }
-                else {
-                    this.levelNum[index + 1].minCounts = this.levelNum[index].maxCounts + 1
-                }
-            }
-        },
-        delLevel(index) {
-
-
-            if (this.levelNum[index].id) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    return this.$http.post({
-                        url: '/productPrice/del',
-                        data: { id: this.levelNum[index].id }
-                    })
-                }).then(() => {
-                    this.$message.success('删除成功');
-                    this.levelNum.splice(index, 1)
-                }).catch(action => {
-                    if (action === 'cancel') {
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-            }
-            else {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' }).then(() => {
-                    this.levelNum.splice(index, 1)
-                    this.$message.success('删除成功');
-                }).catch(action => {
-                    if (action === 'cancel') {
-                    } else {
-                        this.$message.error('删除失败');
-                    }
-                })
-
-            }
-
-        },
-        handleSuccess(response) {
-            console.log(response)
-            var jsonp = {
-                image: response.data[0],
-                url: response.data[0]
-            }
-            this.fileList.push(jsonp)
-        },
-        handleRemove(file, fileList) {
-            console.log(file)
-            if (file.id) {
-                this.$http.post({
-                    url: '/productImage/del',
-                    data: { id: file.id }
-                }).then(() => {
-                    this.$message.success('删除成功');
-                }).catch(action => {
-
-                })
-            }
-
-
-            this.fileList = fileList
-        },
-        getMini(index) {
-            if (index == 0) {
-                return 0
-            }
-            else {
-                return Number(this.levelNum[index - 1].maxCounts) + 1
-            }
-        }
-    },
-    components: {
-        RichText
-    }
-}
-</script>
-<style lang="less" scoped>
-.container {
-    background-color: #fff;
-    padding: 20px;
-    border-radius: 4px;
-    border: 1px solid rgba(234, 234, 234, 1);
-}
-</style>

src/main/vue/src/pagesPre/Register.vue

@@ -1,529 +0,0 @@
-<template>
-    <div style="padding:0 34px 0 20px;">
-        <el-tabs v-model="activeName">
-            <el-tab-pane label="商家注册" name="first">
-                <el-form v-if="!isSuccess1" :model="formData1" :rules="rules1" ref="form1" label-width="100px" label-position="right" size="small" style="max-width: 420px;margin-top:20px;">
-                    <el-form-item prop="username" label="用户名">
-                        <el-input v-model="formData1.username" placeholder="请输入用户名" maxlength="15" style="width:204px;"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="password" label="设置密码">
-                        <el-input type="password" name='psd' placeholder="6-11位的字母或者数字（必须包含数字字母的组合）" v-model="formData1.password" maxlength="20"></el-input>
-                        <password-level :password='formData1.password'></password-level>
-                    </el-form-item>
-                    <el-form-item prop="surePassword" label="确认密码">
-                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData1.surePassword" maxlength="20"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="contacter" label="联系人">
-                        <el-input placeholder="请输入联系人" v-model="formData1.contacter" maxlength="8"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="contactPhone" label="联系人电话">
-                        <el-input v-model="formData1.contactPhone" placeholder="请输入手机号码" maxlength="11"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="code" label="短信验证码">
-                        <el-input v-model="formData1.code" placeholder="请输入验证码" style="width:204px;"></el-input>
-                        <el-button plain :disabled="isSend" style="width:110px;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
-                    </el-form-item>
-                    <el-form-item prop="companyName" label="企业名称">
-                        <el-input v-model="formData1.companyName" placeholder="请输入企业名称" maxlength="20"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="companyType" label="企业类型">
-                        <el-select v-model="formData1.companyType" placeholder="请选择">
-                            <el-option v-for="item in companyTypeList" :key="item.id" :label="item.typeName" :value="item.typeName">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item prop="isRead" label="">
-                        <el-checkbox v-model="formData1.isRead">已阅读</el-checkbox>
-                        <el-button type="text" style="color:#FB6E08" @click="dialogVisible=true">《用户隐私协议和隐私条款》</el-button>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" style="width:204px" @click="onSave">立即注册</el-button>
-                    </el-form-item>
-
-                </el-form>
-
-                <dir class="success">
-                    <systemState class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
-                    <el-button type="warning" @click="open" class="open">认证开店</el-button>
-                </dir>
-            </el-tab-pane>
-            <el-tab-pane label="个人注册" name="second">
-                <el-form v-if="!isSuccess" :model="formData" :rules="rules" ref="form" label-width="100px" label-position="right" size="small" style="max-width: 420px;margin-top:20px;">
-                    <el-form-item prop="username" label="用户名">
-                        <el-input v-model="formData.username" placeholder="请输入用户名" maxlength="15" style="width:204px;"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="password" label="设置密码">
-                        <el-input type="password" name='psd' placeholder="6-20位的字母或者数字（必须包含数字字母的组合）" v-model="formData.password" maxlength="20"></el-input>
-                        <password-level :password='formData.password'></password-level>
-                    </el-form-item>
-                    <el-form-item prop="surePassword" label="确认密码">
-                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData.surePassword" maxlength="20"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="phone" label="手机号码">
-                        <el-input v-model="formData.phone" placeholder="请输入手机号码" maxlength="11"></el-input>
-                    </el-form-item>
-                    <el-form-item prop="code" label="短信验证码">
-                        <el-input v-model="formData.code" placeholder="请输入验证码" style="width:204px;"></el-input>
-                        <el-button plain :disabled="isSend" style="width:110px;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
-                    </el-form-item>
-
-                    <el-form-item prop="isRead" label="">
-                        <el-checkbox v-model="formData.isRead">已阅读</el-checkbox>
-                        <el-button type="text" style="color:#FB6E08" @click="dialogVisible=true">《用户隐私协议和隐私条款》</el-button>
-                    </el-form-item>
-
-                    <el-form-item label="">
-                        <el-button type="primary" style="width:204px" @click="onSave">立即注册</el-button>
-                    </el-form-item>
-
-                </el-form>
-                <template v-else>
-                    <dir class="success">
-                        <systemState class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
-                        <el-button type="warning" @click="open" class="open">认证开店</el-button>
-                    </dir>
-
-                </template>
-            </el-tab-pane>
-        </el-tabs>
-
-        <el-dialog title="用户隐私协议和隐私条款" class="xieyi" :visible.sync="dialogVisible" width="636px">
-            <div class="window" v-html="agreement">
-
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="readAgree(false)">不同意</el-button>
-                <el-button type="primary" @click="readAgree(true)">同 意</el-button>
-            </span>
-        </el-dialog>
-
-    </div>
-</template>
-<script>
-import formValidator from '../formValidator'
-import systemState from '../pagesPre/SystemState'
-import passwordLevel from '../components/PasswordLevel'
-import { mapState } from 'vuex'
-export default {
-    created() {
-
-        this.$http.get({
-            url: '/companyType/all'
-        }).then(res => {
-            if (res.success) {
-                this.companyTypeList = res.data
-            }
-        });
-
-        this.$http.get({
-            url: '/userAgreement/getOne?id=1',
-        }).then(res => {
-            if (res.success) {
-                if (res.data) {
-                    this.agreement = res.data.agreement
-                }
-
-            }
-        })
-
-    },
-    computed: {
-        ...mapState(['msgCode']),
-    },
-    data() {
-        return {
-            dialogVisible: false,
-            agreement: '',
-            companyTypeList: [],
-            activeName: 'second',
-            saving: false,
-            formData: {
-                isRead: false,
-            },
-            formData1: {
-                isRead: false,
-            },
-            rules: {
-                username: [
-                    { required: true, message: '请输入用户名', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入用户名'));
-                            }
-                            else if (/^[0-9]*$/.test(value)) {
-                                callback(new Error('用户名必须包含字母或中文字符'));
-                            }
-                            else if (!/^[\u4E00-\u9FA5A-Za-z0-9_]+$/.test(value)) {//中文，英文，下划线
-                                callback(new Error('用户名不能包含特殊字符'));
-                            } else {
-                                this.checkHas({ username: this.formData.username }).then((result) => {
-                                    if (result) {
-                                        callback(new Error('已存在该用户名'));
-                                    }
-                                    else {
-                                        callback();
-                                    }
-                                })
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                password: [
-                    { required: true, message: '请输入密码', trigger: 'blur' },
-                    {
-
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入密码'));
-                            } else if (!/^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('6-20位的字母、数字和特殊字符（必须包含数字母、数字和特殊字符）'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                surePassword: [
-                    { required: true, message: '请输入确认密码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入确认密码'));
-                            } else if (value == this.formData.password) {
-                                callback();
-                            } else {
-                                callback(new Error('两次密码输入不一致！'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                phone: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入手机号'));
-                            } else if (/^1[3-9]\d{9}$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('请输入正确的手机号'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                code: [
-                    { required: true, message: '请输入短信验证码', trigger: 'blur' },
-                ],
-                isRead: [{
-                    validator: (rule, value, callback) => {
-                        if (!value) {
-                            callback(new Error('请阅读并同意协议'));
-                        } else {
-                            callback();
-                        }
-                    }, trigger: 'blur'
-                }]
-            },
-            rules1: {
-                username: [
-                    { required: true, message: '请输入用户名', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入用户名'));
-                            }
-                            else if (!/^[\u4E00-\u9FA5A-Za-z0-9_]+$/.test(value)) {//中文，英文，下划线
-                                callback(new Error('用户名不能包含特殊字符'));
-                            }
-                            else if (/^[0-9]*$/.test(value)) {
-                                callback(new Error('用户名必须包含字母或中文字符'));
-                            }
-                            else {
-                                this.checkHas({ username: this.formData1.username }).then((result) => {
-                                    if (result) {
-                                        callback(new Error('已存在该用户名'));
-                                    }
-                                    else {
-                                        callback();
-                                    }
-                                })
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                password: [
-                    { required: true, message: '请输入密码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入密码'));
-                            } else if (!/^.*(?=.{6,})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*? ]).*$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('6-20位的字母、数字和特殊字符（必须包含数字母、数字和特殊字符）'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                surePassword: [
-                    { required: true, message: '请输入确认密码', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入确认密码'));
-                            } else if (value == this.formData1.password) {
-                                callback();
-                            } else {
-                                callback(new Error('两次密码输入不一致！'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                contacter: [
-                    { required: true, message: '请输入联系人', trigger: 'blur' }
-                ],
-                contactPhone: [
-                    { required: true, message: '请输入手机号', trigger: 'blur' },
-                    {
-                        validator: (rule, value, callback) => {
-                            if (!value) {
-                                callback(new Error('请输入手机号'));
-                            } else if (/^1[3-9]\d{9}$/.test(value)) {
-                                callback();
-                            } else {
-                                callback(new Error('请输入正确的手机号'));
-                            }
-                        }, trigger: 'blur'
-                    }
-                ],
-                companyName: [
-                    { required: true, message: '请输入公司名称', trigger: 'blur' },
-                ],
-                companyType: [
-                    { required: true, message: '请选择公司类型', trigger: 'blur' },
-                ],
-                code: [
-                    { required: true, message: '请输入短信验证码', trigger: 'blur' },
-                ],
-                isRead: [{
-                    validator: (rule, value, callback) => {
-                        if (!value) {
-                            callback(new Error('请阅读并同意协议'));
-                        } else {
-                            callback();
-                        }
-                    }, trigger: 'blur'
-                }]
-            },
-            roles: [],
-            departs: [],
-            backCode: '',
-            startNum: 60,
-            isSend: false,
-            isSuccess: false,
-            isSuccess1: false
-        }
-    },
-    methods: {
-        onSave() {
-            if (this.activeName == 'first') {
-                this.$refs.form1.validate((valid) => {
-                    if (valid) {
-                        this.checkMes().then((result) => {
-                            console.log(result)
-                            if (result) {
-                                this.submit();
-                            }
-                        })
-
-                    } else {
-                        return false;
-                    }
-                });
-            }
-            else {
-                this.$refs.form.validate((valid) => {
-                    if (valid) {
-                        this.checkMes().then((result) => {
-                            console.log(result)
-                            if (result) {
-                                this.submit();
-                            }
-                        })
-
-                    } else {
-                        return false;
-                    }
-                });
-            }
-
-        },
-        submit() {
-            if (this.activeName == 'second') {
-                this.$http.post({
-                    url: '/userInfo/register',
-                    data: {
-                        username: this.formData.username,
-                        nickname: this.formData.username,
-                        password: this.formData.password,
-                        phone: this.formData.phone
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.isSuccess = true
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-            else {
-
-                this.$http.post({
-                    url: '/userInfo/register',
-                    data: {
-                        username: this.formData1.username,
-                        nickname: this.formData1.username,
-                        password: this.formData1.password,
-                        phone: this.formData1.contactPhone,
-                        contacter: this.formData1.contacter,
-                        companyName: this.formData1.companyName,
-                        companyType: this.formData1.companyType,
-                        contactPhone: this.formData1.contactPhone,
-                        companyFlag: 'Y'
-
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$message.success('成功');
-                        this.isSuccess1 = true
-                    } else {
-                        this.$message.warning('失败')
-                    }
-                });
-            }
-
-
-        },
-        startSend() {
-            if (!this.checkPhone(this.formData.phone) && this.activeName == 'second') {
-                this.$message.warning('手机号格式错误')
-                return
-            }
-            else if (!this.checkPhone(this.formData1.contactPhone) && this.activeName == 'first') {
-                this.$message.warning('手机号格式错误')
-                return
-            }
-
-
-            this.checkHas({ phone: (this.activeName == 'first' ? this.formData1.contactPhone : this.formData.phone) }).then((result) => {
-                console.log(result)
-                if (result) {
-                    this.$message.warning('该手机号已经被用户绑定')
-                }
-                else {
-                    this.sendMeg(this.activeName == 'first' ? this.formData1.contactPhone : this.formData.phone, this.msgCode['用户注册']).then((json) => {
-                        if (json.success) {
-                            this.$message.success('发送成功')
-                            this.backCode = json.data
-                            this.startNum = 61
-                            this.isSend = true
-                            this.setTime()
-                        }
-                        else {
-                            this.$message.warning(json.error)
-                        }
-                    })
-                }
-            })
-
-
-        },
-        setTime() {
-            if (this.startNum == 0) {
-                this.isSend = false
-                return
-            }
-            this.startNum--
-            setTimeout(() => {
-                this.setTime()
-            }, 1000)
-        },
-        checkMes() {
-            return new Promise((resolve, reject) => {
-                if (!this.backCode) {
-                    this.$message.warning('请发送验证码')
-                    resolve(false)
-                }
-                else if (this.activeName == 'first' && !this.formData1.code) {
-                    this.$message.warning('请输入验证码')
-                    resolve(false)
-                }
-                else if (this.activeName == 'second' && !this.formData.code) {
-                    this.$message.warning('请输入验证码')
-                    resolve(false)
-                }
-                else {
-                    this.$http.get({
-                        url: '/aliapi/verifyMsgCode',
-                        data: {
-                            // sessionId: this.backCode,
-                            code: this.activeName == 'second' ? this.formData.code : this.formData1.code
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            resolve(true)
-                        } else {
-                            this.$message.warning(res.error)
-                            resolve(false)
-                        }
-                    });
-                }
-
-            })
-
-
-        },
-        readAgree(reslut) {
-            this.dialogVisible = false
-            if (this.activeName == 'second') {
-                this.formData.isRead = reslut
-            }
-            else {
-                this.formData1.isRead = reslut
-            }
-        },
-        open() {
-            this.$router.push({
-                name: 'userCertification'
-            })
-        }
-    },
-    components: {
-        systemState, passwordLevel
-    }
-}
-</script>
-<style lang="less" scoped>
-.success {
-    position: relative;
-}
-.certain {
-    padding: 140px 0 0;
-    margin: auto;
-}
-.open {
-    position: absolute;
-    bottom: 0;
-    right: 500px;
-}
-.window {
-    max-height: 50vh;
-    overflow: auto;
-    border-top: 1px solid #ebebeb;
-    padding-top: 20px;
-}
-</style>