Browse Source

修改路由跳转

gcz 1 year ago
parent
commit
7ef65b7288
3 changed files with 27 additions and 11 deletions
  1. 8 1
      center/orderdetails.vue
  2. 7 4
      center/refund.vue
  3. 12 6
      center/refundselect.vue

+ 8 - 1
center/orderdetails.vue

@@ -251,7 +251,14 @@
 				if(pages.length==1){
 					uni.$u.route('/pages/index/index')
 				}else{
-					uni.navigateBack()
+					let prePage = pages[pages.length-1];
+					if(prePage.route=='center/orderdetails'){
+						uni.navigateBack({
+							delta: 2
+						});
+					}else{
+						uni.navigateBack()
+					}
 				};
 			},
 			getTemplateIdList(){

+ 7 - 4
center/refund.vue

@@ -122,10 +122,13 @@
 					uni.$u.toast(res.msg)
 					// uni.navigateBack()
 					setTimeout(()=>{
-						uni.$u.route('/center/orderdetails', {
-							type:'redirectTo',
-							id: this.orderId
-						});
+						// uni.$u.route('/center/orderdetails', {
+						// 	type:'redirectTo',
+						// 	id: this.orderId
+						// });
+						uni.redirectTo({
+							url: `/center/orderdetails?id=${this.orderId}`
+						})
 						// uni.$u.route('/center/order');
 					},1500)
 					console.log('res',res.data);

+ 12 - 6
center/refundselect.vue

@@ -114,11 +114,13 @@
 			this.getViewers();
 		},
 		methods: {
-			leftClick(e) {
-				uni.reLaunch({
-					url: '/pages/index/index'
-				});
-				console.log('leftClick', e);
+			leftClick(e){
+				let pages = getCurrentPages();
+				if(pages.length==1){
+					uni.$u.route('/pages/index/index')
+				}else{
+					uni.navigateBack()
+				};
 			},
 			// 切换全选状态
 			allCheckboxChange(n) {
@@ -166,7 +168,11 @@
 					viewerList:JSON.stringify(viewerList)
 				};
 				// console.log('selectGoods', this.selectGoods);
-				uni.$u.route('/center/refund', params);
+				// uni.$u.route('/center/refund', params);
+				
+				uni.redirectTo({
+					url: `/center/refund?id=${this.orderId}&refundAmount=${this.totalPrice}&viewerList=${JSON.stringify(viewerList)}`
+				})
 			},
 			getViewers() {
 				this.$u.api.getViewers({