9.22

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

@@ -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);

gasStation-uni/pages/refuel/refuel.vue

@@ -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"
+							<view class="sz" :class="{'acvit': qhindex == index}" v-for="(item,index) in oilNumberList"
-								@click="setQindex(index)">
+								:key="index" @click="setQindex(index,item)">
-								<view>全部</view>
+								<view>{{item.oilName}}</view>
 							</view>
 
 						</scroll-view>
 						<view class="wr_box">
-							<view class="xanniu" :class="{'acvit' : anIndex == index }" v-for="(item,index) in 9"
+							<view class="xanniu" :class="{'acvit' : anIndex == index }"
-								:key="index" @click="setadindex(index)">
+								v-for="(item,index) in oilGunList" :key="index" @click="setadindex(index)">
-								<view class="">1号枪</view>
+								<view class="">{{item.gunName}}</view>
-								<view class="">汽油92#</view>
+								<view class="">{{item.oilName}}</view>
 							</view>
 						</view>
 
@@ -562,8 +562,16 @@
 			cardTypeclose() {
 				this.cardType = false
 			},
-			setQindex() {
+			setQindex(index, data) {
-				this.qhindex = false
+				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);
 				})
 			},
 			// 获取当前店铺油号对应的油枪信息

gasStation-uni/pagesMy/feedback/feedback.vue

@@ -1,19 +1,22 @@
 <template>
 	<view class="content">
-		<view class="container">
+		<!-- <view class="container"> -->
-			<view class="my-header">
+			<!-- <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>

gasStation-uni/pagesMy/setup/index.vue

@@ -11,8 +11,9 @@
 			<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"
-					<image class="touxiang" v-else src="@/static/imgs/myx.png"  mode="aspectFit"></image>
+						:src="baseUrl + user.avatar" mode="aspectFit"></image>
+					<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
 				</view>
 			</button>
 			<!-- #endif -->
@@ -20,20 +21,29 @@
 			<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"
-					<image class="touxiang" v-else src="@/static/imgs/myx.png"  mode="aspectFit"></image>
+						:src="baseUrl + user.avatar" mode="aspectFit"></image>
+					<image class="touxiang" v-else src="@/static/imgs/myx.png" mode="aspectFit"></image>
 				</view>
 			</button>
 			<!-- #endif -->
 			<view class="box-hang" @click="goEdit(0)">
 				<view class="">昵称</view>
-				<view class="dis"> 
+				<view class="dis">
-					<text v-if="!user.name">未填写</text> 
+					<text v-if="!user.name">未填写</text>
-					<text v-else>{{user.name}}</text> 
+					<text v-else>{{user.name}}</text>
-					<uni-icons type="right" size="16"></uni-icons> 
+					<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="">会员支付设置</view>
-				<view class="dis"> <text></text> <uni-icons type="right" size="16"></uni-icons> </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>
@@ -66,12 +79,17 @@
 			return {
 				title: '',
 				// 用户信息
-				user:{
+				user: {
 					// 用户头像
-					avatar:"",
+					avatar: "",
 				},
 				// url信息
 				baseUrl: this.$baseUrl,
+				columns: [
+					['全部类型', '消费有礼', '会员充值']
+				],
+				show: false,
+				show1: false,
 			}
 		},
 		onShow() {
@@ -81,19 +99,41 @@
 
 		},
 		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){
+			onChooseAvatar(e) {
 				let _this = this;
 				let tempFilePath = e.detail.avatarUrl //上传的图片地址
-				let maxSizeInBytes = 1024*1024 //限制大小
+				let maxSizeInBytes = 1024 * 1024 //限制大小
 				uni.getFileInfo({
-					filePath:tempFilePath,
+					filePath: tempFilePath,
 					success(res) {
 						let fileSize = res.size
-						if (fileSize > maxSizeInBytes){
+						if (fileSize > maxSizeInBytes) {
 							uni.showToast({
-								title:"请上传小于1MB的图片",
+								title: "请上传小于1MB的图片",
-								icon:"error"
+								icon: "error"
 							})
 							return
 						}
@@ -111,17 +151,17 @@
 				})
 			},
 			// 用户选择头像
-			onChooseAvatar1(e){
+			onChooseAvatar1(e) {
 				let _this = this;
 				//从本地相册选择图片或使用相机拍照
 				uni.chooseImage({
-					sourceType: ['album', 'camera'],//选择方式相册或者相机
+					sourceType: ['album', 'camera'], //选择方式相册或者相机
 					success: (res) => {
 						console.log('图片', res)
 						var tempFilePath = res.tempFilePaths;
 						var filePath = tempFilePath[0];
-						console.log(filePath);//输出本地头像路径
+						console.log(filePath); //输出本地头像路径
-				//调用上传下载api
+						//调用上传下载api
 						// 将图片上传服务器
 						upload({
 							url: '/clientApi/file/upload',
@@ -135,11 +175,11 @@
 				});
 			},
 			// 修改用户信息
-			editUser(){
+			editUser() {
 				request({
 					url: 'business/userManager/user/edit',
 					method: 'put',
-					data:this.user,
+					data: this.user,
 				}).then(res => {
 					if (res.code == 200) {
 						this.getUser()
@@ -147,13 +187,13 @@
 				})
 			},
 			// 跳转修改页面
-			goEdit(val){
+			goEdit(val) {
 				uni.navigateTo({
 					url: '/pagesMy/editUser/index?editType=' + val,
 				})
 			},
 			// 查询当前登录用户信息
-			getUser(){
+			getUser() {
 				request({
 					url: 'business/userManager/user/getUser',
 					method: 'get',
@@ -165,7 +205,7 @@
 			},
 			goBack() {
 				uni.navigateTo({
-					url:"/pages/my/my"
+					url: "/pages/my/my"
 				})
 			}
 		}