Merge branch 'crm12.6' into debug

pages-approve/businessTrip/detail.vue

@@ -106,7 +106,12 @@ export default {
                             if(res.code===200){
                                 uni.$emit('businessApproveListUpdate')
                                 uni.navigateBack({
-                                    delta: 1
+                                    delta: 1,
+                                    fail:()=>{
+                                        uni.switchTab({
+                                            url: '/pages/index/index'
+                                        })
+                                    }
                                 });
                                 
                             }
@@ -143,7 +148,12 @@ export default {
                                 })
                                 setTimeout(() => {
                                     uni.navigateBack({
-                                        delta: 1
+                                        delta: 1,
+                                        fail:()=>{
+                                            uni.switchTab({
+                                                url: '/pages/index/index'
+                                            })
+                                        }
                                     });
                                 }, 1500);     
                             }

pages-approve/search/index.vue

@@ -236,6 +236,7 @@
 	.search-btn {
 		position: relative;
 		color: #3385FF;
+		padding-right: 10rpx;
 
 		&::before {
 			content: '';