Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/webapp/WEB-INF/page/sale/sale.html

@@ -105,11 +105,11 @@
     <header class="main-header">
         <div class="container-fluid">
             <div class="row" style="border:0;margin-bottom:10px">
-                <div class="col-md-3 logodiv">
+                <div class="col-md-3 col-sm-6 logodiv">
                     <!--center-block-->
                     <img src="${rc.contextPath}/statics/img/logotest2.jpg" class="img-rounded img-responsive" style="height: 70px;">
                 </div>
-                <div class="col-md-9" style="background-color: #f0f0f0;margin:0px;padding: 0px" >
+                <div class="col-md-9 col-sm-6" style="background-color: #f0f0f0;margin:0px;padding: 0px" >
                     <div v-show="showList">
 
                         <Row :gutter="16">
@@ -132,12 +132,13 @@
                     </div>
                 </div>
             </div>
+
         </div>
     </header>
 
     <div class="container-fluid" style="margin-top: 15px">
         <div id="content" class="row-fluid">
-            <div class="col-md-3">
+            <div class="col-md-3 col-sm-3">
                 <div>
                     <i-input class="search" placeholder="输入或扫码商品条形码" ref="saomiao" id="saomiao" v-model.trim='prodBarcode' @on-enter="searchQuery(prodBarcode)"/>
                 </div>
@@ -154,8 +155,8 @@
                     </li>-->
                     <li style="margin-top: 50px;" >
                         <div v-show="goodsDetail" style="font-size: 1.2em">
-                            <img style="height: 400px;width: 400px;" :src="goods.primaryPicUrl" class="img-rounded"/>
-                            <h1 style="margin: 8px;"><strong>{{goods.name}}</strong></h1>
+                            <img style="width: 100%;" :src="goods.primaryPicUrl" class="img-rounded"/>
+                            <h1 style="margin: 8px;font-size: 20px;"><strong>{{goods.name}}</strong></h1>
                             <p style="margin: 8px;">单价： <strong>{{goods.retailPrice}}</strong> /元</p>
                             <p style="margin: 8px;">优惠前税费： <strong>{{goods.goodstaxes}}</strong> /元</p>
                             <p style="margin: 8px;">规格： {{goods.specification}}</p>
@@ -171,22 +172,22 @@
                     </li>
                 </ul>
             </div>
-            <div class="col-md-6" style="padding: 0px;background-color: #f0f0f0">
+            <div class="col-md-6 col-sm-8" style="padding: 0px;background-color: #f0f0f0">
                 <ul class="list-unstyled; ">
-                    <li ref="overflowLi" style="height: 600px;overflow:auto">
+                    <li ref="overflowLi" style="min-height: 290px;overflow:auto">
                         <table id="cbec" class="table .table-striped">
                             <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
-                                <th style="width: 300px;padding: 7px">跨境商品名称</th>
-                                <th style="padding: 7px">单价</th>
-                                <th style="padding: 7px">积分优惠</th>
-                                <th style="padding: 7px">其他优惠</th>
-                                <th style="padding: 7px">预估税费</th>
-                                <th style="padding: 7px">实际支付价</th>
-                                <th style="padding: 7px">数量</th>
-                                <th style="padding: 7px">参与活动</th>
+                                <th style="width: 130px;padding: 7px">跨境商品名称</th>
+                                <th style="padding: 7px;min-width: 38px;">单价</th>
+                                <th style="padding: 7px;">积分优惠</th>
+                                <th style="padding: 7px;">其他优惠</th>
+                                <th style="padding: 7px;">预估税费</th>
+                                <th style="padding: 7px;">实际支付价</th>
+                                <th style="padding: 7px;min-width: 70px;">数量</th>
+                                <th style="padding: 7px;min-width: 130px;">参与活动</th>
                                 <th>操作</th>
                             </tr>
-                            <tr v-for="(item,i) in goodsList" v-if="item.name" style="font-size: 1.3em">
+                            <tr v-for="(item,i) in goodsList" v-if="item.name" style="font-size: 1em">
                                 <td><h3>{{item.name}}</h3></td>
                                 <td> {{item.retailPrice}}</td>
                                 <td> {{item.deductionPrice}}</td>
@@ -238,6 +239,7 @@
                         <i-button data-toggle="modal" @click="toResumePending" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;恢复挂起</i-button>
                         <i-button data-toggle="modal" @click="calculateOrderPrice" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;计算优惠后价格</i-button>
                         <i-button data-toggle="modal" @click="toOrderSubmit" type="primary" class="goods-button" ><i class="fa fa-pencil-square-o"></i>&nbsp;提交订单</i-button>
+                        <button type="button" style="margin:0 30px 0 20px;font-size: 25px;" class="btn btn-primary" @click="demo" id="demo" data-dismiss="modal">测试打印小票</button>
 
 <!--                        45636914-->
                         <div class="modal fade" id="pendignOrderModal"  role="dialog" aria-labelledby="pendignOrderLabel" aria-hidden="true">
@@ -417,9 +419,9 @@
 
 
             </div>
-            <div class="col-md-3">
+            <div class="col-md-3 col-sm-1">
                 <h2 class="text-center" style="border: white;background-color: #F5DCB3;padding: 8px" >小票码 <span v-show="delayResponse"> 海关卡回执导致单量堆积</span></h2><br/>
-                <div class="row" style="border: white;background-color: #f0f0f0;overflow:auto;height: 700px;">
+                <div class="row" style="border: white;background-color: #f0f0f0;overflow:auto;min-height: 520px;">
                     <div class="col-xs-4 col-sm-4" v-for="(item,i) in pickUpCodeList" style="margin-bottom: 8px;">
                         <i-button data-toggle="modal" data-target="#orderDetail" style="width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn,item.pickUpCodeSn)" v-if="item.pickUpCodeStatus == 0"  >&nbsp;{{item.pickUpCodeSn}}</i-button>
                         <i-button data-toggle="modal" data-target="#orderDetail" style="background-color:#83e7b4;width: 110px;font-family: 微软雅黑" @click="queryOrderDetail(item.orderSn,item.pickUpCodeSn)" v-if="item.pickUpCodeStatus == 1" >{{item.pickUpCodeSn}}</i-button>