解决冲突，提交修复问题

components/cm-module/receipt/receipt-details.vue

@@ -174,6 +174,12 @@ export default {
 			}
 			&.sms {
 				height: auto;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				line-clamp: 2;
+				-webkit-box-orient: vertical;
 			}
 		}
 	}

components/cm-module/receipt/receipt-orderDetails.vue

@@ -269,6 +269,12 @@ export default {
 			}
 			&.sms {
 				height: auto;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				line-clamp: 2;
+				-webkit-box-orient: vertical;
 			}
 		}
 	}

pages/relation/ordinary/examine-detail.vue

@@ -216,7 +216,7 @@
 						if(this.params.receiptStatus == 3){//通过审核跳转
 							this.$api.redirectTo(`/pages/relation/ordinary/detail?id=${this.params.id}`)
 						}else{//不通过审核跳转
-							this.$api.navigateTo(`/pages/relation/ordinary/index?id=${this.params.id}`)
+							this.$api.redirectTo(`/pages/relation/ordinary/index?id=${this.params.id}`)
 						}
 					},2000)
 				})

pages/relation/refund/index.vue

@@ -644,7 +644,7 @@ page {
 				height: 100rpx;
 				padding: 10rpx;
 				border-radius: 4rpx;
-				.text{
+				.text {
 					height: 100%;
 					text-overflow: ellipsis;
 					overflow: hidden;

pages/relation/return/index.vue

@@ -672,7 +672,7 @@ page {
 				height: 100rpx;
 				padding: 10rpx;
 				border-radius: 4rpx;
-				.text{
+				.text {
 					height: 100%;
 					text-overflow: ellipsis;
 					overflow: hidden;