1

gasStation-uni/pages/index/index.vue

@@ -283,7 +283,8 @@
 						})
 
 						uni.showToast({
-							title:"获取位置信息成功"
+							title: "获取位置信息成功",
+							icon: "none"
 						})
 					},
 					fail: function(err) {

gasStation-uni/pagesHome/RechargeRecords/RechargeRecords.vue

@@ -0,0 +1,69 @@
+<template>
+	<view class="content">
+		<view class="container">
+			<view class="my-header">
+				<view class="my-icons" @click="goback"> <uni-icons type="left" size="16"></uni-icons> </view>
+				<view class="my-text">充值记录</view>
+				<view class="my-icons"></view>
+			</view>
+			<!-- 顶部区域 -->
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '',
+
+
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #f4f5f6;
+	}
+
+	.container {
+		width: 100%;
+		height: 100vh;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
+
+	.my-header {
+		width: 100%;
+		height: 88px;
+		background: #ffffff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #000;
+		box-sizing: border-box;
+		padding: 0px 15px;
+		padding-top: 40px;
+
+		.my-icons {
+			width: 20px;
+
+		}
+
+		position: fixed;
+		top: 0px;
+	}
+</style>

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -32,10 +32,10 @@
 						{{index+1}}.{{item || "" }}
 					</view>
 				</view>
-				<view class="box-gang">
+				<view class="box-gang" @click="show = true">
 					<view class="">推荐员工</view>
 					<view class=""></view>
-					<view class="" @click="show = true">
+					<view class="">
 						<uni-icons type="right" size="14"></uni-icons>
 					</view>
 
@@ -46,7 +46,7 @@
 					<view class="anniu">
 						<text>立即充值</text>
 					</view>
-          <view class="dibu">
+					<view class="dibu" @click="goRechargeRecords()">
 						<view class="">充值记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
@@ -63,8 +63,7 @@
 			<view class="boxback" v-if="actinput == 1">
 				<view class="box-cz">
 					<view class="box-jg" :class="{ 'actbox' : actindex == index }" v-for="(item,index) in cardFuleList"
-                :key="index"
+						:key="index" @click="fuleindex(index,item.rechargeBalance,item.points)">
-                @click="fuleindex(index,item.rechargeBalance,item.points)">
 						<view class="s-title" :class="{ 'actsize' : actindex == index }">油品:{{item.type}}
 						</view>
 						<view class="s-title" :class="{ 'actsize' : actindex == index }">油号:{{item.oilType}}
@@ -98,7 +97,7 @@
 					<view class="anniu">
 						<text>立即充值</text>
 					</view>
-          <view class="dibu">
+					<view class="dibu" @click="goRechargeRecords()">
 						<view class="">充值记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
@@ -124,7 +123,7 @@
 					<view class="anniu" @click="exchangeGift()">
 						<text>立即兑换</text>
 					</view>
-          <view class="dibu">
+					<view class="dibu" @click="goRechargeRecords()">
 						<view class="">兑换记录</view>
 						<uni-icons type="right" color="#1678ff" size="14"></uni-icons>
 					</view>
@@ -137,7 +136,7 @@
 				</view>
 			</view>
 
-			<u-picker :show="show" :columns="columns" @confirm="confirm" @cancel="cancel"></u-picker>
+			<u-picker :show="show" :columns="columns" keyName="realName" @confirm="confirm" @cancel="cancel"></u-picker>
 			<u-modal :show="shows" :title="message" :content='money' @confirm="confirms()"></u-modal>
 		</view>
 	</view>
@@ -145,7 +144,9 @@
 
 <script>
 	import request from '../../utils/request'
-  import {getValue} from "@dcloudio/uni-ui/lib/uni-forms/utils";
+	import {
+		getValue
+	} from "@dcloudio/uni-ui/lib/uni-forms/utils";
 	export default {
 		data() {
 			return {
@@ -194,6 +195,7 @@
 		},
 		onShow() {
 			this.getValueCars();
+			this.getStaffList()
 			//this.getFuelCars();
 		},
 		methods: {
@@ -201,6 +203,7 @@
 				this.shows = false
 			},
 			confirm(e) {
+				console.log(e);
 				this.show = false
 			},
 			cancel() {
@@ -280,7 +283,8 @@
 					this.cardValueList = []
 					if (res.code == 200) {
 						this.cardFuleList = res.data.records
-        this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0].fringeBenefit,
+						this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0]
+							.fringeBenefit,
 							this.cardFuleList[0].rechargeBalance, this.cardFuleList[0].points, this
 							.cardFuleList[0].lockupPrice, this
 							.cardFuleList[0].incomeLitres)
@@ -290,7 +294,8 @@
 			//礼品卡兑换
 			exchangeGift() {
 				request({
-          url:'/business/marketingActivity/cardGift/exchange?number='+this.number+"&cardPassword="+this.cardPassword,
+					url: '/business/marketingActivity/cardGift/exchange?number=' + this.number + "&cardPassword=" +
+						this.cardPassword,
 					method: 'get',
 				}).then(res => {
 					if (res.data.id == '' || res.data.id == null) {
@@ -313,13 +318,20 @@
 					console.log(res)
 				})
 			},
+			goRechargeRecords() {
+				uni.navigateTo({
+					url: '/pagesMy/Recharge/Recharge'
+				})
+			},
 			//获取本店员工列表
 			getStaffList() {
 				request({
 					url: '/business/member/staff/list',
 					method: 'get',
 				}).then(res => {
-         this.columns = res.data.records
+					this.columns.push(res.data.records)
+					console.log("columns", this.columns);
+
 				})
 			}
 		}