From 3d087f8f5cba21e08dbac92a034de8b77881a8b5 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Wed, 9 Oct 2024 17:23:11 +0800
Subject: [PATCH] 10.9

---
 .../views/cashier/NewComponents/Integral.vue  | 51 ++++++-------------
 .../views/cashier/NewComponents/credit.vue    | 11 ++--
 .../views/cashier/NewComponents/newHome.vue   |  2 +-
 fuintCashierWeb/src/views/cashier/index.vue   |  5 +-
 4 files changed, 25 insertions(+), 44 deletions(-)

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index c660a200e..a3506439b 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -1,4 +1,4 @@
-<!--积分-->
+<!--积分 商城-->
 <template>
     <div class="app-center">
       <div class="center-left">
@@ -49,22 +49,15 @@
             </div>
 
           </div>
-<!--          <div class="center-left-hj">-->
-<!--            <div class="hj-box" style="justify-content: left">油品:￥200.00</div>-->
-<!--            <div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥0.52</div>-->
-<!--          </div>-->
+
           <div class="center-left-hj">
             <div>使用积分</div>
             <div>-{{allPoints}}</div>
           </div>
-<!--          <div class="center-left-hj" v-show="isMember">-->
-<!--            <div>-->
-<!--              电子储值卡-->
-<!--              <span>（账户余额：{{ balance }}元）</span>-->
-<!--            </div>-->
-<!--            <div>-￥{{ allAmout }}</div>-->
-<!--          </div>-->
-
+          <div class="center-left-hj">
+            <div>积分余额（账户余额:318积分)</div>
+            <div>-{{allPoints}}</div>
+          </div>
             <div class="center-left-hj" v-show="isMember">
               <div>
                 积分余额
@@ -78,10 +71,6 @@
               <div>扫码支付</div>
               <div class="bule">{{allPoints}}</div>
             </div>
-<!--            <div class="th-box">-->
-<!--              <div>找零</div>-->
-<!--              <div class="bule">394.7</div>-->
-<!--            </div>-->
             <div class="th-box">
               <div @click="dialogVisible = true">加油员</div>
               <div style="cursor: pointer;color: crimson" @click="dialogVisible = true" >{{ staff.realName }}</div>
@@ -114,15 +103,13 @@
         </div>
 
       </div>
-      <div class="center-right"
-      >
+<!--      右侧-->
+      <div class="center-right">
         <div class="center-right-top">
           <el-tabs v-model="queryParams.categoryId" @tab-click="handleClick">
             <el-tab-pane label="全部" name='first'></el-tab-pane>
             <el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name='item.id.toString()'></el-tab-pane>
           </el-tabs>
-
-
         </div>
         <div style="width: 200px;margin-left: 2%; ">
           <el-input v-model="queryParams.giftName" @input="getGift()" placeholder="请输入内容"></el-input>
@@ -165,11 +152,10 @@
             <div class="ddjil" @click="orderHistoryMethod">订单记录</div>
             <div class="gwuc" @click="shoppingCartMethod()">
               <el-badge :hidden="markPurchasesAll<1" :value="markPurchasesAll" class="item">
-                <i class="el-icon-shopping-cart-2"></i> <span style="margin-left: 5px">购物车</span>
+                <i class="el-icon-shopping-cart-2"></i> <span style="margin-left: 5px">购物车1</span>
               </el-badge>
             </div>
           </div>
-
         </div>
 
       </div>
@@ -1570,20 +1556,9 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
     cursor: pointer;
     /*color: white;*/
   }
-
   .wrap-box2{
     background: #30a1ff !important;
     color: white;
-    //width: 100%;
-    //height: 100%;
-    //border-radius: 8px;
-    //height: 80px;
-    //display: flex;
-    //align-items: center;
-    //justify-content: center;
-    //border: 1px solid #20b400;
-    //cursor: pointer;
-    //color: #20b400;
   }
 
   .center-left-bottom{
@@ -1733,7 +1708,10 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
     align-items: center;
   }
   .wrap-right-bottom{
-    width: 100%;
+    position: absolute;
+    bottom: 0px;
+    justify-content: space-between;
+    width: 58%;
     background: white;
     display: flex;
     align-items: center;
@@ -1741,7 +1719,8 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
     margin-top: 10px;
     box-sizing: border-box;
     padding: 15px;
-    justify-content: space-between;
+
+
   }
   .chongzhi{
     display: flex;
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 2dd71f124..aa28d8dd3 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -57,12 +57,13 @@
             placeholder="挂账结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item style="float: right">
-          <el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
-          <el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
-          <el-button type="primary"  @click="addUnit">新增挂账单位</el-button>
-        </el-form-item>
+
       </el-form>
+      <div style="display: flex">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery1">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery1">重置</el-button>
+        <el-button type="primary"  @click="addUnit">新增挂账单位</el-button>
+      </div>
     </div>
 <!--    统计-->
     <div class="top_news">
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 5adff15bb..20e38ee75 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -129,7 +129,7 @@
       <div class="box-bottom">
         <div>
           <div class="price_">￥{{realAmount}}</div>
-          <div class="price_prefer">优惠合计:￥{{disTotal}}元</div>
+          <div class="price_prefer">优惠合计:￥{{disTotal}}</div>
         </div>
         <div class="anniu">立即结算</div>
       </div>
diff --git a/fuintCashierWeb/src/views/cashier/index.vue b/fuintCashierWeb/src/views/cashier/index.vue
index 44e6c336c..d703e328e 100644
--- a/fuintCashierWeb/src/views/cashier/index.vue
+++ b/fuintCashierWeb/src/views/cashier/index.vue
@@ -748,12 +748,13 @@ export default {
     }
   }
   .app-left-box{
-    width: 100%;
+    width: 80%;
+    margin-left: 15%;
     height: 60px;
     box-sizing: border-box;
     display: flex;
     align-items: center;
-    justify-content: center;
+    //justify-content: center;
     color: #909399;
   }
   .container-top{