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

src/main/java/com/caimei/www/controller/authorized/supplier/SupplierPageController.java

@@ -18,6 +18,12 @@ public class SupplierPageController extends BaseController {
 	private static final String ORDER_LIST = "supplier-center/order/list";
     /** 订单详情 */
 	private static final String ORDER_DETAIL = "supplier-center/order/detail";
+    /** 物流 */
+	private static final String LOGISTICS = "supplier-center/order/logistics";
+    /** 发货 */
+	private static final String DELIVERY = "supplier-center/order/delivery";
+    /** 发货记录 */
+	private static final String DELIVERY_RECORD = "supplier-center/order/delivery-record";
     /** 结算管理 */
 	private static final String SETTLEMENT_LIST = "supplier-center/order/settlement";
     /** 员工管理 */
@@ -66,6 +72,24 @@ public class SupplierPageController extends BaseController {
         return SETTLEMENT_LIST;
     }
 
+    /** 结算管理 */
+    @GetMapping("/supplier/order/logistics.html")
+    public String logistics() {
+        return LOGISTICS;
+    }
+
+    /** 结算管理 */
+    @GetMapping("/supplier/order/delivery.html")
+    public String delivery() {
+        return DELIVERY;
+    }
+
+    /** 结算管理 */
+    @GetMapping("/supplier/order/delivery_record.html")
+    public String deliveryRecord() {
+        return DELIVERY_RECORD;
+    }
+
     /** 员工管理 */
     @GetMapping("/supplier/operation/list.html")
     public String operationList() {
@@ -113,11 +137,13 @@ public class SupplierPageController extends BaseController {
     public String goodsList() {
         return GOODS_LIST;
     }
+
     /** 商品预览 */
     @GetMapping("/supplier/goods/preview.html")
     public String goodsPreview() {
         return GOODS_PREVIEW;
     }
+
     /** 消息列表 */
     @GetMapping("/supplier/message/list.html")
     public String settingMessage() {return MESSAGE;}

src/main/java/com/caimei/www/controller/unlimited/FleaMarketController.java

@@ -1,8 +1,11 @@
 package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
+import com.caimei.www.pojo.page.ProductDetail;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 /**
  * Description
@@ -45,8 +48,9 @@ public class FleaMarketController extends BaseController {
     /**
      * 二手商品详情
      */
-    @GetMapping("/flea-market/detail.html")
-    public String fleaMarketDetail() {
+    @GetMapping("/flea-market-{id}.html")
+    public String fleaMarketDetail(final Model model, @PathVariable("id") Integer productId) {
+        model.addAttribute("productId", productId);
         return FLEA_MARKET_DETAIL;
     }
 

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

@@ -126,7 +126,7 @@
 .productItem .item .name em{font-style: normal;color: #e15616;}
 .productItem .item .price{height:21vw;text-align:center}
 .productItem .item .price em{display:block;height:7vw;line-height:7vw;color:#4A4F58;font-style:normal;}
-/*.productItem .item .price em.p{color:#F55C5C}*/
+.productItem .item .price em.p{color:#F55C5C}
 .productItem .item .price .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom;}
 .productItem .item .price .icon:before{width:11vw;height:5vw;}
 .productItem .item .price .icon.i0:before{background-position:0 -23.2vw}
@@ -138,10 +138,14 @@
 .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}
+.productItem .item .btn.cat{font-size:3.1vw;line-height:4vw;white-space:pre-wrap;padding:1vw;width:80%;height:auto}
 .noMore{height:10vw;line-height:10vw;text-align:center;color:#ccc}
+/* 加入购物车 */
+.cartAlert h6{font-size:4.6vw;font-weight:bold;margin:2vw 0;}
+.cartAlert p{font-size:3.7vw;}
+.cartAlert p em{font-style:normal;color:#e15616;}
+.btn-to-cart{background:#e15616!important;color:#FFF!important;}
+.btn-to-goon{background:#5bb641!important;color:#FFF!important;}
 /* 登录弹框 */
 .loginAlert{padding-top:1vw;text-align:center;}
 .loginAlert span{display:block}
@@ -164,7 +168,9 @@
 #scrollTop .phoneHover a{color:#E15616}
 #scrollTop .phoneHover a>i{display:inline-block;height:7.2vw;line-height:7.2vw;padding:0 2vw;background:#F55C5C;border-radius:3.6vw;margin-left:4vw;font-size:3.4vw}
 /* 活动标签，阶梯价格 */
-.priceTag .tag{position:absolute;left:0;height:6.4vw;line-height:6.4vw;font-size:3vw;padding:0 6vw 0 3vw;background-color:#ffe6dc;color:#E15616;border-radius:2px;font-style:normal;white-space:nowrap;top:-6.8vw}
+.priceTag .tag,.listTag{height:6.4vw;line-height:6.4vw;font-size:3vw;padding:0 6vw 0 3vw;background-color:#ffe6dc;color:#E15616;border-radius:2px;font-style:normal;white-space:nowrap;}
+.priceTag .tag{position:absolute;left:0;top:-6.8vw}
+.listTag{padding:0 3vw;}
 .priceTag .tag:before{width:4vw;height:4vw;background-position:-51.6vw -.9vw;position:absolute;right:1.5vw;top:1.2vw}
 .priceTag .tag.on:before{background-position:-43vw -.9vw}
 .priceTag .ladder,.priceTag .promotion{display:none;background-color:rgba(74,79,88,.7);z-index:998}
@@ -181,6 +187,6 @@
 .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;}
+/*.btnBox a{color:#fff;font-size:3vw;text-align:center}*/
 
-.btnBox a{color:#fff;font-size:3vw;text-align:center}
 

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

@@ -26,13 +26,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .icon.shop .tips{position:absolute;top:-30px;left:0;white-space:nowrap;background-color:#666;border-radius:2px;line-height:30px;font-size:12px;color:#FFF;text-align:center;display:inline-block;opacity:0;transition:all 1s;padding:0 10px;font-style:normal}
 .icon.shop .tips:before{content:"";width:10px;height:10px;background:#666;position:absolute;bottom:-3px;left:17px;transform:rotate(45deg)}
 .icon.shop:hover .tips{opacity:1}
-.icon.comment:before {
-    width: 25px;
-    height: 25px;
-    background-position: -5px -333px;
-    position: absolute;
-    top: 35px
-}
+.icon.comment:before{width:25px;height:25px;background-position:-5px -333px;position:absolute;top:35px}
 /*短信图形验证弹窗统一样式*/
 .content-model{width: 100%;height: 100%;background: rgba(0,0,0,.3);position: fixed;top: 0;left: 0;display: none;}
 .content-model.active{display: block;}
@@ -53,7 +47,6 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .content-model .model-content .model-button{width: 100%;height: 32px;float: left;margin-top: 32px;}
 .content-model .model-content .model-button .button{width: 120px;height: 32px;border-radius: 2px;background-color: #e15616;text-align: center;line-height: 32px;font-size: 14px;float: right;color: #FFFFFF;cursor: pointer;}
 
-
 /* 头部 */
 .baseHeadTop{width:100%;font-size:14px;background:#FBFBFB}
 .baseHeadTop ul{height:40px;line-height:40px}
@@ -205,14 +198,13 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .productItem .image .icon.hot:before,.productItem .image .icon.new:before{display:block;width:50px;height:64px}
 .productItem .image .icon.hot:before{background-position:-57px -180px}
 .productItem .image .icon.new:before{background-position:0px -180px}
-.productItem .name{display:block;padding:14px 35px;height:48px;line-height:24px}
+.productItem .name{display:block;padding:15px;height:48px;line-height:24px}
 .productItem .name span{color:#93979F;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
 .productItem .name em{font-style: normal;color: #e15616;}
 .productItem .price{height:48px;border-top: 1px solid #E15616}
 .productItem .price em{height:48px;line-height:48px;color:#4A4F58;font-style:normal;margin-left:15px;font-weight:bold;font-size:14px}
 .productItem .price em.p{color:#333333}
-.productItem .price .rmb{font-weight:bold;}
-.productItem .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;vertical-align:text-bottom;}
+.productItem .price .icon{display:inline-block;font-size:0;height:24px;line-height:24px;margin-left:4px;vertical-align:text-bottom;}
 .productItem .price .icon:before{width:80px;height:24px;}
 .productItem .price .icon.i0:before{background-position:-295px -140px}
 .productItem .price .icon.i1:before{background-position:-295px -140px}
@@ -220,19 +212,20 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .productItem .price .icon.i3:before{background-position:-295px -208px}
 .productItem .price .icon.i4:before{background-position:-295px -242px}
 .productItem .price .icon.i5:before{background-position:-295px -276px}
-.productItem .btnBox{display:none;position:absolute;width:284px;height:68px;background:#fef6f3;text-align:center;bottom:0;left:0}
-.btnBox a {color: #fff;font-size:12px;text-align:center;}
+.productItem .btnBox{display:none;position:absolute;width:284px;height:68px;z-index:1;background:#fef6f3;text-align:center;bottom:0;left:0}
 .productItem .item:hover .btnBox{display:block}
-.productItem .item:hover .name span{color: #e15616;}
+.productItem .item:hover .name span{color:#e15616;}
 .productItem .item:hover{box-shadow:0px 2px 6px #dedede;-moz-transition: all 0.5s;-webkit-transition:all 0.5s;transition:all 0.3s;-webkit-transform:translate3d(0,-2px,0);transform:translate3d(0,-2px,0);}
-.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{display:block;width:158px;margin:12px auto;height:42px;line-height:42px;font-size:16px;text-align:center;overflow:hidden;color:#F94B4B;background:#FFE6DC;border:1px solid #E15616;border-radius:2px}
 .productItem .btn.add{color:#E15616;}
+.productItem .btn.cat{font-size:12px;width:80%;background:#E15616;color:#FFF}
 .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}
-
-
+/* 加入购物车 */
+.cartAlert h6{font-size:16px;font-weight:bold;margin:10px 0;}
+.cartAlert p{font-size:14px;}
+.cartAlert p em{font-style:normal;color:#e15616;}
+.btn-to-cart{background:#e15616!important;color:#FFF!important;}
+.btn-to-goon{background:#5bb641!important;color:#FFF!important;}
 /*分页*/
 .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}
@@ -249,7 +242,7 @@ header{box-shadow: 0 2px 10px #ebecef;}
 /* 登录弹框 */
 .loginAlert{padding-top:5px;}
 .loginAlert span:first-child:after{content: '，';}
-/*.loginAlert:after{content:'';display:block;width:125px;height:125px;background:url(/img/account/to_login.png) no-repeat left top;background-size:100% 100%;margin:10px 0 0 15px;}*/
+.loginAlert:after{content:'';display:block;width:125px;height:125px;background:url(/img/account/to_login.png) no-repeat left top;background-size:100% 100%;margin:10px 0 0 15px;}
 /* 咨询，回到顶部 */
 #scrollTop{display:none;position:fixed;right:50%;margin-right:-700px;width:88px;z-index:9999;bottom:120px;}
 #scrollTop .item{width:100%;background-color:#fff;box-sizing:border-box;text-align:center;box-shadow:0 2px 4px rgb(254,246,243);border-radius:2px;margin-bottom:10px;font-size:12px;position:relative}
@@ -266,7 +259,8 @@ header{box-shadow: 0 2px 10px #ebecef;}
 #scrollTop .item:hover .phoneHover{display:block}
 /* 活动标签，阶梯价格 */
 .priceTag{position:relative}
-.priceTag .tag{display:inline-block;height:24px;line-height:24px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer;background:#fff;padding:0 24px 0 10px;position:relative;font-style:normal}
+.priceTag .tag,.listTag{display:inline-block;height:24px;line-height:24px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#E15616;cursor:pointer;background:#fff;padding:0 24px 0 10px;position:relative;font-style:normal}
+.listTag{float:right;padding:0 12px;margin:12px 15px 0 0;}
 .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}
@@ -284,17 +278,5 @@ header{box-shadow: 0 2px 10px #ebecef;}
 .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;}
-
-
-.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}
-.pricebox{background:#e15616;width:244px;height:44px;line-height:44px;display:block;text-align:center;margin:12px auto}
-.activity{text-align:center;display:inline-block;height:24px;border:1px solid rgba(225,86,22,0.30196078431372547);opacity:1;border-radius:2px;font-size:12px;font-family:Microsoft YaHei;font-weight:400;line-height:24px;color:rgba(225,86,22,1) !important;position:relative;z-index:1;cursor:pointer;background:#fff;padding:0px 20px 0 5px;margin-left:15px}
-.activitystyle{border-bottom:1px solid #fff !important}
-.activity .icon.shaky:before{width:20px;height:20px;position:absolute;top:-5px;right:0;background-position:-90px 6px}
-.activity .activeicon{background-position:-207px -46px;top:8px}
-.activityBox{border:1px solid rgba(225,86,22,0.30196078431372547);border-radius:0px 2px 2px 2px;position:absolute;background:#fff;left:0;font-size:12px;text-align:center;top:28px;line-height:40px;padding:10px;max-height:319px;overflow:auto}
-.activeBtn{width:57px;height:24px;background:#E15616;color:#fff;border-radius:2px;float:right;margin-top:10px;cursor:pointer}
-.priceicon{font-weight:bold}
-
 /*  加载  */
 .loading {box-sizing: border-box;padding: 200px 0;text-align: center;}

src/main/resources/static/css/flea-market/list.css

@@ -89,13 +89,13 @@
     }
 
     .itemImg {
+        display: block;
         position: relative;
         width: 100%;
         height: 284px;
         margin-right: 20px;
         background-color: #fff;
         cursor: pointer;
-        background: #000
     }
 
     .itemImg .bigImg {

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

@@ -84,6 +84,7 @@ li{list-style:none;}
 #sideNav .item>a:first-child:before{display:none}
 #sideNav .item>a.on{background:#FEF6F3;color:#E15616}
 
+/*
 .btnBox{
     background:#E15616;
     height: 55px;
@@ -97,3 +98,4 @@ li{list-style:none;}
     font-size: 12px;
     text-align: center
 }
+*/

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

@@ -44,7 +44,7 @@ li{list-style:none;}
 .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>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;font-style:normal;line-height:20px;vertical-align:top;cursor:pointer}
 .productBox .detailBox .number input{width:48px;border:none;line-height:22px;font-size:14px;vertical-align:top;text-align:center;color:#E15616;}
 .productBox .detailBox .detail .btn{position:absolute;right:20px;top:20px;height:32px;line-height:32px;padding:0 16px;background:#F94B4B;font-size:14px;color:#FFF;border-radius:2px}
 .productBox .detailBox .detail .row .btn{top:6px;right:0}
@@ -60,12 +60,13 @@ li{list-style:none;}
 .recommendBox .hd{font-size:16px;color:#4A4F58;font-weight:bold;padding:16px 32px}
 #productRecommend{padding:10px;background: #fff}
 #productRecommend li{float:left;width:167px;height:205px;overflow:hidden;}
-#productRecommend li .item{width:153px;height:205px;margin:0 auto;line-height:22px}
+#productRecommend li .item{width:153px;height:205px;margin:0 auto;line-height:22px;background:#FFF;}
 #productRecommend li .item a{display:block;width:100%;height:100%;color:#93979F}
 #productRecommend li .item a:hover{color:#E15616}
-#productRecommend li .item img{display:block;width:153px;height:153px}
-#productRecommend li .item span{max-height:44px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
-#productRecommend .swiper-wrapper{height:205px;}
+#productRecommend li .item a:hover img{border: solid 1px #e15616;}
+#productRecommend li .item img{display:block;width:153px;height:153px;border:solid 1px #e2e7ef;}
+#productRecommend li .item span{max-height:44px;padding-top:4px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;}
+#productRecommend .swiper-wrapper{height:205px;overflow:hidden;background:url(/img/base/placeholder.png) repeat-x center;background-size:166px;}
 #productRecommend .swiper-pagination{width:100%;height:14px;z-index:1;text-align:center;font-size:0;}
 #productRecommend .swiper-pagination span{display:inline-block;width:14px;height:4px;border:5px solid transparent;cursor:pointer;opacity:.2;}
 #productRecommend .swiper-pagination span:before{content:"";display:inline-block;width:100%;height:4px;background:#E15616;border-radius:2px}

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

@@ -608,44 +608,47 @@
 }
 
 .product p {
- font-size: 4vw;
- font-weight: normal;
- font-stretch: normal;
- line-height: 5.6vw;
- letter-spacing: 0px;
- color: #22272e;
- padding: 2.7vw;
+     font-size: 4vw;
+     font-weight: normal;
+     font-stretch: normal;
+     line-height: 5.6vw;
+     letter-spacing: 0px;
+     color: #22272e;
+     padding: 2.7vw;
 }
 
 .product ul {
- height: 50px;
- line-height: 80px;
- background-color: #ffffff;
- box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
- padding: 15px;
+     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;
- width: 24vw;
- text-align: center;
- color: #333333;
- position: relative;
- cursor: pointer;
+     display: inline-block;
+     width: 24vw;
+     text-align: center;
+     color: #333333;
+     position: relative;
+     cursor: pointer;
 }
 
 .mIcon.confirm:before {
- width: 34px;
- height: 35px;
- background-position: -266px -371px;
- position: absolute;
- right: 53px;
+    width: 9vw;
+    height: 9vw;
+    background-position: -66.7vw -60vw;
+    right: 37px;
+    top: -2px;
+    position: absolute
 }
 
 .mIcon.other:before {
- background-position: -300px -371px;
+ background-position: -76vw -60vw;
+}
+.mIcon.down:before {
+ background-position: -84vw -60vw;
 }
-
 .rank_top p {
  font-size: 3.4vw;
  color: #22272e;

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

@@ -1,4 +1,5 @@
-.crumbs{
+@media screen and (min-width:768px) {
+  .crumbs{
     padding-left: 220px;
     font-size: 16px;
     color: #22272e
@@ -36,6 +37,7 @@
 	border-radius: 2px;
 	border: solid 1px #b8bfca;
 	padding-left: 10px;
+	cursor: pointer;
 }
 .state{
     width: 168px;
@@ -45,9 +47,11 @@
     border: solid 1px #b8bfca;
     padding-left: 10px;
     color: #627386;
+    cursor: pointer;
 }
 input::placeholder{
     color: #627386;
+    font-size: 12px;
 }
 .query-btn{
     width: 90px;
@@ -57,7 +61,9 @@ input::placeholder{
 	text-align: center;
 	line-height: 36px;
 	color: #ffffff;
-    margin: 15px 10px 0 0
+    margin: 15px 10px 0 0;
+    cursor: pointer;
+    float: right;
 }
 .supplier-main{
     margin-top: 10px;
@@ -149,3 +155,231 @@ input::placeholder{
 .userinfo .blcak{
     color: #22272e;
 }
+}
+
+/*移动*/
+@media screen and (max-width:768px) {
+    .wrap_tittle {
+    height: 10.6vw;
+    line-height: 10.6vw;
+    background: #fff;
+    padding: 0 2.7vw;
+    font-size: 3.4vw;
+    color: #22272e;
+    border-bottom: solid .27vw #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;
+    }
+.right{
+    width: 100%;
+}
+.new-s-item>form{
+    overflow: hidden;
+    background: #fff;
+    padding: 2.7vw 2.7vw 4.5vw 2.7vw;
+    box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)
+}
+.new-s-item>form>div{
+    font-size: 3.4vw;
+    color: #627386;
+    width: 93.4vw;
+    margin-bottom: 2.6vw;
+    display: inline-block
+}
+.new-s-item>form>div.order-border{
+    border: 1px solid #b8bfca;
+}
+.new-s-item>form>div.order-border span{
+     padding-left: 2.7vw;
+}
+.new-s-item>form>label{
+    float: left;
+    margin-bottom: 2.6vw;
+    font-size: 3.4vw;
+    color: #627386;
+    border: 1px solid #b8bfca;
+    height: 11.8vw;
+    padding-left: 2.7vw;
+    line-height: 11.8vw
+}
+.Buyer{
+    height: 11.8vw;
+    background-color: #ffffff;
+    border-radius: .53vw;
+    border: 0;
+    cursor: pointer;
+    width: 72vw
+}
+.state{
+    width: 93.4vw;
+    height: 11.7vw;
+    background-color: #ffffff;
+    border-radius: .53vw;
+    border: solid .27vw #b8bfca;
+    padding-left: 2.7vw;
+    color: #627386;
+    cursor: pointer;
+    margin-top: 2.6vw
+}
+/*select::-ms-expand { display: none; }*/
+/*select {*/
+/*    appearance:none;*/
+/*    -moz-appearance:none;*/
+/*    -webkit-appearance:none;*/
+/* }*/
+input::placeholder{
+    color: #9aa5b5;
+}
+.query-btn{
+    width: 35.3vw;
+    height: 11.2vw;
+    background-color: #ffe6dc;
+    border-radius: .53vw;
+    text-align: center;
+    line-height: 11.2vw;
+    color: #e15616;
+    margin: 2.7vw 29.3vw;
+    cursor: pointer;
+    border: .27vw solid #e15616
+}
+.supplier-main{
+    margin-top: 2.7vw;
+    background: #fff;
+    padding-top: 2.7vw;
+    position: relative
+}
+.order-content{
+   padding: 1.3vw 5.3vw;
+   overflow: hidden
+}
+.order-title{
+    background-color: #ffffff;
+    padding: 0 5.3vw;
+    overflow: hidden;
+    font-size: 3.7vw;
+}
+.title-name{
+    color: #e15616;
+    margin-bottom: 3.8vw;
+}
+.title-time{
+    color: #9aa5b5;
+    margin-bottom:3.8vw;
+}
+.order-item{
+overflow:hidden ;
+}
+.order-item p{
+    margin-bottom: 5.3VW;
+    width: 50%;
+    float: left;
+}
+.order-item.pay span{
+    color: #e15616;
+}
+.red{
+    color: #f94b4b;
+}
+.order-botton{
+    width: 100%;
+    overflow: hidden;
+    height: 16vw;
+    line-height: 16vw;
+}
+.order-botton div{
+    float: right;
+}
+.order-botton a{
+   margin-left: 2.7vw;
+    width: 22.4vw;
+    height: 9.6vw;
+    background-color: #ffe6dc;
+    border-radius: .53vw;
+    border: solid 1px #e15616;
+    text-align: center;
+    line-height: 9.6vw;
+    color: #e15616;
+    display: inline-block
+}
+.order-botton .deatil{
+    border: 1px solid #1890f9;
+    line-height: 7.2vw;
+    right: 5.7vw;
+    position: absolute;
+    top: 10vw;
+    width: 22.4vw;
+    height: 7.2vw;
+    border-radius: 3.6vw;
+    color: #1890f9;
+    background: #e0f1ff
+}
+.order-product .product-img{
+    width: 28VW;
+    height: 28VW;
+	border: solid 1px #e2e7ef;
+	float: left;
+}
+.product-info .num:nth-child(1){
+    float: left;
+}
+.product-info .num:nth-child(2){
+    float: right;
+}
+.order-product .product-img img{
+    width: 100%;
+    height: 100%;
+}
+.order-product .product-info{
+    float: right;
+    width: 65%;
+}
+.order-product{
+    overflow: hidden;
+    margin-bottom: 1.9vw;
+}
+.product-info p{
+    color: #627386;
+    margin-top: 7px;
+    overflow: hidden;
+}
+.userinfo{
+	background-color: #f0f3f7;
+	box-shadow: 0px 3px 6px 0px
+		rgba(0, 0, 0, 0.07);
+    padding: 10px 20px;
+    color: #627386;
+}
+.product-info h3{
+    font-size: 3.7VW;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.userinfo p{
+    display: inline-block;
+    margin-bottom: 2.7vw;
+}
+.username p:nth-child(1){
+    width: 100%;
+}
+.username p:nth-child(2){
+    float: left;
+}
+.username p:nth-child(3){
+    float: right;
+}
+.userinfo .blcak{
+    color: #22272e;
+}
+}

src/main/resources/static/js/base.js

@@ -1,10 +1,16 @@
 var spiServer = $("#spiServer").val();
 var isPC = ($(window).width()>768);
 var globalUserData = '';
-var REV_TOKEN_DEV = 'X-Token';
+var GLOBAL_TOKEN = 'X-Token';
+var GLOBAL_USER_ID = 0;
+var GLOBAL_USER_IDENTITY = 0;
+var GLOBAL_SHOP_ID = 0;
 if(localStorage.getItem('userInfo')){
     globalUserData = JSON.parse(localStorage.getItem('userInfo'));
-    REV_TOKEN_DEV = globalUserData.token;
+    GLOBAL_TOKEN = globalUserData.token;
+    GLOBAL_USER_ID = globalUserData.userId;
+    GLOBAL_USER_IDENTITY = globalUserData.identity ? globalUserData.identity : globalUserData.userIdentity;
+    GLOBAL_SHOP_ID = globalUserData.shopId;
 }
 // 头部
 var globalHead = new Vue({
@@ -364,7 +370,7 @@ function tokenAjax(type, url, params, callback){
         data: params,
         headers:{
             'Content-Type': type=='post'?'application/x-www-form-urlencoded':'application/json;charset=utf8',
-            'X-Token':REV_TOKEN_DEV
+            'X-Token':GLOBAL_TOKEN
         },
         success : function (res) {
             if(res.code === -99){
@@ -392,6 +398,7 @@ function setSearchProductList(list, userId) {//处理搜索
             brand: item.p_brand_name,
             priceFlag: item.p_price_flag,
             priceGrade: item.p_price_flag,
+            actStatus: 0,
             priceLoaded: false
         });
         // 0公开价格 1不公开价格 2仅对会员机构公开
@@ -421,8 +428,7 @@ function setProductPrice(productList, productIds, userId, callback){
                         product.price = item.price;
                         product.priceLoaded = true;
                         product.ladderPriceFlag = item.ladderPriceFlag;
-                     var actStatus = item.actStatus;
-                        product.actStatus=actStatus;
+                        product.actStatus =item.actStatus;
                         product.promotions =item.promotions;
                     }
                 });
@@ -566,7 +572,7 @@ function addShoppingCart(userId, productId, count, callback){
                 useBootstrap: false,
                 boxWidth: (isPC?'338px':'74.6vw'),
                 title: false,
-                content:'<div class="cartAlert"><h6>商品已成功加入购物车！</h6><p>当前购物车共'+res.data+'种商品去结算继续购物</p></div>',
+                content:'<div class="cartAlert"><h6>商品已成功加入购物车！</h6><p>当前购物车共<em>'+res.data+'</em>种商品</p></div>',
                 closeIcon: true,
                 animation: 'opacity',
                 closeAnimation: 'opacity',
@@ -582,14 +588,14 @@ function addShoppingCart(userId, productId, count, callback){
                     },
                     close: {
                         text: '继续购物',
-                        btnClass: 'btn-cancel'
+                        btnClass: 'btn-to-goon',
+                        action: callback?callback():function(){}
                     }
                 }
             });
         } else {
             dialog("加入购物车失败！");
         }
-        callback();
     });
 }
 

src/main/resources/static/js/flea-market/list.js

@@ -104,10 +104,6 @@ var fleaMarketList = new Vue({
                      }else{
                      }
                 })
-          },
-          getproduct:function(id){
-            window.location.href = '/flea-market/detail.html?productID='+id;
-            return false
           },
            returnedTarget:function(){//对象合并 IE 兼容方法
             if (typeof Object.assign != 'function') {

src/main/resources/static/js/flea-market/secondDetail.js

@@ -7,7 +7,7 @@ var fleaMarket = new Vue({
         tabIndex:0,
         userId:'',
         shopId:'',
-        id:window.location.href.split('=')[1],
+        id: $("#productId").val(),
         isShow:false,
         isRequest:false,
         Showlogo:false,
@@ -16,7 +16,7 @@ var fleaMarket = new Vue({
         previewThumb:[],
         previewParams:[],
         recommdeImage:[],
-        userID:JSON.parse(localStorage.getItem('userInfo')),
+        userID: GLOBAL_USER_ID,
         HandType:false,
         ShowImage:false,
         recommde:false,
@@ -120,6 +120,9 @@ var fleaMarket = new Vue({
             _this.previewBigimage = item;
         },
     },
+    created: function () {
+        this.id = $("#productId").val();
+    },
     mounted: function () {
      var _this = this;
         _this.InfoData();

src/main/resources/static/js/product/detail.js

@@ -4,30 +4,30 @@ var productDetail = new Vue({
         productId: 0,
         userId: 0,
         userIdentity: '', //2-会员机构；3-供应商；4-普通机构
-        userToken: '',
+        number: 0,
+        productStock: 0,
         images: [],
-        price: 564,
-        priceFlag: 2,
-        recommendType: 1,
-        recommendPage: 1,
-        recommends: [],
-        parameters: [],
-        isShow:false,
+        priceObj: {
+            actStatus: 0,
+            ladderPriceFlag: 0,
+            minBuyNumber: 1,
+            price: 0,
+            costPrice: 0,
+            priceFlag: 3,
+            productId: 0,
+            promotions: '',
+            step: 1,
+            supplierId: 0,
+            userIdentity: 0
+        },
         ladderList:[],//阶梯价
-        deailData:{},
         promotions:{},//促销活动信息
-        recommde:false,
-        recommdeindex:0,
-        number:0,
-        minBuyNumber:0,
-        buyRetailPrice:0,
-        allTotalPrice:0,
-        typedata:0,
         promotionsId:0,//活动id
-        isQuantity:false,
-        isStock:false,
-        cartAlert:false
-
+        addStatus: true,
+        recommendType: 0,//相关推荐类型 0自动选择; 1手动推荐
+        recommendPage: 1,
+        recommends: [],
+        parameters: []
     },
     computed: {},
     methods: {
@@ -64,36 +64,46 @@ var productDetail = new Vue({
                 }
             });
         },
-        toLogin:function() {
-            location.href ='/login.html';
-        },
-        productDetail:function(){
+        getProductPrice:function(){
             var _self = this;
             if(_self.productId ===0){return;}
             $.getJSON(spiServer + "/product/detail/price",{
-                // userId:this.userId,
-                // productId: this.productId
-                userId:10684,
+                userId: GLOBAL_USER_ID,
                 productId: _self.productId
             }).done(function (r) {
                 if (r.code === 0 && r.data) {
-                _self.priceFlag = r.data.priceFlag;
-                _self.number = r.data.minBuyNumber;//最小起訂量
-                _self.buyRetailPriceStep = r.data.step;
-                _self.minBuyNumber = r.data.minBuyNumber;
-                _self.buyRetailPrice = r.data.price;
-                    console.log(r)
-                    if(r.data.ladderPriceFlag==1){
+                    _self.priceObj = r.data;
+                    _self.number = r.data.minBuyNumber;
+                    if(r.data.ladderPriceFlag===1){
                         _self.ladderPrice();
-                     }else {
-                        _self.allTotalPrice = _self.number * _self.deailData.price;
-                     }
-                   _self.deailData =r.data;
-                    if(_self.deailData.actStatus==1){
-                    _self.promotions =  _self.deailData.promotions;
-                    _self.promotionsId = _self.deailData.promotions.id;
                     }
-
+                    if(r.data.actStatus==1){
+                        _self.promotions =  r.data.promotions;
+                        _self.promotionsId = r.data.promotions.id;
+                    }
+                }
+            });
+        },
+        ladderPrice:function(){
+            var _self = this;
+            if(!this.productId){return;}
+            $.getJSON(spiServer + "/product/ladderPrice",{
+                productId: this.productId
+            }).done(function (r) {
+                if (r.code === 0 && r.data) {
+                    _self.ladderList =r.data;
+                    this.numberResize();
+                }
+            });
+        },
+        getParameters: function(){
+            var _self = this;
+            if(!this.productId){return;}
+            $.getJSON(spiServer + "/product/detail/parameter",{
+                productId: this.productId
+            }).done(function (r) {
+                if (r.code === 0 && r.data) {
+                    _self.parameters = r.data;
                 }
             });
         },
@@ -112,78 +122,48 @@ var productDetail = new Vue({
             $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
             if(!isPC){looseBody();}
         },
-        changeCountAdd:function () { //数量增加按钮
-            var _this = this;
-            if(_this.buyRetailPriceStep == 2){
-                _this.number += _this.minBuyNumber
-            }else{
-                _this.number++
-            }
-            _this.allTotalPrice = _this.number * _this.deailData.price;
-            _this.calculatPerice()
+        numberSub: function(){
+            this.number -= this.priceObj.step;
+            this.numberResize();
         },
-        changeCountSub:function(){//popup弹窗数量减按钮
-           var _this = this;
-				if(_this.number<=_this.minBuyNumber){
-					_this.number= _this.minBuyNumber;
-					_this.isQuantity =true;
-					 layer.tips('此商品最小起批量为' + _this.minBuyNumber, $(this).parent().find(".calc-input"), {
-                        tips: 1,
-                        time: 3000
-                         });
-					return
-				}else{
-					if(_this.buyRetailPriceStep == 2){
-						_this.number-=_this.minBuyNumber
-					}else{
-						_this.number--
-					}
-					_this.allTotalPrice = _this.number * _this.deailData.price;
-					_this.calculatPerice();
-					_this.isQuantity =false
-				}
-			 },
-			 changeNumber:function(e){
-			   var  _this=this;
-				var _value = e.detail.value;
-				if(!_value){
-					_this.number = _this.minBuyNumber
-				}else if(_value < _this.minBuyNumber){
-					_this.layer.msg('该商品最小起订量为'+_this.minBuyNumber,2000);
-					_this.number = _this.minBuyNumber
-				}else if( _value % _this.minBuyNumber !=0 ){
-					_this.layer.msg('购买量必须为起订量的整数倍',2000);
-					_this.number = _this.minBuyNumber
-				}else{
-					_this.number = e.detail.value;
-					_this.allTotalPrice = _this.number * _this.deailData.price;
-					_this.calculatPerice();
-				}
-			},
-        calculatPerice:function(){//判断是否为阶梯价然后做计算价格处理
-              var _this = this;
-				if(_this.deailData.ladderPriceFlag == '1'){
-					_this.ladderList.forEach(function (item,index) {
-						if(_this.number>=item.buyNum){
-							_this.buyRetailPrice = item.buyPrice
-							_this.allTotalPrice = _this.number*item.buyPrice
-						}
-					})
-				}else{
-					_this.buyRetailPrice = _this.deailData.price;
-				}
-			},
-		addShopCart:function(){ //加入购物车
-		    addShoppingCart(this.userId, this.productId, this.number);
-		},
-		Continueshop:function(){ //继续购物
-            var _this = this;
-            _this.cartAlert = false;
-             location.reload()
+        numberAdd: function(){
+            this.number += this.priceObj.step;
+            this.numberResize();
+
         },
-        settlement:function(){//去结算
-           window.location.href = "/shopping/cart.html"
+        numberChange: function(){
+            this.number = Math.ceil(this.number/this.priceObj.step)*this.priceObj.step;
+            this.numberResize();
+
         },
+        numberResize: function(){
+            var _self = this;
+            if (this.number<this.priceObj.minBuyNumber){
+                this.number = this.priceObj.minBuyNumber;
+            }
+            if (this.number>this.productStock){
+                this.number = this.productStock;
+            }
+            if(this.priceObj.ladderPriceFlag){
+                this.ladderList.forEach.forEach(function(ladder){
+                    if(_self.number>=ladder.buyNum){
+                        _self.priceObj.price = ladder.buyPrice;
+                    }
+                });
+            }
+        },
+        toLogin: function() {
+            location.href ='/login.html';
+        },
+		addShopCart: function(){ //加入购物车
+		    var _self = this;
+		    if(this.addStatus){
+		        _self.addStatus = false;
+                addShoppingCart(this.userId, this.productId, this.number,function(){
+                    _self.addStatus = true;
+                });
+		    }
+		},
         buyNowSubmit: function(){
             if(this.productId && this.number){
                 // type:（1购物车提交[对应表cm_cart]，2直接购买提交, 3协销下单）
@@ -198,106 +178,55 @@ var productDetail = new Vue({
                 recommendType: this.recommendType
             }).done(function (r) {
                 if (r.code === 0 && r.data) {
-                    // _self.recommendPage = Math.ceil(r.data.length / 7);
                     if(r.data.length > 0){
                         _self.recommends = r.data;
-                        _self.recommde =true;
-                    }else {
-                        _self.recommde =false;
-                    }
-                    if(r.data.length<7){
-                        var length = 7-r.data.length;
-                        _self.recommdeindex = length;
-                    }else {
-                        var remainderres=r.data.length%7;
-                         _self.recommdeindex= 7-remainderres;
+                        _self.recommendPage = isPC ? Math.ceil(r.data.length / 7) : Math.ceil(r.data.length / 3);
+                        setTimeout(function(){
+                            if (isPC) {
+                                $('#productRecommend').slide({
+                                    mainCell:".swiper-wrapper"
+                                    ,titCell:".swiper-pagination span"
+                                    ,effect: "leftLoop"
+                                    ,interTime: 3000
+                                    ,autoPlay: true
+                                    ,scroll:7
+                                    ,vis:7
+                                    ,trigger: "mouseover"
+                                });
+                            } else {
+                                var swiper = new Swiper('#productRecommend', {
+                                    slidesPerView: 3,
+                                    spaceBetween: 0,
+                                    autoplay: {
+                                        delay: 3000,
+                                        disableOnInteraction: false
+                                    },
+                                    pagination: {
+                                        el: '.swiper-pagination'
+                                    }
+                                });
+                            }
+                        },500);
                     }
                 }
             });
-        },
-        ladderPrice:function(){
-            var _self = this;
-            if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/ladderPrice",{
-                productId: this.productId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    console.log(r)
-                   _self.ladderList =r.data;
-                   _self.ladderList.forEach(function (item,index) {
-						if(_self.number>=item.buyNum){
-							_self.buyRetailPrice = item.buyPrice
-							_self.allTotalPrice = _self.buyRetailPrice*_self.number;
-						}
-					})
-
-                }
-            });
-        },
-        clubupgrade:function(){
-            location.href='/myAccount/club/clubupgrade.jsp'
-        },
-        getParameters: function(){
-            var _self = this;
-            if(!this.productId){return;}
-            $.getJSON(spiServer + "/product/detail/parameter",{
-                productId: this.productId
-            }).done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.parameters = r.data;
-                }
-            });
         }
-
-
     },
     created: function () {
         this.productId = $("#productId").val();
-        var userInfo = localStorage.getItem('userInfo');
-        if(userInfo){
-            this.userId = JSON.parse(userInfo).userId*1;
-        }
+        this.productStock = $("#productStock").val();
         this.getImages();
     },
     mounted: function () {
-        this.productDetail();
+        this.userId = GLOBAL_USER_ID;
+        this.userIdentity = GLOBAL_USER_IDENTITY;
+        this.getProductPrice();
+        this.getParameters();
         this.getRecommends();
         $('.productInfo').slide({
             mainCell:".tabCon"
             ,titCell:".tabTit span"
             ,trigger: "click"
         });
-        if(globalUserData){
-           console.log(globalUserData)
-            globalUserData.userId ? globalUserData.userId : globalUserData.userID;
-            this.userIdentity = globalUserData.identity ? globalUserData.identity : globalUserData.userIdentity;
-            this.userToken = globalUserData.token;
-        }
-         //相關推薦輪播
-        var mySwiper = new Swiper('#productRecommend',{
-                slidesPerView: 7,
-                spaceBetween: 12,
-                slidesPerGroup: 7,
-                autoplay: {
-                    delay:10000,
-                    disableOnInteraction: false,//是否禁止autoplay。默认为true：停止。
-                },
-                loop: false,
-                observer: true, //修改swiper自己或子元素时，自动初始化swiper
-                observeParents: true, //修改swiper的父元素时，自动初始化swiper
-                pagination: {
-                    el: '.swiper-pagination',
-                    clickable: true,
-                },
-                on:{
-                    init:function() {
-                        var length = this.slides.length;
-                        if(length < 8) {
-                            this.autoplay.stop();
-                        }
-                    }
-                }
-       })
-
     }
 });

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

@@ -186,6 +186,9 @@ var shoppingCart = new Vue({
         },
         cartNumberAdd: function(cart){
             cart.number += cart.step;
+            if (cart.number>cart.stock){
+                cart.number = cart.stock;
+            }
             this.numberChange(cart);
         },
         cartNumberChange: function(cart){

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

@@ -2,28 +2,42 @@ var isPC = ($(window).width()>768);
 var orderList = new Vue({
     el:'#orderList',
     data:{
+        Status:[
+            {name:'所有',value:'0'},
+            {name:'待发货',value:'1'},
+            {name:'部分发货',value:'2'},
+            {name:'已发货',value:'3'},
+        ],
+        pay:[
+            {name:'所有',value:'0'},
+            {name:'待结算',value:'1'},
+            {name:'部分结算',value:'2'},
+            {name:'已结算',value:'3'},
+        ],
         params:{
             ShopID:10100,
             pageNum: 1,
-            pageSize: 15,
-            sendOutStatus: 0,
-            payStatus: 0,
-            shopOrderNo:'',
-            name: '',
-            sendOutStatus:'',
-            payStatus:'',
+            pageSize: 10,
+            sendOutStatus: '',//发货状态
+            payStatus:'',//结算状态
+            shopOrderNo:'',//订单编号
+            name: '',//买家名称
         },
          pageInput: '1',
-        isRequset:false,
-        results:[],
+         listRecord: 0,
+         isRequset:false,
+         open:false,
+         requestFlag: true,
+         noMore: false,
+         results:[],
     },
     computed: {
         pageTotal: function () {
-            var total = Math.ceil(this.listRecord / this.params.size);
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
             return total > 0 ? total : 1;
         },
         showPageBtn: function () {
-            var total = Math.ceil(this.listRecord / this.params.size);
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
             total = total > 0 ? total : 1;
             var index = this.params.pageNum, arr = [];
             if (total <= 6) {
@@ -40,8 +54,8 @@ var orderList = new Vue({
     methods:{
          toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
-                var params = {pageNum: pageNum};
-                window.location.href = updateUrlParam(params);
+                this.params.pageNum = pageNum;
+                this.MyOrderList(this.params);
             }
         },
      checkNum: function () {
@@ -51,17 +65,82 @@ var orderList = new Vue({
             this.pageInput = 1;
         }
     },
-
-    },
-    mounted:function () {
-        var _this = this;
+    MyOrderList:function () {
+       var _this = this;
         SupplierApi.MyOrderList(_this.params,function (res) {
             if(res.code==0){
-                 _this.isRequset = true;
-                     console.log(res)
-                 _this.results = res.data.results;
+                 console.log(res)
+                 if(res.data.results.length > 0){
+                     _this.isRequset = true;
+                     _this.results = res.data.results;
+                     _this.listRecord = res.data.totalRecord;
+                 }else {
+                     _this.results = res.data.results;
+                     _this.listRecord = res.data.totalRecord;
+                 }
             }
-
         })
+    },
+    opentittle:function(){
+       this.open = !this.open;
+    },
+    getpayStatus:function () { //结算状态
+        var _this = this;
+        if(event.target.value==0){
+            _this.params.payStatus = '';
+        }else {
+            _this.params.payStatus = event.target.value;
+        }
+    },
+    getstatus:function () { //发货状态
+      var _this = this;
+        if(event.target.value==0){
+         _this.params.sendOutStatus='';
+        }else {
+         _this.params.sendOutStatus=event.target.value;
+        }
+    },
+    serchBtn:function () {
+        var _this=this;
+            _this.MyOrderList()
+    },
+    delivery:function (orderID) {//发货
+        window.location.href='/supplier-center/shop/goods.html?shopOrderID='+orderID;
+    }
+    },
+    mounted:function () {
+        var _self = this;
+       _self.MyOrderList();
+        if(globalUserData){
+            _self.params.ShopID = globalUserData.shopId;
+        }
+         if(!isPC){
+            //移动端上垃加载更多
+            $(window).on('scroll', function(){
+                var scrollTop = $(this).scrollTop();
+                var scrollHeight = $(document).height();
+                var windowHeight = window.innerHeight;
+                if (scrollTop + windowHeight >= scrollHeight) {
+                    //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
+                    var totalPage = Math.ceil(_self.listRecord / _self.params.pageSize)?Math.ceil(_self.listRecord / _self.params.pageSize):1;
+                    var next = _self.params.pageNum+1;
+                    if(next <= totalPage){
+                        if (_self.requestFlag){
+                            _self.params.pageNum = next;
+                            if (_self.isRequset) {
+                                // 获取列表数据
+                                _self.MyOrderList();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
+
     }
 })

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

@@ -11,7 +11,8 @@
 <template th:replace="components/header"></template>
 
 <!-- 二手商品详情 -->
-    <div class="preview-container" id="fleaMarket" >
+<div class="preview-container" id="fleaMarket" >
+    <input type="hidden" th:value="${productId}" id="productId">
     <div class="inner-container">
         <div class="preview-header clearfix">
             <div class="preview-banner clearfix" id="imgShown" >

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

@@ -13,86 +13,88 @@
 <!-- 二手商品列表 -->
 <div id="fleaMarketList">
     <div class="wrap">
-        <div class="ListImg" >
-            <img src="/img/flea-market/banner.png"/>
-       </div>
-       <template>
-           <ul class="secondTitle " v-if="isPC">
-                <li class="ClassA icon "  v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'jqSelect':'']">{{item.name}} </li>
-                <li class="fabu"><a href="/flea-market/form.html">我要发布</a><li/>
-           </ul>
-           <ul class="secondTitle" v-else>
-               <li class="ClassA  mIcon"  v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'off':'']">{{item.name}}
-                <span class="line" v-if="currentId==item.value"></span>
-               </li>
-               <li class="fabu"><a href="/flea-market/form.html">我要发布</a><li/>
-           </ul>
-       </template>
-
-
-
-       <ul class="mainTab"  v-if="mainflag">
-           <li v-for="(item,index) in tabList" @click='handleChild(item)' :class="currentID2 ==index?'addstyle':' '" >{{item.name}}</li>
-
-       </ul>
-       <div class="shopList">
-            <div class="Listitem" v-if="isShow"   v-for="(item, index) in tabchildList">
-                <div class="itemImg onhref" :data-id="item.productID" @click="getproduct(item.productID)">
+        <div class="ListImg">
+            <img src="/img/flea-market/banner.png" />
+        </div>
+        <template>
+            <ul class="secondTitle " v-if="isPC">
+                <li class="ClassA icon " v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'jqSelect':'']">{{item.name}} </li>
+                <li class="fabu">
+                    <a href="/flea-market/form.html">我要发布</a>
+                <li/>
+            </ul>
+            <ul class="secondTitle" v-else>
+                <li class="ClassA  mIcon" v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'off':'']">{{item.name}}
+                    <span class="line" v-if="currentId==item.value"></span>
+                </li>
+                <li class="fabu">
+                    <a href="/flea-market/form.html">我要发布</a>
+                <li/>
+            </ul>
+        </template>
+        <ul class="mainTab" v-if="mainflag">
+            <li v-for="(item,index) in tabList" @click='handleChild(item)' :class="currentID2 ==index?'addstyle':' '">{{item.name}}</li>
+        </ul>
+        <div class="shopList">
+            <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
+                <a class="itemImg onhref" :href="'/flea-market-'+item.productID+'.html'">
                     <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
+                </a>
+                <div class="ItemInfo">
+                    <div class="tag">
+                        <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
+                        <span class="infotag brand" v-if="item.brandName==null&&item.brandName==''">{{item.brandName}}</span>
+                        <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
+                        <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
+                    </div>
+                    <a class="productname" :href="'/flea-market-'+item.productID+'.html'">
+                        {{item.name}}
+                    </a>
+                    <div class="targetprice">
+                        <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
+                        <span v-else-if="userID==null" class="priceparam" @click="toLogin">登录查看价格></span>
+                        <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
+                        <span v-else>￥{{item.price1Str}}</span>
+                    </div>
+                    <div class="shijian">
+                        <div>
+                            <i class="icon mIcon  liulanliang"></i> {{item.viewingNum}}
+                        </div>
+                        <div>
+                            <i class="icon mIcon  shijian"></i> {{item.onLineDateStr}}
+                        </div>
+                    </div>
+                    <div class="dizhi">
+                        <i class="icon mIcon dizhi"></i>
+                        {{item.provinceCityDistrict}}
+                    </div>
+                </div>
+            </div>
+            <div class="no-content" v-show="showflag" :class="showflag?'show':''">
+                <img src="/img/flea-market/nologo.png" v-if="isPC" />
+                <img src="/img/flea-market/kong_m.png" v-else />
+                <div class="error-message">
+                    <p>此分类下面没有商品，换其它分类瞅瞅</p>
                 </div>
-            <div class="ItemInfo" >
-                 <div class="tag">
-                   <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
-                   <span class="infotag brand" v-if="item.brandName==null&&item.brandName==''">{{item.brandName}}</span>
-                   <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
-                   <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
-                  </div>
-                  <div class="productname">
-                    {{item.name}}
-                  </div>
-                  <div class="targetprice">
-                    <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
-                    <span v-else-if="userID==null" class="priceparam" @click="toLogin">登录查看价格></span>
-                    <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
-                    <span v-else>￥{{item.price1Str}}</span>
-                  </div>
-                  <div class="shijian">
-                        <div ><i class="icon mIcon  liulanliang"></i> {{item.viewingNum}}</div>
-                        <div><i class="icon mIcon  shijian"></i> {{item.onLineDateStr}}</div>
-                   </div>
-                  <div class="dizhi">
-                    <i class="icon mIcon dizhi"></i>
-                     {{item.provinceCityDistrict}}
-                  </div>
             </div>
-          </div>
-             <div class="no-content" v-show="showflag" :class="showflag?'show':''">
-               <img src="/img/flea-market/nologo.png" v-if="isPC"/>
-               <img src="/img/flea-market/kong_m.png" v-else />
-               <div class="error-message">
-                 <p>此分类下面没有商品，换其它分类瞅瞅</p>
-               </div>
-           </div>
-
-
-       </div>
-    </div>
-    <div  class="pageWrap clear" v-if="isPC">
-            <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
-            <template v-for="n in showPageBtn">
-                <a v-if="n" :class="{ 'on': (n==listQuery.pageNum) }" @click="toPagination(n)" href="javascript:void(0);">{{ n }}</a>
-                <template v-else>···</template>
-            </template>
-            <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)"href="javascript:void(0);"> </a>
-            <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-            <span>跳至</span>
-            <input v-model="pageInput" @blur="checkNum()"/>
-            <span>页</span>&nbsp;
-              <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
         </div>
-
+    </div>
+    <div class="pageWrap clear" v-if="isPC">
+        <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
+        <template v-for="n in showPageBtn">
+            <a v-if="n" :class="{ 'on': (n==listQuery.pageNum) }" @click="toPagination(n)" href="javascript:void(0);">{{ n }}</a>
+            <template v-else>···</template>
+        </template>
+        <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"> </a>
+        <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+        <span>跳至</span>
+        <input v-model="pageInput" @blur="checkNum()" />
+        <span>页</span>&nbsp;
+        <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+    </div>
 </div>
 
+
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>

src/main/resources/templates/index.html

@@ -48,7 +48,7 @@
     <!--页面主体数据-->
     <div class="wrap">
         <div>
-            <div class="floorTit">
+            <div class="floorTit toLogin">
                 <h2 v-for="item in pageFloors" v-if="item.type==1" v-text="item.title" data-id="1"></h2>
                 <h2 v-else-if="pageFloors.length==0" data-id="1">推荐专区</h2>
             </div>
@@ -65,42 +65,33 @@
                                     <span v-html="p.name"></span>
                                 </a>
                                 <div class="price mfhc">
-                                    <template v-if="userId && userId>0">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                         <template v-if="p.priceFlag==1">
-                                            <em >￥价格未公开</em>
-                                             <div class="btnBox" v-if="isPC">
-                                                <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
+                                            <em>￥价格未公开</em>
+                                            <div class="btnBox">
+                                                <a href="javascript:void(0)" class="btn cat">价格未公开，请联系 0755-22907771</a>
                                             </div>
                                         </template>
                                         <template v-else>
-<!--                                            <em v-if="!p.priceLoaded">正在获取价格...</em>-->
-                                            <template v-if="p.priceFlag==2 && p.userIdentity!=2">
+                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                            </template>
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
-                                                <div class="btnBox" v-if="isPC">
-                                                    <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
+                                                <div class="btnBox">
+                                                    <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>
                                             </template>
-                                            <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                            <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                            <template  v-else-if="p.userIdentity==3">
-                                                <em class="p" v-if="p.supplierId==shopID" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                                <em v-else>
-                                                    <span class="rmb">￥</span>
-                                                    <i :class="'icon mIcon i'+p.priceGrade"></i>
-                                                 </em>
+                                            <template v-else>
+                                                <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                             </template>
                                         </template>
-
                                     </template>
                                     <template v-else>
-                                       <em >
-                                             <span class="rmb">￥</span>
-                                             <i :class="'icon mIcon i'+p.priceGrade"></i>
-                                        </em>
-                                        <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                         <div class="btnBox">
-                                            <a href="javascript:void(0);" class=" btn add" @click="toLogin">登录查看价格</a>
-                                        </div>
+                                        <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>
                             </div>

src/main/resources/templates/product/detail.html

@@ -14,6 +14,7 @@
 <!-- 商品详情 -->
 <div id="productDetail">
     <input type="hidden" th:value="${productId}" id="productId">
+    <input type="hidden" th:value="${product?.stock}" id="productStock">
     <div class="wrap">
         <div class="productBox clear">
             <div class="imageBox" id="imgShown">
@@ -50,31 +51,26 @@
                 </p>
                 <div class="detail">
                     <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>
-                            <template v-if="priceFlag==2 && userIdentity!=2">
-                                <em style="font-weight: bold" class="pricedeail">￥会员可见</em>
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                            <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
+                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity!=2">￥会员可见</em>
+                            <template v-else-if="priceObj.priceFlag==0 || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID)">
+                                <em class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
                             </template>
-                            <em v-else class="price pricedeail" :class="promotions.type==1&&promotions.mode==1?'original-price':''">￥{{buyRetailPrice}}</em>
+                            <em v-else>￥<i :class="'icon mIcon i'+priceObj.priceGrade"></i></em>
                         </template>
-                    </template>
-                    <template v-else>
-                        <em class="price">
-                        <span class="priceicon">￥</span>
-                            <i th:class="'icon mIcon i'+*{priceGrade}"></i>
-                        </em>
-                    </template>
+                        <em v-else>￥<i :class="'icon mIcon i'+priceObj.priceGrade"></i></em>
                     </div>
-                    <template  v-if="priceFlag!=2  && userIdentity!=2 ">
+                    <template v-if="priceObj.priceFlag!=2 && priceObj.userIdentity!=2">
                         <div class="row"> <span class="l">市场价</span><i>：</i>
-                             <em class="pricedeail" :class="deailData.actStatus==1?'original-price':''">￥{{buyRetailPrice}}</em>
+                             <em class="pricedeail" :class="priceObj.actStatus==1?'original-price':''">￥{{priceObj.costPrice}}</em>
                         </div>
                     </template>
-                    <div class="row" v-if="deailData.actStatus==1||deailData.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
-                        <template v-if="userId && userId>0">
+                    <div class="row" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!-- 阶梯价 -->
-                            <div v-if="deailData.ladderPriceFlag==1" class="priceTag">
+                            <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">
                                 <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
                                 <div class="ladder mFixed">
                                     <span>
@@ -88,7 +84,7 @@
                                 </div>
                             </div>
                             <!-- 促销活动 -->
-                            <div v-if="deailData.actStatus==1 && promotions" class="priceTag">
+                            <div v-if="priceObj.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">
@@ -117,13 +113,13 @@
                         </template>
                         <!-- 登录 -->
                         <template v-else>
-                            <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 v-if="priceObj.ladderPriceFlag==1 || priceObj.actStatus==1" class="priceTag">
+                                <i v-if="priceObj.ladderPriceFlag==1" class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>
+                                <i v-if="priceObj.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 v-if="priceObj.ladderPriceFlag==1"><em @click="toLogin">登录</em>，享受阶梯价格优惠</p>
+                                        <p v-if="priceObj.actStatus==1"><em @click="toLogin">登录</em>，参与促销活动</p>
                                         <p class="r"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                 </div>
@@ -135,11 +131,11 @@
                     <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>
+                    <div class="row"><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>
+                            <em class="sub" @click="numberSub()">-</em>
+                            <input type="number" :value="number" v-model="number" maxlength='6' @change="numberChange()">
+                            <em class="add" @click="numberAdd()">+</em>
                         </span>
                         <input type="hidden" th:value="*{step}">
                     </div>
@@ -150,26 +146,25 @@
                         <em class="ser icon mIcon">正品保证</em>
                     </div>
                 </div>
-               <template v-if="userId && userId>0">
-                   <div  class="btnBox" v-if="priceFlag==2 && userIdentity!=2">
-                      <a class="upgrade" @click="clubupgrade" href="javascript:0">升级会员查看价格</a>
+               <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                   <div  class="btnBox" v-if="priceObj.priceFlag==2 && userIdentity!=2">
+                      <a class="upgrade" href="/upgrade.html">升级会员查看价格</a>
                    </div>
-                    <div class="btnBox" v-else-if="priceFlag==0">
+                    <div class="btnBox" v-else-if="priceObj.priceFlag==0">
                         <a href="javascript:void(0);" class="cart icon" @click='addShopCart()'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()">立即购买</a>
                     </div>
                 </template>
                 <template v-else>
-                    <a href="javascript:void(0);" class="member-detail " @click="toLogin">登录查看价格</a>
+                    <a href="javascript:void(0);" class="member-detail" @click="toLogin">登录查看价格</a>
                 </template>
             </div>
         </div>
-
-        <div class="recommendBox" v-if="recommde">
+        <div class="recommendBox" v-if="recommends.length>0">
             <div class="hd">相关推荐</div>
             <div id="productRecommend" class="swiper-container">
                 <ul class="swiper-wrapper" v-cloak>
-                    <li class="swiper-slide" v-for="p in recommends">
+                    <li class="swiper-slide mfc" v-for="p in recommends">
                         <div class="item">
                             <a class="image" :href="'/product-'+p.id+'.html'" target="_blank">
                                 <img :src="p.image" :alt="p.name">
@@ -177,15 +172,15 @@
                             </a>
                         </div>
                     </li>
-                    <li class="swiper-slide  defaulImg" v-for="(item,index) in recommdeindex">
+                    <!--<li class="swiper-slide  defaulImg" v-for="(item,index) in recommendIndex">
                        <div class="item">
                             <a href="javascript:0" class="image">
                                 <img src="/img/base/placeholder.png" alt="">
                             </a>
                      </div>
-                </li>
+                    </li>-->
                 </ul>
-                <div v-show="recommendPage>1" class="swiper-pagination mfc"><span v-if="isPC" v-for="i in recommendPage"></span></div>
+                <div class="swiper-pagination mfc"><span v-if="isPC" v-for="i in recommendPage"></span></div>
             </div>
         </div>
     </div>
@@ -213,8 +208,8 @@
                 <div class="item">
                     <table>
                         <tr v-for="pa in parameters">
-                            <td v-text="pa.paramsName"></td>
-                            <td v-text="pa.paramsContent"></td>
+                            <td v-text="pa.name"></td>
+                            <td v-text="pa.content"></td>
                         </tr>
                     </table>
                 </div>

src/main/resources/templates/product/list.html

@@ -109,42 +109,33 @@
                         <span v-html="p.name"></span>
                     </a>
                     <div class="price mfhc">
-                        <template v-if="userId && userId>0">
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <template v-if="p.priceFlag==1">
-                                <em >￥价格未公开</em>
-                                 <div class="btnBox " v-if="isPC">
-                                    <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
+                                <em>￥价格未公开</em>
+                                <div class="btnBox">
+                                    <a href="javascript:void(0)" class="btn cat">价格未公开，请联系 0755-22907771</a>
                                 </div>
                             </template>
                             <template v-else>
-                                <em v-if="!p.priceLoaded">正在获取价格...</em>
-                                <template v-else-if="p.priceFlag ==2 && p.userIdentity!=2">
+                                <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                    <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                </template>
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                     <em>￥会员可见</em>
-                                    <div class="btnBox" v-if="isPC">
-                                        <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
+                                    <div class="btnBox">
+                                        <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                     </div>
                                 </template>
-                                <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)" ></em>
-                                <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                <a href="javascript:void(0);" class="login-btn" v-else-if="p.ladderPriceFlag==1">阶梯价格</a>
-                                 <template  v-else-if="p.userIdentity==3">
-                                    <em class="p" v-if="p.supplierId==shopID" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
-                                    <em v-else>
-                                        <span class="rmb">￥</span>
-                                        <i :class="'icon mIcon i'+p.priceGrade"></i>
-                                    </em>
+                                <template v-else>
+                                    <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
-                            <em>
-                                <span class="rmb">￥</span>
-                                <i :class="'icon mIcon i'+p.priceGrade"></i>
-                            </em>
-                             <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                            <div class="btnBox">
-                              <a href="javascript:void(0)" @click="toLogin" class="btn add">登录查看价格</a>
-                            </div>
+                            <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                            <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                         </template>
                     </div>
                 </div>

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

@@ -68,13 +68,13 @@
             <div class="product">
                 <p>商品数据</p>
                  <ul>
-                     <li class="icon confirm">
+                     <li class="icon confirm mIcon">
                          <a href="">全部商品<span>{{homeData.allNum}}</span></a>
                      </li>
-                      <li class="icon other confirm">
+                      <li class="icon other confirm mIcon">
                           <a>已上架<span>{{homeData.upNum}}</span></a>
                      </li>
-                     <li class="icon down confirm">
+                     <li class="icon down confirm mIcon">
                          <a>已下架<span>{{homeData.downNum}}</span></a>
                      </li>
                  </ul>

src/main/resources/templates/supplier-center/order/delivery-record.html

@@ -0,0 +1,24 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+    <h1>发货记录</h1>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

src/main/resources/templates/supplier-center/order/delivery.html

@@ -0,0 +1,24 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+    <h1>发货</h1>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

src/main/resources/templates/supplier-center/order/detail.html

@@ -12,7 +12,7 @@
 
 <!-- 我的采美 -->
 <div>
-
+    <h1></h1>
 </div>
 
 <!-- 引入底部 -->

src/main/resources/templates/supplier-center/order/list.html

@@ -20,35 +20,31 @@
             <span>&gt;</span>
             <span>我的订单</span>
         </div>
-         <div class="wrap clear ">
+         <div v-else class="wrap_tittle mIcon" @click="opentittle"><i class="mIcon open"></i><span style="margin-left: 25px;">我的订单</span></div>
+         <div class="wrap clear " >
           <!--左侧面包屑-->
-            <template th:replace="supplier-center/components/tableft"></template>
+          <div v-show="open">
+              <template th:replace="supplier-center/components/tableft" ></template>
+          </div>
+
             <div class="right">
                 <div class="new-s-item">
                         <form action="">
-                            <label for="order-number">订单编号： <input type="text" id="order-number" class="Buyer" placeholder="请输入商品货号"><span></span></label>
-                            <label for="name-buyer">买家名称： <input type="text" id="name-buyer" class="Buyer" placeholder="请输入买家名称"> <span></span></label>
+                            <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入商品货号"></div>
+                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
                             <div>
                                 结算状态：
-                                <select name="" id="settlement-status" class="state">
-                                    <option value="0">所有</option>
-                                    <option value="1">待结算</option>
-                                    <option value="2">部分结算</option>
-                                    <option value="3">已结算</option>
+                                <select name="" id="settlement-status" class="state" @change="getpayStatus($event)">
+                                    <option value="0" v-for="p in pay" :value="p.value">{{p.name}}</option>
                                 </select>
-                                <span></span>
                             </div>
                             <div>
                                 发货状态：
-                                <select name="" id="delivery-status" class="state">
-                                    <option value="0">所有</option>
-                                    <option value="1">待发货</option>
-                                    <option value="2">部分发货</option>
-                                    <option value="3">已发货</option>
+                                <select name="" id="delivery-status" class="state " @change="getstatus($event)" >
+                                    <option  v-for="s in Status" :value="s.value">{{s.name}}</option>
                                 </select>
-                                <span></span>
                             </div>
-                             <button class="query-btn">查询</button>
+                                <button type="button" class="query-btn" @click="serchBtn">查询</button>
                         </form>
 
                          <div class="supplier-main order" v-for="(order,index) in results" :key="index">
@@ -61,7 +57,7 @@
                                 </div>
                             </div>
                             <div class="order-content">
-                                <div class="order-item">
+                                <div class="order-item pay">
                                     <p>结算状态：&nbsp;
                                         <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
                                         <span v-if="order.payStatus==2"> 部分结算</span>
@@ -75,14 +71,14 @@
                                     </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>商品金额：&nbsp;<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
-                                    <p>结算商品金额：&nbsp;<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
-                                    <p>结算税费：&nbsp;<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
-                                    <p>结算运费：&nbsp;<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
+                                    <p>商品金额：<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
+                                    <p>结算商品金额：<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
+                                    <p>结算税费：<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
+                                    <p>结算运费：<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>总结算金额：&nbsp;<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
-                                    <p>已结算金额：&nbsp;<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
+                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
                                 </div>
                                 <div class="order-product" v-for="proitem in order.orderProductList">
                                     <div class="product-img">
@@ -102,19 +98,19 @@
                                 </div>
                                 <div class="order-botton">
                                    <div>
-                                        <a class="btn cancel" href="javascript: void(0);" >发货</a>
-                                        <a class="btn primary" href="javascript: void(0);"  >发货记录</a>
-                                        <a class="btn cancel" href="javascript: void(0);" >售货清单</a>
-                                        <a class="btn cancel" href="javascript: void(0);" >查看详情</a>
+                                        <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
+                                        <a class="btn" href="javascript: void(0);"  >发货记录</a>
+                                        <a class="btn" href="javascript: void(0);" >售货清单</a>
+                                        <a class="btn deatil" href="javascript: void(0);" >查看详情</a>
                                    </div>
 
                                 </div>
                             </div>
                              <div class="userinfo" >
                                     <div class="username">
-                                         <p >买家名称：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                         <p >收货人：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
-                                         <p >联系方式：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.mobile}}</span> </p>
+                                         <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
+                                         <p >收货人：<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
+                                         <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
                                     </div>
                                     <div class="address">
                                         <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
@@ -122,20 +118,22 @@
                                 </div>
                         </div>
                     </div>
-                    <div v-if=" pageTotal>1" class="pageWrap clear">
-                        <a v-if="params.num>1" class="prev" @click="toPagination(params.num*1-1)" href="javascript:void(0);"></a>
-                        <template v-for="n in showPageBtn">
-                            <a v-if="n" :class="{'on':(n==params.num)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-                            <span v-else>···</span>
-                        </template>
-                        <a v-if="params.num<pageTotal" class="next" @click="toPagination(params.num*1+1)" href="javascript:void(0);"></a>
-                        <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-                        <span>跳至</span>
-                        <input v-model="pageInput" @blur="checkNum()"/>
-                        <span>页</span>&nbsp;
-                        <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+                     <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+                     <div class="pageWrap clear" v-if="isPC && pageTotal>1">
+                            <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)" href="javascript:void(0);"></a>
+                            <template v-for="n in showPageBtn">
+                                <a v-if="n" :class="{'on':(n==params.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
+                                <span v-else>···</span>
+                            </template>
+                            <a v-if="params.pageNum<pageTotal" class="next" @click="toPagination(params.pageNum*1+1)" href="javascript:void(0);"></a>
+                            <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                            <span>跳至</span>
+                            <input v-model="pageInput" @blur="checkNum()"/>
+                            <span>页</span>&nbsp;
+                            <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
                    </div>
             </div>
+
          </div>
   </div>
 </div>

src/main/resources/templates/supplier-center/order/logistics.html

@@ -0,0 +1,24 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+    <h1>物流</h1>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

src/main/resources/templates/supplier-center/shop/goods.html

@@ -9,7 +9,7 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-
+    <h1></h1>
 <!-- 我的采美 -->
 <div>
 

src/main/resources/templates/supplier/index.html

@@ -57,29 +57,33 @@
                                     <span v-html="p.name"></span>
                                 </a>
                                 <div class="price mfhc">
-                                    <template v-if="userId && userId>0">
-                                        <em v-if="p.priceFlag==1">￥未公开价格</em>
-                                        <div class="btnBox " v-if="p.priceFlag==1" >
-                                              <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
-                                        </div>
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                                        <template v-if="p.priceFlag==1">
+                                            <em>￥价格未公开</em>
+                                            <div class="btnBox">
+                                                <a href="javascript:void(0)" class="btn cat">价格未公开，请联系 0755-22907771</a>
+                                            </div>
+                                        </template>
                                         <template v-else>
-                                            <em v-if="!p.priceLoaded">正在获取价格...</em>
-                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
-                                                <em >￥会员可见</em>
-                                                <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
+                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                            </template>
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                                <em>￥会员可见</em>
                                                 <div class="btnBox">
-                                                       <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
-                                                 </div>
+                                                    <a href="/upgrade.html" class="btn">升级会员查看价格</a>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                             </template>
-                                            <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                        <div class="btnBox">
-                                            <a href="javascript:void(0)" @click="toLogin" class="btn add">登录查看价格</a>
-                                        </div>
+                                        <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>
                             </div>
@@ -100,29 +104,33 @@
                                     <span v-html="p.name"></span>
                                 </a>
                                 <div class="price mfhc">
-                                    <template v-if="userId && userId>0">
-                                        <em v-if="p.priceFlag==1">价格未公开￥</em>
-                                        <div class="btnBox " v-if="p.priceFlag==1" >
-                                              <a href="javascript:0" class="pricebox">价格未公开，请联系 0755-22907771</a>
-                                        </div>
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                                        <template v-if="p.priceFlag==1">
+                                            <em>￥价格未公开</em>
+                                            <div class="btnBox">
+                                                <a href="javascript:void(0)" class="btn cat">价格未公开，请联系 0755-22907771</a>
+                                            </div>
+                                        </template>
                                         <template v-else>
-                                            <em v-if="!p.priceLoaded">正在获取价格...</em>
+                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                            </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
-                                                <em >￥会员可见</em>
-                                                <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
+                                                <em>￥会员可见</em>
                                                 <div class="btnBox">
-                                                       <a href="javascript:void(0)" class="btn add" @click="upgrade">升级会员查看价格</a>
-                                                 </div>
+                                                    <a href="/upgrade.html" class="btn">升级会员查看价格</a>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
                                             </template>
-                                            <em v-else class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em><span class="rmb">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <a href="javascript:void(0);" class="login-btn" v-if="p.actStatus==1">{{p.promotions.name}}</a>
-                                        <div class="btnBox">
-                                            <a href="javascript:void(0);" class=" btn add" @click="toLogin">登录查看价格</a>
-                                        </div>
+                                        <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>
                             </div>