9月21 前台提交

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

@@ -344,13 +344,18 @@ export default {
         },
         saveRemark() {
             if (this.img.id && this.imgStyle == 'upload') {
+                if (!this.remark) {
+                    this.$message.success('成功');
+                    this.dialogFormVisible = false
+                    return
+                }
                 var data = {
                     remark: this.remark,
                     id: this.img.id
                 }
 
-                if(!data.remark){
-                    data.remark=''
+                if (!data.remark) {
+                    data.remark = ''
                 }
 
                 this.$http.post({
@@ -360,7 +365,7 @@ export default {
                     if (res.success) {
                         this.dialogFormVisible = false
                         this.$message.success('成功');
-                        this.$emit('changeRemark',{remark:this.remark,id:this.img.id})
+                        this.$emit('changeRemark', { remark: this.remark, id: this.img.id })
                     } else {
                         this.$message.warning('失败')
                     }
@@ -373,10 +378,10 @@ export default {
                     storeId: this.img.storeId,
                     userId: this.img.userId,
                     statusFlag: 2,
-                    detailRemark: this.remark
+                    // detailRemark: this.remark
                 }
-                if(!data.detailRemark){
-                    data.detailRemark=''
+                if (this.remark) {
+                    data.detailRemark = this.remark
                 }
                 if (this.detailRemarkFlag) {
                     data.detailRemarkFlag = this.detailRemarkFlag

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

@@ -4,7 +4,7 @@
             <div class="Head">
                 <div class="HeadAll">
                     <div class="HeadLeft">
-                        <span>您好，欢迎来到图忆途摄影服务平台！</span>
+                        <span v-if="welcom.length>0" @click="goNextUrl(welcom[0].url)">{{welcom[0].linkName}}</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> -->
@@ -30,7 +30,7 @@
                         </el-dropdown>
                         <el-button type="text" style="vertical-align: middle;margin-left:15px;color:#333" @click="goNext('userCenterHome')" size="small">个人中心</el-button>
 
-                        <el-button type="text" v-if="isStore"  style="vertical-align: middle;margin-left:15px;color:#333" @click="goShop" size="small">店铺中心</el-button>
+                        <el-button type="text" v-if="isStore" style="vertical-align: middle;margin-left:15px;color:#333" @click="goShop" size="small">店铺中心</el-button>
                     </div>
 
                 </div>
@@ -49,7 +49,8 @@ export default {
     name: 'miniHead',
     data() {
         return {
-            isIndex: true
+            isIndex: true,
+            welcom: []
         }
     },
     computed: {
@@ -64,11 +65,11 @@ export default {
             }
             return city
         },
-        isStore(){
-            var result=false
-            if(this.userInfo){
-                if(this.userInfo.storeFlag=='Y'){
-                    result=true
+        isStore() {
+            var result = false
+            if (this.userInfo) {
+                if (this.userInfo.storeFlag == 'Y') {
+                    result = true
                 }
             }
             return result
@@ -92,6 +93,19 @@ export default {
         else {
             this.isIndex = true
         }
+
+        this.$http.get({
+            url: '/quickLinks/all',
+            data: {
+                typeFlag: 4
+            }
+        }).then(res => {
+            if (res.success) {
+                this.welcom = res.data
+            }
+        }).catch(e => {
+            console.log(e)
+        })
     },
     methods: {
         goHome() {
@@ -111,6 +125,12 @@ export default {
                 })
             }
         },
+        goNextUrl(nextName) {
+            if (nextName) {
+                window.open(nextName)
+            }
+
+        },
         goNext(nextName) {
             if (nextName) {
                 this.$router.push({

src/main/vue/src/pagesPre/Contact.vue

@@ -43,11 +43,11 @@
 
                 <div class="content-img">
                     <img src="../assetsPre/contact1.png" alt="">
-                    <div class="ps" style="margin-top:23px;">
-                        全国免费服务热线 400-800-0608
+                    <div class="ps" style="margin-top:23px;" v-if="contactInfo.servicePhone">
+                        全国免费服务热线 {{contactInfo.servicePhone}}
                     </div>
-                    <div class="ps" style="margin-top:8px;">
-                        客服时间 周一至周日 9:00-17:00
+                    <div class="ps" style="margin-top:8px;" v-if="contactInfo.serviceTime">
+                        客服时间 {{contactInfo.serviceTime}}
                     </div>
                 </div>
             </div>

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.e11073d43328d9c79d40.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>
+<!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.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>

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

@@ -5,7 +5,7 @@
             position: absolute;
             top: 0;
             left: 0;
-        }</style><link href=/static/css/index.bd3923d4c13953c9b1ff127d96427b10.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.e11073d43328d9c79d40.js></script><script type=text/javascript src=/static/js/vendor.f9fb9e119f6383c2d254.js></script><script type=text/javascript src=/static/js/index.c367bac2c7ac07e68375.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</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字符串
     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.e11073d43328d9c79d40.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>
+<!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.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>

src/main/webapp/static/js/102.b6da54bd6276f5e2b1e1.js → src/main/webapp/static/js/103.102947359830cf106f1d.js

@@ -1 +1 @@
-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"}});
+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"}});

src/main/webapp/static/js/106.47620996f8b61ddfb412.js → src/main/webapp/static/js/107.8fa14fc1ce6362557679.js

@@ -1 +1 @@
-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}});
+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}});

src/main/webapp/static/js/132.6791f7e12e17df68cc1c.js → src/main/webapp/static/js/135.9090d696bec112ca3570.js

@@ -1 +1 @@
-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}});
+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}});

src/main/webapp/static/js/145.edd9da6ab597762a55f6.js → src/main/webapp/static/js/149.a9a6680421a457605995.js

@@ -1 +1 @@
-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){}});
+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){}});