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

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

@@ -264,7 +264,7 @@ body{background: #fff}
          border-color: transparent transparent #1890f9 transparent;
          position: absolute;
          top: -15px;
-         right: 31px;
+         left: 35px;
      }
 
      .form-upload-tips {
@@ -286,7 +286,7 @@ body{background: #fff}
          box-shadow: 0px 3px 6px 0px rgba(24, 144, 249, 0.17);
          position: absolute;
          bottom: 10px;
-         right: -32px;
+         left: -32px;
          border-radius: 3px;
          display: none;
      }

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

@@ -1,6 +1,5 @@
 @media screen and (min-width:768px) {
 .crumbs{
-    padding-left: 220px;
     font-size: 16px;
     color: #22272e
 }
@@ -73,6 +72,7 @@
     overflow: hidden;
     height: 136px;
     background: #fff;
+    padding-top: 10px
 }
 .goods-btn{
     float: left;
@@ -92,7 +92,10 @@
 }
 .goods_item h3{
     color: #22272e;
-    font-size: 16px
+    font-size: 16px;
+    text-overflow: ellipsis;
+    width: 500px;
+    white-space: nowrap
 }
 .goods_item p span{
     color: #627386;
@@ -164,7 +167,8 @@ input::-webkit-outer-spin-button,
 	border-radius: 2px;
 	border: solid 1px #e15616;
 	color: #e15616;
-	margin-right: 15px
+	margin-right: 15px;
+	cursor: pointer;
 }
 }
 

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

@@ -1,6 +1,5 @@
 @media screen and (min-width:768px) {
     .crumbs {
-        padding-left: 220px;
         font-size: 16px;
         color: #22272e
     }
@@ -140,8 +139,14 @@
         width: 300px;
         margin-left: 10px;
         font-size: 16px;
-        letter-spacing: 1px;
-        color: #22272e
+        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 {

src/main/resources/static/css/supplier-center/logistics-detail.css

@@ -0,0 +1,222 @@
+
+@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
+    }
+
+    .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;
+        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
+    }
+    .logistics-info{
+        background: #fff;
+        padding: 15px;
+        color: #627386;
+        margin-bottom: 20px;
+        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
+    }
+}

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

@@ -0,0 +1,314 @@
+@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;
+        box-shadow: 0px 3px 6px 0px
+		rgba(0, 0, 0, 0.07);
+    }
+
+    .price {
+        overflow: hidden;
+    }
+
+    .protitle {
+        color: #22272e;
+        font-size: 16px;
+        padding: 15px;
+    }
+    .product {
+        background: #fff;
+        padding: 10px 20px;
+        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: 11%;
+        text-align: center;
+
+    }
+
+    .product-title li:nth-child(1) {
+        width: 50%;
+        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: 11%;
+        text-align: center;
+        color: #627386;
+    }
+
+    .pro-information li div.product-img {
+        width: 50%;
+        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
+    }
+    .add-logistics{
+       height: 395px;
+        background-color: #ffffff;
+        box-shadow: 0px 3px 6px 0px
+            rgba(0, 0, 0, 0.07);
+        margin-top: 20px;
+        padding: 0 20px;
+        color: #627386;
+    }
+    .company-number div{
+        width: 49%;
+        display: inline-block;
+        margin: 2px 0;
+    }
+    .company{
+        width: 210px;
+        height: 36px;
+        background-color: #ffffff;
+        border-radius: 2px;
+        border: solid 1px #b8bfca;
+        color: #627386;
+        padding-left: 10px
+    }
+    input::placeholder,textarea::placeholder {
+        color: #627386;
+        font-size: 12px;
+    }
+    textarea::placeholder {
+        color: #9aa5b5;
+    }
+    .red{
+        color: #f94b4b;
+    }
+    .companyBtn{
+        width: 36px;
+        height: 36px;
+        background-color: #ffffff;
+        border-radius: 2px;
+        border: solid 1px #b8bfca;
+        margin-left: 8px;
+        cursor: pointer;
+        font-size: 18px
+    }
+    .icon.add:before {
+        width: 25px;
+        height: 25px;
+        background-position: -168px -374px;
+        position: absolute;
+        top: 17px;
+        right: 29px;
+    }
+    .add-text {
+        font-size: 12px;
+        color: #333330;
+        opacity: 0.5;
+        position: absolute;
+        top: 60%;
+        right: 13px;
+    }
+    .upload-file{
+        position: relative;
+        float: left;
+        margin: 10px 10px 10px 0px;
+        cursor: pointer;
+        width: 80px;
+        height: 80px;
+        border-radius: 2px;
+        border: solid 1px #b8bfca
+    }
+    .input-file{
+        width: 80px;
+        height: 80px;
+        opacity: 0;
+        cursor: pointer;
+        position: absolute
+    }
+    #uploadGoodsImages{
+        overflow: hidden;
+        float: left;
+        width: 90%
+    }
+    .release-from{
+        overflow: hidden;
+    }
+    .red-color{
+        float: left;
+        height: 80px;
+        line-height: 80px;
+        width: 85px;
+    }
+    .upload-file img{
+        width: 100%;
+        height: 100%;
+    }
+    .icon.del:before {
+        width: 20px;
+        height: 20px;
+        background-position: -116px -138px;
+        position: absolute;
+        top: -3px;
+        right: -3px;
+    }
+    .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: 496px;
+        height: 114px;
+        background-color: #ffffff;
+        border-radius: 2px;
+        border: solid 1px #b8bfca;
+        resize: none;
+        padding: 10px;
+        color: #9aa5b5;
+     }
+     .remarks{
+        margin-top: 25px;
+        position: relative;
+     }
+     .remarks .rema{
+        height: 114px;
+        line-height: 114px;
+        display: inline-block;
+        float: left;
+        width: 85px;
+        text-align: center
+     }
+     .size-num {
+         position: absolute;
+         right: 350px;
+         top: 109px;
+         color: #9aa5b5
+     }
+
+
+}

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

@@ -1,7 +1,6 @@
 @media screen and (min-width:768px) {
 .pageWrap{width: 986px}
   .crumbs{
-    padding-left: 220px;
     font-size: 16px;
     color: #22272e
 }

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

@@ -1,7 +1,6 @@
 
 @media screen and (min-width:768px) {
     .crumbs {
-        padding-left: 220px;
         font-size: 16px;
         color: #22272e
     }
@@ -98,7 +97,7 @@
 
     .product-info li {
         width: 100%;
-        padding: 10px 0
+        padding: 15px 0
     }
 
     .product-img h3 {
@@ -106,7 +105,13 @@
         width: 300px;
         margin-left: 10px;
         font-size: 16px;
-        letter-spacing: 1px
+        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 {
@@ -129,7 +134,7 @@
     .record-time {
         color: #9aa5b5;
         font-size: 12px;
-        padding: 15px 0
+        padding-top: 5px;
     }
 
     .img-remark span {
@@ -151,10 +156,11 @@
         width: 100%;
         height: 100%;
     }
-
+    .img-remark{
+        margin: 30px 0;
+    }
     .remark {
         color: #627386;
-        padding: 10px 0;
     }
 
     .remark span {

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

@@ -51,8 +51,10 @@ var delivergoods = new Vue({
            CAIMEI.Modal('请至少选择一项商品进行发货','确定','取消',function () {})
         }else {
          CAIMEI.Modal('确定发货吗？确定后将不能修改','取消','确定',function () {
-             var obj= JSON.stringify(_this.submitIds);
-               CAIMEI.Storage.setItem('orderList',obj);
+             var orderlist= JSON.stringify(_this.submitIds);
+             var user = JSON.stringify(_this.userInfo);
+               CAIMEI.Storage.setItem('orderList',orderlist);
+               CAIMEI.Storage.setItem('userInfo',user);
                 setTimeout(function(){
                     window.location.href = '/supplier/order/logistics.html';
                 },200)

src/main/resources/static/js/supplier-center/logistics-detail.js

@@ -0,0 +1,23 @@
+var logisticsDetail  = new Vue({
+    el:'#logisticsDetail',
+    data:{
+        params:{
+            logisticsBatchId:834,
+            shopOrderId:16089
+        },
+        userInfo:{},
+        listData:[]
+    },
+    methods:{},
+    mounted:function () {
+    var _self=this;
+    // _self.params.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+    // _self.params.logisticsBatchID=CAIMEI.getUrlParam('logisticsBatchID');
+        SupplierApi.logisticsInfo(_self.params,function (res) {
+                if(res.code==0){
+                    _self.userInfo = res.data.userInfo;
+                    _self.listData = res.data.logisticsBatch
+                }
+        })
+    }
+})

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

@@ -0,0 +1,82 @@
+var isPC = ($(window).width()>768);
+jqMultipleShow("click", ".navList", ".tab", ".con");
+var logistics = new Vue({
+    el:'#logistics',
+    data:{
+         open:false,
+         userInfo:{},
+         orderList:[],
+         GoodsImagesList:[],
+         formData:new FormData(),
+         txtVal: 0,
+         desc:'',
+         kdlist:[],
+         setkdlist:[],
+         codeNum:0,
+         params:{
+            logistics:[//物流
+                {logisticsCompanyCode:''},
+                {logisticsCompanyName:''},
+                {number:''}
+            ],
+            record:[
+                {orderProductId:''},
+                {num:''}
+            ],
+            info:{
+                image:'',
+                note:'',//备注
+                shopOrderId:'',//商品id
+            }
+         }
+    },
+    methods:{
+         uploadGoodsImagesFn: function(event){//上传商品图片
+            var _this = this;
+            var inputDOM = _this.$refs.goodsImages;
+            var file = inputDOM.files;
+            _this.formData.append('file', file[0]);
+            SupplierApi.uploadimg(_this.formData,function(response){
+               _this.GoodsImagesList.push(response.data);
+               _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+                event.target.value = '';
+            });
+        },
+         removeGoodsImagesFn: function(index){//删除商品图片
+            var _this = this;
+            _this.GoodsImagesList.splice(index,1);
+            _this.secondParams.image1 =_this.GoodsImagesList.toString()+',';
+         },
+         descInput:function () {
+             this.txtVal = this.desc.length;
+         },
+         addBtn:function (list) { //添加物流
+             var _this = this;
+              _this.setkdlist.push(list);
+              console.log(_this.setkdlist)
+         },
+         addNum:function(){
+            var _this = this;
+                _this.codeNum++;
+                console.log( _this.codeNum)
+         },
+         subBtn:function (list) {
+            var _this = this;
+             _this.setkdlist.splice(_this.setkdlist.indexOf(list), 1);
+         }
+
+    },
+    mounted:function () {
+      var _self = this;
+          SupplierApi.kdList(function (res) {
+                 if(res.code==0){
+                  _self.kdlist = res.data
+                 }
+               })
+      if(isPC){
+            _self.open=true;
+        }
+        _self.userInfo =JSON.parse(CAIMEI.Storage.getItem('userInfo'));
+        _self.orderList = JSON.parse(CAIMEI.Storage.getItem('orderList'));
+    }
+})

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

@@ -4,7 +4,7 @@ var deliveryRecode = new Vue({
     el:'#deliveryRecode',
     data:{
     userInfo:{},
-    logisticsList:[],
+    results:[],
     isShow:false,
     open:false,
      pageInput: '1',
@@ -60,14 +60,21 @@ var deliveryRecode = new Vue({
                 _this.listRecord = res.data.logisticsBatchPage.totalRecord;
                 var logisticsBatchPage = res.data.logisticsBatchPage;
                 if(logisticsBatchPage.results==''){
-                     _this.logisticsList = [];
+                     _this.results = [];
                      // _this.isShow = true
                 }else {
-                    _this.logisticsList = logisticsBatchPage.results;
+                    _this.results = logisticsBatchPage.results;
                     // _this.isShow = false
                 }
             }
          })
+        },
+        seelogistic:function (logisticsBatchID,shopOrderID) {//查看物流
+           window.location.href='/supplier/order/logistics/detail.html?logisticsBatchID='+logisticsBatchID
+        //   +'&shopOrderId='+shopOrderID+''
+        },
+        addlogistic:function () {
+
         }
     },
     mounted:function () {

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

@@ -0,0 +1,16 @@
+var saleslist = new Vue({
+    el:'#saleslist',
+    data:{
+        isNone:true,
+        shopOrderId:''
+    },
+    methods:{
+        print:function () {
+            window.print();
+            this.isNone = false
+        }
+    },
+    mounted:function () {
+     this.shopOrderId=CAIMEI.getUrlParam('shopOrderID');
+    }
+})

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

@@ -44,11 +44,11 @@
                 </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>
+<!--                        <div class="no-delivery-record" v-if="isShow">-->
+<!--                            <img src="/img/order/kon.png">-->
+<!--                            <p>此订单还没有发货记录，快去<span>补充</span>他吧</p>-->
+<!--                        </div>-->
+                    <div class="product"   v-for="r in results">
                         <ul class="product-title">
                             <li>商品信息</li>
                             <li>购买数量</li>
@@ -57,33 +57,34 @@
                             <li>本次发货</li>
                         </ul>
                         <ul class="product-info">
-                            <li>
+                            <li v-for="order in r.logisticsRecordList">
                                 <div class="product-img">
-                                    <img src="https://img-b.caimei365.com/group1/M00/02/F7/Cmgy619YcouAR3uWAABdjZxswlA610.jpg"/>
-                                    <h3>皮肤冷却仪冷风机皮肤冷却仪冷风风皮肤冷却仪冷风机</h3>
+                                    <img :src="order.image"/>
+                                    <h3>{{order.productName}}</h3>
                                 </div>
-                                <div>10</div>
-                                <div>100</div>
-                                <div>1000</div>
-                                <div>10000</div>
+                                <div>{{order.buyNum}}</div>
+                                <div>{{order.shipmentsNum}}</div>
+                                <div>{{order.notShippedNum}}</div>
+                                <div>{{order.num}}</div>
                             </li>
-                            <p class="record-time">发货时间：2019-04-03 16:45</p>
+                            <p class="record-time">发货时间：{{r.deliveryTime}}</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">
+                                <ul v-if="r.remarkImages!=null">
+                                    <li v-for="cmImg in r.remarkImages">
+                                        <img :src="cmImg">
                                     </li>
                                 </ul>
+                                <span v-else style="color: #22272e">暂无图片备注</span>
                             </div>
-                            <p class="remark">文字备注：<span>这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注这里是我写的文字备注</span></p>
+                            <p class="remark">文字备注：
+                                <span v-if="r.remark!=''&&r.remark!=null">{{r.remark}}</span>
+                                <span v-else>暂无备注</span>
+                            </p>
                         </ul>
                         <div class="record-button">
-                            <button class="view-logistics" type="button">查看物流</button>
-                            <button class="add-logistics" type="button">添加物流</button>
+                            <button class="view-logistics" type="button" @click="seelogistic(r.id)">查看物流</button>
+                            <button class="add-logistics" type="button" @click="addlogistic">添加物流</button>
                         </div>
                     </div>
                 </div>

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

@@ -15,12 +15,12 @@
 <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>
+                <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>

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

@@ -4,21 +4,104 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/logistics-detail.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1>查看物流</h1>
+<div id="logisticsDetail">
+    <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="record-product">
+                    <div class="protitle">发货记录</div>
+                    <div class="product" >
+                        <ul class="product-title">
+                            <li>商品信息</li>
+                            <li>购买数量</li>
+                            <li>已发数量</li>
+                            <li>未发数量</li>
+                            <li>本次发货</li>
+                        </ul>
+                        <ul class="product-info">
+                            <li v-for="order in listData.logisticsRecordList">
+                                <div class="product-img">
+                                    <img :src="order.image"/>
+                                    <h3>{{order.productName}}</h3>
+                                </div>
+                                <div>{{order.buyNum}}</div>
+                                <div>{{order.shipmentsNum}}</div>
+                                <div>{{order.notShippedNum}}</div>
+                                <div>{{order.num}}</div>
+                            </li>
+                            <p class="record-time">发货时间：{{listData.deliveryTime}}</p>
+                            <div class="img-remark">
+                                <span>图片备注：</span>
+                                <ul v-if="listData.remarkImages!=null">
+                                    <li v-for="cmImg in listData.remarkImages">
+                                        <img :src="cmImg">
+                                    </li>
+                                </ul>
+                                <span style="color: #22272e" v-else>暂无图片备注</span>
+                            </div>
+                            <p class="remark">文字备注：
+                                <span v-if="listData.remark!=''&&listData.remark!=null">{{listData.remark}}</span>
+                                <span v-else>暂无备注</span>
+                            </p>
+                        </ul>
 
+                    </div>
+                     <div class="logis">
+                            <div class="delivery-logis-title">物流信息</div>
+                            <div class="logistics-info" v-for="logis in listData.logisticsInformationList">
+                                <div class="logistics-time">物流时间：{{logis.updateDate}}}</div>
+                                <div class="logistics-company">物流公司：{{logis.logisticsCompanyName}}</div>
+                                <div class="logistics-number">物流单号：{{logis.nu}}</div>
+                            </div>
+                            <div class="logistics-record" v-if="listData.logisticsInformationList.length==0">
+                              <p>暂无物流信息</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/logistics-detail.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -4,21 +4,147 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台，做美业，上采美</title>
     <template th:replace="components/head-link"></template>
-
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/logistics.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-    <h1>物流</h1>
+<div id="logistics">
+    <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>
+                    </div>
+                    <div class="product">
+                        <ul class="product-title">
+                            <li>商品信息</li>
+                            <li>购买数量</li>
+                            <li>已发数量</li>
+                            <li>未发数量</li>
+                            <li>本次发货</li>
+                        </ul>
+                        <ul class="pro-information">
+                            <li v-for="order in orderList ">
+                                <div class="product-img">
+                                    <img :src="order.productImage"/>
+                                    <h3>{{order.name}}</h3>
+                                </div>
+                                <div>{{order.num}}</div>
+                                <div>{{order.shipmentsNum}}</div>
+                                <div>{{order.notOutStore - order.actualCancelNum}}</div>
+                                <div>{{order.inputVal}}</div>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="add-logistics">
+                    <div class="add-wrap">
+                        <div class="company-number">
+                            <div class="logist-left">
+                                <i class="red">*</i>
+                                物流公司：
+                                <select name="" class="logistics-company-name company">
+                                <option value="0">请选择</option>
+                                    <option v-for="item in kdlist" :value="item.value">{{item.label}}</option>
+                                </select>
+                                <button class="add-company companyBtn" @click="addBtn(kdlist)">+</button>
+                            </div>
+
+                            <div class="logist-right">
+                                <i class="red">*</i>
+                                物流编号：
+                                <input type="text" class="logistics-order-number company"
+                                       oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
+                                <button class="add-number companyBtn" @click="addNum">+</button>
+                            </div>
+                        </div>
+
+                        <div class="company-number" v-for="kd in setkdlist">
+                            <div class="logist-left">
+                                <i class="red">*</i>
+                                物流公司：
+                                <select name="" class="logistics-company-name company">
+                                <option value="0">请选择</option>
+                                    <option v-for="item in kd" :value="item.value">{{item.label}}</option>
+                                </select>
+                                <button class="add-company companyBtn" @click="subBtn(kd)">-</button>
+                            </div>
 
-</div>
+                            <div class="logist-right">
+                                <i class="red">*</i>
+                                物流编号：
+                                <input type="text" class="logistics-order-number company"
+                                       oninput="value=value.replace(/[^\d]/g,'')" placeholder="请输入物流编号">
+                                <button class="add-number companyBtn">-</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="upload-img">
+                        <div class="release-from ">
+                            <span class="red-color">&nbsp;图片备注：</span>
+                            <div class="release-input" id="uploadGoodsImages">
+                                <div class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+                                    <img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img">
+                                    <i class="icon mIcon del" @click="removeGoodsImagesFn(index)"></i>
+                                </div>
+                                <div class="upload-file" v-show="GoodsImagesList.length<5">
+                                    <i class="icon mIcon add"></i>
+                                    <p class="add-text">添加图片</p>
+                                    <input ref="goodsImages" type="file" name="file" value="" class="input-file"
+                                           accept="image/png,image/jpeg,image/gif,image/jpg"
+                                           @change="uploadGoodsImagesFn">
+                                </div>
+                                <div class="form-upload-tips">
+                                    <i class="icon mIcon icon-wen"></i>
+                                    <div class="wen-tips">请备注快递单，发货现场和货物的照片，最多10张</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="remarks">
+                        <span class="rema">备注：</span>
+                        <textarea maxlength="200" placeholder="文字备注，200字以内"  v-model="desc" @input="descInput" ></textarea>
+                        <div class="size-num">{{txtVal = desc.length}}/200</div>
+                    </div>
+                </div>
+            </div>
+        </div>
 
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
+    </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/logistics.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -8,8 +8,6 @@
 </head>
 <body>
 <!-- 引用头部 -->
-<template th:replace="components/header"></template>
-
 <!-- 我的采美 -->
 <div id="saleslist">
     <div class="sales-list">
@@ -44,14 +42,13 @@
             </div>
             </div>
             <div class="print-time">
-                <button type="button" class="print">打印</button>
+                <button type="button" class="print" @click="print" v-show="isNone">打印</button>
             </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/saleslist.js(v=${version})}"></script>