Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/webapp/WEB-INF/html/admin.html
#	src/main/webapp/WEB-INF/html/index.html
#	src/main/webapp/WEB-INF/html/loginAdmin.html
#	src/main/webapp/static/css/index.73aaf8dfaea77de7601d237227c61761.css
#	src/main/webapp/static/css/index.966b9e61e0d1f54c6864ac5829eb79a8.css
#	src/main/webapp/static/css/index.9e2de3a15fe6a2a3bf02ce46a6dde5b8.css
#	src/main/webapp/static/js/47.2ea8888360979e5d66ed.js
#	src/main/webapp/static/js/7.298a5c09c986acdb0d44.js
#	src/main/webapp/static/js/8.949bfaf269ce96c9303d.js
#	src/main/webapp/static/js/9.52b9865ed5ee67b163d9.js
#	src/main/webapp/static/js/9.712f4d7c261ef3310f4e.js
#	src/main/webapp/static/js/manifest.6d1c1d7768ff6823291d.js

src/main/vue/package.json

@@ -22,6 +22,7 @@
         "es6-promise": "^4.2.4",
         "less": "^3.0.4",
         "less-loader": "^4.1.0",
+        "moment": "^2.22.2",
         "normalize.css": "^8.0.0",
         "sass-loader": "^7.1.0",
         "tinymce": "^4.8.2",

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

@@ -77,10 +77,10 @@ export default {
         background-position: center center;
         background-size: cover;
         color: #fff;
-        font-size: 18px;
+        font-size: 16px;
         font-weight: bold;
         line-height: 30px;
-        padding-right: 8.5px;
+        padding-right: 5px;
         text-align: right;
     }
 

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

@@ -136,8 +136,16 @@ export default {
                         this.loading = false;
                         if (res.success) {
                             this.$message.success('登录成功')
+                            if (this.$route.query.next) {
+                                this.$router.replace({
+                                    name: this.$route.query.next
+                                })
+                                return
+                            }
                             if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
+
                                 history.back()
+
                             }
                             else {
                                 this.$router.replace({
@@ -178,8 +186,16 @@ export default {
                         this.loading = false;
                         if (res.success) {
                             this.$message.success('登录成功')
+                            if (this.$route.query.next) {
+                                this.$router.replace({
+                                    name: this.$route.query.next
+                                })
+                                return
+                            }
                             if (this.brefName && this.brefName != 'register' && this.brefName != 'backPassword') {
+
                                 history.back()
+
                             }
                             else {
                                 this.$router.replace({

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

@@ -297,10 +297,10 @@ export default {
         background-position: center center;
         background-size: cover;
         color: #fff;
-        font-size: 18px;
+        font-size: 16px;
         font-weight: bold;
         line-height: 30px;
-        padding-right: 8.5px;
+        padding-right: 5px;
         text-align: right;
     }
 

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

@@ -5,14 +5,22 @@
             <!-- <el-form-item prop="storeId" label="店铺">
                 <el-input v-model="formData.storeId" :disabled="'storeId'==subColumn"></el-input>
             </el-form-item> -->
-            <el-form-item prop="typeFlag" label="类型" style="max-width:400px">
+            <el-form-item prop="typeFlag"  label="店铺类型" style="max-width:400px">
+                <template>
+                    <el-select disabled v-model="formData.serviceType" clearable placeholder="请选择">
+                        <el-option v-for="item in serviceTypeList" :key="item.id" :label="item.shortName" :value="item.id">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+            <!-- <el-form-item prop="typeFlag" label="类型" style="max-width:400px">
                 <template>
                     <el-select v-model="formData.typeFlag" clearable placeholder="请选择">
                         <el-option v-for="item in typeFlagOptions" :key="item.value" :label="item.label" :value="item.value">
                         </el-option>
                     </el-select>
                 </template>
-            </el-form-item>
+            </el-form-item> -->
 
             <!-- <el-form-item prop="serviceType" label="服务大类">
                 <el-select v-model="formData.serviceType" filterable placeholder="请选择" size="small">
@@ -128,6 +136,16 @@ import RichText from '../components/RichText'
 export default {
     created() {
 
+        this.$http.get({
+            url: '/serviceType/all',
+            data: {}
+        }).then(res => {
+            if (res.success) {
+                this.serviceTypeList = res.data
+
+            }
+        })
+
         if (this.$route.query.id) {
             this.$http.get({
                 url: '/productInfo/getOne',
@@ -137,7 +155,7 @@ export default {
             }).then(res => {
                 if (res.success) {
 
-
+                    res.data.serviceType = Number(res.data.serviceType)
                     this.formData = res.data;
                     this.levelNum = res.data.productPriceList
                     // res.data.productImageList.forEach(item => {
@@ -172,12 +190,13 @@ export default {
         });
 
         this.formData.storeId = this.myStoreInfo.id
-        this.formData.serviceType = this.myStoreInfo.serviceType
+        this.formData.serviceType = Number(this.myStoreInfo.serviceType)
         this.formData.subclass = this.myStoreInfo.subclass
 
     },
     data() {
         return {
+            serviceTypeList: [],
             saving: false,
             formData: {
                 typeFlag: 0,

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

@@ -44,8 +44,10 @@
 
                 </el-form>
 
-                <systemState v-else class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
-
+                <dir class="success">
+                    <systemState class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
+                    <el-button type="warning" @click="open" class="open">认证开店</el-button>
+                </dir>
             </el-tab-pane>
             <el-tab-pane label="个人注册" name="second">
                 <el-form v-if="!isSuccess" :model="formData" :rules="rules" ref="form" label-width="100px" label-position="right" size="small" style="max-width: 420px;margin-top:20px;">
@@ -77,8 +79,13 @@
                     </el-form-item>
 
                 </el-form>
+                <template v-else>
+                    <dir class="success">
+                        <systemState class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
+                        <el-button type="warning" @click="open" class="open">认证开店</el-button>
+                    </dir>
 
-                <systemState v-else class="certain" :next='"login"' :type='"success"' :title="'注册成功！'" :subtitle='"请牢记您的用户名和密码，即可登陆。缴纳保证金后也可开店~"'></systemState>
+                </template>
             </el-tab-pane>
         </el-tabs>
 
@@ -488,6 +495,11 @@ export default {
             else {
                 this.formData1.isRead = reslut
             }
+        },
+        open() {
+            this.$router.push({
+                name: 'userCertification'
+            })
         }
     },
     components: {
@@ -496,8 +508,17 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.success {
+    position: relative;
+}
 .certain {
-    margin: 140px auto;
+    padding: 140px 0 0;
+    margin: auto;
+}
+.open {
+    position: absolute;
+    bottom: 0;
+    right: 500px;
 }
 .window {
     max-height: 50vh;

src/main/vue/src/pagesPre/Shop.vue

@@ -394,10 +394,10 @@ export default {
         background-position: center center;
         background-size: cover;
         color: #fff;
-        font-size: 18px;
+        font-size: 16px;
         font-weight: bold;
         line-height: 30px;
-        padding-right: 8.5px;
+        padding-right:5px;
         text-align: right;
     }
 

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

@@ -161,6 +161,10 @@ export default {
                         name: '客服管理',
                         index: '1',
                         href: 'customerServices'
+                    }, {
+                        name: '实名信息',
+                        index: '2',
+                        href: 'userRealCertification'
                     }],
                     '无': []
                 }

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

@@ -4,10 +4,14 @@
             <div class="top-item" style="width:34%;text-align:left">
                 <div class="icon" :style="{backgroundImage:'url('+userInfo.icon+')'}"></div>
                 <div class="name">
-                    <div class="title">{{userInfo.nickname}}</div>
+                    <div class="title">
+                        {{userInfo.nickname}}
+
+                    </div>
                     <div class="level">
                         <i class="el-icon-star-on"></i>
                         <span class="sub">1</span>
+                        <small>{{userInfo.companyFlag=='Y'?'企业用户':'个人用户'}}</small>
                     </div>
                 </div>
             </div>
@@ -62,14 +66,14 @@ export default {
             }
         }).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
-                        }
-                    })
+                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 => {
@@ -188,6 +192,12 @@ export default {
                     display: inline-block;
                     transform: scale(0.5, 0.5);
                 }
+
+                small {
+                    color: #999;
+                    font-size: 12px;
+                    margin-left: 10px;
+                }
             }
         }
 

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

@@ -153,7 +153,7 @@ export default {
                         res.data.address.push(res.data.province)
                         res.data.address.push(res.data.city)
                         res.data.address.push(res.data.country)
-                        res.data.companyTime = format(new Date(res.data.companyTime), 'YYYY', { locale: zh })
+                        res.data.companyTime = format(new Date(Number(res.data.companyTime)), 'YYYY', { locale: zh })
                         this.formData1 = res.data;
                     }
 
@@ -198,6 +198,10 @@ export default {
                 if (!this.formData1.id) {
                     data.userId = this.userInfo.id
                     data.userName = this.userInfo.username
+
+                }
+                else {
+                    data.statusFlag = 0
                 }
                 this.$http.post({
                     url: this.formData1.id ? '/companyAuthentication/update' : '/companyAuthentication/save',

src/main/vue/src/pagesPre/UserRealCertification.vue

@@ -0,0 +1,312 @@
+<template>
+    <div class="conatiner">
+        <div class="PageTitle">
+            {{userInfo.companyFlag=='Y'?'企业实名信息':'个人实名信息'}}
+        </div>
+        <div class="content">
+            <el-button type="warning" plain @click="isChange" v-if="disabled">修改实名信息</el-button>
+            <el-form v-if="userInfo.companyFlag=='N'" :disabled='disabled' class="certain" :model="formData" :rules="rules" ref="personalAuthentication" label-width="100px" label-position="right" size="small" style="max-width: 600px;">
+                <el-form-item prop="realName" label="真实姓名">
+                    <el-input v-model="formData.realName" style="width:320px;" placeholder="请填写您的真实姓名"></el-input>
+                </el-form-item>
+                <el-form-item prop="idcard" label="身份证号">
+                    <el-input v-model="formData.idcard" style="width:320px;" placeholder="请填写姓名所对应的身份证号码"></el-input>
+                </el-form-item>
+                <el-form-item prop="faceImage" label="身份证照片">
+                    <single-upload-title v-model="formData.faceImage" style="display:inline-block" :title='"添加人像面"' :width='200' :height='125'>
+
+                    </single-upload-title>
+                    <single-upload-title v-model="formData.backImage" style="display:inline-block;margin-left:20px;" :title='"添加非人像面"' :width='200' :height='125'></single-upload-title>
+                    <div class="ps">注：需要上传清晰身份证照，格式jpg/jpeg/png，大小不超过10M </div>
+                </el-form-item>
+                <el-form-item v-if="!disabled">
+                    <el-button :loading="$store.state.fetchingData" type="primary" @click="onSave">保存</el-button>
+                    <el-button type="default" @click="disabled=true">取消</el-button>
+                </el-form-item>
+            </el-form>
+            <el-form v-else class="certain" :disabled='disabled' :model="formData1" :rules="rules1" ref="personalAuthentication" label-width="120px" label-position="right" size="small" style="max-width: 600px;">
+                <el-form-item prop="company" label="公司名称">
+                    <el-input v-model="formData1.company" maxlength="30" style="width:320px;" placeholder="中英文、数字、空格或中文括号（30字以内）"></el-input>
+                </el-form-item>
+                <el-form-item prop="companyTime" label="公司注册时间">
+                    <el-date-picker v-model="formData1.companyTime" type="year" placeholder="请选择公司注册年份">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="businessNo" label="工商注册号">
+                    <el-input v-model="formData1.businessNo" style="width:320px;" maxlength="30" placeholder="英文或数字（30字以内）"></el-input>
+                </el-form-item>
+                <el-form-item prop="certificate" label="证件扫描">
+                    <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>
+                </el-form-item>
+                <el-form-item prop="address" label="所在地">
+                    <el-cascader :options="cityData" :props='{value:"name",label:"name"}' v-model="formData1.address">
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item v-if="!disabled">
+                    <el-button :loading="$store.state.fetchingData" type="primary" @click="onSave">保存</el-button>
+                    <el-button type="default" @click="disabled=true">取消</el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import certificationStep from '../components/CertificationStep'
+import setStoreInfo from '../pagesPre/SetStoreInfo'
+import guaranteeMoney from '../pagesPre/GuaranteeMoney'
+import systemState from '../pagesPre/SystemState'
+import cityData from '../city'
+import moment from 'moment'
+export default {
+    name: 'userRealCertification',
+    data() {
+        return {
+            disabled: true,
+            cityData,
+            stepList: ['实名认证', '店铺信息', '缴纳质保金', '系统审核', '入驻成功'],
+            formData: {},
+            formData1: {
+                company: '',
+                companyTime: '',
+                address: [],
+                realName: ''
+            },
+            rules: {
+                realName: [
+                    { required: true, message: '请填写真实姓名', trigger: 'blur' },
+                ],
+                idcard: [
+                    { required: true, message: '请填写身份证号', trigger: 'blur' },
+                    {
+                        validator: (rule, value, callback) => {
+                            if (!value) {
+                                callback(new Error('请填写身份证号'));
+                            } else if (/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(value)) {
+                                callback();
+                            } else {
+                                callback(new Error('请输入正确的身份证号'));
+                            }
+                        }, trigger: 'blur'
+                    }
+                ],
+                faceImage: [
+                    { required: true, message: '请上传身份证照片', trigger: 'blur' },
+                ]
+            },
+            rules1: {
+                company: [
+                    { required: true, message: '请输入公司名称', trigger: 'blur' },
+                ],
+                companyTime: [
+                    { required: true, message: '请选择公司注册年份', trigger: 'blur' },
+                ],
+                businessNo: [
+                    { required: true, message: '请输入工商注册号', trigger: 'blur' },
+                ],
+                certificate: [
+                    { required: true, message: '请添加证件照片', trigger: 'blur' },
+                ],
+                address: [
+                    { required: true, message: '请选择地址', trigger: 'blur' },
+                ]
+            },
+            address: []
+        }
+    },
+    computed: {
+        ...mapState(['userInfo', 'myStoreInfo']),
+    },
+    mounted() {
+        if (this.userInfo.companyFlag == 'Y') {
+            this.$http.get({
+                url: '/companyAuthentication/getOne',
+                data: {
+                    userId: this.userInfo.id
+                }
+            }).then(res => {
+                if (res.success) {
+                    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)
+                        // console.log(moment(Number(res.data.companyTime)).format('YYYY'))
+                        res.data.companyTime = moment(Number(res.data.companyTime)).format('YYYY')
+                        // format(new Date(res.data.companyTime), 'YYYY-MM-DD HH:mm', { locale: zh })
+                        this.formData1 = res.data;
+                    }
+
+                }
+            })
+        }
+        else {
+            this.$http.get({
+                url: '/personalAuthentication/getOne',
+                data: {
+                    userId: this.userInfo.id
+                }
+            }).then(res => {
+                if (res.success) {
+                    if (res.data) {
+                        this.formData = res.data;
+                    }
+
+                }
+            })
+        }
+
+    },
+    methods: {
+        isChange() {
+            this.$confirm('修改信息之后店铺将会下架，等待重新审核。', '确定要修改认证信息码？', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                dangerouslyUseHTMLString: true
+            }).then(() => {
+                this.disabled = false
+            }).catch(() => {
+
+            });
+        },
+        onSave() {
+            this.$refs.personalAuthentication.validate((valid) => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            if (this.userInfo.companyFlag == 'Y') {
+                var data = { ...this.formData1 }
+                delete data.address
+                data.province = this.formData1.address[0]
+                data.city = this.formData1.address[1]
+                data.country = this.formData1.address[2]
+                data.companyTime = Date.parse(new Date(data.companyTime))
+                if (!this.formData1.id) {
+                    data.userId = this.userInfo.id
+                    data.userName = this.userInfo.username
+
+                }
+                else {
+                    data.statusFlag = 0
+                }
+                this.$http.post({
+                    url: this.formData1.id ? '/companyAuthentication/update' : '/companyAuthentication/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.changeStep(4)
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+            }
+            else {
+                var data = JSON.parse(JSON.stringify(this.formData));
+                if (!this.formData.id) {
+                    data.userId = this.userInfo.id
+                    data.userName = this.userInfo.username
+                }
+                this.$http.post({
+                    url: this.formData.id ? '/personalAuthentication/update' : '/personalAuthentication/save',
+                    data: data
+                }).then(res => {
+                    if (res.success) {
+                        this.changeStep(4)
+                    } else {
+                        this.$message.warning('失败')
+                    }
+                });
+
+            }
+
+        },
+        changeStep(num) {
+            if (num == 4) {
+                this.$http.post({
+                    url: '/storeInfo/update',
+                    data: {
+                        id: this.myStoreInfo.id,
+                        useFlag: 'N'
+                    }
+                }).then(() => {
+                })
+            }
+            this.$http.post({
+                url: '/userInfo/update',
+                data: {
+                    id: this.userInfo.id,
+                    approveStep: num
+                }
+            }).then(res => {
+                if (res.success) {
+                    this.$http.get({
+                        url: '/userInfo/getUserInfo',
+                        data: {}
+                    }).then(res => {
+                        if (res.success) {
+                            this.$store.commit('updateUserInfo', res.data);
+                            this.$alert('成功修改实名信息，我们将会尽快完成审核，上架店铺', '修改成功', {
+                                confirmButtonText: '确定',
+                                callback: action => {
+                                    this.disabled = true
+                                    this.$emit('changeTrue')
+                                }
+                            });
+                        }
+                    })
+                } else {
+                    this.$message.warning('失败')
+                }
+            });
+        }
+
+    },
+    components: {
+        certificationStep, setStoreInfo, guaranteeMoney, systemState
+    }
+}
+</script>
+
+<style lang="less" scoped>
+.conatiner {
+    background: rgba(255, 255, 255, 1);
+    border-radius: 4px;
+    border: 1px solid rgba(234, 234, 234, 1);
+    padding: 0 40px 0 24px;
+    min-height: 600px;
+}
+
+.PageTitle {
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+    font-weight: bold;
+    color: rgba(51, 51, 51, 1);
+    line-height: 19px;
+    padding: 18px 0 9px;
+    border-bottom: 1px solid #ebebeb;
+}
+
+.content {
+    padding-top: 18px;
+
+    .certain {
+        margin: 20px auto;
+
+        .ps {
+            font-size: 12px;
+            font-family: MicrosoftYaHei;
+            color: rgba(153, 153, 153, 1);
+            line-height: 16px;
+        }
+    }
+}
+</style>

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

@@ -2,7 +2,7 @@
     <div class="conatiner">
         <el-tabs v-model="activeName" class="tab">
             <el-tab-pane label="账户资料" name="first">
-                <el-form :model="userInfo" ref="form" label-width="80px" label-position="right" size="small" style="max-width:400px;">
+                <el-form :model="userInfo" ref="form" :rules="rule" 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>
@@ -23,8 +23,25 @@
                     <el-form-item prop="mail" label="邮箱">
                         <el-input v-model="userInfo.mail"></el-input>
                     </el-form-item>
+                    <template v-if="userInfo.companyFlag=='Y'">
+                        <el-form-item prop="contacter" label="联系人">
+                            <el-input placeholder="请输入联系人" v-model="userInfo.contacter" maxlength="8"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="companyName" label="企业名称">
+                            <el-input v-model="userInfo.companyName" placeholder="请输入企业名称" maxlength="20"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="companyType" label="企业类型">
+                            <el-select v-model="userInfo.companyType" placeholder="请选择">
+                                <el-option v-for="item in companyTypeList" :key="item.id" :label="item.typeName" :value="item.typeName">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+
+                    </template>
+
                     <el-form-item>
-                        <el-button @click="submit" :loading="$store.state.fetchingData" type="primary" style="width:80px">保存</el-button>
+                        <el-button @click="onSave(0)" :loading="isSave" type="primary" style="width:80px">保存</el-button>
+                        <el-button v-if="userInfo.companyFlag=='N'" @click="dialogVisible=true" type="warning">成为企业用户</el-button>
                         <!-- <el-button @click="$router.go(-1)">取消</el-button> -->
                     </el-form-item>
                 </el-form>
@@ -95,6 +112,32 @@
                 </el-form>
             </el-tab-pane>
         </el-tabs>
+
+        <el-dialog title="企业账号认证信息" :visible.sync="dialogVisible" :show-close='nowStep==1' width='600px' :close-on-click-modal='nowStep==1'>
+            <template v-if="nowStep==1">
+                <el-form :model="userInfo" ref="form" :rules="rule" label-width="80px" label-position="right" size="small" style="max-width:400px;">
+                    <el-form-item prop="contacter" label="联系人">
+                        <el-input placeholder="请输入联系人" v-model="userInfo.contacter" maxlength="8"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="companyName" label="企业名称">
+                        <el-input v-model="userInfo.companyName" placeholder="请输入企业名称" maxlength="20"></el-input>
+                    </el-form-item>
+                    <el-form-item prop="companyType" label="企业类型">
+                        <el-select v-model="userInfo.companyType" placeholder="请选择">
+                            <el-option v-for="item in companyTypeList" :key="item.id" :label="item.typeName" :value="item.typeName">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="dialogVisible=false">取 消</el-button>
+                    <el-button type="primary" @click="onSave(1)">确 定</el-button>
+                </span>
+            </template>
+
+            <userRealCertification @changeTrue='dialogVisible=false' v-if="nowStep==2" ref='child'></userRealCertification>
+        </el-dialog>
     </div>
 </template>
 
@@ -102,6 +145,7 @@
 import { mapState } from 'vuex'
 import orderItem from '../components/OrderItem'
 import cityData from '../city'
+import userRealCertification from '../pagesPre/UserRealCertification'
 export default {
     name: 'order',
     data() {
@@ -118,13 +162,47 @@ export default {
                 telephone: "",
                 defaultFlag: true
             },
-            tableData: []
+            rule: {
+                icon: [
+                    { required: true, message: '请上传头像', trigger: 'blur' },
+                ],
+                nickname: [
+                    { required: true, message: '请输入昵称', trigger: 'blur' },
+                ],
+                sex: [
+                    { required: true, message: '请选择性别', trigger: 'blur' },
+                ],
+                birthday: [
+                    { required: true, message: '请选择生日', trigger: 'blur' },
+                ],
+                contacter: [
+                    { required: true, message: '请输入联系人', trigger: 'blur' }
+                ],
+                companyName: [
+                    { required: true, message: '请输入公司名称', trigger: 'blur' },
+                ],
+                companyType: [
+                    { required: true, message: '请选择公司类型', trigger: 'blur' },
+                ]
+            },
+            tableData: [],
+            companyTypeList: [],
+            isSave: false,
+            dialogVisible: false,
+            nowStep: 1,
         }
     },
     computed: {
         ...mapState(['userInfo']),
     },
     mounted() {
+        this.$http.get({
+            url: '/companyType/all'
+        }).then(res => {
+            if (res.success) {
+                this.companyTypeList = res.data
+            }
+        });
         this.getUserAddress()
         if (this.$route.query.activeName) {
             this.activeName = this.$route.query.activeName
@@ -153,12 +231,27 @@ export default {
                 console.log(e)
             })
         },
-        submit() {
+        onSave(type) {
+            this.$refs.form.validate((valid) => {
+                if (valid) {
+                    this.submit(type)
+
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit(type) {
+            this.isSave = true
             var data = JSON.parse(JSON.stringify(this.userInfo));
+            if (type) {
+                data.companyFlag = 'Y'
+            }
             this.$http.post({
                 url: '/userInfo/update',
                 data: data
             }).then(res => {
+                this.isSave = false
                 if (res.success) {
                     this.$message.success('成功');
                     this.$http.get({
@@ -167,6 +260,18 @@ export default {
                     }).then(res => {
                         if (res.success) {
                             this.$store.commit('updateUserInfo', res.data);
+                            if (type) {
+                                // this.dialogVisible = false
+                                if (this.userInfo.storeFlag == 'Y') {
+                                    this.nowStep = 2
+                                    setTimeout(()=>{
+                                        this.$refs.child.disabled = false
+                                    },100)
+                                }
+                                else {
+                                    this.dialogVisible = false
+                                }
+                            }
                         }
                     })
                 } else {
@@ -307,7 +412,7 @@ export default {
 
     },
     components: {
-        orderItem
+        orderItem, userRealCertification
     }
 }
 </script>

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

@@ -4,10 +4,13 @@
             <div class="top-item" style="width:28%;text-align:left">
                 <div class="icon" :style="{backgroundImage:'url('+userInfo.icon+')'}"></div>
                 <div class="name">
-                    <div class="title">{{userInfo.nickname}}</div>
+                    <div class="title">
+                        {{userInfo.nickname}}
+
+                    </div>
                     <div class="level">
-                        <i class="el-icon-star-on"></i>
-                        <span class="sub">1</span>
+                        <div :style="{backgroundImage:'url('+require('../assetsPre/startLogo.png')+')'}">{{myStoreInfo.credit}}</div>
+                        <small>{{userInfo.companyFlag=='Y'?'企业用户':'个人用户'}}</small>
                     </div>
                 </div>
             </div>
@@ -29,23 +32,23 @@
                 </div>
                 <img style="width:17px;height:17px; vertical-align: middle;" src="../assetsPre/add.png" alt="">
             </div>
-        </div>
-        <template v-if="orderList.length>0">
-            <div class="contentTitle">
-                最新订单进展
             </div>
-
-            <div class="content">
-                <div class="orderList">
-                    <order-item @changeorderinfo='changeorderinfo' v-for="item in orderList" :info='item' :type='"shop"'></order-item>
+            <template v-if="orderList.length>0">
+                <div class="contentTitle">
+                    最新订单进展
                 </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>
+                <div class="content">
+                    <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>
 
-    </div>
+        </div>
 </template>
 
 <script>
@@ -222,11 +225,15 @@ export default {
             margin-left: 10px;
             vertical-align: middle;
             .title {
+                width: 150px;
                 display: block;
                 font-size: 16px;
                 font-family: MicrosoftYaHei;
                 color: rgba(51, 51, 51, 1);
                 line-height: 21px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
             }
 
             .level {
@@ -234,15 +241,25 @@ export default {
                 display: block;
                 margin-top: 8px;
                 font-size: 0;
-                i {
-                    font-size: 20px;
-                }
+                div {
+                    display: inline-block;
+                    width: 50px;
+                    height: 30px;
 
-                .sub {
+                    background-position: center center;
+                    background-size: cover;
+                    color: #fff;
                     font-size: 16px;
-                    vertical-align: bottom;
-                    display: inline-block;
-                    transform: scale(0.5, 0.5);
+                    font-weight: bold;
+                    line-height: 30px;
+                    padding-right: 5px;
+                    text-align: right;
+                }
+
+                small {
+                    color: #999;
+                    font-size: 12px;
+                    margin-left: 10px;
                 }
             }
         }

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

@@ -365,6 +365,17 @@ const router = new Router({
                     pageMenu: '商家中心',
                     pageMenu2: '账户设置',
                 }
+            }, {
+                path: '/userRealCertification',
+                name: 'userRealCertification',
+                component: () =>
+                    import ('../pagesPre/UserRealCertification'),
+                meta: {
+                    title: '实名信息',
+                    checkLogin: true,
+                    pageMenu: '商家中心',
+                    pageMenu2: '账户设置',
+                }
             }]
         }, {
             path: '/',
@@ -530,13 +541,13 @@ router.beforeEach((to, from, next) => {
             }
             console.log(to.meta.checkLogin)
             if (to.meta.checkLogin) {
-                next('/login');
+                next('/login?next=' + to.name);
             } else {
                 next();
             }
         }).catch(() => {
             if (to.meta.checkLogin) {
-                next('/login');
+                next('/login?next=' + to.name);
             } else {
                 next();
             }

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

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6c7a0974466282104e94.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/admin.cafbc6a4af025586fd9f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.41c1c11330831dc9790b.js></script><script type=text/javascript src=/static/js/vendor.549f5ae89dffa96d1064.js></script><script type=text/javascript src=/static/js/admin.0f5998d7d1f35c3ae91e.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.966b9e61e0d1f54c6864ac5829eb79a8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6c7a0974466282104e94.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/index.100deb2e6160f9ef9c70.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.6f7c6489701f73577d088ed30a89e5f0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.41c1c11330831dc9790b.js></script><script type=text/javascript src=/static/js/vendor.549f5ae89dffa96d1064.js></script><script type=text/javascript src=/static/js/index.1186717576404615c01a.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"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6c7a0974466282104e94.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/loginAdmin.a3656ecb2f699ed54055.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.41c1c11330831dc9790b.js></script><script type=text/javascript src=/static/js/vendor.549f5ae89dffa96d1064.js></script><script type=text/javascript src=/static/js/loginAdmin.23e5df3430ab4c7d18a9.js></script></body></html>

src/main/webapp/static/js/103.102947359830cf106f1d.js → src/main/webapp/static/js/104.19d9a41eb2077a682ad4.js

@@ -1 +1 @@
-webpackJsonp([103],{"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"}});
+webpackJsonp([104],{"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/107.8fa14fc1ce6362557679.js → src/main/webapp/static/js/108.9b56da1d789e399c429d.js

@@ -1 +1 @@
-webpackJsonp([107],{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([108],{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/135.9090d696bec112ca3570.js → src/main/webapp/static/js/136.886ed76da97a16ffbf96.js

@@ -1 +1 @@
-webpackJsonp([135],{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([136],{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/162.add368ca76d4a42ecf5a.js → src/main/webapp/static/js/163.4fbafa9471bf91fa3052.js

@@ -1 +1 @@
-webpackJsonp([162],{"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:16}}).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("SH8R")},"data-v-115aa2ee",null);n.default=i.exports},SH8R:function(t,n){}});
+webpackJsonp([163],{"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:16}}).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("SH8R")},"data-v-115aa2ee",null);n.default=i.exports},SH8R:function(t,n){}});