Merge branch '云仓3.1.1'

src/api/module/freight.js

@@ -45,3 +45,12 @@ export function delFreight(ids) {
     })
 }
 
+
+// 获取全部地址
+export function addressList(data) {
+    return request({
+        url: '/local/address/getAddressList',
+        method: 'post',
+        data: data
+    })
+}

src/components/HeaderSearch/index.vue

@@ -159,7 +159,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+    ::v-deep  .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;

src/layout/components/TagsView/ScrollPane.vue

@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+  ::v-deep  {
     .el-scrollbar__bar {
       bottom: 0px;
     }

src/views/entry/agreement.vue

@@ -163,7 +163,7 @@
       width: 80%;
       margin: 30px auto 30px;
       height: calc(100% - 120px);
-      /deep/.el-card__body{
+      ::v-deep .el-card__body{
         height: calc(100% - 120px);
         overflow-x: hidden;
         overflow-y: scroll;

src/views/entry/fillBrandInf.vue

@@ -670,7 +670,7 @@
       width: 80%;
       margin: 30px auto 30px;
       height: calc(100% - 120px);
-      /deep/.el-card__body{
+      ::v-deep .el-card__body{
         height: calc(100% - 120px);
         overflow-x: hidden;
         overflow-y: scroll;
@@ -772,30 +772,30 @@
     .uploadData {
       display: inline-block;
 
-      /deep/ .el-upload--picture-card {
+      ::v-deep  .el-upload--picture-card {
         width: 100px;
         height: 100px;
       }
 
-      /deep/ .el-upload {
+      ::v-deep  .el-upload {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .el-upload-list--picture-card .el-upload-list__item {
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .avatar {
+      ::v-deep  .avatar {
         width: 100px;
         height: 100px;
       }

src/views/entry/fillMainInf.vue

@@ -813,7 +813,7 @@
       width: 80%;
       margin: 30px auto 30px;
       height: calc(100% - 140px);
-      /deep/.el-card__body{
+      ::v-deep .el-card__body{
         height: calc(100% - 140px);
         overflow-x: hidden;
         overflow-y: scroll;
@@ -887,26 +887,26 @@
     // 上传图片样式
     .uploadData {
       display: inline-block;
-      /deep/ .el-upload--picture-card{
+      ::v-deep  .el-upload--picture-card{
         width: 100px;
         height: 100px;
       }
-      /deep/ .el-upload{
+      ::v-deep  .el-upload{
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
-      /deep/ .el-upload-list--picture-card .el-upload-list__item{
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item{
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
-      /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail{
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail{
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
-      /deep/ .avatar{
+      ::v-deep  .avatar{
         width: 100px;
         height: 100px;
       }

src/views/entry/fillShopInf.vue

@@ -584,7 +584,7 @@
       width: 80%;
       margin: 30px auto 30px;
       height: calc(100% - 140px);
-      /deep/.el-card__body{
+      ::v-deep .el-card__body{
         height: calc(100% - 180px);
         overflow-x: hidden;
         overflow-y: scroll;
@@ -667,30 +667,30 @@
     .uploadData {
       display: inline-block;
 
-      /deep/ .el-upload--picture-card {
+      ::v-deep  .el-upload--picture-card {
         width: 100px;
         height: 100px;
       }
 
-      /deep/ .el-upload {
+      ::v-deep  .el-upload {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .el-upload-list--picture-card .el-upload-list__item {
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
+      ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail {
         width: 100px;
         height: 100px;
         line-height: 100px;
       }
 
-      /deep/ .avatar {
+      ::v-deep  .avatar {
         width: 100px;
         height: 100px;
       }

src/views/entry/newyuncang.vue

@@ -1262,7 +1262,7 @@
     overflow: hidden;
   }
 
-  /deep/ .is-active {
+  ::v-deep  .is-active {
     border: 1px solid #e9e9e9;
     background: #fff;
     overflow: hidden;

src/views/system/asset/explain/index.vue

@@ -87,7 +87,7 @@
 </script>
 
 <style scoped>
-  /deep/.explain .el-card__body {
+  ::v-deep .explain .el-card__body {
     height: 100%;
     /*padding: 30px 20px;*/
     overflow: auto;

src/views/system/asset/wddetails.vue

@@ -513,7 +513,7 @@
 </script>
 
 <style scoped>
-  /deep/ .el-card__body{
+  ::v-deep  .el-card__body{
     height: 100%;
     overflow: hidden;
   }
@@ -569,7 +569,7 @@
     color: #333;
   }
 
-  /deep/.el-col {
+  ::v-deep .el-col {
     border: 1px solid #eee;
     padding: 0 10px;
     height: 45px;

src/views/system/asset/withdraw/index.vue

@@ -276,7 +276,7 @@
   };
 </script>
 <style scoped>
-  /deep/ .el-card__body{
+  ::v-deep  .el-card__body{
     height: 100%;
     overflow: hidden;
   }
@@ -291,7 +291,7 @@
     margin-bottom: 26px;
   }
 
-  /deep/ .spe-code-con-item .el-input-group__append {
+  ::v-deep  .spe-code-con-item .el-input-group__append {
     cursor: pointer;
   }
 

src/views/system/freight/freight_list/index.vue

@@ -66,16 +66,33 @@
         @pagination="getList"
       />
       <!-- 添加或修改freight对话框 -->
-      <el-dialog :title="title" :visible.sync="isOpen" v-if="isOpen" width="70%" class="freightTemplate-add"
+      <!-- <el-dialog :title="title" :visible.sync="isOpen" v-if="isOpen" width="70%" class="freightTemplate-add"
                  :close-on-click-modal="false" center>
         <IndexBtn :option="form" @closeIndexbtn="closeDialog"/>
-      </el-dialog>
+      </el-dialog> -->
+
+      <el-drawer
+        :title="title"
+        :withHeader="false"
+        :destroy-on-close='true'
+        :append-to-body="false"
+        :modal='false'
+        :modal-append-to-body='false'
+        :visible.sync="isOpen"
+        v-if="isOpen"
+        direction="rtl"
+        style="position:absolute;height:100%;"
+        size="100%"
+        >
+        <template-freight :option="form" :address-all="addressAll" @closeIndexbtn="closeDialog"/>
+      </el-drawer>
     </el-card>
   </div>
 </template>
 <script>
-  import IndexBtn from './indexbtn'
-  import {listFreight, getFreight, delFreight, addFreight, updateFreight} from '@/api/module/freight'
+  import TemplateFreight from './templateFreight'
+  // import IndexBtn from './indexbtn'
+  import {listFreight, getFreight, delFreight, addFreight, updateFreight, addressList} from '@/api/module/freight'
   import {dateFormat} from '@/utils'
 
   export default {
@@ -122,18 +139,20 @@
           name: [
             {required: true, message: "模板名称不能为空", trigger: "blur"}
           ],
-        }
+        },
+        addressAll: []
       };
     },
     components: {
-      IndexBtn
+      TemplateFreight,
+      // IndexBtn
     },
     created() {
       this.getList();
       this.$nextTick(() => {
         this.fullHeight = document.getElementsByClassName('box-card')[0].clientHeight
       })
-
+      this.getaddressList()
     },
     watch: {
       fullHeight(val) {
@@ -142,6 +161,29 @@
       }
     },
     methods: {
+      // 获取全部地区
+      getaddressList() {
+        addressList().then(res => {
+          if (res.code == 1) {
+            this.addressAll = this.getTreeData(res.data)
+          }
+        })
+      },
+      // 处理最后一级显示暂无数据
+      getTreeData(data) {
+        for(let i = 0, len = data.length; i < len; i++ ) {
+          if (data[i].type >= 2) {
+            data[i].children = undefined
+          } else {
+            if (!data[i].children.length) {
+              data[i].children = undefined
+            } else {
+              this.getTreeData(data[i].children)
+            }
+          }
+        }
+        return data
+      },
       closeDialog(val) {
         this.isOpen = val;
         this.getList();
@@ -330,14 +372,18 @@
 </script>
 <style scoped lang="scss" type="text/stylus">
   .freightTemplate-add {
-    /deep/.el-dialog {
+    ::v-deep .el-dialog {
       height: 80%;
       overflow : hidden;
     }
-    /deep/.el-dialog__body{
+    ::v-deep .el-dialog__body{
       height: calc(100% - 60px);
       overflow-x: hidden;
       overflow-y: scroll;
     }
   }
+
+  ::v-deep .el-drawer__body{
+    overflow-y: auto;
+  }
 </style>

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

@@ -138,6 +138,10 @@
       goodsaftersale: {
         type: Object,
         required: true
+      },
+      option: {
+        type: Number,
+        required: true
       }
     },
     data() {
@@ -231,9 +235,20 @@
       },
       // 运费模板
       getFreightData() {
-        GetFreight().then(res => {
+        let params = {
+          is_status: 1
+        }
+        GetFreight(params).then(res => {
           if(res.data) {
             this.freightOptions = res.data;
+
+            if (this.option == 0) {
+              for (let i = 0; i < this.freightOptions.length; i++) {
+                if (this.freightOptions[i].is_default == 1) {
+                  this.goodsAfterSaleForm.freight_id = this.freightOptions[i].id
+                }
+              }
+            }
           }else {
             this.freightOptions = ''
           }

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

@@ -228,13 +228,13 @@
   left: 60px;
 }
 
-/deep/.ql-toolbar.ql-snow {
+::v-deep .ql-toolbar.ql-snow {
   border: none;
   border-bottom: 1px solid #ccc;
   padding: 5px 8px;
 }
 
-/deep/.ql-toolbar.ql-snow .ql-formats {
+::v-deep .ql-toolbar.ql-snow .ql-formats {
   vertical-align : baseline;
   margin: 0;
   padding: 0 8px;
@@ -242,7 +242,7 @@
   border-radius: 3px;
 }
 
-/deep/.ql-toolbar.ql-snow .ql-formats:hover {
+::v-deep .ql-toolbar.ql-snow .ql-formats:hover {
   background-color : #00afff;
   border-color: #00afff;
 }

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

@@ -975,7 +975,7 @@
     font-size: 12px;
   }
 
-  /deep/.el-form-item {
+  ::v-deep .el-form-item {
     margin-bottom: 20px;
   }
 
@@ -991,21 +991,21 @@
     cursor: pointer;
   }
 
-  /*/deep/.el-cascader-menu {*/
+  /*::v-deep .el-cascader-menu {*/
   /*  height:600px;*/
   /*}*/
- /deep/ .el-cascader-menu{
+ ::v-deep  .el-cascader-menu{
    max-width: 250px !important;
    min-width: 250px !important;
 
  }
- /deep/  .el-cascader-menu__wrap{
+ ::v-deep   .el-cascader-menu__wrap{
    width:auto !important;
    max-width: 250px !important;
    min-width: 250px !important;
 
  }
- .opendow /deep/ .el-dialog{
+ .opendow ::v-deep  .el-dialog{
    width:800px;
  }
 

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

@@ -954,30 +954,30 @@ p {
 .uploadData50 {
   display: inline-block;
 
-  /deep/ .el-upload--picture-card {
+  ::v-deep  .el-upload--picture-card {
     width: 50px;
     height: 50px;
   }
 
-  /deep/ .el-upload {
+  ::v-deep  .el-upload {
     width: 50px;
     height: 50px;
     line-height: 50px;
   }
 
-  /deep/ .el-upload-list--picture-card .el-upload-list__item {
+  ::v-deep  .el-upload-list--picture-card .el-upload-list__item {
     width: 50px;
     height: 50px;
     line-height: 50px;
   }
 
-  /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
+  ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail {
     width: 50px;
     height: 50px;
     line-height: 50px;
   }
 
-  /deep/ .avatar {
+  ::v-deep  .avatar {
     width: 50px;
     height: 50px;
   }

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

@@ -59,7 +59,7 @@
           </div>
         </div>
         <!-- 售后及服务 -->
-            <Goodsaftersale class="floor-item" style="box-shadow:none;"  ref="goodsaftersale" :goodsaftersale="goodsaftersale" />
+            <Goodsaftersale class="floor-item" style="box-shadow:none;"  ref="goodsaftersale" :goodsaftersale="goodsaftersale" :option="option" />
 
 
             <div class="submit-type-con">
@@ -201,7 +201,7 @@
     created() {
     // option 商品的id
       //debugger
-      this.option = Number(this.$route.query.goods_id)
+      this.option = Number(this.$route.query.goods_id) || 0
       if( this.option && this.option !== 0 ) {
         let data = { goodsId: this.option};
         getGoodsNew(data).then(res => {

src/views/system/goodsimport/components/goodsdetail.vue

@@ -1114,12 +1114,12 @@
     /* background-color: #fff; */
   }
 
-  /deep/ .maxImgBox {
+  ::v-deep  .maxImgBox {
     width: 455px !important;
     height: 455px !important;
   }
 
-  /deep/ .el-input-group__append {
+  ::v-deep  .el-input-group__append {
     color: #fff;
     background-color: #647dff;
     border-color: #647dff;

src/views/system/goodsimport/editgoods.vue

@@ -36,7 +36,7 @@
 .add-workorder-dialog {
   height: 100%;
 }
-/deep/.add-workorder-dialog el-dialog {
+::v-deep .add-workorder-dialog el-dialog {
   height: calc(100% - 15vh);
 }
 </style>

src/views/system/goodsimport/goodsgement.vue

@@ -404,7 +404,10 @@
     methods: {
       // 运费模板
       getFreightData() {
-        GetFreight().then(res => {
+        let params = {
+          is_status: 1
+        }
+        GetFreight(params).then(res => {
           if(res.data) {
             this.freightOptions = res.data;
           }else {
@@ -900,12 +903,12 @@
   }
 
   .freightTemplate-add {
-    /deep/ .el-dialog {
+    ::v-deep  .el-dialog {
       height: 80%;
       overflow: hidden;
     }
 
-    /deep/ .el-dialog__body {
+    ::v-deep  .el-dialog__body {
       height: calc(100% - 60px);
       overflow-x: hidden;
       overflow-y: scroll;
@@ -916,12 +919,12 @@
     margin: 0 10px;
   }
 
-  /deep/ .radiomodels .el-radio-button .el-radio-button__inner {
+  ::v-deep  .radiomodels .el-radio-button .el-radio-button__inner {
     border: 1px solid #DCDFE6 !important;
     border-radius: 4px !important;
   }
 
-  /deep/ .radiomodels .el-radio-button .el-radio-button__orig-radio:checked + .el-radio-button__inner {
+  ::v-deep  .radiomodels .el-radio-button .el-radio-button__orig-radio:checked + .el-radio-button__inner {
     box-shadow: none;
   }
 

src/views/system/goodsimport/index.vue

@@ -235,11 +235,11 @@ export default {
 </script>
 <style scoped lang="scss" type="text/stylus">
 .freightTemplate-add {
-  /deep/.el-dialog {
+  ::v-deep .el-dialog {
     height: 80%;
     overflow: hidden;
   }
-  /deep/.el-dialog__body {
+  ::v-deep .el-dialog__body {
     height: calc(100% - 60px);
     overflow-x: hidden;
     overflow-y: scroll;
@@ -248,11 +248,11 @@ export default {
 .radiomodels .el-radio-button {
   margin: 0 10px;
 }
-/deep/ .radiomodels .el-radio-button .el-radio-button__inner {
+::v-deep  .radiomodels .el-radio-button .el-radio-button__inner {
   border: 1px solid #dcdfe6 !important;
   border-radius: 4px !important;
 }
-/deep/
+::v-deep 
   .radiomodels
   .el-radio-button
   .el-radio-button__orig-radio:checked
@@ -275,7 +275,7 @@ export default {
   padding:0;
   margin:5px 0;
 }
-/deep/ .el-card__body {
+::v-deep  .el-card__body {
     height: calc(100% - 40px);
     overflow-y: auto;
 }

src/views/system/operation/document.vue

@@ -144,10 +144,10 @@
 </script>
 
 <style lang="scss" type="text/stylus" scoped>
-  /deep/.el-card__header p {
+  ::v-deep .el-card__header p {
     font-size: 18px;
   }
-  /deep/.el-card__body {
+  ::v-deep .el-card__body {
     padding: 10px 0 10px 0;
     height: calc(100% - 45px);
     overflow :hidden;
@@ -193,13 +193,13 @@
     }
   }
     /*样式重置*/
-    /deep/.el-submenu__title {
+    ::v-deep .el-submenu__title {
       //padding: 0 30px!important;
     }
-    /deep/.el-submenu__title > span {
+    ::v-deep .el-submenu__title > span {
       font-size: 16px;
     }
-    /deep/.el-table td {
+    ::v-deep .el-table td {
       border: none;
     }
 

src/views/system/operation/helpDoc.vue

@@ -139,7 +139,7 @@
 </script>
 
 <style lang="scss" type="text/stylus" scoped>
-/deep/.el-card__body {
+::v-deep .el-card__body {
   height: calc(100% - 100px);
   width: 80%;
   padding: 0 100px;

src/views/system/order/components/orderDetail.vue

@@ -837,34 +837,34 @@ export default {
 </script>
 
 <style scoped>
-  /deep/.el-dialog__header {
+  ::v-deep .el-dialog__header {
     border-bottom: 1px solid #eee;
     text-align: center;
   }
-  /deep/.el-step__head.is-success {
+  ::v-deep .el-step__head.is-success {
     color: #3AA0FF;
     border-color: #3AA0FF;
   }
-  /deep/.el-step__title.is-success {
+  ::v-deep .el-step__title.is-success {
     color: #3AA0FF;
   }
-  /deep/.el-col {
+  ::v-deep .el-col {
     border: 1px solid #eee;
     padding: 0 10px;
     height: 38px;
     display: flex;
     align-items: center;
   }
-  /deep/.el-dialog__body {
+  ::v-deep .el-dialog__body {
     padding: 20px;
   }
-  /deep/.el-input--medium .el-input__inner {
+  ::v-deep .el-input--medium .el-input__inner {
     height: 28px;
   }
-  /*/deep/input::-webkit-input-placeholder{*/
+  /*::v-deep input::-webkit-input-placeholder{*/
   /*  color:#606266;*/
   /*}*/
-  /*/deep/input::-moz-placeholder{*/
+  /*::v-deep input::-moz-placeholder{*/
   /*  color:#606266;*/
   /*  opacity: 1*/
   /*}*/
@@ -938,18 +938,18 @@ export default {
   .remark-con .remark-text {
 
   }
-  /deep/.only-eidt-placeholder .el-input input::-webkit-input-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-webkit-input-placeholder{
+  ::v-deep .only-eidt-placeholder .el-input input::-webkit-input-placeholder, ::v-deep .only-eidt-placeholder .el-input textarea::-webkit-input-placeholder{
     color: #666;
   }
-  /deep/.only-eidt-placeholder .el-input input:-moz-placeholder, /deep/.only-eidt-placeholder .el-input textarea:-moz-placeholder {
+  ::v-deep .only-eidt-placeholder .el-input input:-moz-placeholder, ::v-deep .only-eidt-placeholder .el-input textarea:-moz-placeholder {
     color: #666;
     opacity: 1;
   }
-  /deep/.only-eidt-placeholder .el-input input::-moz-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-moz-placeholder {
+  ::v-deep .only-eidt-placeholder .el-input input::-moz-placeholder, ::v-deep .only-eidt-placeholder .el-input textarea::-moz-placeholder {
     color: #666;
     opacity: 1;
   }
-  /deep/.only-eidt-placeholder .el-input input:-ms-input-placeholder, /deep/.only-eidt-placeholder .el-input textarea::-ms-input-placeholder {
+  ::v-deep .only-eidt-placeholder .el-input input:-ms-input-placeholder, ::v-deep .only-eidt-placeholder .el-input textarea::-ms-input-placeholder {
     color: #666;
   }
 </style>

src/views/system/order/index.vue

@@ -1058,11 +1058,11 @@
 .box-cardone{
   height: 100%;
 }
-  /deep/ .el-range-editor.el-input__inner {
+  ::v-deep  .el-range-editor.el-input__inner {
     width: 100%;
   }
 
-  /deep/ .el-card__body {
+  ::v-deep  .el-card__body {
     height: calc(100% - 50px);
     /* overflow: auto; */
   }
@@ -1075,7 +1075,7 @@
     /* height: calc(100% - 50px); */
     /* overflow-y: hidden; */
   }
-  /deep/ .el-tabs__header{
+  ::v-deep  .el-tabs__header{
     margin: 0;
   }
   .form-box {
@@ -1087,7 +1087,7 @@
     /*background-color: #F7F8FA;*/
   }
 
-  /deep/.form-params .el-form-item {
+  ::v-deep .form-params .el-form-item {
     margin: 5px 0 5px 0;
   }
   .img-title-table {
@@ -1136,7 +1136,7 @@
   .order-card {
     margin: 10px 0 12px;
   }
-  .order-card /deep/ .el-card__header {
+  .order-card ::v-deep  .el-card__header {
     padding: 0;
     min-height: fit-content;
   }
@@ -1155,18 +1155,18 @@
     margin: 5px 0;
   }
 
-  /deep/ .title_table{
+  ::v-deep  .title_table{
     /*width: calc(100% - 94px) !important;*/
     /*margin: 0 40px;*/
   }
-  /deep/ .title_table .el-table__body-wrapper{
+  ::v-deep  .title_table .el-table__body-wrapper{
     display: none !important;
     height:0 !important;
   }
-  /deep/ .title_table tr th {
+  ::v-deep  .title_table tr th {
     border-bottom: 0 !important;
   }
-  /deep/  .title_table::before{
+  ::v-deep   .title_table::before{
     height:0;
   }
 
@@ -1194,12 +1194,12 @@
     overflow: hidden;
   }
 
-  .delivery-fail-data-dialog /deep/ .el-dialog {
+  .delivery-fail-data-dialog ::v-deep  .el-dialog {
     height: 80%;
     overflow: hidden;
   }
 
-  .delivery-fail-data-dialog /deep/ .el-dialog .el-dialog__body {
+  .delivery-fail-data-dialog ::v-deep  .el-dialog .el-dialog__body {
     height: calc(100% - 120px);
     overflow: auto;
     padding: 15px 20px;

src/views/system/order/index2.vue

@@ -951,18 +951,18 @@
 </script>
 <style scoped lang="scss" type="text/stylus">
   .order-details{
-    /deep/.el-dialog {
+    ::v-deep .el-dialog {
       height: 80%;
       overflow: hidden;
     }
-    /deep/.el-dialog__body {
+    ::v-deep .el-dialog__body {
       height: calc(100% - 120px);
       overflow-x: hidden;
       overflow-y: scroll;
     }
   }
 
-  /deep/.queryFormInline {
+  ::v-deep .queryFormInline {
     .el-form-item:nth-child(1) {
       margin-bottom: 10px ;
     }
@@ -988,7 +988,7 @@
   .delivery-tips-con {
     font-size: 12px;
   }
-  /deep/.el-step__title.is-finish {
+  ::v-deep .el-step__title.is-finish {
     color: #333
   }
 </style>

src/views/system/retreat/edit.vue

@@ -887,7 +887,7 @@
   }
 
   /* 售后信息 表格 样式 */
-  /deep/.el-col {
+  ::v-deep .el-col {
     /*border: 1px solid #eee;*/
     /*padding: 0 10px;*/
     /*height: 38px;*/

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

@@ -506,22 +506,22 @@
     height: 100%;
     /*overflow: auto;*/
   }
-  .card-spe-con /deep/ .el-card__body {
+  .card-spe-con ::v-deep  .el-card__body {
     height: calc(100% - 40px);
     overflow: hidden;
   }
-  /*/deep/ .el-dialog__body {*/
+  /*::v-deep  .el-dialog__body {*/
   /*  height: 100%;*/
   /*  overflow: hidden;*/
   /*}*/
-  /deep/ .el-tabs__header{
+  ::v-deep  .el-tabs__header{
     margin: 0;
   }
-  /deep/ .after-sale-tabs .el-tabs__item {
+  ::v-deep  .after-sale-tabs .el-tabs__item {
     line-height: 30px;
   }
 
-  /deep/ .el-form--inline .el-form-item {
+  ::v-deep  .el-form--inline .el-form-item {
     margin-right: 15px;
   }
 
@@ -541,7 +541,7 @@
     margin: 10px 0 12px;
   }
 
-  .order-card /deep/ .el-card__header {
+  .order-card ::v-deep  .el-card__header {
     padding: 0;
     min-height: fit-content;
   }
@@ -560,16 +560,16 @@
     margin: 5px 0;
   }
 
-  /deep/ .title_table .el-table__body-wrapper {
+  ::v-deep  .title_table .el-table__body-wrapper {
     display: none !important;
     height: 0 !important;
   }
 
-  /deep/ .title_table tr th {
+  ::v-deep  .title_table tr th {
     border-bottom: 0 !important;
   }
 
-  /deep/ .title_table::before {
+  ::v-deep  .title_table::before {
     height: 0;
   }
 
@@ -593,12 +593,12 @@
     overflow: hidden;
   }
 
-  .after-sale-dialog /deep/ .el-dialog {
+  .after-sale-dialog ::v-deep  .el-dialog {
     overflow: hidden;
     height: 100%;
   }
 
-  .after-sale-dialog /deep/ .el-dialog__body {
+  .after-sale-dialog ::v-deep  .el-dialog__body {
     overflow: auto;
     height: calc(100% - 120px);
     padding: 10px 20px;

src/views/system/retreat/retreat/index0907.vue

@@ -762,16 +762,16 @@ import {dateFormat} from '@/utils'
   };
 </script>
 <style scoped lang="scss" type="text/stylus">
-  /deep/.queryFormInline {
+  ::v-deep .queryFormInline {
     .el-form-item {
       margin-bottom: 5px ;
     }
   }
- /deep/ .after-sales-details .el-dialog{
+ ::v-deep  .after-sales-details .el-dialog{
     height:80%;
     overflow: hidden;
   }
-/deep/  .el-dialog__body{
+::v-deep   .el-dialog__body{
     height:calc(100% - 50px);
     overflow-y: scroll;
   }

src/views/system/retreat/retreat/index_bak.vue

@@ -806,7 +806,7 @@ import {dateFormat} from '@/utils'
   };
 </script>
 <style scoped lang="scss" type="text/stylus">
-  /deep/.queryFormInline {
+  ::v-deep .queryFormInline {
     .el-form-item {
       margin-bottom: 5px ;
     }

src/views/system/settings/setpsd.vue

@@ -468,7 +468,7 @@
     width: 90%;
     margin: 40px 0 30px 100px;
 
-    /deep/ .el-form-item {
+    ::v-deep  .el-form-item {
       margin-top: 18px !important;
     }
   }

src/views/system/shop/brand.vue

@@ -1048,11 +1048,11 @@
  </style>
 <style lang="scss" type="text/stylus" scoped>
   .brandInf-add {
-    /deep/.el-dialog {
+    ::v-deep .el-dialog {
       height: 85%;
       overflow : hidden;
     }
-    /deep/.el-dialog__body{
+    ::v-deep .el-dialog__body{
       height: calc(100% - 60px);
       overflow-x: hidden;
       overflow-y: scroll;
@@ -1089,7 +1089,7 @@
     padding: 0 10px;
   }
   .btnCen {
-    /deep/.el-form-item__content {
+    ::v-deep .el-form-item__content {
       margin-left: 0!important;
       text-align : center;
       margin-top: 30px;
@@ -1118,30 +1118,30 @@
 // 上传图片样式重置 start
   .uploadData {
     display: inline-block;
-    /deep/ .el-upload--picture-card {
+    ::v-deep  .el-upload--picture-card {
       width: 100px;
       height: 100px;
     }
 
-    /deep/ .el-upload {
+    ::v-deep  .el-upload {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .el-upload-list--picture-card .el-upload-list__item {
+    ::v-deep  .el-upload-list--picture-card .el-upload-list__item {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
+    ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .avatar {
+    ::v-deep  .avatar {
       width: 100px;
       height: 100px;
     }

src/views/system/shop/index.vue

@@ -953,11 +953,11 @@
 <style lang="scss" type="text/stylus" scoped>
 
   .shopinf-edit {
-    ///deep/.el-dialog {
+    //::v-deep .el-dialog {
     //  height: 80%;
     //  overflow : hidden;
     //}
-    ///deep/.el-dialog__body{
+    //::v-deep .el-dialog__body{
     //  height: calc(100% - 60px);
     //  overflow-x: hidden;
     //  overflow-y: scroll;
@@ -985,20 +985,20 @@
   }
 
 
-  /deep/ .el-card__body {
+  ::v-deep  .el-card__body {
     height: calc(100% - 80px);
     margin: 10px 0;
     overflow-x: hidden;
     overflow-y: scroll;
   }
 
-  /deep/ .speDom {
+  ::v-deep  .speDom {
     color: red;
     font-size: 20px;
     margin: 0 0 4px 10px;
   }
 
-  /deep/ .speTip {
+  ::v-deep  .speTip {
     color: #c0ccda;
     font-size: 14px;
   }
@@ -1020,30 +1020,30 @@
   .uploadData {
     display: inline-block;
 
-    /deep/ .el-upload--picture-card {
+    ::v-deep  .el-upload--picture-card {
       width: 100px;
       height: 100px;
     }
 
-    /deep/ .el-upload {
+    ::v-deep  .el-upload {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .el-upload-list--picture-card .el-upload-list__item {
+    ::v-deep  .el-upload-list--picture-card .el-upload-list__item {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .el-upload-list--picture-card .el-upload-list__item-thumbnail {
+    ::v-deep  .el-upload-list--picture-card .el-upload-list__item-thumbnail {
       width: 100px;
       height: 100px;
       line-height: 100px;
     }
 
-    /deep/ .avatar {
+    ::v-deep  .avatar {
       width: 100px;
       height: 100px;
     }
@@ -1174,7 +1174,7 @@
   // 提示语样式  end
 
   .btnCen {
-    /deep/ .el-form-item__content {
+    ::v-deep  .el-form-item__content {
       margin-left: 0 !important;
       text-align: center;
       //margin-top: 30px;