优化

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

@@ -38,7 +38,11 @@ const baseUrl = process.env.NODE_ENV === 'production' ? '../' : `http://${locati
 Vue.prototype.$baseUrl = baseUrl;
 axios.defaults.withCredentials = true;
 axios.defaults.baseURL = baseUrl;
-axios.defaults.headers.common['token'] = "0eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiI2M2MzZjI2MC0yNGJiLTQxNTctYTQ5Yy0yNThhN2Q3NTgyNWUiLCJpc3MiOiJhZG1pbiIsImlhdCI6MTUzNjgwOTM4Niwic3ViIjoiZ3Vlc3QiLCJleHAiOjE1MzY4MTI5ODZ9.O7yhHcMt0QWqAg_Ev9lNwMlwgxZtKEu8rUpynrVyqV8"
+axios.post('/auth/loginGuest').then(res => {
+    if (res.data.success) {
+        axios.defaults.headers.common['token'] = res.data.data
+    }
+})
 Vue.prototype.$http = {
     get(params) {
         return new Promise((resolve, reject) => {
@@ -159,7 +163,8 @@ Vue.prototype.$http = {
 };
 
 
-Vue.prototype.getTime = function (str) {
+
+Vue.prototype.getTime = function(str) {
     if (str) {
         return moment(str).format('YYYY-MM-DD HH:mm')
     } else {
@@ -167,7 +172,7 @@ Vue.prototype.getTime = function (str) {
     }
 }
 
-Vue.prototype.getPhone = function (phone) {
+Vue.prototype.getPhone = function(phone) {
     if (phone) {
         if (phone.length == 11) {
             var str = phone.substr(0, 3)
@@ -183,7 +188,7 @@ Vue.prototype.getPhone = function (phone) {
 
 
 }
-Vue.prototype.getMail = function (mail) {
+Vue.prototype.getMail = function(mail) {
     if (mail) {
         var list = mail.split('@')
         var str = list[0].substr(0, 3)
@@ -198,7 +203,7 @@ Vue.prototype.getMail = function (mail) {
 }
 
 
-Vue.prototype.sendMeg = function (phone) {
+Vue.prototype.sendMeg = function(phone) {
     return new Promise((resolve, reject) => {
         this.$http.get({
             url: '/rong/sendCode',
@@ -220,7 +225,7 @@ Vue.prototype.sendMeg = function (phone) {
 }
 
 //检查是否存在
-Vue.prototype.checkHas = function (data) {
+Vue.prototype.checkHas = function(data) {
     return new Promise((resolve, reject) => {
         this.$http.get({
             url: '/userInfo/getOne',
@@ -273,7 +278,7 @@ const updateTableHeight = () => {
 
 
 //校验手机号是否正确
-Vue.prototype.checkPhone = function (phone) {
+Vue.prototype.checkPhone = function(phone) {
     var result = false
     if ((/^1[3|4|5|8|7|6|9][0-9]\d{8}$/.test(phone))) {
         result = true

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

@@ -139,7 +139,7 @@ export default {
 
         if (this.serviceType.length == 0) {
             this.$http.get({
-                url: '/serviceType/all',
+                url: '/serviceType/home',
                 data: {}
             }).then(res => {
                 if (res.success) {

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

@@ -67,17 +67,16 @@
                         </div>
                         <div class="box-right-content">
                             <div class="box-goodsList" v-loading="loading">
-                                <template v-if='serviceGoods[item.id]'>
-                                    <goods-little v-for="(todo,todoIndex) in serviceGoods[item.id].home" :info='todo' style="padding-left:30px;display:inline-block"></goods-little>
-                                </template>
+
+                                <goods-little v-for="(todo,todoIndex) in item.homeStoreInfoList" :info='todo' style="padding-left:30px;display:inline-block"></goods-little>
+
                             </div>
                             <div class="box-rankList" v-loading="loading">
-                                <template v-if='serviceGoods[item.id]'>
-                                    <router-link :to='{name:"shop",query:{id:todo.id,breHref:breHref}}' class="box-rankItem" v-for="(todo,todoIndex) in serviceGoods[item.id].hot">
-                                        <div class="num" :style="{backgroundImage:'url('+(todoIndex<3?require('../assetsPre/num_bg_pre.png'):require('../assetsPre/num_bg.png'))+')'}">{{todoIndex+1}}</div>
-                                        <div class="name">{{todo.storeName}}</div>
-                                    </router-link>
-                                </template>
+
+                                <router-link :to='{name:"shop",query:{id:todo.id,breHref:breHref}}' class="box-rankItem" v-for="(todo,todoIndex) in item.hotStoreInfoList">
+                                    <div class="num" :style="{backgroundImage:'url('+(todoIndex<3?require('../assetsPre/num_bg_pre.png'):require('../assetsPre/num_bg.png'))+')'}">{{todoIndex+1}}</div>
+                                    <div class="name">{{todo.storeName}}</div>
+                                </router-link>
 
                             </div>
                         </div>
@@ -237,108 +236,7 @@ export default {
 
             }
 
-            if (this.serviceType.length == 0) {
-                this.$http.get({
-                    url: '/serviceType/all',
-                    data: {}
-                }).then(res => {
-                    if (res.success) {
-                        this.$store.commit('updateServiceType', res.data)
-                        this.serviceType.forEach((item, index) => {
-                            this.serviceGoods[item.id] = {
-                                home: [],
-                                hot: []
-                            }
-                            this.$http.get({
-                                url: '/storeInfo/page',
-                                data: {
-                                    currentPage: 1,
-                                    pageNumber: 6,
-                                    serviceType: item.id,
-                                    homeFlag: 1,
-                                    useFlag: 'Y'
-                                }
-                            }).then(res => {
-                                if (res.success) {
-                                    this.serviceGoods[item.id].home = res.data.pp
-                                }
-                            }).catch(e => {
-                                console.log(e)
-                            })
-
-                            this.$http.get({
-                                url: '/storeInfo/page',
-                                data: {
-                                    currentPage: 1,
-                                    pageNumber: 10,
-                                    serviceType: item.id,
-                                    hotFlag: 1,
-                                    useFlag: 'Y'
-                                }
-                            }).then(res => {
-                                if (res.success) {
-                                    this.serviceGoods[item.id].hot = res.data.pp
-                                }
-                            }).catch(e => {
-                                console.log(e)
-                            })
-
-                        });
-                    }
-                }).catch(e => {
-                    console.log(e)
-                })
-
-            }
-            else {
-                this.serviceType.forEach((item, index) => {
-                    this.serviceGoods[item.id] = {
-                        home: [],
-                        hot: []
-                    }
-                    this.$http.get({
-                        url: '/storeInfo/page',
-                        data: {
-                            currentPage: 1,
-                            pageNumber: 6,
-                            serviceType: item.id,
-                            homeFlag: 1,
-                            useFlag: 'Y'
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            this.serviceGoods[item.id].home = res.data.pp
-                        }
-                    }).catch(e => {
-                        console.log(e)
-                    })
-
-                    this.$http.get({
-                        url: '/storeInfo/page',
-                        data: {
-                            currentPage: 1,
-                            pageNumber: 10,
-                            serviceType: item.id,
-                            hotFlag: 1,
-                            useFlag: 'Y'
-                        }
-                    }).then(res => {
-                        if (res.success) {
-                            this.serviceGoods[item.id].hot = res.data.pp
-                        }
-                    }).catch(e => {
-                        console.log(e)
-                    })
-
-                });
-            }
-
-
-
-            setTimeout(() => {
-                this.loading = false
-            }, 500)
-
+            this.loading=false
 
         }, 500)
 

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

@@ -75,7 +75,7 @@ export default {
     mounted() {
         if (this.serviceType.length == 0) {
             this.$http.get({
-                url: '/serviceType/all',
+                url: '/serviceType/home',
                 data: {}
             }).then(res => {
                 if (res.success) {

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

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

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

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.0871c8e21121b80e79a087b817e61d11.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.16e5d30ce39a0a4dddf8.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.b346cb207392f75cd89e.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.837ea9ca6f15e1c994003967f8c887e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.7c3893cc0c1edfb27588.js></script><script type=text/javascript src=/static/js/vendor.dca531f3c9de411dd825.js></script><script type=text/javascript src=/static/js/index.729221eb93abb046e54e.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;