Merge remote-tracking branch 'origin/master'

gasStation-uni/pages.json

@@ -193,6 +193,13 @@
 						"navigationStyle": "custom"
 					}
 				},
+				{
+					"path": "CardManagement/Detail",
+					"style": {
+						"navigationBarTitleText": "添加子卡管理",
+						"navigationStyle": "custom"
+					}
+				},
 				{
 					"path": "writeOff/writeOff",
 					"style": {

gasStation-uni/pagesHome/PointsGoodsDetails/PointsGoodsDetails.vue

@@ -11,7 +11,6 @@
 				<view class="t-top">
 					<view class="top-icon">
 						<uni-icons type="checkmarkempty" color="#ffffff" size="18"></uni-icons>
-
 					</view>
 					<view class="">
 						<view class="title-lan">兑换成功</view>

gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue

@@ -200,6 +200,7 @@
 				this.getValueCars();
 			}
 			if (option.id == 1) {
+				console.log("囤油");
 				this.getFuelCars();
 
 			}
@@ -207,7 +208,7 @@
 		onShow() {
 			this.getValueCars();
 			this.getStaffList()
-			//this.getFuelCars();
+
 		},
 		methods: {
 			confirms() {
@@ -275,9 +276,9 @@
 					this.cardValueList = []
 					if (res.code == 200) {
 						this.cardValueList = res.data.records
-						this.xzindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0].fringeBenefit,
+						this.xzindex(0, res.data.records[0].rechargeBalance, res.data.records[0].fringeBenefit,
-							this.cardValueList[0].giftBalance, this.cardValueList[0].points, this
+							res.data.records[0].giftBalance, res.data.records[0].points, res.data.records[0]
-							.cardValueList[0].growthValue)
+							.growthValue)
 					}
 
 				})
@@ -294,12 +295,8 @@
 					this.cardValueList = []
 					if (res.code == 200) {
 						this.cardFuleList = res.data.records
-						console.log('213');
+
-						this.fuleindex(0, this.cardValueList[0].rechargeBalance, this.cardValueList[0]
+						this.fuleindex(0, res.data.records[0].rechargeBalance, res.data.records[0].points)
-							.fringeBenefit,
-							this.cardFuleList[0].rechargeBalance, this.cardFuleList[0].points, this
-							.cardFuleList[0].lockupPrice, this
-							.cardFuleList[0].incomeLitres)
 					}
 				})
 			},

gasStation-uni/pagesMy/CardManagement/CardManagement.vue

@@ -30,6 +30,9 @@
 					</view>
 				</view>
 			</view>
+			<view class="x_anniu" @click="goDetail()">
+				<uni-icons type="plusempty" color="#fff" size="30"></uni-icons>
+			</view>
 
 			<!-- <u-empty v-if="list.length == 0 " mode="coupon" text="内容为空"
 				icon="http://cdn.uviewui.com/uview/empty/coupon.png">
@@ -66,6 +69,11 @@
 			tapindex(index) {
 				this.tindex = index
 			},
+			goDetail() {
+				uni.navigateTo({
+					url: '/pagesMy/CardManagement/Detail'
+				})
+			},
 			goback() {
 				uni.navigateBack()
 			}
@@ -197,4 +205,17 @@
 		font-size: 14px;
 		border-radius: 50px;
 	}
+
+	.x_anniu {
+		position: fixed;
+		bottom: 50px;
+		right: 30px;
+		width: 50px;
+		height: 50px;
+		border-radius: 50%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: #0000ff;
+	}
 </style>

gasStation-uni/pagesMy/CardManagement/Detail.vue

@@ -0,0 +1,101 @@
+<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 class="input_">
+				<view class="">请输入手机号：</view>
+				<view class="">
+					<input type="text" placeholder="请输入手机号" />
+				</view>
+			</view>
+			<view class="anniu">
+				<text>提交</text>
+			</view>
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '',
+
+
+			}
+		},
+
+		components: {
+
+		},
+		methods: {
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		background: #ffffff;
+	}
+
+	.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;
+	}
+
+	.input_ {
+		width: 90%;
+		box-sizing: border-box;
+		padding: 15px 0px;
+		display: flex;
+		align-items: center;
+		border-bottom: 1px solid #DDDDDD;
+		margin: 15px auto;
+
+	}
+
+	.anniu {
+		width: 90%;
+		height: 42px;
+		margin: 15px auto;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: white;
+		border-radius: 8px;
+		background: #ff6e05;
+	}
+</style>