9月21 前台提交

src/main/vue/src/pages/BannerInfo.vue

@@ -77,21 +77,24 @@ export default {
                     ],
             },
             locationOptions: [
-                { label: '首页banner', value: '1' }, 
-                { label: '首页修图消息', value: '2' }, 
-                { label: '首页影楼消息', value: '4' },
-                { label: '首页样片消息', value: '5' },
-                { label: '首页营销消息', value: '6' },
-                { label: '首页周边消息', value: '7' },
-                { label: '修图banner', value: '8' },
-                { label: '影楼banner', value: '9' },
-                { label: '样片banner', value: '10' },
-                { label: '营销banner', value: '11' },
-                { label: '周边banner', value: '12' },
-                { label: '关于我们banner', value: '13' },
+                { label: '首页banner', value: '1' },
+                { label: '首页影楼修图消息', value: '2' },
+                { label: '首页商业修图消息', value: '4' },
+                { label: '首页摄影消息', value: '5' },
+                { label: '首页样片消息', value: '6' },
+                { label: '首页营销消息', value: '7' },
+                { label: '首页周边消息', value: '17' },
+                { label: '影楼修图banner', value: '8' },
+                { label: '商业修图banner', value: '9' },
+                { label: '摄影banner', value: '10' },
+                { label: '样片banner', value: '11' },
+                { label: '营销banner', value: '12' },
+                { label: '周边banner', value: '13' },
                 { label: '加入我们banner', value: '14' },
                 { label: '联系我们banner', value: '15' },
-                ],
+                { label: '关于我们banner', value: '16' },
+
+            ],
             subColumn: '',
             subValue: '',
         }

src/main/vue/src/pages/BannerInfos.vue

@@ -250,19 +250,22 @@ export default {
             imageDialogVisible: false,
             locationOptions: [
                 { label: '首页banner', value: '1' },
-                { label: '首页修图消息', value: '2' },
-                { label: '首页影楼消息', value: '4' },
-                { label: '首页样片消息', value: '5' },
-                { label: '首页营销消息', value: '6' },
-                { label: '首页周边消息', value: '7' },
-                { label: '修图banner', value: '8' },
-                { label: '影楼banner', value: '9' },
-                { label: '样片banner', value: '10' },
-                { label: '营销banner', value: '11' },
-                { label: '周边banner', value: '12' },
-                { label: '关于我们banner', value: '13' },
+                { label: '首页影楼修图消息', value: '2' },
+                { label: '首页商业修图消息', value: '4' },
+                { label: '首页摄影消息', value: '5' },
+                { label: '首页样片消息', value: '6' },
+                { label: '首页营销消息', value: '7' },
+                { label: '首页周边消息', value: '17' },
+                { label: '影楼修图banner', value: '8' },
+                { label: '商业修图banner', value: '9' },
+                { label: '摄影banner', value: '10' },
+                { label: '样片banner', value: '11' },
+                { label: '营销banner', value: '12' },
+                { label: '周边banner', value: '13' },
                 { label: '加入我们banner', value: '14' },
                 { label: '联系我们banner', value: '15' },
+                { label: '关于我们banner', value: '16' },
+
             ],
             slectLocation: '',
         }

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

@@ -54,7 +54,7 @@ export default {
         this.$http.get({
             url: '/bannerInfo/all',
             data: {
-                location: 13
+                location: 16
             }
         }).then(res => {
             if (res.success) {

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

@@ -60,7 +60,7 @@
                     <div class="box-right">
                         <div class="box-right-top" :style="{backgroundColor:item.color}">
                             <div class="box-ad">
-                                <span>消息提醒：最热门服务商家可在此展示位置自定义一条广告消息展示</span>
+                                <span>消息提醒：{{allAd[serviceBanner[index]]}}</span>
                             </div>
                             <div class="box-hot">热门{{item.shortName}}</div>
                             <img src="../assetsPre/hot.png" alt="">
@@ -201,7 +201,9 @@ export default {
             serviceGoods: {},
             loading: true,
             newShop: [],
-            orderList: []
+            orderList: [],
+            allAd: {},
+            serviceBanner: ["2", "4", "5", "6", "7", "17"]
         }
     },
     mounted() {
@@ -254,6 +256,8 @@ export default {
 
             this.loading = false
 
+
+
         }, 500)
 
 
@@ -271,6 +275,21 @@ export default {
             console.log(e)
         })
 
+        this.$http.get({
+            url: '/bannerInfo/all',
+            data: {}
+        }).then(res => {
+            if (res.success) {
+                var jsonp = {}
+                res.data.forEach(item => {
+                    jsonp[item.location] = item.subtitle
+                })
+                this.allAd = jsonp
+            }
+        }).catch(e => {
+            console.log(e)
+        })
+
 
         var list = [{
             name: '首页',

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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.54a30a8ed603f4e95bd1.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/admin.6c06cb22d58b9d138563.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.05829a965d0124187fe7cddf115e75c4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.9326f266fc6d26a59236.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/admin.2e6e5a1c7cd3a70d6480.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.fad578ba4aa9ddbec671262bb8da5c51.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.54a30a8ed603f4e95bd1.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/index.29767ec8bae0c959dc09.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.9e2de3a15fe6a2a3bf02ce46a6dde5b8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.9326f266fc6d26a59236.js></script><script type=text/javascript src=/static/js/vendor.6df82a5829731809cf89.js></script><script type=text/javascript src=/static/js/index.fb4b453ba507c5b1c3bb.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.54a30a8ed603f4e95bd1.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.9326f266fc6d26a59236.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>

src/main/webapp/static/js/149.a9a6680421a457605995.js → src/main/webapp/static/js/162.add368ca76d4a42ecf5a.js

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