~~

resources/admin/src/pages/cashierhome/cashierhome.vue

@@ -47,7 +47,7 @@
                                     <div class="pricebox">
                                       <div class="price">
                                         
-                                        <div class="price_icon">会员 ¥</div>
+                                        <div class="price_icon"> ¥</div>
                                         <div class="price_main din">
                                           {{ cc.formatBig }}
                                           <text class="mini">{{ cc.formatMini }}</text>
@@ -55,7 +55,7 @@
                                       </div>
                                         
                                       <div class="price jfprice">
-                                        <div class="price_icon">+积分:</div>
+                                        <div class="price_icon">积分可抵扣:</div>
                                         <div class="price_main din">
                                           {{ cc.goods.integral }}
                                         </div>
@@ -76,9 +76,9 @@
                                     <div class="pricebox">
                                       
                                       <div class="price">
-                                        <div class="price_icon">不用使用积分 ¥</div>
+                                        <div class="price_icon">使用积分 ¥</div>
                                         <div class="price_main din">
-                                          {{ parseFloat(parseFloat(cc.goods.price)  + parseFloat(cc.goods.integral)).toFixed(2) }}
+                                          {{ parseFloat(parseFloat(cc.goods.price)  - parseFloat(cc.goods.integral)).toFixed(2) }}
                                         </div>
                                       </div>
 
@@ -94,12 +94,17 @@
 
 
                     <div class="total">
-                      <small>数量:</small>{{ totalCount }}<small>金额:</small>￥{{ totalMoney }}
-                      <small>所需积分:</small>{{ totaljifen }}
+                      <small>数量:</small>{{ totalCount }}
+                      <!-- <small>金额:</small>￥{{ totalMoney }} -->
+                      <small>积分可抵扣:</small>{{ totaljifen }}
                       
                     </div>
                     <div class="total">
-                      <small>不使用积分需付:</small>￥{{Userprice }}
+                      <small>使用积分需付:</small>￥{{Userprice }}
+                      
+                    </div>
+                    <div class="total">
+                      <small>不使用积分需付:</small>￥{{totalMoney }}
                       
                     </div>
                     <div class="pos_btn">
@@ -109,7 +114,7 @@
                       <el-button size="large" type="primary" @click="focusfun(1)" >监听扫码枪识别</el-button>
                       <el-button size="large" type="danger" @click="delAllGoods()">清空购物单</el-button>
                       <el-button size="large" type="success" @click="focusfun(2)">会员扣积分</el-button>
-                      <el-button size="large" type="success" @click="checkOut()">会员结算</el-button>
+                      <el-button size="large" type="success" @click="checkOut()">用户结算</el-button>
                       
                       <!-- addjf 会员扣积分 -->
                     </div>
@@ -287,7 +292,7 @@ export default {
   mounted(){
     var orderHeight = document.body.clientHeight;
     // document.getElementById("order_list").style.height = (orderHeight - 100) + "px";
-    this.scrollbarheight = orderHeight - 320;
+    this.scrollbarheight = orderHeight - 330;
 
   },
   created: function() {
@@ -317,7 +322,7 @@ export default {
           this.totalCount = totalCount;
           this.totaljifen = totaljifen;//积分
 
-          this.Userprice = parseFloat(parseFloat(total) + parseFloat(this.totaljifen)).toFixed(2);
+          this.Userprice = parseFloat(parseFloat(total) - parseFloat(this.totaljifen)).toFixed(2);
 
 				},
 				deep: true,