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

9.22

Browse Source
This commit is contained in:
cun-nan 2024-09-22 14:16:55 +08:00
parent 049685178d
commit 297d52e5ea
4 changed files with 116 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
View File

@ -130,7 +130,7 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId);
queryWrapper.eq("status", "qy");
queryWrapper.eq("role_id", "15");
// queryWrapper.eq("role_id", "15");
queryWrapper.eq("if_delete", "0");
queryWrapper.eq("is_refuel", "xs");
List list = baseMapper.selectList(queryWrapper);

32
gasStation-uni/pages/refuel/refuel.vue
View File

@ -298,10 +298,10 @@
<view class="popup-box">
<view class="p_title">选择员工</view>
<view class="wr_box">
<view class="xanniu" :class="{'acvit' : anIndex == index }" v-for="(item,index) in 12"
<view class="xanniu" :class="{'acvit' : anIndex == index }" v-for="(item,index) in staffList"
:key="index" @click="setadindex(index)">
<view class="">员工名</view>
<view class="">{{item.realName}}</view>
</view>
</view>
</view>
@ -310,17 +310,17 @@
<view class="popup-box">
<view class="p_title">选择油品油枪</view>
<scroll-view scroll-x="true" class="tap-top">
<view class="sz" :class="{'acvit': qhindex == index}" v-for="(item,index) in 5" :key="index"
@click="setQindex(index)">
<view>全部</view>
<view class="sz" :class="{'acvit': qhindex == index}" v-for="(item,index) in oilNumberList"
:key="index" @click="setQindex(index,item)">
<view>{{item.oilName}}</view>
</view>
</scroll-view>
<view class="wr_box">
<view class="xanniu" :class="{'acvit' : anIndex == index }" v-for="(item,index) in 9"
:key="index" @click="setadindex(index)">
<view class="">1号枪</view>
<view class="">汽油92#</view>
<view class="xanniu" :class="{'acvit' : anIndex == index }"
v-for="(item,index) in oilGunList" :key="index" @click="setadindex(index)">
<view class="">{{item.gunName}}</view>
<view class="">{{item.oilName}}</view>
</view>
</view>
@ -562,8 +562,16 @@
cardTypeclose() {
this.cardType = false
},
setQindex() {
this.qhindex = false
setQindex(index, data) {
this.qhindex = index
this.oilGunList = data.oilGunList
if (data.oilGunList.length > 0) {
this.oilOrder.oilGunNum = data.oilGunList[0].id
this.oilPrice = data.oilPrice
this.oilUnit = data.unit
this.oilOrder.oils = data.oilNameId
uni.setStorageSync("tankId", data.oilGunList[0].tankId)
}
},
ypClose() {
this.selectShow = false
@ -735,6 +743,7 @@
// _this.welfare.push(res.data.welfare)
// }
// }
console.log(res, 738);
}).catch(err => {
// uni.showLoading({
// title: JSON.stringify(err) + 222
@ -797,6 +806,7 @@
uni.setStorageSync("tankId", res.data[0].oilGunList[0].tankId)
}
}
console.log(res, 801);
})
},
// 获取当前店铺油号对应的油枪信息

36
gasStation-uni/pagesMy/feedback/feedback.vue
View File

@ -1,19 +1,22 @@
<template>
<view class="content">
<view class="container">
<view class="my-header">
<!-- <view class="container"> -->
<!-- <view class="my-header">
<view class="my-icons" @click="goBack"> <uni-icons type="left" color="#ffffff" size="16"></uni-icons>
</view>
<view class="my-text">意见反馈</view>
<view class="my-icons"></view>
</view>
</view> -->
<!-- 顶部区域 -->
<view class="top-title">您提交的意见反馈，将鼓励我们做得更好~</view>
<view class="box-top">
<view class="top-title">
<view class="title_">
反馈内容
</view>
<u--textarea v-model="value5" placeholder="请填写您的反馈和建议" border="bottom"></u--textarea>
<view class="top-title" style="border-bottom: none;">
<view class="title_" style="border-bottom: none;">
相关截图（选填）
</view>
<u-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
@ -24,7 +27,7 @@
</view>
</view>
<!-- </view> -->
</view>
</template>
@ -179,15 +182,26 @@
.anniu {
width: 95%;
background: #1678ff;
height: 40px;
margin: 10px auto;
margin-top: 50px;
border-radius: 4px;
background: #FA6400;
display: flex;
align-items: center;
justify-content: center;
color: white;
margin: 10px auto;
border-radius: 50px;
box-sizing: border-box;
padding: 10px 0px;
}
.title_ {
margin: 10px 0px;
}
.top-title {
background: rgba(255, 150, 85, 0.15);
box-sizing: border-box;
padding: 10px;
}
</style>

52
gasStation-uni/pagesMy/setup/index.vue
View File

@ -11,7 +11,8 @@
<button class="box-hang" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
<view class="">头像</view>
<view class="touxiang">
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
:src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
</view>
</button>
@ -20,7 +21,8 @@
<button class="box-hang" @click="onChooseAvatar1">
<view class="">头像</view>
<view class="touxiang">
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined" :src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-if="user.avatar!='' && user.avatar!=null && user.avatar!=undefined"
:src="baseUrl + user.avatar" mode="aspectFit"></image>
<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
</view>
</button>
@ -33,7 +35,15 @@
<uni-icons type="right" size="16"></uni-icons>
</view>
</view>
<view class="box-hang">
<view class="box-hang" @click="show1 =!show1">
<view class="">性别</view>
<view class="dis"> <text>{{user.sex}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
</view>
<view class="box-hang" @click="show=!show">
<view class="">生日</view>
<view class="dis"> <text>{{user.birthday}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
</view>
<!-- <view class="box-hang">
<view class="">手机号</view>
<view class="dis"> <text>{{user.mobile}}</text> <uni-icons type="right" size="16"></uni-icons> </view>
</view>
@ -47,12 +57,15 @@
<text v-if="!user.carNo">未填写</text>
<text v-else>{{user.carNo}}</text> <uni-icons type="right" size="16"></uni-icons>
</view>
</view>
</view> -->
<!-- <view class="box-hang" @click="goEdit(3)">
<view class="">支付密码</view>
<view class="dis"> <text></text> <uni-icons type="right" size="16"></uni-icons> </view>
<view class="">会员支付设置</view>
<view class="dis"> <text>已设置</text> <uni-icons type="right" size="16"></uni-icons> </view>
</view> -->
<u-datetime-picker :show="show" v-model="value1" mode="date" @cancel="cancel1"
@confirm="confirm1"></u-datetime-picker>
<u-picker :show="show1" :columns="columns" @cancel="cancel" @confirm="confirm"></u-picker>
</view>
</view>
@ -72,6 +85,11 @@
},
// url信息
baseUrl: this.$baseUrl,
columns: [
['全部类型', '消费有礼', '会员充值']
],
show: false,
show1: false,
}
},
onShow() {
@ -81,6 +99,28 @@
},
methods: {
confirm(e) {
this.show1 = false
},
cancel() {
this.show1 = false
},
timestampToString(timestamp) {
// 将时间戳转换为Date对象
const date = new Date(timestamp);
// 使用toLocaleDateString和toLocaleTimeString可以根据本地格式转换日期和时间
const dateString = date.toLocaleDateString()
const timeString = date.toLocaleTimeString();
// 返回日期和时间的组合
return date.getFullYear() + '-' + (date.getMonth() + 1);
},
confirm1(e) {
this.show = false
},
cancel1() {
this.show = false
},
// 用户选择头像
onChooseAvatar(e) {
let _this = this;