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

@@ -36,7 +36,7 @@
 		<view class="mart10 heightl60 paddleft10 fcor333 fontwig6 font18 width100 backcorfff">支付方式</view>
 		<view class="line1"></view>
 		<view class="width100 backcorfff">
-			<view class="height50 width100 backcorfff" @tap="paytype='jifen'">
+			<!-- <view class="height50 width100 backcorfff" @tap="paytype='jifen'">
 				<view class="width50 flleft fcor333 fontwig6 font16" style="padding-left: 4%;">
 					积分支付
 				</view>
@@ -45,9 +45,19 @@
 					<radio :checked="paytype=='jifen'" color="#0083f5" />
 				</view>
 			</view>
-			<view class="width94 line1 mart5 marb5"></view>
+			<view class="width94 line1 mart5 marb5"></view> -->
 
-			<!-- <view class="line1"></view>
+			<view class="line1"></view>
+			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='jifen'">
+				<view class="width60 flleft fontwig6">
+					积分支付
+				</view>
+				<view class="flright width30 fotct">
+					<radio :checked="paytype=='jifen'" color="#0083f5" />
+				</view>
+			</view>
+
+			<view class="line1"></view>
 			<view class="heightl60 paddleft10 fcor666 width100 backcorfff" @tap="paytype='weixin'">
 				<view class="width60 flleft fontwig6">
 					微信支付
@@ -65,7 +75,7 @@
 				<view class="flright width30 fotct">
 					<radio :checked="paytype=='gonghuika'" @click="changeRiado()" color="#0083f5" />
 				</view>
-			</view> -->
+			</view>
 		</view>
 
 		<view class="width100 mart15 fcor333 font16 fontwig6 paddleft10">重要说明</view>

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

@@ -284,12 +284,20 @@
 			},
 			//失去焦点算价格和油升
 			Listeningfocus() {
+				//原来计算方式
 				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.totalPrice).toFixed(0);
-				}
+					this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(1);
+				}
+				//目前计算方式
+				// 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) {
+				// 	let gbprice = parseFloat(this.litre * this.priceGun).toFixed(2);
+				// 	this.discountPrice = parseFloat(gbprice - this.totalPrice).toFixed(0);
+				// }
 			},
 			//跳转手机授权
 			jumpPhone(){

pages/order/confirmation.vue

@@ -228,7 +228,8 @@
 				tongCardPrice: 0,
 				storeId: '',
 				isDiscont: false,
-				coupondiscountid: ''
+				coupondiscountid: '',
+				orderDetails:'' //订单详情
 
 			};
 		},
@@ -415,6 +416,10 @@
 					})
 					return;
 				}
+				if(this.orderDetails){
+					this.orderToPay(this.orderDetails);
+					return;
+				}
 				uni.showLoading({
 					title: '提交订单中...'
 				})
@@ -442,6 +447,7 @@
 						// })
 						this.jumpType = res.return_data.highChildOrderList[0].ext1;
 						this.orderId = res.return_data.id;
+						this.orderDetails = res.return_data;
 						this.orderToPay(res.return_data);
 					} else {
 						uni.hideLoading();

pages/user/order_details/order_details.vue

@@ -106,7 +106,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.totalPrice*100}}
+					</image>{{recinfo.totalPrice * 10 * 10}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.payPrice">
@@ -119,7 +119,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payPrice*100}}
+					</image>{{recinfo.payPrice* 10 * 10}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.payRealPrice">
@@ -132,7 +132,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.payRealPrice*100}}
+					</image>{{recinfo.payRealPrice * 10 * 10}}
 				</view>
 			</view>
 			<view class="row" v-if="recinfo.deductionPrice">
@@ -145,7 +145,7 @@
 				<view class="right" v-else>
 					<image style="width: 15px;height: 15px;vertical-align: sub;"
 						src="../../../static/img/jfx.png">
-					</image>{{recinfo.deductionPrice*100}}
+					</image>{{recinfo.deductionPrice * 10 * 10}}
 				</view>
 			</view>
 			<view class="row">

pages/user/order_list/order_list.vue

@@ -71,7 +71,7 @@
 							<view class="font16 fontwig6 text1 fcor333 aliitem" style="justify-content: flex-end;"
 								v-else>
 								<image style="width: 15px;height: 15px;" src="../../../static/img/jfx.png">
-								</image>{{row.payPrice*100}}
+								</image>{{row.payPrice * 10 * 10}}
 							</view>
 							<view class="fotrt font15 text1 fcor999 mart5">{{typeText[row.orderStatus]}}</view>
 						</view>