Merge branch 'release' of...

Merge branch 'release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-customer-new-master into release

src/pages/create_order/create_order.vue

@@ -2016,6 +2016,10 @@ export default {
               that.params.lockConsigneeDay = null
               that.params.lockConsigneeTime = null
               that.params.firstStockedTime = null
+              that.params.adjustToStartWarehouseId = null
+              that.params.adjustToDestWarehouseId = null
+              that.params.destAdjustToStartWarehouseId = null
+              that.params.destAdjustToDestWarehouseId = null
               // 状态重置
               that.params.status = 0
               that.params.cargoControlStatus = 0
@@ -2075,7 +2079,6 @@ export default {
                   num: item.num,
                   worth: item.worth,
                   boxGauge: item.boxGauge,
-                  brand: item.brand,
                   brandType: item.brandType
                 }
               }else {

src/static/css/integral.css

@@ -105,9 +105,9 @@ page {
 
 .classification-image {
   position: absolute;
-  width: 164upx;
-  height: 116upx;
-  transform: translateY(-60upx);
+  width: 90upx;
+  height: 135upx;
+  transform: translateY(-30upx);
 }
 
 .log-menu {