供应商

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

@@ -50,13 +50,13 @@
 @media screen and (max-width:768px){
 #fleaMarketList{width: 100%;overflow: hidden}
     .shopList{background: #fff}
-    .Listitem{height:33vw;padding: 10px;border-bottom: .24vw solid #F0F2F4}
+    .Listitem{height:33vw;padding: 2.7vw;border-bottom: .24vw solid #F0F2F4}
     .ListImg{width: 100%;height: 35.3vw}
     .ListImg img {width: 100%;height: 100%;}
     .secondTitle {width: 100%;height: 10vw;background-color: #ffffff;border-bottom: .24vw solid #F0F2F4;position: relative}
     .ClassA {width: 32vw;height: 10vw;display: inline-block;text-align: center;line-height: 10vw;font-size: 3.86vw;cursor: pointer;color: #9aa5b5;border: 0;position: relative;}
     .mainTab {background: #fff;width: 29vw;position: absolute;z-index: 1;}
-    .Listitem:nth-of-type(4n) {margin-right: 0;}
+    .Listitem:nth-of-type(4) {margin-right: 0;}
     .mainTab li {height: 9.6vw;line-height: 9.6vw;text-align: center;color: #627386;cursor: pointer;}
     .active {color: #E15621;}
     .line{width: 10vw;margin:0 auto;height: .48vw;background-color: #e15616;display: block}
@@ -65,25 +65,27 @@
     .activeImg{opacity: 0.5;}
     .itemImg img{width: 100%;height: 100%;}
     .ItemInfo{float: right;width: 60vw}
-    .infotag {font-size:  0.4vw;width: 11.6vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 .72vw}
-    .infotag.news {border: solid 1px #f94b4b;color: #f94b4b;background-color: #fadbdb}
-    .infotag.brand {border: solid 1px #f9a24b;color: #f9a24b;background-color: #faefdb;}
-    .infotag.sold {border: solid 1px #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
-    .infotag.other {border: solid 1px #1890f9;color: #1890f9;background-color: #e3ebf7;}
-    .targetprice {font-size: 4vw;color: #f94b4b;cursor: pointer;}
-    .productname{color: #627386;letter-spacing: 1px;font-size: 4vw;margin: 1.2vw 0;display: block;}
+    .infotag {font-size: 3vw;padding: 0 2.7vw;height: 4.8vw;line-height:  4.8vw;text-align: center;display: inline-block;border-radius: .48vw;flex: auto;margin: 0 .72vw}
+    .infotag.news {border: solid .27vw #f94b4b;color: #f94b4b;background-color: #fadbdb}
+    .infotag.brand {border: solid.27vw #f9a24b;color: #f9a24b;background-color: #faefdb;}
+    .infotag.sold {border: solid .27vw #9aa5b5;color: #9aa5b5;background-color: #e3ebf7;}
+    .infotag.other {border: solid .27vw #1890f9;color: #1890f9;background-color: #e3ebf7;}
+    .targetprice {font-size: 3.4vw;color: #f94b4b;cursor: pointer;}
+    .productname{color: #627386;letter-spacing: .27vw;font-size: 3.4vw;margin: 1.2vw 0;display: block;overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap}
     .shijian {font-size: 3.46vw;color: #9aa5b5;text-align: justify;margin-bottom: 1.2vw ;position: relative;}
     .shijian div {display: inline-block;}
     .shijian div:nth-child(1) {margin-right:16vw;}
-    .dizhi {font-size:  3.46vw;color: #9aa5b5;margin-bottom: 1.2vw;position: relative;margin-right: 20px}
+    .dizhi {font-size: 3vw;color: #9aa5b5;margin-bottom: 1.2vw;position: relative;margin-right: 5.3vw}
     .mIcon.liulanliang:before {background-position: -28.8vw -15.5vw;width: 5.3vw;height: 5.3vw;}
-    .mIcon.shijian:before {background-position: -36.8vw -15.5vw;width: 4.9vw;height: 6vw;position: absolute;right: .24vw;top: -1.45vw;}
+    .mIcon.shijian:before {background-position: -36.8vw -15.5vw;width: 4.9vw;height: 6vw;position: absolute;right: .24vw;top: -1.7vw;}
     .mIcon.dizhi:before {background-position: -87.7vw -38.4vw;width: 5.3vw;height: 5.3vw;position: absolute;right: -6vw;top: -1.3vw}
     .mIcon.off:before{background-position: -68vw .53vw;width: 5.3vw;height: 5.3vw;position: absolute;right: 5vw;top: 1.7vw;}
     .mIcon.open:before{background-position: -60.3vw .53vw;width: 5.3vw;height: 5.3vw;position: absolute;right: 5vw;top: 1.7vw;}
     .no-content{padding:26.6vw 5.3vw;background-color: #fff;margin: auto;}
     .no-content img{width: 50%;display: block;margin: 0 auto;padding: 0.5rem 0;}
     .error-message{text-align: center;margin-top: 5.3vw;font-size: 3.7vw;color: #53504D}
-    .fabu{background: #e15616;height: 56px;width: 100%;text-align: center;line-height: 56px;font-size: 19px;position: fixed;bottom: 0;z-index: 1}
-    .fabu a{color: #fff}
+    .fabu{text-align: center;font-size: 3.7vw;padding: 3.3vw;background: #fff}
+    .fabu a{color: #fff;display: block;background: #e15616;height: 11.3vw;width: 100%;margin: auto;line-height: 11.3vw}
 }

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

@@ -81,6 +81,6 @@
     .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) {background: #fff;line-height: 8vw;padding-left: 4vw;color: #22272e;font-size: 3.2vw;}
     .sett-re div:nth-child(2) p {display: inline-block;margin-right: 2.7vw}
 }

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

@@ -29,6 +29,8 @@ input::placeholder{color: #9aa5b5;font-size: 12px;}
 .userinfo{background-color: #f0f3f7;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);padding: 10px 20px;color: #627386;}
 .userinfo p{display: inline-block;margin: 10px 55px 10px 0;}
 .userinfo .blcak{color: #22272e;}
+.empty{background: #fff;margin-top: 10px;}
+.navLayout{min-height: auto;}
 }
 
 /*移动*/

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

@@ -32,8 +32,8 @@
     .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 img {position: absolute;top: 10%;left: 50%;transform: translate(-50%,50%);width: 220px;}
+    .no-delivery-record p{position: absolute;top: 68%;left: 50%;transform: translate(-50%,50%);font-size: 16px;color: #4a4f58}
     .no-delivery-record span{color: #e15616;}
 }
 

src/main/resources/static/css/supplier-center/order/settlement.css

@@ -26,7 +26,8 @@
     .status-yellow{color: #f9a94b;}
     .air{position: relative;min-height: 600px}
     .air img{position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto; width: 221px;height: 180px}
-
+    .empty{background: #fff;margin-top: 10px;}
+    .navLayout{min-height: auto;}
  }
 
 /* 移动*/

src/main/resources/static/css/supplier-center/shop/brand.css

@@ -55,6 +55,8 @@
    margin-right: 10px;color: #22272e; cursor: pointer;}
   .box-btn .btn-cancel{background-color: #e15616;color: #fff; border: 1px solid #e15616;}
   .icon.add:before { width: 25px;height: 25px;background-position: -168px -374px; position: relative; top: 15px; right: -15px}
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
   }
 
 

src/main/resources/static/css/supplier-center/shop/decoration.css

@@ -41,7 +41,8 @@
   .saveBtn{ text-align: center;float: right;width: 68px;height: 32px; background-color: #e15616; border-radius: 2px;line-height: 32px;
     color: #ffffff;cursor: pointer;}
   .Note{float: left}
-
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
 }
 
 /*移动端*/

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

@@ -25,7 +25,7 @@ li{list-style: none}
   .tbodyle ul li:nth-child(2){width: 25%;}
   .tbody ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(3){ width: 16%}
   .tbody ul li:last-child{width: 20%}
-  .goods-main .checkbox { height: 90px;overflow: hidden; cursor: pointer;line-height: 90px}
+  .goods-main .checkbox {overflow: hidden; cursor: pointer;}
   .tbody .checkbox .box{ display: inline-block; width: 20px;height: 90px;margin-top: 2px;float: left;}
   .goods-main  .tbody .checkbox span{ display: inline-block;float: left;margin-left: 6px;}
   .checkbox .icon-weigouxuan:before{ width: 16px;height: 16px; background-position: -332px -32px;}
@@ -34,21 +34,24 @@ li{list-style: none}
   .goods-main  .tbody .good-info img{width: 80px;height: 80px;margin-top: 8px}
   .tbody ul li .good-classFly,.tbody ul li .good-price,.tbody ul li .status{position: relative;top: 50%;left: 50%;transform: translate(-50%, -50%);width: fit-content;}
   .goods-main  .tbody .good-name{margin-left: 8px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;width: 112px}
-  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
+  .goods-main  .tbody .good-handle{text-align: left;padding: 0 7px;line-height: 35px;position: absolute;width: 180px;top: 0;left: 50px;right: 0;bottom: 0;margin: auto;height: fit-content}
   .goods-main  .tbody .btn{padding: 0 11px;margin-right: 8px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
-  .goods-container .good-footer{width: 100%;height: 56px;float: left;padding: 10px 0;}
-  .goods-container .good-footer .footer-left{float: left;margin-left: 20px}
+  .goods-container .good-footer{width: 95%;height: 56px;float: left;padding: 20px}
+  .goods-container .good-footer .footer-left{float: left;}
   .goods-container .good-footer .checkbox {line-height: 36px;}
   .goods-container .good-footer .checkbox .box{line-height: 40px;float: left;}
   .goods-container .good-footer .checkbox span{display: inline-block;float: left;margin-left: 10px;}
-  .goods-container .good-footer .footer-right{float: right;}
-  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;margin-right: 30px;color: #FFF;}
+  .goods-container .good-footer .footer-right{float: right;margin-top: 10px;}
+  .goods-container .good-footer .footer-right .btn{width: 90px;height: 36px;display: block;line-height: 36px;text-align: center;font-size: 14px;border-radius: 2px;color: #FFF;}
   .goods-container .good-footer .footer-right .btn.icon-weigouxuan{border: solid 1px #9aa5b5;color: #22272e;opacity: .5;}
   .goods-container .good-footer .footer-right .btn.icon-gouxuan{background-color: #e15616;}
   .bg-gouxuan{background-color: #f0f3f7;}
   .good-price p {display: inline-block}
   .priceTag{position: absolute;    top: 60px; right: 45px}
   .pageWrap{width: 968px;margin: auto;padding: 32px 0}
+  .empty{background: #fff;margin-top: 10px;}
+  .navLayout{min-height: auto;}
+  .styleborder{border-top: 1px solid #e2e7ef}
   }
 
 /*移动*/

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

@@ -46,7 +46,8 @@ li{list-style:none}
 .supplierInfo .productList{width:1200px;margin-left:-8px;margin-bottom:18px;}
 .supplierInfo .productBox .title{color:#4A4F58;font-size:20px;height:54px;line-height:54px}
 .supplierInfo .productItem {margin-bottom: 16px;}
-
+.empty{background: #fff;margin-top: 10px;}
+.navLayout{min-height: auto;}
 
 }
 

src/main/resources/static/css/user-center/order/logistics.css

@@ -31,6 +31,8 @@ li {list-style: none; }
      .status-time-latest {text-align: left;margin-left: 25px;color: #0278D8;font-size: 10px;margin-top: 5px;}
      .package-status .status-list>li div{display: inline-block;color: #22272e;}
      .status-list li .status-date{margin: 0 15px;color: #22272e;font-weight: bold;}
+     .navLayout{min-height: auto;}
+     .empty img{width: 100%}
  }
 
  @media screen and (max-width:768px){
@@ -62,4 +64,5 @@ li {list-style: none; }
      .status-time-before {text-align: left;margin-left: 5.5vw;}
      .package-status .status-list>li div{display: inline-block;color: #9aa5b5;font-size: 3vw;line-height: 6.4vw;}
      .status-list li .status-date{margin: 0 4vw;}
+     .empty img{width: 100%}
  }

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -100,6 +100,7 @@ var myGoods = new Vue({
                         _this.productsList = NewProduct;
                     }else{
                         _this.productsList = data.results;
+                        _this.listRecord = data.totalRecord;
                     }
                 }else{
                     CAIMEI.Alert(response.msg, '确定');

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

@@ -27,9 +27,6 @@
                 <li class="ClassA  mIcon" v-for="(item, index) in tabTitle" :key="index" @click="handle(item)" :class="[currentId==item.value?'active':'',item.value==1?'off':'']">{{item.name}}
                     <span class="line" v-if="currentId==item.value"></span>
                 </li>
-                <li class="fabu">
-                    <a href="/flea-market/form.html">我要发布</a>
-                <li/>
             </ul>
         </template>
         <ul class="mainTab" v-if="mainflag">
@@ -78,6 +75,9 @@
                 </div>
             </div>
         </div>
+            <div class="fabu" v-if="!isPC">
+                 <a href="/flea-market/form.html">我要发布</a>
+            </div>
     </div>
     <div class="pageWrap clear" v-if="isPC">
         <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>

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

@@ -102,7 +102,7 @@
                             </div>
                     </div>
                     <div class="empty" v-else>
-                        <img src="/img/common/empty.png">
+                        <img src="/img/order/icon-empt.svg">
                         <div class="msg"><p>暂无数据</p></div>
                     </div>
                 </div>

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

@@ -39,11 +39,8 @@
                 </div>
                 <div class="record-product">
                     <div class="protitle">发货记录</div>
-                    <div class="no-delivery-record" v-if="isShow">
-                        <img src="/img/order/kon.png" v-if="isPC">
-                        <img src="/img/order/H5kon.png" V-else>
-                        <p>此订单还没有发货记录，快去<span>补充</span>它吧</p>
-                    </div>
+
+                   <template v-if="results.length>0">
                     <div class="product" v-for="r in results">
                         <ul class="product-title">
                             <li>商品信息</li>
@@ -88,10 +85,17 @@
                             </button>
                         </div>
                     </div>
+                    </template>
+                    <template v-else>
+                       <div class="no-delivery-record">
+                            <img src="/img/order/icon-recod.svg">
+                            <p>此订单还没有发货记录，快去<span>补充</span>它吧</p>
+                        </div>
+                    </template>
                 </div>
 
                 <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-                <div class="pageWrap clear" v-if="isPC && pageTotal>=1">
+                <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">

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

@@ -70,7 +70,7 @@
                     </div>
                 </div>
                 <div v-else class="empty">
-                    <img src="/img/order/air.png"/>
+                    <img src="/img/order/icon-set.svg"/>
                     <div class="msg"><p>暂无数据</p></div>
                  </div>
                      <template class="main-content" v-else>

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

@@ -44,6 +44,7 @@
                         </div>
                     </form>
                 </div>
+                <template v-if="brandlist.length>0">
                 <div class="brand-list" v-if="isPC">
                     <ul class="brand-title">
                         <li>品牌名称</li>
@@ -116,6 +117,13 @@
                         </div>
                     </div>
                 </div>
+                </template>
+                <template v-else>
+                    <div class="empty">
+                        <img src="/img/order/icon-empt.svg">
+                        <div class="msg"><p>暂无数据</p></div>
+                    </div>
+                </template>
                 <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)"

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

@@ -27,6 +27,7 @@
                     <div class="title-text">主页广告设置<span>（主页广告图最多可上传4张图）</span></div>
                     <div class="addHomepage" @click="addpictures" v-if="isPC">添加主页广告图</div>
                 </div>
+                <template v-if="list.length>0">
                 <div class="content" v-if="isPC">
                     <ul class="title-list">
                         <li>图片</li>
@@ -73,6 +74,13 @@
                          <div class="addHomepage" @click="addpictures">添加主页广告图</div>
                     </div>
                 </div>
+             </template>
+             <template v-else>
+                 <div class="empty">
+                    <img src="/img/order/icon-empt.svg">
+                    <div class="msg"><p>暂无数据</p></div>
+                  </div>
+             </template>
             </div>
 
         </div>

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

@@ -235,6 +235,7 @@
                           </div>
                         </div>
                     <div class="good-footer">
+                        <div class="styleborder">
                         <div class="footer-left">
                             <div class="checkbox" @click='checkedAll'>
                                 <div class="box icon mIcon"
@@ -246,10 +247,11 @@
                             <a href="javascript:void(0);" class="btn batch"
                                :class="[isCheckedAll ||check? 'icon-gouxuan' : 'icon-weigouxuan']" @click="ItemDownshelfAll">批量下架</a>
                         </div>
+                          </div>
                     </div>
                 </div>
                 <div  class="empty" v-else>
-                    <img src="/img/common/empty.png">
+                    <img src="/img/order/icon-goods.svg">
                     <div class="msg"><p>您还未发布任何商品快去<a href="/supplier/release.html">发布</a>吧</p></div>
                 </div>
                 <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>

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

@@ -143,7 +143,7 @@
                         </li>
                     </ul>
                     <div v-else class="empty">
-                        <img src="/img/common/empty.png">
+                        <img src="/img/order/icon-dianpu.svg">
                         <div class="msg">
                             <p>该供应商暂未发布商品，去<a href="/">商城</a>，逛逛吧~</p>
                         </div>

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

@@ -41,7 +41,7 @@
                     <div class="title">物流信息</div>
                     <div class="logistics-deatil">
                         <div class="title-deatil">物流详情</div>
-                         <div class="logsitics-list">
+                         <div class="logsitics-list" v-if="logisticsInfoList.length<0">
                              <div class="goodlist" v-for="(info,index) in logisticsInfoList" :key="index">
                                <p>发货时间：<span>{{info.updateDate}}</span></p>
                                <p v-if="isPC">物流公司：<span>{{info.logisticsCompanyName}}</span></p>
@@ -72,6 +72,10 @@
 
                              </div>
                          </div>
+                         <div v-else class="empty">
+                            <img src="/img/order/icon-logsitics.svg">
+                           <div class="msg"><p>暂无数据</p></div>
+                         </div>
                     </div>
                 </div>