1.修改样式

App.vue

@@ -5,15 +5,15 @@
 			// brestUrl: 'http://192.168.3.4:9302/brest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://hsg.dctpay.com/crest',
-			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			// brestUrl : 'https://hsg.dctpay.com/brest',
-			// imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
+			url: 'https://hsg.dctpay.com/crest',
+			imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			brestUrl : 'https://hsg.dctpay.com/brest',
+			imageWxImg:'https://hsg.dctpay.com/filesystem/wxApplets/',
 			//测试
-			url: 'https://hsgcs.dctpay.com/crest',
-			brestUrl : 'https://hsgcs.dctpay.com/brest',
-			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
-			imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
+			// url: 'https://hsgcs.dctpay.com/crest',
+			// brestUrl : 'https://hsgcs.dctpay.com/brest',
+			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// imageWxImg:'https://hsgcs.dctpay.com/filesystem/wxApplets/',
 			userInfo: "",
 			brestUserInfo : '',
 			openId: '',

pages/goods/refuel-confirm/refuel-confirm.vue

@@ -224,7 +224,7 @@
 		position: fixed;
 		bottom: 0upx;
 		width: 100%;
-		height: 99upx;
+		height: 100rpx;
 		color: #FFFFFF;
 		border-top: solid 1upx #eee;
 		background-color: #FFFFFF;
@@ -234,15 +234,17 @@
 		align-items: center;
 	
 		.reBtn {
-			width: 110px;
+			width: 120px;
 			background-color: #089bf5;
 			color: #FFFFFF;
 			text-align: center;
 			padding: 0;
 			font-size: 16px;
-			border-radius: 22px;
-			height: 40px;
-			line-height: 40px;
+			border-radius: 0px;
+			height: 50px;
+			line-height: 50px;
+			position: absolute;
+			right: 0px;
 		}
 	}
 </style>

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

@@ -82,7 +82,8 @@
 		<!-- 底部按钮 -->
 		<view class="footer">
 			<view class="flleft padleft15 font15 fcoreb5">
-				合计: ￥<text class="font24">{{totalPrice}}</text><text class="font12 fcor666">优惠:￥{{discountPrice}}</text>
+				合计: ￥<text class="font24">{{totalPrice}}</text><text
+					class="font12 fcor666" v-if="priceVip != priceOfficial">优惠约:￥{{discountPrice}}</text>
 			</view>
 
 			<!-- #ifdef MP -->
@@ -116,6 +117,7 @@
 				</view>
 			</view>
 		</wybPopup>
+		<view class="height30"></view>
 	</view>
 </template>
 
@@ -270,7 +272,7 @@
 				this.inputMoney = amount.price;
 				this.litre = parseFloat(amount.price / this.priceGun).toFixed(2);
 				this.totalPrice = parseFloat(amount.price / this.priceGun * this.priceVip).toFixed(2);
-					if(this.priceVip != this.priceGun){
+				if (this.priceVip != this.priceGun) {
 					let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
 					this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
 				}
@@ -306,11 +308,11 @@
 			},
 			//失去焦点算价格和油升
 			Listeningfocus() {
-				this.litre = parseFloat(this.inputMoney / this.priceGun).toFixed(2);
-				this.totalPrice = parseFloat(this.inputMoney / this.priceGun * this.priceVip).toFixed(2);
-				if (this.priceVip != this.priceGun) {
+				this.litre = parseFloat(this.inputMoney / this.priceOfficial).toFixed(2);
+				this.totalPrice = parseFloat(this.inputMoney / this.priceOfficial * this.priceVip).toFixed(2);
+				if (this.priceVip != this.priceOfficial) {
 					let gbprice = parseFloat(this.litre * this.priceOfficial).toFixed(2);
-					this.discountPrice = parseFloat(gbprice - this.inputMoney).toFixed(2);
+					this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
 				}
 			},
 			toPay() {
@@ -332,7 +334,9 @@
 						"goodsPrice": this.inputMoney,
 						"gasGunNo": this.gunNo,
 						"gasOilNo": this.gasOilNo,
-						"gasOilType": this.oilType
+						"gasOilType": this.oilType,
+						"gasPriceGun": this.priceOfficial,
+						"gasPriceVip": this.priceVip
 					}]
 				}
 				addOrder(goods).then(res => {
@@ -472,7 +476,7 @@
 		position: fixed;
 		bottom: 0upx;
 		width: 100%;
-		height: 99upx;
+		height: 100rpx;
 		color: #FFFFFF;
 		border-top: solid 1upx #eee;
 		background-color: #FFFFFF;
@@ -482,15 +486,17 @@
 		align-items: center;
 
 		.reBtn {
-			width: 90px;
+			width: 120px;
 			background-color: #089bf5;
 			color: #FFFFFF;
 			text-align: center;
 			padding: 0;
 			font-size: 16px;
-			border-radius: 22px;
-			height: 40px;
-			line-height: 40px;
+			border-radius: 0px;
+			height: 50px;
+			line-height: 50px;
+			position: absolute;
+			right: 0px;
 		}
 	}
 </style>