dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:dc7e6e1cbd012fc45f3af749031786312ae55d24
Branches Tags
dianliang:main
dianliang:master
...
compare: dianliang:660732951763fa29ac54d236688c4b3a0693c167
Branches Tags
dianliang:main
dianliang:master

2 Commits
dc7e6e1cbd ... 6607329517

Author SHA1 Message Date
DESKTOP-369JRHT\12997
6607329517 Merge remote-tracking branch 'origin/main' 2024-09-27 17:34:00 +08:00
DESKTOP-369JRHT\12997
aba8d7a4f6 9.27 2024-09-27 17:33:51 +08:00
4 changed files with 175 additions and 61 deletions
Show Stats Expand all files Collapse all files

92
fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
View File

@ -103,39 +103,56 @@
</div> </div>
<!-- </el-card>--> <!-- </el-card>-->
<el-card style="margin-top: 20px"> <div>
<template>
<div class="ds-dbox"> <div class="ds-dbox">
<div class="k-one"> <div class="box2">
<div class="title_">激活会员总数</div> <div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
<div class="num-size">{{total}}</div> {{ total || 0 }}
<img class="r-bot-img" src="./imgs/hy-1.png" alt="">
</div> </div>
<div class="size-hui">
<div class="k-two"> <div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
<div class="title_">今日新增/昨日新增</div> <div style="font-weight: bold;font-size: 13px;margin-left: 5px">激活会员总数</div>
<div class="num-size"> {{ addNum }}/{{ yesterdayAddNum }}</div>
<img class="r-bot-img" src="./imgs/hy-2.png" alt="">
</div> </div>
<div class="k-three">
<div class="title_">充值总人数</div>
<div class="num-size">{{rechargeTotal || 0}}</div>
<img class="r-bot-img" src="./imgs/hy-3.png" alt="">
</div> </div>
<div class="k-four"> <div class="box2">
<div class="title_">储值总余额</div> <div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
<div class="num-size">{{balance}}</div> {{ addNum }}/{{ yesterdayAddNum }}
<img class="r-bot-img" src="./imgs/hy-4.png" alt="">
</div> </div>
<div class="k-five"> <div class="size-hui">
<div class="title_">积分总余额</div> <div style="width: 8px;height: 8px;border-radius: 4px;background: #00CAFF"></div>
<div class="num-size">{{point}}</div> <div style="font-weight: bold;font-size: 13px;margin-left: 5px">今日新增/昨日新增</div>
<img class="r-bot-img" src="./imgs/hy-5.png" alt=""> </div>
</div>
<div class="box2">
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
{{rechargeTotal || 0}}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #F44522"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">充值总人数</div>
</div>
</div>
<div class="box2">
<div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
{{balance || 0}}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">储值总余额</div>
</div>
</div>
<div class="box2">
<div style="font-size: 26px;color: #2B63F4;font-weight: bold;margin-top: 5px">
{{point || 0}}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #2B63F4"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">积分总余额</div>
</div> </div>
</div> </div>
</template> </div>
</el-card> </div>
<!-- <el-card style="margin-top: 20px">--> <!-- <el-card style="margin-top: 20px">-->
@ -212,7 +229,7 @@
<div>{{ scope.row.growthValue || '0' }}</div> <div>{{ scope.row.growthValue || '0' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建时间" align="center" width="160" prop="balCreateTime"/> <el-table-column label="创建时间" align="center" prop="balCreateTime"/>
<el-table-column label="操作" align="center" width="150" fixed='right'> <el-table-column label="操作" align="center" width="150" fixed='right'>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -1246,7 +1263,6 @@ export default {
.ds-dbox { .ds-dbox {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
} }
@ -1384,4 +1400,26 @@ export default {
.acvtive1 { .acvtive1 {
color: #FF770F !important; color: #FF770F !important;
} }
.box2 {
padding: 5px;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 70px;
border-radius: 6px 6px 6px 6px;
border: 1px solid #FF9655;
}
.size-hui {
display: flex;
align-items: center;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
font-size: 13px;
color: #888888;
text-align: left;
font-style: normal;
text-transform: none;
}
</style> </style>

129
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -1,35 +1,37 @@
<template> <template>
<div class="center"> <div class="">
<el-card style="margin-bottom: 20px"> <div class="tab-box">
<div style="display: flex; align-items: center"> <div class="tab_" :class="{active:index== tabindex }" @click="getindex(index)" v-for="(item,index) in tabs"
<div style="width: 5%;margin-right: 10px">卡券核销:</div> :key="index">
<div style="width: 80%;"> {{ item.name }}
<!-- 17615834396--> </div>
</div>
<div class="w_box" style="margin-bottom: 20px">
<div class="title_" >通过手机号查询会员可以核销的卡券或扫码核销（扫码时，请保证输入框有光标闪烁）</div>
<div class="input_box" >
<div style="width: 40%;margin-right: 15px">
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input> <el-input v-model="queryParams.mobile" placeholder="请输入会员手机号码"></el-input>
</div> </div>
<div style="width: 10%;margin-left: 20px"> <div >
<el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
</div> </div>
</div> </div>
<div class="wrap-box"> <div class="wrap-box">
<div class="coupon-box" v-for="(item,index) in couponList" :key="index"> <div class="coupon-box" @click="getcardExchangeRecord(item.id)" v-for="(item,index) in couponList" :key="index">
<div class="box-top"> <div class="box-hei">{{item.exchangeName}} </div>
<span>{{item.exchangeName}}</span> <div class="box-hui"><span>券码:</span> <span>{{item.ticketCode}}</span> </div>
</div> <div class="box-hui"><span>有效期:</span> <span>{{item.outTime}}</span> </div>
<div class="box-title">{{item.name}}</div> <div class="box-hui"><span>获得方式:</span> <span>{{item.exchangeFrom}}</span> </div>
<div class="box-hui"><span style="width: 35%">券码:</span> <span>{{item.ticketCode}}</span> </div> <!-- <div class="anniu" >-->
<div class="box-hui"><span style="width: 35%">有效期:</span> <span>{{item.outTime}}</span> </div> <!-- <span>立即核销</span>-->
<div class="box-hui"><span style="width: 35%">获得方式:</span> <span>{{item.exchangeFrom}}</span> </div> <!-- </div>-->
<div class="anniu" @click="getcardExchangeRecord(item.id)" >
<span>立即核销</span>
</div>
</div> </div>
</div> </div>
<el-empty :image-size="300" v-if="total == 0"></el-empty> <el-empty :image-size="300" v-if="total == 0"></el-empty>
</el-card> </div>
</div> </div>
</template> </template>
@ -39,6 +41,15 @@ export default {
name: 'index', name: 'index',
data(){ data(){
return{ return{
tabindex: 0,
tabs: [
{
name: "卡券核销",
},
{
name: "核销记录",
},
],
queryParams : { queryParams : {
pageNum: 1, pageNum: 1,
pageSize: 999, pageSize: 999,
@ -65,6 +76,10 @@ export default {
} }
}, },
methods:{ methods:{
getindex(index) {
this.tabindex = index
},
getList() { getList() {
if(!this.queryParams.mobile ){ if(!this.queryParams.mobile ){
this.$message.error("输入框不能为空") this.$message.error("输入框不能为空")
@ -131,22 +146,22 @@ export default {
display: flex; display: flex;
} }
.coupon-box{ .coupon-box{
width: 200px; width: 335px;
height: 250px; height: 100px;
background: #ffffff; background: #ffffff;
border: 1px solid #eef1f6; border: 1px solid #eef1f6;
border-radius: 2px; border-radius: 2px;
margin: 10px; margin: 10px;
background: url("./imgs/qname.png") no-repeat;
background-size: 100% 100%;
} }
.box-top{ .box-top{
width: 100%; width: 100%;
height: 100px; color: #333;
background: #00afff;
color: white;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-size: 18px; font-size: 16px;
font-weight: bold; font-weight: bold;
} }
.box-title{ .box-title{
@ -161,6 +176,16 @@ export default {
color: #999999; color: #999999;
display: flex; display: flex;
font-size: 12px; font-size: 12px;
margin-left: 30%;
}
.box-hei{
box-sizing: border-box;
padding: 0px 15px;
color: #333;
display: flex;
font-size: 14px;
margin-left: 30%;
margin-top: 15px;
} }
.anniu{ .anniu{
box-sizing: border-box; box-sizing: border-box;
@ -177,5 +202,59 @@ export default {
margin-top: 15px; margin-top: 15px;
} }
.w_box{
width: 98%;
background: #fff;
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
min-height: 80vh;
margin: 15px auto;
}
.tab-box {
width: 100%;
height: 40px;
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 25px;
}
.tab_ {
width: 75px;
height: 100%;
//border-bottom: 2px solid #FF770F;
display: flex;
font-weight: 500;
font-size: 14px;
color: #999999;
align-items: center;
justify-content: center;
margin-left: 50px;
cursor: pointer;
}
.active {
border-bottom: 2px solid #FF770F !important;
color: #FF770F !important;
}
.title_{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin: 20px auto;
text-align: center;
font-weight: 400;
font-size: 20px;
color: #333333;
}
.input_box{
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
</style> </style>

BIN
fuintCashierWeb/src/views/cashier/NewComponents/imgs/qname.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

3
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -67,9 +67,6 @@
</el-form> </el-form>
</div> </div>
<div class="cot-box"> <div class="cot-box">
<!-- 条件查询-->
<!-- 统计-->
<div> <div>
<div class="box-gang"> <div class="box-gang">
<div class="box2"> <div class="box2">