9月20 前台提交

src/main/vue/src/RongIM/index.js

@@ -39,14 +39,14 @@ export default {
         console.log(token)
         RongIMClient.connect(String(token), {
             onSuccess: (userId) => {
-                console.log('连接成功,userId:', userId)
+                // console.log('连接成功,userId:', userId)
                 store.commit('updateIMConnected', true)
             },
             onTokenIncorrect: () => {
-                console.log('连接失败', 'token无效')
+                // console.log('连接失败', 'token无效')
             },
             onError: (errorCode) => {
-                console.log('连接失败', RongIMLib.ErrorCode[errorCode])
+                // console.log('连接失败', RongIMLib.ErrorCode[errorCode])
             }
         })
     },

src/main/vue/src/components/MiniHead.vue

@@ -7,7 +7,7 @@
                         <span>您好，欢迎来到图忆途摄影服务平台！</span>
                         <img src="../assetsPre/location.png" alt="">
                         <span>{{locationCity}}</span>
-                        <el-button v-if="!isIndex" type="text" style="vertical-align: middle;margin-left:15px;color:#333" @click="goHome" size="small">首页</el-button>
+                        <!-- <el-button v-if="!isIndex" type="text" style="vertical-align: middle;margin-left:15px;color:#333" @click="goHome" size="small">首页</el-button> -->
                     </div>
 
                     <div class="HeadRight">

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

@@ -18,7 +18,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;" :hidden='isSend' @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
+                        <el-button plain style="width:110px;" :disabled='isSend' @click="startSend">{{isSend?'已发送('+startNum+'S)':'获取验证码'}}</el-button>
                     </el-form-item>
 
                     <el-form-item label="">
@@ -45,7 +45,7 @@
 
             <template v-if="nowStep==3">
 
-                <systemState style="margin:auto" class="certain" :next='"login"' :type='"success"' :title="'修改密码成功！'" :subtitle='"请牢记您的新密码，"+nowIndex+"秒后跳转到首页"'></systemState>
+                <systemState style="margin:auto" class="certain" :next='"login"' :type='"success"' :title="'修改密码成功！'" :subtitle='""'></systemState>
             </template>
 
         </div>
@@ -223,7 +223,7 @@ export default {
             this.nowIndex = i
             if (i == 0) {
                 if (this.$route.query.name == 'backPassword') {
-                    history.back()
+                   this.$router.go(-1)
                 }
             }
             else {
@@ -320,4 +320,5 @@ export default {
 .stepContent {
     padding: 90px 300px 49px;
 }
+
 </style>

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

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

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

@@ -41,7 +41,8 @@
                 <el-input type="textarea" v-model="formData.serviceDetail" :disabled="'serviceDetail'==subColumn"></el-input>
             </el-form-item>
             <el-form-item prop="inventory" label="库存" style="max-width:400px">
-                <el-input v-model="formData.inventory" :disabled="'inventory'==subColumn"></el-input>
+                <!-- <el-input v-model="formData.inventory" :disabled="'inventory'==subColumn"></el-input> -->
+                <el-input-number v-model="formData.inventory" :min="0"></el-input-number>
             </el-form-item>
             <el-form-item prop="price" label="默认价格">
                 <el-input-number v-model="formData.price" :min="0"></el-input-number>
@@ -186,15 +187,31 @@ export default {
                 useFlag: true,
                 serviceType: 1,
                 onShelf: false,
-                price: 0
+                price: 0,
+                inventory: 0
             },
             rules: {
+                typeFlag: [
+                    { required: true, message: '请选择类型', trigger: 'blur' },
+                ],
+                title: [
+                    { required: true, message: '请输入商品标题', trigger: 'blur' },
+                ],
+                image: [
+                    { required: true, message: '请上传商品主图', trigger: 'blur' },
+                ],
+                inventory: [
+                    { required: true, message: '请上传商品主图', trigger: 'blur' },
+                ],
+                price: [
+                    { required: true, message: '请输入默认价格', trigger: 'blur' },
+                ],
             },
             subColumn: '',
             subValue: '',
             serviceTypes: [],
             serviceTypeDetails: {},
-            typeFlagOptions: [{ label: '修图', value: 0 }, { label: '实体商品', value: 1 }],
+            typeFlagOptions: [{ label: '修图', value: 0 }],//[{ label: '修图', value: 0 }, { label: '实体商品', value: 1 }],
             levelNum: [],
             fileList: []
         }
@@ -211,6 +228,7 @@ export default {
                 if (valid) {
                     this.submit();
                 } else {
+                    this.$message.warning('数据录入不全')
                     return false;
                 }
             });
@@ -251,7 +269,7 @@ export default {
                 data.productId = id
                 data.typeFlag = index
                 if (index == this.levelNum.length - 1) {
-                    data.maxCounts =-1
+                    data.maxCounts = -1
                 }
                 this.$http.post({
                     url: data.id ? '/productPrice/update' : '/productPrice/save',
@@ -407,7 +425,7 @@ export default {
             }
         }
     },
-    components:{
+    components: {
         RichText
     }
 }

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

@@ -35,7 +35,7 @@
 
                     <el-form-item prop="isRead" label="">
                         <el-checkbox v-model="formData1.isRead">已阅读</el-checkbox>
-                        <el-button type="text" style="color:#FB6E08">《用户隐私协议和隐私条款》</el-button>
+                        <el-button type="text" style="color:#FB6E08" @click="dialogVisible=true">《用户隐私协议和隐私条款》</el-button>
                     </el-form-item>
 
                     <el-form-item label="">
@@ -69,7 +69,7 @@
 
                     <el-form-item prop="isRead" label="">
                         <el-checkbox v-model="formData.isRead">已阅读</el-checkbox>
-                        <el-button type="text" style="color:#FB6E08">《用户隐私协议和隐私条款》</el-button>
+                        <el-button type="text" style="color:#FB6E08" @click="dialogVisible=true">《用户隐私协议和隐私条款》</el-button>
                     </el-form-item>
 
                     <el-form-item label="">
@@ -82,6 +82,16 @@
             </el-tab-pane>
         </el-tabs>
 
+        <el-dialog title="用户隐私协议和隐私条款" class="xieyi" :visible.sync="dialogVisible" width="636px">
+            <div class="window" v-html="agreement">
+
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="readAgree(false)">不同意</el-button>
+                <el-button type="primary" @click="readAgree(true)">同 意</el-button>
+            </span>
+        </el-dialog>
+
     </div>
 </template>
 <script>
@@ -99,12 +109,26 @@ export default {
                 this.companyTypeList = res.data
             }
         });
+
+        this.$http.get({
+            url: '/userAgreement/getOne?id=1',
+        }).then(res => {
+            if (res.success) {
+                if (res.data) {
+                    this.agreement = res.data.agreement
+                }
+
+            }
+        })
+
     },
-    computed:{
-           ...mapState(['msgCode']),
+    computed: {
+        ...mapState(['msgCode']),
     },
     data() {
         return {
+            dialogVisible: false,
+            agreement: '',
             companyTypeList: [],
             activeName: 'second',
             saving: false,
@@ -381,7 +405,7 @@ export default {
                     this.$message.warning('该手机号已经被用户绑定')
                 }
                 else {
-                    this.sendMeg(this.activeName == 'first' ? this.formData1.contactPhone : this.formData.phone,this.msgCode['用户注册']).then((json) => {
+                    this.sendMeg(this.activeName == 'first' ? this.formData1.contactPhone : this.formData.phone, this.msgCode['用户注册']).then((json) => {
                         if (json.success) {
                             this.$message.success('发送成功')
                             this.backCode = json.data
@@ -443,6 +467,15 @@ export default {
 
 
         },
+        readAgree(reslut) {
+            this.dialogVisible = false
+            if (this.activeName == 'second') {
+                this.formData.isRead = reslut
+            }
+            else {
+                this.formData1.isRead = reslut
+            }
+        }
     },
     components: {
         systemState, passwordLevel
@@ -453,4 +486,10 @@ export default {
 .certain {
     margin: 140px auto;
 }
+.window {
+    max-height: 50vh;
+    overflow: auto;
+    border-top: 1px solid #ebebeb;
+    padding-top: 20px;
+}
 </style>

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

@@ -1,5 +1,5 @@
 <template>
-    <el-form :model="formData" :rules="rules" ref="storeInfo" label-width="100px" label-position="right"  style="max-width: 600px;">
+    <el-form :model="formData" :rules="rules" ref="storeInfo" label-width="100px" label-position="right" style="max-width: 600px;">
         <el-form-item prop="storeName" label="店铺名称">
             <el-input maxlength="30" v-model="formData.storeName" style="width:320px;" :disabled="'storeName'==subColumn" placeholder="中英文、数字或字符（30字以内）"></el-input>
         </el-form-item>
@@ -38,7 +38,7 @@
         </el-form-item> -->
 
         <el-form-item prop="description" label="店铺简介">
-            <el-input  type="textarea" :rows="2" v-model="formData.description" maxlength="30" style="width:320px;" :disabled="'description'==subColumn" placeholder="请输入店铺简介（30字以内）"></el-input>
+            <el-input type="textarea" :rows="2" v-model="formData.description" maxlength="30" style="width:320px;" :disabled="'description'==subColumn" placeholder="请输入店铺简介（30字以内）"></el-input>
         </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>
@@ -111,7 +111,10 @@ export default {
                     var subclass = res.data.subclass.split(',')
                     res.data.subclass = []
                     subclass.forEach(item => {
-                        res.data.subclass.push(Number(item))
+                        if (item) {
+                            res.data.subclass.push(Number(item))
+                        }
+
                     })
                     this.formData = res.data;
                     if (this.formData.serviceType) {

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

@@ -104,7 +104,7 @@
 
                 </div>
 
-                <el-button class='submit' type="primary" @click="submit">提交订单</el-button>
+                <el-button class='submit' type="primary" @click="onSave">提交订单</el-button>
             </div>
         </div>
 
@@ -192,7 +192,7 @@ export default {
     computed: {
         ...mapState(['userInfo', 'typeFlag']),
         price() {
-            var money = 0;
+            var money = this.productInfo.price;
             if (this.productInfo.productPriceList.length > 0) {
                 this.productInfo.productPriceList.forEach(item => {
                     if (item.maxCounts && item.minCounts && this.num <= item.maxCounts && this.num >= item.minCounts) {
@@ -286,7 +286,7 @@ export default {
                 item.isChoose = false
             })
         },
-        submit() {
+        onSave() {
             if (this.typeFlag[this.productInfo.typeFlag] == '实体商品' && !this.userAddressID) {
                 this.$message({
                     message: '请选择收货地址',
@@ -306,6 +306,18 @@ export default {
                 return
             }
 
+            this.$confirm('确定要提交订单吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.submit()
+            }).catch(() => {
+
+            });
+        },
+        submit() {
+
 
             var data = {
                 productId: this.$route.query.productId,

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

@@ -31,6 +31,9 @@
             <div class="orderList">
                 <order-item v-for="item in orderList" :info='item' @startChat='startChat' @changeData='changeData'></order-item>
             </div>
+
+            <!-- <el-pagination v-if="totalNumber>3" background @current-change="currentPageChange" :current-page="currentPage" :page-size="3" layout="total, prev, pager, next" :total="totalNumber">
+            </el-pagination> -->
         </div>
     </div>
 </template>
@@ -42,7 +45,8 @@ export default {
     name: 'order',
     data() {
         return {
-            orderList: []
+            orderList: [],
+            currentPage: 1
         }
     },
     computed: {
@@ -72,6 +76,7 @@ export default {
             console.log(e)
 
         })
+        // this.getData({})
 
     },
     methods: {
@@ -84,6 +89,36 @@ export default {
                     this.$set(this.orderList, index, json)
                 }
             })
+        },
+        getData(jsonp) {
+            var data = jsonp
+            data.userId = this.userInfo.id
+            data.pageNumber = 3
+            data.currentPage = this.currentPage
+
+            this.$http.get({
+                url: '/userOrder/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    res.data.pp.forEach(item => {
+                        if (item.productComment.starLevel) {
+                            item.productComment.starLevel = Number(item.productComment.starLevel)
+                        }
+                        else {
+                            item.productComment.starLevel = 0
+                        }
+                    })
+                    this.orderList = res.data.pp
+                }
+            }).catch(e => {
+                console.log(e)
+            })
+        },
+        currentPageChange(page) {
+            this.currentPage = page
+            this.getData({})
         }
 
     },

src/main/vue/src/pagesPre/UserSafe.vue

@@ -75,13 +75,17 @@ export default {
         }
     },
     computed: {
-        ...mapState(['userInfo','msgCode']),
+        ...mapState(['userInfo', 'msgCode']),
     },
     mounted() {
 
     },
     methods: {
         changeStart(str) {
+            if (str === '手机号' && this.userInfo.phone) {
+                this.goNext('changePhone')
+                return
+            }
             this.changeUser = { ...this.userInfo }
             this.code = ''
             this.backCode = ''
@@ -101,7 +105,7 @@ export default {
                     this.$message.warning('该手机号已经被用户绑定')
                 }
                 else {
-                    this.sendMeg(this.changeUser.phone,this.msgCode['信息变更']).then((json) => {
+                    this.sendMeg(this.changeUser.phone, this.msgCode['信息变更']).then((json) => {
                         if (json.success) {
                             this.$message.success('发送成功')
                             this.backCode = json.data
@@ -206,13 +210,22 @@ export default {
                 }
             });
         },
-        goNext(str){
-            this.$router.push({
-                name:'backPassword',
-                query:{
-                    title:'修改密码'
-                }
-            })
+        goNext(str) {
+            if (str == 'backPassword') {
+                this.$router.push({
+                    name: 'backPassword',
+                    query: {
+                        title: '修改密码'
+                    }
+                })
+            }
+            else {
+                this.$router.push({
+                    name: str
+
+                })
+            }
+
         }
 
     },

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

@@ -39,6 +39,9 @@
                 <div class="orderList">
                     <order-item @changeorderinfo='changeorderinfo' v-for="item in orderList" :info='item' :type='"shop"'></order-item>
                 </div>
+
+                <el-pagination style="padding:20px 0" v-if="totalNumber>3" background @current-change="currentPageChange" :current-page="currentPage" :page-size="3" layout="total, prev, pager, next" :total="totalNumber">
+                </el-pagination>
             </div>
         </template>
 
@@ -53,7 +56,9 @@ export default {
     data() {
         return {
             orderList: [],
-            isUseSize: 0
+            isUseSize: 0,
+            currentPage: 1,
+            totalNumber: 0
         }
     },
     computed: {
@@ -71,29 +76,30 @@ export default {
         }
     },
     mounted() {
-        this.$http.get({
-            url: '/userOrder/page',
-            data: {
-                storeId: this.userInfo.storeInfo.id,
-                pageNumber: 1,
-                currentPage: 1
-            }
-        }).then(res => {
-            if (res.success) {
-                res.data.pp.forEach(item => {
-                    if (item.productComment.starLevel) {
-                        item.productComment.starLevel = Number(item.productComment.starLevel)
-                    }
-                    else {
-                        item.productComment.starLevel = 0
-                    }
-                })
-                this.orderList = res.data.pp
-            }
-        }).catch(e => {
-            console.log(e)
+        // this.$http.get({
+        //     url: '/userOrder/page',
+        //     data: {
+        //         storeId: this.userInfo.storeInfo.id,
+        //         pageNumber: 1,
+        //         currentPage: 1
+        //     }
+        // }).then(res => {
+        //     if (res.success) {
+        //         res.data.pp.forEach(item => {
+        //             if (item.productComment.starLevel) {
+        //                 item.productComment.starLevel = Number(item.productComment.starLevel)
+        //             }
+        //             else {
+        //                 item.productComment.starLevel = 0
+        //             }
+        //         })
+        //         this.orderList = res.data.pp
+        //     }
+        // }).catch(e => {
+        //     console.log(e)
 
-        })
+        // })
+        this.getData({})
 
 
 
@@ -113,6 +119,36 @@ export default {
 
     },
     methods: {
+        getData(jsonp) {
+            var data = jsonp
+            data.storeId = this.myStoreInfo.id
+            data.pageNumber = 3
+            data.currentPage = this.currentPage
+            data.statusStr = '0,1,2,3,4'
+            // data.commentFlag = 0
+            // if (this.searchKey) {
+            //     data.advancedQuery = 'AND_,product_name_,like_,' + this.searchKey
+            // }
+            this.$http.get({
+                url: '/userOrder/page',
+                data: data
+            }).then(res => {
+                if (res.success) {
+                    this.totalNumber = res.data.page.totalNumber;
+                    res.data.pp.forEach(item => {
+                        if (item.productComment.starLevel) {
+                            item.productComment.starLevel = Number(item.productComment.starLevel)
+                        }
+                        else {
+                            item.productComment.starLevel = 0
+                        }
+                    })
+                    this.orderList = res.data.pp
+                }
+            }).catch(e => {
+                console.log(e)
+            })
+        },
         changeorderinfo(id) {
             this.$http.get({
                 url: '/userOrder/getOne',
@@ -136,6 +172,10 @@ export default {
             }).catch(e => {
                 console.log(e)
             })
+        },
+        currentPageChange(page) {
+            this.currentPage = page
+            this.getData({})
         }
 
     },

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

@@ -386,6 +386,14 @@ const router = new Router({
                 meta: {
                     title: '找回密码',
                 }
+            }, {
+                path: '/changePhone',
+                name: 'changePhone',
+                component: () =>
+                    import ('../pagesPre/ChangePhone'),
+                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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.af108473940871e39457.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.1cbcce0f7e5a4153bad4.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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/admin.223777ad2210cfa62129.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.cde12c34bfa9ef75e8dfc3728725ef02.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.af108473940871e39457.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.6096fe993ed79f29e95a.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.9cf3a0770079b1465db0a635a125585c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/index.1e1aa6254693f06a22a4.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/WEB-INF/html/loginAdmin.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.af108473940871e39457.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/loginAdmin.c471bb41727e6f91b753.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><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.cb52b8fa49e1c90c1e61.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/loginAdmin.5a0656572772d4c1eb47.js></script></body></html>

src/main/webapp/static/js/100.bbeae09c374a54197d65.js → src/main/webapp/static/js/102.b6da54bd6276f5e2b1e1.js

@@ -1 +1 @@
-webpackJsonp([100],{"76TP":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var s={name:"home",data:function(){return{joinInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/joinUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.joinInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:14}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{goNext:function(){window.open(this.joinInfo.zhaopin)}}},i={render:function(){var t=this,n=t.$createElement,s=t._self._c||n;return s("div",{staticClass:"conatiner"},[s("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[s("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?s("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),s("div",{staticClass:"content"},[t._m(0),t._v(" "),s("div",{staticClass:"content-content"},[s("div",{staticClass:"content-text"},[s("div",{domProps:{innerHTML:t._s(t.joinInfo.manifesto)}}),t._v("\n                邮箱："+t._s(t.joinInfo.email)+"\n                "),s("br"),t._v(" 联系方式："+t._s(t.joinInfo.telephone)+"\n            ")]),t._v(" "),s("div",{staticClass:"line"}),t._v(" "),s("div",{staticClass:"content-img"},[s("img",{attrs:{src:e("Ns+n"),alt:""}}),t._v(" "),s("div",{staticClass:"button",on:{click:t.goNext}},[t._v("诚聘英才")])])])])],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 a=e("VU/8")(s,i,!1,function(t){e("G79N")},"data-v-6c7e461e",null);n.default=a.exports},G79N:function(t,n){},"Ns+n":function(t,n,e){t.exports=e.p+"static/img/join.999e208.png"}});
+webpackJsonp([102],{"76TP":function(t,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var s={name:"home",data:function(){return{joinInfo:{},bannerList:[]}},mounted:function(){var t=this;this.$http.get({url:"/joinUs/getOne",data:{id:1}}).then(function(n){n.success&&(t.joinInfo=n.data)}).catch(function(t){console.log(t)}),this.$http.get({url:"/bannerInfo/all",data:{location:14}}).then(function(n){n.success&&(t.bannerList=n.data)}).catch(function(t){console.log(t)})},computed:{},methods:{goNext:function(){window.open(this.joinInfo.zhaopin)}}},i={render:function(){var t=this,n=t.$createElement,s=t._self._c||n;return s("div",{staticClass:"conatiner"},[s("el-carousel",{staticClass:"swiper banner",class:[1==t.bannerList.length?"noButton":""],attrs:{height:"220px",interval:4e3}},[t._l(t.bannerList,function(n){return[s("el-carousel-item",{style:{backgroundImage:"url("+n.imageUrl+")"}},[n.url?s("a",{attrs:{href:n.url}}):t._e()])]})],2),t._v(" "),s("div",{staticClass:"content"},[t._m(0),t._v(" "),s("div",{staticClass:"content-content"},[s("div",{staticClass:"content-text"},[s("div",{domProps:{innerHTML:t._s(t.joinInfo.manifesto)}}),t._v("\n                邮箱："+t._s(t.joinInfo.email)+"\n                "),s("br"),t._v(" 联系方式："+t._s(t.joinInfo.telephone)+"\n            ")]),t._v(" "),s("div",{staticClass:"line"}),t._v(" "),s("div",{staticClass:"content-img"},[s("img",{attrs:{src:e("Ns+n"),alt:""}}),t._v(" "),s("div",{staticClass:"button",on:{click:t.goNext}},[t._v("诚聘英才")])])])])],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 a=e("VU/8")(s,i,!1,function(t){e("JPpr")},"data-v-60bc1eee",null);n.default=a.exports},JPpr:function(t,n){},"Ns+n":function(t,n,e){t.exports=e.p+"static/img/join.999e208.png"}});

src/main/webapp/static/js/104.2d3e8ab53b63fce18772.js → src/main/webapp/static/js/106.47620996f8b61ddfb412.js

@@ -1 +1 @@
-webpackJsonp([104],{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([106],{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/129.657d657fa49e8a25a5da.js → src/main/webapp/static/js/132.6791f7e12e17df68cc1c.js

@@ -1 +1 @@
-webpackJsonp([129],{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([132],{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/142.114f312491c0ed243814.js → src/main/webapp/static/js/145.edd9da6ab597762a55f6.js

@@ -1 +1 @@
-webpackJsonp([142],{"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("gjue")},"data-v-44fef9b8",null);n.default=i.exports},gjue:function(t,n){}});
+webpackJsonp([145],{"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){}});