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

9.21

Browse Source
This commit is contained in:
cun-nan 2024-09-21 11:33:14 +08:00
parent b49079e40e
commit ca6c095895
5 changed files with 421 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -3,7 +3,7 @@
<div class="left-box">
<div class="box-top">
<div class="o-top" v-if="userInfo">
<div>
<div style="width: 50%">
<div class="d-s">
<img src="./imgs/new_user.png" style="width: 28px;height: 28px;margin-right: 10px">
<div >
@ -21,7 +21,7 @@
</div>
</div>
<div class="d-s">
<div class="d-s" style="width: 50%">
<div class="an_bor" @click="addMemberRecharge()">会员充值</div>
<div class="an_bor" @click="restVipUser">重置会员</div>
<div class="an_bor" @click="addFreeTicket()" >赠送优惠券</div>
@ -237,11 +237,15 @@
<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 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;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">
@ -592,6 +596,11 @@ export default {
},
computed: {
chooseUser(data){
//选择会员
this.userInfo = true
this.chooseVipUser = data
},
getGoodsItem() {
if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) {
// 保留两位小数
@ -1649,6 +1658,27 @@ input {
padding: 10px 5px;
border-radius: 8px;
color: white;
::v-deep.el-input__inner {
background: transparent !important;
border: white 1px solid;
.el-input__placeholder{
color: red;
}
}
::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 ;
}
}
.wrap-tc{
width: 100%;

24
gasStation-uni/pages/index/index.vue
View File

@ -56,7 +56,8 @@
<view class="_gbox" v-for="(item,index) in oilTypeList" :key="index">
<view class="_ns">{{item.oilName}}{{item.oilType}}</view>
<view class="_ns">¥{{item.oilPrice}}</view>
<view class="_ns _lv">0.12%↑</view>
<view class="_ns _lv" v-if="upOrDown==1">{{item.amplitudeOfChange}}↑</view>
<view class="_ns _red" v-else>{{item.amplitudeOfChange}}↓</view>
</view>
<!-- <view class="_gbox">
<view class="_ns">92#汽油</view>
@ -270,8 +271,27 @@
onlyFromCamera: true,
success: (res) => {
console.log('扫描二维码成功,结果:' + JSON.stringify(res) + res.result);
let storeId = ""
let staffId = ""
let str = res.result.split("?")[1];
if (str.includes("&")) {
let arr = str.split("&");
arr.forEach(item => {
if (item.includes("storeId")) {
storeId = item.split("=")[1]
} else if (item.includes("staffId")) {
staffId = item.split("=")[1]
}
})
} else {
storeId = str.split("=")[1]
}
console.log(storeId,staffId,289);
uni.setStorageSync("storeId", storeId)
this.getUserAuthority();
uni.navigateTo({
url: '/pagesHome/check/index'
url: '/pages/refuel/refuel?staffId='+staffId
})
},
error: (res) => {

12
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -11,7 +11,7 @@
储值卡余额
</view>
<view class="card-num">
¥{{cardBalance.cardBalance}}
¥{{cardBalance.cardBalance || 0}}
</view>
<!-- <view class="r-box">
NO.xxxxxxxxxxxxxxxxxx
@ -29,7 +29,7 @@
剩余油量
</view>
<view class="card-num">
{{cardBalance.refuelMoney || 0}}L
0L
</view>
<!-- <view class="r-box">
NO.xxxxxxxxxxxxxxxxxx
@ -39,14 +39,14 @@
<view class="top_card">
<view class="">礼品卡</view>
<view class="">
面值 1000元
兑换记录
</view>
</view>
<view class="card-b">
卡号：xxxxxxxxxxxxxxxxx
已兑换：{{cardBalance.giftCardCount || 0}}份
</view>
<view class="card-b">
卡密：xxxxxxxxxxxxxxxxx
累计兑换金额：{{cardBalance.giftCardAmount || 0}}元
</view>
<!-- <view class="r-box">
NO.xxxxxxxxxxxxxxxxxx
@ -71,6 +71,7 @@
cardsList: [],
cardsIndex: 0,
title: '',
giftInfo:{},
}
},
@ -140,6 +141,7 @@
}).then(res => {
if (res.code == 200) {
this.cardBalance = res.data
console.log(res.data);
}
})
},

41
gasStation-uni/pagesHome/QRcode/QRcode.vue
View File

@ -8,12 +8,12 @@
<view class="my-icons"></view>
</view> -->
<!-- 顶部区域 -->
<view class="title_">付款码</view>
<view class="size_">结账时请出示</view>
<view class="title_"><!-- 付款码 --></view>
<!-- <view class="size_">结账时请出示</view> -->
<view class="cen-box">
<!-- <view class="box-top">
<view class="box-top">
请出示此码给加油员
</view> -->
</view>
<view class="code-top">
<w-barcode :options="option"></w-barcode>
</view>
@ -33,11 +33,15 @@
</text>
</view>
<view class="bottom-box" @click="show = !show">
<view class="">
<view class="h_siz">储值卡</view>
<view class="">余额￥{{cardBalance.cardBalance}}</view>
<image src="@/static/icon/card.png" style="width: 30px;height: 25px;">
<view style="margin-left: 15px;" v-if="value=='oilStorageCard'">
<view>{{deduction[0].value}}</view>
<view class="h_siz">{{deduction[0].desc}}</view>
</view>
<view style="margin-left: 15px;" v-if="value=='balance'">
<view>{{deduction[1].value}}</view>
<view class="h_siz">{{deduction[1].desc}}</view>
</view>
<view class="button_c" @click="goMemberRecharge()">充值</view>
</view>
</view>
@ -53,10 +57,10 @@
<view class="title">请选择用户类型</view>
<view class="hui-size">如果付款失败尝试使用其他方式完成付款</view>
</view>
<view class="bottom-box" v-for="(item,index) in deduction" :key="index"
@click="choosePayMethod(item.value)">
<view class="bottom-box" style="justify-content: space-between;" v-for="(item,index) in deduction" :key="index"
@click="choosePayMethod(item.key)">
<view style="display: flex;align-items: center;">
<uni-icons type="wallet-filled" color="#2979ff" size="30"></uni-icons>
<image src="@/static/icon/card.png" style="width: 30px;height: 25px;">
<view style="margin-left: 10px;">
<view class="">{{item.value}}</view>
<!-- <view style="font-size: 14px; color: #666666;">根据账户自动识别的付款方式</view> -->
@ -67,7 +71,7 @@
<u-icon name="arrow-right"></u-icon>
</view>
</view>
<view class="bottom-box">
<!-- <view class="bottom-box">
<view style="display: flex;align-items: center;">
<uni-icons type="wallet-filled" color="#2979ff" size="30"></uni-icons>
<view style="margin-left: 10px;">
@ -78,7 +82,7 @@
<view class="">
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view> -->
</view>
</u-popup>
@ -124,7 +128,7 @@ export default {
this.getBarCode()
this.getQrCode()
this.countdown()
this.getUserInfo()
// this.getUserInfo()
},
components: {
@ -283,8 +287,6 @@ export default {
padding-bottom: 10px;
border-bottom: 1px solid #f4f5f6;
text-align: center;
font-size: 18px;
font-weight: bold;
}
.code-box {
@ -323,8 +325,8 @@ export default {
box-sizing: border-box;
padding-top: 15px;
display: flex;
align-items: center;
justify-content: space-between;
// align-items: center;
// justify-content: space-between;
}
.v-bottom-box {
@ -371,6 +373,7 @@ export default {
font-size: 16px;
color: #fff;
text-align: center;
height: 15px;
}
.size_ {
@ -381,6 +384,8 @@ export default {
.h_siz {
color: #666666;
margin-top: 5px;
font-size: 14px;
}
.x_sz {

BIN
gasStation-uni/static/icon/card.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 877 B