供应商

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

@@ -608,44 +608,47 @@
 }
 
 .product p {
- font-size: 4vw;
- font-weight: normal;
- font-stretch: normal;
- line-height: 5.6vw;
- letter-spacing: 0px;
- color: #22272e;
- padding: 2.7vw;
+     font-size: 4vw;
+     font-weight: normal;
+     font-stretch: normal;
+     line-height: 5.6vw;
+     letter-spacing: 0px;
+     color: #22272e;
+     padding: 2.7vw;
 }
 
 .product ul {
- height: 50px;
- line-height: 80px;
- background-color: #ffffff;
- box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
- padding: 15px;
+     height: 50px;
+     line-height: 80px;
+     background-color: #ffffff;
+     box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);
+     padding: 15px;
 }
 
 .product li {
- display: inline-block;
- width: 24vw;
- text-align: center;
- color: #333333;
- position: relative;
- cursor: pointer;
+     display: inline-block;
+     width: 24vw;
+     text-align: center;
+     color: #333333;
+     position: relative;
+     cursor: pointer;
 }
 
 .mIcon.confirm:before {
- width: 34px;
- height: 35px;
- background-position: -266px -371px;
- position: absolute;
- right: 53px;
+    width: 9vw;
+    height: 9vw;
+    background-position: -66.7vw -60vw;
+    right: 37px;
+    top: -2px;
+    position: absolute
 }
 
 .mIcon.other:before {
- background-position: -300px -371px;
+ background-position: -76vw -60vw;
+}
+.mIcon.down:before {
+ background-position: -84vw -60vw;
 }
-
 .rank_top p {
  font-size: 3.4vw;
  color: #22272e;

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

@@ -1,4 +1,5 @@
-.crumbs{
+@media screen and (min-width:768px) {
+  .crumbs{
     padding-left: 220px;
     font-size: 16px;
     color: #22272e
@@ -36,6 +37,7 @@
 	border-radius: 2px;
 	border: solid 1px #b8bfca;
 	padding-left: 10px;
+	cursor: pointer;
 }
 .state{
     width: 168px;
@@ -45,9 +47,11 @@
     border: solid 1px #b8bfca;
     padding-left: 10px;
     color: #627386;
+    cursor: pointer;
 }
 input::placeholder{
     color: #627386;
+    font-size: 12px;
 }
 .query-btn{
     width: 90px;
@@ -57,7 +61,9 @@ input::placeholder{
 	text-align: center;
 	line-height: 36px;
 	color: #ffffff;
-    margin: 15px 10px 0 0
+    margin: 15px 10px 0 0;
+    cursor: pointer;
+    float: right;
 }
 .supplier-main{
     margin-top: 10px;
@@ -149,3 +155,231 @@ input::placeholder{
 .userinfo .blcak{
     color: #22272e;
 }
+}
+
+/*移动*/
+@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%;
+}
+.new-s-item>form{
+    overflow: hidden;
+    background: #fff;
+    padding: 2.7vw 2.7vw 4.5vw 2.7vw;
+    box-shadow: 0px .8vw 1.6vw 0px rgba(0, 0, 0, 0.07)
+}
+.new-s-item>form>div{
+    font-size: 3.4vw;
+    color: #627386;
+    width: 93.4vw;
+    margin-bottom: 2.6vw;
+    display: inline-block
+}
+.new-s-item>form>div.order-border{
+    border: 1px solid #b8bfca;
+}
+.new-s-item>form>div.order-border span{
+     padding-left: 2.7vw;
+}
+.new-s-item>form>label{
+    float: left;
+    margin-bottom: 2.6vw;
+    font-size: 3.4vw;
+    color: #627386;
+    border: 1px solid #b8bfca;
+    height: 11.8vw;
+    padding-left: 2.7vw;
+    line-height: 11.8vw
+}
+.Buyer{
+    height: 11.8vw;
+    background-color: #ffffff;
+    border-radius: .53vw;
+    border: 0;
+    cursor: pointer;
+    width: 72vw
+}
+.state{
+    width: 93.4vw;
+    height: 11.7vw;
+    background-color: #ffffff;
+    border-radius: .53vw;
+    border: solid .27vw #b8bfca;
+    padding-left: 2.7vw;
+    color: #627386;
+    cursor: pointer;
+    margin-top: 2.6vw
+}
+/*select::-ms-expand { display: none; }*/
+/*select {*/
+/*    appearance:none;*/
+/*    -moz-appearance:none;*/
+/*    -webkit-appearance:none;*/
+/* }*/
+input::placeholder{
+    color: #9aa5b5;
+}
+.query-btn{
+    width: 35.3vw;
+    height: 11.2vw;
+    background-color: #ffe6dc;
+    border-radius: .53vw;
+    text-align: center;
+    line-height: 11.2vw;
+    color: #e15616;
+    margin: 2.7vw 29.3vw;
+    cursor: pointer;
+    border: .27vw solid #e15616
+}
+.supplier-main{
+    margin-top: 2.7vw;
+    background: #fff;
+    padding-top: 2.7vw;
+    position: relative
+}
+.order-content{
+   padding: 1.3vw 5.3vw;
+   overflow: hidden
+}
+.order-title{
+    background-color: #ffffff;
+    padding: 0 5.3vw;
+    overflow: hidden;
+    font-size: 3.7vw;
+}
+.title-name{
+    color: #e15616;
+    margin-bottom: 3.8vw;
+}
+.title-time{
+    color: #9aa5b5;
+    margin-bottom:3.8vw;
+}
+.order-item{
+overflow:hidden ;
+}
+.order-item p{
+    margin-bottom: 5.3VW;
+    width: 50%;
+    float: left;
+}
+.order-item.pay span{
+    color: #e15616;
+}
+.red{
+    color: #f94b4b;
+}
+.order-botton{
+    width: 100%;
+    overflow: hidden;
+    height: 16vw;
+    line-height: 16vw;
+}
+.order-botton div{
+    float: right;
+}
+.order-botton a{
+   margin-left: 2.7vw;
+    width: 22.4vw;
+    height: 9.6vw;
+    background-color: #ffe6dc;
+    border-radius: .53vw;
+    border: solid 1px #e15616;
+    text-align: center;
+    line-height: 9.6vw;
+    color: #e15616;
+    display: inline-block
+}
+.order-botton .deatil{
+    border: 1px solid #1890f9;
+    line-height: 7.2vw;
+    right: 5.7vw;
+    position: absolute;
+    top: 10vw;
+    width: 22.4vw;
+    height: 7.2vw;
+    border-radius: 3.6vw;
+    color: #1890f9;
+    background: #e0f1ff
+}
+.order-product .product-img{
+    width: 28VW;
+    height: 28VW;
+	border: solid 1px #e2e7ef;
+	float: left;
+}
+.product-info .num:nth-child(1){
+    float: left;
+}
+.product-info .num:nth-child(2){
+    float: right;
+}
+.order-product .product-img img{
+    width: 100%;
+    height: 100%;
+}
+.order-product .product-info{
+    float: right;
+    width: 65%;
+}
+.order-product{
+    overflow: hidden;
+    margin-bottom: 1.9vw;
+}
+.product-info p{
+    color: #627386;
+    margin-top: 7px;
+    overflow: hidden;
+}
+.userinfo{
+	background-color: #f0f3f7;
+	box-shadow: 0px 3px 6px 0px
+		rgba(0, 0, 0, 0.07);
+    padding: 10px 20px;
+    color: #627386;
+}
+.product-info h3{
+    font-size: 3.7VW;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.userinfo p{
+    display: inline-block;
+    margin-bottom: 2.7vw;
+}
+.username p:nth-child(1){
+    width: 100%;
+}
+.username p:nth-child(2){
+    float: left;
+}
+.username p:nth-child(3){
+    float: right;
+}
+.userinfo .blcak{
+    color: #22272e;
+}
+}

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

@@ -2,28 +2,42 @@ var isPC = ($(window).width()>768);
 var orderList = new Vue({
     el:'#orderList',
     data:{
+        Status:[
+            {name:'所有',value:'0'},
+            {name:'待发货',value:'1'},
+            {name:'部分发货',value:'2'},
+            {name:'已发货',value:'3'},
+        ],
+        pay:[
+            {name:'所有',value:'0'},
+            {name:'待结算',value:'1'},
+            {name:'部分结算',value:'2'},
+            {name:'已结算',value:'3'},
+        ],
         params:{
             ShopID:10100,
             pageNum: 1,
-            pageSize: 15,
-            sendOutStatus: 0,
-            payStatus: 0,
-            shopOrderNo:'',
-            name: '',
-            sendOutStatus:'',
-            payStatus:'',
+            pageSize: 10,
+            sendOutStatus: '',//发货状态
+            payStatus:'',//结算状态
+            shopOrderNo:'',//订单编号
+            name: '',//买家名称
         },
          pageInput: '1',
-        isRequset:false,
-        results:[],
+         listRecord: 0,
+         isRequset:false,
+         open:false,
+         requestFlag: true,
+         noMore: false,
+         results:[],
     },
     computed: {
         pageTotal: function () {
-            var total = Math.ceil(this.listRecord / this.params.size);
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
             return total > 0 ? total : 1;
         },
         showPageBtn: function () {
-            var total = Math.ceil(this.listRecord / this.params.size);
+            var total = Math.ceil(this.listRecord / this.params.pageSize);
             total = total > 0 ? total : 1;
             var index = this.params.pageNum, arr = [];
             if (total <= 6) {
@@ -40,8 +54,8 @@ var orderList = new Vue({
     methods:{
          toPagination: function (pageNum) {
             if (pageNum <= this.pageTotal) {
-                var params = {pageNum: pageNum};
-                window.location.href = updateUrlParam(params);
+                this.params.pageNum = pageNum;
+                this.MyOrderList(this.params);
             }
         },
      checkNum: function () {
@@ -51,17 +65,82 @@ var orderList = new Vue({
             this.pageInput = 1;
         }
     },
-
-    },
-    mounted:function () {
-        var _this = this;
+    MyOrderList:function () {
+       var _this = this;
         SupplierApi.MyOrderList(_this.params,function (res) {
             if(res.code==0){
-                 _this.isRequset = true;
-                     console.log(res)
-                 _this.results = res.data.results;
+                 console.log(res)
+                 if(res.data.results.length > 0){
+                     _this.isRequset = true;
+                     _this.results = res.data.results;
+                     _this.listRecord = res.data.totalRecord;
+                 }else {
+                     _this.results = res.data.results;
+                     _this.listRecord = res.data.totalRecord;
+                 }
             }
-
         })
+    },
+    opentittle:function(){
+       this.open = !this.open;
+    },
+    getpayStatus:function () { //结算状态
+        var _this = this;
+        if(event.target.value==0){
+            _this.params.payStatus = '';
+        }else {
+            _this.params.payStatus = event.target.value;
+        }
+    },
+    getstatus:function () { //发货状态
+      var _this = this;
+        if(event.target.value==0){
+         _this.params.sendOutStatus='';
+        }else {
+         _this.params.sendOutStatus=event.target.value;
+        }
+    },
+    serchBtn:function () {
+        var _this=this;
+            _this.MyOrderList()
+    },
+    delivery:function (orderID) {//发货
+        window.location.href='/supplier-center/shop/goods.html?shopOrderID='+orderID;
+    }
+    },
+    mounted:function () {
+        var _self = this;
+       _self.MyOrderList();
+        if(globalUserData){
+            _self.params.ShopID = globalUserData.shopId;
+        }
+         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.MyOrderList();
+                            }
+                        }
+                        _self.requestFlag = false;
+                    }else{
+                        //到底了
+                        _self.noMore = true;
+                        $('footer').removeClass("noneImportant");
+                    }
+                }
+            });
+        }
+
     }
 })

src/main/resources/templates/supplier-center/dashboard.html

@@ -68,13 +68,13 @@
             <div class="product">
                 <p>商品数据</p>
                  <ul>
-                     <li class="icon confirm">
+                     <li class="icon confirm mIcon">
                          <a href="">全部商品<span>{{homeData.allNum}}</span></a>
                      </li>
-                      <li class="icon other confirm">
+                      <li class="icon other confirm mIcon">
                           <a>已上架<span>{{homeData.upNum}}</span></a>
                      </li>
-                     <li class="icon down confirm">
+                     <li class="icon down confirm mIcon">
                          <a>已下架<span>{{homeData.downNum}}</span></a>
                      </li>
                  </ul>

src/main/resources/templates/supplier-center/order/deliver-goods.html

@@ -0,0 +1,24 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+    <h1>发货</h1>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

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

@@ -20,35 +20,31 @@
             <span>&gt;</span>
             <span>我的订单</span>
         </div>
-         <div class="wrap clear ">
+         <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 " >
           <!--左侧面包屑-->
-            <template th:replace="supplier-center/components/tableft"></template>
+          <div v-show="open">
+              <template th:replace="supplier-center/components/tableft" ></template>
+          </div>
+
             <div class="right">
                 <div class="new-s-item">
                         <form action="">
-                            <label for="order-number">订单编号： <input type="text" id="order-number" class="Buyer" placeholder="请输入商品货号"><span></span></label>
-                            <label for="name-buyer">买家名称： <input type="text" id="name-buyer" class="Buyer" placeholder="请输入买家名称"> <span></span></label>
+                            <div class='order-border'><span>订单编号：</span><input type="text" id="order-number" v-model="params.shopOrderNo" class="Buyer" placeholder="请输入商品货号"></div>
+                            <div class='order-border'><span>买家名称：</span><input type="text" id="name-buyer" v-model="params.name" class="Buyer" placeholder="请输入买家名称"> </div>
                             <div>
                                 结算状态：
-                                <select name="" id="settlement-status" class="state">
-                                    <option value="0">所有</option>
-                                    <option value="1">待结算</option>
-                                    <option value="2">部分结算</option>
-                                    <option value="3">已结算</option>
+                                <select name="" id="settlement-status" class="state" @change="getpayStatus($event)">
+                                    <option value="0" v-for="p in pay" :value="p.value">{{p.name}}</option>
                                 </select>
-                                <span></span>
                             </div>
                             <div>
                                 发货状态：
-                                <select name="" id="delivery-status" class="state">
-                                    <option value="0">所有</option>
-                                    <option value="1">待发货</option>
-                                    <option value="2">部分发货</option>
-                                    <option value="3">已发货</option>
+                                <select name="" id="delivery-status" class="state " @change="getstatus($event)" >
+                                    <option  v-for="s in Status" :value="s.value">{{s.name}}</option>
                                 </select>
-                                <span></span>
                             </div>
-                             <button class="query-btn">查询</button>
+                                <button type="button" class="query-btn" @click="serchBtn">查询</button>
                         </form>
 
                          <div class="supplier-main order" v-for="(order,index) in results" :key="index">
@@ -61,7 +57,7 @@
                                 </div>
                             </div>
                             <div class="order-content">
-                                <div class="order-item">
+                                <div class="order-item pay">
                                     <p>结算状态：&nbsp;
                                         <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
                                         <span v-if="order.payStatus==2"> 部分结算</span>
@@ -75,14 +71,14 @@
                                     </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>商品金额：&nbsp;<span class="red">￥{{order.productAmount.toFixed(2)}}</span> </p>
-                                    <p>结算商品金额：&nbsp;<span class="red">￥{{order.shopProductAmount.toFixed(2)}}</span> </p>
-                                    <p>结算税费：&nbsp;<span class="red">￥{{order.shopTaxFee.toFixed(2)}}</span> </p>
-                                    <p>结算运费：&nbsp;<span class="red">￥{{order.shopPostFee.toFixed(2)}}</span> </p>
+                                    <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>总结算金额：&nbsp;<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
-                                    <p>已结算金额：&nbsp;<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
+                                    <p>总结算金额：<span class="red">￥{{order.shouldPayShopAmount.toFixed(2)}}</span> </p>
+                                    <p>已结算金额：<span class="red">￥{{order.payedShopAmount.toFixed(2)}}</span> </p>
                                 </div>
                                 <div class="order-product" v-for="proitem in order.orderProductList">
                                     <div class="product-img">
@@ -102,19 +98,19 @@
                                 </div>
                                 <div class="order-botton">
                                    <div>
-                                        <a class="btn cancel" href="javascript: void(0);" >发货</a>
-                                        <a class="btn primary" href="javascript: void(0);"  >发货记录</a>
-                                        <a class="btn cancel" href="javascript: void(0);" >售货清单</a>
-                                        <a class="btn cancel" href="javascript: void(0);" >查看详情</a>
+                                        <a class="btn" href="javascript: void(0);" v-if="order.sendOutStatus!=3" :value="order.shopOrderID" @click="delivery(order.shopOrderID)">发货</a>
+                                        <a class="btn" href="javascript: void(0);"  >发货记录</a>
+                                        <a class="btn" href="javascript: void(0);" >售货清单</a>
+                                        <a class="btn deatil" href="javascript: void(0);" >查看详情</a>
                                    </div>
 
                                 </div>
                             </div>
                              <div class="userinfo" >
                                     <div class="username">
-                                         <p >买家名称：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.name}}</span> </p>
-                                         <p >收货人：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
-                                         <p >联系方式：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.mobile}}</span> </p>
+                                         <p>买家名称：<span class="blcak">{{order.userInfo.name}}</span> </p>
+                                         <p >收货人：<span class="blcak">{{order.userInfo.shouHuoRen}}</span> </p>
+                                         <p >联系方式：<span class="blcak">{{order.userInfo.mobile}}</span> </p>
                                     </div>
                                     <div class="address">
                                         <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
@@ -122,20 +118,22 @@
                                 </div>
                         </div>
                     </div>
-                    <div v-if=" pageTotal>1" class="pageWrap clear">
-                        <a v-if="params.num>1" class="prev" @click="toPagination(params.num*1-1)" href="javascript:void(0);"></a>
-                        <template v-for="n in showPageBtn">
-                            <a v-if="n" :class="{'on':(n==params.num)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-                            <span v-else>···</span>
-                        </template>
-                        <a v-if="params.num<pageTotal" class="next" @click="toPagination(params.num*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 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>
 </div>

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

@@ -0,0 +1,24 @@
+<!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>
+
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+
+<!-- 我的采美 -->
+<div>
+    <h1>物流</h1>
+
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+
+</body>
+</html>

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

@@ -9,7 +9,7 @@
 <body>
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
-
+    <h1></h1>
 <!-- 我的采美 -->
 <div>