Merge branch 'h5dev' into dev

pages/goods/goods-list/goods-list.vue

@@ -20,7 +20,7 @@
 		</view>
 
 		<view class="width90 mart20 marb20 alijus">
-			<view class="font14 fcor333 paddtop5 paddbotm5  margle20  marRight20" v-for="(item,index) in cateTypeList" @click="switchid(item)"
+			<view class="font16 fcor333 paddtop5 paddbotm5  margle20  marRight20" v-for="(item,index) in cateTypeList" @click="switchid(item)"
 				:class="[goodtyid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index">{{item.title}}</view>
 		</view>
 		<view v-if="goodsList == '' " class="mart60 fotct font14 fcor666">

pages/goods/refuel-details/refuel-details.vue

@@ -23,15 +23,15 @@
 					{{oilNo}}
 					<image mode="widthFix" :src="imagewxUrl+imgadres2"></image>
 				</view>
-				<view class="margle20 font15 fcoreb5 flleft mart20  borRit">
+				<view class="margle10 font15 fcoreb5 flleft mart20  borRit">
 					<view class="fontspec fotct ">平台价</view>
 					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceVip}}</view>
 				</view>
-				<view class="margle20 font15 fcor666 flleft mart20  borRit">
+				<view class="margle10 font15 fcor666 flleft mart20  borRit">
 					<view class="fontspec fotct ">油站价</view>
 					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceGun}}</view>
 				</view>
-				<view class="margle20 font15 fcor666 flleft mart20 ">
+				<view class="margle10 font15 fcor666 flleft mart20 ">
 					<view class="fontspec fotct ">国标价</view>
 					<view class="fontwig6 font20"><text class="font14">￥</text>{{priceOfficial}}</view>
 				</view>
@@ -74,13 +74,13 @@
 		</view>
 		<!-- 详情描述-->
 		<view class="line10 mart15"></view>
-		<view class="width90 height40 mart10">
+	<!-- 	<view class="width90 height40 mart10">
 			<view class="flleft width50 font15 fcor666">加油升数:<text class="fcoreb5 margle">
 					{{oilLiters}}L</text></view>
 			<view class="flright width50 font15 fcor666">油站直降:<text class="fcoreb5 margle">
 					¥{{pricePreferences}}</text>
 			</view>
-		</view>
+		</view> -->
 		<view class="width90 height40">
 			<view class="flleft width50 font15 fcor666">平台补贴:
 				<text class="fcoreb5 margle">¥{{oilSubsidy}}</text>

pages/order/confirmation.vue

@@ -244,7 +244,6 @@
 			let that = this;
 			that.paytype = '';
 			that.user = app.globalData.userInfo;
-			that.getUserNormalDiscountList();
 			that.findUser();
 		},
 		onHide() {
@@ -283,6 +282,7 @@
 						app.globalData.userInfo = res.return_data;
 						this.user = res.return_data;
 						this.getHuiLianTongCardBalance();
+						this.getUserNormalDiscountList();
 						uni.setStorage({
 							key: "user",
 							data: res.return_data

qianzhu-KFC/home/home.vue

@@ -19,10 +19,10 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="foots fotct marb20">
+		<!-- <view class="foots fotct marb20">
 			<view class="width90 mart30 colorbe font12"> 本产品为第三方代点餐/代配送服务！</view>
 			<view class="width90 mart5 colorbe font12"> 即第三方代点餐，一切商业行为与肯德基无关。</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 

qianzhu-Starbucks/home/home.vue

@@ -4,17 +4,17 @@
 		<view class="width94 heads alijusstart">
 			<view class="width48 backcorfff height280 fotct paddtop15">
 				<view class="fcor333 fontwig6  font20">星专享</view>
-				<view class="color2f6f43 font16 mart10">低至8折</view>
+				<view class="color2f6f43 font16 mart10">低至9折</view>
 				<image class="width80p mart20" mode="widthFix" src="../static/imgs/sk1.png"></image>
 				<view class="mart20 width80 height30 border-15 fcorfff backcorf2f6 font13" @click="jumpbuffert()">
 					立即点餐(堂食/外带)
 				</view>
 			</view>
 		</view>
-		<view class="foots fotct marb20">
+		<!-- <view class="foots fotct marb20">
 			<view class="width90 mart30 colorbe font12"> 本产品为第三方代点餐/代配送服务！</view>
 			<view class="width90 mart5 colorbe font12"> 即第三方代点餐，一切商业行为与星巴克无关。</view>
-		</view>
+		</view> -->
 	</view>
 </template>
 

subPages/preferred-goods/preferred-goods.vue

@@ -58,6 +58,7 @@
 				let params = {
 					pageNum: pagenum,
 					pageSize: this.pageSize,
+					userService:'优选商品'
 				}
 				getListGoodsType(params).then(res => {
 					uni.hideLoading();