前台提交

src/main/vue/src/components/OrderItem.vue

@@ -17,7 +17,7 @@
                 <div>
                     <img :src="info.userInfo.icon" style="width:50px;height:50px;border-radius:100%;display:block;margin:auto;" alt="">
                     <div style="margin:10px;font-size:16px;font-weight:bold;text-align:center;color:#000">{{info.userInfo.nickname}}</div>
-                    <el-rate style="text-align:center" :disabled="true" v-model="info.productComment.starLevel" :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
+                    <el-rate style="text-align:center" :disabled="true" v-model="starLevel" :colors="['#99A9BF', '#F7BA2A', '#FF9900']">
                     </el-rate>
                     <div style="text-align:center">{{info.productComment.commentCount}}人评论</div>
                 </div>
@@ -194,7 +194,15 @@ export default {
             dialogVisible: false,
             isSuccess: false,
             tip: '',
-            temp: 0
+            temp: 0,
+            starLevel:0
+        }
+    },
+    created(){
+        if(this.info.productComment){
+            if(this.info.productComment.starLevel){
+                this.starLevel=Number(this.info.productComment.starLevel)
+            }
         }
     },
     computed: {

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

@@ -152,34 +152,37 @@
 <script>
 var newShopLeft = 100;
 window.onresize = function () {
-    console.log(document.getElementById('container').scrollTop)
-    if (document.getElementById('container').scrollTop < 600) {
-        if (document.getElementById('allConatiner')) {
+    // console.log(document.getElementById('container').scrollTop)
+    if (document.getElementById('container')) {
+        if (document.getElementById('container').scrollTop < 600) {
+            if (document.getElementById('allConatiner')) {
+                if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
+                    document.getElementById('newRight').style.right = 0 - (document.getElementById('allConatiner').offsetWidth - 1390) / 2 + 'px'
+                }
+                else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
+                    document.getElementById('newRight').style.right = 0
+                }
+                else {
+                    document.getElementById('newRight').style.right = '-180px'
+
+                }
+            }
+        }
+        else {
+            document.getElementById('newRight').style.top = '100px'
             if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-                document.getElementById('newRight').style.right = 0 - (document.getElementById('allConatiner').offsetWidth - 1390) / 2 + 'px'
+                document.getElementById('newRight').style.right = 0
             }
             else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
                 document.getElementById('newRight').style.right = 0
             }
             else {
-                document.getElementById('newRight').style.right = '-180px'
+                document.getElementById('newRight').style.right = '90px'
 
             }
         }
     }
-    else {
-        document.getElementById('newRight').style.top = '100px'
-        if (document.getElementById('allConatiner').offsetWidth <= 1750 && document.getElementById('allConatiner').offsetWidth > 1390) {
-            document.getElementById('newRight').style.right = 0
-        }
-        else if (document.getElementById('allConatiner').offsetWidth <= 1390) {
-            document.getElementById('newRight').style.right = 0
-        }
-        else {
-            document.getElementById('newRight').style.right = '90px'
 
-        }
-    }
 
 };
 import goodsLittle from '../components/GoodsLittle'
@@ -302,14 +305,14 @@ export default {
         //     }
         //     return time
         // },
-         showHide(style){
-            if(style==1){
-                this.hideShow1=true
-                this.$emit('showHide',{index:1,hide:true})
-            }
-            else{
-                 this.hideShow2=true
-                this.$emit('showHide',{index:2,hide:true})
+        showHide(style) {
+            if (style == 1) {
+                this.hideShow1 = true
+                this.$emit('showHide', { index: 1, hide: true })
+            }
+            else {
+                this.hideShow2 = true
+                this.$emit('showHide', { index: 2, hide: true })
             }
         },
         goBanner(banner) {

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

@@ -79,6 +79,8 @@ import guaranteeMoney from '../pagesPre/GuaranteeMoney'
 import systemState from '../pagesPre/SystemState'
 import cityData from '../city'
 // import moment from 'moment'
+import { format } from 'date-fns'
+import zh from 'date-fns/locale/zh_cn'
 export default {
     name: 'order',
     data() {

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

@@ -420,7 +420,8 @@ const router = new Router({
     ]
 });
 router.beforeEach((to, from, next) => {
-    //console.log(to);
+    console.log(to.path)
+        //console.log(to);
     if (/^\/http/.test(to.path)) {
         console.log(Vue.$baseUrl);
         let url = to.path.replace('/', '');
@@ -439,9 +440,9 @@ router.beforeEach((to, from, next) => {
         return;
     }
 
-    // if (from.name != 'login' && from.name != 'register' && from.name != 'backPassword') {
-    //     store.commit('updateBrefName', from.name)
-    // }
+    if (from.name != 'login' && from.name != 'register' && from.name != 'backPassword') {
+        store.commit('updateBrefName', from.name)
+    }
 
     if (store.state.userInfo) {
         axios.get('/usersSession/all', {

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.ccc483ba50195d831904.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.664edccac69172836820.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.470b815a4495aa03ba49.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/admin.664edccac69172836820.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.6e0f0d455c863d39adab5cbaef52ab20.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.ccc483ba50195d831904.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.10e9cff4b328afff268b.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+        }</style><link href=/static/css/index.4aa258c2c1b2bff4f53738e082369b6f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.470b815a4495aa03ba49.js></script><script type=text/javascript src=/static/js/vendor.89cb0930756807ab3c59.js></script><script type=text/javascript src=/static/js/index.2501542d9b5be4abbdde.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;