From beed5488b4ad7f53384590b9fded31be5ea3a67c Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Wed, 28 Jul 2021 22:34:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/qianZhuPay/qianZhuPay.vue            |  4 ++--
 pages/tabBar/home/home.vue                 |  4 ++--
 pages/tabBar/order/webUrl/webUrl.vue       |  9 +++++++--
 pages/user/order_details/order_details.vue | 13 ++++++++-----
 pages/user/order_list/order_list.vue       |  2 +-
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pages/qianZhuPay/qianZhuPay.vue b/pages/qianZhuPay/qianZhuPay.vue
index c1109f7..544b80c 100644
--- a/pages/qianZhuPay/qianZhuPay.vue
+++ b/pages/qianZhuPay/qianZhuPay.vue
@@ -56,7 +56,7 @@
 								})
 								uni.redirectTo({
 									url: '../tabBar/order/webUrl/webUrl?url=' + that
-										.orderInfoUrl+'&orderid='+that.orderNo
+										.orderInfoUrl+'&orderid='+that.orderNo+'&sour='+that.source
 								})
 							},
 							fail: function(err) {
@@ -64,7 +64,7 @@
 								uni.hideLoading();
 								uni.redirectTo({
 									url: '../tabBar/order/webUrl/webUrl?url=' + that
-										.orderInfoUrl+'&orderid='+that.orderNo
+										.orderInfoUrl+'&orderid='+that.orderNo+'&sour='+that.source
 								})
 							},
 						});
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 5764566..3d81c2a 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -264,7 +264,7 @@
 				// 分类菜单
 				categoryList: [{
 						id: 1,
-						name: '团油',
+						name: '在线加油',
 						img: 'user/home1.png',
 						src: '/pages/goods/refuel/refuel'
 					},
@@ -717,7 +717,7 @@
 			},
 			//跳转菜单
 			toCategory(item) {
-				if (item.name == '团油') {
+				if (item.name == '在线加油') {
 					uni.navigateTo({
 						url: item.src
 					})
diff --git a/pages/tabBar/order/webUrl/webUrl.vue b/pages/tabBar/order/webUrl/webUrl.vue
index 5c5069e..98a4d51 100644
--- a/pages/tabBar/order/webUrl/webUrl.vue
+++ b/pages/tabBar/order/webUrl/webUrl.vue
@@ -12,15 +12,20 @@
 		data() {
 			return {
 				url: '',
-				orderNo:''
+				orderNo:'',
+				sourType:''
 			}
 		},
 		onLoad(options) {
 			this.url = decodeURIComponent(options.url);
 			this.orderNo= options.orderid; 
+			this.sourType = options.sour;
+			// console.log('========'+options.sour);
 		},
 		onUnload() {
-			this.cancelOrderByOrderNo();
+			// if(this.sourType != 'MOBILE'){
+			// 	this.cancelOrderByOrderNo();
+			// }
 		},
 		methods: {
 		//取消订单
diff --git a/pages/user/order_details/order_details.vue b/pages/user/order_details/order_details.vue
index c1a6bb2..a1bd4b6 100644
--- a/pages/user/order_details/order_details.vue
+++ b/pages/user/order_details/order_details.vue
@@ -14,8 +14,9 @@
 			<view class="row">
 				<view class="goods-info">
 					<view class="img">
-						<image :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1 "></image>
-						<image :src="rec.goodsImg" v-else></image>
+						<image :src="imageUrl+rec.goodsImg" v-if="rec.goodsType == 1"></image>
+						<image :src="imagewxUrl+imgadres1" v-if="rec.goodsType == 6"></image>
+						<image :src="rec.goodsImg" v-if="rec.goodsType != 1 && rec.goodsType != 6"></image>
 					</view>
 					<view class="info">
 						<view class="title">{{rec.goodsName}}</view>
@@ -210,7 +211,7 @@
 			</view>
 		</view> -->
 		<view class="width100 height60"></view>
-		<view class="footer" v-if="recinfo.orderStatus == 1">
+		<view class="footer" v-if="recinfo.orderStatus == 1 && recinfo.highChildOrderList[0].goodsType !=6 && recinfo.highChildOrderList[0].goodsType !=5 && recinfo.highChildOrderList[0].goodsType !=4">
 			<view class="settlement">
 				<view class="sum">合计:
 					<view class="money" v-if="recinfo.payType != 3">￥{{recinfo.payPrice}}</view>
@@ -245,7 +246,9 @@
 				deduction: 0, //抵扣价格
 				recinfo: [],
 				orderId: '',
-				imageUrl: app.globalData.imgUrl
+				imageUrl: app.globalData.imgUrl,
+				imagewxUrl: app.globalData.imageWxImg,
+				imgadres1:'dhf.png',
 
 			};
 		},
@@ -309,7 +312,7 @@
 		},
 		methods: {
 			toGoods(e, item) {
-				if (item != 2 && item != 4 && item != 5 && item != 6) {
+				if (item != 2 && item != 3 && item != 4 && item != 5 && item != 6) {
 					uni.navigateTo({
 						url: '../../goods/goods?id=' + e
 					});
diff --git a/pages/user/order_list/order_list.vue b/pages/user/order_list/order_list.vue
index 81b5f28..6057457 100644
--- a/pages/user/order_list/order_list.vue
+++ b/pages/user/order_list/order_list.vue
@@ -54,7 +54,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="btns" v-if="row.orderStatus==1">
+					<view class="btns" v-if="(row.orderStatus==1 && row.highChildOrderList[0].goodsType !=6 && row.highChildOrderList[0].goodsType !=5 && row.highChildOrderList[0].goodsType !=4)">
 						<block>
 							<view class="default" @tap="cancelOrder(row.id)">取消订单</view>
 							<view class="pay" @tap="toPayment(row)">付款</view>