Merge remote-tracking branch 'origin/developerB' into developerB

# Conflicts:
#	src/main/resources/static/css/base/base.pc.css

src/main/java/com/caimei/www/controller/authorized/ShoppingController.java

@@ -6,6 +6,7 @@ import com.caimei.www.pojo.order.CartItem;
 import com.caimei.www.service.page.ShoppingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -22,6 +23,7 @@ import java.util.Map;
 public class ShoppingController extends BaseController {
 
 	private static final String SHOPPING_CART_PATH = "shopping/cart";
+	private static final String SHOPPING_CONFIRM_PATH = "shopping/confirm";
 
     private ShoppingService shoppingService;
     @Autowired
@@ -37,6 +39,14 @@ public class ShoppingController extends BaseController {
         return SHOPPING_CART_PATH;
     }
 
+    /**
+     * 确认订单页
+     */
+    @GetMapping("/shopping/confirm.html")
+    public String confirm() {
+        return SHOPPING_CONFIRM_PATH;
+    }
+
     /**
      * 顶部购物车数据
      * @return
@@ -47,14 +57,5 @@ public class ShoppingController extends BaseController {
         return shoppingService.getHeaderCart(userId);
     }
 
-    /**
-     * 购物车列表数据
-     * @return
-     */
-    @GetMapping("/cart/list")
-    @ResponseBody
-    public JsonModel<Map<String, Object>> getShoppingCarts(Integer userId) {
-        return shoppingService.getShoppingCarts(userId);
-    }
 
 }

src/main/resources/static/css/base/base.h5.css

@@ -138,6 +138,9 @@
 .productItem .item .btn{height:9vw;line-height:9vw}
 .productItem .item .btn{display:inline-block;width:35.8vw;height:9vw;text-align:center;overflow:hidden;color:#F94B4B;background:#FEF6F3;border-radius:2px}
 .productItem .item .btn.add{background:#FEF6F3;color:#E15616;}
+.price .login-btn{width:14vw;height:5vw;background:#FBEDE6;text-align:center;line-height:5vw;font-size:3vw;color:#e15616;padding:0.5vw 1.25vw}
+.price .pricebox{background:#e15616;width:42.5vw;height:10.5vw;line-height:5vw;display:block;font-size:3vw}
+.productItem .price em{font-weight:bold}
 .noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
 /* 登录弹框 */
 .loginAlert{padding-top:1vw;text-align:center;}
@@ -171,26 +174,13 @@
 .priceTag .ladder .t{color:#627386}
 .priceTag .ladder .p{color:#f94b4b}
 .priceTag .close{display:block;width:46vw;height:10vw;line-height:10vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:1px solid #e15616;margin:6vw auto 0}
-
 .priceTag .promotion>div{display:block;box-sizing:border-box;width:82vw;padding:3.3vw;background:#FFF;border-radius:1.6vw;position:relative;top:50%;margin:-60vw auto 0 auto;line-height:8vw;font-size:3.7vw}
 .priceTag .promotion p{text-align:left}
 .priceTag .promotion p>em{color:#E15616;font-style:normal}
 .priceTag .promotion .p{display:block;height:12vw;padding:1vw 0 1vw 12vw;position:relative;line-height:5vw}
-.priceTag .promotion .p img{width:10vw;position:absolute;left:0;top:1vw}
+.priceTag .promotion .p img{width:10vw;height:10vw;position:absolute;left:0;top:1vw}
 .priceTag .promotion .p span{display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
 .priceTag .promotion .more{color:#f55c5c;text-decoration:underline;float:right;}
 
-
-
-
-
-
-.login-btn{width:14vw;height:5vw;background:#FBEDE6;text-align:center;line-height:5vw;font-size:3vw;color:#e15616;padding:0.5vw 1.25vw}
-.activity{text-align:center;display:inline-block;height:6vw;border:0.25vw solid rgba(225,86,22,0.30196078431372547);opacity:1;border-radius:.2vw;font-size:3vw;font-family:Microsoft YaHei;font-weight:400;line-height:6vw;color:rgba(225,86,22,1) !important;position:relative;z-index:1;cursor:pointer;background:#fff;padding:0px 5vw 0 1.25vw}
-.activity .icon{width:3.7vw;height:3.7vw;position:absolute;top:2.5vw;background:transparent url(/img/base/tubiao@2x.png) no-repeat no-repeat scroll right 1.25vw center;background-position:-168px -48px;right:0}
-.activity .activeicon{background-position:-207px -46px;top:8px}
-.activityBox{border:.25vw solid rgba(225,86,22,0.30196078431372547);border-radius:0px 2px 2px 2px;position:absolute;background:#fff;left:0;font-size:3vw;text-align:center;top:7vw;padding:2vw;max-height:31.9vw;overflow:auto}
-.activeBtn{width:57px;height:24px;background:#E15616;color:#fff;border-radius:2px;float:right;margin-top:10px;cursor:pointer}
 .btnBox a{color:#fff;font-size:3vw;text-align:center}
-.pricebox{background:#e15616;width:42.5vw;height:10.5vw;line-height:5vw;display:block;font-size:3vw}
-.productItem .price em{font-weight:bold}
+

src/main/resources/static/css/base/base.pc.css

@@ -228,6 +228,11 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .productItem .btn{display:block;width:158px;margin:12px auto;height:42px;line-height:42px;text-align:center;overflow:hidden;color:#F94B4B;background:#FFE6DC;border:1px solid #E15616;border-radius:2px}
 .productItem .btn.add{color:#E15616;}
 .productItem .btn:hover{background:#E15616;color:#FFF}
+.price .login-btn{float:right;margin:10px 10px 0 0;padding:2px 5px;border:1px solid rgba(225,86,22,0.16862745098039217);color:#E15616;border-radius:2px;height:24px;line-height:24px}
+.price .pricebox{background:#e15616;width:244px;height:44px;line-height:44px;display:block;text-align:center;margin:12px auto}
+.priceicon{font-weight:bold}
+
+
 /*分页*/
 .pageWrap{width:1184px;text-align:center;margin:20px auto 36px}
 .pageWrap a{box-sizing:border-box;display:inline-block;width:40px;height:40px;line-height:40px;border:1px solid #EBECEF;font-size:16px;margin:0 5px;color:#2D3036;background:#fff;border-radius:2px}
@@ -265,17 +270,17 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .priceTag .tag:before{width:24px;height:24px;background-position:-88px 3px;position:absolute;right:0;top:0}
 .priceTag .tag.on:before{background-position:-117px 3px}
 .priceTag .ladder,.priceTag .promotion{position:absolute;background:#fff;box-shadow:0 3px 6px 0 #d7dfec;border-radius:2px;line-height:42px;left:0;top:28px;z-index:9;transition:all .8s;display:none}
-.priceTag .ladder>span{padding:0 20px 20px;}
+.priceTag .ladder>span{padding:0 20px 10px;text-align:center;font-size:16px;display:block;}
 .priceTag .ladder em{white-space:nowrap}
 .priceTag .ladder i{font-style:normal;display:inline-block;width:120px;text-align:center}
 .priceTag .ladder .t{color:#627386}
 .priceTag .ladder .p{color:#f94b4b}
-.priceTag .close{background:#E15616;color:#fff;border-radius:2px;cursor:pointer;display:inline-block;padding:0 20px;height:30px;line-height:30px}
+.priceTag .close{background:#E15616;color:#fff;border-radius:2px;cursor:pointer;display:inline-block;padding:0 20px;height:30px;line-height:30px;font-style:normal;}
 .priceTag .promotion{font-size:14px;line-height:30px;padding:8px 15px;width:320px;}
 .priceTag .promotion p{text-align:left}
 .priceTag .promotion p>em{color:#E15616;font-style:normal}
 .priceTag .promotion .p{display:block;height:40px;padding:10px 0 10px 50px;position:relative;line-height:20px}
-.priceTag .promotion .p img{width:40px;position:absolute;left:0;top:10px}
+.priceTag .promotion .p img{width:40px;height:40px;position:absolute;left:0;top:10px}
 .priceTag .promotion .p span{display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}
 .priceTag .promotion p.r{text-align:right;}
 .priceTag .promotion .more{color:#f55c5c;text-decoration:underline;float:right;}

src/main/resources/static/css/product/detail.h5.css

@@ -14,10 +14,12 @@ li{list-style:none}
 .productBox .detailBox .tags span{display:inline-block;height:4.2vw;line-height:4.2vw;padding:0 1vw;font-size:2.6vw;color:#FFF;background:#86B2FF;border-radius:2px;margin-right:2.7vw}
 .productBox .detailBox .detail{box-sizing:border-box;padding:2.8vw;font-size:3.4vw;line-height:7.5vw;color:#93979F;background:#f3f7fe;border-radius:2px;position:relative;margin:3.5vw 0}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #BEC2C9;margin:2vw 0}
+.productBox .detailBox .row{position:relative;}
+.priceTag {position: absolute;left: 20vw;}
 .productBox .detailBox .row>i{font-style:normal;margin-right:2vw}
-.productBox .detailBox .row em{font-style:normal;color:#4A4F58}
-.productBox .detailBox .row em.ser{color:#93979F;display:inline-block;margin-right:4vw}
-.productBox .detailBox .row em.ser:before{content:'\2713';display:inline-block;width:3.4vw;height:3.4vw;text-align:center;line-height:3.4vw;font-size:3.4vw;background:#E15616;border-radius:1.7vw;color:#FFF;margin-right:1.4vw}
+.productBox .detailBox .row>em{font-style:normal;color:#4A4F58}
+.productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:4vw}
+.productBox .detailBox .row>em.ser:before{content:'\2713';display:inline-block;width:3.4vw;height:3.4vw;text-align:center;line-height:3.4vw;font-size:3.4vw;background:#E15616;border-radius:1.7vw;color:#FFF;margin-right:1.4vw}
 .productBox .detailBox .price{height:21vw}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
 .productBox .detailBox .price .icon:before{width:11vw;height:5vw;}

src/main/resources/static/css/product/detail.pc.css

@@ -25,13 +25,13 @@ li{list-style:none;}
 .productBox .detailBox .tags span{display:inline-block;line-height:16px;padding: 3px 6px;font-size:12px;color: #999999;border-radius:2px;margin-right:10px;border: 1px solid #EDEDED;}
 .productBox .detailBox .detail{box-sizing:border-box;padding:14px 20px;font-size:14px;color:#93979f;background:#f3f7fe;border-radius:2px;margin:10px 0;position:relative;}
 .productBox .detailBox .detail hr{border:none;border-top:1px dashed #F9DDD0;margin:12px 0}
-.productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px}
+.productBox .detailBox .row{padding:3px 0 3px 80px;line-height:24px;position:relative;}
 .productBox .detailBox .row .l{display:inline-block;min-width:60px;height:24px;text-align:justify;vertical-align:top;margin-left:-80px;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
-.productBox .detailBox .row em{font-style:normal;color:#333333;margin-left: 15px}
-.productBox .detailBox .row em.ser{color:#93979F;display:inline-block;margin-right:20px;}
-.productBox .detailBox .row em.ser:before{width:20px;height:20px;margin-right:5px;background-position:-60px 0;vertical-align:text-top;}
+.productBox .detailBox .row>em{font-style:normal;color:#333333;margin-left: 15px}
+.productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:20px;}
+.productBox .detailBox .row>em.ser:before{width:20px;height:20px;margin-right:5px;background-position:-60px 0;vertical-align:text-top;}
 .productBox .detailBox .price{height:24px}
 .productBox .detailBox .price .rmb{font-weight:bold;}
 .productBox .detailBox .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-top;}
@@ -42,6 +42,7 @@ li{list-style:none;}
 .productBox .detailBox .price .icon.i3:before{background-position:-295px -208px}
 .productBox .detailBox .price .icon.i4:before{background-position:-295px -242px}
 .productBox .detailBox .price .icon.i5:before{background-position:-295px -276px}
+.productBox .detailBox .priceTag {position:absolute;top:0;left:88px;}
 .productBox .detailBox .number{display:inline-block;width:96px;line-height:24px;height:24px;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top;}
 .productBox .detailBox .number>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;line-height:20px;vertical-align:top;cursor:pointer;margin: 0}
 .productBox .detailBox .number input{width:48px;border:none;line-height:22px;font-size:14px;vertical-align:top;text-align:center;color:#E15616;}

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/product/detail.js

@@ -23,8 +23,7 @@ var productDetail = new Vue({
         buyRetailPrice:0,
         allTotalPrice:0,
         typedata:0,
-        promotionsId:0,//活动商品id
-        giftData:[],//赠品
+        promotionsId:0,//活动id
         isQuantity:false,
         isStock:false,
         cartAlert:false
@@ -65,11 +64,11 @@ var productDetail = new Vue({
                 }
             });
         },
-    toLogin:function() {
-    location.href ='/login.html';
-   },
+        toLogin:function() {
+            location.href ='/login.html';
+        },
         productDetail:function(){
-         var _self = this;
+            var _self = this;
             if(_self.productId ===0){return;}
             $.getJSON(spiServer + "/product/detail/price",{
                 // userId:this.userId,
@@ -93,21 +92,35 @@ var productDetail = new Vue({
                     if(_self.deailData.actStatus==1){
                     _self.promotions =  _self.deailData.promotions;
                     _self.promotionsId = _self.deailData.promotions.id;
-                     _self.promotionsProduct();
                     }
 
                 }
             });
         },
+        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();}
+        },
         changeCountAdd:function () { //数量增加按钮
-        var _this = this;
+            var _this = this;
             if(_this.buyRetailPriceStep == 2){
-					_this.number += _this.minBuyNumber
-				}else{
-					_this.number++
-				}
-				_this.allTotalPrice = _this.number * _this.deailData.price;
-				_this.calculatPerice()
+                _this.number += _this.minBuyNumber
+            }else{
+                _this.number++
+            }
+            _this.allTotalPrice = _this.number * _this.deailData.price;
+            _this.calculatPerice()
         },
         changeCountSub:function(){//popup弹窗数量减按钮
            var _this = this;
@@ -263,28 +276,9 @@ var productDetail = new Vue({
                     _self.parameters = r.data;
                 }
             });
-        },
+        }
+
 
-        promotionsProduct:function () {//赠品接口
-            var _self = this;
-            if(_self.promotionsId ===0){return;}
-            $.getJSON(spiServer + "/product/promotions/gifts",{
-                promotionsId: _self.promotionsId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    console.log(r)
-                    _self.giftData = r.data;
-                }
-            });
-        },
-         activity:function () {
-           var _this = this;
-           _this.isShow = !_this.isShow;
-        },
-    activeBtn:function () {
-           var _this = this;
-            _this.isShow = false;
-        },
     },
     created: function () {
         this.productId = $("#productId").val();

src/main/resources/static/js/shopping/cart.js

@@ -170,7 +170,14 @@ var shoppingCart = new Vue({
                 alert("test")
             })
         },
-
+        submitCart: function(){
+            if (this.submitIds.length>0){
+                var productIds = this.submitIds.join(",");
+                window.localStorage.setItem("shoppingProductIds", productIds);
+                // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
+                window.location.href = '/shopping/confirm.html?type=1';
+            }
+        }
     },
     created: function () {
         if(globalUserData){

src/main/resources/static/js/shopping/confirm.js

@@ -0,0 +1,76 @@
+var shoppingCart = new Vue({
+    el: "#shoppingCart",
+    data: {
+        userId: 0,
+        userIdentity: '',
+        userToken: '',
+        type: '',
+        listData: [],
+        kindCount: 0,
+        totalCount: 0,
+        totalPrice: 0
+    },
+    computed: {
+
+    },
+    methods: {
+        getConfirmList: function (productIds, productCount) {
+            var _self = this;
+            if(this.userId ===0){return;}
+            tokenAjax("get", "/order/confirm", {
+                userId: _self.userId,
+                count: productCount,
+                productIds: productIds
+            } ,function (r) {
+                if (r.code === 0 && r.data) {
+                    _self.listData = r.data.list;
+                }
+            });
+        },
+        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();}
+        },
+        submitOrder: function(){
+
+        }
+    },
+    created: function () {
+        this.type = getUrlParam("type") ? getUrlParam("type")*1 : "";
+        if(globalUserData){
+            this.userId = globalUserData.userId;
+            this.userIdentity = globalUserData.identity;
+            this.userToken = globalUserData.token;
+            // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
+            if(this.type === 1) {
+                var productIds = window.localStorage.getItem("shoppingProductIds");
+                // 获取列表数据
+                this.getConfirmList(productIds, null);
+            }
+        }
+    },
+    mounted: function () {
+        var _self = this;
+        var minAwayBtm = $("footer").height();
+        //处理滚动条控制底部提交fixed
+        $(window).scroll(function() {
+            var awayBtm = $(document).height() - $(window).scrollTop() - $(window).height();
+            if(minAwayBtm <= awayBtm){
+                $(".summaryWrap").addClass('fixed');
+            }else{
+                $(".summaryWrap").removeClass("fixed");
+            }
+        });
+    }
+});

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/product/detail.html

@@ -49,7 +49,7 @@
                     <span th:each="tag: *{tagList}" th:text="${tag}"></span>
                 </p>
                 <div class="detail">
-                    <p class="row"><span class="l">采美价</span><i>：</i>
+                    <div class="row"><span class="l">采美价</span><i>：</i>
                     <template v-if="userId && userId>0">
                        <em v-if="priceFlag==1" class="pricedeail">￥价格未公开</em>
                        <template v-else>
@@ -65,173 +65,90 @@
                             <i th:class="'icon mIcon i'+*{priceGrade}"></i>
                         </em>
                     </template>
-                    </p>
+                    </div>
                     <template  v-if="priceFlag!=2  && userIdentity!=2 ">
-                        <p class="row"> <span class="l">市场价</span><i>：</i>
+                        <div class="row"> <span class="l">市场价</span><i>：</i>
                              <em class="pricedeail" :class="deailData.actStatus==1?'original-price':''">￥{{buyRetailPrice}}</em>
-                        </p>
+                        </div>
                     </template>
-                    <p class="row" style="position:relative;" v-if="deailData.actStatus==1||deailData.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
-                      <span class="activity" @click="activity" :class="isShow?'activitystyle':''" v-if="deailData.ladderPriceFlag==1">阶梯价格<i class="icon shaky" :class="isShow?'activeicon':''"></i> </span>
-                      <span class="activity" @click="activity" :class="isShow?'activitystyle':''" v-if="deailData.actStatus==1">{{promotions.name}}：{{promotions.touchPrice.toFixed(2)}}<i class="icon shaky" :class="isShow?'activeicon':''"></i> </span>
-
-
-                    <template v-if="userId && userId>0">
-                        <!-- 已登录 会员可见   -->
-                        <template v-if="priceFlag==2 && userIdentity !=2">
-                            <div class="activityBox" v-show="isShow">
-                              <p>
-                                <a style="color: #E15616" href="javascript:0" @click="clubupgrade" class="loginWithParam">升级会员</a>，参与{{promotions.name}}促销活动
-                              </p>
-                              <button class="activeBtn" @click="activeBtn">了解</button>
-                         </div>
+                    <div class="row" v-if="deailData.actStatus==1||deailData.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
+                        <template v-if="userId && userId>0">
+                            <!-- 阶梯价 -->
+                            <div v-if="deailData.ladderPriceFlag==1" class="priceTag">
+                                <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
+                                <div class="ladder mFixed">
+                                    <span>
+                                        <em class="t"><i>价格</i><i>起订量</i></em>
+                                        <em v-for="l in ladderList">
+                                            <i class="p">¥{{toFloat(l.buyPrice)}}</i>
+                                            <i>{{l.numRange}}</i>
+                                        </em>
+                                        <em @click="hideThisLadder($event)" class="close">了解</em>
+                                    </span>
+                                </div>
+                            </div>
+                            <!-- 促销活动 -->
+                            <div v-if="deailData.actStatus==1 && promotions" class="priceTag">
+                                <i v-if="promotions.type==1 && promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="promotions.name+'：¥'+toFloat(promotions.touchPrice)"></i>
+                                <i v-else 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.type==1 && promotions.mode==1">{{promotions.name+'：¥'+toFloat(promotions.touchPrice)}}</em>
+                                            <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 v-if="promotions.status==1">不限时</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>
+                            </div>
                         </template>
+                        <!-- 登录 -->
                         <template v-else>
-                        <div class="activityBox" v-show="isShow" v-if="promotions.type==3&&promotions.mode==2">
-                            <!--  店铺满减-->
-                               <p class="Boxtext">
-                                  <a style="color: #E15616" href="javascript:0" class="loginWithParam">全店铺满减：满1000.00，减500.00</a>
-                                    </br>促销时间：不限时
-                                </p>
-                                <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                         </div>
-                         <div class="activityBox" v-show="isShow"  v-if="promotions.type==1&&promotions.mode==3">
-                               <!-- 店铺满赠 -->
-                                <p class="Boxtext">
-                                    <a style="color: #E15616" href="javascript:0" class="loginWithParam">全店铺，满1000.00，赠送商品：</a>
-                                    </br>促销时间：{{promotions.beginTime}}~{{promotions.endTime}}
-                                </p>
-                                   <div class="activepro" v-for="promotions in giftData">
-                                      <a :href="'/product-'+promotions.productId+'.html'" target="_blank">
-                                           <div class="activeimg">
-                                               <img :src="promotions.image">
-                                           </div>
-                                           <div class="activeright">
-                                               <p>{{promotions.name}}</p>
-                                               <p>x1</p>
-                                           </div>
-                                       </a>
-                                   </div>
-                              <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                        </div>
-                         <div class="activityBox" v-show="isShow"  v-if="promotions.type==1&&promotions.mode==1">
-                           <!--单品优惠 -->
-                               <p class="Boxtext">
-                                  <a style="color: #E15616" href="javascript:0" class="loginWithParam">促销时间:{{promotions.beginTime}}~{{promotions.endTime}}</a>
-                               </p>
-                               <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                         </div>
-                          <div class="activityBox" v-show="isShow" v-if="promotions.type==1&&promotions.mode==2">
-                           <!--单品满减 -->
-                               <p class="Boxtext">
-                                  <a style="color: #E15616" href="javascript:0" class="loginWithParam">购买此商品，满1000.00，减500.00</a>
-                                </br>促销时间：不限时
-                               </p>
-                               <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                         </div>
-                          <div class="activityBox" v-show="isShow"  v-if="promotions.type==1&&promotions.mode==3">
-                               <!-- 单品满赠 -->
-                                <p class="Boxtext">
-                                    <a style="color: #E15616" href="javascript:0" class="loginWithParam">购买此商品，满1000.00，赠送商品：</a>
-                                    </br>促销时间：{{promotions.beginTime}}~{{promotions.endTime}}
-                                </p>
-                                   <div class="activepro" v-for="promotions in giftData">
-                                      <a :href="'/product/detail.shtml?id='+promotions.productId" target="_blank">
-                                           <div class="activeimg">
-                                               <img :src="promotions.image">
-                                           </div>
-                                           <div class="activeright">
-                                               <p>{{promotions.name}}</p>
-                                               <p>x1</p>
-                                           </div>
-                                       </a>
-                                   </div>
-                              <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                        </div>
-                        <!--阶梯价-->
-                        <div class="item-tips activityBox" v-show="isShow"  v-if="deailData.ladderPriceFlag==1">
-                           <div class="tips-content">
-                                 <div class="tip-tr">
-                                    <div class="tip-td">起订量</div>
-                                    <div class="tip-td">价格</div>
-                                 </div>
-                           <div class="tip-ul">
-                                 <ul class="tip-ul">
-                                    <li class="tip-tr ladderPriceList"  v-for="(item,index) in ladderList">
-                                        <div class="tip-td buyNumRangeShow">{{item.numRange}}</div>
-                                        <div class="tip-td buyPrice">￥{{item.buyPrice}}</div>
-                                    </li>
-                                 </ul>
-                           </div>
-                         </div>
-                          <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                       </div>
-                       <div class="activityBox" v-show="isShow"  v-if="promotions.type==2&&promotions.mode==2">
-                               <!-- 凑单满减 -->
-                                <p class="Boxtext">
-                                    <a style="color: #E15616" href="javascript:0" class="loginWithParam">购买下列商品，满1000.00，减500.00</a>
-                                    </br>促销时间：{{promotions.beginTime}}~{{promotions.endTime}}
-                                </p>
-                              <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                        </div>
-                        <div class="activityBox" v-show="isShow"  v-if="promotions.type==2&&promotions.mode==3">
-                               <!-- 凑单满赠 -->
-                                <p class="Boxtext">
-                                    <a style="color: #E15616" href="javascript:0" class="loginWithParam">购买此商品，满1000.00</a>
-                                    </br>促销时间：{{promotions.beginTime}}~{{promotions.endTime}}
-                                </p>
-                                 <p  href="javascript:0" class="loginWithParam">赠送商品：</p>
-                                   <div class="activepro" v-for="promotions in giftData">
-                                      <a :href="'/product-'+promotions.productId+'.html'" target="_blank">
-                                           <div class="activeimg">
-                                               <img :src="promotions.image">
-                                           </div>
-                                           <div class="activeright">
-                                               <p>{{promotions.name}}</p>
-                                               <p>x1</p>
-                                           </div>
-                                       </a>
-                                   </div>
-                              <button class="activeBtn" @click="activeBtn" v-show="isShow">了解</button>
-                        </div>
-
-                       </template>
-                    </template>
-                    <template v-else>
-                        <!--   未登录      -->
-                        <div class="activityBox" v-show="isShow" v-if="deailData.ladderPriceFlag==1">
-                              <p>
-                                <a style="color: #E15616" href="javascript:0" @click="toLogin">登录</a>，享受阶梯价格优惠
-                              </p>
-                              <button class="activeBtn" @click="activeBtn">了解</button>
-                         </div>
-                        <div class="activityBox" v-show="isShow" v-else>
-                              <p>
-                                <a style="color: #E15616" href="javascript:0" @click="toLogin">登录</a>，参与{{promotions.name}}促销活动
-                              </p>
-                              <button class="activeBtn" @click="activeBtn">了解</button>
-                         </div>
-                    </template>
-                    </p>
-                    <p class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></p>
-                    <p class="row"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></p>
-                    <p class="row"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></p>
-                    <p class="row"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></p>
-                    <p class="row"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></p>
-                    <p class="row" v-if="priceFlag== 0 && userIdentity !=2"><span class="l" >采购量</span><i>：</i>
+                            <div v-if="deailData.ladderPriceFlag==1 || deailData.actStatus==1" class="priceTag">
+                                <i v-if="deailData.ladderPriceFlag==1" class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
+                                <i v-if="deailData.actStatus==1" class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                                <div class="promotion mFixed">
+                                    <div>
+                                        <p v-if="deailData.ladderPriceFlag==1"><em @click="toLogin">登录</em>，享受阶梯价格优惠</p>
+                                        <p v-if="deailData.actStatus==1"><em @click="toLogin">登录</em>，参与促销活动</p>
+                                        <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                    </div>
+                                </div>
+                            </div>
+                        </template>
+                    </div>
+                    <div class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
+                    <div class="row"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
+                    <div class="row"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
+                    <div class="row"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
+                    <div class="row"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
+                    <div class="row" v-if="priceFlag== 0 && userIdentity !=2"><span class="l" >采购量</span><i>：</i>
                         <span class="number">
                             <em class="sub" @click="changeCountSub" :class="[isQuantity==true?'disabled':'']">-</em>
                             <input type="number" v-model="number" maxlength='6' @blur="changeNumber($event)" >
                             <em class="add" @click="changeCountAdd" :class="[isStock==true?'disabled':'']">+</em>
                         </span>
                         <input type="hidden" th:value="*{step}">
-                    </p>
+                    </div>
                     <hr>
-                    <p class="row"><span class="l">服务</span><i>：</i>
+                    <div class="row"><span class="l">服务</span><i>：</i>
                         <em class="ser icon mIcon">无忧退货</em>
                         <em class="ser icon mIcon">快速退款</em>
                         <em class="ser icon mIcon">正品保证</em>
-                    </p>
+                    </div>
                 </div>
                <template v-if="userId && userId>0">
                <div  class="btnBox" v-if="priceFlag==2 && userIdentity!=2">

src/main/resources/templates/shopping/cart.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-购物车列表</title>
+    <title>采美365网-我的购物车</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/shopping/cart.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
@@ -77,12 +77,12 @@
                             </template>
                             <!-- 促销活动 -->
                             <div v-if="cart.actStatus==1 && cart.promotions" class="priceTag">
-                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+'：¥'+toFloat(cart.price)"></i>
+                                <i v-if="cart.promotions.type==1 && cart.promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="cart.promotions.name+'：¥'+toFloat(cart.promotions.touchPrice)"></i>
                                 <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="cart.promotions?cart.promotions.name:''"></i>
                                 <div class="promotion mFixed">
                                     <div>
                                         <p class="t">
-                                            <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+'：¥'+toFloat(cart.price)}}</em>
+                                            <em v-if="cart.promotions.type==1 && cart.promotions.mode==1">{{cart.promotions.name+'：¥'+toFloat(cart.promotions.touchPrice)}}</em>
                                             <em v-if="cart.promotions.mode==2">{{cart.promotions.name+'，满 ¥'+toFloat(cart.promotions.touchPrice)+' 减 ¥'+toFloat(cart.promotions.reducedPrice)}}</em>
                                             <em v-if="cart.promotions.mode==3">{{cart.promotions.name+'，满 ¥'+toFloat(cart.promotions.touchPrice)+' 赠送商品'}}</em>
                                         </p>
@@ -91,11 +91,11 @@
                                         <template v-if="cart.promotions.mode==3">
                                             <p>赠品：</p>
                                             <p>
-                                                <a v-for="g in cart.promotions.giftList" class="p" href="JavaScript:void(0);">
+                                                <span v-for="g in cart.promotions.giftList" class="p">
                                                     <img :src="g.image">
                                                     <span v-text="g.name"></span>
                                                     <span v-text="'× '+g.number"></span>
-                                                </a>
+                                                </span>
                                             </p>
                                         </template>
                                         <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
@@ -173,7 +173,7 @@
             </div>
             <div class="right mfbt">
                 <div class="item">总价：<em v-text="'¥'+toFloat(totalPrice)"></em></div>
-                <a class="submit" href="javascript:void(0);">去结算</a>
+                <a class="submit" href="javascript:void(0);" @click="submitCart()">去结算</a>
             </div>
         </div>
     </div>

src/main/resources/templates/shopping/confirm.html

@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美365网-核对订单信息</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/shopping/cart.css(v=${version})}" rel="stylesheet" type="text/css">
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 购物车列表 -->
+<div id="shoppingConfirm">
+    <!--列表-->
+    <div v-else class="wrap">
+        <div class="pageTitle">
+            <div class="step">
+                <span>我的购物车</span>
+                 <label class="line"></label>
+                <span class="on">核对订单信息</span>
+                 <label class="line"></label>
+                <span>成功提交订单</span>
+            </div>
+            <h1>核对订单信息</h1>
+        </div>
+    </div>
+
+    <div class="summaryWrap">
+        <div class="summary">
+            <div class="left mfbt">
+                <div class="item">
+                    <input class="check" type="checkbox" @change="ckeckAll()" v-model="allChecked">
+                    <span>全选</span>
+                    <a class="delete" href="javascript:void(0);">删除</a>
+                </div>
+                <div class="item">商品种类：<em v-text="kindCount"></em></div>
+                <div class="item">商品数量：<em v-text="totalCount"></em></div>
+            </div>
+            <div class="right mfbt">
+                <div class="item">总价：<em v-text="'¥'+toFloat(totalPrice)"></em></div>
+                <a class="submit" href="javascript:void(0);" @click="submitOrder()">去结算</a>
+            </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/shopping/confirm.js(v=${version})}"></script>
+</body>
+</html>

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>