图标

src/main/resources/static/css/product/list.css

@@ -21,6 +21,7 @@ li{list-style:none}
     .empty a{color:#E15616;}
     .productList{width:1200px;margin:0 auto;box-sizing:border-box}
     .productList .productItem{margin-bottom:16px}
+    .login-btn{font-size: 12px}
 }
 /**
 * 移动端

src/main/resources/static/css/supplier-center/dashboard.css

@@ -1,179 +1,792 @@
-/*左侧导航*/
-.left {
-    float: left;
-    width: 200px;
-    line-height: 50px;
-    white-space: nowrap;
-    text-indent: 16px;
-    font-size: 16px;
-    background: #FFF;
-}
-#dashboard.left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
- .navList .tab{display:block;color:#22272e;position:relative}
- .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
- .navList .con{position:relative;}
- .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
- .navList .con:before{top:0}
- .navList .con:after{bottom:0}
- .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
- .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
- .navList.on .tab{color:#e15616}
- .navList .con a.on{color:#e15616;background-color:#ffe6dc}
- .right{float:right;width:968px}
-.pageContent{background:#FFF;padding:16px}
-.pageContent form{
-    width: 498px;
-    margin: 0 auto;
-    padding: 50px 0;
-}
-.right{
-    float: right;
-    width: 968px;
-}
+ @media screen and (min-width:768px) {
+     /*左侧导航*/
+     .left {
+         float: left;
+         width: 200px;
+         line-height: 50px;
+         white-space: nowrap;
+         text-indent: 16px;
+         font-size: 16px;
+         background: #FFF;
+     }
+
+     #dashboard.left .title {
+         color: #22272e;
+         font-weight: bold;
+         border-bottom: 1px solid #f5f5f5
+     }
+
+     .navList .tab {
+         display: block;
+         color: #22272e;
+         position: relative
+     }
+
+     .navList .tab:before {
+         content: '\276F';
+         font-weight: normal;
+         position: absolute;
+         right: 10px;
+         top: 0;
+         transform: rotate(90deg);
+         width: 32px;
+         height: 32px;
+         line-height: 32px;
+         text-align: center;
+         color: #bec2c9
+     }
+
+     .navList .con {
+         position: relative;
+     }
+
+     .navList .con:before, .navLayout .navList .con:after {
+         content: '';
+         position: absolute;
+         width: 168px;
+         border-top: 1px solid #f5f5f5;
+         left: 16px
+     }
+
+     .navList .con:before {
+         top: 0
+     }
+
+     .navList .con:after {
+         bottom: 0
+     }
+
+     .navList .con a {
+         display: block;
+         font-size: 14px;
+         color: #627386;
+         text-indent: 32px
+     }
+
+     .navList.on .tab:before {
+         top: 18px;
+         transform: rotate(270deg);
+         color: #e15616
+     }
+
+     .navList.on .tab {
+         color: #e15616
+     }
+
+     .navList .con a.on {
+         color: #e15616;
+         background-color: #ffe6dc
+     }
+
+     .right {
+         float: right;
+         width: 968px
+     }
+
+     .pageContent {
+         background: #FFF;
+         padding: 16px
+     }
+
+     .pageContent form {
+         width: 498px;
+         margin: 0 auto;
+         padding: 50px 0;
+     }
+
+     .right {
+         float: right;
+         width: 968px;
+     }
+
+     /**/
+     #dashboard li {
+         list-style: none;
+     }
+
+     .information {
+         background: #fff;
+         padding: 20px;
+         box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+     }
+
+     .head {
+         width: 112px;
+         height: 80px;
+         border-radius: 2px;
+         border: solid 1px #f5f5f5;
+         margin-right: 10px;
+         position: relative;
+         cursor: pointer;
+         display: inline-block;
+         vertical-align: top;
+     }
+
+     .zhuti {
+         font-size: 16px;
+         color: #22272e;
+         padding: 25px 236px 10px
+     }
+     .info_main h3{
+        display: inline-block;
+     }
+    .icon.Promotion:before{
+        width: 20px;
+        height: 20px;
+        background-position: -90px 3px;
+        position: absolute;
+    }
+     .icon.Image:before {
+         width: 120px;
+         height: 80px;
+         background-position: 10px -521px
+     }
+
+     .head img {
+         width: 100%;
+         height: 100%;
+     }
+
+     .info_main {
+        display: inline-block;
+     }
+    .activityBox{
+        top: 25px;
+    }
+    .activepro{
+        width: 312px;
+        overflow: hidden;
+        cursor: pointer;
+    }
+    .Boxtext{
+        text-align: left;
+        line-height: 25px;
+        color: #333333;
+        padding-bottom: 5px;
+    }
+    .activeimg{
+        width: 68px;
+        height: 68px;
+        float: left;
+        line-height: 68px
+    }
+    .activeright p{
+         text-align: left;
+        line-height: 20px;
+        font-size: 12px
+    }
+    .activeimg img{
+        width: 100%;
+        height: 100%
+    }
+     .username {
+         color: #627386;
+         font-size: 12px;
+         margin: 10px 0;
+     }
+
+     .perfect {
+         width: 64px;
+         height: 22px;
+         background-color: #627386;
+         border-radius: 2px;
+         color: #ffffff;
+         font-size: 12px;
+         line-height: 22px;
+         text-align: center;
+         display: inline-block;
+     }
+
+     .ziliao {
+         font-size: 14px;
+         color: #22272e;
+     }
+
+     .ziliao span {
+         color: #f94b4b;
+     }
+
+     .message {
+         float: right;
+         width: 30px;
+         height: 30px;
+         cursor: pointer;
+     }
+
+     .msg_num {
+         width: 20px;
+         height: 20px;
+         line-height: 20px;
+         display: block;
+         background: red;
+         border-radius: 50%;
+         color: #fff;
+         font-size: 10px;
+         text-align: center;
+         position: relative;
+         top: 10px;
+         right: 9px;
+     }
+
+     .icon.msg:before {
+         width: 25px;
+         height: 25px;
+         background-position: -240px -371px
+     }
+
+     .product {
+         margin: 20px 0;
+     }
+
+     .product p {
+         font-size: 16px;
+         font-weight: normal;
+         font-stretch: normal;
+         line-height: 21px;
+         letter-spacing: 0px;
+         color: #22272e;
+         padding: 10px;
+     }
+
+     .product ul {
+         height: 50px;
+         line-height: 80px;
+         background-color: #ffffff;
+         box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+         padding: 15px;
+     }
+
+     .product li {
+
+         display: inline-block;
+         margin-right: 20px;
+         width: 110px;
+         text-align: center;
+         color: #333333;
+         position: relative;
+         cursor: pointer;
+     }
+
+     .icon.confirm:before {
+         width: 34px;
+         height: 35px;
+         background-position:-159px -415px;
+         position: absolute;
+         right: 53px;
+     }
+
+     .icon.other:before {
+         background-position: -197px -415px;
+     }
+    .icon.down:before{
+         background-position: -234px -415px;
+    }
+     .rank_top p {
+         font-size: 16px;
+         color: #22272e;
+         display: inline-block;
+     }
+
+     .rank_top span {
+         color: #627386;
+         font-size: 16px;
+     }
+
+     .sales-ranke ul li {
+         display: inline-block;
+         width: 10%;
+     }
+
+     .sales-ranke ul li:nth-child(2) {
+         width: 79%;
+     }
+
+     .sales-ranke {
+         background: #fff;
+         color: #627386;
+         padding: 10px 22px
+     }
+
+     .sales-ranke ul {
+         padding: 10px 0;
+         border-bottom: 1px solid #e2e7ef
+     }
+
+     .rank_top {
+         padding: 10px;
+     }
 
+     .file_img {
+         width: 118px;
+         height: 80px;
+         font-size: 999px;
+         opacity: 0;
+         top: 0px;
+         left: 0px;
+         position: absolute
+     }
 
-/**/
-#dashboard li{
-    list-style: none;
+     .shop-ranke {
+         background: #fff;
+         padding-bottom: 20px;
+         box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+     }
+
+     .shop-ranke ul li {
+         float: left;
+         height: 70px;
+         width: 10%;
+         color: #e15616;
+         line-height: 70px
+     }
+
+     .shop-ranke ul {
+         padding: 5px 15px;
+         overflow: hidden;
+     }
+
+     .shop-ranke ul li:nth-child(2) {
+         width: 79%;
+     }
+
+     .shop-ranke ul li .shop-img {
+         display: inline-block;
+         vertical-align: top;
+         margin-left: 10px;
+     }
+
+     .shop-ranke ul li .shop-img img {
+         width: 70px;
+         height: 70px;
+         display: inline-block;
+     }
+
+     .shop-ranke ul li p {
+         width: 350px;
+         font-size: 14px;
+         height: 60px;
+         line-height: 60px;
+         color: #333;
+         padding-left: 16px;
+         display: inline-block;
+         overflow: hidden;
+         text-overflow: ellipsis;
+     }
+
+     .icon.rank0:before {
+         background-position: 0px -453px
+     }
+
+     .icon.rank1:before {
+         background-position: -62px -453px
+     }
+
+     .icon.rank2:before {
+         background-position: -124px -453px
+     }
+
+     .icon.rank3:before {
+         background-position: -186px -453px
+     }
+
+     .icon.rank4:before {
+         background-position: -248px -453px
+     }
+
+     .icon.rank:before {
+         position: absolute;
+         width: 60px;
+         height: 60px;
+     }
+
+     .confirm span {
+         color: #e15616;
+         padding: 5px
+     }
+
+     .Statistics {
+         margin-top: 20px;
+     }
+
+     .Stati_top p {
+         font-size: 14px;
+         color: #333333;
+         display: inline-block;
+     }
+
+     .Stati_top span {
+         font-size: 12px;
+         color: #999999;
+     }
+
+     #StatisticsEacths {
+         width: 968px;
+         height: 279px;
+         background: #FFF;
+         padding-top: 20px;
+         margin-top: 10px;
+         box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+     }
+ }
+
+/*移动端*/
+ @media screen and (max-width:768px){
+ #dashboard{
+    width: 100%;
+    overflow: hidden;
+ }
+ #dashboard li {
+ list-style: none;
 }
-.information{
+.wrap_tittle{
+    height: 10.6vw;
+    line-height: 10.6vw;
     background: #fff;
-    padding: 20px;
-    overflow: hidden;
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.head{
-    width: 112px;
-	height: 80px;
-	border-radius: 2px;
-	border: solid 1px #f5f5f5;
-	float: left;
-    margin-right: 10px;
-}
-.head img{
+    padding: 0 2.7vw;
+    font-size: 4.5vw;
+    color: #22272e;
+    border-bottom: solid 1px #e2e7ef;
+}
+.mIcon.wrap_tittle:before{
+    width: 6.7vw;
+    height: 6.7vw;
+    background-position: -50.7vw -51.5vw;
+    position: absolute;
+    top: 28vw;
+}
+.mIcon.open:before{
+    width: 10.6vw;
+    height: 11.2vw;
+    float: right;
+    background-position: -48.8vw 2.7vw;
+}
+.left{
     width: 100%;
-    height: 100%;
+    background: #fff;
 }
-.info_main{
-    float: left;
+.mIcon.navList:before{
+     width: 25px;
+     height: 25px;
+     position: absolute;
+     top: 3px
 }
-.username{
-    color: #627386;
-    font-size: 12px;
-    margin: 10px 0;
-}
-.perfect{
-    width: 64px;
-	height: 22px;
-	background-color: #627386;
-	border-radius: 2px;
-	color: #ffffff;
-	font-size: 12px;
-	line-height: 22px;
-	text-align: center;
-	display: inline-block;
-}
-.ziliao{
-	font-size: 14px;
+.mIcon.one:before{
+    background-position: -222px -193px;
+}
+.mIcon.two:before{
+    background-position: -284px -193px;
+}
+.mIcon.three:before{
+    background-position: -127px -193px;
+}
+.mIcon.four:before{
+    background-position: -158px -193px;
+}
+.navList{
+    padding:2.7vw;
+    position: relative;
+}
+.navList .tab{
+    margin-left: 6.7vw;
     color: #22272e;
 }
-.ziliao span{
-    color: #f94b4b;
+.con{
+    margin-top: 10px;
 }
-.message{
-    float: right;
-    width: 30px;
-    height: 30px;
-    cursor: pointer;
-}
-.msg_num{
-    width: 20px;
-    height: 20px;
-    line-height: 20px;
-    display: block;
-    background: red;
-    border-radius: 50%;
-    color: #fff;
-    font-size: 10px;
+.con a{
+    color: #627386;
+    height: 8.6vw;
+    line-height: 8.6vw;
+    border: 1px solid #b8bfca;
+    display: inline-block;
+    width: 20.8vw;
     text-align: center;
-    position: relative;
-    top: 10px;
-    right: 9px;
-}
-.icon.msg:before{
-    width: 25px;
-    height: 25px;
-    background-position: -240px -371px
-}
-.product{
-    margin: 20px 0;
-}
-.product p{
-    font-size: 16px;
-	font-weight: normal;
-	font-stretch: normal;
-	line-height: 21px;
-	letter-spacing: 0px;
-	color: #22272e;
-	padding: 10px;
-}
-.product ul{
-	height: 50px;
-    line-height: 80px;
-    background-color: #ffffff;
+    margin: 1.9vw 1.3vw;
+}
+.information {
+     background: #fff;
+    padding: 2.7vw;
+    overflow: hidden;
     box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    padding: 15px;
+    width: 100%;
+    height: 33.9vw;
 }
-.product li{
 
-    display: inline-block;
-    margin-right: 20px;
-    width: 110px;
-    text-align: center;
-    color: #333333;
-    position: relative;
-    cursor: pointer;
+.head {
+ width: 112px;
+ height: 80px;
+ border-radius: 2px;
+ border: solid 1px #f5f5f5;
+ float: left;
+ margin-right: 10px;
+ position: relative;
+ cursor: pointer;
 }
-.icon.confirm:before{
-    width: 34px;
-    height: 35px;
-    background-position: -266px -371px;
-    position: absolute
+
+.zhuti {
+ font-size: 16px;
+ color: #22272e;
 }
-.icon.other:before{
-    background-position: -300px -371px;
+
+.mIcon.Image:before {
+ width: 120px;
+ height: 80px;
+ background-position: 10px -521px
 }
-.rank_top p{
-   font-size: 16px;
-   color: #22272e;
-   display: inline-block;
+
+.head img {
+ width: 100%;
+ height: 100%;
 }
-.rank_top span{
-    color: #627386;
-    font-size: 16px;
+
+.info_main {
+ float: left;
 }
-.rank_top a{
-    float: right;
-    color: #333333;
-    cursor: pointer
+
+.username {
+ color: #627386;
+ font-size: 12px;
+ margin: 10px 0;
 }
-.sales-ranke ul li{
-    display: inline-block;
-    width: 10%;
+
+.perfect {
+ width: 64px;
+ height: 22px;
+ background-color: #627386;
+ border-radius: 2px;
+ color: #ffffff;
+ font-size: 12px;
+ line-height: 22px;
+ text-align: center;
+ display: inline-block;
 }
-.sales-ranke ul li:nth-child(2){
-    width: 79%;
+
+.ziliao {
+ font-size: 14px;
+ color: #22272e;
 }
-.sales-ranke{
-    height: 54px;
-    background: #fff;
-    line-height: 54px;
-    color: #627386;
+
+.ziliao span {
+ color: #f94b4b;
+}
+
+.message {
+ float: right;
+ width: 30px;
+ height: 30px;
+ cursor: pointer;
+}
+
+.msg_num {
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ display: block;
+ background: red;
+ border-radius: 50%;
+ color: #fff;
+ font-size: 10px;
+ text-align: center;
+ position: relative;
+ top: 10px;
+ right: 9px;
+}
+
+.icon.msg:before {
+ width: 25px;
+ height: 25px;
+ background-position: -240px -371px
+}
+
+.product {
+ margin: 20px 0;
+}
+
+.product p {
+ font-size: 16px;
+ font-weight: normal;
+ font-stretch: normal;
+ line-height: 21px;
+ letter-spacing: 0px;
+ color: #22272e;
+ padding: 10px;
+}
+
+.product ul {
+ height: 50px;
+ line-height: 80px;
+ background-color: #ffffff;
+ box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+ padding: 15px;
+}
+
+.product li {
+
+ display: inline-block;
+ margin-right: 20px;
+ width: 110px;
+ text-align: center;
+ color: #333333;
+ position: relative;
+ cursor: pointer;
+}
+
+.icon.confirm:before {
+ width: 34px;
+ height: 35px;
+ background-position: -266px -371px;
+ position: absolute;
+ right: 53px;
+}
+
+.icon.other:before {
+ background-position: -300px -371px;
+}
+
+.rank_top p {
+ font-size: 16px;
+ color: #22272e;
+ display: inline-block;
+}
+
+.rank_top span {
+ color: #627386;
+ font-size: 16px;
+}
+
+.sales-ranke ul li {
+ display: inline-block;
+ width: 10%;
+}
+
+.sales-ranke ul li:nth-child(2) {
+ width: 79%;
 }
-.sales-ranke ul{
-    padding: 0 15px;
+
+.sales-ranke {
+ background: #fff;
+ color: #627386;
+ padding: 10px 22px
+}
+
+.sales-ranke ul {
+ padding: 10px 0;
+ border-bottom: 1px solid #e2e7ef
+}
+
+.rank_top {
+ padding: 10px;
+}
+
+.file_img {
+ width: 118px;
+ height: 80px;
+ font-size: 999px;
+ opacity: 0;
+ top: 0px;
+ left: 0px;
+ position: absolute
+}
+
+.shop-ranke {
+ background: #fff;
+ padding-bottom: 20px;
+ box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+}
+
+.shop-ranke ul li {
+ float: left;
+ height: 70px;
+ width: 10%;
+ color: #e15616;
+ line-height: 70px
+}
+
+.shop-ranke ul {
+ padding: 5px 15px;
+ overflow: hidden;
+}
+
+.shop-ranke ul li:nth-child(2) {
+ width: 79%;
+}
+
+.shop-ranke ul li .shop-img {
+ display: inline-block;
+ vertical-align: top;
+ margin-left: 10px;
+}
+
+.shop-ranke ul li .shop-img img {
+ width: 70px;
+ height: 70px;
+ display: inline-block;
+}
+
+.shop-ranke ul li p {
+ width: 350px;
+ font-size: 14px;
+ height: 60px;
+ line-height: 60px;
+ color: #333;
+ padding-left: 16px;
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
 }
-.rank_top{
-    padding: 10px;
+
+.icon.rank0:before {
+ background-position: 0px -453px
+}
+
+.icon.rank1:before {
+ background-position: -62px -453px
+}
+
+.icon.rank2:before {
+ background-position: -124px -453px
+}
+
+.icon.rank3:before {
+ background-position: -186px -453px
+}
+
+.icon.rank4:before {
+ background-position: -248px -453px
+}
+
+.icon.rank:before {
+ position: absolute;
+ width: 60px;
+ height: 60px;
+}
+
+.confirm span {
+ color: #e15616;
+ padding: 5px
+}
+
+.Statistics {
+ margin-top: 20px;
+}
+
+.Stati_top p {
+ font-size: 14px;
+ color: #333333;
+ display: inline-block;
+}
+
+.Stati_top span {
+ font-size: 12px;
+ color: #999999;
+}
+
+#StatisticsEacths {
+ width: 968px;
+ height: 279px;
+ background: #FFF;
+ padding-top: 20px;
+ margin-top: 10px;
+ box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
 }
+ }

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -162,6 +162,12 @@ var SupplierApi = {
                 .then(function(res){
                     callback(res);
                 });
+        },
+         uploadAvatar: function (params, callback) {//供应商 首页上传头像成功后调用
+            Http.AjaxService({ url:'/user/uploadAvatar', type:'post', data:params, json:false, mask:true,replace:true})
+                .then(function(res){
+                    callback(res);
+                });
         }
 
 };

src/main/resources/static/js/supplier-center/dashboard.js

@@ -1,42 +1,53 @@
 jqMultipleShow("click", ".navList", ".tab", ".con");
+var isPC = ($(window).width()>768);
 var dashboard = new Vue({
     el:'#dashboard',
     data:{
-        Tab:[
-            {title:'我的交易',
-            List:[
-                {name:'我的首页',path:'/supplier/dashboard.html'},
-                {name:'我的订单',path:'/supplier/order/list.html'},
-                {name:'结算管理',path:'/supplier/order/settlement.html'},
-                {name:'评价管理',path:''},
-            ]},
-            {title:'我的店铺',
-            List:[
-                {name:'查看店铺',path:''},
-                {name:'装扮主页',path:'/supplier/decoration.html'},
-                {name:'发布商品',path:'/supplier/release.html'},
-                {name:'我的商品',path:'/supplier/goods.html'},
-                {name:'品牌管理',path:''},
-            ]},
-            {title:'管理中心',
-             List:[
-                {name:'资料信息',path:'/supplier/setting/information.html'},
-                {name:'员工管理',path:'/supplier/operation/list.html'},
-             ]
-            },
-            {title:'账户设置',List:[
-                {name:'重置密码',path:'/supplier/setting/password.html'},
-                {name:'更换手机',path:'/supplier/setting/phone.html'},
-            ]},
-        ],
         userId:'',
         homeData:'',
+        formData:new FormData(),
+        goodImage:'',
         shopinfo:{},
         promotions:{},
+        rankingList:[],
+        titleSshow:false,
         msgFlag:false,
-
+        isShow:false,
     },
      methods: {
+     uploadGoodsImagesFn:function (event) {//更换头像
+          var _this = this;
+            var inputDOM = _this.$refs.goodImage;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            SupplierApi.uploadimg(_this.formData,function(response){
+               _this.goodImage=response.data;
+                event.target.value = '';
+                SupplierApi.uploadAvatar({userId:_this.userId, image:_this.goodImage},function (res) {
+                    console.log(res)
+                })
+            });
+     },
+     toggleThisLadder: function(event){
+            var el = event.currentTarget;
+            if($(el).hasClass("on")){
+                $(el).removeClass("on").siblings('.mFixed').hide();
+                if(!isPC){looseBody();}
+            }else{
+                $(el).addClass("on").siblings('.mFixed').show();
+                if(!isPC){fixedBody();}
+            }
+        },
+         hideThisLadder: function(event){
+            var el = event.currentTarget;
+            $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
+            if(!isPC){looseBody();}
+        },
+     opentitle:function () {
+         var _this = this;
+         _this.titleSshow =!this.titleSshow;
+     }
+
 
     },
     mounted:function () {
@@ -45,20 +56,133 @@ var dashboard = new Vue({
         _this.userId =JSON.parse(userInfo).userId
         console.log(_this.userId)
         SupplierApi.homePageData({userId:_this.userId},function (res) {
-        if(res.code==0){
-             _this.homeData = res.data;
-             _this.shopinfo = res.data.shop;
-             _this.promotions = res.data.promotions;
-             if (res.data.unReadMessageCount>99){
-                 res.data.unReadMessageCount = '99+';
-                 _this.msgFlag = true
-             }else if(res.data.unReadMessageCount == 0){
-                 _this.msgFlag = false
-             }else {
-               _this.msgFlag = true
-             }
-             console.log(res)
-        }
+            if(res.code==0){
+                 _this.homeData = res.data;
+                 _this.goodImage = _this.homeData.user.image;
+                 _this.shopinfo = res.data.shop;
+                 _this.promotions = res.data.promotions;
+                 _this.rankingList = res.data.salesRankingList;
+                 if (res.data.unReadMessageCount>99){
+                     res.data.unReadMessageCount = '99+';
+                     _this.msgFlag = true
+                 }else if(res.data.unReadMessageCount == 0){
+                     _this.msgFlag = false
+                 }else {
+                   _this.msgFlag = true
+                 }
+                 var paytotalfeeData=[];//订单金额
+                 var orderNumData=[];//订单数
+                 _this.homeData.salesStatisticsList.map(function (item) {
+                    orderNumData.push(item.orderQuantity);
+                    paytotalfeeData.push(item.orderAmount)
+                  })
+                 console.log(res)
+                 // 基于准备好的dom，初始化echarts实例
+                var myChart = echarts.init(document.getElementById('StatisticsEacths'));
+                var monthData =['近一个月','近三个月','近半年','近一年'];
+                // var paytotalfeeData =['200.00','2000.00','20000.00','200000.00'];
+                // var orderNumData = ['100','1000','10000','100000'];
+                var option = {
+                        tooltip: {
+                          trigger: 'axis',
+                          axisPointer: {
+                            type: 'cross',
+                            label: {
+                              backgroundColor: '#6a7985'
+                            }
+                          }
+                        },
+                        legend: {
+                          show: true,
+                          top: 0,
+                          right: '5%'
+                        },
+                        grid: {
+                          left: '3%',
+                          right: '4%',
+                          bottom: '3%',
+                          containLabel: true
+                        },
+                        xAxis: [{
+                          type: 'category',
+                          boundaryGap: false,
+                          data: monthData
+                        }],
+                        yAxis: [{
+                          type: 'log',
+                          axisTick: {
+                            show: true
+                          }
+                        }],
+                        series: [
+                                    {
+                                      name: '订单金额',
+                                      type: 'line',
+                                      smooth: true,
+                                      symbolSize: 3,
+                                      showSymbol: false,
+                                      symbol: 'emptyCircle',
+                                      lineStyle: {
+                                        color: '#1667e1'
+                                      },
+                                      itemStyle: {
+                                        color: '#1667e1',
+                                        borderWidth: 2
+                                      },
+                                      areaStyle: {
+                                        color: {
+                                          type: 'linear',
+                                          x: 0,
+                                          y: 0,
+                                          x2: 0,
+                                          y2: 1,
+                                          colorStops: [{
+                                            offset: 0, color: 'rgba(65, 125, 230, 0.2)' // 0% 处的颜色
+                                          }, {
+                                            offset: 1, color: 'rgba(65, 125, 230, 0)'// 100% 处的颜色
+                                          }]
+                                        }
+                                      },
+                                      data: paytotalfeeData,
+                                      animationDuration: 2000
+                                    },
+                                    {
+                                      name: '订单量(笔)',
+                                      type: 'line',
+                                      smooth: true,
+                                      symbolSize: 3,
+                                      showSymbol: false,
+                                      symbol: 'emptyCircle',
+                                      lineStyle: {
+                                        color: '#16e175'
+                                      },
+                                      itemStyle: {
+                                        color: '#16e175',
+                                        borderWidth: 2
+                                      },
+                                      areaStyle: {
+                                        color: {
+                                          type: 'linear',
+                                          x: 0,
+                                          y: 0,
+                                          x2: 0,
+                                          y2: 1,
+                                          colorStops: [{
+                                            offset: 0, color: 'rgba(131, 242, 183, 0.2)' // 0% 处的颜色
+                                          }, {
+                                            offset: 1, color: 'rgba(131, 242, 183, 0)'// 100% 处的颜色
+                                          }]
+                                        }
+                                      },
+                                      data: orderNumData,
+                                      animationDuration: 2000
+                                    }
+
+                        ]
+                };
+                // 使用刚指定的配置项和数据显示图表。
+                myChart.setOption(option);
+            }
 
 
         })

src/main/resources/templates/flea-market/detail.html

@@ -173,7 +173,6 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/second.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/flea-market/secondDetail.js(v=${version})}"></script>
 </body>

src/main/resources/templates/flea-market/form.html

@@ -203,9 +203,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/second.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/flea-market/form.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/flea-market/list.html

@@ -96,7 +96,6 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/second.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/flea-market/list.js(v=${version})}"></script>
 </body>

src/main/resources/templates/supplier-center/components/tableft.html

@@ -0,0 +1,36 @@
+<div class="left">
+    <div class="navList mIcon one">
+        <span class="tab">我的交易</span>
+        <div class="con"  :style="isPC?'display:none':''">
+            <a href="/supplier/dashboard.html">我的首页</a>
+            <a href="/supplier/order/list.html">我的订单</a>
+            <a href="/supplier/order/settlement.html">结算管理</a>
+            <a href="/">评价管理</a>
+        </div>
+    </div>
+    <div class="navList mIcon two">
+        <span class="tab">我的店铺</span>
+        <div class="con" :style="isPC?'display:none':''">
+            <a href="/">查看店铺</a>
+            <a href="/supplier/decoration.html">装扮主页</a>
+            <a href="/supplier/release.html">发布商品</a>
+            <a href="/supplier/goods.html">我的商品</a>
+            <a href="/supplier/goods.html">品牌管理</a>
+
+        </div>
+    </div>
+    <div class="navList mIcon three">
+        <span class="tab">管理中心</span>
+        <div class="con" :style="isPC?'display:none':''">
+            <a href="/supplier/setting/information.html">资料信息</a>
+            <a href="/supplier/operation/list.html">员工管理</a>
+        </div>
+    </div>
+    <div class="navList mIcon four">
+        <span class="tab">账户设置</span>
+        <div class="con" :style="isPC?'display:none':''">
+            <a href="/supplier/setting/password.html">重置密码</a>
+            <a href="/supplier/setting/phone.html">更换手机</a>
+        </div>
+    </div>
+</div>

src/main/resources/templates/supplier-center/dashboard.html

@@ -13,27 +13,46 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="wrap clear mf">
-    <p class="zhuti">我的交易 &gt; 我的首页 </p>
-        <div class="left">
-            <div class="title">我的交易</div>
-                <div class="navList" v-for="(tab,index) in Tab">
-                <span class="tab">{{tab.title}}</span>
-                <div class="con">
-                    <a :href="item.path" v-for="(item,index) in tab.List">{{item.name}}</a>
-                </div>
-            </div>
-        </div>
+    <div class="wrap clear ">
+    <p class="zhuti" v-if="isPC">我的交易 &gt; 我的首页 </p>
+    <div v-else class="wrap_tittle mIcon" @click="opentitle"><i class="mIcon open"></i><span style="margin-left: 25px;">我的主页</span></div>
+        <!--左侧面包屑-->
+        <template th:replace="supplier-center/components/tableft"></template>
+
         <div class="right">
             <div class="information">
                 <div class="head">
-                     <img :src="goodImage">
-                        <input type="file" ref="goodImage" name="file" class="file_img" @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg">
+                     <i class="icon Image" v-if="goodImage==null"></i>
+                     <img :src="goodImage" v-else>
+                     <input type="file" ref="goodImage" name="file" class="file_img" @change="uploadGoodsImagesFn" accept="image/png,image/jpeg,image/gif,image/jpg">
                 </div>
                 <div class="info_main">
                     <div class="">
-                         <h3>{{shopinfo.sname}}</h3>
-                         <span></span>
+                        <h3>{{shopinfo.sname}}</h3>
+                          <span v-if="promotions!=null" class="priceTag">
+                          <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                          <div class="promotion mFixed">
+                                    <div>
+                                        <p class="t">
+                                            <em v-if="promotions.mode==2">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
+                                            <em v-if="promotions.mode==3">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
+                                        </p>
+                                        <p>促销时间：<em >不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
+                                        <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
+                                        <template v-if="promotions.mode==3">
+                                            <p>赠品：</p>
+                                            <p>
+                                                <span v-for="g in promotions.giftList" class="p">
+                                                    <img :src="g.image">
+                                                    <span v-text="g.name"></span>
+                                                    <span v-text="'× '+g.number"></span>
+                                                </span>
+                                            </p>
+                                        </template>
+                                        <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                    </div>
+                                </div>
+                          </span>
                     </div>
                     <p class="username">用户名：{{shopinfo.name}}</p>
                     <span class="perfect">立即完善</span>
@@ -48,13 +67,13 @@
                 <p>商品数据</p>
                  <ul>
                      <li class="icon confirm">
-                         <a>全部商品</a>
+                         <a href="">全部商品<span>{{homeData.allNum}}</span></a>
                      </li>
                       <li class="icon other confirm">
-                         <a>已上架</a>
+                          <a>已上架<span>{{homeData.upNum}}</span></a>
                      </li>
-                     <li class="icon other confirm">
-                         <a>已下架</a>
+                     <li class="icon down confirm">
+                         <a>已下架<span>{{homeData.downNum}}</span></a>
                      </li>
                  </ul>
             </div>
@@ -62,33 +81,49 @@
                 <div class="rank_top">
                     <p>单品销售排名</p>
                     <span>（统计标准：已确认的订单）</span>
-                    <a>查看全部 > </a>
                 </div>
                 <div class="sales-ranke">
-                <ul>
-                    <li>排名</li>
-                    <li>商品信息</li>
-                    <li>销量</li>
-                </ul>
+                    <ul>
+                        <li>排名</li>
+                        <li>商品信息</li>
+                        <li>销量</li>
+                    </ul>
+                </div>
+                <div class="shop-ranke">
+                   <ul v-for="(rk,index) in rankingList" :key="index">
+                       <li><i class="icon rank" :class="'rank'+index"></i></li>
+                       <li>
+                          <div class="shop-img">
+                             <img :src="rk.image">
+                          </div>
+                          <p>{{rk.name}}</p>
+                        </li>
+                        <li class="sales-num"><span>{{rk.total}}</span></li>
+                    </ul>
+                </div>
             </div>
-
-
+<!-- 销售情况统计  -->
+            <div class="Statistics">
+                <div class="Stati_top">
+                    <p>销售情况统计</p>
+                    <span>(统计标准:已确认的订单)</span>
+                </div>
+                 <div id="StatisticsEacths" style="">
+                <!-- echarts表   -->
+                 </div>
             </div>
-
         </div>
-
-
-
-
     </div>
 </div>
-
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/dashboard.js(v=${version})}"></script>
 </body>
+    <script type="text/javascript">
+
+
+</script>
 </html>