Переглянути джерело

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

zhengjinyi 4 роки тому
батько
коміт
c989164fcb

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

@@ -443,7 +443,7 @@
     line-height: 10.6vw;
     background: #fff;
     padding: 0 2.7vw;
-    font-size: 4.5vw;
+    font-size: 3.4vw;
     color: #22272e;
     border-bottom: solid .27vw #e2e7ef;
 }

+ 34 - 13
src/main/resources/static/css/supplier-center/message.css

@@ -4,20 +4,41 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px) {
-.navLayout {min-height: 900px;opacity: 0;}
+/*.navLayout {min-height: 900px;opacity: 0;}*/
     .navLayout.active {opacity: 1;}
     .crumbs{padding-left: 220px;}
-    .navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
-    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
-    .navLayout .navList .tab{display:block;color:#22272e;position:relative;cursor: pointer;}
-    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
-    .navLayout .navList .con{position:relative;}
-    .navLayout .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
-    .navLayout .navList .con:before{top:0}
-    .navLayout .navList .con:after{bottom:0}
-    .navLayout .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
-    .navLayout .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
-    .navLayout .navList.on .tab{color:#e15616}
-    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+    .crumbs span{color: #22272e;font-size: 16px}
+    .right{float: right;width: 80%;background: #fff;padding: 10px;}
+    .mymessage-tt{font-size: 16px;height: 56px;line-height: 56px;padding: 0 10px;color: #22272e;}
+    .mymessage-hd{height: 54px;line-height: 54px;border-bottom: solid 1px #e2e7ef; border-top: solid 1px #e2e7ef;padding-left: 10px}
+    .checkbox-wrap{float: left}
+    .mark-read{float: right}
+    .mark-read span{width: 90px;height: 36px;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;
+        text-align: center; line-height: 36px; color: #e15616; margin-right: 15px;display: inline-block;cursor: pointer }
+    .checkbox-wrap span{margin-left: 10px}
+    .mymessage-bd{padding-left: 10px}
+    .mymessage-bd li{height: 40px;line-height: 40px;}
+    .xiaoxi{width: 75%;display: inline-block;margin-left: 10px;}
+    .checkbox-wrap{display: inline-block}
 }
 
+@media screen and (max-width:768px) {
+#message{width: 100%;overflow: auto}
+    .crumbs span{color: #22272e;font-size: 3.4vw}
+    .right{background: #fff;padding: 2.7vw;}
+    .mymessage-tt{font-size: 3.4vw;height: 10vw;line-height: 10vw;padding: 0 2.7vw;color: #22272e;}
+    .mymessage-hd{height: 14.4vw;line-height: 14.4vw;border-bottom: solid .27vw #e2e7ef; border-top: solid .27vw #e2e7ef;padding-left: 2.7vw}
+    .checkbox-wrap{float: left}
+    .mark-read{float: right}
+    .mark-read span{width: 22.4vw;height: 9.6vw;background-color: #ffd8d8;border: solid .27vw #e15616;text-align: center;
+    line-height: 9.6vw;color: #f94b4b;margin-right: 2vw;display: inline-block;cursor: pointer;border-radius: 4.8vw }
+    .checkbox-wrap span{margin-left: 2.7vw}
+    .mymessage-bd{padding-left: 2.7vw}
+    .mymessage-bd li{line-height:5.3vw;padding-top: 1.5vw}
+    .xiaoxi{display: inline-block;margin-left: 2.7vw;color: #4a4f58;width: 90%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+    .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;}
+    .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;}
+    .mymessage-bd .time{ display: block; margin-left: 30px;color: #9aa5b5; font-size: 1.6vw;}
+    .checkbox-wrap{display: inline-block}
+}

+ 151 - 0
src/main/resources/static/css/supplier-center/orderlist.css

@@ -0,0 +1,151 @@
+.crumbs{
+    padding-left: 220px;
+    font-size: 16px;
+    color: #22272e
+}
+.right{
+    width: 968px;
+    float: right;
+}
+.new-s-item>form{
+    overflow: hidden;
+    background: #fff;
+    padding: 10px 10px 17px 10px;
+    box-shadow: 0px 3px 6px 0px
+		rgba(0, 0, 0, 0.07);
+}
+.new-s-item>form>div{
+  float: left;
+  height: 40px;
+  margin: 10px 20px 0 20px;
+  font-size: 12px;
+  color: #627386;
+  line-height: 40px;
+  position: relative;
+}
+.new-s-item>form>label{
+    float: left;
+    margin: 10px 20px 0 20px;
+    font-size: 12px;
+    color: #627386;
+}
+.Buyer{
+    width: 168px;
+	height: 36px;
+	background-color: #ffffff;
+	border-radius: 2px;
+	border: solid 1px #b8bfca;
+	padding-left: 10px;
+}
+.state{
+    width: 168px;
+    height: 36px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #b8bfca;
+    padding-left: 10px;
+    color: #627386;
+}
+input::placeholder{
+    color: #627386;
+}
+.query-btn{
+    width: 90px;
+	height: 36px;
+	background-color: #e15616;
+	border-radius: 2px;
+	text-align: center;
+	line-height: 36px;
+	color: #ffffff;
+    margin: 15px 10px 0 0
+}
+.supplier-main{
+    margin-top: 10px;
+    background: #fff;
+    padding-top: 15px;
+}
+.order-content{
+   padding: 10px 20px;
+   overflow: hidden
+}
+.order-title{
+    background-color: #ffffff;
+    padding: 10px 20px;
+    overflow: hidden;
+}
+.title-name{
+    float: left;
+    color: #22272e;
+
+}
+.title-time{
+    float: right;
+    color: #9aa5b5;
+}
+.order-item p{
+    display: inline-block;
+    color: #627386;
+    margin: 0 60px 20px 0;
+}
+.red{
+    color: #f94b4b;
+}
+.order-botton{
+    width: 100%;
+    overflow: hidden;
+    height: 60px;
+    line-height: 60px;
+}
+.order-botton div{
+    float: right;
+}
+.order-botton a{
+    width: 90px;
+	height: 36px;
+	background-color: #ffe6dc;
+	border-radius: 2px;
+	border: solid 1px #e15616;
+	text-align: center;
+	line-height: 36px;
+	color: #e15616;
+	display: inline-block;
+	margin-right: 16px;
+}
+.order-product .product-img{
+    width: 100px;
+	height: 100px;
+	border: solid 1px #e2e7ef;
+	float: left;
+}
+.product-info .num{
+    margin-right: 80px;
+}
+.order-product .product-img img{
+    width: 100%;
+    height: 100%;
+}
+.order-product .product-info{
+    float: right;
+    width: 87%;
+}
+.order-product{
+    overflow: hidden;
+}
+.product-info p{
+    color: #627386;
+    margin-top: 7px;
+}
+.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;
+}

+ 30 - 0
src/main/resources/static/css/supplier-center/tableft.css

@@ -0,0 +1,30 @@
+@media screen and (min-width:768px) {
+    .navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
+    .navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
+    .navLayout .navList .tab{display:block;color:#22272e;position:relative;cursor: pointer;}
+    .navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
+    .navLayout .navList .con{position:relative;}
+    .navLayout .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
+    .navLayout .navList .con:before{top:0}
+    .navLayout .navList .con:after{bottom:0}
+    .navLayout .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
+    .navLayout .navList.on .tab:before{top:18px;transform:rotate(270deg);color:#e15616}
+    .navLayout .navList.on .tab{color:#e15616}
+    .navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+}
+
+@media screen and (max-width:768px) {
+    .left { width: 100%;background: #fff;}
+    .navList {padding: 2.7vw; position: relative;}
+    .mIcon.navList:before{ width: 6.7vw; height: 6.7vw; position: absolute;top: .8vw;}
+    .mIcon.one:before{background-position: -59.2vw -51.5vw;}
+    .mIcon.two:before{ background-position: -75.7vw -51.5vw;}
+    .mIcon.three:before{
+    background-position: -33.9vw -51.5vw;}
+    .mIcon.four:before{ background-position: -42.1vw -51.5vw;}
+    .navList{padding:2.7vw;position: relative;}
+    .navList .tab{margin-left: 6.7vw;color: #22272e;}
+    .con{margin-top: 2.7vw;}
+    .con a{color: #627386;height: 8.6vw;line-height: 8.6vw;border: 1px solid #b8bfca;display: inline-block;width: 20.8vw;
+        text-align: center;margin: 1.9vw 1.3vw;}
+}

BIN
src/main/resources/static/img/base/icon_m.png


+ 41 - 0
src/main/resources/static/js/base.js

@@ -552,3 +552,44 @@ function dialog(txt,callback) {
         }
     });
 }
+
+// 加入购物车
+function addShoppingCart(userId, productId, count, callback){
+    tokenAjax("post", "/shoppingCart/addCart", {
+        userID: userId,
+        productID: productId,
+        productCount: count
+    },function (res) {
+        if(res && res.code*1 === 0){
+            globalHead.getHeadCart(userId);
+            $.confirm({
+                useBootstrap: false,
+                boxWidth: (isPC?'338px':'74.6vw'),
+                title: false,
+                content:'<div class="cartAlert"><h6>商品已成功加入购物车!</h6><p>当前购物车共'+res.data+'种商品去结算继续购物</p></div>',
+                closeIcon: true,
+                animation: 'opacity',
+                closeAnimation: 'opacity',
+                animateFromElement: false,
+                scrollToPreviousElement: false,
+                buttons: {
+                    login: {
+                        text: '去结算',
+                        btnClass: 'btn-to-cart',
+                        action: function(){
+                            window.location.href = '/shopping/cart.html';
+                        }
+                    },
+                    close: {
+                        text: '继续购物',
+                        btnClass: 'btn-cancel'
+                    }
+                }
+            });
+        } else {
+            dialog("加入购物车失败!");
+        }
+        callback();
+    });
+}
+

+ 1 - 14
src/main/resources/static/js/product/detail.js

@@ -174,20 +174,7 @@ var productDetail = new Vue({
 				}
 			},
 		addShopCart:function(){ //加入购物车
-			    var _this = this;
-               $.getJSON(spiServer + "/shoppingCart/addCart",{
-                        productID: _this.productId,
-                        userID: _this.userId,
-                        productCount: _this.number,
-                   }).done(function (res) {
-                          if(res.code==0){
-                                _this.cartAlert = true;
-                                _this.typedata = res.data;//商品种数
-                            }else {
-
-                                _this.cartAlert = false;
-                            }
-                })
+		    addShoppingCart(this.userId, this.productId, this.number);
 		},
 		Continueshop:function(){ //继续购物
             var _this = this;

+ 4 - 1
src/main/resources/static/js/shopping/cart.js

@@ -161,6 +161,8 @@ var shoppingCart = new Vue({
                         });
                         if(promotionsPrice>=promotions.touchPrice){
                             reducedPrice += promotions.reducedPrice;
+                            totalPrice -= promotions.reducedPrice;
+
                         }
                     } else if (promotions.type===1 && promotions.mode ===1) {
                         promotions.productList.forEach(function(product){
@@ -170,7 +172,7 @@ var shoppingCart = new Vue({
                 });
                 _self.reducedPrice = reducedPrice;
                 _self.originalPrice = originalPrice;
-                _self.totalPrice = totalPrice-reducedPrice;
+                _self.totalPrice = totalPrice;
                 _self.kindCount = kindCount;
                 _self.totalCount = totalCount;
             });
@@ -195,6 +197,7 @@ var shoppingCart = new Vue({
                 cart.ladderPrices.forEach(function(ladder){
                     if(cart.number>=ladder.buyNum){
                         cart.price = ladder.buyPrice;
+                        cart.originalPrice = ladder.buyPrice;
                     }
                 });
             }

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

@@ -18,7 +18,6 @@ var message = new Vue({
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.getMessageCount();
-            alert(111)
         }
     }
 });

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

@@ -0,0 +1,67 @@
+var isPC = ($(window).width()>768);
+var orderList = new Vue({
+    el:'#orderList',
+    data:{
+        params:{
+            ShopID:10100,
+            pageNum: 1,
+            pageSize: 15,
+            sendOutStatus: 0,
+            payStatus: 0,
+            shopOrderNo:'',
+            name: '',
+            sendOutStatus:'',
+            payStatus:'',
+        },
+         pageInput: '1',
+        isRequset:false,
+        results:[],
+    },
+    computed: {
+        pageTotal: function () {
+            var total = Math.ceil(this.listRecord / this.params.size);
+            return total > 0 ? total : 1;
+        },
+        showPageBtn: function () {
+            var total = Math.ceil(this.listRecord / this.params.size);
+            total = total > 0 ? total : 1;
+            var index = this.params.pageNum, arr = [];
+            if (total <= 6) {
+                for (var i = 1; i <= total; i++) {
+                    arr.push(i);
+                }
+                return arr;
+            }
+            if (index <= 3) return [1, 2, 3, 4, 5, 0, total];
+            if (index >= total - 2) return [1, 0, total - 4, total - 3, total - 2, total - 1, total];
+            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, total];
+        }
+    },
+    methods:{
+         toPagination: function (pageNum) {
+            if (pageNum <= this.pageTotal) {
+                var params = {pageNum: pageNum};
+                window.location.href = updateUrlParam(params);
+            }
+        },
+     checkNum: function () {
+        if (this.pageInput > this.pageTotal) {
+            this.pageInput = this.pageTotal;
+        } else if (this.pageInput < 1) {
+            this.pageInput = 1;
+        }
+    },
+
+    },
+    mounted: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;
+            }
+
+        })
+    }
+})

+ 1 - 1
src/main/resources/templates/product/detail.html

@@ -155,7 +155,7 @@
                       <a class="upgrade" @click="clubupgrade" href="javascript:0">升级会员查看价格</a>
                    </div>
                     <div class="btnBox" v-else-if="priceFlag==0">
-                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart'>加入购物车</a>
+                        <a href="javascript:void(0);" class="cart icon" @click='addShopCart()'>加入购物车</a>
                         <a href="javascript:void(0);" class="buy" @click="buyNowSubmit()">立即购买</a>
                     </div>
                 </template>

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

@@ -13,7 +13,7 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="wrap clear ">
+    <div class="wrap clear navLayout">
     <p class="zhuti" v-if="isPC">我的交易 &gt; 我的首页 </p>
     <div v-else class="wrap_tittle mIcon" @click="opentitle"><i class="mIcon open"></i><span style="margin-left: 25px;">我的主页</span></div>
         <!--左侧面包屑-->

+ 23 - 4
src/main/resources/templates/supplier-center/message/list.html

@@ -4,6 +4,7 @@
 <head>
     <title>采美365网-消息列表-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/supplier-center/message.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -12,19 +13,37 @@
 
 <!-- 我的消息 -->
 <div id="message">
-    <div class="navLayout" :class="isRequset ? 'active':''" >
-        <div class="crumbs">
+    <div class="navLayout" :class="isRequset ? 'active':''"   >
+        <div class="crumbs" v-if="isPC">
             <span>我的交易</span>
             <span>&gt;</span>
             <span>我的首页</span>
             <span>&gt;</span>
             <span>我的消息</span>
         </div>
-        <div class="wrap clear mf">
+        <div v-else class="wrap_tittle mIcon"><span style="padding-left: 6.7vw">我的消息</span><i class="mIcon open"></i></div>
+        <div class="wrap clear ">
             <!--左侧面包屑-->
             <template th:replace="supplier-center/components/tableft"></template>
             <div class="right">
-
+                <div class="mymessage-tt">所有信息</div>
+                 <div class="mymessage-hd">
+                    <div class="checkbox-wrap">
+                        <input type="checkbox" class="checkbox all" >
+                        <span>全选</span>
+                    </div>
+                    <div class="mark-read">
+                         <span >标为已读</span>
+                         <span>删除</span>
+                    </div>
+                </div>
+                <ul class="mymessage-bd">
+                    <li >
+                        <div class="checkbox-wrap"><input type="checkbox" class="checkbox only" ></div>
+                        <div class="xiaoxi">科技合格的空间和该地块机会放寒假烦得很</div>
+                        <span class="time"> 2019-07-18 15:12:21</span>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>

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

@@ -4,6 +4,8 @@
 <head>
     <title>采美365网-中国美业全方位线上交易服务互动平台,做美业,上采美</title>
     <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/supplier-center/tableft.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/supplier-center/orderlist.css(v=${version})}" rel="stylesheet" type="text/css">
 
 </head>
 <body>
@@ -11,13 +13,137 @@
 <template th:replace="components/header"></template>
 
 <!-- 我的采美 -->
-<div>
-<h1>我的订单</h1>
+<div id="orderList">
+  <div class="navLayout" :class="isRequset ? 'active':''"   >
+    <div class="crumbs" v-if="isPC">
+            <span>我的交易</span>
+            <span>&gt;</span>
+            <span>我的订单</span>
+        </div>
+         <div class="wrap clear ">
+          <!--左侧面包屑-->
+            <template th:replace="supplier-center/components/tableft"></template>
+            <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>
+                                结算状态:
+                                <select name="" id="settlement-status" class="state">
+                                    <option value="0">所有</option>
+                                    <option value="1">待结算</option>
+                                    <option value="2">部分结算</option>
+                                    <option value="3">已结算</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>
+                                <span></span>
+                            </div>
+                             <button class="query-btn">查询</button>
+                        </form>
+
+                         <div class="supplier-main order" v-for="(order,index) in results" :key="index">
+                            <div class="order-title" >
+                                <div class="title-name">
+                                    <p>订单编号(标识):{{order.shopOrderNo}}</p>
+                                </div>
+                                <div class="title-time">
+                                    <p>下单时间:{{order.orderTime}}</p>
+                                </div>
+                            </div>
+                            <div class="order-content">
+                                <div class="order-item">
+                                    <p>结算状态:&nbsp;
+                                        <span v-if="order.payStatus==1||order.payStatus==null"> 待结算</span>
+                                        <span v-if="order.payStatus==2"> 部分结算</span>
+                                        <span v-if="order.payStatus==3"> 已结算</span>
+                                    </p>
+                                    <p>发货状态:&nbsp;
+                                        <span v-if="order.sendOutStatus==1">待发货</span>
+                                        <span v-if="order.sendOutStatus==null">未发货</span>
+                                        <span v-if="order.sendOutStatus==2">部分发货</span>
+                                        <span v-if="order.sendOutStatus==3">已发货</span>
+                                    </p>
+                                </div>
+                                <div class="order-item">
+                                    <p>商品金额:&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>
+                                </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>
+                                </div>
+                                <div class="order-product" v-for="proitem in order.orderProductList">
+                                    <div class="product-img">
+                                        <img :src="proitem.productImage"/>
+                                    </div>
+                                    <div class="product-info">
+                                        <h3>{{proitem.name}}</h3>
+                                        <p>
+                                        <span class="num" >数量:&nbsp;{{proitem.num}}</span>
+                                        <span class="num">已发货:&nbsp;{{proitem.shipmentsNum}}</span>
+                                        <span class="num" v-if="order.returnedNum!=null&&order.returnedNum!=0">已退/已取消:&nbsp;{{proitem.actualCancelNum}}</span>
+                                        </p>
+                                        <p >单价:&nbsp;<span>¥{{proitem.price.toFixed(2)}}</span> </p>
+                                        <p>合计:&nbsp;<span class="red">¥{{proitem.totalAmount.toFixed(2)}}</span> </p>
+                                    </div>
+
+                                </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>
+                                   </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>
+                                    </div>
+                                    <div class="address">
+                                        <p >收货地址:&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
+                                    </div>
+                                </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>
+            </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/orderlist.js(v=${version})}"></script>
 </body>
 </html>