From 2e566e323c3523b5cf74aceddca274094d75dadc Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 26 Jul 2023 09:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B0=83=E6=95=B4=E4=BA=86?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=EF=BC=8C=E8=82=AF=E5=BE=B7=E5=9F=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=98=9F=E5=B7=B4=E5=85=8B=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=8F=98=E5=BD=A2=EF=BC=8C=E5=AF=B9=E9=97=A8=E5=BA=97=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=89=8D=E7=AB=AF=E6=89=8B=E5=8A=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 135 +++-
 member-Recharge/choicepage/choicepage.vue     |  10 +-
 .../rec-confirmation/rec-confirmation.vue     |  11 +-
 pages.json                                    | 101 +--
 pages/goods/refuel-confirm/refuel-confirm.vue |  50 +-
 pages/goods/refuel-details/refuel-details.vue |   4 +-
 pages/goods/refuel/refuel.vue                 |  31 +-
 pages/tabBar/home/home.vue                    | 654 +++++++++---------
 qianzhu-KFC/buffet-order/buffet-order.vue     |  73 +-
 qianzhu-KFC/confirmOrder/confirmOrder.vue     |  11 +-
 qianzhu-KFC/home/home.vue                     |   9 +-
 qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue   |  10 +-
 qianzhu-KFC/menu-list/menu-list.vue           |  14 +-
 qianzhu-Starbucks/home/home.vue               |   9 +-
 uni.scss                                      |   4 +-
 15 files changed, 606 insertions(+), 520 deletions(-)

diff --git a/App.vue b/App.vue
index 0cf1d52..7bc3a4b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,19 +1,8 @@
 <script>
+	import Vue from 'vue'
 	export default {
 		globalData: {
-			// url: 'http://192.168.3.4:9301/crest',
-			// brestUrl: 'http://192.168.3.4:9302/brest',
-			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
-			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// v1url:'https://hsg.dctpay.com/v1',
-			// orderurl:' https://hsg.dctpay.com/order',
-			// userurl:'https://hsg.dctpay.com/user',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl: 'https://hsg.dctpay.com/brest',
-			// imageWxImg: 'https://hsg.dctpay.com/filesystem/wxApplets/',
-			// imageqrImg: 'https://hsg.dctpay.com/filesystem/temporary/',
-			//测试
+			
 			url: '',
 			v1url: '',
 			orderurl: '',
@@ -73,10 +62,34 @@
 
 		},
 		onLaunch: function() {
-			/*
-			 路由拦截
-			 */
+			uni.getSystemInfo({
+				success: function(e) {
+					// #ifndef MP
+					Vue.prototype.StatusBar = e.statusBarHeight;
+					if (e.platform == 'android') {
+						Vue.prototype.CustomBar = e.statusBarHeight + 50;
+					} else {
+						Vue.prototype.CustomBar = e.statusBarHeight + 45;
+					};
+					// #endif
+			
+					// #ifdef MP-WEIXIN
+					Vue.prototype.StatusBar = e.statusBarHeight;
+					let custom = uni.getMenuButtonBoundingClientRect();
+					Vue.prototype.Custom = custom;
+					// Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight + 4;
+					Vue.prototype.CustomBar = custom.height + custom.top - e.statusBarHeight +4;
+					
+					
+					console.log(custom)
+					// #endif		
+			
+					
+				}
+			});
+			
 			
+			/* 
 			// const methodToPatch = ['navigateTo', 'redirectTo', 'switchTab', 'navigateBack'];
 			const methodToPatch = ['navigateTo', 'redirectTo', 'switchTab', ];
 			
@@ -128,10 +141,11 @@
 					}
 				})
 				
-			})
+			}) */
 			
 		},
 		onShow: function() {
+			let that = this;
 			// #ifdef MP
 			let accountInfo = uni.getAccountInfoSync();
 
@@ -159,9 +173,13 @@
 				this.globalData.imageqrImg = 'https://hsg.dctpay.com/filesystem/temporary/';
 				this.globalData.h5url = "https://hsg.dctpay.com/hsgH5" /* 分享需要用到*/
 			}
+			
+			
+			
+			
 			// #endif
 			// #ifdef H5
-			let that = this;
+			
 			that.globalData.h5url = "https://hsgcs.dctpay.com/hsgH5";
 			that.globalData.url = 'https://hsgcs.dctpay.com/crest';
 			that.globalData.v1url = 'https://hsgcs.dctpay.com/v1';
@@ -194,7 +212,7 @@
 				}
 			})
 			
-			uni.getStorage({
+			/* uni.getStorage({
 				key: 'user',
 				success(e) {
 					if (e.data) {
@@ -210,7 +228,7 @@
 						that.globalData.token = e.data;
 					}
 				}
-			})
+			}) */
 
 
 
@@ -246,7 +264,7 @@
 				}
 			})
 
-			uni.getStorage({
+			/* uni.getStorage({
 				key: 'cityId',
 				success(e) {
 					if (e.data) {
@@ -297,9 +315,82 @@
 						that.globalData.longitude = e.data;
 					}
 				}
-			})
+			}) */
 
 			// #endif
+		
+			uni.getStorage({
+				key: "user",
+				success(e) {
+					if(e.data){
+						that.globalData.userInfo = e.data 
+					}	
+				},
+			})
+			uni.getStorage({
+				key: 'token',
+				success(e) {
+					if(e.data){
+						that.globalData.token = e.data;
+					}
+				}
+			})
+			
+			
+			uni.getStorage({
+				key: 'cityId',
+				success(e) {
+					if (e.data) {
+						that.globalData.cityId = e.data;
+					}
+				}
+			})
+			
+			uni.getStorage({
+				key: 'cityName',
+				success(e) {
+					if (e.data) {
+						that.globalData.cityName = e.data;
+					}
+				}
+			})
+			
+			uni.getStorage({
+				key: 'qianzhuCityName',
+				success(e) {
+					if (e.data) {
+						that.globalData.qianzhuCityName = e.data;
+					}
+				}
+			})
+			
+			uni.getStorage({
+				key: 'companyId',
+				success(e) {
+					if (e.data) {
+						that.globalData.companyId = e.data;
+					}
+				}
+			})
+			
+			uni.getStorage({
+				key: 'latitude',
+				success(e) {
+					if (e.data) {
+						that.globalData.latitude = e.data;
+					}
+				}
+			})
+			uni.getStorage({
+				key: 'longitude',
+				success(e) {
+					if (e.data) {
+						that.globalData.longitude = e.data;
+					}
+				}
+			})
+			
+			
 		},
 		onHide: function() {
 		}
diff --git a/member-Recharge/choicepage/choicepage.vue b/member-Recharge/choicepage/choicepage.vue
index adfb201..0ebdbdd 100644
--- a/member-Recharge/choicepage/choicepage.vue
+++ b/member-Recharge/choicepage/choicepage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image :src="imageUrl+item.img" mode="widthFix" class="flleft width40 imgs mart20"
+		<image :src="imageUrl+item.img" mode="widthFix" class="height95 verc width40 imgs mart20 "
 			v-for="(item,index) in choicelist" :key="index" @click="jumprechangeVip(item)">
 		</image>
 
@@ -73,5 +73,13 @@
 	.imgs {
 		margin-left: 5%;
 		margin-right: 5%;
+		
+		
+		
 	}
+	
+	.height95{
+		height:90px;
+	}
+	
 </style>
diff --git a/member-Recharge/rec-confirmation/rec-confirmation.vue b/member-Recharge/rec-confirmation/rec-confirmation.vue
index 9b4ac1b..a3faee6 100644
--- a/member-Recharge/rec-confirmation/rec-confirmation.vue
+++ b/member-Recharge/rec-confirmation/rec-confirmation.vue
@@ -32,7 +32,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="width94 concont mart10 backcorfff marb100">
+		<view class="width94 concont mart10 backcorfff ">
 			<view class="height50 width100 paddtop5 backcorfff" @click="showPopup()">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
 					优惠抵扣<text class="yhqky">{{OrderPreList.length}}张可用</text>
@@ -76,7 +76,7 @@
 			<view class="width94 line1 marb5"></view>
 			<view class="height50 width100 backcorfff" v-if="Integrastu == 1">
 				<view class="width40 flleft fcor333 fontwig6 font15 text1 alijusstart" style="padding-left: 4%;">
-					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;"></image>
+					<image src="../../static/img/rebate.png" mode="widthFix" style="width: 25px;height: 25px;"></image>
 					<text>下单返积分</text>
 				</view>
 				<view class="width50 flright fotrt paddtright10 font15 colore95 alijun"
@@ -88,13 +88,13 @@
 					{{rebateIntegral}}
 				</view> -->
 			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 4%;">
-				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
+			<view class=" width100 backcorfff alijusstart paddbotm10 border-box" style="padding-left: 4%;">
+				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20 height20"></image>
 				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
 			</view>
 			<view class="width94 line1 marb5"></view>
 			<view class="height50 width100">
-				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+				<view class="width100 flleft fcor333 fontwig6 font16 border-box" style="padding-left: 4%;">
 					支付方式
 				</view>
 			</view>
@@ -122,6 +122,7 @@
 			</view>
 		</view>
 
+		<view class="height120"></view>
 		<view class="footbtn width100 height50 backcor33">
 			<view class="width94 alijusstart">
 				<view class="width70 fcorfff">
diff --git a/pages.json b/pages.json
index 867e99e..96712ff 100644
--- a/pages.json
+++ b/pages.json
@@ -17,6 +17,13 @@
 		}, {
 			"path": "pages/tabBar/home/home",
 			"style": {
+				"navigationBarTitleText": "首页",
+				"navigationBarBackgroundColor": "#3da7e7",
+				"backgroundColorTop": "#3da7e7",
+				"onReachBottomDistance": 50,
+				"navigationStyle": "custom"
+			}
+			/* "style": {
 				"navigationBarTextStyle": "white",
 				"navigationBarTitleText": "首页",
 				"navigationBarBackgroundColor": "#3da7e7",
@@ -26,7 +33,7 @@
 					"titleNView": false, //禁用原生导航栏
 					"softinputNavBar": "none"
 				}
-			}
+			} */
 		},
 		{
 			"path": "pages/tabBar/classify/classify",
@@ -43,97 +50,7 @@
 				}
 			}
 		},
-		// {
-		// 	"path": "pages/classify/goodsDetail/goodsDetail",
-		// 	"style": {
-		// 		"navigationBarTitleText": "商品详情",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/goods-search/goods-search",
-		// 	"style": {
-		// 		"navigationBarTitleText": "搜索",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/cart/cart",
-		// 	"style": {
-		// 		"navigationBarTitleText": "购物车",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/goods-comment/goods-comment",
-		// 	"style": {
-		// 		"navigationBarTitleText": "查看评论",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/address/address",
-		// 	"style": {
-		// 		"navigationBarTitleText": "我的地址",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/address/addNewAddress/addNewAddress",
-		// 	"style": {
-		// 		"navigationBarTitleText": "新增地址",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/settleAccounts/settleAccounts",
-		// 	"style": {
-		// 		"navigationBarTitleText": "订单确认",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/order/order",
-		// 	"style": {
-		// 		"navigationBarTitleText": "订单列表",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/order/orderDetail",
-		// 	"style": {
-		// 		"navigationBarTitleText": "订单详情",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/order/editOrder",
-		// 	"style": {
-		// 		"navigationBarTitleText": "修改订单",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// // {
-		// // 	"path": "pages/wuliu/wuliu",
-		// // 	"style": {
-		// // 		"navigationBarTitleText": "物流信息",
-		// // 		"enablePullDownRefresh": false
-		// // 	}
-		// // },
-		// {
-		// 	"path": "pages/classify/order/pay",
-		// 	"style": {
-		// 		"navigationBarTitleText": "收银台页",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
-		// {
-		// 	"path": "pages/classify/order/paymentResult",
-		// 	"style": {
-		// 		"navigationBarTitleText": "支付结果",
-		// 		"enablePullDownRefresh": false
-		// 	}
-		// },
+		
 		{
 			"path": "pages/qianZhuPay/union-pay/union-pay",
 			"style": {
diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index 4f5097d..5e7abf0 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -4,74 +4,74 @@
 		<view class="width100 height120 backcorfff">
 			<image :src="gasOrderList.gasimg" class="flleft conImg mart10 margle10"></image>
 			<view class="conCont paddtop15">
-				<view class="font20 fontwig6 fcor333 text1 paddtright10">{{gasOrderList.gasname}}</view>
-				<view class="font14 fcor999 text2 paddtop5 paddtright10">{{gasOrderList.gasaddress}}</view>
-				<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{gasOrderList.highChildOrderList[0].gasPriceVip}}
-					<text class="margle10 slogan font14">￥{{gasOrderList.highChildOrderList[0].gasPriceGun}}</text>
+				<view class="font20 fontwig6 fcor333 text1 paddtright10">{{gasOrderList.gasname || ''}}</view>
+				<view class="font14 fcor999 text2 paddtop5 paddtright10">{{gasOrderList.gasaddress  || ''}}</view>
+				<view class="font20 fontwig6 fcoreb5 paddtop5">￥{{gasOrderList.highChildOrderList[0].gasPriceVip  || ''}}
+					<text class="margle10 slogan font14">￥{{gasOrderList.highChildOrderList[0].gasPriceGun  || ''}}</text>
 				</view>
 			</view>
 		</view>
 		<!-- //订单详情 -->
-		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">订单详情</view>
+		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff border-box">订单详情</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				油号\油枪
 			</view>
 			<view class="flright width40 fotct">
-				{{gasOrderList.highChildOrderList[0].gasOilNo}}#/{{gasOrderList.highChildOrderList[0].gasGunNo}}号
+				{{gasOrderList.highChildOrderList[0].gasOilNo  || ''}}#/{{gasOrderList.highChildOrderList[0].gasGunNo  || ''}}号
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				加油金额
 			</view>
 			<view class="flright width40 fotct">
-				¥{{orderList.oilingPrice}}
+				¥{{orderList.oilingPrice  || ''}}
 			</view>
 		</view>
 		<!-- 新增 -->
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				加油升数
 			</view>
 			<view class="flright width40 fotct">
-				{{orderList.oilLiters}}L
+				{{orderList.oilLiters  || ''}}L
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				平台折扣
 			</view>
 			<view class="flright width40 fotct" v-if="orderList.discount != 1">
-				{{(orderList.discount * 100).toFixed(2)}}折
+				{{(orderList.discount * 100).toFixed(2)  || ''}}折
 			</view>
 			<view class="flright width40 fotct" v-else>
 				无
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				每升优惠
 			</view>
 			<view class="flright width40 fotct" v-if="!memDiscountId">
-				¥{{orderList.litersPreferences}}
+				¥{{orderList.litersPreferences  || ''}}
 			</view>
 			<view class="flright width40 fotct" v-else>
 				¥0
 			</view>
 		</view>
 		<view class="line1"></view>
-		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff">
+		<view class="heightl60 paddleft10 fcor666  font16 width100 backcorfff border-box">
 			<view class="flleft width50">
 				本次优惠
 			</view>
 			<view class="flright width40 fotct" v-if="!memDiscountId">
-				¥{{orderList.totalPreferences}}
+				¥{{orderList.totalPreferences  || ''}}
 			</view>
 			<view class="flright width40 fotct" v-else>
 				¥0
@@ -142,19 +142,19 @@
 					{{rebateIntegral}}
 				</view> -->
 			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+			<view class=" width100 backcorfff alijusstart paddbotm10 border-box" style="padding-left: 2%;">
 				<image src="../../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
 				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
 			</view>
 		</view>
 
 		<!-- //支付方式 -->
-		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式:</view>
+		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff border-box">支付方式:</view>
 		<view class="line1"></view>
 		<view class="width100 backcorfff" v-for="(item,index) in paytypeList" :key="index">
 
 			<view class="line1" v-if="item == 2"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 2" @tap="paytype='2'">
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff border-box" v-if="item == 2" @tap="paytype='2'">
 				<view class="width60 flleft font16">
 					微信支付
 				</view>
@@ -162,9 +162,9 @@
 					<radio :checked="paytype=='2'" color="#0083f5" />
 				</view>
 			</view>
-
+			
 			<view class="line1" v-if="item == 6"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 6" @tap="paytype='6'">
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff border-box" v-if="item == 6" @tap="paytype='6'">
 				<view class="width60 flleft font16">
 					油卡支付<text class="font14 fcor666 margle">余额: {{oilPirce}}元</text>
 				</view>
@@ -174,7 +174,7 @@
 			</view>
 
 			<view class="line1" v-if="item == 3"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item == 3" @tap="paytype='3'">
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff border-box" v-if="item == 3" @tap="paytype='3'">
 				<view class="width60 flleft font16">
 					汇联通工会卡<text class="font14 fcor666 margle">余额: {{tongCardPrice}}元</text>
 				</view>
@@ -183,7 +183,7 @@
 				</view>
 			</view>
 			<view class="line1" v-if="item ==7"></view>
-			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" v-if="item ==7" @tap="paytype='7'">
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff border-box" v-if="item ==7" @tap="paytype='7'">
 				<view class="width60 flleft font14">
 					车队油卡<text class="font14 fcor666 margle">余额: {{oilUserNoPrice}}元</text>
 				</view>
@@ -223,7 +223,7 @@
 			</view>
 		</view>
 
-		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>
+		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10 border-box">重要说明</view>
 		<view class="width95 paddleft10 font14 fcor999	 mart5">1.<text
 				class="fcor089 fontwig6">请先加油后下单</text>,即您到站后,与工作人员确认油号,枪号后再付款。</view>
 		<view class="width95 paddleft10 font14 fcor999  mart5">
diff --git a/pages/goods/refuel-details/refuel-details.vue b/pages/goods/refuel-details/refuel-details.vue
index df5c6fd..3de18b0 100644
--- a/pages/goods/refuel-details/refuel-details.vue
+++ b/pages/goods/refuel-details/refuel-details.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<image mode="widthFix" class="width100" :src="storeList.gasLogoSmall"></image>
+		<image mode="widthFix" class="width100 height260" :src="storeList.gasLogoSmall"></image>
 		<view class="height100p titlecon backcorfff">
 			<view class="height75 paddtop25 width90">
 				<view class="flleft width80p">
@@ -1047,6 +1047,7 @@
 	.reimg {
 		image {
 			width: 20px;
+			height:20px;
 		}
 	}
 
@@ -1071,6 +1072,7 @@
 
 		image {
 			width: 10px;
+			height:10px;
 			margin-left: 10px;
 		}
 	}
diff --git a/pages/goods/refuel/refuel.vue b/pages/goods/refuel/refuel.vue
index 469f6dd..5e66eb2 100644
--- a/pages/goods/refuel/refuel.vue
+++ b/pages/goods/refuel/refuel.vue
@@ -24,29 +24,32 @@
 		<view v-if="refuelList == '' " class="mart60 fotct font14 fcor666">
 			<image mode="widthFix" style="width: 70vw;" :src="imagewxUrl+imgadres3"></image>
 		</view>
-		<view class="width96 height100p backcorfff border-r mart10" v-for="(item,index) in refuelList" :key="index">
-			<image mode="widthFix" :src="item.store_logo" class="recontleft flleft mart10 border-r"
-				style="max-height: 80px;" @click="goDetails(item.store_key,item.id)">
+		<view class="width96 dis-flex border-box  backcorfff border-r mart10 " v-for="(item,index) in refuelList" :key="index">
+			<image mode="widthFix" :src="item.store_logo" class="recontleft height50 border-r"
+				 @click="goDetails(item.store_key,item.id)">
 			</image>
-			<view class="recontright">
-				<view class="text1 width100 font18 fontwig6  paddtop10" @click="goDetails(item.store_key,item.id)">
+			<view class="recontright flex-1">
+				<view class="text1 width100 font18 fontwig6 " @click="goDetails(item.store_key,item.id)">
 					{{item.store_name}}
 				</view>
-				<view class="width100 mart5 height22">
-					<view class="width70 flleft text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
+				<view class="width100 mart5 dis-flex">
+					<view class="width70 flex-s0  text1 font13 fcor999" @click="goDetails(item.store_key,item.id)">
 						{{item.address}}
 					</view>
-					<view class="width30 flright font13 fcor666 fotct" v-if="item.distance" @click="seeloaction(item)">
-						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;margin-right: 3px"></image>
+					<view class="width30 flex-s0 font13 fcor666 fotct" v-if="item.distance" @click="seeloaction(item)">
+						<image mode="widthFix" :src="imagewxUrl+imgadres1" style="width: 10px;margin-right: 3px;height:10px;"></image>
 						{{item.distance}}km
 					</view>
 				</view>
-				<view class="font14 width100 fcoreb5 mart5 height22" @click="goDetails(item.store_key,item.id)">
+				<view class="font14 width100 fcoreb5 mart5 " @click="goDetails(item.store_key,item.id)">
 					<text class="font18 fontwig6">{{item.price_vip}}</text>起<text
 						class="fcor999 margle">油站价￥{{item.price_gun}}</text>
 				</view>
 			</view>
 		</view>
+		<view class="height10"></view>
+			
+		
 
 		<wybPopup ref="popup" type="bottom" height="500" width="500" radius="6" :showCloseIcon="false">
 			<view class="fotct font18 fontwig6 fcor333 mart10 height30" v-if="typeId  == 1">筛选距离</view>
@@ -343,6 +346,7 @@
 
 		.stuimg {
 			width: 10px;
+			height: 10px;
 			vertical-align: middle;
 		}
 	}
@@ -350,6 +354,7 @@
 	.sear {
 		margin-left: 10px;
 		width: 50px;
+		height:19px;
 	}
 
 	.searImg {
@@ -357,12 +362,14 @@
 	}
 
 	.recontleft {
+		flex-shrink: 0;
 		width: 80px;
-		margin-left: 10px;
+		margin : 20rpx;
+		
 	}
 
 	.recontright {
-		margin-left: 95px;
+		padding:  20rpx 20rpx 20rpx 0;
 	}
 
 	.text {
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index b08f616..417925b 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -1,174 +1,190 @@
 <template>
 	<view>
 		<!-- 状态栏 -->
-		<view v-if="showHeader && !isdisplay" class="status"
-			:style="{ position: headerPosition,top:statusTop,opacity: afterHeaderOpacity}"></view>
-		<!-- 顶部导航栏 -->
-		<view v-if="showHeader && !isdisplay" class="header"
-			:style="{ position: headerPosition,top:headerTop,opacity: afterHeaderOpacity }">
-			<!-- 定位城市 -->
-			<view class="addr" @click="goPostion">
-				<!-- <view class="icon location"></view> -->
-				{{ city }}
-				<image mode="widthFix" style="width: 15px;" :src="imagewxUrl+imgadres2"></image>
-			</view>
-			<!-- 搜索框 -->
-			<view class="input-box">
-				<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
-				<view class="icon search"></view>
-			</view>
 
-			<!-- 右侧图标按钮 -->
-			<view class="icon-btn">
-				<!-- #ifdef MP-->
-				<button open-type="contact" style="background-color: transparent;padding: 0px;">
-					<image src="../../../static/img/home/cusser.png" mode="widthFix" class="icon30"></image>
-				</button>
-				<!-- #endif -->
-				<!-- #ifdef H5-->
-				<image :src="imagewxUrl+imgadres4" mode="widthFix" style="background-color: transparent;padding: 0px;"
-					class="h5xfimg" @click="playPhone"></image>
-				<!-- #endif -->
-			</view>
-		</view>
-		<view v-if="isdisplay">
-			<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
+		<view v-if="!isdisplay" :style="{height:StatusBar,backgroundColor: bgColor}" class="status">
+
 		</view>
 
-		<!-- 顶部菜单 -->
-		<view v-for="(item,index) in homeCateList" :key="index" style="margin-top: -2px;">
-			<view class="height90 backcorltop mart50" v-if="item.type == 1">
-				<view class="category-list">
-					<view class="category" style="width: 25%;" v-for="(row, indexs) in item.childCategory" :key="indexs"
-						@click="toCategory(row)">
-						<view class="img">
-							<image :src="imageUrl+row.imgData"></image>
-						</view>
-						<view class="text fcorfff">{{ row.title }}</view>
-					</view>
+
+		<view class="" :style="{paddingTop:StatusBar,position:'relative',}">
+
+			<!-- 定位城市 position:'relative' ,top:StatusBar,-->
+			<view  v-if="!isdisplay" class="city-con dis-flex padleft15" :style="{ height:CustomBar+'px', }">
+				<view class="addr" @click="goPostion">
+					{{ city }}
+					<image mode="aspectFit" style="width: 15px;height: 15px;" :src="imagewxUrl+imgadres2"></image>
 				</view>
 			</view>
-			<!-- 顶部活动图片 -->
-			<image class="width100" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
-
-			<!-- 顶部菜单 -->
-			<view class="category-list backcorfff" style="margin-top: -7px;" v-if="item.type == 7">
-				<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
-					@click="toCategory(row)">
-					<view class="img">
-						<image :src="imageUrl+row.imgData"></image>
+
+			<!-- 顶部导航栏 -->
+			<view  v-if="!isdisplay"  class="header"
+				:style="{ position: 'sticky',top:StatusBar,height:Number(CustomBar + 5) +'px',backgroundColor: bgColor,}">
+
+				<view :style="{width:width}" class="header-chid">
+					<view class="input-box">
+						<input placeholder="搜索门店" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
+						<view class="icon search"></view>
+					</view>
+
+
+					<view class="icon-btn">
+						<!-- #ifdef MP-->
+						<button open-type="contact" style="background-color: transparent;padding: 0px;">
+							<image src="../../../static/img/home/cusser.png" mode="aspectFit" class="icon30"
+								style="height: 30px;"></image>
+						</button>
+						<!-- #endif -->
+						<!-- #ifdef H5-->
+						<image :src="imagewxUrl+imgadres4" mode="widthFix"
+							style="background-color: transparent;padding: 0px;" class="h5xfimg" @click="playPhone">
+						</image>
+						<!-- #endif -->
 					</view>
-					<view class="text fcor333">{{ row.title }}</view>
 				</view>
 			</view>
-			<!-- 消息 -->
-			<view class="height120 backcorfff" v-if="item.type == 3">
-				<view class="height20 width100"></view>
-				<view class="width92 message alijus">
-					<view class="width100 alijus" style="margin-top: -20px;" @click="test(0)"
-						v-if="item.childDate.length == 1">
-						<view class="width80p paddleft10 alijusstart">
-							<view class="stus"></view>
-							<view class="paddleft10 font14 fcor666 text1 width70">
-								{{item.childDate[0].title}}
+
+
+			<view v-if="isdisplay">
+				<image :src="imagewxUrl+imgadres5" class="widthw30 mart110" mode="widthFix"></image>
+			</view>
+
+			
+			<view v-for="(item,index) in homeCateList" :key="index" style="">
+				<!-- 顶部菜单 -->
+				<view class=" backcorltop " v-if="item.type == 1">
+					<view class="category-list ">
+						<view class="category margb40upx" style="width: 25%;" v-for="(row, indexs) in item.childCategory"
+							:key="indexs" @click="toCategory(row)">
+							<view class="img">
+								<image class="verc" :src="imageUrl+row.imgData"></image>
 							</view>
-							<view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
+							<view class="text fcorfff">{{ row.title }}</view>
 						</view>
-						<view class="width20 alijus">
-							<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
+					</view>
+				</view>
+				<!-- 顶部活动图片 -->
+				<image class="width100 verc backcolorfff" style="min-height: 90px;" mode="widthFix" :src="imagewxUrl+imgadres" v-if="item.type == 8"></image>
+
+				<!-- 中间菜单 -->
+				<view class="category-list pdb40upx  backcorfff" style="" v-if="item.type == 7">
+					<view class="category" style="width: 20%;" v-for="(row, indexc) in item.childCategory" :key="indexc"
+						@click="toCategory(row)">
+						<view class="img">
+							<image class="verc" mode="aspectFit" :src="imageUrl+row.imgData"></image>
 						</view>
+						<view class="text fcor333">{{ row.title }}</view>
 					</view>
-					<swiper v-else circular="true" autoplay="true" display-multiple-items="2" :vertical="true">
-						<swiper-item class="alijus" v-for="(swipers,index) in item.childDate" :key="swipers.id"
-							@click="test(index)">
+				</view>
+				
+					
+				
+				<!-- 消息 -->
+				<view class="height120 backcorfff" v-if="item.type == 3">
+					<view class="height20 width100"></view>
+					<view class="width92 message alijus">
+						<view class="width100 alijus" style="margin-top: -20px;" @click="test(0)"
+							v-if="item.childDate.length == 1">
 							<view class="width80p paddleft10 alijusstart">
 								<view class="stus"></view>
 								<view class="paddleft10 font14 fcor666 text1 width70">
-									{{swipers.title}}
+									{{item.childDate[0].title}}
 								</view>
-								<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
+								<view class="width25 font13 fcor999">{{item.childDate[0].timeData}}</view>
 							</view>
 							<view class="width20 alijus">
 								<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
 							</view>
-						</swiper-item>
-					</swiper>
+						</view>
+						<swiper v-else circular="true" autoplay="true" display-multiple-items="2" :vertical="true">
+							<swiper-item class="alijus" v-for="(swipers,index) in item.childDate" :key="swipers.id"
+								@click="test(index)">
+								<view class="width80p paddleft10 alijusstart">
+									<view class="stus"></view>
+									<view class="paddleft10 font14 fcor666 text1 width70">
+										{{swipers.title}}
+									</view>
+									<view class="width25 font13 fcor999">{{swipers.timeData}}</view>
+								</view>
+								<view class="width20 alijus">
+									<image class="icon15" mode="widthFix" src="../../../static/img/jt.png"></image>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
 				</view>
-			</view>
 
-			<!-- 轮播图 -->
-			<view class="swiper mart20" v-if="item.type == 2">
-				<view class="swiper-box">
-					<swiper circular="true" autoplay="true" @change="swiperChange">
-						<swiper-item v-for="swiper in item.childCategory" :key="swiper.id">
-							<image :src="imageUrl+swiper.imgData" @click="jumplottery(swiper)"></image>
-						</swiper-item>
-					</swiper>
+				<!-- 轮播图 -->
+				<view class="swiper mart20" v-if="item.type == 2">
+					<view class="swiper-box">
+						<swiper circular="true" autoplay="true" @change="swiperChange">
+							<swiper-item v-for="swiper in item.childCategory" :key="swiper.id">
+								<image :src="imageUrl+swiper.imgData" @click="jumplottery(swiper)"></image>
+							</swiper-item>
+						</swiper>
+					</view>
 				</view>
-			</view>
-			<!-- 加油专区 ,天天好券-->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9"
-				@click="goGoodsList(item.jumpUrl)">
-				<view class="width70 font18 fcor333">
-					{{item.name}}
+				<!-- 加油专区 ,天天好券-->
+				<view class="width90 mart20 alijusstart" v-if="item.type == 6 || item.type == 9"
+					@click="goGoodsList(item.jumpUrl)">
+					<view class="width70 font18 fcor333">
+						{{item.name}}
+					</view>
+					<view class="width30 font14 fotrt fcor666">更多<text class="icon-ymt to-right fcor666 font14"></text>
+					</view>
 				</view>
-				<view class="width30 font14 fotrt fcor666">更多<text class="icon-ymt to-right fcor666 font14"></text></view>
-			</view>
-			<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
-					@click="toGoods(item.detailJumpUrl,goods.id)">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
-						:src="imageUrl+goods.couponImg"></image>
-					<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
-					<!-- <view class="width96 fcor999 font11">{{goods.salesEndTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view> -->
-					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
+				<view class="width94 alijusnostart mart20" v-if="item.type == 6 ">
+					<view class="backcorfff spcarea border-r" v-for="(goods,index1) in item.childDate" :key="index1"
+						@click="toGoods(item.detailJumpUrl,goods.id)">
+						<image mode="aspectFill" class="width100" style="border-radius: 5px 5px 0 0;height: 100px;"
+							:src="imageUrl+goods.couponImg"></image>
+						<view class="width96 fcor333 font15 fontwig6">{{goods.couponName}}</view>
+						<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.salesPrice}}</view>
+					</view>
 				</view>
-			</view>
-			<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
-				<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
-					@click="toGoods(item.detailJumpUrl,goods.id)">
-					<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
-						:src="imageUrl+goods.listImg"></image>
-					<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
-					<!-- <view class="width96 fcor999 font11" v-if="goods.effectiveTiem">
-						{{goods.effectiveTiem | timeFormat('yyyy-mm-dd hh:mm:ss')}}
-					</view> -->
-					<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
+				<view class="width94 alijusnostart mart20" v-if="item.type == 9 ">
+					<view class="backcorfff spcarea border-r" v-for="(goods,index2) in item.childDate" :key="index2"
+						@click="toGoods(item.detailJumpUrl,goods.id)">
+						<image mode="widthFix" class="width100" style="border-radius: 5px; 5px 0 0"
+							:src="imageUrl+goods.listImg"></image>
+						<view class="width96 fcor333 font15 fontwig6">{{goods.title}}</view>
+						<view class="width94 fcoreb5 font15 fontwig6">¥{{goods.price}}</view>
+					</view>
 				</view>
-			</view>
-			<!-- 大图 -->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 4" @click="goGoodsList(item.jumpUrl)">
-				<view class="width70 font18 fcor333">
-					{{item.name}}
+				<!-- 大图 -->
+				<view class="width90 mart10 alijusstart" v-if="item.type == 4" @click="goGoodsList(item.jumpUrl)">
+					<view class="width70 font18 fcor333">
+						{{item.name || ''}}
+					</view>
 				</view>
-			</view>
-			<image class="width90 mart10" mode="widthFix" v-if="item.type == 4"
-				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
-			</image>
-			<!-- 惠享生活 -->
-			<view class="width90 mart20 alijusstart" v-if="item.type == 5">
-				<view class="width70 font18 fcor333">
-					惠享生活
+				<image class="width90 mart10" mode="widthFix" style="min-height: 123px;border-radius: 15rpx;" v-if="item.type == 4"
+					:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
+				</image>
+				<!-- 惠享生活 -->
+				<view class="width90 mart20 alijusstart" v-if="item.type == 5">
+					<view class="width70 font18 fcor333">
+						惠享生活
+					</view>
+				</view>
+				<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
+					:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
+				</image>
+				<view class="width90 alijusstart mart10" v-if="item.type == 5">
+					<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" style="min-height: 100px;" class="width31"
+						@click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
+					<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" style="min-height: 100px;" class="width31"
+						@click="goGoodsList(item.childCategory[2].jumpUrl)"></image>
+					<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" style="min-height: 100px;" class="width31"
+						@click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
 				</view>
 			</view>
-			<image class="width90 mart10" mode="widthFix" v-if="item.type == 5"
-				:src="imageUrl+item.childCategory[0].imgData" @click="goGoodsList(item.childCategory[0].jumpUrl)">
-			</image>
-			<view class="width90 alijusstart mart10" v-if="item.type == 5">
-				<image :src="imageUrl+item.childCategory[1].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[1].jumpUrl)"></image>
-				<image :src="imageUrl+item.childCategory[2].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[2].jumpUrl)"></image>
-				<image :src="imageUrl+item.childCategory[3].imgData" mode="widthFix" class="width31"
-					@click="goGoodsList(item.childCategory[3].jumpUrl)"></image>
-			</view>
+			<!-- 弹窗 -->
+			<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
+				<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
+			</wybPopup>
+			<view class="height40"></view>
+
 		</view>
-		<!-- 弹窗 -->
-		<wybPopup ref="popup" type="center" height="850" width="600" bgColor="" radius="6" :showCloseIcon="true">
-			<image class="popImg" :src="imageUrl+imgadres3" @click="jumpWeb"></image>
-		</wybPopup>
-		<view class="height40"></view>
 	</view>
 </template>
 
@@ -188,11 +204,11 @@
 		},
 		data() {
 			return {
-				showHeader: true,
+				// showHeader: true,
 				isShowAuth: false,
-				afterHeaderOpacity: 1, //不透明度
-				headerPosition: 'fixed',
-				headerTop: null,
+
+
+
 				statusTop: null,
 				nVueTitle: null,
 				city: '',
@@ -215,7 +231,16 @@
 				//切换状态
 				jumpType: '',
 				locationRef: null, // 用于接收定位对象
-				isdisplay: true //是否展示
+				isdisplay: true, //是否展示
+
+				StatusBar: this.StatusBar + 'px',
+				Custom: this.Custom,
+				width: '100%',
+				CustomBar: this.CustomBar,
+				bgColor: '#3da7e7',
+				// dhTop:Number(this.StatusBar+this.CustomBar)+'px' 
+
+
 			};
 		},
 
@@ -228,6 +253,16 @@
 				}
 			}
 		},
+		onPageScroll(obj) {
+			// console.log(obj,"obj")
+			if (obj.scrollTop >= this.CustomBar) {
+				this.width = this.Custom.left + 'px';
+				this.bgColor = "#089bf5";
+			} else {
+				this.width = "100%";
+				this.bgColor = "#3da7e7";
+			}
+		},
 		onLoad(options) {
 			let that = this;
 			// #ifdef MP
@@ -247,63 +282,10 @@
 					})
 				},
 			})
-			//定位
-			that.postionIng();
 			// #endif
-			// #ifdef H5
+			//定位
 			that.postionIng();
-			// if (app.globalData.h5code) {
-			// 	that.getH5AccessToken();
-			// }
-			// uni.showLoading({
-			// 	title: '加载中'
-			// })
-			// var geolocation = new qq.maps.Geolocation('7UMBZ-HFEHX-HSD4Q-Z3QY6-OQKN7-2QBDB', "嗨森逛");
-			// 回调的第一次参数为成功后具体的位置信息
-			// geolocation.getLocation(
-			// 	res => {
-			// 		uni.hideLoading();
-			// 		app.globalData.latitude = res.lat;
-			// 		app.globalData.longitude = res.lng;
-
-			// 		uni.setStorage({
-			// 			key: "latitude",
-			// 			data: res.lat
-			// 		})
 
-			// 		uni.setStorage({
-			// 			key: "longitude",
-			// 			data: res.lng
-			// 		})
-			// 		that.findByLatAndLng(res.lng, res.lat);
-			// 	},
-			// 	err => {
-			// 		uni.hideLoading();
-			// 		uni.showModal({
-			// 			title: '获取定位权限失败,默认城市重庆市',
-			// 			content: '请确定手机定位已打开，并且当前浏览器允许获取定位，都开启后请刷新页面。'
-			// 		})
-			// 		that.city = '重庆市';
-			// 		app.globalData.cityName = '重庆市';
-			// 		app.globalData.cityId = '500000';
-			// 		that.getCmsContentcmsContent();
-			// 		that.getCmsAactibity();
-			// 	}
-			// );
-			// #endif
-			uni.getStorage({
-				key: "user",
-				success(e) {
-					app.globalData.userInfo = e.data //这就是你想要取的token
-					uni.getStorage({
-						key: 'token',
-						success(e) {
-							app.globalData.token = e.data;
-						}
-					})
-				},
-				fail: res => {}
-			})
 			if (JSON.stringify(options.id)) {
 				app.globalData.identificationCode = options.id;
 				return;
@@ -318,10 +300,10 @@
 
 		},
 		methods: {
-			jumpcdx() {
-				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
-			},
+			// jumpcdx() {
+			// 	location.href =
+			// 		'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsg.dctpay.com%2FhsgH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect';
+			// },
 			//获取首页功能
 			getCmsContentcmsContent() {
 				let code;
@@ -432,20 +414,20 @@
 				})
 			},
 			// 获取精准定位
-			getLocation() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				let that = this;
-				that.locationRef.getLocation() // 调用 getLocation 方法获取精准定位
-					.then(res => {
-						uni.hideLoading();
-						// res 就是返回的数据
-						app.globalData.latitude = res.lat;
-						app.globalData.longitude = res.lng;
-						that.findByLatAndLng(res.lng, res.lat);
-					})
-			},
+			// getLocation() {
+			// 	uni.showLoading({
+			// 		title: '加载中'
+			// 	})
+			// 	let that = this;
+			// 	that.locationRef.getLocation() // 调用 getLocation 方法获取精准定位
+			// 		.then(res => {
+			// 			uni.hideLoading();
+			// 			// res 就是返回的数据
+			// 			app.globalData.latitude = res.lat;
+			// 			app.globalData.longitude = res.lng;
+			// 			that.findByLatAndLng(res.lng, res.lat);
+			// 		})
+			// },
 			//经纬度转换
 			findByLatAndLng(item, item1) {
 				let that = this;
@@ -587,22 +569,22 @@
 				});
 			},
 			//H5 获取openId
-			getH5AccessToken() {
-				let params = {
-					code: app.globalData.h5code
-				}
-				getH5AccessToken(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.openid) {
-						app.globalData.openId = res.return_data.openid;
-						uni.setStorage({
-							key: "openId",
-							data: res.return_data.openid
-						})
-					} else {
-						this.jumpcdx();
-					}
-				});
-			},
+			// getH5AccessToken() {
+			// 	let params = {
+			// 		code: app.globalData.h5code
+			// 	}
+			// 	getH5AccessToken(params).then(res => {
+			// 		if (res.return_code == '000000' && res.return_data.openid) {
+			// 			app.globalData.openId = res.return_data.openid;
+			// 			uni.setStorage({
+			// 				key: "openId",
+			// 				data: res.return_data.openid
+			// 			})
+			// 		} else {
+			// 			this.jumpcdx();
+			// 		}
+			// 	});
+			// },
 			//搜索跳转
 			toSearch() {
 				uni.navigateTo({
@@ -639,65 +621,65 @@
 				})
 			},
 
-			eheckStu(item) {
-				this.cpStuats = item;
-			},
+			// eheckStu(item) {
+			// 	this.cpStuats = item;
+			// },
 			//获取登陆信息
-			getuserinfos() {
-				let that = this;
-				// 获取微信用户信息
-				uni.getUserProfile({
-					desc: '登录中...',
-					success: function(res) {
-						let params = {
-							openId: app.globalData.openId,
-							iv: res.iv,
-							encryptedData: res.encryptedData
-						}
-						getUserInfo(params).then(res => {
-							if (res.return_code == '000000') {
-								uni.hideLoading();
-								uni.showToast({
-									title: '获取信息成功',
-									icon: 'none',
-									duration: 2000
-								})
-								app.globalData.userInfo = res
-									.return_data
-									.object
-									.highUser;
-								app.globalData.token = res
-									.return_data.uniqueCode;
-								uni.setStorage({
-									key: "user",
-									data: res.return_data
-										.object
-										.highUser
-								})
-								uni.setStorage({
-									key: "token",
-									data: res.return_data
-										.uniqueCode
-								})
-							} else {
-								uni.hideLoading();
-								uni.showToast({
-									title: res.return_msg,
-									icon: 'none',
-									duration: 2000
-								})
-							}
-						});
-					},
-					fail: res => {
-						uni.hideLoading();
-						uni.showToast({
-							title: "微信登录授权失败",
-							icon: "none"
-						});
-					}
-				})
-			},
+			// getuserinfos() {
+			// 	let that = this;
+			// 	// 获取微信用户信息
+			// 	uni.getUserProfile({
+			// 		desc: '登录中...',
+			// 		success: function(res) {
+			// 			let params = {
+			// 				openId: app.globalData.openId,
+			// 				iv: res.iv,
+			// 				encryptedData: res.encryptedData
+			// 			}
+			// 			getUserInfo(params).then(res => {
+			// 				if (res.return_code == '000000') {
+			// 					uni.hideLoading();
+			// 					uni.showToast({
+			// 						title: '获取信息成功',
+			// 						icon: 'none',
+			// 						duration: 2000
+			// 					})
+			// 					app.globalData.userInfo = res
+			// 						.return_data
+			// 						.object
+			// 						.highUser;
+			// 					app.globalData.token = res
+			// 						.return_data.uniqueCode;
+			// 					uni.setStorage({
+			// 						key: "user",
+			// 						data: res.return_data
+			// 							.object
+			// 							.highUser
+			// 					})
+			// 					uni.setStorage({
+			// 						key: "token",
+			// 						data: res.return_data
+			// 							.uniqueCode
+			// 					})
+			// 				} else {
+			// 					uni.hideLoading();
+			// 					uni.showToast({
+			// 						title: res.return_msg,
+			// 						icon: 'none',
+			// 						duration: 2000
+			// 					})
+			// 				}
+			// 			});
+			// 		},
+			// 		fail: res => {
+			// 			uni.hideLoading();
+			// 			uni.showToast({
+			// 				title: "微信登录授权失败",
+			// 				icon: "none"
+			// 			});
+			// 		}
+			// 	})
+			// },
 			//跳转菜单
 			toCategory(item) {
 				uni.navigateTo({
@@ -778,7 +760,11 @@
 	button::after {
 		border: none
 	}
-
+	
+	.bgLinear{
+		background: linear-gradient(to bottom, #ffffff, #F5F5F5) no-repeat;
+	}
+	
 	.pullDown-effects {
 		position: fixed;
 		//top: calc(100upx - 36vw);
@@ -798,60 +784,63 @@
 
 	.status {
 		width: 100%;
-		height: 0;
 		position: fixed;
 		z-index: 10;
-		background-color: #fff;
+		transition: 0.2s all linear;
 		top: 0;
-		/*  #ifdef  APP-PLUS  */
-		height: var(--status-bar-height); //覆盖样式
-		/*  #endif  */
+
 	}
 
-	.header {
-		width: 92%;
-		padding: 0 4%;
-		height: 100upx;
+
+	.addr {
+		// width: 120upx;
+		height: inherit;
+		flex-shrink: 0;
 		display: flex;
+		// overflow: hidden;
+		// -webkit-line-clamp: 1;
+		// -webkit-box-orient: vertical;
+		// text-overflow: ellipsis;
 		align-items: center;
-		position: fixed;
+		font-size: 28upx;
+		color: #FFFFFF;
+
+		.icon {
+			height: 60upx;
+			margin-right: 5upx;
+			display: flex;
+			align-items: center;
+			font-size: 42upx;
+			color: #ffc50a;
+		}
+	}
+
+	.city-con {
 		background-color: #3da7e7;
-		top: 0;
-		z-index: 10;
+	}
 
-		/*  #ifdef  APP-PLUS  */
-		top: var(--status-bar-height);
-		/*  #endif  */
+	.header {
+		box-sizing: border-box;
+		z-index: 999;
+		transition: 0.2s all linear;
 
-		.addr {
-			width: 120upx;
-			height: 45rpx;
-			flex-shrink: 0;
+		.header-chid {
 			display: flex;
-			overflow: hidden;
-			display: -webkit-box;
-			-webkit-line-clamp: 1;
-			-webkit-box-orient: vertical;
-			text-overflow: ellipsis;
 			align-items: center;
-			font-size: 28upx;
-			color: #FFFFFF;
-
-			.icon {
-				height: 60upx;
-				margin-right: 5upx;
-				display: flex;
-				align-items: center;
-				font-size: 42upx;
-				color: #ffc50a;
-			}
+			height: 100%;
+			padding: 4px 10px 4px 10px;
+			box-sizing: border-box;
+			transition: 0.2s all linear;
 		}
 
+
+
 		.input-box {
+			box-sizing: border-box;
 			width: 100%;
-			height: 70rpx;
+			height: inherit;
 			background-color: #f5f5f5;
-			border-radius: 10rpx;
+			border-radius: 36rpx;
 			position: relative;
 			display: flex;
 			align-items: center;
@@ -860,7 +849,6 @@
 				display: flex;
 				align-items: center;
 				position: absolute;
-				top: 0;
 				right: 0;
 				width: 60upx;
 				height: 60upx;
@@ -900,14 +888,22 @@
 		border: none
 	}
 
+	.margb40upx{
+		margin-bottom:40upx;
+	}
+	.pdb40upx{
+		padding-bottom: 40upx;
+	}
 	.category-list {
 		width: 100%;
 		display: flex;
 		justify-content: flex-start;
 		flex-wrap: wrap;
-
+		
+		
 		.category {
 			margin-top: 40upx;
+			// margin-bottom:40upx;
 			display: flex;
 			flex-wrap: wrap;
 
diff --git a/qianzhu-KFC/buffet-order/buffet-order.vue b/qianzhu-KFC/buffet-order/buffet-order.vue
index 10229e8..b7bb36f 100644
--- a/qianzhu-KFC/buffet-order/buffet-order.vue
+++ b/qianzhu-KFC/buffet-order/buffet-order.vue
@@ -1,16 +1,16 @@
 <template>
 	<view>
-		<view class="width100 height120 headsbg backcorfff">
+		<view class="width100  headsbg backcorfff">
 			<view class="height20"></view>
 			<view class="width100 fotct font18 fcor666">自助餐厅,不支持外卖</view>
-			<image src="../static/imgs/buffstu.png" v-if="typeid == 1" mode="widthFix" class="width100"></image>
-			<image src="../static/imgs/buffstu1.png" v-if="typeid == 2" mode="widthFix" class="width100"></image>
+			<image src="../static/imgs/buffstu.png" v-if="typeid == 1" mode="widthFix" class="width100 height75 verc"></image>
+			<image src="../static/imgs/buffstu1.png" v-if="typeid == 2" mode="widthFix" class="width100 height90 verc"></image>
 		</view>
 
 		<view class="input-box mart20 width90" v-if="typeid == 1">
 			<view class="fcor333 font13 alijusstart" style="width: 120px;padding-left: 10px;" @click="jumpregin()">
 				{{cityName}}
-				<image src="../../static/img/downj.png" mode="widthFix" class="icon12 margle"></image>
+				<image src="../../static/img/downj.png" mode="widthFix" class="icon12 margle height10" ></image>
 			</view>
 			<input placeholder="请输入关键字搜索" v-model="storeName" @input="getKfcStoresList()"
 				placeholder-style="color:#c0c0c0;" />
@@ -27,8 +27,8 @@
 			</view>
 		</view> -->
 
-		<view class="width100 height40" v-if="typeid == 2"></view>
-		<view class="width100 height25" v-else></view>
+		<!-- <view class="width100 height40" v-if="typeid == 2"></view>
+		<view class="width100 height25" v-else></view> -->
 		<!-- <view class="mart20 width80 alijusstart fotct marb20" v-if="typeid == 2">
 			<view class="width50 fcor333 font16" :class="collection == 1?'color2f6f43':'fcor333'" @click="changestu(1)">
 				附近餐厅
@@ -55,12 +55,20 @@
 			</view>
 			<view class="width90 mart5 font12 fcor999">{{item.address}}</view>
 			<view class="width90 mart5 alijusstart paddbotm10">
-				<image class="icon15" src="../static/imgs/location.png" v-if="typeid == 1" mode="widthFix"></image>
-				<image class="icon15" src="../static/imgs/locabtn.png" v-if="typeid == 2" mode="widthFix"></image>
+				<image class="icon15 height15" src="../static/imgs/location.png" v-if="typeid == 1" mode="widthFix"></image>
+				<image class="icon15 height15" src="../static/imgs/locabtn.png" v-if="typeid == 2" mode="widthFix"></image>
 				<text class="margle font14 fcor666 " v-if="typeid == 2">{{(item.distance / 1000).toFixed(2)}}km</text>
 				<text class="margle font14 fcor666 " v-else>{{item.distance}}km</text>
 			</view>
 		</view>
+		
+		<view style="height:10px;"></view>
+		
+		<view class="width100 height40 font15 fcor999 fotct" v-if="dataList.length!=0&& dataList.length == kcfShopList.length">
+			没有更多了
+		</view>
+			
+		
 	</view>
 </template>
 
@@ -77,7 +85,13 @@
 				kcfShopList: [], //门店列表
 				typeid: app.globalData.distinguishid, //区分类型
 				cityName: '', //城市名称
-				storeName: '' //搜索名称
+				storeName: '' ,//搜索名称
+				dataList:[],
+				page:{
+					pageIndex:1,
+					pageSize:10,
+					
+				}
 			}
 		},
 		onLoad() {
@@ -85,6 +99,9 @@
 		},
 		onShow() {
 			this.cityName = app.globalData.qianzhuCityName;
+			
+			
+			
 			if (this.typeid == 2) {
 				this.getStarbucksStore();
 			}
@@ -92,6 +109,13 @@
 				this.getKfcStoresList();
 			}
 		},
+		onReachBottom(){
+			if(this.kcfShopList.length< this.dataList.length){
+				this.page.pageIndex++;
+				this.manualPaging();
+			}
+			
+		},
 		methods: {
 			//更换状态
 			changestu(item) {
@@ -127,15 +151,31 @@
 					lat: app.globalData.latitude,
 					lon: app.globalData.longitude
 				}
+				this.dataList = [];
+				this.kcfShopList = [];
+				this.page.pageIndex =1;
 				getStarbucksStore(datas).then(res => {
 					setTimeout(() => {
 						uni.hideLoading();
 					}, 1000);
 					if (res.return_code == '000000') {
-						this.kcfShopList = res.return_data;
+						// this.kcfShopList = res.return_data;
+						this.dataList = res.return_data;
+						this.manualPaging();
 					}
 				})
 			},
+			//手动分页
+			manualPaging(){
+				if (this.dataList.length > 0) {
+					let arr  = this.dataList.slice(
+				          (this.page.pageIndex - 1) * this.page.pageSize,
+				          this.page.pageIndex * this.page.pageSize
+						)
+					this.kcfShopList= this.kcfShopList.concat(arr);	
+						// console.log(this.kcfShopList,"this.kcfShopList")
+				}
+			},
 			//肯德基列表
 			getKfcStoresList() {
 				uni.showLoading({
@@ -147,12 +187,17 @@
 					lat: app.globalData.latitude,
 					lon: app.globalData.longitude
 				}
+				this.dataList = [];
+				this.kcfShopList = [];
+				this.page.pageIndex =1;
 				getKfcStoresList(datas).then(res => {
 					setTimeout(() => {
 						uni.hideLoading();
 					}, 1000);
 					if (res.return_code == '000000') {
-						this.kcfShopList = res.return_data;
+						// this.kcfShopList = res.return_data;
+						this.dataList = res.return_data;
+						this.manualPaging();
 					}
 				})
 			}
@@ -165,8 +210,12 @@
 		background-color: #f0f0f0;
 	}
 
+	.height15{
+		height:15px;
+	}
+
 	.headsbg {
-		border-radius: 0 0 30px 30px;
+		// border-radius: 0 0 30px 30px;
 	}
 
 	.colorc8 {
diff --git a/qianzhu-KFC/confirmOrder/confirmOrder.vue b/qianzhu-KFC/confirmOrder/confirmOrder.vue
index cb060ac..3929dcd 100644
--- a/qianzhu-KFC/confirmOrder/confirmOrder.vue
+++ b/qianzhu-KFC/confirmOrder/confirmOrder.vue
@@ -138,14 +138,14 @@
 					{{rebateIntegral}}
 				</view> -->
 			</view>
-			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;">
+			<view class=" width100 backcorfff alijusstart paddbotm10" style="padding-left: 2%;box-sizing: border-box; ">
 				<image src="../../static/img/sigh.png" mode="widthFix" class="icon20"></image>
 				<text class="fcor999 font13">积分抵扣与优惠券抵扣不同享</text>
 			</view>
 
 			<view class="width94 line1 marb5"></view>
 			<view class="height50 width100">
-				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
+				<view class="width100 flleft fcor333 fontwig6 font16" style="padding-left: 4%;box-sizing:border-box;">
 					支付方式
 					<!-- : 
 					<text class="jfrecharge" style="background-color: #c72a20;" v-if="typeid == 1" @click="jumpdeposits">积分充值</text>
@@ -185,7 +185,7 @@
 			<view class="width94 font12 fcor999 mart5 paddbotm10">经用于接收取餐码,请正确填写</view>
 		</view>
 
-		<view class="concont width94 mart20 backcorfff marb150" v-if="typeid == 1">
+		<view class="concont width94 mart20 backcorfff " v-if="typeid == 1">
 			<view class="width94 paddtop10 font14 fcor333 fontwig6">
 				就餐方式
 			</view>
@@ -202,7 +202,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="concont width94 mart20 backcorfff marb150 font13" v-if="typeid == 2">
+		<view class="concont width94 mart20 backcorfff  font13" v-if="typeid == 2">
 			<view class="width94 alijusstart paddtop10 font14" @click="radioChange()">
 				<view class="width50 fcor333">购买须知</view>
 				<!-- <view ></view> -->
@@ -227,7 +227,8 @@
 			</view>
 		</view>
 
-
+		
+		<view class="height60"></view>
 		<view class="footbtn width100 height50 backcor33">
 			<view class="width94 alijusstart">
 				<view class="width70 fcorfff">
diff --git a/qianzhu-KFC/home/home.vue b/qianzhu-KFC/home/home.vue
index 3c4fd50..0afbeff 100644
--- a/qianzhu-KFC/home/home.vue
+++ b/qianzhu-KFC/home/home.vue
@@ -5,7 +5,7 @@
 			<view class="width48 backcorfff height280 fotct paddtop15">
 				<view class="fcor666 fontwig6 font20">平台特惠</view>
 				<view class="c62a1e font28 mart10 fontwig6">凭码取餐</view>
-				<image class="width80p mart20" mode="widthFix" src="../static/imgs/kfc1.png"></image>
+				<image class="width80p mart20 minh90" mode="widthFix" src="../static/imgs/kfc1.png"></image>
 				<view class="mart20 width80 height30 border-15 fcorfff backcorf062 font13" @click="jumpbuffert()">
 					立即点餐
 				</view>
@@ -56,9 +56,14 @@
 	page {
 		background-color: #f0f0f0;
 	}
-
+	
+	.minh90{
+		height: 90px;
+	}
+	
 	.imgs {
 		position: absolute;
+		min-height: 350px;
 	}
 
 	.width48 {
diff --git a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
index 95bb044..41590fd 100644
--- a/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
+++ b/qianzhu-KFC/kfc-menu-list/kfc-menu-list.vue
@@ -15,7 +15,7 @@
 			<view v-for="(item,index)  in flist" :key="index" class="f-item" :class="{active: item.name == currentId}"
 				@click="tabtap(item)">
 				<view class="width100 fotct">
-					<image :src="item.imageUrl" mode="widthFix" class="icon45"></image>
+					<image :src="item.imageUrl" mode="widthFix" class="icon45 height45" ></image>
 				</view>
 				<view class="width100 fotct" style="margin-top: -30px;">
 					{{item.name}}
@@ -89,7 +89,7 @@
 
 
 		<!-- 弹窗选择规格 -->
-		<wybPopup ref="popup" type="bottom" width="500" height="700" scrollY="true" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup" type="bottom" width="500" height="600" :scrollY="true" radius="6" :showCloseIcon="true">
 			<image mode="widthFix" class="width40w mart40" :src="kfcimgs"></image>
 			<view class="width100 line1 mart10"></view>
 			<view class="mart20 width90 font18 fontwig6 fcor333">{{kfcname}}</view>
@@ -101,7 +101,7 @@
 					{{item.productName}}
 				</view>
 			</view>
-			<view class="height150"></view>
+			<view class="height120"></view>
 			<view class="wybfot width100">
 				<view class="height50 pricefot alijusstart backcorfff">
 					<view class="width60 margle10">
@@ -602,8 +602,8 @@
 	}
 
 	.qzgoodsimg {
-		margin-top: -10px;
-		min-height: 100px;
+		// margin-top: -10px;
+		height: 100px;
 		width: 120px;
 	}
 
diff --git a/qianzhu-KFC/menu-list/menu-list.vue b/qianzhu-KFC/menu-list/menu-list.vue
index abb683d..187b497 100644
--- a/qianzhu-KFC/menu-list/menu-list.vue
+++ b/qianzhu-KFC/menu-list/menu-list.vue
@@ -15,9 +15,9 @@
 			<view v-for="item in flist" :key="item.id" class="f-item" :class="{active: item.id === currentId}"
 				@click="tabtap(item)">
 				<view class="width100 fotct">
-					<image :src="item.ext2" mode="widthFix" class="icon45"></image>
+					<image :src="item.ext2" mode="widthFix" class="icon45 height45" ></image>
 				</view>
-				<view class="width100 fotct" style="margin-top: -30px;">
+				<view class="width100 fotct" style="">
 					{{item.name}}
 				</view>
 			</view>
@@ -83,7 +83,7 @@
 
 
 		<!-- 弹窗选择规格 -->
-		<wybPopup ref="popup" type="bottom" width="500" height="700" :scrollY="true" radius="6" :showCloseIcon="true">
+		<wybPopup ref="popup" type="bottom" width="500" height="600" :scrollY="true" radius="6" :showCloseIcon="true">
 			<image mode="widthFix" class="width40w mart40" :src="cbkchangelist.defaultImage"></image>
 			<view class="width100 line1"></view>
 			<view class="mart20 width90 font18 fontwig6 fcor333">{{cbkchangelist.name}}</view>
@@ -545,7 +545,9 @@
 
 
 	.f-item {
-		display: grid;
+		// display: grid;
+		display: flex;
+		flex-direction: column;
 		align-items: center;
 		justify-content: center;
 		width: 100%;
@@ -602,9 +604,9 @@
 	}
 
 	.qzgoodsimg {
-		margin-top: -10px;
+		// margin-top: -10px;
 		width: 120px;
-		min-height: 100px;
+		height: 100px;
 	}
 
 	.icon-click {
diff --git a/qianzhu-Starbucks/home/home.vue b/qianzhu-Starbucks/home/home.vue
index 97e1b03..d5caa36 100644
--- a/qianzhu-Starbucks/home/home.vue
+++ b/qianzhu-Starbucks/home/home.vue
@@ -5,7 +5,7 @@
 			<view class="width48 backcorfff height280 fotct paddtop15">
 				<view class="fcor333 fontwig6  font20">星专享</view>
 				<view class="color2f6f43 font28 mart10 fontwig6">凭码取餐</view>
-				<image class="width80p mart20" mode="widthFix" src="../static/imgs/sk1.png"></image>
+				<image class="width80p mart20 minh100" mode="widthFix" src="../static/imgs/sk1.png"></image>
 				<view class="mart20 width80 height30 border-15 fcorfff backcorf2f6 font13" @click="jumpbuffert()">
 					立即点餐
 				</view>
@@ -48,9 +48,14 @@
 	page {
 		background-color: #f0f0f0;
 	}
-
+	
+	.minh100{
+		height: 100px;
+	}
+	
 	.imgs {
 		position: absolute;
+		min-height: 350px;
 	}
 
 	.width48 {
diff --git a/uni.scss b/uni.scss
index 1a6b300..e97107f 100644
--- a/uni.scss
+++ b/uni.scss
@@ -982,7 +982,9 @@ $uni-font-size-paragraph:30upx;
 .flex-1{
 	flex: 1;
 }
-
+.flex-s0{
+	flex-shrink: 0;
+}
 // 底部框
 .border-b{
 	border-bottom: 1px solid #f6f6f6;