Browse Source

供应商

Administrator 4 years ago
parent
commit
33c0d98d3a

+ 61 - 367
src/main/resources/static/css/supplier-center/order/delivery.css

@@ -1,375 +1,69 @@
 @media screen and (min-width:768px) {
-.crumbs{
-    font-size: 16px;
-    color: #22272e
-}
-.right{
-    width: 968px;
-    float: right;
-}
-.userinfo{
-    padding: 5px 20px;
-    background: #fff;
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.info{
-    height: 56px;
-    line-height: 56px;
-    border-bottom: solid 1px #e2e7ef;
-    font-size: 16px;
-    color: #22272e;
-    overflow: hidden
-}
-.comback{
-    width: 90px;
-    height: 36px;
-    background-color: #ffe6dc;
-    border-radius: 2px;
-    border: solid 1px #e15616;
-    float: right;
-    line-height: 36px;
-    margin-top: 10px;
-    cursor: pointer;
-    color: #e15616;
-}
-.userinfo .user p{
-    display: inline-block;
-    color: #627386;
-    margin: 15px 45px 15px 0px;
-}
-.userinfo .user p span{
-    color: #22272e;
-}
-.address{
-    margin-bottom: 15px;
-    color: #627386;
-}
-.address span{
-    color: #22272e;
-}
-.goods-info{
-    margin-top: 30px;
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.protitle{
-    font-size: 16px;
-    margin: 15px 20px;
-    color: #22272e
-}
-.goods_img{
-    width: 100px;
-	height: 100px;
-	border: solid 1px #e2e7ef;
-    float: left
-}
-.goods_img img{
-    width: 100%;
-    height: 100%;
-}
-.goods-list{
-    overflow: hidden;
-    height: 136px;
-    background: #fff;
-    padding-top: 10px
-}
-.goods-btn{
-    float: left;
-    width: 40px;
-    height: 100%;
-    position: relative;
-    margin-left: 20px;
-    line-height: 136px
-}
-.goods{
-    float: left;
-    margin-top: 15px;
-}
-.goods_item{
-    float: left;
-    margin-left: 15px;
-}
-.goods_item h3{
-    color: #22272e;
-    font-size: 16px;
-    text-overflow: ellipsis;
-    width: 500px;
-    white-space: nowrap
-}
-.goods_item p span{
-    color: #627386;
-    margin: 15px 30px 15px 0;
-    display: inline-block
-}
-.red{
-    color: #f94b4b;
-}
-.delivery-number{
-    color: #627386;
-}
-.sp-delivery-cal{
-    width: 24px;
-	height: 24px;
-    line-height:24px;
-    text-align: center;
-	background-color: #fef6f3;
-	border-radius: 2px;
-	border: solid 1px #ffe6dc;
-    display: inline-block;
-    vertical-align: middle;
-    cursor: pointer
-}
-.del-num{
-    line-height: 24px;
-    width: 48px;
-    height: 24px;
-    margin: 0 -5px;
-    border-left: 0;
-    border-right: 0;
-    outline: 0;
-    text-align: center;
-    border: solid 1px #ffe6dc;
-    vertical-align: middle;
-    color: #E15616;
-}
-input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-    input[type="number"]{
-        -moz-appearance: textfield;
-    }
-.allcheck{
-    height: 60px;
-    background: #fff;
-    font-size: 16px;
-    color: #22272e;
-    border-top: solid 1px #efefef
-}
-.delivery-button{
-    float: right;
-    margin: 10px;
-}
-.all-election{
-    float: left;
-    width: 60px;
-    height: 100%;
-    margin-left: 20px;
-    line-height: 60px;
-}
-.delivery-button button{
-    width: 90px;
-	height: 36px;
-	line-height: 36px;
-	text-align: center;
-	background-color: #ffe6dc;
-	border-radius: 2px;
-	border: solid 1px #e15616;
-	color: #e15616;
-	margin-right: 15px;
-	cursor: pointer;
-}
+    .crumbs{font-size: 16px;color: #22272e}
+    .userinfo{padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .info{height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback{width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #e15616;}
+    .userinfo .user p{display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span{color: #22272e;}
+    .address{margin-bottom: 15px;color: #627386;}
+    .address span{color: #22272e;}
+    .goods-info{margin-top: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .protitle{font-size: 16px;margin: 15px 20px;color: #22272e}
+    .goods_img{width: 100px;height: 100px;border: solid 1px #e2e7ef;float: left}
+    .goods_img img{width: 100%;height: 100%;}
+    .goods-list{overflow: hidden;height: 136px;background: #fff;padding-top: 10px}
+    .goods-btn{float: left;width: 40px;height: 100%;position: relative;margin-left: 20px;line-height: 136px}
+    .goods{float: left;margin-top: 15px;}
+    .goods_item{float: left;margin-left: 15px;}
+    .goods_item h3{color: #22272e;font-size: 16px;text-overflow: ellipsis;width: 500px;white-space: nowrap}
+    .goods_item p span{color: #627386;margin: 15px 30px 15px 0;display: inline-block}
+    .red{color: #f94b4b;}
+    .delivery-number{color: #627386;}
+    .sp-delivery-cal{width: 24px;height: 24px;line-height:24px;text-align: center;background-color: #fef6f3;border-radius: 2px;border: solid 1px #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
+    .del-num{line-height: 24px;width: 48px;height: 24px;margin: 0 -5px;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid 1px #ffe6dc;vertical-align: middle;color: #E15616;}
+    input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
+    input[type="number"]{-moz-appearance: textfield;}
+    .allcheck{height: 60px;background: #fff;font-size: 16px;color: #22272e;border-top: solid 1px #efefef}
+    .delivery-button{float: right;margin: 10px;}
+    .all-election{float: left;width: 60px;height: 100%;margin-left: 20px;line-height: 60px;}
+    .delivery-button button{width: 90px;height: 36px;line-height: 36px;text-align: center;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;color: #e15616;margin-right: 15px;cursor: pointer;}
 }
 
 
 
 /*移动端*/
 @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%;
-}
-.userinfo{
-    padding: 5px 20px;
-    background: #fff;
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.info{
-    height: 13.3vw;
-    line-height: 13.3vw;
-    font-size: 3.4vw;
-    color: #22272e;
-    overflow: hidden
-}
-.comback{
-    width: 22.4vw;
-    height: 7.2vw;
-    background-color: #ffe6dc;
-    border-radius: 4.5vw;
-    border: solid 1px #e15616;
-    float: right;
-    line-height: 7.2vw;
-    margin-top: 2.7vw;
-    cursor: pointer;
-    color: #e15616
-}
-.userinfo .user p{
-    display: inline-block;
-    color: #627386;
-    margin: 0 10px 10px 0;
-}
-.userinfo .user p:nth-child(1){
-    width: 100%;
-}
-.userinfo .user p span{
-    color: #22272e;
-}
-.address{
-    margin-bottom: 15px;
-    color: #627386;
-}
-.address span{
-    color: #22272e;
-}
-.goods-info{
-    box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-}
-.protitle{
-    font-size: 3.7vw;
-    margin: 3.3vw 5.3vw;
-    color: #22272e
-}
-.goods_img{
-    width: 24vw;
-    height: 24vw;
-    border: solid 1px #e2e7ef;
-    float: left;
-    margin-top: 4vw
-}
-.goods_img img{
-    width: 100%;
-    height: 100%;
-}
-.goods-list{
-    overflow: hidden;
-    height: 41.6vw;
-    background: #fff;
-}
-.goods-btn{
-    float: left;
-    width: 8vw;
-    height: 100%;
-    position: relative;
-    margin-left: 4vw;
-    line-height: 41.6vw
-}
-.goods{
-    float: left;
-    width: 85%;
-}
-.goods_item{
-   width: 63%;
-    float: left;
-    margin-left: 2.7vw
-}
-.goods_item h3{
-    color: #22272e;
-    font-size: 3.7vw;
-    padding-top: 3.5vw;
-}
-.goods_item p span:nth-child(1){
-    width: 100%;
-}
-.goods_item p span{
-    color: #627386;
-    margin: 1.3vw 5.3vw 1.3vw 0;
-    display: inline-block
-}
-.red{
-    color: #f94b4b;
-}
-.delivery-number{
-    color: #627386;
-}
-.sp-delivery-cal{
-    width: 4.8vw;
-    height: 4.8vw;
-    line-height: 4.8vw;
-    text-align: center;
-    background-color: #fef6f3;
-    border-radius: .53vw;
-    border: solid .27vw #ffe6dc;
-    display: inline-block;
-    vertical-align: middle;
-    cursor: pointer
-}
-.del-num{
-    line-height: 24px;
-    width: 10.2vw;
-    height: 4.8vw;
-    margin: 0 -1.3vw;
-    border-left: 0;
-    border-right: 0;
-    outline: 0;
-    text-align: center;
-    border: solid .27vw #ffe6dc;
-    vertical-align: middle;
-    color: #E15616;
-    font-size: 2.9vw;
-}
-input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
-    input[type="number"]{
-        -moz-appearance: textfield;
-    }
-.allcheck{
-    height: 60px;
-    background: #fff;
-    color: #22272e;
-    border-top: solid 1px #efefef
-}
-.delivery-button{
-    float: right;
-    margin: 10px;
-}
-.all-election{
-    float: left;
-    width: 16vw;
-    height: 100%;
-    margin-left: 4vw;
-    line-height: 16vw;
-    color: #4a4f58
-}
-.delivery-button button{
-    width: 22.4vw;
-	height: 9.6vw;
-	line-height: 9.6vw;
-	text-align: center;
-	background-color: #ffe6dc;
-	border-radius: .53vw;
-	border: solid .27vw #e15616;
-	color: #e15616;
-	margin-right: 3.8vw;
-	cursor: pointer;
-}
-.delivery-button button.delivery{
-   background-color: #e15616;
-   color: #fff;
-}
+.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%;}
+.userinfo{padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+.info{height: 13.3vw;line-height: 13.3vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+.comback{width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.5vw;border: solid 1px #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616}
+.userinfo .user p{display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
+.userinfo .user p:nth-child(1){width: 100%;}
+.userinfo .user p span{color: #22272e;}
+.address{margin-bottom: 4vw;color: #627386;}
+.address span{color: #22272e;}
+.goods-info{box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+.protitle{font-size: 3.7vw;margin: 3.3vw 5.3vw;color: #22272e}
+.goods_img{width: 24vw;height: 24vw;border: solid .27vw #e2e7ef;float: left;margin-top: 4vw}
+.goods_img img{width: 100%;height: 100%;}
+.goods-list{overflow: hidden;background: #fff;padding-bottom: 3.8vw;}
+.goods-btn{float: left;width: 8vw;height: 100%;position: relative;margin-left: 4vw;line-height: 41.6vw;}
+.goods{float: left;width: 85%;}
+.goods_item{width: 63%;float: left;margin-left: 2.7vw}
+.goods_item h3{color: #22272e;font-size: 3.7vw;padding-top: 3.5vw;}
+.goods_item p span:nth-child(1){width: 100%;}
+.goods_item p span{color: #627386;margin: 1.3vw 5.3vw 1.3vw 0;display: inline-block}
+.red{color: #f94b4b;}
+.delivery-number{color: #627386;}
+.sp-delivery-cal{width: 4.8vw;height: 4.8vw;line-height: 4.8vw;text-align: center;background-color: #fef6f3;border-radius: .53vw;border: solid .27vw #ffe6dc;display: inline-block;vertical-align: middle;cursor: pointer}
+.del-num{line-height: 24px;width: 10.2vw;height: 4.8vw;margin: 0 -1.3vw;border-left: 0;border-right: 0;outline: 0;text-align: center;border: solid .27vw #ffe6dc;vertical-align: middle;color: #E15616;font-size: 2.9vw;}
+input::-webkit-outer-spin-button, input::-webkit-inner-spin-button {-webkit-appearance: none;}
+input[type="number"]{-moz-appearance: textfield;}
+.allcheck{height: 16vw;background: #fff;color: #22272e;border-top: solid .27vw #efefef;margin-top: 3.8vw}
+.delivery-button{float: right;margin:2.7vw;}
+.all-election{float: left;width: 16vw;height: 100%;margin-left: 4vw;line-height: 16vw;color: #4a4f58}
+.delivery-button button{width: 22.4vw;height: 9.6vw;line-height: 9.6vw;text-align: center;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #e15616;color: #e15616;margin-right: 3.8vw;cursor: pointer;}
+.delivery-button button.delivery{background-color: #e15616;color: #fff;}
 }

+ 76 - 456
src/main/resources/static/css/supplier-center/order/detail.css

@@ -1,463 +1,83 @@
 @media screen and (min-width:768px) {
-    .crumbs {
-        font-size: 16px;
-        color: #22272e
-    }
-
-    .right {
-        width: 968px;
-        float: right;
-    }
-
-    .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 56px;
-        line-height: 56px;
-        border-bottom: solid 1px #e2e7ef;
-        font-size: 16px;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 90px;
-        height: 36px;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        float: right;
-        line-height: 36px;
-        margin-top: 10px;
-        cursor: pointer;
-        color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 15px 45px 15px 0px;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-
-    .product-info {
-        margin-top: 20px;
-    }
-
-    .price {
-        overflow: hidden;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px;
-        float: left;
-    }
-
-    .price-right {
-        float: right;
-        padding: 15px;
-        color: #22272e;
-    }
-
-    .red {
-        color: #f94b4b;
-    }
-
-    .product {
-        background: #fff;
-        padding: 10px 15px;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .product-title {
-        border-bottom: solid 1px #e2e7ef;
-        height: 54px;
-        line-height: 54px
-    }
-
-    .product-title li {
-        display: inline-block;
-        list-style: none;
-        color: #627386;
-        width: 17%;
-        text-align: center;
-
-    }
-
-    .product-title li:nth-child(1) {
-        width: 46%;
-        text-align: left
-    }
-
-    .pro-information li {
-        list-style: none;
-    }
-
-    .pro-information li {
-        width: 100%;
-        padding: 10px 0;
-    }
-
-    .pro-information li div {
-        display: inline-block;
-        width: 17%;
-        text-align: center;
-        color: #627386;
-    }
-
-    .pro-information li div.product-img {
-        width: 46%;
-        text-align: left;
-    }
-
-    .product-img img {
-        width: 70px;
-        height: 70px;
-        border: solid 1px #e2e7ef;
-    }
-
-    .product-img h3 {
-        display: inline-block;
-        width: 300px;
-        margin-left: 10px;
-        font-size: 16px;
-        color: #22272e;
-        vertical-align: middle;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-inline-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
-    }
-
-    .info-title {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px;
-    }
-
-    .title-name {
-        color: #22272e;
-        margin-bottom: 20px
-    }
-
-    .title-time {
-        float: right;
-        color: #9aa5b5;
-    }
-
-    .order-item {
-        display: flex
-    }
-
-    .order-item p {
-        margin-bottom: 20px;
-        display: inline-block;
-        color: #627386;
-        width: 25%
-    }
-
-    .red {
-        color: #f94b4b;
-    }
-
-    .order-info {
-        margin-top: 20px;
-    }
-
-    .order-info .content {
-        background: #fff;
-        padding: 15px;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .order-item.pay span {
-        color: #e15616;
-    }
-
-    .sett-re {
-        margin-top: 20px
-    }
-
-    .sett-re div:nth-child(1) {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px
-    }
-
-    .sett-re div:nth-child(2) {
-        background: #fff;
-        height: 60px;
-        line-height: 60px;
-        padding-left: 15px;
-        color: #22272e
-    }
-
-    .sett-re div:nth-child(2) p {
-        display: inline-block;
-        margin-right: 15px
-    }
+    .crumbs {font-size: 16px;color: #22272e}
+    .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #e15616;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 15px;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {margin-top: 20px;}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px;float: left;}
+    .price-right {float: right;padding: 15px;color: #22272e;}
+    .red {color: #f94b4b;}
+    .product {background: #fff;padding: 10px 15px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .product-title {border-bottom: solid 1px #e2e7ef;height: 54px;line-height: 54px}
+    .product-title li {display: inline-block;list-style: none;color: #627386;width: 17%;text-align: center;}
+    .product-title li:nth-child(1) {width: 46%;text-align: left}
+    .pro-information li {list-style: none;}
+    .pro-information li {width: 100%;padding: 10px 0;}
+    .pro-information li div {display: inline-block;width: 17%;text-align: center;color: #627386;}
+    .pro-information li div.product-img {width: 46%;text-align: left;}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .info-title {color: #22272e;font-size: 16px;padding: 15px;}
+    .title-name {color: #22272e;margin-bottom: 20px}
+    .title-time {float: right;color: #9aa5b5;}
+    .order-item {display: flex}
+    .order-item p {margin-bottom: 20px;display: inline-block;color: #627386;width: 25%}
+    .red {color: #f94b4b;}
+    .order-info {margin-top: 20px;}
+    .order-info .content {background: #fff;padding: 15px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .order-item.pay span {color: #e15616;}
+    .sett-re {margin-top: 20px}
+    .sett-re div:nth-child(1) {color: #22272e;font-size: 16px;padding: 15px}
+    .sett-re div:nth-child(2) {background: #fff;height: 60px;line-height: 60px;padding-left: 15px;color: #22272e}
+    .sett-re div:nth-child(2) p {display: inline-block;margin-right: 15px}
 }
 
 
 /*移动*/
 @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%;
-    }
-
-    .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 13vw;
-        line-height: 13vw;
-        font-size: 3.4vw;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 22.4vw;
-        height: 7.2vw;
-        background-color: #ffe6dc;
-        border-radius: 4.8vw;
-        border: solid .27vw #e15616;
-        float: right;
-        line-height: 7.2vw;
-        margin-top: 2.7vw;
-        cursor: pointer;
-        color: #e15616
-    }
-    .userinfo .user p:nth-child(1){
-        width: 100%;
-    }
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 0 10px 10px 0;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-
-    .product-info {
-       margin-top: 4vw;
-        background: #fff
-    }
-
-    .price {
-        overflow: hidden;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 3.4vw;
-        padding: 4vw;
-        float: left
-    }
-
-    .price-right {
-        float: right;
-        padding: 4vw;
-        color: #22272e
-    }
-
-    .red {
-        color: #f94b4b;
-    }
-
-    .product {
-        background: #fff;
-        padding: 0 4vw;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-        position: relative;
-        height: 45vw
-    }
-
-    .product-title {
-        height: 5.3vw;
-        line-height: 5.3vw;
-        position: relative;
-         width: 100%
-    }
-
-    .product-title li {
-        display: inline-block;
-        list-style: none;
-        color: #627386;
-        position: relative;
-        top: 20vw;
-        width: 30%;
-        text-align: center
-    }
-
-    .product-title li:nth-child(1) {
-        width: 100%;
-        text-align: left;
-        top: 0
-    }
-     .product-title li:nth-child(2) {
-        text-align: left
-    }
-
-    .pro-information li {
-        width: 100%;
-        padding: 10px 0;
-        list-style: none;
-    }
-
-    .pro-information li div {
-        display: inline-block;
-        text-align: center;
-        top: 9.6vw;
-        width: 30%;
-        position: relative
-    }
-
-    .pro-information li div.product-img {
-        width: 100%;
-        text-align: left;
-        top: 0
-    }
-    .pro-information li div:nth-child(2){
-        text-align: left;
-    }
-    .product-img img {
-        width: 15vw;
-        height: 15vw;
-        border: solid 1px #e2e7ef
-    }
-
-    .product-img h3 {
-        display: inline-block;
-        width: 78%;
-        font-size:3.4vw;
-        letter-spacing: .27vw;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap
-    }
-
-    .info-title {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px;
-    }
-
-    .title-name {
-        color: #22272e;
-        margin-bottom: 20px
-    }
-
-    .title-time {
-        float: right;
-        color: #9aa5b5;
-    }
-
-    .order-item {
-        display: flex
-    }
-
-    .order-item p {
-        margin-bottom: 20px;
-        display: inline-block;
-        color: #627386;
-        width: 25%
-    }
-
-    .red {
-        color: #f94b4b;
-    }
-
-    .order-info {
-        margin-top: 20px;
-    }
-
-    .order-info .content {
-        background: #fff;
-        padding: 15px;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .order-item.pay span {
-        color: #e15616;
-    }
-
-    .sett-re {
-        margin-top: 20px
-    }
-
-    .sett-re div:nth-child(1) {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px
-    }
-
-    .sett-re div:nth-child(2) {
-        background: #fff;
-        height: 60px;
-        line-height: 60px;
-        padding-left: 15px;
-        color: #22272e
-    }
-
-    .sett-re div:nth-child(2) p {
-        display: inline-block;
-        margin-right: 15px
-    }
+    .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%;}
+    .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid .27vw #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616}
+    .userinfo .user p:nth-child(1){width: 100%;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .product-info {margin-top: 4vw;background: #fff}
+    .price {overflow: hidden;}
+    .protitle {color: #22272e;font-size: 3.4vw;padding: 4vw;float: left}
+    .price-right {float: right;padding: 4vw;color: #22272e}
+    .red {color: #f94b4b;}
+    .product {background: #fff;padding: 0 4vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);position: relative;height: 45vw}
+    .product-title {height: 5.3vw;line-height: 5.3vw;position: relative;width: 100%}
+    .product-title li {display: inline-block;list-style: none;color: #627386;position: relative;top: 20vw;width: 30%;text-align: center}
+    .product-title li:nth-child(1) {width: 100%;text-align: left;top: 0}
+    .product-title li:nth-child(2) {text-align: left}
+    .pro-information li {width: 100%;padding: 2.7vw 0;list-style: none;}
+    .pro-information li div {display: inline-block;text-align: center;top: 9.6vw;width: 30%;position: relative}
+    .pro-information li div.product-img {width: 100%;text-align: left;top: 0}
+    .pro-information li div:nth-child(2){text-align: left;}
+    .product-img img {width: 15vw;height: 15vw;border: solid 1px #e2e7ef}
+    .product-img h3 {width: 36.8vw;font-size: 3.4vw;letter-spacing: .27vw;white-space: normal;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .info-title {color: #22272e;font-size: 3.4vw;padding: 4vw;}
+    .title-name {color: #22272e;margin-bottom: 5.3vw}
+    .title-time {float: right;color: #9aa5b5;}
+    .order-item p {margin-bottom: 5.3vw;display: inline-block;color: #627386;width: 48%}
+    .red {color: #f94b4b;}
+    .order-info {margin-top:5.3vw;}
+    .order-info .content {background: #fff;padding: 4vw;box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07);}
+    .order-item.pay span {color: #e15616;}
+    .sett-re {margin-top:5.3vw}
+    .sett-re div:nth-child(1) {color: #22272e;font-size:3.4vw;padding: 4vw}
+    .sett-re div:nth-child(2) {background: #fff;line-height: 8vw;padding-left: 4vw;color: #22272e}
+    .sett-re div:nth-child(2) p {display: inline-block;margin-right: 2.7vw}
 }

+ 72 - 217
src/main/resources/static/css/supplier-center/order/logistics-detail.css

@@ -1,221 +1,76 @@
 
 @media screen and (min-width:768px) {
-    .crumbs {
-        font-size: 16px;
-        color: #22272e
-    }
-
-    .right {
-        width: 968px;
-        float: right;
-    }
-
-    .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 56px;
-        line-height: 56px;
-        border-bottom: solid 1px #e2e7ef;
-        font-size: 16px;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 90px;
-        height: 36px;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        float: right;
-        line-height: 36px;
-        margin-top: 10px;
-        cursor: pointer;
-        color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 15px 45px 15px 0px;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-
-    .record-product {
-        margin-top: 20px;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px 20px;
-    }
-
-    .product ul li {
-        list-style: none;
-        display: inline-block;
-    }
-
-    .product-title li {
-        width: 11%;
-        text-align: center;
-    }
-
-    .product-title li:nth-child(1) {
-        width: 50%;
-        text-align: left;
-    }
-
-    .product {
-        padding: 0 21px;
-        background: #fff;
-        overflow: hidden;
-        padding-bottom: 30px;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)
-    }
-
-    .product-title {
-        height: 56px;
-        line-height: 56px;
-        color: #627386;
-        border-bottom: solid 1px #e2e7ef
-    }
-
-    .product-info li {
-        width: 100%;
-        padding: 15px 0
-    }
-
-    .product-img h3 {
-        display: inline-block;
-        width: 300px;
-        margin-left: 10px;
-        font-size: 16px;
-        letter-spacing: 1px;
-        color: #22272e;
-        vertical-align: middle;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-inline-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
-    }
-
-    .product-info li div.product-img {
-        width: 50%;
-        text-align: left
-    }
-
-    .product-img img {
-        width: 70px;
-        height: 70px;
-        border: solid 1px #e2e7ef;
-    }
-
-    .product-info li div {
-        display: inline-block;
-        width: 11%;
-        text-align: center;
-        color: #627386
-    }
-
-    .record-time {
-        color: #9aa5b5;
-        font-size: 12px;
-        padding-top: 5px
-    }
-
-    .img-remark span {
-        color: #627386;
-    }
-
-    .img-remark ul {
-        display: inline-block;
-    }
-
-    .img-remark li {
-        display: inline-block;
-        width: 50px;
-        height: 50px;
-        margin-left: 10px;
-    }
-    .img-remark{
-        margin: 30px 0;
-    }
-
-    .img-remark li img {
-        width: 100%;
-        height: 100%;
-    }
-
-    .remark {
-        color: #627386;
-    }
-
-    .remark span {
-        color: #22272e;
-    }
-
-    .record-button {
-        float: right;
-        padding: 20px
-    }
-
-    .record-button button {
-        width: 90px;
-        height: 36px;
-        line-height: 36PX;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        text-align: center;
-        color: #e15616;
-        margin-left: 10px;
-        cursor: pointer;
-    }
+    .crumbs {font-size: 16px;color: #22272e}
+   .userinfo {padding: 5px 20px;background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;font-size: 16px;color: #22272e;overflow: hidden}
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;float: right;line-height: 36px;margin-top: 10px;cursor: pointer;color: #e15616;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 15px 45px 15px 0px;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 15px;color: #627386;}
+    .address span {color: #22272e;}
+    .record-product {margin-top: 20px;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .product ul li {list-style: none;display: inline-block;}
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 50%;text-align: left;}
+    .product {padding: 0 21px;background: #fff;overflow: hidden;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
+    .product-info li {width: 100%;padding: 15px 0}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 50%;text-align: left}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
+    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
+    .img-remark{margin: 30px 0;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .record-button {float: right;padding: 20px}
+    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
+    .logis{margin-top: 30px;}
+    .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .logistics-info{background: #fff;padding: 15px 20px;color: #627386;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
+    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
+}
 
-    .logis{
-        margin-top: 30px;
-    }
-    .delivery-logis-title{
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px 20px;
-    }
-    .logistics-info{
-        background: #fff;
-        padding: 15px 20px;
-        color: #627386;
-        box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-    }
-    .logistics-info div{
-         margin-right: 65px;
-         display: inline-block;
-         line-height: 24px
-    }
-    .logistics-record{
-        display: inline-block;
-        width: 100%;
-        color: #333;
-        font-size: 16px;
-        margin: 10px 15px
-    }
+/*移动*/
+@media screen and (max-width:768px) {
+    .crumbs {font-size: 3.4vw;color: #22272e}
+    .userinfo {padding: 1.3vw 5.3vw;background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+    .info {height: 13vw;line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback {width: 22.4vw;height: 7.2vw;background-color: #ffe6dc;border-radius: .53vw;border: solid .27vw #e15616;float: right;line-height: 7.2vw;margin-top: 2.7vw;cursor: pointer;color: #e15616;}
+    .userinfo .user p {display: inline-block;color: #627386;margin: 0 6.7vw 2.7vw 0;}
+    .userinfo .user p span {color: #22272e;}
+    .address {margin-bottom: 4vw;color: #627386;}
+    .address span {color: #22272e;}
+    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .product ul li {list-style: none;display: inline-block;}
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 50%;text-align: left;}
+    .product {padding: 0 21px;background: #fff;overflow: hidden;padding-bottom: 30px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07)}
+    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
+    .product-info li {width: 100%;padding: 15px 0}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;letter-spacing: 1px;color: #22272e;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 50%;text-align: left}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-info li div {display: inline-block;width: 11%;text-align: center;color: #627386}
+    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
+    .img-remark{margin: 30px 0;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .record-button {float: right;padding: 20px}
+    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
+    .logis{background: #fff}
+    .delivery-logis-title{color: #22272e;font-size: 16px;padding: 15px 20px;}
+    .logistics-info{background: #fff;padding: 15px 20px;color: #627386;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .logistics-info div{margin-right: 65px;display: inline-block;line-height: 24px}
+    .logistics-record{display: inline-block;width: 100%;color: #333;font-size: 16px;margin: 10px 15px}
 }

+ 327 - 5
src/main/resources/static/css/supplier-center/order/logistics.css

@@ -3,11 +3,6 @@
         font-size: 16px;
         color: #22272e
     }
-
-    .right {
-        width: 968px;
-        float: right;
-    }
     .userinfo {
         padding: 5px 20px;
         background: #fff;
@@ -339,3 +334,330 @@
      }
 
 }
+
+/*移动*/
+@media screen and (max-width:768px) {
+.crumbs {
+        font-size:3.4vw;
+        color: #22272e
+    }
+    .userinfo {
+        padding: 1.3vw 5.3vw;
+        background: #fff;
+        box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);
+    }
+
+    .info {
+        height: 13vw;
+        line-height: 13vw;
+        font-size: 3.4vw;
+        color: #22272e;
+        overflow: hidden
+    }
+
+    .comback {
+        width: 22.4vw;
+    height: 7.2vw;
+    background-color: #ffe6dc;
+    border-radius: 4.8vw;
+    border: solid .27vw #e15616;
+    float: right;
+    line-height: 7.2vw;
+    margin-top: 2.7vw;
+    cursor: pointer;
+    color: #e15616;
+    }
+
+    .userinfo .user p {
+        display: inline-block;
+        color: #627386;
+        margin: 0 6.7vw 2.7vw 0;
+    }
+    .userinfo .user p:nth-child(1){width: 100%}
+    .userinfo .user p span {
+        color: #22272e;
+    }
+
+    .address {
+        margin-bottom: 4vw;
+        color: #627386;
+    }
+
+    .address span {
+        color: #22272e;
+    }
+    .product-info {
+        box-shadow: 0px .8vw 1.6vw 0px
+		rgba(0, 0, 0, 0.07);
+		    background: #fff;
+    margin-top: 2.7vw
+    }
+
+    .price {
+        overflow: hidden;
+    }
+
+    .protitle {
+        color: #22272e;
+        font-size: 3.4vw;
+        padding: 2.7vw 5.3vw;
+    }
+    .product {
+        background: #fff;
+        padding: 2.7vw 5.3vw;
+        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+        height: 50vw
+    }
+
+    .product-title {
+           height: 5.3vw;
+        line-height: 5.3vw;
+        position: relative;
+        width: 100%
+    }
+
+    .product-title li {
+            display: inline-block;
+        list-style: none;
+        color: #627386;
+        position: relative;
+        top: 26vw;
+        width: 21vw
+
+    }
+
+    .product-title li:nth-child(1) {
+        width: 100%;
+        text-align: left;
+        top: 0;
+    }
+     .pro-information li {
+        list-style: none;
+    }
+
+    .pro-information li {
+        width: 100%;
+        padding: 10px 0;
+    }
+
+    .pro-information li div {
+           display: inline-block;
+        color: #627386;
+        top: 11.6vw;
+        width: 21vw;
+        position: relative
+    }
+
+    .pro-information li div.product-img {
+            width: 100%;
+            text-align: left;
+            top: 0
+    }
+
+    .product-img img {
+        width: 70px;
+        height: 70px;
+        border: solid 1px #e2e7ef;
+    }
+
+    .product-img h3 {
+        display: inline-block;
+            width: 40vw;
+        margin-left: 10px;
+        font-size: 3.4VW;
+        color: #22272e;
+        vertical-align: middle;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-inline-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical
+    }
+    .add-logistics{
+       height: auto;
+        background-color: #ffffff;
+        box-shadow: 0px 3px 6px 0px
+            rgba(0, 0, 0, 0.07);
+        margin-top: 2.7vw;
+        padding: 20px;
+        color: #627386;
+    }
+    .company-number{
+        width: 100%;
+    }
+    .logist-right>div{
+        margin-top: 5px;
+    }
+    .company-number>div{
+        margin: 4vw 0;
+    }
+    .logistics-order-number.company{width: 72vw}
+    .company{
+            width: 75vw;
+        height: 11.8vw;
+        background-color: #ffffff;
+        border-radius: .53vw;
+        border: solid 1px #b8bfca;
+        color: #9aa5b5;
+        padding-left: 2.7vw;
+        margin-top: 2.7vw
+    }
+    input::placeholder,textarea::placeholder {
+        color: #9aa5b5;
+        font-size: 12px;
+    }
+    textarea::placeholder {
+        color: #9aa5b5;
+    }
+    .red{
+        color: #f94b4b;
+    }
+    .companyBtn{
+            width: 11.8vw;
+        height: 11.8vw;
+        background-color: #ffffff;
+        border-radius: .53vw;
+        border: solid 1px #b8bfca;
+        margin-left: .53vw;
+        cursor: pointer;
+        font-size: 4.8vw;
+        color: #b8bfca;
+    }
+    .mIcon.add:before {
+             width: 8vw;
+    height: 8vw;
+    background-position: -9.2vw -61.3vw;
+    position: absolute;
+    top: 5.5vw;
+    right: 8vw
+    }
+    .add-text {
+           font-size: 3.6vw;
+        color: #333330;
+        opacity: 0.5;
+        position: absolute;
+        top: 60%;
+        right: 5.3vw
+    }
+    .upload-file{
+        position: relative;
+        float: left;
+        margin: 0 2.7vw 2.7vw 0px;
+        cursor: pointer;
+        width: 23vw;
+        height: 23vw;
+        border-radius: .53vw;
+        border: solid .27vw #b8bfca
+    }
+    .input-file{
+           width: 23vw;
+        height:23vw;
+        opacity: 0;
+        cursor: pointer;
+        position: absolute
+    }
+    #uploadGoodsImages{
+        overflow: hidden;
+        float: left;
+        width: 90%;
+       margin-top: 2.7vw
+    }
+    .release-from{
+        overflow: hidden;
+    }
+    .upload-file img{
+        width: 100%;
+        height: 100%;
+    }
+    .mIcon.del:before {
+           width: 5.3vw;
+        height: 5.3vw;
+        background-position: -90vw -7.5vw;
+        position: absolute;
+        top: -.8vw;
+        right: -.8vw
+    }
+    .form-upload-tips .icon-wen:before {
+        width: 20px;
+        height: 20px;
+        background-position: -84px -144px;
+        cursor: pointer;
+    }
+    .form-upload-tips .icon-wen:before {
+        width: 20px;
+        height: 20px;
+        background-position: -84px -144px;
+        cursor: pointer;
+    }
+    .wen-tips {
+        width: 300px;
+        height: 47px;
+        background-color: #1890f9;
+        box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);
+        color: #fff;
+        position: absolute;
+        left: inherit;
+        font-size: 12px;
+        text-align: center;
+        line-height: 47px;
+        top: 33px;
+        display: none;
+    }
+    .form-upload-tips{
+        float: left;
+        position: relative;
+    }
+    .form-upload-tips .wen-tips:before {
+        content: '';
+        width: 0px;
+        height: 0px;
+        border-width: 8px;
+        border-style: solid;
+        border-color: transparent transparent #1890f9 transparent;
+        position: absolute;
+        top: -15px;
+        left:5px;
+     }
+      .form-upload-tips:hover .wen-tips {
+         display: block;
+     }
+     .remarks textarea{
+        width: 83.4vw;
+        height: 42.4vw;
+        background-color: #ffffff;
+        border-radius: .53vw;
+        border: solid 1px #b8bfca;
+        resize: none;
+        padding: 2.7vw;
+        color: #9aa5b5;
+     }
+     .remarks{position: relative}
+     .remarks .rema{
+        line-height:10.7vw ;
+     }
+     .size-num {
+         position: absolute;
+        right: 2.7vw;
+        top: 52vw;
+        color: #9aa5b5
+     }
+     .defineBtn button{
+        width: 100%;
+        height: 11.2vw;
+        line-height: 11.2vw;
+        text-align: center;
+        color: #fff;
+        background-color: #e15616;
+        border-radius: .53vw;
+        border: solid .27vw #e15616;
+        cursor: pointer;
+        margin-bottom: 2.7vw
+     }
+     .defineBtn button:nth-child(2){background:#ffe6dc;color: #e15616 }
+     .defineBtn{
+        overflow: hidden;
+           margin-top: 4vw
+     }
+
+}

+ 45 - 266
src/main/resources/static/css/supplier-center/order/record.css

@@ -1,272 +1,51 @@
 
 @media screen and (min-width:768px) {
-    .crumbs {
-        font-size: 16px;
-        color: #22272e
-    }
-
-    .right {
-        width: 968px;
-        float: right;
-    }
-
-    .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 56px;
-        line-height: 56px;
-        border-bottom: solid 1px #e2e7ef;
-        font-size: 16px;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 90px;
-        height: 36px;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        float: right;
-        line-height: 36px;
-        margin-top: 10px;
-        cursor: pointer;
-        color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 15px 45px 15px 0px;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-
-    .record-product {
-        margin-top: 20px;
-    }
-
-    .protitle {
-        color: #22272e;
-        font-size: 16px;
-        padding: 15px 20px;
-    }
-
-    .product ul li {
-        list-style: none;
-        display: inline-block;
-    }
-
-    .product-title li {
-        width: 11%;
-        text-align: center;
-    }
-
-    .product-title li:nth-child(1) {
-        width: 50%;
-        text-align: left;
-    }
-
-    .product {
-        padding: 0 20px;
-        background: #fff;
-        overflow: hidden;
-        box-shadow: 0px 3px 6px 0px
-		rgba(0, 0, 0, 0.07);
-    }
-
-    .product-title {
-        height: 56px;
-        line-height: 56px;
-        color: #627386;
-        border-bottom: solid 1px #e2e7ef
-    }
-
-    .product-info li {
-        width: 100%;
-        padding: 15px 0
-    }
-
-    .product-img h3 {
-        display: inline-block;
-        width: 300px;
-        margin-left: 10px;
-        font-size: 16px;
-        vertical-align: middle;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-inline-box;
-        -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
-    }
-
-    .product-info li div.product-img {
-        width: 50%;
-        text-align: left
-    }
-
-    .product-img img {
-        width: 70px;
-        height: 70px;
-        border: solid 1px #e2e7ef;
-    }
-
-    .product-info li div {
-        display: inline-block;
-        width: 11%;
-        text-align: center
-    }
-
-    .record-time {
-        color: #9aa5b5;
-        font-size: 12px;
-        padding-top: 5px;
-    }
-
-    .img-remark span {
-        color: #627386;
-    }
-
-    .img-remark ul {
-        display: inline-block;
-    }
-
-    .img-remark li {
-        display: inline-block;
-        width: 50px;
-        height: 50px;
-        margin-left: 10px;
-    }
-
-    .img-remark li img {
-        width: 100%;
-        height: 100%;
-    }
-    .img-remark{
-        margin: 20px 0;
-    }
-    .remark {
-        color: #627386;
-    }
-
-    .remark span {
-        color: #22272e;
-    }
-
-    .record-button {
-        float: right;
-        padding: 20px
-    }
-
-    .record-button button {
-        width: 90px;
-        height: 36px;
-        line-height: 36PX;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        text-align: center;
-        color: #e15616;
-        margin-left: 10px;
-        cursor: pointer;
-    }
-
-    .no-delivery-record {
-        width: 968px;
-        height: 423px;
-        background-color: #ffffff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-        position: relative;
-    }
-
-    .no-delivery-record img {
-        position: absolute;
-        top: 0;
-        left: 50%;
-        transform: translate(-50%,50%)
-    }
-    .no-delivery-record p{
-        position: absolute;
-        top: 62%;
-        left: 50%;
-        transform: translate(-50%,50%);
-        font-size: 16px;
-        color: #4a4f58
-    }
-    .no-delivery-record span{
-        color: #e15616;
-    }
+    .crumbs {font-size: 16px;color: #22272e }
+    .userinfo { padding: 5px 20px; background: #fff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
+    .info {height: 56px;line-height: 56px; border-bottom: solid 1px #e2e7ef;font-size: 16px; color: #22272e; overflow: hidden }
+    .comback {width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;float: right; line-height: 36px; margin-top: 10px;cursor: pointer;color: #e15616; }
+    .userinfo .user p {display: inline-block;color: #627386; margin: 15px 45px 15px 0px; }
+    .userinfo .user p span { color: #22272e; }
+    .address {margin-bottom: 15px; color: #627386;}
+    .address span {color: #22272e; }
+    .record-product { margin-top: 20px; }
+    .protitle {color: #22272e;font-size: 16px;padding: 15px 20px; }
+    .product ul li {list-style: none;display: inline-block; }
+    .product-title li {width: 11%;text-align: center;}
+    .product-title li:nth-child(1) {width: 50%;text-align: left; }
+    .product {padding: 0 20px;background: #fff;overflow: hidden;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07); }
+    .product-title {height: 56px;line-height: 56px;color: #627386;border-bottom: solid 1px #e2e7ef}
+    .product-info li {width: 100%;padding: 15px 0}
+    .product-img h3 {display: inline-block;width: 300px;margin-left: 10px;font-size: 16px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .product-info li div.product-img {width: 50%;text-align: left}
+    .product-img img {width: 70px;height: 70px;border: solid 1px #e2e7ef;}
+    .product-info li div {display: inline-block;width: 11%;text-align: center}
+    .record-time {color: #9aa5b5;font-size: 12px;padding-top: 5px;}
+    .img-remark span {color: #627386;}
+    .img-remark ul {display: inline-block;}
+    .img-remark li {display: inline-block;width: 50px;height: 50px;margin-left: 10px;}
+    .img-remark li img {width: 100%;height: 100%;}
+    .img-remark{margin: 20px 0;}
+    .remark {color: #627386;}
+    .remark span {color: #22272e;}
+    .record-button {float: right;padding: 20px}
+    .record-button button {width: 90px;height: 36px;line-height: 36PX;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;color: #e15616;margin-left: 10px;cursor: pointer;}
+    .no-delivery-record {width: 968px;height: 423px;background-color: #ffffff;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);position: relative;}
+    .no-delivery-record img {position: absolute;top: 0;left: 50%;transform: translate(-50%,50%)}
+    .no-delivery-record p{position: absolute;top: 62%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
+    .no-delivery-record span{color: #e15616;}
 }
 
 /*移动*/
 @media screen and (max-width:768px) {
-        .userinfo {
-        padding: 5px 20px;
-        background: #fff;
-        box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
-    }
-
-    .info {
-        height: 56px;
-        line-height: 56px;
-        border-bottom: solid 1px #e2e7ef;
-        font-size: 16px;
-        color: #22272e;
-        overflow: hidden
-    }
-
-    .comback {
-        width: 90px;
-        height: 36px;
-        background-color: #ffe6dc;
-        border-radius: 2px;
-        border: solid 1px #e15616;
-        float: right;
-        line-height: 36px;
-        margin-top: 10px;
-        cursor: pointer;
-        color: #e15616;
-    }
-
-    .userinfo .user p {
-        display: inline-block;
-        color: #627386;
-        margin: 15px 45px 15px 0px;
-    }
-
-    .userinfo .user p span {
-        color: #22272e;
-    }
-
-    .address {
-        margin-bottom: 15px;
-        color: #627386;
-    }
-
-    .address span {
-        color: #22272e;
-    }
-
-    .record-product {
-        margin-top: 20px;
-    }
-
+    .userinfo { padding: 1.3vw 3.2vw; background: #fff;box-shadow: 0 .8vw 1.6vw 0 rgba(0, 0, 0, 0.07);}
+    .info { height: 13vw; line-height: 13vw;font-size: 3.4vw;color: #22272e;overflow: hidden}
+    .comback { width: 22.4vw; height: 7.2vw;background-color: #ffe6dc;border-radius: 4.8vw;border: solid 1px #e15616; float: right;line-height: 7.2vw; margin-top: 2.7vw;cursor: pointer;  color: #e15616}
+    .userinfo .user p:nth-child(1){ width: 100%; }
+    .userinfo .user p { display: inline-block;color: #627386; margin: 0 8vw 4vw 0; }
+    .userinfo .user p span { color: #22272e; }
+    .address {margin-bottom: 4vw;color: #627386; }
+    .address span { color: #22272e; }
     .protitle {
         color: #22272e;
         font-size: 16px;
@@ -277,16 +56,16 @@
         display: inline-block;
     }
     .product-title li {
-        width: 11%;
+        width: 19%;
         text-align: center;
     }
 
     .product-title li:nth-child(1) {
-        width: 50%;
+        /*width: 50%;*/
         text-align: left;
     }
     .product{
-        padding: 0 15px;
+        padding: 0 4vw;
         background: #fff;
         overflow: hidden;
     }

+ 54 - 106
src/main/resources/static/css/supplier-center/order/saleslist.css

@@ -1,107 +1,55 @@
-.sales-list{
-    width: 1056px;
-    margin: 0 auto;
-}
-#saleslist{
-    background: #fff;
-}
-.sales-list>.sales-list-title{
-    width: 100%;
-    height: 120px;
-    line-height: 120px;
-    text-align: center;
-    font-size: 32px;
-    color: #22272e;
-}
-.sales-list>.sales-list-cantent{
-    width: 96%;
-    background: #fff;
-    margin: 0 auto;
-    border-left: 1px solid #b8bfca;
-    border-top: 1px solid #b8bfca;
-    border-bottom: 1px solid #b8bfca;
-}
-.sales-list>.sales-list-cantent>.number-time,
-.sales-list>.sales-list-cantent>.buyer-supplier,
-.sales-list>.sales-list-cantent>.delivery-info{
-    width: 100%;
-    height: 48px;
-    display: flex;
-    flex: 4;
-}
-.sales-list>.sales-list-cantent>.number-time>div,
-.sales-list>.sales-list-cantent>.buyer-supplier>div,
-.sales-list>.sales-list-cantent>.delivery-info>div{
-    width: 10%;
-    height: 100%;
-    border-right: 1px solid #b8bfca;
-    border-bottom: 1px solid #b8bfca;
-    text-align: left;
-    text-indent: 10px;
-    line-height: 48px;
-}
-.sales-list>.sales-list-cantent>.number-time>div:nth-child(2),
-.sales-list>.sales-list-cantent>.number-time>div:nth-child(4),
-.sales-list>.sales-list-cantent>.buyer-supplier>div:nth-child(2),
-.sales-list>.sales-list-cantent>.buyer-supplier>div:nth-child(4){
-  width: 40%;
-}
-.sales-list>.sales-list-cantent>.delivery-info>div:nth-child(2){
-    width: 90%;
-}
-.sales-list>.sales-list-cantent>.goods-info{
-    width: 100%;
-    display: flex;
-    flex: 2;
-    line-height: 10px;
-}
-.sales-list>.sales-list-cantent>.goods-info>div{
-    width: 10%;
-    border-right: 1px solid #b8bfca;
-    border-bottom: 1px solid #b8bfca;
-    text-indent: 10px;
-    line-height: 35px;
-}
-.sales-list>.sales-list-cantent>.goods-info>.goods-info-conent{
-    width: 90%;
-}
-.sales-list>.sales-list-cantent>.total-amount{
-    width: 100%;
-    height: 40px;
-    border-right: 1px solid #b8bfca;
-    box-sizing: border-box;
-}
-.sales-list>.sales-list-cantent>.total-amount>.print-time-1{
-    float: left;
-    text-indent: 10px;
-}
-.sales-list>.sales-list-cantent>.total-amount>p{
-    float: right;
-    margin-top: 10px;
-    margin-right: 10px;
-}
-.print-time{
-    width: 100%;
-    height: 150px;
-    position: relative;
-}
-.print{
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%,-50%);
-    -moz-transform: translate(-50%,-50%);
-    outline: none;
-    cursor: pointer;
-    width: 232px;
-    height: 50px;
-    background-color: #e15616;
-    box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);
-    border-radius: 2px;
-    border: 0;
-    color: #fff;
-    font-size: 18px
-}
-.colour{
-    color: #627386;
+@media screen and (min-width:768px) {
+    .sales-list {width: 1056px;margin: 0 auto;}
+    #saleslist {background: #fff;}
+    .sales-list > .sales-list-title {width: 100%;height: 120px;line-height: 120px;text-align: center;font-size: 32px;color: #22272e;}
+    .sales-list > .sales-list-cantent {width: 96%;background: #fff;margin: 0 auto;border-left: 1px solid #b8bfca;border-top: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;}
+    .sales-list > .sales-list-cantent > .number-time,
+    .sales-list > .sales-list-cantent > .buyer-supplier,
+    .sales-list > .sales-list-cantent > .delivery-info {width: 100%;height: 48px;display: flex;flex: 4;}
+    .sales-list > .sales-list-cantent > .number-time > div,
+    .sales-list > .sales-list-cantent > .buyer-supplier > div,
+    .sales-list > .sales-list-cantent > .delivery-info > div {width: 10%;height: 100%;border-right: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;text-align: left;text-indent: 10px;line-height: 48px;}
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(4),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(4) {width: 40%;}
+    .sales-list > .sales-list-cantent > .delivery-info > div:nth-child(2) {width: 90%;}
+    .sales-list > .sales-list-cantent > .goods-info {width: 100%;display: flex;flex: 2;line-height: 10px;}
+    .sales-list > .sales-list-cantent > .goods-info > div {width: 10%;border-right: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;text-indent: 10px;line-height: 35px;}
+    .sales-list > .sales-list-cantent > .goods-info > .goods-info-conent {width: 90%;}
+    .sales-list > .sales-list-cantent > .total-amount {width: 100%;height: 40px;border-right: 1px solid #b8bfca;box-sizing: border-box;}
+    .sales-list > .sales-list-cantent > .total-amount > .print-time-1 {float: left;text-indent: 10px;}
+    .sales-list > .sales-list-cantent > .total-amount > p {float: right;margin-top: 10px;margin-right: 10px;}
+    .print-time {width: 100%;height: 150px;position: relative;}
+    .print {position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%);outline: none;cursor: pointer;width: 232px;height: 50px;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;border: 0;color: #fff;font-size: 18px}
+    .colour {color: #627386;}
+}
+
+
+/*移动*/
+@media screen and (max-width:768px) {
+     .sales-list {width: 100%;margin: 0 auto;}
+    #saleslist {background: #fff;}
+    .sales-list > .sales-list-title {width: 100%;height: 120px;line-height: 120px;text-align: center;font-size: 32px;color: #22272e;}
+    .sales-list > .sales-list-cantent {width: 96%;background: #fff;margin: 0 auto;border-left: 1px solid #b8bfca;border-top: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;}
+    .sales-list > .sales-list-cantent > .number-time,
+    .sales-list > .sales-list-cantent > .buyer-supplier,
+    .sales-list > .sales-list-cantent > .delivery-info {width: 100%;height: 48px;display: flex;flex: 4;}
+    .sales-list > .sales-list-cantent > .number-time > div,
+    .sales-list > .sales-list-cantent > .buyer-supplier > div,
+    .sales-list > .sales-list-cantent > .delivery-info > div {width: 10%;height: 100%;border-right: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;text-align: left;text-indent: 10px;line-height: 48px;}
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .number-time > div:nth-child(4),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(2),
+    .sales-list > .sales-list-cantent > .buyer-supplier > div:nth-child(4) {width: 40%;}
+    .sales-list > .sales-list-cantent > .delivery-info > div:nth-child(2) {width: 90%;}
+    .sales-list > .sales-list-cantent > .goods-info {width: 100%;display: flex;flex: 2;line-height: 10px;}
+    .sales-list > .sales-list-cantent > .goods-info > div {width: 10%;border-right: 1px solid #b8bfca;border-bottom: 1px solid #b8bfca;text-indent: 10px;line-height: 35px;}
+    .sales-list > .sales-list-cantent > .goods-info > .goods-info-conent {width: 90%;}
+    .sales-list > .sales-list-cantent > .total-amount {width: 100%;height: 40px;border-right: 1px solid #b8bfca;box-sizing: border-box;}
+    .sales-list > .sales-list-cantent > .total-amount > .print-time-1 {float: left;text-indent: 10px;}
+    .sales-list > .sales-list-cantent > .total-amount > p {float: right;margin-top: 10px;margin-right: 10px;}
+    .print-time {width: 100%;height: 150px;position: relative;}
+    .print {position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);-moz-transform: translate(-50%, -50%);outline: none;cursor: pointer;width: 232px;height: 50px;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;border: 0;color: #fff;font-size: 18px}
+    .colour {color: #627386;}
 }

+ 1 - 1
src/main/resources/static/css/supplier-center/shop/goods.css

@@ -11,7 +11,7 @@ li{list-style: none}
   #newBtn div{height: 36px;border-radius: 2px;display: inline-block;text-align: center;cursor: pointer}
   #newBtn{float: right;margin: 0}
   .query-btn{background-color: #e15616;color: #fff;width: 88px;border: 1px solid #e15616}
-  .goods-main{width: 100%; height: auto; float: left; margin-top: 10px;background: #fff;}
+  .goods-main{width: 100%; height: auto; float: left; margin:10px 0;background: #fff;}
   .goods-main-empty{width: 100%;height: 60px;line-height: 60px;text-align: center;float: left;margin-top: 20px;}
   .goods-main-empty p{font-size: 14px;color: #333;}
   .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}

+ 0 - 5
src/main/resources/static/js/supplier-center/order/detail.js

@@ -3,7 +3,6 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
 var seeDetail = new Vue({
     el:'#seeDetail',
     data:{
-        open:false,
         shopID:'',
         userInfo:{},
         order:{},
@@ -28,10 +27,6 @@ var seeDetail = new Vue({
             }
          })
         },
-       opentittle:function(){
-       var _this = this
-           _this.open = !_this.open;
-    },
     },
     mounted:function () {
        var _self = this;

+ 0 - 4
src/main/resources/static/js/supplier-center/order/logistics.js

@@ -3,7 +3,6 @@ jqMultipleShow("click", ".navList", ".tab", ".con");
 var logistics = new Vue({
     el:'#logistics',
     data:{
-         open:false,
          userInfo:{},
          orderList:[],
          GoodsImagesList:[],
@@ -144,9 +143,6 @@ var logistics = new Vue({
               console.log(_self.kdlist.length);
              }
           });
-      if(isPC){
-            _self.open=true;
-        }
         _self.userInfo =JSON.parse(CAIMEI.Storage.getItem('userInfo'));
         _self.orderList = JSON.parse(CAIMEI.Storage.getItem('orderList'));
 

+ 0 - 4
src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -27,7 +27,6 @@ var orderList = new Vue({
          pageInput: '1',
          listRecord: 0,
          isRequset:false,
-         open:false,
          requestFlag: true,
          noMore: false,
          results:[],
@@ -82,9 +81,6 @@ var orderList = new Vue({
             }
         })
     },
-    opentittle:function(){
-       this.open = !this.open;
-    },
     getpayStatus:function () { //结算状态
         var _this = this;
         if(event.target.value==0){

+ 0 - 7
src/main/resources/static/js/supplier-center/order/record.js

@@ -6,7 +6,6 @@ var deliveryRecode = new Vue({
     userInfo:{},
     results:[],
     isShow:false,
-    open:false,
      pageInput: '1',
      listRecord: 0,
      params:{
@@ -91,12 +90,6 @@ var deliveryRecode = new Vue({
         var _self = this;
          _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
          _self.shipmentsRecord();
-          if(isPC){
-            _self.open=true;
-        }
-              if(isPC){
-            _self.open=true;
-        }
          if(!isPC){
             //移动端上垃加载更多
             $(window).on('scroll', function(){

+ 1 - 1
src/main/resources/templates/components/head-link.html

@@ -1,5 +1,5 @@
 <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, account-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <meta name="viewport" content="width=device-width,account-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">

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

@@ -13,7 +13,7 @@
 
 <!-- 我的采美 -->
 <div id="deliveryRecode">
-    <div class="navLayout">
+    <div class="navLayout" v-cloak="">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>
@@ -21,14 +21,12 @@
             <span>&gt;</span>
             <span>发货记录</span>
         </div>
-        <div v-else class="wrap_tittle mIcon" @click="opentittle">
-            <i class="mIcon open"></i><span style="margin-left: 25px;">发货</span>
-        </div>
+<!--        <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">
             <!--左侧面包屑-->
-            <!--            <div v-show="open">-->
             <template th:replace="supplier-center/components/tableft"></template>
-            <!--            </div>-->
             <div class="right">
                 <div class="userinfo">
                     <p class="info">

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

@@ -13,7 +13,7 @@
 
 <!-- 我的采美 -->
 <div id="delivergoods">
-    <div class="navLayout">
+    <div class="navLayout" v-cloak="">
         <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>

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

@@ -13,22 +13,20 @@
 
 <!-- 我的采美 -->
 <div id="seeDetail">
-    <div class="navLayout">
+    <div class="navLayout" v-cloak="">
             <div class="crumbs" v-if="isPC">
                 <span>我的交易</span>
                 <span>&gt;</span>
                 <span>我的订单</span>
                 <span>&gt;</span>
-                <span>发货记录</span>
+                <span>订单详情</span>
              </div>
-        <div v-else class="wrap_tittle mIcon" @click="opentittle">
-            <i class="mIcon open"></i><span style="margin-left: 25px;">我的订单</span>
-        </div>
+<!--        <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">
             <!--左侧面包屑-->
-            <div v-show="open">
                 <template th:replace="supplier-center/components/tableft"></template>
-            </div>
             <div class="right">
                 <div class="userinfo">
                     <p class="info">
@@ -101,12 +99,10 @@
                     <div class="sett-re">
                         <div>结算记录</div>
                          <div v-if="payflag" v-for="pay in payShopRecord">
-                             <p>{{pay.status}}.结算时间{{pay.payTime}}</p>
-                             <p>结算金额{{pay.payAmount}}</p>
+                             <p>{{pay.status}}.结算时间{{pay.payTime}}</p>
+                             <p>结算金额:¥{{pay.payAmount}}</p>
                          </div>
                     </div>
-
-
                 </div>
             </div>
         </div>

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

@@ -21,9 +21,9 @@
             <span>&gt;</span>
             <span>查看物流</span>
         </div>
-        <div v-else class="wrap_tittle mIcon" @click="opentittle">
-            <i class="mIcon open"></i><span style="margin-left: 25px;">发货</span>
-        </div>
+<!--        <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">
             <!--左侧面包屑-->
 <!--            <div v-show="open">-->

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

@@ -23,9 +23,7 @@
         </div>
         <div class="wrap clear">
             <!--左侧面包屑-->
-            <div v-show="open">
                 <template th:replace="supplier-center/components/tableft"></template>
-            </div>
             <div class="right">
                 <div class="userinfo">
                     <p class="info">

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

@@ -10,10 +10,10 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-    <h1></h1>
+<h1></h1>
 <!-- 我的采美 -->
 <div id="myGoods">
-    <div class="navLayout goods-container"  v-show="isRequest" :class="isRequest ? 'active' : ''">
+    <div class="navLayout goods-container" v-show="isRequest" :class="isRequest ? 'active' : ''">
         <div class="crumbs">
             <span>我的店铺</span>
             <span>&gt;</span>
@@ -25,120 +25,148 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                            <div class='form-row'>
-                                <span>商品货号:</span>
-                                <input type="text" id="name-buyer" v-model="listQuery.productCode" class="Buyer" placeholder="请输入商品货号" maxlength="20">
-                            </div>
-                             <div class="form-row">
-                                <span>商品名称:</span>
-                                <input class="Buyer" v-model="listQuery.name" type="text" maxlength="25" placeholder="请输入商品名称">
-                             </div>
-                            <div class="form-row">
-                                状态:
-                                    <select name="" id="settlement-status" class="state" @change="SelectChangeStateFn($event)">
-                                        <option value="">全部</option>
-                                        <option value="1">待审核</option>
-                                        <option value="8">审核未通过</option>
-                                        <option value="2">已上架</option>
-                                        <option value="3">已下架</option>
-                                        <option value="9">已冻结</option>
-                                        <option value="0">已删除</option>
-                                    </select>
-                                </div>
-                                <div class="form-row">
-                                    主推商品:
-                                        <select name=""  class="state" @change="SelectChangeInsideFn($event)">
-                                            <option value="">请选择</option>
-                                            <option value="1">是</option>
-                                            <option value="0">否</option>
-                                        </select>
-                                 </div>
-                                 <div class="form-row">
-                                    分类:
-                                        <select name=""  class="state" @change="ChangeClassificationFirst($event)">
-                                            <option value="">全部</option>
-                                            <option v-for="x in classificationFirstList" :value="x.bigTypeID">{{x.name}}</option>
-                                        </select>
-                                        <select name=""  class="state" @change="ChangeClassificationTwo($event)">
-                                            <option value="">请选择二级分类</option>
-                                            <option v-for="x in classificationTwoList" :value="x.smallTypeID">{{x.name}}</option>
-                                        </select>
-                                        <select name=""  class="state" @change="ChangeClassificationThree($event)">
-                                            <option value="">请选择三级分类</option>
-                                            <option v-for="x in classificationThreeList" :value="x.tinyTypeID" >{{x.name}}</option>
-                                        </select>
-                                 </div>
-                                <div id="newBtn">
-                                    <div class="query-btn" @click="SearchQueryListFn">搜索</div>
-                                </div>
+                        <div class='form-row'>
+                            <span>商品货号:</span>
+                            <input type="text" id="name-buyer" v-model="listQuery.productCode" class="Buyer"
+                                   placeholder="请输入商品货号" maxlength="20">
+                        </div>
+                        <div class="form-row">
+                            <span>商品名称:</span>
+                            <input class="Buyer" v-model="listQuery.name" type="text" maxlength="25"
+                                   placeholder="请输入商品名称">
+                        </div>
+                        <div class="form-row">
+                            状态:
+                            <select name="" id="settlement-status" class="state" @change="SelectChangeStateFn($event)">
+                                <option value="">全部</option>
+                                <option value="1">待审核</option>
+                                <option value="8">审核未通过</option>
+                                <option value="2">已上架</option>
+                                <option value="3">已下架</option>
+                                <option value="9">已冻结</option>
+                                <option value="0">已删除</option>
+                            </select>
+                        </div>
+                        <div class="form-row">
+                            主推商品:
+                            <select name="" class="state" @change="SelectChangeInsideFn($event)">
+                                <option value="">请选择</option>
+                                <option value="1">是</option>
+                                <option value="0">否</option>
+                            </select>
+                        </div>
+                        <div class="form-row">
+                            分类:
+                            <select name="" class="state" @change="ChangeClassificationFirst($event)">
+                                <option value="">全部</option>
+                                <option v-for="x in classificationFirstList" :value="x.bigTypeID">{{x.name}}</option>
+                            </select>
+                            <select name="" class="state" @change="ChangeClassificationTwo($event)">
+                                <option value="">请选择二级分类</option>
+                                <option v-for="x in classificationTwoList" :value="x.smallTypeID">{{x.name}}</option>
+                            </select>
+                            <select name="" class="state" @change="ChangeClassificationThree($event)">
+                                <option value="">请选择三级分类</option>
+                                <option v-for="x in classificationThreeList" :value="x.tinyTypeID">{{x.name}}</option>
+                            </select>
+                        </div>
+                        <div id="newBtn">
+                            <div class="query-btn" @click="SearchQueryListFn">搜索</div>
+                        </div>
                     </form>
                 </div>
-                  <div class="goods-main" v-if="productsList.length>0">
-                    <div class="goods-table" width="100%" >
-                            <ul class="goods-title">
-                                <li>编号</li>
-                                <li>商品主图</li>
-                                <li>分类</li>
-                                <li>市场价/售价</li>
-                                <li>状态</li>
-                                <li>操作</li>
+                <div class="goods-main" v-if="productsList.length>0">
+                    <div class="goods-table" width="100%">
+                        <ul class="goods-title">
+                            <li>编号</li>
+                            <li>商品主图</li>
+                            <li>分类</li>
+                            <li>市场价/售价</li>
+                            <li>状态</li>
+                            <li>操作</li>
+                        </ul>
+                        <div class="tbody">
+                            <ul v-for="(product, index) in productsList" :key="index"
+                                :class="[product.productsChecked ?'bg-gouxuan':'']">
+                                <li>
+                                    <div class="checkbox" @click='ischeck(product)'>
+                                        <div class="box icon"
+                                             :class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
+                                        <span> {{product.productID}}</span>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="good-info">
+                                        <img :src="product.mainImage" :alt="product.name">
+                                        <p class="good-name">{{product.name}}</p>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="good-classFly">
+                                        <p>{{product.typeName}}</p>
+                                    </div>
+                                </li>
+                                <li>
+                                    <div class="good-price">
+                                        <p>¥{{toFixedFn(product.normalPrice)}}</p>
+                                        <p>/</p>
+                                        <p>¥{{toFixedFn(product.price1)}}</p>
+                                    </div>
+                                </li>
+                                <li>
+                                    <p class="status" :style="{color: StatusColorFn(product.validFlag)}">
+                                        {{StatusTextFn(product.validFlag)}}</p>
+                                </li>
+                                <li>
+                                    <div class="good-handle">
+                                        <a class="btn " href="javascript: void(0);"
+                                           v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1"
+                                           @click="editGoodFn(product)">编辑</a>
+                                        <a class="btn " href="javascript: void(0);"
+                                           v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
+                                        <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured"
+                                           @click="AddPushHotFn(product)">添加主页推荐</a>
+                                        <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured"
+                                           @click="DeletePushHotFn(product)">删除主页推荐</a>
+                                        <a class="btn primary" href="javascript: void(0);"
+                                           v-if="['1','2'].indexOf(product.validFlag)!=-1"
+                                           @click="pageLinkDetils(product)">预览商品</a>
+                                    </div>
+                                </li>
                             </ul>
-                            <div class="tbody">
-                                <ul v-for="(product, index) in productsList" :key="index" :class="[product.productsChecked ?'bg-gouxuan':'']">
-                                    <li>
-                                        <div class="checkbox" @click='ischeck(product)'>
-                                            <div class="box icon" :class="[product.productsChecked ?'icon-gouxuan':'icon-weigouxuan']"></div>
-                                            <span> {{product.productID}}</span>
-                                        </div>
-                                    </li>
-                                    <li>
-                                        <div class="good-info">
-                                            <img :src="product.mainImage" :alt="product.name">
-                                            <p class="good-name">{{product.name}}</p>
-                                        </div>
-                                   </li>
-                                   <li>
-                                        <div class="good-classFly">
-                                            <p>{{product.typeName}}</p>
-                                        </div>
-                                    </li>
-                                    <li >
-                                        <div class="good-price">
-                                            <p>¥{{toFixedFn(product.normalPrice)}}</p>
-                                            <p>/</p>
-                                            <p>¥{{toFixedFn(product.price1)}}</p>
-                                        </div>
-                                    </li>
-                                    <li >
-                                        <p class="status" :style="{color: StatusColorFn(product.validFlag)}">{{StatusTextFn(product.validFlag)}}</p>
-                                    </li>
-                                    <li>
-                                        <div class="good-handle">
-                                            <a class="btn " href="javascript: void(0);" v-if="['0','1','2','3','8','9'].indexOf(product.validFlag)!=-1" @click="editGoodFn(product)">编辑</a>
-                                            <a class="btn " href="javascript: void(0);" v-if="['2'].indexOf(product.validFlag)!=-1" @click="ItemDownshelf(product)">下架</a>
-                                            <a class="btn success" href="javascript: void(0);" v-if="product.isAddFeatured" @click="AddPushHotFn(product)">添加主页推荐</a>
-                                            <a class="btn danger" href="javascript: void(0);" v-if="product.isDelFeatured" @click="DeletePushHotFn(product)">删除主页推荐</a>
-                                            <a class="btn primary" href="javascript: void(0);" v-if="['1','2'].indexOf(product.validFlag)!=-1" @click="pageLinkDetils(product)">预览商品</a>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </div>
+                        </div>
                     </div>
                     <div class="good-footer">
                         <div class="footer-left">
                             <div class="checkbox" @click='checkedAll'>
-                                <div class="box icon" :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']"></div>
+                                <div class="box icon"
+                                     :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']"></div>
                                 <span>全选</span>
                             </div>
                         </div>
                         <div class="footer-right">
-                            <a href="javascript:void(0);" class="btn batch" :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
+                            <a href="javascript:void(0);" class="btn batch"
+                               :class="[isCheckedAll ? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
                         </div>
                     </div>
                 </div>
-                 <div v-else class="goods-main-empty">
+                <div v-else class="goods-main-empty">
                     <p>您还未发布任何商品,快去 <a href="/supplier/product/toRelease.html">发布</a>吧</p>
-                 </div>
+                </div>
+                <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+                 <div class="pageWrap clear" v-if="isPC && pageTotal>1">
+                        <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);" v-text="n"></a>
+                            <span v-else>···</span>
+                        </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>
     </div>
@@ -147,7 +175,8 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript"
+        th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/shop/goods.js(v=${version})}"></script>
 </body>
 </html>