Merge remote-tracking branch 'origin/master'

pos-uni/pagesHome/Collection/Collection.vue

@@ -228,8 +228,8 @@
 		},
 		methods: {
 			// 确定备注
-			submitRemark(){
-				this.show = false 
+			submitRemark() {
+				this.show = false
 				this.oilOrder.remark = this.value1
 			},
 			close() {
@@ -376,7 +376,8 @@
 								// 	icon: "success"
 								// })
 								uni.navigateTo({
-									url: "/pagesHome/PaymentResults/PaymentResults"
+									url: "/pagesHome/PaymentResults/PaymentResults?orderNo=" +
+										resp.data.orderNo
 								})
 							} else {
 								uni.showToast({
@@ -451,11 +452,11 @@
 				this.oilOrder.oilPrice = this.oilPrice
 				this.oilOrder.oilCardAmount1 = this.oilCardAmount
 				this.oilOrder.oilGunNum = this.oilGunNum
-				if (this.userInfo){
+				if (this.userInfo) {
 					this.oilOrder.userId = this.userInfo.id
 					this.oilOrder.payUser = this.userInfo.mobile
 				}
-				
+
 				request({
 					url: "business/oilOrder/addOrderPos",
 					method: 'post',
@@ -470,7 +471,7 @@
 						// })
 
 						uni.navigateTo({
-							url: "/pagesHome/PaymentResults/PaymentResults?orderNo="+this.orderNo
+							url: "/pagesHome/PaymentResults/PaymentResults?orderNo=" + this.orderNo
 						})
 					} else if (res.data.code == 2) {
 						uni.showToast({

pos-uni/pagesHome/MemberRecharge/MemberRecharge.vue

@@ -280,7 +280,8 @@
 					data: this.order
 				}).then((res) => {
 					uni.navigateTo({
-						url: '/pagesHome/PaymentResults/PaymentResults?type=1&orderNo=' + res.data.orderNo
+						url: '/pagesHome/PaymentResults/PaymentResults?type=1&orderNo=' + res.data
+							.paymentNo
 					})
 				})
 

pos-uni/pagesHome/PaymentResults/PaymentResults.vue

@@ -37,7 +37,7 @@
 		</view>
 		<view class="container" v-if="balanceOrder">
 			<headers :titles="titles"><u-icon name="arrow-left" color="#fff" size="22"></u-icon></headers>
-			<view class="top_">
+			<!-- <view class="top_">
 				<image src="../../static/imgs/zfcg.png" mode=""></image>
 			</view>
 			<view class="title_">支付成功</view>
@@ -45,7 +45,7 @@
 				<image src="../../static/imgs/zfsb.png" mode=""></image>
 			</view>
 			<view class="title_" v-if="oilOrder.orderStatus!='paid'">支付失败</view> -->
-			<view class="b-bs">
+			<!-- <view class="b-bs">
 				<view class="h-size">应收金额</view>
 				<view class="red-size">￥{{balanceOrder.orderAmount}}</view>
 			</view>
@@ -68,7 +68,7 @@
 				<view class="h-size" v-if="balanceOrder.payType=='UNIONPAY'">银联二维码支付</view>
 				<view class="h-size" v-if="balanceOrder.payType=='CASH'">现金支付</view>
 				<view class="h-size" v-if="balanceOrder.payType=='APPLET_CODE'">小程序码支付</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="p-bottom">
 			<view class="anniu" @click="goback()">