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

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

@@ -4,7 +4,43 @@
     <title>收付款管理</title>
     #parse("sys/header.html")
 
-    <style type="text/css">
+    <style type="text/css" lang="scss">
+
+
+        @media screen and (max-width: 1396px) {
+            #rrapp {
+                font-size: 0.1rem;
+            }
+            #goodsImg{
+                width: 50%;
+            }
+        }
+        @media screen and (min-width: 1396px) and (max-width: 1536px) {
+            #rrapp {
+                font-size: 0.2rem;
+            }
+            #goodsImg{
+                width: 50%;
+            }
+        }
+        @media screen and (min-width: 1536px) and (max-width: 1920px) {
+            #rrapp {
+                font-size: 0.5rem;
+            /*//我这里是按1920的屏幕宽度设置的，所以1rem相当于100px*/
+            }
+            #goodsImg{
+                width: 75%;
+            }
+        }
+        @media screen and (min-width: 1920px) {
+            #rrapp {
+                font-size: 0.1rem;
+            }
+            #goodsImg{
+                width: 100%;
+            }
+        }
+
         #saomiao{
             padding-right: 30px;
         }
@@ -155,7 +191,7 @@
                     </li>-->
                     <li style="margin-top: 50px;" >
                         <div v-show="goodsDetail" style="font-size: 1.2em">
-                            <img style="width: 100%;" :src="goods.primaryPicUrl" class="img-rounded"/>
+                            <img id="goodsImg" :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>
@@ -174,21 +210,21 @@
             </div>
             <div class="col-md-6 col-sm-8" style="padding: 0px;background-color: #f0f0f0">
                 <ul class="list-unstyled; ">
-                    <li ref="overflowLi" style="min-height: 290px;overflow:auto">
+                    <li ref="overflowLi" style="height: 250px;overflow:auto">
                         <table id="cbec" class="table .table-striped">
                             <tr style="border: white;background-color: #F5DCB3;font-size: 1.3em" >
-                                <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>
+                                <th style="width: 26%;">跨境商品名称</th>
+                                <th style="width: 9%;">单价</th>
+                                <th style="width: 11%;">积分优惠</th>
+                                <th style="width: 11%;">其他优惠</th>
+                                <th style="width: 10%;">预估税费</th>
+                                <th style="width: 12%;">实际支付价</th>
+                                <th style="width: 10%;">数量</th>
+                                <th style="width: 13%;">参与活动</th>
+                                <th>&nbsp;</th>
                             </tr>
                             <tr v-for="(item,i) in goodsList" v-if="item.name" style="font-size: 1em">
-                                <td><h3>{{item.name}}</h3></td>
+                                <td> {{item.name}}</td>
                                 <td> {{item.retailPrice}}</td>
                                 <td> {{item.deductionPrice}}</td>
                                 <td> {{item.otherDiscountedPrice}}</td>
@@ -215,22 +251,22 @@
 <!--                                原userInfo.customPhone属性是会员手机号-->
 <!--                                现其定义为收货人手机号(支付人手机号)-->
 <!--                                海控需要将其分开-->
-                                <li><h3 style="border: white;padding: 8px">会员手机号:{{userInfo.consigneePhone}}</h3></li>
-                                <li><h3 style="border: white;padding: 8px">收货人手机号:{{userInfo.customPhone}}</h3></li>
+                                <li><p style="border: white;padding: 8px;font-weight:600;">会员手机号:{{userInfo.consigneePhone}}</p></li>
+                                <li><p style="border: white;padding: 8px;font-weight:600;">收货人手机号:{{userInfo.customPhone}}</p></li>
                             </ul>
                         </div>
                         <ul style="display: inline-block">
-                            <li><h3 style="border: white;padding: 8px;">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px;">抵扣积分:{{deductionScore}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px;">会员等级:{{levelName}}</h3></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">会员当前积分:{{memberCurrentAvailableScore}}</p></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">抵扣积分:{{deductionScore}}</p></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">会员等级:{{levelName}}</p></li>
                         </ul>
                         <div style="width: 30px; display: inline-block"></div>
                         <ul style="display: inline-block">
-                            <li><h3 style="border: white;padding: 8px;">总件数:{{totalCount}}</h3></li>
-                            <li><h3 style="border: white;padding: 8px;">总价:{{totalPrice}}</h3></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">总件数:{{totalCount}}</p></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">总价:{{totalPrice}}</p></li>
 <!--                            <li><h3 style="border: white;padding: 8px">优惠价:{{discountedPrice}}</h3></li>-->
-                            <li><h3 style="border: white;padding: 8px">实际支付价:{{actualPrice}}</h3></li>
-                            <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px">满减:{{showReduceMoney}}</h3></li>
+                            <li><p style="border: white;padding: 8px;font-weight:600;">实际支付价:{{actualPrice}}</p></li>
+                            <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px;font-weight:600;">满减:{{showReduceMoney}}</h3></li>
                         </ul>
                     </li>
                     <li  style="height: 90px;">
@@ -420,7 +456,7 @@
             </div>
             <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;min-height: 520px;">
+                <div class="row" style="border: white;background-color: #f0f0f0;overflow:auto;min-height: 420px;">
                     <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>