Sfoglia il codice sorgente

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

zhengjinyi 4 anni fa
parent
commit
5104683665

+ 371 - 0
src/main/resources/static/css/supplier-center/delivery.css

@@ -0,0 +1,371 @@
+@media screen and (min-width:768px) {
+.crumbs{
+    padding-left: 220px;
+    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;
+}
+.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
+}
+.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
+}
+}
+
+
+
+/*移动端*/
+@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;
+}
+}

+ 183 - 0
src/main/resources/static/css/supplier-center/detail.css

@@ -0,0 +1,183 @@
+
+ .crumbs {
+        padding-left: 220px;
+        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;
+}
+.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;
+    letter-spacing: 1px;
+}
+.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
+}

+ 7 - 1
src/main/resources/static/css/supplier-center/orderlist.css

@@ -1,4 +1,5 @@
 @media screen and (min-width:768px) {
+.pageWrap{width: 986px}
   .crumbs{
     padding-left: 220px;
     font-size: 16px;
@@ -88,10 +89,14 @@ input::placeholder{
     float: right;
     color: #9aa5b5;
 }
+.order-item{
+    display: flex;
+}
 .order-item p{
     display: inline-block;
     color: #627386;
-    margin: 0 60px 20px 0;
+    width: 25%;
+    margin-bottom: 20px
 }
 .red{
     color: #f94b4b;
@@ -136,6 +141,7 @@ input::placeholder{
 }
 .order-product{
     overflow: hidden;
+    margin-bottom: 10px
 }
 .product-info p{
     color: #627386;

+ 359 - 0
src/main/resources/static/css/supplier-center/record.css

@@ -0,0 +1,359 @@
+
+@media screen and (min-width:768px) {
+    .crumbs {
+        padding-left: 220px;
+        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
+    }
+
+    .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 15px;
+        background: #fff;
+        overflow: hidden;
+    }
+
+    .product-title {
+        height: 56px;
+        line-height: 56px;
+        color: #627386;
+        border-bottom: solid 1px #e2e7ef
+    }
+
+    .product-info li {
+        width: 100%;
+        padding: 10px 0
+    }
+
+    .product-img h3 {
+        display: inline-block;
+        width: 300px;
+        margin-left: 10px;
+        font-size: 16px;
+        letter-spacing: 1px
+    }
+
+    .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: 15px 0
+    }
+
+    .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%;
+    }
+
+    .remark {
+        color: #627386;
+        padding: 10px 0;
+    }
+
+    .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;
+    }
+
+    .protitle {
+        color: #22272e;
+        font-size: 16px;
+        padding: 15px
+    }
+    .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 15px;
+        background: #fff;
+        overflow: hidden;
+    }
+    .product-title{
+        height: 56px;
+        line-height: 56px;
+        color: #627386;
+        border-bottom: solid 1px #e2e7ef
+    }
+    .product-info li{
+        width: 100%;
+        padding: 10px 0
+    }
+    .product-img h3{
+        display: inline-block;
+        width: 300px;
+        margin-left: 10px;
+        font-size: 16px;
+        letter-spacing: 1px
+    }
+    .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: 15px 0
+    }
+    .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%;
+    }
+    .remark{
+        color: #627386;
+        padding: 10px 0;
+    }
+    .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;
+    }
+}

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

@@ -0,0 +1,106 @@
+.sales-list{
+    width: 842px;
+    margin: 0 auto;
+    background: #fafafa;
+}
+.sales-list>.sales-list-title{
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    text-align: center;
+    color: #333;
+    font-size: 30px;
+}
+.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%;
+    background: #fafafa;
+    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;
+}

BIN
src/main/resources/static/img/order/kon.png


+ 111 - 0
src/main/resources/static/js/supplier-center/delivergoods.js

@@ -0,0 +1,111 @@
+var isPC = ($(window).width() > 768);
+var delivergoods = new Vue({
+    el: '#delivergoods',
+    data: {
+        ShopID: '',
+        userInfo: {},
+        productList: [],
+        submitIds: [],//去结算商品Ids
+        inputVal:'',
+        allChecked: false,
+        check:false,
+        open: false,
+    },
+    methods: {
+        opentittle: function () {
+            this.open = !this.open;
+        },
+        computedPrice: function (order) { //单选
+            var _self = this;
+            var productsCheckedLength=0;
+            this.$nextTick(function () {
+                    if(event.target.checked){
+                         _self.submitIds.push(order);
+                         productsCheckedLength++;
+                    }else {
+                      _self.submitIds.splice(_self.submitIds.indexOf(order), 1);
+                    }
+                    if(productsCheckedLength==_self.productList.length){
+                        _self.allChecked=true;
+                    }else {
+                       _self.allChecked=false
+                    }
+            });
+        },
+        ckeckAll: function () { //全選
+            var _self = this;
+            this.$nextTick(function(){
+                if (_self.allChecked) {
+                    _self.submitIds = [];
+                    _self.productList.forEach(function (order) {
+                            _self.check = true;
+                            _self.submitIds.push(order);
+                        })
+                }else{
+                        _self.submitIds = [];
+                    _self.productList.forEach(function(order){
+                        _self.check = false;
+                    });
+                }
+
+            });
+        },
+        delivery:function () {
+        var _this = this;
+        if(_this.submitIds.length==0){
+           CAIMEI.Modal('请至少选择一项商品进行发货','确定','取消',function () {})
+        }else {
+         CAIMEI.Modal('确定发货吗?确定后将不能修改','取消','确定',function () {
+             var obj= JSON.stringify(_this.submitIds);
+               CAIMEI.Storage.setItem('orderList',obj);
+                setTimeout(function(){
+                    window.location.href = '/supplier/order/logistics.html';
+                },200)
+         })
+
+        }
+
+        },
+        changeCountSub:function(order) {//商品数量减
+        var _this = this;
+            if(_this.inputVal > 1) {
+                _this.inputVal--;
+            }
+            order.inputVal =_this.inputVal;
+        },
+        changeaddCount:function (order) {//商品数量加
+            var _this = this;
+            var num=order.notOutStore - order.actualCancelNum;
+            if(_this.inputVal>=num){
+                _this.inputVal =num
+            }else {
+             _this.inputVal++
+            }
+            order.inputVal = _this.inputVal;
+        },
+
+    },
+    created:function(){
+
+    },
+    mounted: function () {
+        var _this = this;
+        if (globalUserData) {
+            _this.ShopID = globalUserData.shopId;
+        }
+        console.log()
+        if (isPC) {
+            _this.open = true;
+        }
+        SupplierApi.ShipmentsInfo({shopOrderId: _this.ShopID}, function (res) {
+            if (res.code == 0) {
+                _this.userInfo = res.data.userInfo;
+                res.data.orderProductList.forEach(function(order){
+                       order.inputVal = order.notOutStore - order.actualCancelNum;
+                       _this.inputVal=order.inputVal
+                    });
+                _this.productList = res.data.orderProductList;
+            }
+        })
+    },
+})

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

@@ -0,0 +1,42 @@
+var isPC = ($(window).width()>768);
+var seeDetail = new Vue({
+    el:'#seeDetail',
+    data:{
+        open:false,
+        shopID:'',
+        userInfo:{},
+        order:{},
+        orderList:[],
+        payShopRecord:[]
+    },
+    methods:{
+        seeshopDetails:function () {
+        var _this=this;
+            SupplierApi.shopOrderDetails({shopOrderId:_this.shopID},function (res) {//列表初始化
+            if(res.code==0){
+                _this.order = res.data.shopOrder
+                _this.userInfo = res.data.shopOrder.userInfo;
+                _this.orderList =res.data.shopOrder.orderProductList
+                if(res.data.payShopRecord==''){
+                _this.payflag = false;
+                 _this.payShopRecord = [];
+                }else {
+                _this.payflag = true;
+                 _this.payShopRecord = res.data.payShopRecord;
+                }
+            }
+         })
+        }
+    },
+    mounted:function () {
+       var _self = this;
+        if(globalUserData){
+            _self.shopID = globalUserData.shopId;
+        }
+        _self.seeshopDetails();
+
+        if(isPC){
+            _self.open=true;
+        }
+    },
+})

+ 14 - 2
src/main/resources/static/js/supplier-center/orderlist.js

@@ -105,14 +105,26 @@ var orderList = new Vue({
             _this.MyOrderList()
     },
     delivery:function (orderID) {//发货
-        window.location.href='/supplier-center/shop/goods.html?shopOrderID='+orderID;
-    }
+        window.location.href='/supplier/order/delivery.html?shopOrderID='+orderID;
+    },
+    record:function (shopOrderID) {//发货记录
+        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
+    },
+    Checklist:function (shopOrderID) {//售货清单
+        window.location.href = '/supplier/order/delivery_record.html?shopOrderID='+shopOrderID;
+    },
+    seedetail:function (shopOrderID) {
+        window.location.href = '/supplier/order/detail.html?shopOrderID='+shopOrderID;
+    },
     },
     mounted:function () {
         var _self = this;
        _self.MyOrderList();
         if(globalUserData){
             _self.params.ShopID = globalUserData.shopId;
+        }
+        if(isPC){
+            _self.open=true;
         }
          if(!isPC){
             //移动端上垃加载更多

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

@@ -0,0 +1,112 @@
+var isPC = ($(window).width()>768);
+var deliveryRecode = new Vue({
+    el:'#deliveryRecode',
+    data:{
+    userInfo:{},
+    logisticsList:[],
+    isShow:false,
+    open:false,
+     pageInput: '1',
+     listRecord: 0,
+     params:{
+         shopOrderId:'',
+         pageNum: 1,
+         pageSize: 10,
+     },
+     noMore: false,
+      isRequset:false,
+    },
+     computed: {
+        pageTotal: function () {
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            return total > 0 ? total : 1;
+        },
+
+        showPageBtn: function () {
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
+            total = total > 0 ? total : 1;
+            var index = this.params.pageNum, arr = [];
+            if (total <= 6) {
+                for (var i = 1; i <= total; i++) {
+                    arr.push(i);
+                }
+                return arr;
+            }
+            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
+            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
+            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
+        }
+    },
+    methods:{
+         toPagination: function (pageNum) {
+            if (pageNum <= this.pageTotal) {
+                this.params.pageNum = pageNum;
+                this.shipmentsRecord(this.params);
+            }
+        },
+     checkNum: function () {
+        if (this.pageInput > this.pageTotal) {
+            this.pageInput = this.pageTotal;
+        } else if (this.pageInput < 1) {
+            this.pageInput = 1;
+        }
+    },
+        shipmentsRecord:function () {
+        var _this = this
+            SupplierApi.shipmentsRecord(_this.params, function (res) {
+            if(res.code==0){
+                _this.userInfo = res.data.userInfo;
+                _this.listRecord = res.data.logisticsBatchPage.totalRecord;
+                var logisticsBatchPage = res.data.logisticsBatchPage;
+                if(logisticsBatchPage.results==''){
+                     _this.logisticsList = [];
+                     _this.isShow = true
+                }else {
+                    _this.logisticsList = logisticsBatchPage.results;
+                    _this.isShow = false
+                }
+            }
+         })
+        }
+    },
+    mounted:function () {
+        var _self = this;
+        if (globalUserData) {
+            _self.params.shopOrderId = globalUserData.shopId;
+        }
+         _self.shipmentsRecord();
+          if(isPC){
+            _self.open=true;
+        }
+              if(isPC){
+            _self.open=true;
+        }
+         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.shipmentsRecord();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
+    }
+})

+ 0 - 0
src/main/resources/static/js/supplier-center/saleslist.js


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

@@ -4,21 +4,114 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/record.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1>发货记录</h1>
+<div id="deliveryRecode">
+    <div class="navLayout">
+        <div class="crumbs" v-if="isPC">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+            <span>&gt;</span>
+            <span>发货记录</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">
+                        <span>买家信息</span>
+                        <button type="button" class="comback" @click="history.go(-1)">返回</button>
+                    </p>
+                    <div class="user">
+                        <p>买家名称:<span>{{userInfo.name}}</span></p>
+                        <p>收货人:<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>联系方式:<span>{{userInfo.mobile}}</span></p>
+                    </div>
+                    <p class="address">收货地址:<span>{{userInfo.address}}</span></p>
+                </div>
+                <div class="record-product">
+                    <div class="protitle">发货记录</div>
+                    <div class="no-delivery-record" v-if="isShow">
+                        <img src="/img/order/kon.png">
+                        <p>此订单还没有发货记录,快去<span>补充</span>他吧</p>
+                    </div>
+                    <div class="product" v-else>
+                        <ul class="product-title">
+                            <li>商品信息</li>
+                            <li>购买数量</li>
+                            <li>已发数量</li>
+                            <li>未发数量</li>
+                            <li>本次发货</li>
+                        </ul>
+                        <ul class="product-info">
+                            <li>
+                                <div class="product-img">
+                                    <img src="https://img-b.caimei365.com/group1/M00/02/F7/Cmgy619YcouAR3uWAABdjZxswlA610.jpg"/>
+                                    <h3>皮肤冷却仪冷风机皮肤冷却仪冷风风皮肤冷却仪冷风机</h3>
+                                </div>
+                                <div>10</div>
+                                <div>100</div>
+                                <div>1000</div>
+                                <div>10000</div>
+                            </li>
+                            <p class="record-time">发货时间:2019-04-03 16:45</p>
+                            <div class="img-remark">
+                                <span>图片备注:</span>
+                                <ul>
+                                    <li>
+                                        <img src="https://img-b.caimei365.com/group1/M00/02/F7/Cmgy619YcouAR3uWAABdjZxswlA610.jpg">
+                                    </li>
+                                    <li>
+                                        <img src="https://img-b.caimei365.com/group1/M00/02/F7/Cmgy619YcouAR3uWAABdjZxswlA610.jpg">
+                                    </li>
+                                </ul>
+                            </div>
+                            <p class="remark">文字备注:<span>这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注</span></p>
+                        </ul>
+                        <div class="record-button">
+                            <button class="view-logistics" type="button">查看物流</button>
+                            <button class="add-logistics" type="button">添加物流</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <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>
 
 <!-- 引入底部 -->
 <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/supplier-center/record.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -4,21 +4,101 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/delivery.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1>发货</h1>
+<div id="delivergoods">
+    <div class="navLayout">
+        <div class="crumbs" v-if="isPC">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+            <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 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">
+                        <span>买家信息</span>
+                        <button type="button" class="comback" @click="history.go(-1)">返回</button>
+                    </p>
+                    <div class="user">
+                        <p>买家名称:<span>{{userInfo.name}}</span></p>
+                        <p>收货人:<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>联系方式:<span>{{userInfo.mobile}}</span></p>
+                    </div>
+                    <p class="address">收货地址:<span>{{userInfo.address}}</span></p>
+                </div>
+
+                <div class="goods-info">
+                    <div class="protitle">商品信息</div>
+                    <form action="">
+                        <div class="goods-list" v-for="order in productList">
+                            <div class="goods-btn">
+                                <input type="checkbox" name="goodList" class="goods-inp"  v-model="check"
+                                       @change="computedPrice(order)"/>
+                            </div>
+                            <div class="goods">
+                                <div class="goods_img">
+                                    <img :src="order.productImage"/>
+                                </div>
+                                <div class="goods_item">
+                                    <h3 class="sp-order-name">{{order.name}}</h3>
+                                    <p>
+                                        <span>规格:{{order.productUnit}}</span>
+                                        <span>已发数量:{{order.shipmentsNum}}</span>
+                                        <span>未发数量:{{order.notOutStore - order.actualCancelNum}}</span>
+                                        <span>购买数量:{{order.num + order.presentNum}}</span>
+                                    </p>
+                                    <div class="delivery-btn">
+                                        <div class="delivery-number">
+                                            <span class="red">*</span>本次发货:
+                                            <span class="sp-delivery-cal sp-delivery-reduce" @click="changeCountSub(order)">-</span>
+                                            <input type="number" class="del-num" v-model="inputVal" />
+                                            <span class="sp-delivery-cal sp-delivery-add" @click="changeaddCount(order)">+</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="allcheck">
+                            <div class="all-election">
+                                <input type="checkbox" @change="ckeckAll()" v-model="allChecked"/>
+                                全选
+                            </div>
+                            <div class="delivery-button">
+                                <button class="delivery" type="button" @click="delivery">发货</button>
+                                <button class="false-btn" type="button">取消</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+
+            </div>
+        </div>
+
+    </div>
 
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
+<script charset="utf-8" type="text/javascript"
+        th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/delivergoods.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -4,20 +4,116 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/detail.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1></h1>
+<div id="seeDetail">
+    <div class="navLayout">
+            <div class="crumbs" v-if="isPC">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+            <span>&gt;</span>
+            <span>发货记录</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">
+                        <span>买家信息</span>
+                        <button type="button" class="comback" @click="history.go(-1)">返回</button>
+                    </p>
+                    <div class="user">
+                        <p>买家名称:<span>{{userInfo.name}}</span></p>
+                        <p>收货人:<span>{{userInfo.shouHuoRen}}</span></p>
+                        <p>联系方式:<span>{{userInfo.mobile}}</span></p>
+                    </div>
+                    <p class="address">收货地址:<span>{{userInfo.address}}</span></p>
+                </div>
+                <div class="product-info">
+                    <div class="price">
+                        <p class="protitle">商品金额</p>
+                        <p class="price-right">结算商品金额:<span class="red">¥{{order.productAmount}}</span></p>
+                    </div>
+                    <div class="product" >
+                        <ul class="product-title">
+                            <li>商品信息</li>
+                            <li>单价</li>
+                            <li>数量(赠品数)</li>
+                            <li>总价</li>
+                        </ul>
+                        <ul class="pro-information">
+                            <li v-for="pro in orderList ">
+                                <div class="product-img">
+                                    <img :src="pro.productImage"/>
+                                    <h3>{{pro.aliasName}}</h3>
+                                </div>
+                                <div>{{pro.price}}</div>
+                                <div>{{pro.num}}({{pro.presentNum}})</div>
+                                <div>{{pro.totalAmount}}</div>
+                            </li>
+                        </ul>
+                    </div>
+
+                    <div class="order-info">
+                      <div class="info-title">订单信息</div>
+                      <div class="content">
+                          <div class="title-name">
+                                <p>订单编号(标识):{{order.shopOrderNo}}</p>
+                           </div>
+                          <div class="order-item pay">
+                                <p>结算状态:&nbsp;
+                                    <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
+                                    <span v-if="order.payStatus==2"> 部分结算</span>
+                                    <span v-if="order.payStatus==3"> 已结算</span>
+                                 </p>
+                                 <p>发货状态:&nbsp;
+                                    <span v-if="order.sendOutStatus==1">待发货</span>
+                                    <span v-if="order.sendOutStatus==null">未发货</span>
+                                    <span v-if="order.sendOutStatus==2">部分发货</span>
+                                    <span v-if="order.sendOutStatus==3">已发货</span>
+                                  </p>
+                          </div>
+                          <div class="order-item">
+                                    <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>总结算金额:<span class="red">¥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
+                                    <p>已结算金额:<span class="red">¥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                             </div>
+                         </div>
+                    </div>
+                    <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>
+                         </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/detail.js(v=${version})}"></script>
 </body>
 </html>

+ 61 - 0
src/main/resources/templates/supplier-center/order/saleslist.html

@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="https://www.thymeleaf.org ">
+<head>
+    <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/supplier-center/saleslist.css(v=${version})}" rel="stylesheet" type="text/css">
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div id="saleslist">
+    <div class="sales-list">
+        <script type="text/template" id="tp1">
+            <div class="sales-list-title">售货清单</div>
+                <div class="sales-list-cantent">
+                <div class="number-time">
+                <div class="colour">订单编号</div>
+                <div>X159885299087339</div>
+                <div class="colour">下单时间</div>
+                <div>2020-08-31 13:49:50</div>
+            </div>
+            <div class="buyer-supplier">
+                <div class="colour">买        家</div>
+            <div >升级测试小吴</div>
+            <div class="colour">供 应 商</div>
+            <div>李俊供应商9</div>
+            </div>
+            <div class="delivery-info">
+                <div class="colour">收货信息</div>
+                <div>北京市市辖区东城区太南门啊啊啊 小严 15917362709</div>
+            </div>
+            <div class="goods-info">
+                <div class="colour">商品信息</div>
+                <div class="goods-info-conent">
+                <p>1.测试充值余额缴纳定金商品</p>
+                <p>数量(赠品数)x11      单价 ¥10      总价 ¥100</p>
+            </div>
+            </div>
+            <div class="total-amount">
+                <p class="print-time-1 colour" >打印时间:<span>2020-09-09 15:29:06</span></p>
+                <p class="colour" >总金额:¥233.2</p>
+            </div>
+            </div>
+            <div class="print-time">
+                <button type="button" class="print">打印</button>
+            </div>
+        </script>
+
+    </div>
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/saleslist.js(v=${version})}"></script>
+</body>
+</html>