问题修改

src/main/vue/src/components/GoodsLarge.vue

@@ -21,7 +21,8 @@
             </div>
         </div>
 
-        <img src="../assetsPre/levelA.png" alt="" class="level">
+        <!-- <img src="../assetsPre/levelA.png" alt="" class="level"> -->
+          <div class="level" :style="{backgroundImage:'url('+require('../assetsPre/startLogo.png')+')'}">{{info.credit}}</div>
     </router-link>
 </template>
 
@@ -68,8 +69,19 @@ export default {
     .level {
         display: inline-block;
         vertical-align: middle;
-        width: 58.5px;
+        width: 50px;
         height: 30px;
+        position: absolute;
+        right: 0;
+        top: 4px;
+        background-position: center center;
+        background-size: cover;
+        color: #fff;
+        font-size: 18px;
+        font-weight: bold;
+        line-height: 30px;
+        padding-right: 8.5px;
+        text-align: right;
     }
 
     .goodsImg {

src/main/vue/src/components/GoodsLittle.vue

@@ -1,6 +1,6 @@
 <template>
     <router-link :to='{name:"shop",query:{id:info.id,breHref:breHref}}' class="goods">
-        <img src="../assetsPre/levelA.png" alt="" class="level">
+        <div class="level" :style="{backgroundImage:'url('+require('../assetsPre/startLogo.png')+')'}">{{info.credit}}</div>
         <div class="goodsImg" :style="{backgroundImage:'url('+info.icon+')'}"></div>
         <div class="title">
             <div class="name">{{info.storeName}}</div>
@@ -35,13 +35,13 @@ export default {
     computed: {
         breHref() {
             var str = '首页,/index_;'
-            if(this.$route.name == 'index'){
+            if (this.$route.name == 'index') {
 
-            }else if (this.$route.name == 'business') {
+            } else if (this.$route.name == 'business') {
                 str += document.title + ',' + this.$route.name + '_;'
             }
-            else{
-                str=document.title +',/index_;'
+            else {
+                str = document.title + ',/index_;'
             }
             return str
         }
@@ -59,11 +59,19 @@ export default {
     position: relative;
     display: block;
     .level {
-        width: 39px;
+        width: 34px;
         height: 20px;
         position: absolute;
         right: 0;
         top: 4px;
+        background-position: center center;
+        background-size: cover;
+        color: #fff;
+        font-size: 12px;
+        font-weight: bold;
+        line-height: 20px;
+        padding-right: 5px;
+        text-align: right;
     }
     .goodsImg {
         width: 176px;

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

@@ -39,7 +39,7 @@
             <el-dialog :title="(storeType?'查看':'添加/修改')+'备注'" :visible.sync="dialogFormVisible" width='30%'>
                 <el-form label-width="80px">
                     <el-form-item :label="imgStyle=='examine'?'返修备注':'图片备注'">
-                        <el-input type="textarea" v-model="remark" auto-complete="off"></el-input>
+                        <el-input :disabled="storeType" type="textarea" v-model="remark" auto-complete="off"></el-input>
                     </el-form-item>
                 </el-form>
                 <div slot="footer" class="dialog-footer" v-if="!storeType">

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

@@ -0,0 +1,317 @@
+<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;" @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-11位的字母或者数字（必须包含数字字母的组合）" v-model="formData.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-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='"请牢记您的新密码，"+nowIndex+"秒后跳转到首页"'></systemState>
+            </template>
+
+        </div>
+
+    </div>
+</template>
+<script>
+import formValidator from '../formValidator'
+import systemState from '../pagesPre/SystemState'
+import certificationStep from '../components/CertificationStep'
+
+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 (/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,11}$/.test(value)) {
+                                callback();
+                            } else {
+                                callback(new Error('6-11位的字母或者数字（必须包含数字字母的组合）'));
+                            }
+                        }, 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
+        }
+    },
+    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) {
+                history.back()
+            }
+            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).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: '/rong/verifyCode',
+                        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/CustomerService.vue

@@ -4,18 +4,19 @@
             <!-- <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-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"></el-input>
+            <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-form-item prop="password" label="密码">
                 <el-input v-model="formData.password" :disabled="'password'==subColumn"></el-input>
-            </el-form-item>
+            </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>
@@ -84,6 +85,55 @@ export default {
                 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: '',

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

@@ -31,7 +31,7 @@
                                 </el-form-item>
                                 <el-form-item class='isRemenber' label="" style="line-height:16px;">
                                     <el-checkbox v-model="rememberMe">记住我</el-checkbox>
-                                    <a href="#">忘记密码？</a>
+                                    <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>
@@ -52,7 +52,7 @@
                                     </el-input>
                                 </el-form-item>
                                 <el-form-item prop="code">
-                                    <el-input v-model="userInfo.password" placeholder="验证码" type="text">
+                                    <el-input v-model="userInfo.code" placeholder="验证码" type="text">
 
                                         <template slot="prepend">
                                             <div style="padding: 0 15px">
@@ -67,7 +67,7 @@
                                 </el-form-item>
                                 <el-form-item class='isRemenber' label="" style="line-height:16px;">
                                     <el-checkbox v-model="rememberMe">记住我</el-checkbox>
-                                    <a href="#">忘记密码？</a>
+                                    <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>
@@ -147,7 +147,47 @@ export default {
                     })
                 }
                 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,
+                            sessionId: this.realCode
+                        }
+                    }).then(res => {
+                        this.loading = false;
+                        if (res.success) {
 
+                            if (history.length > 2 && !this.$route.query.goIndex) {
+                                history.back()
+                            }
+                            else {
+                                this.$router.replace({
+                                    name: 'index'
+                                })
+                            }
+                        } else {
+                            this.$message.error('用户名或密码错误');
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                    })
                 }
             })
         },
@@ -163,7 +203,17 @@ export default {
             this.isSend = true
             this.getTime()
 
-            this.sendMessage()
+            this.sendMeg(this.userInfo.phone).then((json) => {
+                if (json.success) {
+                    this.$message.success('发送成功')
+                    this.realCode = json.data
+                    this.isSend = true
+                    this.getTime()
+                }
+                else {
+                    this.$message.warning(json.error)
+                }
+            })
         },
         sendMessage() {
             new Promise((resolve, reject) => {
@@ -181,6 +231,8 @@ export default {
                     }
                 }).catch(() => {
                     this.$message.error('验证码发送失败！');
+                    this.isSend = false
+                    this.num = 0
                 })
             })
         },

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

@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="point-item">
-                <el-button type="warning" style="width:248px;" plain round>积分兑换</el-button>
+                <el-button type="warning" style="width:248px;" disabled plain round>积分兑换</el-button>
             </div>
         </div>
 
@@ -44,7 +44,7 @@
         </el-table>
         <div class="pagination-wrapper">
 
-            <el-pagination background @current-change="currentPageChange" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
+            <el-pagination v-if="totalNumber>pageSize" background @current-change="currentPageChange" :page-size="pageSize" layout="total, prev, pager, next" :total="totalNumber">
             </el-pagination>
         </div>
 

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

@@ -140,6 +140,7 @@ export default {
                 })
             })
             this.addImage = list
+            this.num = list.length
         },
         handleSuccess(res) {
             console.log(res)

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

@@ -156,7 +156,7 @@ export default {
         this.$http.get({
             url: '/productComment/count',
             data: {
-                prodcutId: this.$route.query.id
+                productId: this.$route.query.id
             }
         }).then(res => {
             if (res.success) {

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

@@ -33,8 +33,9 @@
             <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="主图">
+            <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>
@@ -83,6 +84,7 @@
                 <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">

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

@@ -13,14 +13,14 @@
                         <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="formData1.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="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 style="width:110px;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
+                        <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>
@@ -62,7 +62,7 @@
                     </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;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
+                        <el-button plain :disabled="isSend" style="width:110px;" @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
                     </el-form-item>
 
                     <el-form-item prop="isRead" label="">
@@ -408,7 +408,7 @@ export default {
                     this.$message.warning('请发送验证码')
                     resolve(false)
                 }
-                else if (!this.formData.code) {
+                else if (!this.formData1.code) {
                     this.$message.warning('请输入验证码')
                     resolve(false)
                 }
@@ -417,7 +417,7 @@ export default {
                         url: '/rong/verifyCode',
                         data: {
                             sessionId: this.backCode,
-                            code: this.formData.code
+                            code: this.formData1.code
                         }
                     }).then(res => {
                         if (res.success) {

src/main/vue/src/pagesPre/SetStoreInfo.vue

@@ -42,7 +42,7 @@
         </el-form-item>
         <el-form-item prop="icon" label="店铺头像">
             <single-upload-title v-model="formData.icon" :width='200' :height='125' :title="'添加头像'" :disabled="'icon'==subColumn"></single-upload-title>
-            <div style="font-size:12px;color:rgba(153,153,153,1);">注：格式jpg/jpeg/png，大小不超过10M</div>
+            <div style="font-size:12px;color:rgba(153,153,153,1);">注：格式jpg/jpeg/png，大小不超过10M，建议尺寸360*280</div>
         </el-form-item>
         <el-form-item prop="address" label="经营地址">
             <el-cascader :options="cityData" placeholder="省/市/区" :props='{value:"name",label:"name"}' v-model="formData.address">

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

@@ -20,7 +20,7 @@
             <div class="top">
                 <img class="icon" :src="myStoreInfo.icon+'?x-oss-process=image/resize,m_fill,h_50,w_50'" alt="">
                 <span style="font-weight:bold;">{{myStoreInfo.storeName}}</span>
-                <span style="font-size:14px;margin-left:20px;">客服{{Customer.username}}</span>
+                <span style="font-size:14px;margin-left:20px;">客服 {{Customer.serviceName}}</span>
                 <img style="margin-left:5px" :src="Customer.icon+'?x-oss-process=image/resize,m_fill,h_30,w_30'" alt="">
             </div>
 

src/main/vue/src/pagesPre/SystemState.vue

@@ -57,7 +57,7 @@ export default {
     methods: {
         goNext(str) {
             var query = {}
-            if (this.$route.name == 'register') {
+            if (this.$route.name == 'register' || this.$route.name == 'backPassword') {
                 query.goIndex = 1
             }
             this.$router.push({

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

@@ -42,7 +42,7 @@
                     </el-aside>
                     <el-main :style="{paddingLeft:nowMenuList.length>0?'20px':0}">
 
-                        <el-alert v-if="coveListNum>0" :title="'当前有'+coveListNum+'条未读消息，请尽快去客户咨询处回复。'" type="warning" show-icon style='margin-bottom:10px;'>
+                        <el-alert v-if="coveListNum>0&&pageMenu=='商家中心'" :title="'当前有'+coveListNum+'条未读消息，请尽快去客户咨询处回复。'" type="warning" show-icon style='margin-bottom:10px;'>
                         </el-alert>
 
                         <router-view ref='child' @startChat='startChat'></router-view>
@@ -114,10 +114,12 @@ export default {
                         name: '我的积分',
                         index: '6',
                         href: 'memberPoint'
-                    }, {
-                        name: '我的优惠券',
-                        index: '5'
-                    }],
+                    }
+                    // , {
+                    //     name: '我的优惠券',
+                    //     index: '5'
+                    // }
+                    ],
                     '账户设置': [{
                         name: '基本信息',
                         index: '1',

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

@@ -11,15 +11,16 @@
                     </div>
                 </div>
             </div>
-            <router-link :to="{name:'userSet',query:{activeName:'second'}}" class="top-item" style="width:22%">
+            <router-link :to="{name:'userSet',query:{activeName:'second'}}" class="top-item" style="width:22%;line-height:45px;">
                 我的收货地址
             </router-link>
             <div class="top-item" style="width:22%">
-                我的优惠券
+                <div>我的余额</div>
+                <div style="color:rgb(253, 149, 1);font-size:16px;margin-top:3px;font-weight:bold;">{{userInfo.moneyCoin}}</div>
             </div>
-            <div class="top-item" style="width:22%">
+             <router-link :to="{name:'memberPoint'}" class="top-item" style="width:22%;line-height:45px;">
                 我的积分
-            </div>
+            </router-link>
         </div>
 
         <div class="contentTitle">
@@ -66,8 +67,8 @@ export default {
 
     },
     methods: {
-        startChat(id){
-            this.$emit('startChat',id)
+        startChat(id) {
+            this.$emit('startChat', id)
         }
 
     },
@@ -95,6 +96,7 @@ export default {
         vertical-align: middle;
         text-align: center;
         box-sizing: border-box;
+        min-height: 45px;
 
         .icon {
             width: 55px;
@@ -160,7 +162,7 @@ export default {
     border-radius: 4px;
     border: 1px solid rgba(234, 234, 234, 1);
 
-    .orderList{
+    .orderList {
         margin-top: 23px;
     }
 }

src/main/vue/src/pagesPre/UserCertification.vue

@@ -39,7 +39,7 @@
                         <single-upload-title v-model="formData1.certificate" style="display:inline-block" :title='"添加证件照片"' :width='200' :height='125'>
 
                         </single-upload-title>
-                        <div class="ps">注：需要上传清晰证件照，格式jpg/jpeg/png，大小不超过10M </div>
+                        <div class="ps">注：建议上传清晰证件照，格式jpg/jpeg/png，大小不超过10M </div>
                     </el-form-item>
                     <el-form-item prop="address" label="所在地">
                         <el-cascader :options="cityData" :props='{value:"name",label:"name"}' v-model="formData1.address">
@@ -89,7 +89,8 @@ export default {
             formData1: {
                 company: '',
                 companyTime: '',
-                address: []
+                address: [],
+                realName: ''
             },
             rules: {
                 realName: [
@@ -145,12 +146,15 @@ export default {
                 }
             }).then(res => {
                 if (res.success) {
-                    res.data.address = []
-                    res.data.address.push(res.data.province)
-                    res.data.address.push(res.data.city)
-                    res.data.address.push(res.data.country)
-                     res.data.companyTime=moment(res.data.companyTime).format('YYYY')
-                    this.formData1 = res.data;
+                    if (res.data) {
+                        res.data.address = []
+                        res.data.address.push(res.data.province)
+                        res.data.address.push(res.data.city)
+                        res.data.address.push(res.data.country)
+                        res.data.companyTime = moment(res.data.companyTime).format('YYYY')
+                        this.formData1 = res.data;
+                    }
+
                 }
             })
         }
@@ -162,7 +166,10 @@ export default {
                 }
             }).then(res => {
                 if (res.success) {
-                    this.formData = res.data;
+                    if (res.data) {
+                        this.formData = res.data;
+                    }
+
                 }
             })
         }
@@ -185,7 +192,7 @@ export default {
                 data.province = this.formData1.address[0]
                 data.city = this.formData1.address[1]
                 data.country = this.formData1.address[2]
-                data.companyTime=Date.parse(moment(data.companyTime))
+                data.companyTime = Date.parse(moment(data.companyTime))
                 if (!this.formData1.id) {
                     data.userId = this.userInfo.id
                     data.userName = this.userInfo.username

src/main/vue/src/pagesPre/UserSet.vue

@@ -5,6 +5,7 @@
                 <el-form :model="userInfo" ref="form" label-width="80px" label-position="right" size="small" style="max-width:400px;">
                     <el-form-item prop="icon" label="当前头像">
                         <single-upload class="icon" v-model="userInfo.icon" style="wdith:98px"></single-upload>
+                        <span style="font-size:12px;color:#999">图片尺寸100*100</span>
                     </el-form-item>
                     <el-form-item prop="nickname" label="昵称">
                         <el-input v-model="userInfo.nickname"></el-input>

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

@@ -367,6 +367,14 @@ const router = new Router({
                 meta: {
                     title: '账户注册',
                 }
+            }, {
+                path: '/backPassword',
+                name: 'backPassword',
+                component: () =>
+                    import ('../pagesPre/BackPassword'),
+                meta: {
+                    title: '找回密码',
+                }
             }]
         }, {
             path: '/login',

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.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>
+<!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.48e8b55b73c59e5d6c46.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/admin.3725b6b904015686c98e.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.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字符串
+        }</style><link href=/static/css/index.e2f6c189030abc1535b85d6b98721b1a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.48e8b55b73c59e5d6c46.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.8a78afcdbecba53ffa04.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/101.7c44d94544b337042b42.js → src/main/webapp/static/js/102.fa40befe33c1c89ee730.js

@@ -1 +1 @@
-webpackJsonp([101],{TH6L:function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("TH6L")},"data-v-f8763b4a",null);t.default=s.exports}});
+webpackJsonp([102],{TH6L:function(e,t){},Wh3M:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("el-form",{ref:"form",staticStyle:{"max-width":"500px"},attrs:{model:e.formData,rules:e.rules,"label-width":"80px","label-position":"right",size:"small"}},[a("el-form-item",{attrs:{prop:"dataruleName",label:"权限名称"}},[a("el-input",{model:{value:e.formData.dataruleName,callback:function(t){e.$set(e.formData,"dataruleName",t)},expression:"formData.dataruleName"}})],1),e._v(" "),a("el-form-item",{attrs:{prop:"permission",label:"权限标识"}},[a("el-input",{model:{value:e.formData.permission,callback:function(t){e.$set(e.formData,"permission",t)},expression:"formData.permission"}})],1),e._v(" "),a("el-form-item",[a("el-button",{attrs:{loading:e.$store.state.fetchingData,type:"primary"},on:{click:e.onSave}},[e._v("保存")]),e._v(" "),a("el-button",{on:{click:function(t){e.$router.go(-1)}}},[e._v("取消")])],1)],1)],1)},staticRenderFns:[]};var s=a("VU/8")({created:function(){var e=this;this.$route.query.id&&this.$http.get({url:"/sysDatarule/getOne",data:{id:this.$route.query.id}}).then(function(t){t.success&&(e.formData=t.data)})},data:function(){return{saving:!1,formData:{},rules:{dataruleName:[{required:!0,message:"请填写权限名称",trigger:"blur"}],permission:[{required:!0,message:"请填写权限标识",trigger:"blur"}]},menus:[]}},methods:{onSave:function(){var e=this;this.$refs.form.validate(function(t){if(!t)return!1;e.submit()})},submit:function(){var e=this;this.$http.post({url:this.formData.id?"/sysDatarule/update":"/sysDatarule/save",data:this.formData}).then(function(t){t.success?(e.$message.success("成功"),e.$router.go(-1)):e.$message.warning("失败")})}}},r,!1,function(e){a("TH6L")},"data-v-f8763b4a",null);t.default=s.exports}});

src/main/webapp/static/js/126.815426c1fdbd9ce43507.js → src/main/webapp/static/js/128.ea71240b3370ae2096f3.js

@@ -1 +1 @@
-webpackJsonp([126],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});
+webpackJsonp([128],{V8wA:function(t,e){},izdZ:function(t,e,r){"use strict";Object.defineProperty(e,"__esModule",{value:!0});r("NYxO");var i={created:function(){this.getIframeSrc()},data:function(){return{iframeSrc:"/404"}},computed:{height:function(){return window.innerHeight-104+"px"}},methods:{getIframeSrc:function(){this.iframeSrc=this.$route.query.code}},watch:{$route:function(){this.getIframeSrc()}}},n={render:function(){var t=this.$createElement;return(this._self._c||t)("iframe",{staticClass:"iframe",attrs:{src:this.iframeSrc,height:this.height,width:"100%"}})},staticRenderFns:[]};var c=r("VU/8")(i,n,!1,function(t){r("V8wA")},"data-v-6d20da16",null);e.default=c.exports}});

src/main/webapp/static/js/139.642828988a5a04b5cd48.js → src/main/webapp/static/js/140.7aa122b7d3aaaacc4793.js

@@ -1 +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){}});
+webpackJsonp([140],{"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){}});