diff --git a/gasStation-uni/pagesHome/MyCard/MyCard.vue b/gasStation-uni/pagesHome/MyCard/MyCard.vue
index b2ef69781..b88c90218 100644
--- a/gasStation-uni/pagesHome/MyCard/MyCard.vue
+++ b/gasStation-uni/pagesHome/MyCard/MyCard.vue
@@ -25,7 +25,7 @@
 						<view class="">￥ <text style="font-weight: bold;font-size: 26px;">{{cardBalance}}</text>
 						</view>
 					</view>
-					<view class="anniu-cz" @click="gocard()">
+					<view class="anniu-cz" @click="gocard(0)">
 						<text>立即充值</text>
 					</view>
 				</view>
@@ -34,10 +34,6 @@
 			<!-- 囤油卡 -->
 			<view class="xyihang">
 				<view class="title-hei">囤油卡</view>
-
-
-
-
 				<view class="d_dis">
 					<view class="" @click="s_()">
 						<text>上一张</text>
@@ -48,11 +44,6 @@
 						<uni-icons type="refreshempty" color="#2979ff" size="20"></uni-icons>
 					</view>
 				</view>
-
-
-
-
-
 			</view>
 			<view class="card-ty">
 				<view class="card-top">
@@ -73,9 +64,12 @@
 							style="margin-right: 15px;"></uni-icons>
 					</view>
 				</view>
-				<view class="anniu-cz" @click="gocard()">
-					<text>立即充值</text>
+				<view class="z_yw">
+					<view class="anniu-cz" @click="gocard(1)">
+						<text>立即充值</text>
+					</view>
 				</view>
+
 			</view>
 			<!-- 礼品卡 -->
 			<view class="xyihang">
@@ -104,8 +98,10 @@
 							style="margin-right: 15px;"></uni-icons>
 					</view>
 				</view>
-				<view class="anniu-cz" @click="gocard()">
-					<text>立即兑换</text>
+				<view class="z_yw">
+					<view class="anniu-cz" @click="gocard(2)">
+						<text>立即兑换</text>
+					</view>
 				</view>
 			</view>
 
@@ -134,9 +130,9 @@
 			this.getUserBalance()
 		},
 		methods: {
-			gocard() {
+			gocard(id) {
 				uni.navigateTo({
-					url: '/pagesHome/oilRecharge/oilRecharge'
+					url: '/pagesHome/oilRecharge/oilRecharge?id=' + id
 				})
 			},
 			s_() {
@@ -342,4 +338,12 @@
 		font-weight: bold;
 		color: #000;
 	}
+
+	.z_yw {
+		width: 100%;
+		margin: 5px auto;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
 </style>
\ No newline at end of file
diff --git a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
index 07c51c13b..e3889e655 100644
--- a/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
+++ b/gasStation-uni/pagesHome/PointsMall/PointsMall.vue
@@ -62,7 +62,11 @@
 							<view class="gang" v-if="qhindex === index"></view>
 						</view>
 					</scroll-view>
+					<u-empty v-if="integralGiftList.length == 0" style="margin: 5px auto;" mode="data"
+						icon="http://cdn.uviewui.com/uview/empty/data.png">
+					</u-empty>
 					<view class="wrap-box">
+
 						<view class="box-goods" v-for="(item,index) in integralGiftList" :key="index"
 							@click="godetails(item)">
 							<view class="goods-img">
@@ -126,7 +130,6 @@
 					page: 1,
 					pageSize: 10000
 				}
-
 			}
 		},
 
@@ -251,12 +254,18 @@
 </script>
 
 <style scoped lang="scss">
-	.content {}
+	.content {
+		background-color: #ffd8d8;
+		width: 100%;
+		height: 100vh;
+
+	}
 
 	.container {
 		width: 100%;
 		box-sizing: border-box;
 		padding-top: 88px;
+
 		background: linear-gradient(180deg, #ff5c28 0%, #ff5c28 20%, #ffd8d8 37%, #ffd8d8 100%);
 		padding-bottom: 40px;
 	}
@@ -357,11 +366,13 @@
 
 
 		.sz {
+			width: 25%;
+			text-align: center;
 			display: inline-block;
 		}
 
 		.box {
-			// margin: 0 auto;
+
 			text-align: center;
 			font-size: 32rpx;
 			margin-right: 50rpx;
@@ -369,6 +380,7 @@
 			text-align: center;
 			// font-weight: bold;
 			color: #666666;
+			margin: 0 auto;
 			margin-bottom: 22rpx;
 		}
 	}
@@ -379,7 +391,8 @@
 	}
 
 	.gang {
-		width: 38rpx;
+		width: 50%;
+		margin: 0 auto;
 		height: 8rpx;
 		background: #ff5c28;
 		border-radius: 14rpx;
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 55d2bafd5..27873ca73 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -193,6 +193,9 @@
 		},
 		components: {
 
+		},
+		onLoad(option) {
+			this.actinput = option.id
 		},
 		onShow() {
 			this.getValueCars();
diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue
index a5cca2c22..e03f73eed 100644
--- a/gasStation-uni/pagesMy/VIP/vip.vue
+++ b/gasStation-uni/pagesMy/VIP/vip.vue
@@ -1,325 +1,316 @@
 <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="top-box">
-        <view class="b-top">
-          <view style="width: 70%;">
-            <view class="title-size">V2会员</view>
-            <view class="min-size" style="margin-bottom: 20px;">升级会员享更多特权</view>
-            <view class="min-size" style="margin-bottom: 10px;">在获得358可升级至钻石会员</view>
-            <u-line-progress :percentage="30" activeColor="#2F72F7"></u-line-progress>
-          </view>
-          <view class="right-img">
-            <image src="../../static/imgs/vipxz.png" mode=""></image>
-          </view>
-        </view>
-      </view>
-      <view class="c-box">
-        <view class="title-bai">会员权益</view>
-        <view class="wrap-box">
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-          <view class="box-ba">
-            <view class="min-box">
-              <image src="../../static/imgs/vipxz.png" mode=""></image>
-            </view>
-            <view class="">会员特权</view>
-          </view>
-        </view>
-      </view>
+	<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>
+			<!-- 顶部区域 -->
+			<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="info" :current="current" :mode="mode"
+				:dots-styles="dotsStyles" field="content">
+				<swiper class="swiper-box" @change="change" :current="swiperDotIndex">
+					<swiper-item v-for="(item, index) in 20" :key="index">
+						<view class="top-box">
 
-      <view style="height: 340px; width: 100%;"></view>
-      <view class="bottom-box">
-        <view class="bottom-bai-box">
-          <view class="b-top-bt">
-            <view class="title">每日任务</view>
-            <view class="times">每天04:00更新</view>
-          </view>
-          <view class="b-top-bt" style="margin: 10px auto;  ">
-            <view class="disa">
-              <view class="btimg">
-                <image src="../../static/imgs/dljf.png" mode=""></image>
-              </view>
-              <view class="an-title">每日登录</view>
-            </view>
-            <view class="anniu"> 去完成 </view>
-          </view>
-          <view class="b-top-bt" style="margin: 10px auto;  ">
-            <view class="disa">
-              <view class="btimg">
-                <image src="../../static/imgs/dljf.png" mode=""></image>
-              </view>
+							<view class="b-top">
+								<view style="width: 70%;">
+									<view class="title-size">V{{index}}会员</view>
+									<view class="min-size" style="margin-bottom: 20px;">升级会员享更多特权</view>
+									<view class="min-size" style="margin-bottom: 10px;">在获得358可升级至钻石会员</view>
+									<u-line-progress :percentage="30" activeColor="#2F72F7"></u-line-progress>
+								</view>
+								<view class="right-img">
+									<image src="../../static/imgs/vipxz.png" mode=""></image>
+								</view>
+							</view>
+						</view>
+						<!-- qy -->
+						<view class="c-box">
+							<!-- <view class="title-bai">会员权益</view> -->
+							<view class="wrap-box">
 
-              <view class="an-title">每日登录</view>
-            </view>
-            <view class="anniu"> 去完成 </view>
-          </view>
-          <view class="b-top-bt" style="margin: 10px auto;  ">
-            <view class="disa">
-              <view class="btimg">
-                <image src="../../static/imgs/dljf.png" mode=""></image>
-              </view>
-              <view class="an-title">每日登录</view>
-            </view>
-            <view class="anniu"> 去完成 </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+
+								<view class="box-ba" v-for="(item,index) in oilNameList" :key="index">
+									<view class="min-box">
+										<image src="../../static/imgs/vipxz.png" mode=""></image>
+									</view>
+									<view class="mu_">{{item}}</view>
+								</view>
+
+
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</uni-swiper-dot>
+
+
+
+			<view style="height: 340px; width: 100%;"></view>
+			<view class="bottom-box">
+				<view class="bottom-bai-box">
+					<view class="b-top-bt">
+						<view class="title">优惠信息</view>
+						<view class="times">每天04:00更新</view>
+					</view>
+				</view>
+				<view class="bottom-bai-box">
+					<view class="title">每消费<text style=" margin: 0px 5px; color:#ff5c28 ;">200万</text> 元加<text
+							style="margin: 0px 5px;color:#2c62cd ;">1%</text>成长值</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      title: '',
+	export default {
+		data() {
+			return {
+				title: '',
+				info: [{
+						colorClass: 'uni-bg-red',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 A'
+					},
+					{
+						colorClass: 'uni-bg-green',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 B'
+					},
+					{
+						colorClass: 'uni-bg-blue',
+						url: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/shuijiao.jpg',
+						content: '内容 C'
+					}
+				],
+				oilNameList: [
+					"汽油",
+					"柴油",
+					"天然气"
+				],
+				modeIndex: -1,
+				styleIndex: -1,
+				current: 0,
+				mode: 'default',
+				dotsStyles: {},
+				swiperDotIndex: 0
 
+			}
+		},
 
-    }
-  },
+		components: {
 
-  components: {
-
-  },
-  methods: {
-    goback() {
-      uni.navigateBack()
-    }
-  }
-}
+		},
+		methods: {
+			change(e) {
+				this.current = e.detail.current
+			},
+			goback() {
+				uni.navigateBack()
+			}
+		}
+	}
 </script>
 
 <style scoped lang="scss">
-.content {
-  background: #2F3648;
-  height: 100vh;
-}
+	.swiper-box {
+		height: 500px;
+	}
 
-.container {
-  width: 100%;
+	.content {
+		background: #2F3648;
+		height: 100vh;
+	}
 
-  box-sizing: border-box;
-  padding-top: 88px;
-}
+	.container {
+		width: 100%;
 
-.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;
+		box-sizing: border-box;
+		padding-top: 88px;
+	}
 
-  .my-icons {
-    width: 20px;
+	.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;
-}
+		}
 
-.top-box {
-  width: 90%;
-  border-radius: 8px;
-  box-sizing: border-box;
-  padding: 20px;
-  background: linear-gradient(90deg, #EEF4FF 0%, #AEC9FF 100%);
-  margin: 10px auto;
-}
+		position: fixed;
+		top: 0px;
+	}
 
-.b-top {
-  color: #2F72F7;
-  display: flex;
-  justify-content: space-between;
-}
+	.top-box {
+		width: 90%;
+		border-radius: 8px;
+		box-sizing: border-box;
+		padding: 20px;
+		background: linear-gradient(90deg, #EEF4FF 0%, #AEC9FF 100%);
+		margin: 10px auto;
+	}
 
-.right-img {
-  width: 80px;
-  height: 80px;
+	.b-top {
+		color: #2F72F7;
+		display: flex;
+		justify-content: space-between;
+	}
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
+	.right-img {
+		width: 80px;
+		height: 80px;
 
-.title-size {
-  font-weight: bold;
-  font-size: 18px;
-}
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-.min-size {
-  font-size: 12px;
-}
+	.title-size {
+		font-weight: bold;
+		font-size: 18px;
+	}
 
-.c-box {
-  width: 90%;
-  box-sizing: border-box;
-  padding: 15px;
-  margin: 20px auto;
-  height: 188px;
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%);
-  border-radius: 8px;
-}
+	.min-size {
+		font-size: 12px;
+	}
 
-.title-bai {
-  font-size: 18px;
-  font-weight: bold;
-  color: #ffffff;
-}
+	.c-box {
+		width: 90%;
+		box-sizing: border-box;
+		padding: 15px;
+		margin: 20px auto;
+		height: 188px;
+		background: linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0) 100%);
+		border-radius: 8px;
+	}
 
-.wrap-box {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
+	.title-bai {
+		font-size: 18px;
+		font-weight: bold;
+		color: #ffffff;
+	}
 
-}
+	.wrap-box {
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
 
-.box-ba {
-  width: 25%;
-  text-align: center;
-  margin: 10px auto;
-  color: #ffffff;
-  font-size: 12px;
-}
+	}
 
-.min-box {
-  width: 30px;
-  height: 30px;
-  margin: 5px auto;
+	.box-ba {
+		width: 33%;
+		text-align: center;
+		margin: 10px auto;
+		color: #ffffff;
+		font-size: 12px;
+	}
 
-  image {
-    width: 100%;
-    height: 100%;
-  }
-}
+	.min-box {
+		width: 90%;
+		height: 90px;
+		margin: 5px auto;
 
-.bottom-box {
-  background: #F3F5F9;
-  width: 100%;
-  border-radius: 16px 16px 0px 0px;
-  box-sizing: border-box;
-  padding: 15px;
-  position: fixed;
-  bottom: 0px;
-  height: 340px;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
 
-}
+	.bottom-box {
+		background: #F3F5F9;
+		width: 100%;
+		border-radius: 16px 16px 0px 0px;
+		box-sizing: border-box;
+		padding: 15px;
+		position: fixed;
+		bottom: 0px;
+		height: 340px;
 
-.bottom-bai-box {
-  width: 100%;
-  border-radius: 8px;
-  background: #ffffff;
-  box-sizing: border-box;
-  padding: 10px;
+	}
+
+	.bottom-bai-box {
+		width: 100%;
+		border-radius: 8px;
+		background: #ffffff;
+		box-sizing: border-box;
+		padding: 10px;
+		margin: 15px auto;
 
 
 
-}
+	}
 
-.b-top-bt {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
+	.b-top-bt {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.title {
-  font-size: 16px;
-  font-weight: bold;
-  color: #333333;
-}
+	.title {
+		font-size: 16px;
+		font-weight: bold;
+		color: #333333;
+	}
 
-.times {
-  font-size: 12px;
-  color: #999999;
-}
+	.times {
+		font-size: 12px;
+		color: #999999;
+	}
 
-.btimg {
+	.btimg {
 
-  image {
-    width: 44px;
-    height: 44px;
-  }
+		image {
+			width: 44px;
+			height: 44px;
+		}
 
-}
+	}
 
-.anniu {
-  width: 70px;
-  height: 30px;
-  background: #EB3E67;
-  border-radius: 15px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: white;
-  font-size: 14px;
-  font-weight: bold;
+	.anniu {
+		width: 70px;
+		height: 30px;
+		background: #EB3E67;
+		border-radius: 15px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: white;
+		font-size: 14px;
+		font-weight: bold;
 
-}
+	}
 
-.disa {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
+	.disa {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.an-title {
-  font-size: 16px;
-  font-weight: bold;
-  color: #333333;
-  margin-left: 5px;
-}
-</style>
+	.an-title {
+		font-size: 16px;
+		font-weight: bold;
+		color: #333333;
+		margin-left: 5px;
+	}
+
+	.mu_ {
+		font-size: 18px;
+		font-weight: bold;
+		margin: 15px auto;
+	}
+</style>
\ No newline at end of file