Merge branch '云仓3.0.1' into test

.env.development

@@ -2,10 +2,10 @@
 ENV = 'development'
 
 # 正式环境
-VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
+#VUE_APP_BASE_API = 'http://sj.jxhh.com/api/v1'
 
 # 测试环境
-#VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
+VUE_APP_BASE_API = 'http://192.168.26.179:6605/api/v1'
 #VUE_APP_BASE_API = 'http://192.168.111.240:6605/api/v1'
 
 # 文档模块 直接调用 sys开放接口

src/views/system/goods/add/components/goodsaftersale.vue

@@ -294,9 +294,13 @@
 .goods-after-sale {
   padding: 20px;
   margin-bottom:20px;
+  box-shadow:none;
 }
 .box-card{
-  margin-bottom: 50px;
+  margin-bottom: 20px;
+}
+.box-card /deep/ .el-card__header{
+  background: #F1F1F6;
 }
 .curspor{
   font-size: 16px;

src/views/system/goods/add/index.vue

@@ -60,7 +60,7 @@
           </div>
         </div>
         <!-- 售后及服务 -->
-            <Goodsaftersale class="floor-item"  ref="goodsaftersale" :goodsaftersale="goodsaftersale" />
+            <Goodsaftersale class="floor-item" style="box-shadow:none;"  ref="goodsaftersale" :goodsaftersale="goodsaftersale" />
            
 
             <div class="submit-type-con">
@@ -757,17 +757,17 @@ debugger
         if(index==3){
            floor_item = this.$refs.goodsaftersale.$refs.paramsvalue.$el
           console.log(floor_item)
-          floor_offsetTop =floor_item.offsetTop - 100
+          floor_offsetTop =floor_item.offsetTop - 90
         }
         if(index==4){
            floor_item = this.$refs.goodsaftersale.$refs.salesvalue.$el
           
-          floor_offsetTop = floor_item.offsetTop - 100
+          floor_offsetTop = floor_item.offsetTop - 90
         }
         if(index==5){
           floor_item = this.$refs.goodsaftersale.$refs.outhervalue.$el
           
-          floor_offsetTop = floor_item.offsetTop - 100
+          floor_offsetTop = floor_item.offsetTop - 90
         }
           // 每次点击，对应dom需要滚动的高度