解决冲突

2022-02-24 17:39:37 +08:00
parent 97fde5d6b9 f7efbe28c0
commit 90461ee459
15 changed files with 150 additions and 81 deletions
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
@ -43,14 +43,8 @@
    </div>
 </nz-card>
 <nz-card>
-  <!-- 数据列表 -->
-  <st
-    #st
-    [data]="service.$api_freight_config_page"
-    [columns]="columns"
-    [req]="{ process: beforeReq }"
-    [loading]="service.http.loading"
-    [scroll]="{ x: '1200px', y: '500px' }"
-  >
-  </st>
+    <!-- 数据列表 -->
+    <st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{  process: beforeReq }"
+        [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
+    </st>
 </nz-card>