diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java index 810319e11..fcd5ea727 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java @@ -490,7 +490,7 @@ public class CardValueServiceImpl extends ServiceImpl cardValueAppletVOList = page.getRecords(); - List appletVOList = cardValueAppletVOList.stream().map(s -> { + return cardValueAppletVOList.stream().map(s -> { CardValueAppletVO cardValueAppletVO = new CardValueAppletVO(); //活动时间 if (s.getActiveTime().equals("1")){ @@ -523,7 +523,6 @@ public class CardValueServiceImpl extends ServiceImpl mu.mobile like concat('%',#{mobile},'%') and - mub.store_id = #{storeId} + mub.store_id = #{storeId} and mub.user_status = '0' diff --git a/fuintCashierWeb/package.json b/fuintCashierWeb/package.json index 0a7f9b814..ccf76c377 100644 --- a/fuintCashierWeb/package.json +++ b/fuintCashierWeb/package.json @@ -57,6 +57,7 @@ "screenfull": "5.0.2", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-clipboard2": "^0.3.3", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue index ca293e405..e93c3e695 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue @@ -7,40 +7,37 @@
-
{{chooseVipUser.name}}
+
{{chooseVipUser.name||'匿名'}}
{{chooseVipUser.mobile}} - +
-
储值卡:¥1000.000
+
储值卡:¥{{chooseVipUser.cardBalance}}
囤油卡:¥1000.000
会员充值
-
重置会员
+
重置会员
赠送优惠券
- -
@@ -435,6 +432,9 @@ import refuelingAmount from './newHomeComponents/refuelingAmount.vue' import { cashRegisterList, cashRegisterGoodsList } from '@/api/newHome/newHome.js' import {QRCodeByStoreId} from "@/api/staff/qrcode"; import {userListByPhone} from "@/api/cashier/user"; +import Vue from 'vue'; +import { VueClipboard } from 'vue-clipboard2'; + export default { data() { return { @@ -592,11 +592,6 @@ export default { }, computed: { - chooseUser(data){ - //选择会员 - this.userInfo = true - this.chooseVipUser = data - }, getGoodsItem() { if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) { // 保留两位小数 @@ -629,11 +624,34 @@ export default { }, methods: { + copyToClipboard(textToCopy) { + + VueClipboard(textToCopy).then(() => { + this.$message.success("复制成功") + // 复制成功的操作 + }, () => { + console.log('复制失败'); + // 复制失败的操作 + }); + }, + restVipUser(){ + this.userInfo = false + this.chooseVipUser = {} + }, + chooseUser(data){ + if (data){ + //选择会员 + this.userInfo = true + this.chooseVipUser = data + console.log(this.chooseVipUser,598) + } + + }, // 根据手机号查询会员信息 - getUser(){ - userListByPhone({mobile:this.userMobile}).then( response => { + getUser(queryString, cb){ + userListByPhone({mobile:queryString}).then( response => { if (response.data){ - this.vipUserList = response.data + cb(response.data) console.log(response.data,608) }else { this.$modal.msgError("会员信息不存在")