打包提交

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

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

src/main/vue/src/components/ImgItem.vue

@@ -49,7 +49,7 @@
             </el-dialog>
 
             <el-dialog :title="img.imageName+' '+imgStyleStr+'预览'" :visible.sync="preView" :width="imageStyle.width+40+'px'">
-                <img-zoom v-if="label=='finishedImage'" :src="img[label]+'?x-oss-process=image/resize,l_500'" :bigsrc="img[label]" :configs="configs"></img-zoom>
+                <img-zoom v-if="label=='finishedImage'" :src="img[label]+'?x-oss-process=image/resize,l_500'" :bigsrc="img[label]+'?x-oss-process=image/resize,l_1000'" :configs="configs"></img-zoom>
                 <img v-else :src="img[label]+'?x-oss-process=image/resize,l_500'" alt="">
             </el-dialog>
         </template>
@@ -59,7 +59,7 @@
 </template>
 
 <script>
-import imgZoom from 'vue2.0-zoom'
+import imgZoom from '../components/ImgZoom'
 export default {
     name: 'imgItem',
     props: {
@@ -102,7 +102,9 @@ export default {
                 maskWidth: 100,
                 maskHeight: 100,
                 maskColor: 'red',
-                maskOpacity: 0.2
+                maskOpacity: 0.2,
+                imgWithd:500,
+                imgHeight:500
             },
             imgInfo: {
                 width: 0,
@@ -170,9 +172,8 @@ export default {
                         width: width,
                         height: height + 'px'
                     }
-
-                    this.configs.width = width / 2
-                    this.configs.height = height / 2
+                    this.configs.imgWithd = width
+                    this.configs.imgHeight = height
                 }
                 img.src = this.img[this.label]
             }

src/main/vue/src/components/ImgZoom.vue

@@ -0,0 +1,119 @@
+<template>
+    <div class="imgzoom" @mouseenter='mouseEnter' @mouseleave='mouseLeave' @mousemove="moseOverEvent">
+        <img ref="mainImg" :src="src" alt="">
+        <template v-if="isShow">
+            <div class="min-box" :style="{top:top+'px',left:left+'px',width:configs.maskWidth+'px',height:configs.maskHeight+'px',backgroundColor:configs.maskColor,opacity:configs.maskOpacity}"></div>
+            <div class="imgBig" :style="{backgroundSize:configs.imgWithd*2+'px '+configs.imgHeight*2+'px',backgroundPosition:backgroundPosition,backgroundImage:'url('+bigsrc+')',width:configs.width+'px',height:configs.height+'px',right:0-configs.width+'px'}"></div>
+        </template>
+    </div>
+
+</template>
+
+<script>
+import logo from '../components/Logo'
+import { mapState } from "vuex";
+export default {
+    name: 'imgZoom',
+    data() {
+        return {
+            top: 0,
+            left: 0,
+            isShow: false,
+            offsetY: 0,
+            offsetX: 0
+        }
+    },
+    props: {
+        src: {
+            type: String,
+            default: ''
+        },
+        bigsrc: {
+            type: String,
+            default: ''
+        },
+        configs: {
+            type: Object,
+            default: {
+                width: 200,
+                height: 200,
+                maskWidth: 100,
+                maskHeight: 100,
+                maskColor: 'red',
+                maskOpacity: 0.2,
+                imgWithd: 500,
+                imgHeight: 500,
+            }
+        }
+    },
+    computed: {
+        backgroundPosition() {
+            var left = 0 - this.left
+            var top = 0 - this.top
+            left = left
+            top = top
+            return left * 2 + 'px ' + top * 2 + 'px'
+        }
+    },
+    watch: {
+
+    },
+    created() {
+
+    },
+    methods: {
+        moseOverEvent(e) {
+            this.offsetX += e.movementX
+            this.offsetY += e.movementY
+            var left = this.offsetX
+            var top = this.offsetY
+            left = left - this.configs.maskWidth / 2
+            top = top - this.configs.maskHeight / 2
+            if (left < 0) {
+                left = 0
+            }
+            if (top < 0) {
+                top = 0
+            }
+            if (left > this.$refs.mainImg.width - this.configs.maskWidth) {
+                left = this.$refs.mainImg.width - this.configs.maskWidth
+            }
+            if (top > this.$refs.mainImg.height - this.configs.maskHeight) {
+                top = this.$refs.mainImg.height - this.configs.maskHeight
+            }
+            this.left = left
+            this.top = top
+        },
+        mouseEnter(e) {
+            this.isShow = true
+            this.offsetX = e.offsetX
+            this.offsetY = e.offsetY
+        },
+        mouseLeave(e) {
+            this.isShow = false
+        }
+    },
+    components: {
+
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.imgzoom {
+    position: relative;
+    cursor: crosshair;
+    .imgBig {
+        position: absolute;
+        background-color: #ccc;
+        right: 0;
+        top: 0;
+    }
+
+    .min-box {
+        position: absolute;
+        top: 0;
+        left: 0;
+    }
+}
+</style>

src/main/vue/src/components/OrderItem.vue

@@ -4,12 +4,12 @@
             <span style="margin-left:25px;">{{getTime(info.createTime)}}</span>
             <span style="margin-left:30px;">订单号：{{info.orderCode}}</span>
 
-            <span style="float:right;position: relative;cursor: pointer;" v-if="type=='user'">
+            <span style="float:right;position: relative;cursor: pointer;" v-if="type=='user'" @click="startChat(info.productInfo.storeInfo.id)">
                 <span style="margin-right:66px;">店铺：{{info.productInfo.storeInfo.storeName}}</span>
                 <img style="width:30px;height:25px;position: absolute;right: 30px;top: 9px;" src="../assetsPre/kefu.png" alt="">
             </span>
 
-            <span style="float:right;position: relative;cursor: pointer;" v-else  @click="goChat">
+            <span style="float:right;position: relative;cursor: pointer;" v-else @click="goChat">
                 <span style="margin-right:66px;">用户：{{info.userInfo.nickname}}</span>
                 <img style="width:30px;height:25px;position: absolute;right: 30px;top: 9px;" src="../assetsPre/kefu.png" alt="">
             </span>
@@ -45,8 +45,8 @@
                         <span>下载原图</span>
                     </div>
 
-                    <div class="preview" @click="goNextquery('orderUpload',{type:'look'})" >
-                        <img src="../assetsPre/prePhoto.png" style="margin-left:32px;"  alt="">
+                    <div class="preview" @click="goNextquery('orderUpload',{type:'look'})">
+                        <img src="../assetsPre/prePhoto.png" style="margin-left:32px;" alt="">
                         <span>查看备注</span>
                     </div>
                 </template>
@@ -54,7 +54,7 @@
             </div>
             <div class="right" style="width:270px;">
                 <div class="price">
-                    ¥{{info.totlePrice}}
+                    ¥{{info.dealPrice}}
                 </div>
                 <div>
                     <span class="btn">
@@ -93,7 +93,9 @@
                     </span>
 
                     <span class="btn" v-else>
-
+                        <template v-if="statusName=='待付款'">
+                            <el-button type="primary" size="mini" @click="changePrice">修改价格</el-button>
+                        </template>
                         <template v-if="statusName=='待修图'">
                             <el-button type="primary" size="mini" @click="goNextquery('orderUploadChange',{type:1})">上传修图</el-button>
                         </template>
@@ -203,8 +205,42 @@ export default {
 
             window.location.href = baseUrl + '/orderImage/zipFilesDown?orderId=' + this.info.id + '&typeFlag=' + typeFlag
         },
-        goChat(){
-            window.open(window.location.origin + window.location.pathname + '?storeId=' + this.info.storeId + '#/storeChat?chatUserId='+this.info.userId)
+        goChat() {
+            window.open(window.location.origin + window.location.pathname + '?storeId=' + this.info.storeId + '#/storeChat?chatUserId=' + this.info.userId)
+        },
+        changePrice() {
+            this.$prompt('请输入修改价格', '订单号:' + this.info.orderCode, {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                inputPattern: /^[0-9]*$/,
+                inputErrorMessage: '价格格式不正确'
+            }).then(({ value }) => {
+                this.$http.post({
+                    url: '/userOrder/update',
+                    data: {
+                        id: this.info.id,
+                        dealPrice: value
+                    }
+                }).then(res => {
+                    if (res.success) {
+                        this.$message({
+                            type: 'success',
+                            message: '修改成功'
+                        });
+                        this.$emit('changeorderinfo', this.info.id)
+                    }
+                }).catch(e => {
+                    console.log(e)
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '取消输入'
+                });
+            });
+        },
+        startChat(id){
+            this.$emit('startChat',id)
         }
     }
 }

src/main/vue/src/emUI.less

@@ -154,7 +154,7 @@ a{
     background-size: cover;
     background-position: center center;
     background-repeat: no-repeat;
-    height:420px ;
+    // height:420px ;
 }
 
 .swiper .el-carousel__arrow{

src/main/vue/src/pages/AboutUs.vue

@@ -9,6 +9,7 @@
             </el-form-item>
             <el-form-item prop="image" label="图片">
                 <single-upload v-model="formData.image" :disabled="'image'==subColumn"></single-upload>
+                <span style="color:#999">图片尺寸 414 *316</span>
             </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>

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

@@ -1,6 +1,13 @@
 <template>
     <div class="conatiner">
-        <div class="banner" style="background-image:url(http://bpic.588ku.com/back_pic/03/63/06/2457abee2a5523a.jpg)"></div>
+          <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">
@@ -8,12 +15,12 @@
                 <span>关于我们</span>
             </div>
             <div class="content-content">
-                <div class="content-img" style="background-image:url(http://bpic.588ku.com/back_pic/04/17/43/435827c692027aa.jpg)"></div>
+                <div class="content-img" :style="{backgroundImage:'url('+aboutInfo.image+')'}"></div>
 
                 <div class="content-text">
-                    <div class="title">安徽图忆途网络科技服务有限公司</div>
-                    <div class="content-all">
-                        此处展示公司简介信息，案例示例 浙江百慕生物科技有限公司隶属浙江丽珀集团，成立于2011年3月，注册资本1000万元，是一家从事海洋生物开发销售的公司，主要从事保健品（海参）产品的销售。 旗下的优参堂海参品牌源自于卢炜翎先生创立的优参号参堂，经过一百多年的发展，现已成为最具规模化，现代化，专业化的海参加工生产企业之一。 公司特与世纪联华超市股份有限公司、物美商业集团股份有限公司、天天好大药房等合作，在浙江省多个城市100多家门店进行销售。此外公司还搭档杭州电视台生活频道《生活大参考》、杭州电视台生活频道电商平台共同进行优参堂海参的销售，致力于将品牌以更多样化的形式进行推广，将产品以更方便快捷的渠道送达到消费者手中。 公司本着“客户至上，质量为本”的原则，建立健全了严苛的质量标准检验体系，除了通过国家食品认证体系之外，还委托国家轻工业食品质量监督检测杭州站特别做了农药、兽药残留检测，海水污染检测，以远远低于国家标准的检测结果确保海参品质。
+                    <div class="title">{{aboutInfo.title}}</div>
+                    <div class="content-all" v-html="aboutInfo.description">
+
                     </div>
                 </div>
             </div>
@@ -26,18 +33,48 @@ 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: 13
+            }
+        }).then(res => {
+            if (res.success) {
+               this.bannerList=res.data
+            }
+        }).catch(e => {
+            console.log(e)
+        })
+    },
     computed: {
     },
     methods: {
+        scrollMenu() { }
     }
 }
 </script>
 
 <style lang="less" scoped>
 .banner {
-    width: 1191px;
+    width: 1190px;
     height: 220px;
     background-position: center center;
     background-repeat: no-repeat;

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

@@ -5,7 +5,7 @@
             <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" src="../assetsPre/logo.png" alt="">
+                        <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">
@@ -58,7 +58,7 @@
         </div>
 
         <div class="little-menu">
-            <div class="little-item" @click="sendMsg" >
+            <div class="little-item" @click="sendMsg">
                 <el-badge is-dot :hidden="hasNew==0">
                     <img src="../assetsPre/fankui1.png" style="width:17px;height:18px;" alt="">
                     <div>咨询</div>
@@ -137,17 +137,20 @@ export default {
     },
     mounted() {
 
-        this.$http.get({
-            url: '/serviceType/all',
-            data: {}
-        }).then(res => {
-            if (res.success) {
-                this.$store.commit('updateServiceType', res.data)
+        if (this.serviceType.length == 0) {
+            this.$http.get({
+                url: '/serviceType/all',
+                data: {}
+            }).then(res => {
+                if (res.success) {
+                    this.$store.commit('updateServiceType', res.data)
 
-            }
-        }).catch(e => {
-            console.log(e)
-        })
+                }
+            }).catch(e => {
+                console.log(e)
+            })
+
+        }
 
 
 
@@ -165,7 +168,7 @@ export default {
         eventBus.$off('receiveMessage', this.onReceiveMessage)
     },
     computed: {
-        ...mapState(['userInfo', 'serviceType', 'conversationList','IMConnected','myStoreInfo']),
+        ...mapState(['userInfo', 'serviceType', 'conversationList', 'IMConnected', 'myStoreInfo']),
         lineWidth() {
             var width = 40
             if (document.getElementById('menuItem' + this.nowMenu)) {
@@ -263,8 +266,8 @@ export default {
                     name: 'login'
                 })
             }
-            else if( this.userInfo.storeFlag=='Y' ){
-                 window.open(window.location.origin + window.location.pathname + '?storeId=' + this.myStoreInfo.id + '#/storeChat')
+            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
@@ -360,6 +363,7 @@ export default {
             float: left;
             width: 300px;
             height: 54px;
+            cursor: pointer;
         }
 
         .Head-right {

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

@@ -389,6 +389,8 @@ export default {
         top: 20vh;
         left: 50%;
         transform: translateX(-50%);
+        height: 60vh;
+        min-height: 360px;
     }
 
     .topContent {
@@ -412,7 +414,7 @@ export default {
 
     .leftList {
         padding: 0 15px;
-        height: 583px;
+        // height: 583px;
         overflow: auto;
     }
 
@@ -493,12 +495,24 @@ export default {
 
     .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;
+            // 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;

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

@@ -1,6 +1,13 @@
 <template>
     <div class="conatiner">
-        <div class="banner" style="background-image:url(http://bpic.588ku.com/back_pic/03/63/06/2457abee2a5523a.jpg)"></div>
+        <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">
@@ -11,23 +18,23 @@
             <div class="content-content">
 
                 <div class="content-text">
-                    <div class="title">安徽图忆途网络科技服务有限公司</div>
+                    <div class="title">{{contactInfo.companyName}}</div>
                     <div class="content-all">
                         <div>
                             <img style="width:18px;height:18px" src="../assetsPre/contact2.png" alt="">
-                            <span>电话：(+86）-755-26905651 / 26905652 / 26905653 </span>
+                            <span>电话：{{contactInfo.telephone}}</span>
                         </div>
                         <div>
                             <img style="width:17px;height:17px" src="../assetsPre/contact4.png" alt="">
-                            <span>传真：(+86）-755-26905650 </span>
+                            <span>传真：{{contactInfo.faxes}} </span>
                         </div>
                         <div>
                             <img style="width:15px;height:12px" src="../assetsPre/contact3.png" alt="">
-                            <span>邮编：230000 </span>
+                            <span>邮编：{{contactInfo.postcode}} </span>
                         </div>
                         <div>
                             <img style="width:12px;height:17px" src="../assetsPre/contact5.png" alt="">
-                            <span>地址：安徽省合肥市高新区长江西路699号金濠广场B03幢2204</span>
+                            <span>地址：{{contactInfo.address}}</span>
                         </div>
                     </div>
                 </div>
@@ -53,8 +60,37 @@ 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: {

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

@@ -366,6 +366,11 @@ export default {
             document.getElementById('container').scrollTop = document.getElementById('box' + index).offsetTop + 730 - 250
         }
     },
+    activated(){
+           this.quickFixed = false
+        document.getElementById('quickMenu').style.left = 0
+
+    },
     components: {
         goodsLittle, menuFoot
     }

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

@@ -1,6 +1,13 @@
 <template>
     <div class="conatiner">
-        <div class="banner" style="background-image:url(http://bpic.588ku.com/back_pic/03/63/06/2457abee2a5523a.jpg)"></div>
+        <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">
@@ -11,24 +18,18 @@
             <div class="content-content">
 
                 <div class="content-text">
-                    如果你是:
-                    <br/>
-                    <b>狂恋代码的超级极客；</b>
-                    <br/> 互联网行业的超级脑残粉；
-                    <br/>
-                    <b>重度互联网依赖者； </b>
-                    <br/> 梦想用自己的右手，咳咳，不，双手让我们的行业变得更酷……
-                    <br/> 恭喜你，和我们基因相符，
-                    <br/> 赶快加入我们吧
-                    <br/> 邮箱：admin@nowcoder.com
-                    <br/> 联系方式：010-60728802
+                    <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">诚聘英才</div>
+                    <div class="button" @click="goNext">诚聘英才</div>
                 </div>
             </div>
         </div>
@@ -40,11 +41,43 @@ 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>
@@ -115,6 +148,7 @@ export default {
                 line-height: 50px;
                 text-align: center;
                 margin: 37px auto;
+                cursor: pointer;
             }
         }
 

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

@@ -4,10 +4,10 @@
             <div class="Foot">
                 <div class="foot-top">
                     <ul class='short-enter'>
-                        <li>
-                            <a href="#">首页</a>
+                        <li v-for="(item,index) in serviceType">
+                            <router-link :to='{name:"business",query:{id:(index+1)}}' class="service-val">{{item.shortName}}</router-link>
                         </li>
-                        <li>
+                        <!-- <li>
                             <a href="#">修图商</a>
                         </li>
                         <li>
@@ -18,7 +18,7 @@
                         </li>
                         <li>
                             <a href="#">周边</a>
-                        </li>
+                        </li> -->
                         <li>
                             <router-link :to='{name:"contact"}'>联系我们</router-link>
                         </li>
@@ -37,15 +37,10 @@
                         <li>
                             友情链接
                         </li>
-                        <li>
-                            <a href='#'>阿里巴巴集团</a>
-                        </li>
-                        <li>
-                            <a href='#'>淘宝网</a>
-                        </li>
-                        <li>
-                            <a href='#'>天猫</a>
+                        <li v-for="item in linkList">
+                            <a :href='item.url'>{{item.linkName}}</a>
                         </li>
+
                     </ul>
                 </div>
             </div>
@@ -57,6 +52,7 @@
 
 <script>
 
+import { mapState } from 'vuex'
 export default {
     props: {
         isBottom: {
@@ -67,10 +63,40 @@ export default {
     name: 'page404',
     data() {
         return {
-
+            linkList: []
         }
     },
     computed: {
+        ...mapState(['serviceType']),
+    },
+    mounted() {
+        if (this.serviceType.length == 0) {
+            this.$http.get({
+                url: '/serviceType/all',
+                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)
+        })
+
 
     },
     methods: {

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

@@ -1,174 +1,71 @@
 <template>
-    <div>
-        <!-- <orderStep></orderStep> -->
-        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
-                 style="max-width: 500px;">
-                                                                                                                                                                                                                                    <el-form-item prop="userId" label="用户">
-                <el-input v-model="formData.userId" :disabled="'userId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="orderCode" label="订单编码">
-                <el-input v-model="formData.orderCode" :disabled="'orderCode'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="storeId" label="店铺">
-                <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productType" label="商品类型">
-                <el-input v-model="formData.productType" :disabled="'productType'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productId" label="商品ID">
-                <el-input v-model="formData.productId" :disabled="'productId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="productName" label="商品名称">
-                <el-input v-model="formData.productName" :disabled="'productName'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="specification" label="规格">
-                <el-input v-model="formData.specification" :disabled="'specification'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="unitPrice" label="单价">
-                <el-input v-model="formData.unitPrice" :disabled="'unitPrice'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="quantity" label="数量">
-                <el-input v-model="formData.quantity" :disabled="'quantity'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="userCouponId" label="优惠券">
-                <el-input v-model="formData.userCouponId" :disabled="'userCouponId'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="offPrice" label="优惠金额">
-                <el-input v-model="formData.offPrice" :disabled="'offPrice'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="totlePrice" label="总价">
-                <el-input v-model="formData.totlePrice" :disabled="'totlePrice'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="dealPrice" label="成交价">
-                <el-input v-model="formData.dealPrice" :disabled="'dealPrice'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="payMode" label="支付方式">
-                <el-input v-model="formData.payMode" :disabled="'payMode'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                                                                                                                        <el-form-item prop="payTime" label="支付时间">
-                            <template>
-                                <div class="block">
-                                    <el-date-picker
-                                            v-model="formData.payTime"
-                                            type="datetime"
-                                            value-format="timestamp"
-                                            placeholder="选择日期"
-                                            :disabled="'payTime'==subColumn">
-                                    </el-date-picker>
-                                </div>
-                            </template>
-                        </el-form-item>
-                                                                                                                                                                                                                                            <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark" :disabled="'remark'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="showFlag" label="显示标识">
-                <el-input v-model="formData.showFlag" :disabled="'showFlag'==subColumn"></el-input>
-            </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="fee" label="手续费">
-                <el-input v-model="formData.fee" :disabled="'fee'==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 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 formValidator from '../formValidator'
 
 import orderStep from '../pagesPre/OrderStep'
-    export default {
-        created() {
-            if (this.$route.query.column) {
-                this.subColumn = this.$route.query.column.split(',')[1];
-                this.subValue = this.$route.query.column.split(',')[0];
+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)
 
-            if (this.$route.query.id) {
-                this.$http.get({
-                    url: '/userOrder/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;
-                    }
-                    }
-                })
-            }else {
-                if (this.$route.query.column) {
-                    this.formData[this.subColumn] = this.subValue;
-                }
-            }
-
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-        data() {
-            return {
-                saving: false,
-                formData: {},
-                rules: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
-                                                                                                                                                                                                                    subColumn: '',
-            subValue: '',
-        }
-        },
-        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: this.formData.id ? '/userOrder/update' : '/userOrder/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: '/userOrder/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('删除失败');
-                    }
-                })
-            },
-        },
-        components:{
-            orderStep
+    },
+    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/OrderUpload.vue

@@ -3,21 +3,21 @@
         <div class="top" v-if="orderInfo.productInfo">
             <span>订单号:{{orderInfo.orderCode}}</span>
             <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
-            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="dialogVisible=true,upLoadImg=[],addImage=[]">上传图片</el-button>
+            <el-button type="primary" v-if="canUploadNum>0" class="btn" @click="dialogVisible=true,upLoadImg=[],addImage=[],num=0">上传图片</el-button>
         </div>
 
-        <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px">
-            <el-upload class="upload-demo"  :file-list="upLoadImg" drag :limit="canUploadNum" :action="url" multiple :on-success='handleSuccess' :on-remove="handleRemove">
+        <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px" :close-on-click-modal='false'>
+            <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">只能上传jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
+                <div class="el-upload__tip" slot="tip">只能上传RGB图片类型的jpg/png文件，当前已上传{{addImage.length}}张图片，还可以上传{{canUploadNum-addImage.length}}张</div>
             </el-upload>
 
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="upload">确 定</el-button>
+                <el-button type="primary" :loading="loading" @click="upload">确 定</el-button>
             </span>
         </el-dialog>
 
@@ -105,7 +105,9 @@ export default {
             addImage: [],
             orderImage: [],
             canSubmit: true,
-            upLoadImg:[]
+            upLoadImg: [],
+            num: 0,
+            loading: false
         }
     },
     methods: {
@@ -144,6 +146,15 @@ export default {
             res.data.forEach(item => {
                 this.addImage.push(item)
             })
+
+            if (this.addImage.length == this.num) {
+                this.loading = false
+            }
+        },
+        handleOn(file, fileList) {
+            this.loading = true
+            this.num++
+            console.log(this.num)
         },
         delImg(index) {
             this.addImage.splice(index, 1)
@@ -164,7 +175,8 @@ export default {
                     userId: this.userInfo.id,
                     storeId: this.orderInfo.storeId,
                     imageName: this.addImage[i].imageName,
-                    originalSize: this.addImage[i].imageSize
+                    originalSize: this.addImage[i].imageSize,
+                    originalArtwork: this.addImage[i].artworkUrl
 
                 }
                 this.$http.post({

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

@@ -9,7 +9,7 @@
                 <el-option key="1" 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=[]">批量上传</el-button>
+            <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">
@@ -49,8 +49,8 @@
 
         </div>
 
-        <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px">
-            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" multiple :on-success='handleSuccess' :on-remove="handleRemove">
+        <el-dialog title="上传图片" :visible.sync="dialogVisible" width="400px" :close-on-click-modal='false'>
+            <el-upload class="upload-demo" :file-list="upLoadImg" drag :action="url" multiple :before-upload="handleOn" :on-success='handleSuccess' :on-remove="handleRemove">
                 <i class="el-icon-upload"></i>
                 <div class="el-upload__text">将文件拖到此处，或
                     <em>点击上传</em>
@@ -60,7 +60,7 @@
 
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="upload">确 定</el-button>
+                <el-button type="primary" @click="upload" :loading="isLoading">确 定</el-button>
             </span>
         </el-dialog>
 
@@ -81,7 +81,15 @@ export default {
         }).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()
             }
         })
@@ -126,9 +134,15 @@ export default {
             upLoadImg: [],
             notUp: 0,
             allNumber: 0,
+            num: 0,
+            isLoading: false
         }
     },
     methods: {
+        handleOn() {
+            this.num++
+            this.isLoading = true
+        },
         changeRemark() {
             if (!this.repairId) {
                 this.$http.get({
@@ -168,9 +182,7 @@ export default {
                 currentPage: this.currentPage,
                 pageNumber: 7,
             }
-            if (this.unFinished) {
-                data.unFinished = this.unFinished
-            }
+
 
             if (this.$route.query.repairId) {
                 data.repairId = this.$route.query.repairId
@@ -181,6 +193,8 @@ export default {
                     data.statusFlag = 0
                 }
                 data.unFinished = ''
+                data.baseRepairId = this.$route.query.repairId
+
 
             }
 
@@ -237,11 +251,15 @@ export default {
                 })
             })
             this.addImage = list
+            this.num = this.addImage.length
         },
         handleSuccess(res) {
             res.data.forEach(item => {
                 this.addImage.push(item)
             })
+            if (this.num == this.addImage.length) {
+                this.isLoading = false
+            }
         },
         delImg(index) {
             this.addImage.splice(index, 1)
@@ -366,16 +384,17 @@ export default {
 
         },
         changeImg(newVal) {
-            this.updateImg(newVal.index, newVal.img.url, newVal.img.imageSize)
+            this.updateImg(newVal.index, newVal.img.url, newVal.img.imageSize, newVal.artworkUrl)
         },
-        updateImg(index, img, size) {
+        updateImg(index, img, size, artworkUrl) {
             this.$http.post({
                 url: '/orderImage/update',
                 data: {
                     id: this.orderImage[index].id,
                     finishedImage: img,
                     finishedSize: size,
-                    statusFlag: 0
+                    statusFlag: 0,
+                    finishedArtwork: artworkUrl
                 }
             }).then(res => {
                 if (res.success) {

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

@@ -7,7 +7,7 @@
                 <span>应付金额</span>
 
                 <span class="price" style="margin-left:10px;">¥</span>
-                <span class="price" style="color:#FC2703;margin-right:24px;font-weight:bold;">{{orderInfo.totlePrice}}</span>
+                <span class="price" style="color:#FC2703;margin-right:24px;font-weight:bold;">{{orderInfo.dealPrice}}</span>
             </span>
         </div>
 
@@ -85,8 +85,12 @@ export default {
             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: confirmButtonText,
                         cancelButtonText: '返回订单管理',
                         dangerouslyUseHTMLString: true,
                         center: true,
@@ -94,12 +98,20 @@ export default {
                         confirmButtonClass: 'btn-confirm',
                         closeOnClickModal: false,
                     }).then(() => {
-                        this.$router.replace({
-                            name: 'orderUpload',
-                            query: {
-                                orderId: this.$route.query.orderId
-                            }
-                        })
+                        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({

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

@@ -2,38 +2,38 @@
     <div style="padding:0 34px 0 20px;">
         <el-tabs v-model="activeName">
             <el-tab-pane label="商家注册" name="first">
-                <el-form v-if="!isSuccess1" :model="formData" :rules="rules1" ref="form1" label-width="100px" label-position="right" size="small" style="max-width: 420px;margin-top:20px;">
+                <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="formData.username" placeholder="请输入用户名" maxlength="10" style="width:204px;"></el-input>
+                        <el-input v-model="formData1.username" placeholder="请输入用户名" maxlength="10" 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="formData.password" maxlength="11"></el-input>
+                        <el-input type="password" name='psd' placeholder="6-11位的字母或者数字（必须包含数字字母的组合）" v-model="formData1.password" maxlength="11"></el-input>
                     </el-form-item>
                     <el-form-item prop="surePassword" label="确认密码">
-                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData.surePassword" maxlength="11"></el-input>
+                        <el-input type="password" name='surepsd' placeholder="请重复输入密码" v-model="formData1.surePassword" maxlength="11"></el-input>
                     </el-form-item>
                     <el-form-item prop="contacter" label="联系人">
-                        <el-input placeholder="请重复输入密码" v-model="formData.contacter" maxlength="8"></el-input>
+                        <el-input placeholder="请重复输入密码" v-model="formData1.contacter" maxlength="8"></el-input>
                     </el-form-item>
                     <el-form-item prop="contactPhone" label="联系人电话">
-                        <el-input v-model="formData.contactPhone" placeholder="请输入手机号码" maxlength="11"></el-input>
+                        <el-input v-model="formData1.contactPhone" 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-input v-model="formData1.code" placeholder="请输入验证码" style="width:204px;"></el-input>
                         <el-button plain style="width:110px;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
                     </el-form-item>
                     <el-form-item prop="companyName" label="企业名称">
-                        <el-input v-model="formData.companyName" placeholder="请输入企业名称" maxlength="20"></el-input>
+                        <el-input v-model="formData1.companyName" placeholder="请输入企业名称" maxlength="20"></el-input>
                     </el-form-item>
                     <el-form-item prop="companyType" label="企业类型">
-                        <el-select v-model="formData.companyType" placeholder="请选择">
+                        <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="formData.isRead">已阅读</el-checkbox>
+                        <el-checkbox v-model="formData1.isRead">已阅读</el-checkbox>
                         <el-button type="text" style="color:#FB6E08">《用户隐私协议和隐私条款》</el-button>
                     </el-form-item>
 
@@ -100,11 +100,14 @@ export default {
     data() {
         return {
             companyTypeList: [],
-            activeName: 'first',
+            activeName: 'second',
             saving: false,
             formData: {
                 isRead: false,
             },
+            formData1: {
+                isRead: false,
+            },
             rules: {
                 username: [
                     { required: true, message: '请输入用户名', trigger: 'blur' },
@@ -189,7 +192,7 @@ export default {
                             if (!value) {
                                 callback(new Error('请输入用户名'));
                             } else {
-                                this.checkHas({ username: this.formData.username }).then((result) => {
+                                this.checkHas({ username: this.formData1.username }).then((result) => {
                                     if (result) {
                                         callback(new Error('已存在该用户名'));
                                     }
@@ -204,7 +207,6 @@ export default {
                 password: [
                     { required: true, message: '请输入密码', trigger: 'blur' },
                     {
-
                         validator: (rule, value, callback) => {
                             if (!value) {
                                 callback(new Error('请输入密码'));
@@ -222,7 +224,7 @@ export default {
                         validator: (rule, value, callback) => {
                             if (!value) {
                                 callback(new Error('请输入确认密码'));
-                            } else if (value == this.formData.password) {
+                            } else if (value == this.formData1.password) {
                                 callback();
                             } else {
                                 callback(new Error('两次密码输入不一致！'));
@@ -333,15 +335,15 @@ export default {
                 this.$http.post({
                     url: '/userInfo/register',
                     data: {
-                        username: this.formData.username,
-                        nickname: this.formData.username,
-                        password: this.formData.password,
-                        phone: this.formData.contactPhone,
-                        contacter: this.formData.contacter,
-                        companyName: this.formData.companyName,
-                        companyType: this.formData.companyType,
-                        contactPhone: this.formData.contactPhone,
-                        companyType:'Y'
+                        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,
+                        companyType: 'Y'
 
                     }
                 }).then(res => {
@@ -361,19 +363,19 @@ export default {
                 this.$message.warning('手机号格式错误')
                 return
             }
-            else if (!this.checkPhone(this.formData.contactPhone) && this.activeName == 'first') {
+            else if (!this.checkPhone(this.formData1.contactPhone) && this.activeName == 'first') {
                 this.$message.warning('手机号格式错误')
                 return
             }
 
 
-            this.checkHas({ phone: (this.activeName == 'first' ? this.formData.contactPhone : this.formData.phone) }).then((result) => {
+            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.formData.contactPhone : this.formData.phone).then((json) => {
+                    this.sendMeg(this.activeName == 'first' ? this.formData1.contactPhone : this.formData.phone).then((json) => {
                         if (json.success) {
                             this.$message.success('发送成功')
                             this.backCode = json.data

src/main/vue/src/pagesPre/ShopOrder.vue

@@ -40,7 +40,7 @@
                 </div>
                 <div class="orderList" style="min-height:562px">
 
-                    <order-item v-for="item in orderList" :info="item"  :type='"shop"'></order-item>
+                    <order-item  @changeorderinfo="changeorderinfo" v-for="item in orderList" :info="item"  :type='"shop"'></order-item>
 
                 </div>
             </template>
@@ -180,6 +180,24 @@ export default {
             }).catch(e => {
                 console.log(e)
             })
+        },
+        changeorderinfo(id) {
+            this.$http.get({
+                url: '/userOrder/getOne',
+                data: {
+                    id:id
+                }
+            }).then(res => {
+                if (res.success) {
+                   this.orderList.forEach((item,index)=>{
+                       if(item.id==id){
+                           this.$set(this.orderList,index,res.data)
+                       }
+                   })
+                }
+            }).catch(e => {
+                console.log(e)
+            })
         }
 
     },

src/main/vue/src/pagesPre/StoreChat.vue

@@ -28,9 +28,9 @@
                 <div class="left">
                     <div class="left-content">
                         <div class="left-item" :class="{active:chatUserId==item.userId}" v-for="(item,index) in storeConversationList" @click="readAll(item)">
-                            <img class="icon" :src="item.storeInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
+                            <img class="icon" :src="item.userInfo.icon+'?x-oss-process=image/resize,m_fill,h_40,w_40'" alt="">
                             <div class="chatName">
-                                <div class="name">{{item.storeInfo.storeName}}</div>
+                                <div class="name">{{item.userInfo.nickname}}</div>
                                 <div class="subtitle" v-if="item.chatInfo">{{item.chatInfo.content}}</div>
                             </div>
                             <div class="time" v-if="item.amount">
@@ -334,20 +334,20 @@ export default {
             }
 
         },
-        updateList(){
+        updateList() {
             this.$http.get({
-                    url: '/usersSession/all',
-                    data: {
-                        storeId: this.myStoreInfo.id,
-                        type: 0
-                    }
-                }).then(res => {
-                    if (res.success) {
-                        this.$store.commit('updateStoreConversationList', res.data)
-                    }
-                }).catch(e => {
-                    console.log(e)
-                })
+                url: '/usersSession/all',
+                data: {
+                    storeId: this.myStoreInfo.id,
+                    type: 0
+                }
+            }).then(res => {
+                if (res.success) {
+                    this.$store.commit('updateStoreConversationList', res.data)
+                }
+            }).catch(e => {
+                console.log(e)
+            })
         }
     },
     components: {
@@ -364,18 +364,34 @@ export default {
     left: 0;
     width: 100%;
     height: 100%;
+    min-height: 700px;
 }
 .content {
     width: 1190px;
-    height: 610px;
+    height: 60vh;
+    min-height: 430px;
     background-color: #fff;
     margin: 100px auto;
     border: 1px solid #ebebeb;
     border-radius: 4px;
+    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;
+    -webkit-justify-content: center;
     justify-content: center;
+    -moz-box-pack: center;
+    -webkit--moz-box-pack: center;
+    box-pack: center;
     align-items: center;
+    -webkit-align-items: center;
+    box-align: center;
+    -moz-box-align: center;
+    -webkit-box-align: center;
     .title {
         font-size: 30px;
         font-weight: bold;
@@ -387,7 +403,17 @@ export default {
 .customerList {
     display: flex;
     align-items: center;
-    justify-content: space-around;
+    -webkit-align-items: center;
+    box-align: center;
+    -moz-box-align: center;
+    -webkit-box-align: center;
+
+    -webkit-justify-content: center;
+    justify-content: center;
+    -moz-box-pack: center;
+    -webkit--moz-box-pack: center;
+    box-pack: center;
+
     min-width: 500px;
     .customerItem {
         padding: 20px;
@@ -407,14 +433,23 @@ export default {
 }
 
 .chatContent {
+    height: 60vh;
+    min-height: 430px;
     width: 1190px;
-    height: 610px;
     background-color: #fff;
     margin: 100px auto;
     // border: 1px solid #ebebeb;
     border-radius: 4px;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
     display: flex;
+    -webkit-box-orient: vertical;
+    -webkit-box-direction: normal;
+    -moz-box-orient: vertical;
+    -moz-box-direction: normal;
     flex-direction: column;
+    -webkit-flex-direction: column;
 
     .top {
         display: flex;
@@ -436,7 +471,11 @@ export default {
     }
 
     .chatmain {
-        flex-grow: 1;
+        box-flex: 1;
+        -webkit-box-flex: 1;
+        -moz-box-flex: 1;
+        flex: 1;
+        -webkit-flex: 1;
         display: flex;
         align-self: stretch;
         .left {

src/main/vue/src/pagesPre/Submit.vue

@@ -11,7 +11,11 @@
                 </div>
                 <template v-else>
                     <div class="address-item" v-if="isMore||userAddressID==item.id" @click="item.isChoose=!item.isChoose" :class="{isActive:item.isChoose}" v-for="(item,index) in userAddress">
-                        <el-button size="medium" @click.stop='' icon="el-icon-check" class="realName" v-if="item.id==userAddressID">{{item.realName}}</el-button>
+                        <el-button size="medium" @click.stop='' class="realName" v-if="item.id==userAddressID">{{item.realName}}
+                            <div class="choose">
+                                <i class="el-icon-check"></i>
+                            </div>
+                        </el-button>
                         <el-button size="medium" @click.stop='userAddressID=item.id' class="realName" v-else>{{item.realName}}</el-button>
                         <span style="margin-left:27px;">{{item.realName}}</span>
                         <span style="margin-left:27px;">{{item.address.join(' ')}}</span>
@@ -189,7 +193,7 @@ export default {
         ...mapState(['userInfo', 'typeFlag']),
         price() {
             var money = 0;
-            if (this.productInfo.productPriceList.length>0) {
+            if (this.productInfo.productPriceList.length > 0) {
                 this.productInfo.productPriceList.forEach(item => {
                     if (item.maxCounts && item.minCounts && this.num < item.maxCounts && this.num >= item.minCounts) {
                         money = item.price
@@ -200,8 +204,8 @@ export default {
                     }
                 })
             }
-            else{
-                money=this.productInfo.price
+            else {
+                money = this.productInfo.price
             }
 
             return money
@@ -559,6 +563,25 @@ export default {
                 .realName {
                     width: 145px;
                     border: 1px solid rgba(234, 234, 234, 1);
+                    position: relative;
+                    overflow: hidden;
+                    .choose {
+                        position: absolute;
+                        width: 40px;
+                        height: 40px;
+                        background: rgba(11, 158, 192, 1);
+                        color: #fff;
+                        right: -20px;
+                        top: -20px;
+                        transform: rotate(45deg);
+                        text-align: center;
+                        i{
+                            position: absolute;
+                            bottom: 0;
+                            left: 12px;
+                            transform: rotate(-45deg);
+                        }
+                    }
                 }
 
                 span {

src/main/vue/src/pagesPre/UserCenter.vue

@@ -5,7 +5,7 @@
             <mini-head></mini-head>
             <div class="Head">
                 <div class="HeadContent">
-                    <img class="logo" src="../assetsPre/logoWhite.png" alt="">
+                    <img class="logo" @click="goNext('index')" src="../assetsPre/logoWhite.png" alt="">
                     <div class="title">
                         {{pageMenu}}
                     </div>
@@ -45,7 +45,7 @@
                         <el-alert v-if="coveListNum>0" :title="'当前有'+coveListNum+'条未读消息，请尽快去客户咨询处回复。'" type="warning" show-icon style='margin-bottom:10px;'>
                         </el-alert>
 
-                        <router-view ref='child'></router-view>
+                        <router-view ref='child' @startChat='startChat'></router-view>
                     </el-main>
                 </el-container>
 
@@ -54,6 +54,9 @@
         <el-footer height='104px'>
             <logo-foot :isBottom='isBottom'></logo-foot>
         </el-footer>
+
+
+        <chatContent ref='chatContent'></chatContent>
     </el-container>
 
 </template>
@@ -63,6 +66,7 @@ import miniHead from '../components/MiniHead'
 import menuFoot from '../pagesPre/MenuFoot'
 import logoFoot from '../pagesPre/LogoFoot'
 import { mapState } from 'vuex'
+import chatContent from '../pagesPre/ChatContent'
 export default {
     name: 'order',
     mounted() {
@@ -182,7 +186,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(['storeConversationList', 'myStoreInfo']),
+        ...mapState(['userInfo', 'storeConversationList', 'myStoreInfo']),
         pageMenu() {
             var str = '个人中心'
             if (this.$route.meta.pageMenu) {
@@ -250,10 +254,23 @@ export default {
                     searchKey: this.searchKey
                 }
             })
+        },
+         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
+            }
         }
     },
     components: {
-        miniHead, menuFoot, logoFoot
+        miniHead, menuFoot, logoFoot,chatContent
     }
 }
 </script>
@@ -282,6 +299,7 @@ export default {
             width: 300px;
             height: 54px;
             vertical-align: middle;
+            cursor: pointer;
         }
 
         .title {

src/main/vue/src/pagesPre/UserCenterHome.vue

@@ -28,7 +28,7 @@
 
         <div class="content">
             <div class="orderList">
-                <order-item v-for="item in orderList" :info='item'></order-item>
+                <order-item v-for="item in orderList" :info='item' @startChat='startChat'></order-item>
             </div>
         </div>
     </div>
@@ -66,7 +66,9 @@ export default {
 
     },
     methods: {
-
+        startChat(id){
+            this.$emit('startChat',id)
+        }
 
     },
     components: {

src/main/vue/src/pagesPre/UserOrder.vue

@@ -39,8 +39,10 @@
                     </div>
                 </div>
                 <div class="orderList" style="min-height:562px">
+                    <template v-for="item in orderList">
+                        <order-item :info="item" @startChat='startChat'></order-item>
 
-                    <order-item v-for="item in orderList" :info="item"></order-item>
+                    </template>
 
                 </div>
             </template>
@@ -80,6 +82,9 @@ export default {
         this.getData({})
     },
     methods: {
+        startChat(id){
+            this.$emit('startChat',id)
+        },
         currentPageChange(page) {
             this.currentPage = page;
             this.getData({});

src/main/vue/src/pagesPre/UserShop.vue

@@ -36,7 +36,7 @@
 
             <div class="content">
                 <div class="orderList">
-                    <order-item v-for="item in orderList" :info='item' :type='"shop"'></order-item>
+                    <order-item @changeorderinfo='changeorderinfo' v-for="item in orderList" :info='item' :type='"shop"'></order-item>
                 </div>
             </div>
         </template>
@@ -73,7 +73,7 @@ export default {
         this.$http.get({
             url: '/userOrder/page',
             data: {
-                storeId: this.myStoreInfo.id,
+                storeId: this.userInfo.storeInfo.id,
                 pageNumber: 1,
                 currentPage: 1
             }
@@ -91,7 +91,7 @@ export default {
         this.$http.get({
             url: '/orderImage/getMemorySize',
             data: {
-              storeId: this.myStoreInfo.id
+              storeId: this.userInfo.storeInfo.id
             }
         }).then(res => {
             if (res.success) {
@@ -104,7 +104,24 @@ export default {
 
     },
     methods: {
-
+        changeorderinfo(id) {
+            this.$http.get({
+                url: '/userOrder/getOne',
+                data: {
+                    id:id
+                }
+            }).then(res => {
+                if (res.success) {
+                   this.orderList.forEach((item,index)=>{
+                       if(item.id==id){
+                           this.$set(this.orderList,index,res.data)
+                       }
+                   })
+                }
+            }).catch(e => {
+                console.log(e)
+            })
+        }
 
     },
     components: {

src/main/vue/src/routerPre/index.js

@@ -425,6 +425,7 @@ router.beforeEach((to, from, next) => {
     }
 
     if (!store.state.userInfo && to.path !== '/login') {
+        // next();
         axios.get('/userInfo/getUserInfo').then(res => {
             if (res.status === 200) {
                 if (res.data.success && res.data.data) {
@@ -483,6 +484,7 @@ router.beforeEach((to, from, next) => {
                     return;
                 }
             }
+            console.log(to.meta.checkLogin)
             if (to.meta.checkLogin) {
                 next('/login');
             } else {

src/main/webapp/WEB-INF/html/admin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7c58273d799602baec23.js></script><script type=text/javascript src=/static/js/vendor.56194c28c58ef2af2fdb.js></script><script type=text/javascript src=/static/js/admin.1dec1632ba5b6c6eec7a.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.da4f73e09f989b1618ebd295c1c6c122.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.51c61c75b6bf7816cb17.js></script><script type=text/javascript src=/static/js/vendor.56194c28c58ef2af2fdb.js></script><script type=text/javascript src=/static/js/admin.6b79dc7dac866c2ae9de.js></script></body></html>

src/main/webapp/WEB-INF/html/index.html

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.6224220b6e2f2849327500dc504d1f66.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7c58273d799602baec23.js></script><script type=text/javascript src=/static/js/vendor.56194c28c58ef2af2fdb.js></script><script type=text/javascript src=/static/js/index.e25e87913624c6b75a5f.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.258b2b34108a6154bcd736380d7f6936.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.51c61c75b6bf7816cb17.js></script><script type=text/javascript src=/static/js/vendor.56194c28c58ef2af2fdb.js></script><script type=text/javascript src=/static/js/index.be3a2f9ad99ae10d48e6.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;

src/main/webapp/static/js/139.642828988a5a04b5cd48.js

@@ -0,0 +1 @@
+webpackJsonp([139],{"7pWu":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var a={name:"home",data:function(){return{aboutInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/aboutUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.aboutInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:13}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{scrollMenu:function(){}}},s={render:function(){var t=this,n=t.$createElement,e=t._self._c||n;return e("div",{staticClass:"conatiner"},[e("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[e("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?e("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),e("div",{staticClass:"content"},[t._m(0),t._v(" "),e("div",{staticClass:"content-content"},[e("div",{staticClass:"content-img",style:{backgroundImage:"url("+t.aboutInfo.image+")"}}),t._v(" "),e("div",{staticClass:"content-text"},[e("div",{staticClass:"title"},[t._v(t._s(t.aboutInfo.title))]),t._v(" "),e("div",{staticClass:"content-all",domProps:{innerHTML:t._s(t.aboutInfo.description)}})])])])],1)},staticRenderFns:[function(){var t=this.$createElement,n=this._self._c||t;return n("div",{staticClass:"name"},[n("div",{staticClass:"kuai"}),this._v(" "),n("span",[this._v("关于我们")])])}]};var i=e("VU/8")(a,s,!1,function(t){e("c+fW")},"data-v-472e9b91",null);n.default=i.exports},"c+fW":function(t,n){}});