供应商

src/main/resources/static/css/supplier-center/operation/list.css

@@ -23,7 +23,7 @@ li{list-style:none}
     .navLayout .right{float:right;width:968px}
     .order-header{width: 100%;height: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .order-header .header-bt {width: 100%;height: 38px;float: left;}
-    .order-header .header-bt .header-search{width: 560px;height: 38px;float: left;}
+    .order-header .header-bt .header-search{height: 38px;float: left;}
     .order-header .header-bt .search{height: 38px;float: left;margin-right: 15px;}
     .order-header .header-bt .search .label{display: inline-block;float: left;height: 38px;line-height:38px;font-size: 12px;color: #627386;margin-right: 15px;}
     .order-header .header-bt .search .search-input{width: 210px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 36px;border: 1px solid #b8bfca;border-radius: 2px; }

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

@@ -27,3 +27,29 @@
     .air img{position: absolute; top: 0; bottom: 0; left: 0; right: 0;margin: auto; width: 221px;height: 180px}
 
  }
+
+/* 移动*/
+
+@media screen and (max-width: 768px){
+   .head-top{padding: 3.4vw;background: #fff;}
+   .head-top form div{margin-top: 2.7vw;color: #627386}
+   .order-border{width: 93.4vw;height: 11.8vw;line-height: 11.8vw;border: 1px solid #b8bfca;font-size: 3.4vw;}
+   .order-border span{padding-left: 2.7vw}
+   input::placeholder,textarea::placeholder{color: #9aa5b5}
+   .Buyer{height: -webkit-fill-available;border: 0;width: 70vw}
+   .state{width: 93.4vw;height: 11.7vw;line-height: 11.7vw;padding-left: 1.3vw;border: 1px solid #b8bfca;background: #fff;color: #627386;}
+   #newBtn>div{width: 40vw;height: 11.2vw;line-height: 11.2vw;text-align: center;display: inline-block;margin-left: 4vw;}
+   #newBtn>.query-btn{border: .27vw solid #e15616;background: #ffe6dc;color: #e15616;}
+   #newBtn{text-align: center}
+   .content-list .list{padding: 3.3vw;background: #fff;margin: 2.7vw 0}
+   .content-list div div{margin: 2.7vw 0}
+   .content-list span{color: #9aa5b5;font-size: 3.2vw;line-height: 6.4vw}
+   .content-list p{color: #22272e;font-size: 3.4vw}
+   .order-name p{width: 89vw;overflow: hidden;display: block;text-overflow: ellipsis;white-space: nowrap}
+   .order-price span,.order-info span{display: inline-block;width: 30%;}
+   .order-info span:nth-child(3){width: 37%}
+   .OrderNo p{color: #e15616}
+   .content-list .status-red{color: #f94b4b;}
+   .content-list .status-blue{color: #1890f9;}
+   .content-list .status-yellow{color: #f9a94b;}
+}

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

@@ -70,13 +70,14 @@
    #newBtn>.query-btn{border: .27vw solid #e15616;background: #e15616;color: #fff;}
    #newBtn>.addBrand{border: .27vw solid #e15616;background: #ffe6dc;color: #e15616;}
   .brand-list .list{margin-top: 2.7vw;background: #fff;padding: 3.3vw;}
-  .brand-title li{display: inline-block;color: #9aa5b5;line-height: 8vw;font-size: 2.5vw;width: 21%;}
+  .brand-title li{display: inline-block;color: #9aa5b5;line-height: 8vw;font-size: 3.2vw;width: 21%;}
   .brand-title li:last-child{float: right;}
-  .brand-logo{width: 17vw;height:17vw;float: left;line-height: 17vw;}
+  .brand-logo{width: 17vw;height:17vw;float: left;line-height: 17vw;text-align: center}
   .brand-logo img{width: 100%;height: 100%;}
+  .brand-name{float: right;width: 72vw}
   .brand-name .proname{color: #22272e;font-size: 3.4vw;overflow: hidden;text-overflow: ellipsis;width: 40vw;white-space: nowrap;vertical-align: middle;display: inline-block}
-  .brand-name span:nth-child(2){display: inline-block;width: 30vw;text-align: center}
-  .brand-description{font-size: 2.6vw;margin: 1.7vw 0;}
+  .brand-name span:nth-child(2){display: inline-block;width: 30vw;text-align: center;}
+  .brand-description{font-size: 3.2vw;margin: 1.7vw 0;   color: #9aa5b5}
   .brand-name .font-red{color: #f94b4b;}
   .brand-name .font-blue{color: #1890f9;}
   .brand-name .font-red{color: #f94b4b;}
@@ -91,7 +92,7 @@
   .mIcon.close-modalForm:before{cursor: pointer;    top: 1.9vw;cursor: pointer;width: 5.3vw;height: 5.3vw;background-position: -34vw 0px;right: 2.7vw;position: absolute;}
   .brand-content{padding:2.7vw;color: #22272e}
   .required{color: red}
-  .brand-name input{width: 46vw;height: 8.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;display: inline-block}
+  .brandlogo-name input{width: 46vw;height: 8.8vw;background-color: #ffffff;border-radius: .53vw;border: solid .27vw #b8bfca;padding-left: 2.7vw;display: inline-block}
   .img-box{ width: 13vw;height: 13vw;background-color: #ffffff;border-radius: 2px;border: solid .27vw #b8bfca;display: inline-block; position: relative;}
   .img-box img{width: 100%;height: 100%; }
   .brand-img{margin: 10px 0;}
@@ -104,5 +105,5 @@
   .box-btn{padding: 2.7vw;}
   .box-btn div{display: inline-block;width: 100%;height: 9.9vw;line-height: 9.9vw;text-align: center;background-color: #e15616;border-radius: .53vw;border: solid 1px #e15616;margin-bottom: 2.7vw;color: #fff;cursor: pointer}
   .box-btn .btn-cancel{background-color: #fff;color: #9aa5b5; border: 1px solid #b8bfca;}
-  .mIcon.add:before {width: 6.7vw;height: 6.7vw;background-position: -8.8vw -61.3vw;position: relative;top: 4vw;right: -4vw}
+  .mIcon.add:before {width:5vw;height: 5vw;background-position: -9.6vw -62vw;position: relative;top: 4vw;right: -4vw}
  }

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

@@ -50,12 +50,12 @@
   .head-top div{display: inline-block}
   .head-top .title-text{color: #22272e;}
   .head-top .title-text span{color: #627386;}
-  .banner-title{vertical-align: middle;overflow: hidden;text-overflow: ellipsis;width: 200px;color: #22272e;font-size: 3.4vw;font-weight: bold;white-space: nowrap}
+  .banner-title{vertical-align: middle;overflow: hidden;text-overflow: ellipsis;width: 200px;color: #22272e;font-size: 3.4vw;white-space: nowrap}
   .advertisement-pic{width: 20vw;height: 20vw}
   .operate div{width: 22.4vw;height:9.6vw;background-color: #e0f1ff;border-radius: 4.8vw;border: solid 1px #1890f9;line-height: 9.6vw;text-align: center;color: #1890f9;cursor: pointer;display: inline-block;margin-right: 2.7vw;}
   .title-list{padding-top: 2.7vw;background: #fff;padding-left: 3.3vw;color: #9aa5b5}
   .shopBanner ul  .title-color{color: #9aa5b5;}
-  .title-list span{display: inline-block;width: 23%}
+  .title-list span{display: inline-block;width: 21%}
   .shopBanner ul{background: #fff;margin-bottom: 1.3vw;padding: 0 3.3vw 3.3vw;overflow: hidden}
   .shopBanner ul li{list-style: none;display: inline-block;padding-top: 10px;color: #22272e;width: 75%;float: left}
   .shopBanner ul li:nth-child(1){}

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

@@ -16,12 +16,12 @@ li{list-style: none}
   .goods-main-empty p{font-size: 14px;color: #333;}
   .goods-main-empty p a{color: #e15616;text-decoration: underline;margin: 0 3px;}
   .goods-title{ height: 56px;line-height: 56px;border-bottom: solid 1px #e2e7ef;padding: 0 20px}
-  .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;}
+  .goods-main .goods-table ul li{float:left;width: 8%;text-align: center;color: #22272e;position: inherit}
   .goods-main .goods-table ul li:nth-child(2){ width: 25%;}
   .goods-main .goods-table ul li:nth-child(3),.goods-main .goods-table ul li:nth-child(4){width: 20%}
   .goods-main .goods-table ul li:last-child{width: 23%;position: relative}
   .tbody ul li{height: 96px;font-size: 12px;}
-  .tbody ul{overflow: hidden;padding: 0 20px}
+  .tbody ul{overflow: inherit;padding: 0 20px;position: relative;}
   .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%}
@@ -32,7 +32,7 @@ li{list-style: none}
   .checkbox .icon-gouxuan:before{width: 16px; height: 16px;background-position: -210px 0px}
   .goods-main  .tbody .good-info{display: inline-block}
   .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{line-height: 90px ;}
+  .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{padding: 0 7px;line-height: 40px;position: absolute;width: 180px;top: 0;left: 0;right: 0;bottom: 0;margin: auto;height: fit-content}
   .goods-main  .tbody .btn{width: 52px;height: 24px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;display: inline-block;line-height: 24px;color: #e15616;}
@@ -49,6 +49,7 @@ li{list-style: none}
   .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}
   }
 
 /*移动*/
@@ -93,7 +94,7 @@ li{list-style: none}
    line-height: 9.5vw;text-align: center;border-radius: 6.4vw;font-size: 3vw;margin-left: 16.7vw}
    .good-handle a.primary{border:1px solid #e15616;color: #e15616;background: #ffe6dc}
    .good-handle a.down{border:1px solid #627386;color: #627386;background: #f0f3f7}
-   .good-handle a.success{border:1px solid #1890f9;color: #1890f9;background: #e0f1ff;width: 23vw}
+   .good-handle a.success{border:1px solid #1890f9;color: #1890f9;background: #e0f1ff;width: 23vw;padding: 0 1.3vw}
    .good-handle a.danger{width:24vw;border:1px solid  #f94b4b;color: #f94b4b;background: #ffd8d8}
    .good-footer{width: 100%;height: 11.9vw;background: #fff; padding: 1.7vw 0}
    .good-footer .footer-left{float: left;margin-left: 5.3vw}
@@ -104,4 +105,5 @@ li{list-style: none}
    .good-footer .footer-right .btn{ width: 20.8vw;height: 8.5vw;display: block;line-height: 8.5vw;text-align: center;font-size: 3.4vw;border-radius: 6.4vw;margin-right: 30px;color: #FFF;}
    .good-footer .footer-right .btn.icon-weigouxuan{border: solid .27vw #b8bfca;color: #627386;}
    .good-footer .footer-right .btn.icon-gouxuan{background-color: #ffe6dc; color: #e15616;border: .27vw solid #e15616}
+   .priceTag{position: absolute;left: 50vw}
  }

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

@@ -13,6 +13,7 @@ var settlement = new Vue({
         list:[],
         pageInput: '1',
         listRecord: 0,
+        noMore:false,
         },
      computed: {
         pageTotal: function () {
@@ -59,6 +60,7 @@ var settlement = new Vue({
                         _this.results = res.data.results;
                         _this.listRecord = res.data.totalRecord;
                     }
+                    _this.requestFlag = true;
                 }
             })
         },
@@ -76,6 +78,33 @@ var settlement = new Vue({
         if(globalUserData){
               _self.params.shopID = globalUserData.shopId;
             }
-        _self.settlementList()
+        _self.settlementList();
+            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.settlementList();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
     }
 })

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

@@ -31,7 +31,7 @@ var myGoods = new Vue({
         checkList:[],
         isCheckedAll:false,
         noMore:false,
-        promotions:{},
+        isRequset:false
     },
     computed: {
         pageTotal: function () {
@@ -54,6 +54,21 @@ var myGoods = new Vue({
         }
     },
     methods: {
+     toggleThisLadder: function(event){
+            var el = event.currentTarget;
+            if($(el).hasClass("on")){
+                $(el).removeClass("on").siblings('.mFixed').hide();
+                if(!isPC){looseBody();}
+            }else{
+                $(el).addClass("on").siblings('.mFixed').show();
+                if(!isPC){fixedBody();}
+            }
+         },
+     hideThisLadder: function(event){
+            var el = event.currentTarget;
+            $(el).parents('.priceTag').find('.tag').removeClass("on").siblings('.mFixed').hide();
+            if(!isPC){looseBody();}
+     },
         GetMyproductDataInfo: function(){//我的商品数据初始化
             var _this = this;
             // _this.returnedTarget();
@@ -68,7 +83,6 @@ var myGoods = new Vue({
                         _this.listRecord = data.totalRecord;
                         var NewProduct = [],isAddFeatured=false;
                         _this.productsList.map(function(el){
-                           _this.promotions = el.promotions;
                             if(_this.featuredNum<4){
                                 if(el.validFlag == 2 && el.featuredFlag ==0 ){
                                     isAddFeatured = true;
@@ -390,7 +404,7 @@ var myGoods = new Vue({
                             _this.listQuery.pageNum = next;
                             if (_this.isRequset) {
                                 // 获取列表数据
-                                _this.MyOrderList();
+                                _this.GetMyproductDataInfo();
                             }
                         }
                         _this.requestFlag = false;

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

@@ -14,7 +14,7 @@
 <!-- 我的采美 -->
 <div id="settlement">
     <div class="navLayout" >
-         <div class="crumbs">
+         <div class="crumbs" v-if="isPC">
             <span>我的店铺</span>
             <span>&gt;</span>
             <span>结算管理</span>
@@ -25,8 +25,8 @@
             <div class="right">
                 <div class="head-top">
                     <form action="">
-                        <div class='order-border'><span>订单编号：</span><input type="text" v-model="params.shopOrderNo"  placeholder="请输入商品货号"> </div>
-                        <div class='order-border'><span>买家名称：</span><input type="text" v-model="params.userName"  placeholder="请输入买家名称"> </div>
+                        <div class='order-border'><span>订单编号：</span><input type="text" class="Buyer" v-model="params.shopOrderNo"  placeholder="请输入商品货号"> </div>
+                        <div class='order-border'><span>买家名称：</span><input type="text" class="Buyer" v-model="params.userName"  placeholder="请输入买家名称"> </div>
                         <div>
                             结算状态：
                             <select name="" id="settlement-status" class="state" @change="getstatus($event)">
@@ -41,7 +41,7 @@
                             </div>
                     </form>
                 </div>
-                <div class="main-content">
+                <div class="main-content" v-if="isPC">
                     <ul class="main-title">
                         <li class="samewidth">订单编号</li>
                         <li class="samewidth">下单时间</li>
@@ -73,6 +73,32 @@
                     </div>
                 </div>
 
+                     <template class="main-content" v-else>
+                        <div class="content-list"v-for="res in list">
+                            <div v-for="item in res.orderProductList" class="list">
+                                <div class="OrderNo">
+                                    <span>订单编号：<p>{{item.shopOrderNo}}</p></span>
+                                </div>
+                                <div class="order-name">
+                                    <span>商品信息：<p>{{item.name}}</p></span>
+                                </div>
+                                <div class="order-price">
+                                    <span>总结算金额：<p>¥ {{res.shouldPayShopAmount ?res.shouldPayShopAmount.toFixed(2) :'0.00'}}</p></span>
+                                    <span>已结算金额：<p>¥ {{res.payedShopAmount ?res.payedShopAmount.toFixed(2) :'0.00'}}</p></span>
+                                </div>
+                                <div class="order-info">
+                                     <span>买家：<p>{{res.name}}</p></span>
+                                     <span>结算状态：
+                                            <p v-if="res.payStatus==1||res.payStatus==null" class="status-red">待结算</p>
+                                            <p v-if="res.payStatus==2" class="status-yellow">部分结算</p>
+                                            <p v-if="res.payStatus==3" class="status-blue">已结算</p>
+                                     </span>
+                                     <span>下单时间：<p>{{res.orderTime}}</p></span>
+                                </div>
+                            </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)" href="javascript:void(0);"></a>

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

@@ -142,7 +142,7 @@
                     <span class="close-modalForm mIcon icon" @click="closebg"></span>
                 </div>
                 <div class="brand-content">
-                    <div class="brand-name">
+                    <div class="brandlogo-name">
                         <span class="label"><em class="required">*</em> 品牌名称：</span>
                         <input type="text" v-model="brandobj.name" placeholder="请输入品牌名称"/>
                     </div>

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

@@ -112,20 +112,20 @@
                                         <p>/</p>
                                         <p>￥{{toFixedFn(product.price1)}}</p>
                                     </div>
-                                      <span v-if="promotions!=null" class="priceTag">
-                                          <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                                      <span v-if="product.promotions!=null" class="priceTag">
+                                          <i class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="product.promotions?product.promotions.name:''"></i>
                                           <div class="promotion mFixed">
                                                     <div>
                                                         <p class="t">
-                                                            <em v-if="promotions.mode==2">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
-                                                            <em v-if="promotions.mode==3">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
+                                                            <em v-if="product.promotions.mode==2">{{product.promotions.name+'，满 ¥'+toFloat(product.promotions.touchPrice)+' 减 ¥'+toFloat(product.promotions.reducedPrice)}}</em>
+                                                            <em v-if="product.promotions.mode==3">{{product.promotions.name+'，满 ¥'+toFloat(product.promotions.touchPrice)+' 赠送商品'}}</em>
                                                         </p>
-                                                        <p>促销时间：<em >不限时</em><em v-else>{{promotions.beginTime.substr(0,10)+' ~ '+promotions.endTime.substr(0,10)}}</em></p>
-                                                        <p v-if="promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+promotions.id">更多凑单商品>>></a></p>
-                                                        <template v-if="promotions.mode==3">
+                                                        <p>促销时间：<em >不限时</em><em v-else>{{product.promotions.beginTime.substr(0,10)+' ~ '+product.promotions.endTime.substr(0,10)}}</em></p>
+                                                        <p v-if="product.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+product.promotions.id">更多凑单商品>>></a></p>
+                                                        <template v-if="product.promotions.mode==3">
                                                             <p>赠品：</p>
                                                             <p>
-                                                                <span v-for="g in promotions.giftList" class="p">
+                                                                <span v-for="g in product.promotions.giftList" class="p">
                                                                     <img :src="g.image">
                                                                     <span v-text="g.name"></span>
                                                                     <span v-text="'× '+g.number"></span>
@@ -184,6 +184,30 @@
                                      <p>￥{{toFixedFn(product.normalPrice)}}</p>
                                      <p>/</p>
                                      <p>￥{{toFixedFn(product.price1)}}</p>
+                                      <span v-if="product.promotions!=null" class="priceTag">
+                                          <i class="tag" @click="toggleThisLadder($event)" v-text="product.promotions?product.promotions.name:''"></i>
+                                          <div class="promotion mFixed">
+                                                    <div>
+                                                        <p class="t">
+                                                            <em v-if="product.promotions.mode==2">{{product.promotions.name+'，满 ¥'+toFloat(product.promotions.touchPrice)+' 减 ¥'+toFloat(product.promotions.reducedPrice)}}</em>
+                                                            <em v-if="product.promotions.mode==3">{{product.promotions.name+'，满 ¥'+toFloat(product.promotions.touchPrice)+' 赠送商品'}}</em>
+                                                        </p>
+                                                        <p>促销时间：<em >不限时</em><em v-else>{{product.promotions.beginTime.substr(0,10)+' ~ '+product.promotions.endTime.substr(0,10)}}</em></p>
+                                                        <p v-if="product.promotions.type==2" class="r"><a class="more" :href="'/product/promotions.html?id='+product.promotions.id">更多凑单商品>>></a></p>
+                                                        <template v-if="product.promotions.mode==3">
+                                                            <p>赠品：</p>
+                                                            <p>
+                                                                <span v-for="g in product.promotions.giftList" class="p">
+                                                                    <img :src="g.image">
+                                                                    <span v-text="g.name"></span>
+                                                                    <span v-text="'× '+g.number"></span>
+                                                                </span>
+                                                            </p>
+                                                        </template>
+                                                        <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
+                                                    </div>
+                                                </div>
+                                      </span>
                                 </div>
                                 <div class="good-status">
                                     <div class="good-left">