twt il y a 5 mois
Parent
commit
a86378f401

+ 2 - 1
pages/subPack/maintain.vue

@@ -92,7 +92,8 @@
 							 <span class="tcSpan1">¥</span>
 							 <span class="tcSpan2">{{v.price}}</span>
 							 <span class="tcSpan3">/次</span>
-							 <span class="tcSpan3" style="padding-left: 10rpx;">{{v.count}}次¥{{v.money}}</span>
+							 <span class="tcSpan3" style="padding-left: 10rpx;"> <span v-if="v.count!=1"> {{v.count}}次</span> ¥{{v.money}}
+							 </span>
 							<!-- <span class="tcSpan3" style="padding-left: 10rpx;">2次</span>
 							 <span class="tcSpan1">¥588</span> -->
 						 </view>

+ 36 - 19
pages/user/myOrder/activityOrderDetail.vue

@@ -490,16 +490,25 @@
 					refundComment:this.tuikuanContent,
 				}, 'POST').then(res => {
 					uni.hideLoading();
-					// var list = res.data.Items
 					this.isShowTui=false;
-					uni.showToast({
-						title: '取消成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
+					if(res.code==0){
+						uni.showToast({
+							title: '取消成功',
+							icon: 'none',
+							duration: 2000
+						});
+						setTimeout(function() {
+							that.getData();
+						}, 1000);
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					
+					
 				})
 			},
 			cancelOrder(){
@@ -661,16 +670,24 @@
 							
 								}, 'POST').then(res => {
 									uni.hideLoading();
-									// var list = res.data.Items
+									if(res.code==0){
+										uni.showToast({
+											title: '取消成功',
+											icon: 'none',
+											duration: 2000
+										});
+										setTimeout(function() {
+											that.getData();
+										}, 1000);
+									}else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 3000
+										});
+									}
+									
 									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
 								})
 							
 				          
@@ -1548,7 +1565,7 @@ color: #764D49;font-size: 26rpx;padding-top:20rpx;
 	
 	.tuikuan {
 		width: 638rpx;
-		height: 664rpx;
+		height: 720rpx;
 		background: #ffffff;
 		margin: 0 36rpx;
 		margin-top: 50%;

+ 52 - 27
pages/user/myOrder/mallOrderDetail.vue

@@ -437,14 +437,23 @@
 					uni.hideLoading();
 					// var list = res.data.Items
 					this.isShowTui=false;
-					uni.showToast({
-						title: '取消成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
+					if(res.code==0){
+						uni.showToast({
+							title: '取消成功',
+							icon: 'none',
+							duration: 2000
+						});
+						setTimeout(function() {
+							that.getData();
+						}, 1000);
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					
 				})
 			},
 			isShowTuiHide(){
@@ -574,15 +583,23 @@
 					uni.hideLoading();
 					// var list = res.data.Items
 					var list = res.data
-					console.log("result+=", res.data);
-					uni.showToast({
-						title: '延期成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
+					if(res.code==0){
+						uni.showToast({
+							title: '延期成功',
+							icon: 'none',
+							duration: 2000
+						});
+						setTimeout(function() {
+							that.getData();
+						}, 1000);
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					
 
 
 				})
@@ -607,16 +624,24 @@
 							
 								}, 'POST').then(res => {
 									uni.hideLoading();
-									// var list = res.data.Items
+									if(res.code==0){
+										uni.showToast({
+											title: '取消成功',
+											icon: 'none',
+											duration: 2000
+										});
+										setTimeout(function() {
+											that.getData();
+										}, 1000);
+									}else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 3000
+										});
+									}
+									
 									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
 								})
 							
 				          
@@ -1251,7 +1276,7 @@
 			
 			.tuikuan {
 				width: 638rpx;
-				height: 664rpx;
+				height: 720rpx;
 				background: #ffffff;
 				margin: 0 36rpx;
 				margin-top: 50%;

+ 17 - 9
pages/user/myOrder/myOrder.vue

@@ -196,16 +196,24 @@
 								}, 'POST').then(res => {
 									uni.hideLoading();
 									// var list = res.data.Items
+									if(res.code==0){
+										uni.showToast({
+											title: '取消成功',
+											icon: 'none',
+											duration: 2000
+										});
+										setTimeout(function() {
+											that.page = 1;
+											that.getData();
+										}, 100);
+									}else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 3000
+										});
+									}
 									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.page = 1;
-										that.getData();
-									}, 100);
 								})
 							
 				          

+ 34 - 17
pages/user/myOrder/paintOrderDetail.vue

@@ -416,14 +416,23 @@
 					uni.hideLoading();
 					// var list = res.data.Items
 					this.isShowTui=false;
-					uni.showToast({
-						title: '取消成功',
-						icon: 'none',
-						duration: 2000
-					});
-					setTimeout(function() {
-						that.getData();
-					}, 1000);
+					if(res.code==0){
+						uni.showToast({
+							title: '取消成功',
+							icon: 'none',
+							duration: 2000
+						});
+						setTimeout(function() {
+							that.getData();
+						}, 1000);
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000
+						});
+					}
+					
 				})
 			},
 			isShowTuiHide(){
@@ -587,15 +596,23 @@
 								}, 'POST').then(res => {
 									uni.hideLoading();
 									// var list = res.data.Items
+									if(res.code==0){
+										uni.showToast({
+											title: '取消成功',
+											icon: 'none',
+											duration: 2000
+										});
+										setTimeout(function() {
+											that.getData();
+										}, 1000);
+									}else{
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 3000
+										});
+									}
 									
-									uni.showToast({
-										title: '取消成功',
-										icon: 'none',
-										duration: 2000
-									});
-									setTimeout(function() {
-										that.getData();
-									}, 1000);
 								})
 							
 				          
@@ -1237,7 +1254,7 @@
 			
 			.tuikuan {
 				width: 638rpx;
-				height: 664rpx;
+				height: 720rpx;
 				background: #ffffff;
 				margin: 0 36rpx;
 				margin-top: 50%;