1
0
Prechádzať zdrojové kódy

收银端界面调整

lhm 3 rokov pred
rodič
commit
3920f983ba

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

@@ -206,6 +206,15 @@
                         </table>
                     </li>
                     <li>
+                        <div style="margin-bottom: 10PX">
+                            <h3 style="border: white;padding: 8px">会员手机号:{{userInfo.customPhone}}</h3>
+                        </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>
+                        </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>
@@ -213,12 +222,6 @@
                             <li><h3 style="border: white;padding: 8px">实际支付价:{{actualPrice}}</h3></li>
                             <li v-if="showReduceMoney != 0"><h3 style="border: white;padding: 8px">满减:{{showReduceMoney}}</h3></li>
                         </ul>
-                        <div style="width: 30px; display: inline-block"></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>
-                        </ul>
                     </li>
                     <li  style="height: 100px;">
                         <i-button type="error" @click="clearGoodsList" class="goods-button"><i class="fa fa-pencil-square-o"></i>&nbsp;清空</i-button>
@@ -372,17 +375,20 @@
                                         <h4 class="modal-title" id="payModalLabel">付款码</h4>
                                     </div>
                                     <div class="modal-body">
-                                        <div style="margin-bottom: 50px">
-                                            <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><h3 style="border: white;padding: 8px;color: red;">实际支付价:{{actualPrice}}</h3></li>
-                                            </ul>
+                                        <div style="margin-bottom: 10PX">
+                                            <h3 style="border: white;padding: 8px">会员手机号:{{userInfo.customPhone}}</h3>
+                                        </div>
+                                        <div style="margin-bottom: 30px">
                                             <ul style="display: inline-block">
                                                 <li><h3 style="border: white;padding: 8px">会员等级:{{levelName}}</h3></li>
                                                 <li><h3 style="border: white;padding: 8px">会员当前积分:{{memberCurrentAvailableScore}}</h3></li>
                                                 <li><h3 style="border: white;padding: 8px">抵扣积分:{{deductionScore}}</h3></li>
                                             </ul>
+                                            <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><h3 style="border: white;padding: 8px;color: red;">实际支付价:{{actualPrice}}</h3></li>
+                                            </ul>
                                         </div>
                                         <form>
                                             <div class="form-group">

+ 9 - 1
kmall-admin/src/main/webapp/js/sale/sale.js

@@ -604,7 +604,7 @@ let vm = new Vue({
         // 会员手机
         memberPhone: '',
         // 订单抵扣积分
-        deductionScore: '',
+        deductionScore: '',
         // 会员可用积分
         memberCurrentAvailableScore: 0,
         // 会员等级名称
@@ -1425,6 +1425,14 @@ let vm = new Vue({
                 alert("请输入身份证");
                 return;
             }
+
+            let memberCode = vm.memberCode;
+            if (memberCode === null || memberCode === '' || memberCode === 'undefined') {
+                vm.levelName = '无';
+                vm.memberCurrentAvailableScore = '无';
+                vm.deductionScore = '无';
+            }
+
             $.ajax({
                 type: "POST",
                 url: "../api/index/idCardVerification",