From 67ab67e6acaa26af2ae4fc2e8b56806562176ce1 Mon Sep 17 00:00:00 2001
From: "DESKTOP-369JRHT\\12997" <9>
Date: Thu, 19 Sep 2024 17:22:30 +0800
Subject: [PATCH] 9.19

---
 .../views/cashier/NewComponents/imgs/dx.png   | Bin 0 -> 1446 bytes
 .../views/cashier/NewComponents/imgs/zxz.png  | Bin 0 -> 1456 bytes
 .../views/cashier/NewComponents/newHome.vue   | 170 ++++++++++++++++--
 3 files changed, 154 insertions(+), 16 deletions(-)
 create mode 100644 fuintCashierWeb/src/views/cashier/NewComponents/imgs/dx.png
 create mode 100644 fuintCashierWeb/src/views/cashier/NewComponents/imgs/zxz.png

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/imgs/dx.png b/fuintCashierWeb/src/views/cashier/NewComponents/imgs/dx.png
new file mode 100644
index 0000000000000000000000000000000000000000..86191b5e9720f63423241bfdeeb40ee229506446
GIT binary patch
literal 1446
zcmZ8heKZql7@sI&KBB{>FDw#bhEW{y{k42-b?-?_Sc^Vf#>&UY<%-FORLmvim~KlW
zQRrS@D>GMht!{<f%FNfyn6HM-eec~l_ng~%-t#`c=l6Tg?|q*?o;NQf$X8R{P#pq+
zX!`qkVIdGD7{FO-%HU)U?Xv+vDG}@I0b#w`IRz4K2<E6ah#UVdKA%57KQ9)GXJ=;@
z78a(arsn46rl+R?1J>l^BuK}{$AJnYz<?Bx3JH)C6BFQ6FaQHyQLNw<SfMJgKp+4B
zsDK29;3A<=I5RUN5{ZD1!XLaxB9VZ{EG{lCEiElCFR!eueEs@WDwVFTuCA@Et*@`k
zWHPy24m#kaN5+C?%*ogw97IJ;SJ%kO3Wtk}i_gg^FK4k>jg1^mZ!eeokNMJ)RJyh%
zmlF=xvmp?b@BO{pk0uX^Mux8sIq7VP=+ZJit><AD8LfwQHqN$<E!2cTT?51$A(XDq
zb_j|^v%y2T__M^a)if}nS!b{*RhBEpX=vs<$mD;Bo1Z@<s}k&;`0h`yGZN#BXYp=V
z87M1MVOmmd%t%t7wRj(u69TW8qdG|+ck*_d94bb+6#wLOA^PO35B2t_xi*Ph3b#Rg
z%&Dusf&HTIJ5>fBMMsrPaL(qlYi3O($^IPZXyWEsOiTNiuzw77KEo&1p^-Efu4de(
zpODEdg*UZ%P?dHMnp7dQvSSKbCAWm)7Sq%gLSEFR4|?fjcs0ymZPaoV8cMsSJz6|b
z!%Ue9#n_&qMnzSqYnXa&M-1pvXF{}0*huI%J2w)R^S|x%Z3X*3S?Y%1n?n&?<YxVh
zjwU7jWE#w@BtrRp|B5XepZhyE2lL%FHXe`fjs9Xs!v@?|w?;lr&k2=41s{uSx7P9m
zw`l&zKdm93>6(de7}%bjFzq{eG+U%i8>HgMm4OyW1)~`0de{?g7cr(=-dCoi=TTWv
zLqfVAfW@1-1%$ypuhy#`A!6vPU<aZW4_VfxjWZ$i_a$k+JWb0aO?P*O8*Wal(^Pgo
zi!C_rsZ1}kr$K|m6I>FW?C9)7n?VuU=+3@pH+T_B1&w*V-Mwt0XOfUZijSGx)G(-X
zCFPP5gwon@H)Y1bzwE7`nLfBZGC;MkzSvl8!5I&k>{{P#kcyNX?dUF7!3`6i%x{V#
zKryoUMqI%C<Ty2&%lnJ;Q{e_<e?iL{mZN@1XOL+>b`4!gV%Vc<BD%M{A^mdPtR#zM
z*jdLfCHi&Q4;J#cMOk#muwm;{Y30zIOk&y2hFxdbZwHIQ>P1XjzF{~4U5uSa{|4FB
zdjfbgan9ujc8xGJA~tS8_rpXQnTY(Xg~h1qKm#928ri%)c|07O8B9L4)#c?g9@^b+
z-(*TE*J>?R{gM8jatneg(~3}K+0(E0s1})U?|%E`7rYlil;&M$UT?^%-}(5R>%r94
zv|O@Cl-aeiR<0!*y-Q|h_NRn1`?{9uJ0_bg&KvO=fy8^rFBwK3J_b!&v-c+H5R35c
zKZ_Vxi?EX!9gGiJp_IlOec5@>FNjh(r&VMz#TV{KE$Dbx-Pl&<&4ab5V-E!P96i)X
z!43ZP%W3;t2Od<b(}T&wha8LY0#R<x**h{F;dU=HSxGe~IDsPtUK8(n#!DaM$6SjK
zjPHMY`TeVm?D>b4oz!RBuyuA9i3y1D;XNiL%Q^#h9nVv2s&@2SqgsQJ?M>dUU@(0X
zUgPc@3>{Pn@TQ+YxqZsR9;!O<yi(|E%c!&*8HuLcJih9hK22qU5#L+7%6a1E+P>{6
vZ+fZ2HRwPXY8m4zSrmTiaQih@U@ljNA8Uli#-W42w*>L`4)S7oL}dL9=$P}-

literal 0
HcmV?d00001

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/imgs/zxz.png b/fuintCashierWeb/src/views/cashier/NewComponents/imgs/zxz.png
new file mode 100644
index 0000000000000000000000000000000000000000..ade9824ddcb608bdba545d0699bd3e75ba997e00
GIT binary patch
literal 1456
zcmYk52~bm46o$j1EJ8t42*oN(m4t=>QNSu0)__Pz10=GfV9F9%1X%<l3L+p|A}T5g
zE+}gT0zm^2Xut?m7EMtWv52A-#Znd*ltL}<_6FNd?|k#WfBy5%oHKLh=2Iyi+L~W#
zqEIMp&)sgmD3lT!`b>2dsI`yHt>8x~$=AaLCF<We1$_pUOe4V%WI!@Nh7*uwfI>Rx
zE(GU&KwA#r(Lp=(en7$jd^%`71$Z<?*jljMTmUZ6ms<)zF<p_g6fEC_ex=&XK@^^@
zpoOETHWwf(e<CYg3jN##^Uofd>Ucx|NkD3nklGYPco?Z;BXviR`c$O;C?YzBG^8Wf
zk0UouAYw=+BF;h@vyrBgNK+0Xf#f2RJme-MA5KS_^H*lk;F5~16wB-dJcvKw1pq!I
z5b%RQNgyZ*0vEprmx95i5O8T9xC~)}E09o73JC*O!@*S+xE2nsLER6^Ad#RP5(O%v
zK}8IxJOC<VLDd0J1vL&-9|YC$KmbVqf<#br2-KzkVG5{YgSsQ2{s<5q0}bim`f+eQ
z1Bf$;WA^vq9atXnrTC$gl~q+WG}f&%GP1Y#_YYvRb90N~;qipRy1J&O!NH-SiHT`=
z78e&^KKEFQLa9`Fx;fL>k7u8b`VTp+U;UP$?}c?K(_a<g<D^Mie<xU}>_kin^>(mo
zEzSai&ojb<A9cLF_LxTvzJFe_bW33O`opWkgrqkwD_`r4u2c7TES=CO3)Fizx3GJM
z6GemcDZ6`$lT(T72ylrkb;AYB3=UiA4jlhW*DKkGDvlD~ln$r3e9h|*8e3L2kjguV
zS;@4Pi|;?-ahhSXx1EP8x+GYJgkh4f!^X6ns;o=85|Wo!9*?1%$2?G5-PekB`T^6c
zSFNrao=;WN4UZCRGVUF8O)&1&Ge2bWo|3~f)?uPl(6>>mtuvIgR;=;A=ATUW|3#Ro
z|JSgzxhN!cn?u``KvgcWM$Mp`Us7T&Bd(G=k67xnCSQs)_y^>%S+O?hIF$Q~PKQPr
z3Z2j4Xid$&z`0(O?znqq4o@LewsW$yI!Jie__OySl_%y*&kd+-_3I>=R;bA_jr$BO
znR25UhWqJVtkY@tep8wc?`-C7vaYf1YT)9v$2TlsE7r)pR&?6}Rt2qQ=*^syMO-Cl
zb~(s#g8lXPlk7(YT(R}!2(h%aJvvR=JLBh0M^As-HJnQ_k@uL%(<63A8L&3VcBZBk
zj5cdw=X_bL1r2<nVJ62x)gYKz*i9m$-{AXXvL5YNW}B27LB8>}?}6%8$*YGE(Ij<~
zpN_if@VDG=e_}OlKp{kT@E<uG6gi%ha)YeD85j0%{uN)bp8R{!VRTs92;Civ9_sNk
zC=E!t;G@ZkD>_Yf$MTzGldxim*74?^B~y-`^@+hgwU{E@nh#x?uT(RX-2M2fNcg%{
z*Hp68C&=BBe@YKOBpnscIYYm+Yl|J<zf%aO)oA}Q`-pAXb{Av!qU*1nvljEg?DK}c
zu^4jdv*qH^6kea>&xX`E?t@SgVQFG1FxueEjlQ-<(dE7Iv_KMpF>;c%A$N>!95xx^
z8ADCn7#c`0G|B#@$?n;>g{@j-vDvvN42DtPhAMr!hp5;r>>iW2)`#pgNu^*MMq2es
z=94XSlpCC?eP##VjYrt6(FqVF;%QH7n#q5PmQ($`H|0csEXFQ6`aQA{R|QQ!-0m31
z@UW%vx1Nd_>USnaSC*?Xl4m~La@b>)E^jxrVT%jHHAo+K*(W68dIraQzoTemn|(!m
nm%W!Dci0|3M^193E8TJQu@>5zeX)4}zI2o)iQ*=5VP^gfwe!`H

literal 0
HcmV?d00001

diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 68710ed3e..480c9e6ca 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -3,21 +3,28 @@
     <div class="left-box">
       <div class="box-top">
         <div class="o-top" v-if="userInfo">
-          <div class="d-s">
-            <img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
-            <div>
-              <div style="font-weight: bold">匿名</div>
-              <div class="d-s">
-                <span>12345679912</span>
-                <img src="./imgs/fz.png" style="width: 17px;height: 17px;margin: 0px 10px">
-                <img src="./imgs/vipicon.png" style="width: 23px;height: 19px;">
+          <div>
+            <div class="d-s">
+              <img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
+              <div>
+                <div style="font-weight: bold">匿名</div>
+                <div class="d-s">
+                  <span>12345679912</span>
+                  <img src="./imgs/fz.png" style="width: 17px;height: 17px;margin: 0px 10px">
+                  <img src="./imgs/vipicon.png" style="width: 23px;height: 19px;">
+                </div>
               </div>
             </div>
+            <div class="d-s">
+              <div style="font-size: 12px;margin-right: 5px">储值卡：￥1000.000 </div>
+              <div style="font-size: 12px">囤油卡：￥1000.000</div>
+            </div>
           </div>
+
           <div class="d-s">
             <div class="an_bor" @click="addMemberRecharge()">会员充值</div>
             <div class="an_bor">重置会员</div>
-            <div class="an_bor">赠送优惠券</div>
+            <div class="an_bor" @click="addFreeTicket()" >赠送优惠券</div>
           </div>
         </div>
         <div class="o-top" v-if="!userInfo">
@@ -58,15 +65,35 @@
             </div>
           </div>
           <div class="d-b">
-            <el-checkbox v-model="boxShow1">储值卡（账户余额:0元)</el-checkbox>
 
-            <div class="or_num">￥0.00</div>
+            <el-checkbox v-model="checkAll">优惠券 <i class="el-icon-arrow-down"></i></el-checkbox>
+            <div class="or_num">-￥0.00</div>
           </div>
-          <div class="d-b">
-            <el-checkbox v-model="boxShow2">囤油卡（账户余额:1000元)</el-checkbox>
+          <!-- 下拉列表插入-->
+          <div v-if="checkAll == true">
+            <div class="x-d-b">
+              <el-checkbox v-model="checkAll1">优惠券1</el-checkbox>
+              <div class="or_num">-￥0.00</div>
+            </div>
+            <div class="x-d-b">
+              <el-checkbox v-model="checkAll2">优惠券2</el-checkbox>
+              <div class="or_num">-￥0.00</div>
+            </div>
+            <div class="x-d-b">
+              <el-checkbox v-model="checkAll3">优惠券3</el-checkbox>
+              <div class="or_num">-￥0.00</div>
+            </div>
+          </div>
+<!--          <div class="d-b">-->
+<!--            <el-checkbox v-model="boxShow1">储值卡（账户余额:0元)</el-checkbox>-->
 
-            <div class="or_num">-￥220.00</div>
-          </div>
+<!--            <div class="or_num">￥0.00</div>-->
+<!--          </div>-->
+<!--          <div class="d-b">-->
+<!--            <el-checkbox v-model="boxShow2">囤油卡（账户余额:1000元)</el-checkbox>-->
+
+<!--            <div class="or_num">-￥220.00</div>-->
+<!--          </div>-->
 
         </div>
         <div class="three-top">
@@ -211,6 +238,41 @@
       </div>
     </div>
     <!--    弹窗-->
+    <el-dialog
+      title="送券"
+      :visible.sync="freeTicket"
+      width="800px"
+
+    >
+      <div class="ds-tc">
+        <div class="left_tc">
+          <div class="t-tc">
+            <div style="font-size: 18px;font-weight: bold">所有卡券</div>
+            <div style="font-size: 16px;color: #ff9655">打印所有二维码</div>
+          </div>
+          <div class="wrap-tc">
+            <div class="tc_wa" :class="{'tc-active' : freeIndex == index }" @click="setFreeIndex(index)"  v-for="(item,index) in freeTicketList">{{item.name}}</div>
+          </div>
+        </div>
+        <div class="right_tc">
+          <div style="font-weight: 600;font-size: 16px;color: #333333;text-align: center;margin-bottom: 15px">优惠价格固定1元</div>
+          <div style="font-weight: 600;font-size: 16px;color: #333333;margin-bottom: 10px" >油品立减券</div>
+          <div style="margin-bottom: 10px">可用时间：周一至周日 全天</div>
+          <div style="display: flex">
+            <div style="width: 70px">可用日期：</div>
+            <div style="width: 150px">2024-09-01 12:00:00至2024-09-01 12:00:00</div>
+          </div>
+          <div style="text-align: center;margin: 15px auto ">
+            <img src="./imgs/ewm.png" style="width: 200px;height: 200px">
+            <div>请顾客使用微信扫码领取</div>
+          </div>
+          <div style="font-weight: 600;font-size: 16px;color: #333333;margin-bottom: 5px">使用规则</div>
+          <div>优惠说明：价值10元代金券一张消费满100可用</div>
+        </div>
+      </div>
+
+
+    </el-dialog>
     <el-dialog
       title="新增会员"
       :visible.sync="newMember"
@@ -407,6 +469,34 @@ export default {
       checkAll2: false,
       checkAll3: false,
       isIndeterminate: true,
+      freeTicket:false,
+      freeIndex:0,
+      freeTicketList:[
+        {
+          name: '油品券',
+          num: '0'
+        },
+        {
+          name: '储值卡券',
+          num: '0'
+        },
+        {
+          name: '会员卡券',
+          num: '0'
+        },
+        {
+          name: '油品券',
+          num: '0'
+        },
+        {
+          name: '储值卡券',
+          num: '0'
+        },
+        {
+          name: '会员卡券',
+          num: '0'
+        },
+      ],
       cardList: [
         {
           name: '储值卡',
@@ -659,6 +749,12 @@ export default {
     addVip() {
       this.newMember = true
     },
+    setFreeIndex(index){
+      this.freeIndex = index
+    },
+    addFreeTicket(){
+      this.freeTicket = true
+    },
     addMemberRecharge() {
       this.memberRecharge = true
     },
@@ -970,7 +1066,7 @@ input {
 
 .an_bor {
   box-sizing: border-box;
-  padding: 10px;
+  padding: 5px;
   border: 1px solid #fff;
   border-radius: 50px;
   display: flex;
@@ -1390,7 +1486,27 @@ input {
 .tc-box {
   text-align: center;
 }
+.ds-tc{
+  width: 100%;
+  display: flex;
+}
+.left_tc{
+  width: 500px;
 
+}
+.right_tc{
+  width: 300px;
+  height: 100%;
+  box-sizing: border-box;
+  padding: 0px 15px;
+
+}
+.t-tc{
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
 .red-size {
   font-size: 18px;
   color: #F44522;
@@ -1448,4 +1564,26 @@ input {
   padding: 10px 5px;
   border-radius: 8px;
 }
+.wrap-tc{
+  width: 100%;
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 15px;
+}
+.tc_wa{
+  width: 32%;
+  margin-bottom: 4%;
+  margin-right: 1%;
+  box-sizing: border-box;
+  padding: 10px;
+  background: url("./imgs/dx.png") no-repeat;
+  height: 65px;
+  background-size: 100% 100%;
+  cursor: pointer;
+}
+.tc-active{
+  background: url("./imgs/zxz.png") no-repeat !important;
+  background-size: 100% 100% !important;
+  color: #fff !important;
+}
 </style>