Merge branch 'master_2.2_1026' into test

src/views/system/retreat/retreat/index.vue

@@ -106,8 +106,7 @@
             <div slot="header" class="el-card-header-spe">
               <div style="float:left;">
                 <span>总订单号：</span>
-                <span>{{ item.order_sn }}</span>
-                <span style="margin: 0 0 0 30px;">商品订单号：</span>
+                <span>{{ item.order_sn }}</span><span style="margin: 0 0 0 30px;">商品订单号：</span>
                 <span>{{ item.goods_order_sn }}</span>
               </div>
               <div style="float:right;">
@@ -422,7 +421,7 @@
         }
 
         if (this.queryParams.order_sn != '') {
-          params['order_sn'] = this.queryParams.order_sn;
+          params['order_sn'] = this.queryParams.order_sn.trim();
         }
         if (this.queryParams.mobile != '') {
           params['mobile'] = this.queryParams.mobile;