From 1ff439d6c029076e62d5255def00de5dafb9a7de Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 30 Mar 2024 11:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=B8=E9=94=80=E5=AE=8C=E6=88=90=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/cancellate_result/index.vue | 35 +++++++++++++------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pages/admin/cancellate_result/index.vue b/pages/admin/cancellate_result/index.vue
index 2192136..46993a4 100644
--- a/pages/admin/cancellate_result/index.vue
+++ b/pages/admin/cancellate_result/index.vue
@@ -6,7 +6,7 @@
 					<view class="order acea-row row-between">
 						<view class="order_sn">订单号：{{orderData.order_sn}}</view>
 						<view class="btn" @click="goBack">上一步</view>
-					</view>	
+					</view>
 					<view class='list'>
 						<view class="acea-row row-between header">
 							<view class="info">
@@ -23,7 +23,7 @@
 								<view v-else class="checkbox">
 									<text class="iconfont icon-weixuanzhong disabled"></text>
 								</view>
-								
+
 								<view class='pictrue'>
 									<image :src='goods.cart_info.product.image'></image>
 								</view>
@@ -39,7 +39,7 @@
 											<view class='num'>{{goods.refund_num}}</view>
 											<view class="plus" :class="(goods.max_count == goods.refund_num || goods.numAdd) ? 'on' : ''" @click.stop='addCart(goods)'>+</view>
 										</view>
-									</view>	
+									</view>
 								</view>
 							</view>
 						</view>
@@ -58,7 +58,7 @@
 					<form @submit="goCallate" report-submit='true'>
 						<button class='placeOrder' formType="submit">立即核销</button>
 					</form>
-				</view>	
+				</view>
 			</view>
 		</view>
 		<view v-else>
@@ -147,14 +147,15 @@
 							this.$set(item, "check", true);
 						})
 					}).catch(res => {
-						that.$util.Tips({
-							title: res
-						});
-						setTimeout(()=>{
-							uni.navigateTo({
-								url: '/pages/admin/orderList/index?types=4&merId='+that.mer_id
-							});
-						},500)
+						// that.$util.Tips({
+						// 	title: res
+						// });
+          uni.navigateBack();
+						// setTimeout(()=>{
+						// 	uni.navigateTo({
+						// 		url: '/pages/admin/order/index?mer_id='+that.mer_id
+						// 	});
+						// },500)
 					})
 			},
 			// 商品递减
@@ -170,7 +171,7 @@
 						goods.numAdd = false;
 					}
 				}
-				
+
 			},
 			// 商品增加
 			addCart(goods) {
@@ -211,7 +212,7 @@
 							},500)
 						});
 				}
-				
+
 			},
 			// 获取选中的商品
 			getSelectedProduct(){
@@ -251,13 +252,13 @@
 						item.check = this.isAllSelect
 						if(item.check)tempArr.push(item)
 					})
-				}	
+				}
 				// 全选
 				this.isAllSelect = tempArr.length == calArr.length ? true : false
 			},
 		},
 		onReachBottom() {
-			
+
 		},
 		// 滚动监听
 		onPageScroll(e) {
@@ -268,7 +269,7 @@
 </script>
 
 <style scoped lang="scss">
-	page {	
+	page {
 		background: #F5F5F5;
 	}
 	.cancellate {