diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index a3506439b..5bae3fe1a 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -4,60 +4,120 @@
-
-
会员搜索
-
-
-
-
- -
-
- {{ member.name }}
- {{ member.mobile }} -
-
- -
-

会员储值账户余额：{{ member.cardBalance }}

-

积分余额：{{ member.points }}

-
- - -
-
- -
- 会员等级：{{ gradeName }} -
- - -
-
-
-
重置会员
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+
{{chooseVipUser.name||'匿名'}}
+
+ {{chooseVipUser.mobile}} + 普通会员 + +
储值卡：￥1000.00
+
储值卡：￥1000.00
+
储值卡：￥1000.00
+
储值卡：￥1000.00
+
储值卡：￥1000.00
+ + + +
+
+
+ + + + +
+ +
+
会员充值
+
重置会员
+
赠送优惠券
+
+
+
+
+ + + + +
+
+
新增会员
+
+ + +
+
+ + {{ item.name }} +
+ +
+
使用积分
-{{allPoints}}
-
-
积分余额（账户余额:318积分)
-
-{{allPoints}}
-
+
积分余额 @@ -72,7 +132,7 @@
{{allPoints}}
-
加油员
+
操作员
{{ staff.realName }}
@@ -105,13 +165,13 @@
-
- +
+
-
+
@@ -152,7 +212,7 @@
订单记录
- 购物车1 + 购物车
@@ -450,7 +510,7 @@ import { import BigNumber from 'bignumber.js'; import PointsCashier from "@/views/cashier/NewComponents/integralOrder/pointsCashier"; import {getDicts} from "@/api/dict/data"; -import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/user"; +import {getUserInfoMobile, getUserVoMobile, getUserVoName, userListByPhone} from "@/api/cashier/user"; import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade"; import {queryStaffs, staffInfo} from "@/api/cashier/staff"; import {connectFlag, getLodop} from "@/api/LodopFuncs"; @@ -463,8 +523,9 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; dict: [], data(){ return{ + userMobile:null, seekZero :0, - + userInfo: false, baseUrl:process.env.VUE_APP_BASE_API, shoppingCart:[], giftList:'', @@ -708,6 +769,16 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; this.dialogVisibleMember = true; } }, + getUsers(queryString, cb){ + userListByPhone({mobile:queryString}).then( response => { + if (response.data){ + cb(response.data) + console.log(response.data,608) + }else { + this.$modal.msgError("会员信息不存在") + } + }) + }, // 获取会员等级信息 // getGrade(id){ // getUserGrade(id).then( response => { @@ -1342,7 +1413,9 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; display: flex; box-sizing: border-box; padding: 10px; + padding-top: 20px; height: 100vh; + justify-content: space-between; } .center-left{ width: 33%; @@ -1350,6 +1423,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; overflow: hidden; height: 98vh; position: relative; + margin-left: 15px; } .bottom-posi{ width: 100%; @@ -1364,7 +1438,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; } .center-right{ - width: 65%; + width: 64%; border-radius: 8px; overflow: hidden; margin: 0px 10px; @@ -1535,27 +1609,14 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; width: 31%; background: #ffffff; border-radius: 8px; - height: 80px; + height: 44px; display: flex; align-items: center; justify-content: center; margin-bottom: 10px; - + border: 1px solid #00afff; } - .wrap-box :hover{ - /*background: #00afff !important;*/ - width: 100%; - height: 100%; - border-radius: 8px; - height: 80px; - display: flex; - align-items: center; - justify-content: center; - border: 1px solid #00afff; - cursor: pointer; - /*color: white;*/ - } .wrap-box2{ background: #30a1ff !important; color: white; @@ -1666,6 +1727,8 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; overflow: auto; } .ts-box{ + box-sizing: border-box; + padding: 0px 15px; display: flex; flex-wrap: wrap; } @@ -1776,4 +1839,68 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print"; height: 98vh; position: relative; } + .o-top { + width: 100%; + height: 80px; + background: #FF9655; + box-sizing: border-box; + padding: 15px; + display: flex; + align-items: center; + font-size: 14px; + color: #fff; + justify-content: space-between; + + } + + .d-s { + display: flex; + align-items: center; + } + .left_input { + width: 80%; + overflow: hidden; + box-sizing: border-box; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + border-radius: 8px; + color: white; + border: 1px solid #fff; + ::v-deep.el-input__inner { + background: transparent !important; + border: transparent 1px solid; + color: #fff; + .el-input__placeholder{ + color: #fff !important; + } + } + + ::v-deep input:-moz-placeholder, + ::v-deep textarea:-moz-placeholder { + color: #fff; + } + ::v-deep input:-ms-input-placeholder, + ::v-deep textarea:-ms-input-placeholder { + color: #fff; + } + ::v-deep input::-webkit-input-placeholder, + ::v-deep textarea::-webkit-input-placeholder { + color: #fff ; + } + } + .an_bor { + box-sizing: border-box; + padding: 5px; + border: 1px solid #fff; + border-radius: 50px; + display: flex; + align-items: center; + font-size: 14px; + color: #FFFFFF; + justify-content: center; + margin: 0px 5px; + cursor: pointer; + } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue index 16598bc8e..f274d80d1 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue @@ -3,17 +3,17 @@
- + - + 未支付 付款成功 付款失败 @@ -24,31 +24,33 @@ v-model="queryParams.mobile" placeholder="手机号码" clearable - style="width: 220px;" + style="width: 170px;" @keyup.enter.native="handleQuery" /> 至 + -
+
搜索 重置 导出
+
@@ -329,9 +331,7 @@ export default { text-align: left; font-style: normal; text-transform: none; - .nei { - width: 150px; - } + } .size-bole{ height: 31px; @@ -364,6 +364,7 @@ export default { height: 60px; background: rgba(255,150,85,0.05); border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; } .top_new{ @@ -371,11 +372,13 @@ export default { justify-content: space-between; background: #fff; width: 98%; - margin: 5px auto; + margin: 0px auto; border-radius: 8px; box-sizing: border-box; - padding: 15px; - height: 64px; + padding: 0px 15px; + border-bottom: 1px solid #eceff1; + padding-bottom: 0px; + } .cont_box{ background: #fff; diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index 99ba5d389..6293c83bc 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -11,12 +11,8 @@
{{chooseVipUser.mobile}} 普通会员 - -
储值卡：￥1000.00
储值卡：￥1000.00
@@ -29,10 +25,10 @@
-
-
储值卡：￥{{chooseVipUser.cardBalance}}
-
囤油卡：￥1000.000
-
+ + + +
@@ -2164,8 +2160,6 @@ input { border-radius: 8px; color: white; border: 1px solid #fff; - - ::v-deep.el-input__inner { background: transparent !important; border: transparent 1px solid;