【模版目录】更新v5.2.1版本

template/admin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "from-crmeb-admin",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "author": "Lison<lison16new@163.com>",
   "private": false,
   "scripts": {
@@ -22,7 +22,7 @@
     "better-scroll": "^1.15.2",
     "clipboard": "^2.0.0",
     "codemirror": "^5.38.0",
-    "core-js": "^3.22.5",
+    "core-js": "^3.32.2",
     "cos-js-sdk-v5": "^0.5.26",
     "countup": "^1.8.2",
     "cropperjs": "^1.2.2",
@@ -32,13 +32,12 @@
     "editor": "^1.0.0",
     "element-ui": "2.15.6",
     "emoji-awesome": "0.0.2",
+    "exceljs": "^4.3.0",
     "file-saver": "^2.0.5",
     "html2canvas": "^1.0.0-alpha.12",
-    "iview-area": "^1.5.17",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
     "lodash": "^4.17.10",
-    "marked": "^0.3.9",
     "moment": "^2.29.1",
     "monaco-editor": "^0.28.1",
     "monaco-editor-webpack-plugin": "^4.2.0",
@@ -50,13 +49,11 @@
     "quill": "^1.3.6",
     "screenfull": "^5.0.2",
     "sortablejs": "^1.15.0",
-    "stylus": "^0.54.7",
     "swiper": "^5.4.5",
     "tree-table-vue": "^1.1.0",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "v-org-tree": "^1.0.6",
     "v-viewer": "^1.5.1",
-    "view-design": "^4.7.0",
     "vue": "^2.5.10",
     "vue-awesome-swiper": "^4.1.1",
     "vue-clipboard2": "^0.3.3",
@@ -85,31 +82,27 @@
     "@babel/plugin-transform-runtime": "^7.2.0",
     "@babel/preset-env": "^7.20.2",
     "@vue/cli-plugin-babel": "^4.4.6",
-    "@vue/cli-plugin-eslint": "^4.4.6",
+    "@vue/cli-plugin-eslint": "^5.0.8",
     "@vue/cli-plugin-unit-jest": "^3.2.3",
     "@vue/cli-plugin-unit-mocha": "^3.0.1",
     "@vue/cli-service": "^3.0.1",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-standard": "^3.0.0-beta.10",
     "axios": "^0.18.1",
-    "chai": "^4.1.2",
     "compression-webpack-plugin": "^6.1.1",
     "eslint": "^7.15.0",
     "eslint-loader": "^4.0.2",
     "eslint-plugin-cypress": "^2.0.1",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-vue": "^7.2.0",
-    "iview-loader": "^1.3.0",
     "jsencrypt": "^3.3.2",
-    "less": "^2.7.3",
-    "less-loader": "^4.1.0",
     "lint-staged": "^6.0.0",
-    "mockjs": "^1.0.1-beta3",
-    "node-sass": "^4.14.1",
     "prettier": "^2.5.1",
-    "sass-loader": "^10.1.0",
+    "sass": "^1.69.5",
+    "sass-loader": "^10.4.1",
     "script-loader": "^0.7.2",
     "style-loader": "^1.2.1",
+    "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "^3.8.0",
     "text-loader": "0.0.1",

template/admin/src/App.vue

@@ -90,20 +90,18 @@ export default {
 };
 </script>
 
-<style lang="less">
-.size {
-  width: 100%;
-  height: 100%;
-}
+<style lang="scss">
 html,
 body {
-  .size;
+  width: 100%;
+  height: 100%;
   overflow: hidden;
   margin: 0;
   padding: 0;
 }
 #app {
-  .size;
+  width: 100%;
+  height: 100%;
   font-family: PingFang SC, Arial, Microsoft YaHei, sans-serif;
 }
 // .dialog-fade-enter-active {
@@ -132,7 +130,7 @@ body {
 //     opacity: 0;
 //   }
 // }
-.ivu-modal-wrap /deep/ .connect_customerServer_img {
+.ivu-modal-wrap ::v-deep .connect_customerServer_img {
   display: none;
 }
 .right-box .ivu-color-picker .ivu-select-dropdown {

template/admin/src/api/order.js

@@ -590,3 +590,14 @@ export function importExpress(data) {
     params: data,
   });
 }
+
+/**
+ * @description 配货单-打印
+ * @param id  订单id
+ */
+export function distributionOrder(id) {
+  return request({
+    url: `/order/print/shipping/${id}`,
+    method: 'get',
+  });
+}

template/admin/src/api/setting.js

@@ -523,7 +523,7 @@ export function roleSetStatusApi(data) {
  * @description 设置 身份管理 ==新增 编辑
  * @param {Object} param data {Object} 传值参数
  */
-export function roleCreatApi(data) {
+export function roleCreateApi(data) {
   return request({
     url: `setting/role/${data.id}`,
     method: 'post',

template/admin/src/components/cards/cards.vue

@@ -110,7 +110,7 @@ export default {
 
 <style scoped lang="stylus">
 
-.card_box_cir1 >>> .iconfont
+.card_box_cir1 ::v-deep .iconfont
    font-size: 26px
    color: #fff
  .one

template/admin/src/components/copyright/index.vue

@@ -50,7 +50,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="scss">
 .ivu-global-footer {
   /* margin: 48px 0 24px 0; */
   /* padding: 0 16px; */

template/admin/src/components/customerInfo/index.vue

@@ -222,7 +222,7 @@ export default {
         width 100%
         height 100%
 .modelBox
-    >>>
+    ::v-deep
     .ivu-table-header
         width 100% !important
 .trees-coadd
@@ -240,7 +240,7 @@ export default {
     margin: 15px 0;
     padding-right: 20px;
 }
-/deep/ .el-form--inline .el-form-item{
+::v-deep .el-form--inline .el-form-item{
   margin-bottom 0
 }
 </style>

template/admin/src/components/diyComponents/c_bg_color.vue

@@ -73,7 +73,7 @@ export default {
 .c_row-item
     margin-top 10px
     margin-bottom 10px
-    >>> .ivu-select-dropdown
+    ::v-deep .ivu-select-dropdown
         left -27px !important
 .color-box
     display flex

template/admin/src/components/diyComponents/c_goods.vue

@@ -145,7 +145,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.middleTop /deep/.ivu-modal-wrap .ivu-modal{
+.middleTop ::v-deep.ivu-modal-wrap .ivu-modal{
     top:50%!important;
     margin-top:-350px;
 }

template/admin/src/components/diyComponents/c_hot_word.vue

@@ -119,7 +119,7 @@ export default {
         color: #D8D8D8;
       }
 
-      /deep/.ivu-input {
+      ::v-deep.ivu-input {
         flex: 1;
         height: 36px;
       }

template/admin/src/components/diyComponents/c_tab.vue

@@ -64,7 +64,7 @@ export default {
 
 <style scoped lang="stylus">
 .radio-box
-    /deep/.ivu-radio-group-button
+    ::v-deep.ivu-radio-group-button
         display flex
         width 100%
         .ivu-radio-wrapper
@@ -73,7 +73,7 @@ export default {
             align-items center
             justify-content center
     &.on
-        /deep/.ivu-radio-group-button
+        ::v-deep.ivu-radio-group-button
             .ivu-radio-wrapper
                 flex 1
 .title-tips

template/admin/src/components/freightTemplate/city.vue

@@ -308,5 +308,8 @@ export default {
   cursor: pointer;
   font-size: 12px;
   margin-left: 10px;
+  line-height: 19px;
+  color: var(--prev-color-text-primary);
+  font-weight: 500;
 }
 </style>

template/admin/src/components/from/from.vue

@@ -130,7 +130,7 @@ export default {
 .radio {
   margin-bottom: 14px;
 }
-.radio >>> .name {
+.radio ::v-deep .name {
   width: 125px;
   text-align: right;
   padding-right: 12px;

template/admin/src/components/goodsList/index.vue

@@ -403,7 +403,7 @@ export default {
 }
 
 .tabform {
-  >>> .ivu-form-item {
+  ::v-deep .ivu-form-item {
     margin-bottom: 16px !important;
   }
 }
@@ -414,7 +414,7 @@ export default {
 }
 
 .goodList {
-  >>> table {
+  ::v-deep table {
     width: 100% !important;
   }
 }

template/admin/src/components/iconFrom/index.vue

@@ -69,7 +69,7 @@ export default {
     position: relative;
     padding-top: 10px;
 
-    >>> .ivu-icon
+    ::v-deep .ivu-icon
         font-size: 32px !important;
 
 .trees-coadd

template/admin/src/components/link/index.vue

@@ -35,7 +35,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="scss">
 .i-link {
   cursor: pointer;
   &-color {

template/admin/src/components/linkaddress/index.vue

@@ -818,35 +818,35 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/ .el-dialog__body {
+::v-deep .el-dialog__body {
   //padding: 20px 10px 10px 10px !important;
 }
-/deep/ .el-tree-node__content {
+::v-deep .el-tree-node__content {
   height: 30px;
 }
-/deep/.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+::v-deep.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
   background-color: var(--prev-bg-menu-hover-ba-color) !important;
   border-right: 2px solid var(--prev-color-primary);
 }
-/deep/.ivu-tree-title-selected, /deep/.ivu-tree-title-selected:hover, /deep/.ivu-tree-title:hover {
+::v-deep.ivu-tree-title-selected, ::v-deep.ivu-tree-title-selected:hover, ::v-deep.ivu-tree-title:hover {
   background-color: unset;
   color: var(--prev-color-primary);
 }
 
-/deep/.ivu-table-cell-tree {
+::v-deep.ivu-table-cell-tree {
   border: 0;
   font-size: 15px;
   background-color: unset;
 }
-/deep/ .el-table .cell {
+::v-deep .el-table .cell {
   display: flex;
   align-items: center;
 }
-/deep/.ivu-table-cell-tree .ivu-icon-ios-add:before {
+::v-deep.ivu-table-cell-tree .ivu-icon-ios-add:before {
   content: '\F11F';
 }
 
-/deep/.ivu-table-cell-tree .ivu-icon-ios-remove:before {
+::v-deep.ivu-table-cell-tree .ivu-icon-ios-remove:before {
   content: '\F116';
 }
 
@@ -905,7 +905,7 @@ export default {
   }
 }
 .radioGroup {
-  /deep/.ivu-radio-wrapper {
+  ::v-deep.ivu-radio-wrapper {
     margin-right: 30px;
   }
 }
@@ -986,10 +986,10 @@ export default {
       }
     }
   }
-  /deep/ .el-table .cell {
+  ::v-deep .el-table .cell {
     padding-right:0;
   }
-  /deep/ .page {
+  ::v-deep .page {
     margin-top:10px;
   }
 

template/admin/src/components/mobileConfigDiy/c_picture_cube.vue

@@ -95,7 +95,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/.ivu-radio-group-button.ivu-radio-group-large .ivu-radio-wrapper{
+::v-deep.ivu-radio-group-button.ivu-radio-group-large .ivu-radio-wrapper{
     width 52px!important
     margin-bottom 10px
     margin-right 9px!important

template/admin/src/components/mobileConfigDiy/pageTitle.vue

@@ -12,12 +12,12 @@
         <el-input v-model="value" placeholder="选填不超过30个字" maxlength="30" @input="changVal" />
       </el-col>
     </div>
-    <div class="c_row-item">
+    <!-- <div class="c_row-item">
       <el-col class="label" :span="4"> 页面状态 </el-col>
       <el-col :span="19" class="slider-box">
         <el-switch :active-value="1" :inactive-value="0" v-model="isShow" @change="changeState" />
       </el-col>
-    </div>
+    </div> -->
     <div class="c_row-item acea-row row-top">
       <el-col class="label" :span="4"> 背景设置 </el-col>
       <el-col :span="19" class="slider-box">
@@ -157,7 +157,7 @@ export default {
   background: #ccc;
 }
 
-/deep/.ivu-input {
+::v-deep.ivu-input {
   font-size: 13px !important;
 }
 
@@ -211,7 +211,7 @@ export default {
   }
 }
 
-.ivu-color-picker /deep/ .ivu-select-dropdown {
+.ivu-color-picker ::v-deep .ivu-select-dropdown {
   position: absolute;
   // width: 300px !important;
   left: 34px !important;

template/admin/src/components/mobileConfigRightDiy/c_foot.vue

@@ -169,7 +169,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
- /deep/.ivu-input{
+ ::v-deep.ivu-input{
      font-size 13px!important;
   }
 .tips

template/admin/src/components/mobileConfigRightDiy/c_hot_imgs.vue

@@ -186,7 +186,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/.ivu-input{
+::v-deep.ivu-input{
     font-size 13px!important;
 }
 .hot_imgs

template/admin/src/components/mobileConfigRightDiy/c_hot_word.vue

@@ -118,7 +118,7 @@ export default {
                 justify-content center
                 width 36px
                 cursor move
-            /deep/.ivu-input
+            ::v-deep.ivu-input
                 flex 1
                 height 36px
                 font-size 13px!important

template/admin/src/components/mobileConfigRightDiy/c_input_item.vue

@@ -71,7 +71,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/.ivu-input
+::v-deep.ivu-input
     font-size 13px!important
 .c_row-item
     margin-bottom 13px

template/admin/src/components/mobileConfigRightDiy/c_input_number.vue

@@ -64,7 +64,7 @@ export default {
 <style scoped lang="stylus">
 .ivu-input-number
     width 100%
-/deep/.ivu-input
+::v-deep.ivu-input
     font-size 13px!important
 .numbox
     display flex

template/admin/src/components/mobileConfigRightDiy/c_menu_list.vue

@@ -281,7 +281,7 @@ export default {
                         font-size 13px
                     .input-box
                         flex 1
-                       /deep/ .ivu-input
+                       ::v-deep .ivu-input
                             font-size 13px!important
             .delect-btn
                 position absolute

template/admin/src/components/mobileConfigRightDiy/c_pictrue.vue

@@ -169,7 +169,7 @@ export default {
 };
 </script>
 <style scoped lang="stylus">
-/deep/ .ivu-divider-horizontal {
+::v-deep .ivu-divider-horizontal {
     margin 12px 0
 }
 .empty-box {

template/admin/src/components/mobileConfigRightDiy/c_product.vue

@@ -149,7 +149,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/.ivu-input
+::v-deep.ivu-input
     font-size 13px!important
 .c_product
     border-bottom 1px solid rgba(0,0,0,0.05);

template/admin/src/components/mobileConfigRightDiy/c_set_up.vue

@@ -105,10 +105,10 @@ export default {
     transform: translateX(100%);
   }
 }
-.setUp /deep/.ivu-tabs-nav-scroll {
+.setUp ::v-deep.ivu-tabs-nav-scroll {
   padding: 0 30px;
 }
-.setUp /deep/.ivu-tabs-nav .ivu-tabs-tab {
+.setUp ::v-deep.ivu-tabs-nav .ivu-tabs-tab {
   padding: 8px 45px;
 }
 </style>

template/admin/src/components/mobileConfigRightDiy/c_tab.vue

@@ -72,7 +72,7 @@ export default {
     border-left 1px solid #dcdee2
 }
 // .radio-box
-//     /deep/.ivu-radio-group-button
+//     ::v-deep.ivu-radio-group-button
 //         display flex
 //         width 100%
 //         flex-wrap: wrap
@@ -82,7 +82,7 @@ export default {
 //             align-items center
 //             justify-content center
 //     &.on
-//         /deep/.ivu-radio-group-button
+//         ::v-deep.ivu-radio-group-button
 //             .ivu-radio-wrapper
 //                 flex unset
 //                 width 67px

template/admin/src/components/mobilePageDiy/z_ueditor.vue

@@ -118,7 +118,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.mobile-page /deep/video{
+.mobile-page ::v-deepvideo{
     width 100%!important
 }
 .box

template/admin/src/components/modelSure/modelSure.vue

@@ -58,7 +58,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.acea-row >>> .ivu-btn-primary
+.acea-row ::v-deep .ivu-btn-primary
     background-color: rgb(170, 170, 170);
     border-color: rgb(170, 170, 170);
 </style>

template/admin/src/components/newsCategory/index.vue

@@ -293,17 +293,17 @@ export default {
   }
 }
 
-.contentBox >>> .vue-waterfall-easy {
+.contentBox ::v-deep .vue-waterfall-easy {
   width: 100% !important;
   left: 0 !important;
   margin-left: 0 !important;
 }
 
-.contentBox >>> .vue-waterfall-easy-scroll::-webkit-scrollbar {
+.contentBox ::v-deep .vue-waterfall-easy-scroll::-webkit-scrollbar {
   display: none;
 }
 
-.contentBox >>> .vue-waterfall-easy-scroll {
+.contentBox ::v-deep .vue-waterfall-easy-scroll {
   scrollbar-width: none; /* firefox */
   -ms-overflow-style: none; /* IE 10+ */
   overflow-x: hidden;
@@ -382,7 +382,7 @@ export default {
   }
 }
 
-.news_pic >>> .ivu-btn-error {
+.news_pic ::v-deep .ivu-btn-error {
   width: 24px !important;
   height: 24px !important;
   background: #FF5D5F !important;
@@ -390,13 +390,13 @@ export default {
   border: 1px solid #eee !important;
 }
 
-.news_pic >>>.ivu-btn-error:hover {
+.news_pic ::v-deep.ivu-btn-error:hover {
   background: #FF5D5F !important;
   border: 1px solid #fff !important;
   color: #fff !important;
 }
 
-.news_pic >>> .ivu-btn-success {
+.news_pic ::v-deep .ivu-btn-success {
   width: 24px !important;
   height: 24px !important;
   border: 1px solid #eee !important;

template/admin/src/components/publicSearchFrom/index.vue

@@ -57,15 +57,15 @@
     cursor pointer
 .ivu-form-item
     margin-bottom 10px
-.tabform >>> .ivu-col
+.tabform ::v-deep .ivu-col
     padding 0!important;
-.tabform >>> .ivu-row-flex
+.tabform ::v-deep .ivu-row-flex
    margin 0!important;
-.withdrawal >>> .item
+.withdrawal ::v-deep .item
    margin-right 10px;
-.tab_data >>> .ivu-form-item-content
+.tab_data ::v-deep .ivu-form-item-content
    margin-left 10px!important
-.ivu-form-label-left >>> .ivu-form-item-label
+.ivu-form-label-left ::v-deep .ivu-form-item-label
     text-align: right;
 </style>
 <script>

template/admin/src/components/quill/index.vue

@@ -130,7 +130,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="scss">
 .i-quill-no-border {
   .ql-toolbar.ql-snow {
     border: none;

template/admin/src/components/searchFrom/searchFrom.vue

@@ -128,11 +128,11 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.tab_data >>> .ivu-form-item-content
+.tab_data ::v-deep .ivu-form-item-content
     margin-left 0 !important
-.table_box >>> .ivu-divider-horizontal
+.table_box ::v-deep .ivu-divider-horizontal
     margin-top 0px !important
-.table_box >>> .ivu-form-item
+.table_box ::v-deep .ivu-form-item
     margin-bottom: 15px !important;
 .tabform
     margin-bottom 10px

template/admin/src/components/sortList/index.vue

@@ -158,13 +158,13 @@ export default {
         height 100%
 
 .tabform
-    >>> .ivu-form-item
+    ::v-deep .ivu-form-item
         margin-bottom 16px !important
 
 .btn
     margin-top 20px
     float right
 .goodList
-    >>> table
+    ::v-deep table
         width 100% !important
 </style>

template/admin/src/components/systemStore/index.vue

@@ -461,7 +461,7 @@ export default {
   }
 }
 
-.mapBox >>> .ivu-modal-body {
+.mapBox ::v-deep .ivu-modal-body {
   height: 640px !important;
 }
 

template/admin/src/components/uploadImg/index.vue

@@ -3,6 +3,7 @@
     <el-dialog
       title="上传图片"
       :visible.sync="uploadModal"
+      :append-to-body="true"
       :width="isIframe ? '100%' : '1024px'"
       :fullscreen="isIframe"
       @close="closed"
@@ -408,12 +409,12 @@ export default {
   },
 };
 </script>
-<style lang="stylus" scoped>
-/deep/ .el-dialog__title{
+<style lang="scss" scoped>
+::v-deep .el-dialog__title {
   font-size: 16px;
 }
-.main{
-    min-height: 410px
+.main {
+  min-height: 410px;
 }
 .pictrue {
   width: 60px !important;
@@ -434,90 +435,91 @@ export default {
   font-size: 18px;
   right: -5px;
   top: -5px;
-  color #999
+  color: #999;
 }
-.form-width{
-    width 280px
+.form-width {
+  width: 280px;
 }
-.tq-text{
-    margin-left 14px
-    font-size: 12px;
-    font-weight: 400;
-    color: var(--prev-color-primary);
-    cursor pointer
+.tq-text {
+  margin-left: 14px;
+  font-size: 12px;
+  font-weight: 400;
+  color: var(--prev-color-primary);
+  cursor: pointer;
 }
-.uploadCont /deep/ .el-upload--picture-card, /deep/ .el-upload-list--picture-card .el-upload-list__item{
-    width 64px
-    height 64px
-    line-height: 72px;
-    overflow inherit
+.uploadCont ::v-deep .el-upload--picture-card,
+::v-deep .el-upload-list--picture-card .el-upload-list__item {
+  width: 64px;
+  height: 64px;
+  line-height: 72px;
+  overflow: inherit;
 }
-.uploadCont /deep/ .el-upload--picture-card, /deep/ .el-upload-list--picture-card .el-upload-list__item img{
-    width 64px !important
-    height 64px !important
-    border-radius: 6px;
-    object-fit: cover;
+.uploadCont ::v-deep .el-upload--picture-card,
+::v-deep .el-upload-list--picture-card .el-upload-list__item img {
+  width: 64px !important;
+  height: 64px !important;
+  border-radius: 6px;
+  object-fit: cover;
 }
-.pl100{
-    padding-left 100px
+.pl100 {
+  padding-left: 100px;
 }
-.img-box{
-    display flex
-    flex-wrap: wrap
+.img-box {
+  display: flex;
+  flex-wrap: wrap;
 }
-.tips{
-    font-size: 12px;
-    color #BBBBBB
+.tips {
+  font-size: 12px;
+  color: #bbbbbb;
 }
-.code-image{
-    display flex
-    margin-top 12px
-    .left{
-        display flex
-        flex-direction: column
-            margin-right 20px
-        align-items center
-        .code{
-            border: 1px solid #DDDDDD;
-            display flex
-            align-items center
-            justify-content center
-            width 200px
-            height 200px
-            border-radius: 4px
-            .code-img{
-                width 160px
-                height 160px
-            }
-        }
-        .form-width{
-            width 200px
-        }
-        .code{
-            margin-bottom 14px
-        }
-         .trip{
-          color #333333
-          text-align: center
-          line-height: 18px;
-        }
-        .trip-small{
-            font-size: 12px;
-            font-weight: 400;
-            color: #BBBBBB;
-            text-align: center
-            line-height: 16px;
-        }
+.code-image {
+  display: flex;
+  margin-top: 12px;
+  .left {
+    display: flex;
+    flex-direction: column;
+    margin-right: 20px;
+    align-items: center;
+    .code {
+      border: 1px solid #dddddd;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 200px;
+      height: 200px;
+      border-radius: 4px;
+      .code-img {
+        width: 160px;
+        height: 160px;
+      }
     }
-    .right{
-      margin-top: 62px;
-        .tip{
-            font-size: 12px;
-            font-weight: 400;
-            color: #BBBBBB;
-            margin 10px 0
-        }
-
+    .form-width {
+      width: 200px;
+    }
+    .code {
+      margin-bottom: 14px;
+    }
+    .trip {
+      color: #333333;
+      text-align: center;
+      line-height: 18px;
     }
+    .trip-small {
+      font-size: 12px;
+      font-weight: 400;
+      color: #bbbbbb;
+      text-align: center;
+      line-height: 16px;
+    }
+  }
+  .right {
+    margin-top: 62px;
+    .tip {
+      font-size: 12px;
+      font-weight: 400;
+      color: #bbbbbb;
+      margin: 10px 0;
+    }
+  }
 }
 </style>

template/admin/src/components/uploadPictures/index.vue

@@ -25,7 +25,7 @@
                   > -->
                   <span class="file-name">
                     <img v-if="!data.pid" class="icon" src="@/assets/images/file.jpg" />
-                    <span class="name line1">{{ data.name }}</span>
+                    <span class="name line1">{{ data.title }}</span>
                   </span>
                   <span>
                     <el-dropdown @command="(command) => clickMenu(data, command)">
@@ -133,18 +133,8 @@
                     <span class="operate" @click="lookImg(item)" v-if="item.isShowEdit">查看</span>
                   </div>
                 </div>
-                <!-- <div class="nameStyle" v-show="item.realName && item.real_name">
-                    {{ item.real_name }}
-                  </div> -->
               </div>
             </div>
-            <!--<Col class="mb20" v-bind="gridPic"-->
-            <!--v-for="(item, index) in pictrueList" :key="index" >-->
-            <!--<div class="pictrueList_pic">-->
-            <!--<img :class="item.isSelect ? 'on': '' " v-lazy="item.satt_dir"-->
-            <!--@click.stop="changImage(item, index, pictrueList)"/>-->
-            <!--</div>-->
-            <!--</Col>-->
           </div>
           <el-table
             v-if="lietStyle == 'table'"
@@ -197,7 +187,7 @@
             v-if="total"
             :total="total"
             :pageCount="9"
-            layout="total, prev, pager, next, jumper"
+            layout="total, prev, pager, next"
             :page.sync="fileData.page"
             @pagination="pageChange"
             :limit.sync="fileData.limit"
@@ -386,6 +376,7 @@ export default {
     },
     uploadSuccess() {
       this.fileData.page = 1;
+      this.initData();
       this.getFileList();
     },
     uploadModal() {
@@ -485,11 +476,6 @@ export default {
         data.flag2 = false;
       }
     },
-    // onClick(root, node, data, e) {
-    //   e.preventDefault();
-
-    //   data.flag2 = !data.flag2;
-    // },
     // 点击树
     appendBtn(data) {
       this.treeId = data.id;
@@ -520,16 +506,6 @@ export default {
           this.$message.error(res.msg);
         });
     },
-    // 确认删除树
-    // submitModel () {
-    //     if (this.tits === '图片') {
-    //         this.getFileList();
-    //         this.checkPicList = [];
-    //     } else {
-    //         this.getList();
-    //         this.checkPicList = [];
-    //     }
-    // },
     // 编辑树表单
     editPic(data) {
       this.$modalForm(categoryEditApi(data.id)).then(() => this.getList());
@@ -541,7 +517,7 @@ export default {
     // 分类列表树
     getList(type) {
       let data = {
-        name: '全部图片',
+        title: '全部图片',
         id: '',
         pid: 0,
       };
@@ -858,7 +834,7 @@ export default {
     right: 0;
     top: 0;
   }
-  /deep/ .el-badge__content.is-fixed {
+  ::v-deep .el-badge__content.is-fixed {
     top: 13px;
     right: 25px;
   }
@@ -884,7 +860,7 @@ export default {
     .isTree {
       min-height: 374px;
       max-height: 550px;
-      /deep/ .file-name {
+      ::v-deep .file-name {
         display: flex;
         align-items: center;
         .name {
@@ -896,17 +872,17 @@ export default {
           margin-right: 8px;
         }
       }
-      /deep/ .el-tree-node {
+      ::v-deep .el-tree-node {
         margin-right: 16px;
       }
-      /deep/ .el-tree-node__children .el-tree-node {
+      ::v-deep .el-tree-node__children .el-tree-node {
         margin-right: 0;
       }
-      /deep/ .el-tree-node__content {
+      ::v-deep .el-tree-node__content {
         width: 100%;
         height: 36px;
       }
-      /deep/ .custom-tree-node {
+      ::v-deep .custom-tree-node {
         flex: 1;
         display: flex;
         align-items: center;
@@ -917,11 +893,11 @@ export default {
         color: rgba(0, 0, 0, 0.6);
         line-height: 13px;
       }
-      /deep/ .is-current {
+      ::v-deep .is-current {
         background: #f1f9ff !important;
         color: var(--prev-color-primary) !important;
       }
-      /deep/ .is-current .custom-tree-node {
+      ::v-deep .is-current .custom-tree-node {
         color: var(--prev-color-primary) !important;
       }
     }
@@ -932,7 +908,7 @@ export default {
   }
 }
 
-.treeSel >>> .ivu-select-dropdown-list {
+.treeSel ::v-deep .ivu-select-dropdown-list {
   padding: 0 5px !important;
   box-sizing: border-box;
   width: 200px;
@@ -1022,7 +998,7 @@ export default {
   display: inline-block;
 }
 
-.bnt /deep/ .ivu-tree-children {
+.bnt ::v-deep .ivu-tree-children {
   padding: 5px 0;
 }
 

template/admin/src/components/wangEditor/index.vue

@@ -189,7 +189,7 @@ export default {
   margin-bottom: 10px;
   cursor: pointer;
 }
-.monaco-box /deep/ .el-textarea__inner{
+.monaco-box ::v-deep .el-textarea__inner{
   height: 600px;
 }
 </style>

template/admin/src/components/wangEditor/monaco.vue

@@ -63,10 +63,10 @@ export default {
   width: 100%;
   margin: 0 auto;
 }
-.text /deep/ .ivu-input-wrapper {
+.text ::v-deep .ivu-input-wrapper {
   min-height: 600px;
 }
-.text /deep/ textarea.ivu-input {
+.text ::v-deep textarea.ivu-input {
   min-height: 600px;
 }
 .text {

template/admin/src/layout/component/transverseAside.vue

@@ -219,7 +219,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .el-scrollbar__bar.is-horizontal {
+::v-deep .el-scrollbar__bar.is-horizontal {
   height: 0;
 }
 .el-menu-horizontal-warp {
@@ -321,13 +321,13 @@ export default {
     }
   }
 }
-/deep/ .el-scrollbar {
+::v-deep .el-scrollbar {
   height: 50px;
 }
-/deep/ .el-scrollbar__bar.is-horizontal {
+::v-deep .el-scrollbar__bar.is-horizontal {
   display: none;
 }
-/deep/ .el-scrollbar__thumb {
+::v-deep .el-scrollbar__thumb {
   display: none;
 }
 </style>

template/admin/src/layout/navBars/breadcrumb/search.vue

@@ -99,10 +99,10 @@ export default {
     transform: translateX(-50%);
   }
 }
-/deep/ .el-dialog__header {
+::v-deep .el-dialog__header {
   border: none !important;
 }
-/deep/ .el-input--small .el-input__inner {
+::v-deep .el-input--small .el-input__inner {
   height: 36px;
   line-height: 36px;
 }

template/admin/src/layout/navBars/breadcrumb/setings.vue

@@ -296,7 +296,7 @@ export default {
         themeSelect['--prev-bg-menuBarColor'] = '#fff';
         themeSelect['--prev-MenuActiveColor'] = '#fff';
         if (val == 'theme-1') {
-          themeSelect['--prev-bg-menu-hover-ba-color'] = '#0256FF';
+          themeSelect['--prev-bg-menu-hover-ba-color'] = '#e8f4ff';
           themeSelect['--prev-bg-menuBar'] = '#282c34';
           themeSelect['--prev-border-color-lighter'] = '#282c34';
         } else if (val == 'theme-3') {
@@ -514,10 +514,10 @@ body .v-modal {
 .mr5 {
   margin-right: 5px;
 }
-/deep/ .el-drawer__header {
+::v-deep .el-drawer__header {
   margin-bottom: 0;
 }
-/deep/ .el-radio-button--mini .el-radio-button__inner {
+::v-deep .el-radio-button--mini .el-radio-button__inner {
   padding: 7px 8px;
 }
 .layout-breadcrumb-seting-bar {

template/admin/src/layout/navBars/breadcrumb/user.vue

@@ -30,7 +30,7 @@
         :class="!isScreenfull ? 'el-icon-full-screen' : 'el-icon-crop'"
       ></i>
     </div>
-    <el-dropdown :show-timeout="70" :hide-timeout="50" @command="onDropdownCommand">
+    <el-dropdown :show-timeout="70" @command="onDropdownCommand">
       <span class="layout-navbars-breadcrumb-user-link">
         <img :src="getUserInfos.head_pic" class="layout-navbars-breadcrumb-user-link-photo mr5" />
         {{ getUserInfos.account === '' ? 'test' : getUserInfos.account }}

template/admin/src/layout/navBars/tagsView/tagsView.vue

@@ -370,7 +370,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .el-scrollbar__bar.is-horizontal {
+::v-deep .el-scrollbar__bar.is-horizontal {
   height: 0;
 }
 .el-dropdown-menu {

template/admin/src/layout/navMenu/horizontal.vue

@@ -130,7 +130,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-/deep/ .el-scrollbar__bar.is-horizontal {
+::v-deep .el-scrollbar__bar.is-horizontal {
   height: 0;
 }
 .el-menu-horizontal-warp {

template/admin/src/layout/navMenu/vertical.vue

@@ -84,12 +84,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-/deep/ .center {
+::v-deep .center {
   text-align: center;
   margin-right: 0 !important;
   margin-left: 5px;
 }
-// /deep/.el-submenu__title {
+// ::v-deep.el-submenu__title {
 //   display: flex;
 //   justify-content: center;
 //   align-items: center;

template/admin/src/main.js

@@ -39,7 +39,7 @@ import 'xe-utils';
 import 'vxe-table/lib/style.css';
 
 import 'v-org-tree/dist/v-org-tree.css';
-import './styles/index.less';
+import './styles/index.scss';
 import 'swiper/css/swiper.css';
 import 'viewerjs/dist/viewer.css';
 import 'codemirror/lib/codemirror.css';
@@ -109,7 +109,6 @@ const messages = ['success', 'warning', 'info', 'error'];
 
 messages.forEach((type) => {
   Element.Message[type] = (options) => {
-    console.log(options, 'optionss');
     if (typeof options === 'string') {
       options = {
         message: options,

template/admin/src/pages/account/login/index.vue

@@ -215,7 +215,6 @@ export default {
           this.$store.commit('menus/setOneLvMenus', arr);
           let routes = formatFlatteningRoutes(data.menus);
           this.$store.commit('menus/setOneLvRoute', routes);
-
           // 记录用户信息
           this.$store.commit('userInfo/name', data.user_info.account);
           this.$store.commit('userInfo/avatar', data.user_info.head_pic);
@@ -458,7 +457,7 @@ a:link, a:visited, a:hover, a:active {
   color: #0366D6;
 }
 
-.index_from >>> .ivu-input-large {
+.index_from ::v-deep .ivu-input-large {
   font-size: 14px !important;
 }
 
@@ -468,10 +467,10 @@ a:link, a:visited, a:hover, a:active {
 .pull-right {
     float: right!important;
 }
-/deep/ .el-button--primary{
+::v-deep .el-button--primary{
   border:none;
 }
-/deep/ .el-button{
+::v-deep .el-button{
   padding: 13px 20px !important;
 }
 .pull-right {

template/admin/src/pages/agent/agentManage.vue

@@ -73,24 +73,24 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="推广用户数量" min-width="120">
+        <el-table-column label="分销等级" min-width="120">
           <template slot-scope="scope">
-            <span>{{ scope.row.spread_count }}</span>
+            <div>{{ scope.row.agentLevel ? scope.row.agentLevel.name : '--' }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="分销等级" min-width="120">
+        <el-table-column label="推广用户数量" min-width="120">
           <template slot-scope="scope">
-            <div>{{ scope.row.agentLevel ? scope.row.agentLevel.name : '--' }}</div>
+            <span>{{ scope.row.spread_count }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="订单数量" min-width="120">
+        <el-table-column label="推广订单数量" min-width="120">
           <template slot-scope="scope">
-            <div>{{ scope.row.order_count }}</div>
+            <div>{{ scope.row.spread_order.order_count }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="订单金额" min-width="120">
+        <el-table-column label="推广订单金额" min-width="120">
           <template slot-scope="scope">
-            <div>{{ scope.row.order_price }}</div>
+            <div>{{ scope.row.spread_order.order_price || '0.00' }}</div>
           </template>
         </el-table-column>
         <el-table-column label="佣金总金额" min-width="120">
@@ -569,6 +569,6 @@ img {
   margin-bottom: 10px;
 }
 
-/* .ivu-mt >>> .ivu-table-header */
+/* .ivu-mt ::v-deep .ivu-table-header */
 /* border-top:1px dashed #ddd!important */
 </style>

template/admin/src/pages/app/upload/index.vue

@@ -201,7 +201,7 @@ export default {
   background-color: #fff;
 }
 
-/deep/ .el-upload-list--picture-card .el-upload-list__item {
+::v-deep .el-upload-list--picture-card .el-upload-list__item {
   // width: 113px;
   // height: 113px;
   // line-height: 113px;
@@ -212,12 +212,12 @@ export default {
   padding-top: 31.3%;
   aspect-ratio: 1 / 1;
 }
-/deep/ .el-upload-list--picture-card .el-upload-list__item > div {
+::v-deep .el-upload-list--picture-card .el-upload-list__item > div {
   // position: relative;
   width: 100%;
   height: 100%;
 }
-/deep/ .el-upload--picture-card {
+::v-deep .el-upload--picture-card {
   width: 100%;
   height: 100%;
   display: flex;
@@ -226,7 +226,7 @@ export default {
   align-items: center;
   background: #f9f9f9;
 }
-/deep/ .el-upload-list--picture-card .el-upload-list__item img {
+::v-deep .el-upload-list--picture-card .el-upload-list__item img {
   width: 100%;
   height: 100%;
   border-radius: 6px;
@@ -244,7 +244,7 @@ export default {
   color: #282828;
   opacity: 0.5;
 }
-/deep/ .el-upload--picture-card:hover,
+::v-deep .el-upload--picture-card:hover,
 .el-upload:focus {
   border-color: #c0ccda;
 }
@@ -253,7 +253,7 @@ export default {
   padding-left: 100px;
   flex-wrap: wrap;
 }
-.none-card /deep/ .el-upload--picture-card {
+.none-card ::v-deep .el-upload--picture-card {
   display: none !important;
 }
 .footer {

template/admin/src/pages/app/wechat/menus/index.vue

@@ -102,9 +102,7 @@
               </el-tabs>
               <el-col :span="24" v-if="isTrue">
                 <el-button size="small" type="danger" @click="deltMenus">删除</el-button>
-                <el-button type="primary" @click="submenus('formValidate')"
-                  >保存并发布</el-button
-                >
+                <el-button type="primary" @click="submenus('formValidate')">保存并发布</el-button>
               </el-col>
             </el-col>
           </el-col>
@@ -230,7 +228,7 @@ export default {
         this.checkedMenuId = id;
         this.parentMenuId = index;
         this.isTrue = true;
-      }else{
+      } else {
         this.$message.warning('二级菜单最多只能添加5个!');
         return false;
       }
@@ -287,30 +285,32 @@ export default {
                 if (e.detail != 0) {
                   done();
                 }
-              };
+              }
             } else {
               done();
             }
           },
-        }).then(() => {
-          this.parentMenuId === null
+        })
+          .then(() => {
+            this.parentMenuId === null
               ? this.list.splice(this.checkedMenuId, 1)
               : this.list[this.parentMenuId].sub_button.splice(this.checkedMenuId, 1);
-          this.parentMenuId = null;
-          this.formValidate = {
-            name: '',
-            type: 'click',
-            appid: '',
-            url: '',
-            key: '',
-            pagepath: '',
-            id: 0,
-          };
-          this.isTrue = true;
-          this.modal2 = false;
-          this.checkedMenuId = null;
-          this.$refs['formValidate'].resetFields();
-          }).catch(() => {});
+            this.parentMenuId = null;
+            this.formValidate = {
+              name: '',
+              type: 'click',
+              appid: '',
+              url: '',
+              key: '',
+              pagepath: '',
+              id: 0,
+            };
+            this.isTrue = true;
+            this.modal2 = false;
+            this.checkedMenuId = null;
+            this.$refs['formValidate'].resetFields();
+          })
+          .catch(() => {});
       } else {
         this.$message.warning('请选择菜单!');
       }
@@ -338,7 +338,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="less">
+<style scoped lang="scss">
 * {
   -moz-user-select: none; /*火狐*/
   -webkit-user-select: none; /*webkit浏览器*/
@@ -346,7 +346,7 @@ export default {
   -khtml-user-select: none; /*早期浏览器*/
   user-select: none;
 }
- /deep/ .el-card__body {
+::v-deep .el-card__body {
   padding: 60px 20px;
 }
 .left {
@@ -387,7 +387,6 @@ export default {
   cursor: pointer;
   color: #999;
   position: relative;
-  
 }
 .text {
   height: 50px;
@@ -427,7 +426,7 @@ export default {
   line-height: 48px;
   background: #fafafa;
   :first-child {
-    border:none
+    border: none;
   }
 }
 .addadd {
@@ -436,7 +435,6 @@ export default {
   border-top: 1px solid #f0f0f0;
   background: #fafafa;
   height: 40px;
-  
 }
 .right {
   background: #fff;

template/admin/src/pages/app/wechat/newsCategory/save.vue

@@ -345,7 +345,7 @@ export default {
 
 <style scoped lang="stylus">
 .newsBox {
-  >>>.ivu-global-footer {
+  ::v-deep.ivu-global-footer {
     dispaly: none !important;
   }
 }
@@ -400,7 +400,7 @@ export default {
   margin: 0 2px;
 }
 
-.save_from >>> .ivu-btn-error {
+.save_from ::v-deep .ivu-btn-error {
   width: 24px !important;
   height: 24px !important;
   background: #FFF !important;
@@ -408,7 +408,7 @@ export default {
   border: 1px solid #eee !important;
 }
 
-.save_from >>>.ivu-btn-error:hover {
+.save_from ::v-deep.ivu-btn-error:hover {
   background: #FF5D5F !important;
   border: 1px solid #fff !important;
   color: #fff !important;

template/admin/src/pages/app/wechat/reply/follow.vue

@@ -575,7 +575,7 @@ export default {
     height: 100%;
 }
 .modelBox
-   >>> .ivu-modal-body
+   ::v-deep .ivu-modal-body
      padding 0 16px 16px 16px !important
 .news_pic
     width: 100%

template/admin/src/pages/app/wechat/user/message.vue

@@ -199,6 +199,6 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.btn_box >>> .ivu-form-item-content
+.btn_box ::v-deep .ivu-form-item-content
     margin-left 0 !important
 </style>

template/admin/src/pages/cms/addArticle/index.vue

@@ -305,7 +305,7 @@ export default {
 .content_width {
   width: 414px;
 }
-/deep/.ivu-form-item-content {
+::v-deep.ivu-form-item-content {
   line-height: unset !important;
 }
 .picBox {

template/admin/src/pages/cms/article/index.vue

@@ -296,7 +296,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.treeSel >>>.ivu-select-dropdown-list {
+.treeSel ::v-deep.ivu-select-dropdown-list {
   padding: 0 10px !important;
   box-sizing: border-box;
 }

template/admin/src/pages/cms/articleCategory/index.vue

@@ -68,7 +68,7 @@
           <template v-slot="{ row }">
             <a @click="edit(row)">编辑</a>
             <el-divider direction="vertical"></el-divider>
-            <a @click="del(row, '删除文章分类',scope.$index)">删除</a>
+            <a @click="del(row, '删除文章分类', index)">删除</a>
             <el-divider direction="vertical"></el-divider>
             <a @click="lookUp(row)">查看文章</a>
           </template>

template/admin/src/pages/division/agent/agreement.vue

@@ -75,7 +75,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-/deep/.ivu-form-item-content {
+::v-deep.ivu-form-item-content {
   line-height: unset !important;
 }
 </style>

template/admin/src/pages/division/agent/applyList.vue

@@ -312,11 +312,11 @@ export default {
   }
 }
 
-/deep/ .ivu-menu-vertical .ivu-menu-item-group-title {
+::v-deep .ivu-menu-vertical .ivu-menu-item-group-title {
   display: none;
 }
 
-/deep/ .ivu-menu-vertical.ivu-menu-light:after {
+::v-deep .ivu-menu-vertical.ivu-menu-light:after {
   display: none;
 }
 

template/admin/src/pages/division/agent/index.vue

@@ -336,11 +336,11 @@ export default {
   }
 }
 
-/deep/ .ivu-menu-vertical .ivu-menu-item-group-title {
+::v-deep .ivu-menu-vertical .ivu-menu-item-group-title {
   display: none;
 }
 
-/deep/ .ivu-menu-vertical.ivu-menu-light:after {
+::v-deep .ivu-menu-vertical.ivu-menu-light:after {
   display: none;
 }
 

template/admin/src/pages/division/list/index.vue

@@ -348,11 +348,11 @@ export default {
   }
 }
 
-/deep/ .ivu-menu-vertical .ivu-menu-item-group-title {
+::v-deep .ivu-menu-vertical .ivu-menu-item-group-title {
   display: none;
 }
 
-/deep/ .ivu-menu-vertical.ivu-menu-light:after {
+::v-deep .ivu-menu-vertical.ivu-menu-light:after {
   display: none;
 }
 

template/admin/src/pages/finance/balance/index.vue

@@ -266,15 +266,15 @@ export default {
   margin-bottom: 10px;
 }
 
-.status >>> .item~.item {
+.status ::v-deep .item~.item {
   margin-left: 6px;
 }
 
-.status >>> .statusVal {
+.status ::v-deep .statusVal {
   margin-bottom: 7px;
 }
 
-/* .ivu-mt >>> .ivu-table-header */
+/* .ivu-mt ::v-deep .ivu-table-header */
 /* border-top:1px dashed #ddd!important */
 .type {
   padding: 3px 0;

template/admin/src/pages/finance/billingRecords/index.vue

@@ -223,12 +223,12 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
-/deep/ .el-tabs__item {
+<style scoped lang="scss">
+::v-deep .el-tabs__item {
   height: 54px !important;
   line-height: 54px !important;
 }
-/deep/.ivu-card-body {
+::v-deep.ivu-card-body {
   padding: 0;
 }
 

template/admin/src/pages/finance/capitalFlow/index.vue

@@ -267,15 +267,15 @@ export default {
   margin-bottom: 10px;
 }
 
-.status >>> .item~.item {
+.status ::v-deep .item~.item {
   margin-left: 6px;
 }
 
-.status >>> .statusVal {
+.status ::v-deep .statusVal {
   margin-bottom: 7px;
 }
 
-/* .ivu-mt >>> .ivu-table-header */
+/* .ivu-mt ::v-deep .ivu-table-header */
 /* border-top:1px dashed #ddd!important */
 .type {
   padding: 3px 0;

template/admin/src/pages/finance/commission/handle/commissionDetails.vue

@@ -32,7 +32,7 @@
           <el-col :span="12">
             <el-form-item label="时间范围：" class="tab_data">
               <el-date-picker
-                  clearable
+                clearable
                 :editable="false"
                 @change="onchangeTime"
                 format="yyyy-MM-dd"
@@ -40,7 +40,7 @@
                 type="daterange"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
-                  style="width: 100%"
+                style="width: 100%"
               ></el-date-picker>
             </el-form-item>
           </el-col>
@@ -173,7 +173,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="scss">
 .table {
   .ivu-table-default {
     overflow-y: auto;

template/admin/src/pages/finance/commission/index.vue

@@ -20,7 +20,6 @@
           <el-form-item label="佣金范围：" class="tab_data">
             <el-input-number
                 :controls="false"
-                type="number"
                 :min="0"
                 class="mr10"
                 v-model="formValidate.price_min"
@@ -28,7 +27,6 @@
             <span class="mr10">一</span>
             <el-input-number
                 :controls="false"
-                type="number"
                 :min="0"
                 v-model="formValidate.price_max"
             />
@@ -190,7 +188,7 @@ export default {
   margin-left: 10px;
 }
 
-.tab_data >>> .ivu-form-item-content {
+.tab_data ::v-deep .ivu-form-item-content {
   display: flex !important;
 }
 </style>

template/admin/src/pages/finance/components/commissionDetails/index.vue

@@ -216,7 +216,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .colorred {
   color: #ff5722;
 }

template/admin/src/pages/finance/financialRecords/bill/index.vue

@@ -195,7 +195,7 @@ export default {
 </script>
 
 <style scoped lang="stylus">
-.ivu-form-label-left >>> .ivu-form-item-label {
+.ivu-form-label-left ::v-deep .ivu-form-item-label {
   text-align: right;
 }
 
@@ -211,7 +211,7 @@ export default {
   color: #009688;
 }
 
-.ivu-mt /deep/ .ivu-select-placeholder {
+.ivu-mt ::v-deep .ivu-select-placeholder {
   height: 32px;
 }
 </style>

template/admin/src/pages/finance/financialRecords/recharge/index.vue

@@ -299,10 +299,10 @@ export default {
     cursor pointer
 .ivu-form-item
     margin-bottom 10px
-.status >>> .item~.item
+.status ::v-deep .item~.item
     margin-left 6px
-.status >>> .statusVal
+.status ::v-deep .statusVal
     margin-bottom 7px
-/*.ivu-mt >>> .ivu-table-header*/
+/*.ivu-mt ::v-deep .ivu-table-header*/
 /*    border-top:1px dashed #ddd!important*/
 </style>

template/admin/src/pages/finance/userExtract/index.vue

@@ -419,11 +419,11 @@ export default {
     cursor pointer
 .ivu-form-item
     margin-bottom 10px
-.status >>> .item~.item
+.status ::v-deep .item~.item
     margin-left 6px
-.status >>> .statusVal
+.status ::v-deep .statusVal
     margin-bottom 7px
-/*.ivu-mt >>> .ivu-table-header*/
+/*.ivu-mt ::v-deep .ivu-table-header*/
 /*    border-top:1px dashed #ddd!important*/
 .type
    padding 3px 0

template/admin/src/pages/index/components/baseInfo.vue

@@ -99,7 +99,7 @@ export default {
 .ivu-text-right {
   text-align: right;
 }
-/deep/.el-card__header {
+::v-deep.el-card__header {
   border-bottom: none !important;
   padding-bottom: 0;
 }

template/admin/src/pages/index/components/gridMenu.vue

@@ -97,7 +97,7 @@ export default {
   },
 };
 </script>
-<style lang="less">
+<style lang="scss">
 .el-tag {
   color: var(--prev-color-primary) !important;
   background-color: #fff !important;

template/admin/src/pages/index/components/userChart.vue

@@ -114,7 +114,7 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
 .dashboard-console-visit {
   ul {
     li {

template/admin/src/pages/index/components/visitChart.vue

@@ -124,7 +124,7 @@ export default {
   },
 };
 </script>
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .dashboard-console-visit {
   ul {
     li {
@@ -140,7 +140,7 @@ export default {
   padding-left: 8px !important;
 }
 .card-title {
-    display: flex;
+  display: flex;
   align-items: center;
 }
 </style>

template/admin/src/pages/index/index.vue

@@ -52,7 +52,7 @@ export default {
             this.authCode = data.auth_code;
             this.auth = true;
           }
-          this.openImage = true
+          this.openImage = true;
         })
         .catch((res) => {});
     },
@@ -63,7 +63,7 @@ export default {
 };
 </script>
 
-<style lang="less">
+<style lang="scss">
 .dashboard-console-visit {
   .ivu-radio-group-button .ivu-radio-wrapper {
     border: none !important;

template/admin/src/pages/kefu/appChat/feedback.vue

@@ -4,7 +4,7 @@
       <div class="feedback-header acea-row">
         <span class="sp1">商城客服已离线</span>
         <div>
-          <i class="el-icon-close" style="font-size: 18px;" @click="close"></i>
+          <i class="el-icon-close" style="font-size: 18px" @click="close"></i>
         </div>
       </div>
       <div v-if="!isShow">
@@ -100,7 +100,7 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
 .maskModel {
   z-index: 7777 !important;
 }

template/admin/src/pages/kefu/appChat/index.vue

@@ -45,10 +45,12 @@
                           </div>
                           <div class="attr">
                             <span>库存：{{ item.productInfo.stock }}</span>
-                            <span>销量：{{
+                            <span
+                              >销量：{{
                                 parseInt(item.productInfo.sales) +
                                 parseInt(item.productInfo.ficti ? item.productInfo.ficti : 0)
-                              }}</span>
+                              }}</span
+                            >
                           </div>
                           <div class="group">
                             <div class="money">￥{{ item.productInfo.price }}</div>
@@ -572,7 +574,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 @import '../../../styles/emoji-awesome/css/google.min.css';
 li {
   list-style-type: none;
@@ -964,11 +966,11 @@ li {
             display: none;
           }
 
-          /deep/ img {
+          ::v-deep img {
             width: 100%;
           }
 
-          /deep/ video {
+          ::v-deep video {
             width: 100%;
           }
         }

template/admin/src/pages/kefu/appChat/mobile/index.vue

@@ -709,10 +709,10 @@ export default {
                 border transparent !important
 
             }
-            >>> .ivu-input{
+            ::v-deep .ivu-input{
                 font-size .28rem !important
             }
-            >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+            ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                 border transparent
                 box-shadow: none;
             }
@@ -827,10 +827,10 @@ export default {
                 border-radius: .32rem;
                 overflow hidden
 
-                >>> .ivu-input{
+                ::v-deep .ivu-input{
                     background #F5F6F9
                 }
-                >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+                ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                     border transparent
                     box-shadow: none;
                 }

template/admin/src/pages/kefu/components/words.vue

@@ -557,10 +557,10 @@ export default {
                 border-radius: .32rem;
                 overflow hidden
 
-                >>> .ivu-input{
+                ::v-deep .ivu-input{
                     background #F5F6F9
                 }
-                >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+                ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                     border transparent
                     box-shadow: none;
                 }

template/admin/src/pages/kefu/index.vue

@@ -15,14 +15,14 @@
               <div class="page-account-top-logo">客服登录</div>
             </div>
             <el-form ref="formInline" :model="formInline" :rules="ruleInline" @keyup.enter="handleSubmit('formInline')">
-              <el-form-item prop="username">
+              <el-form-item class="mb10" prop="username">
                 <el-input type="text" v-model="formInline.username" placeholder="请输入用户名" size="large" />
               </el-form-item>
-              <el-form-item prop="password">
+              <el-form-item class="mb10" prop="password">
                 <el-input type="password" v-model="formInline.password" placeholder="请输入密码" size="large" />
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" long size="large" @click="handleSubmit('formInline')" class="btn">登录 </el-button>
+                <el-button type="primary" size="large" @click="handleSubmit('formInline')" class="btn">登录 </el-button>
               </el-form-item>
             </el-form>
             <div class="qh_box" v-if="!isMobile" @click="bindScan"><span class="iconfont iconerweima2"></span></div>
@@ -488,6 +488,7 @@ export default {
 }
 
 .btn {
+  width: 100%;
   background: #265BED;
 }
 
@@ -519,7 +520,7 @@ a:link, a:visited, a:hover, a:active {
   color: #0366D6;
 }
 
-.index_from >>> .ivu-input-large {
+.index_from ::v-deep .ivu-input-large {
   font-size: 14px !important;
 }
 </style>

template/admin/src/pages/kefu/mobile/chat_list.vue

@@ -453,7 +453,7 @@ body {
             border-bottom: 1px solid #ECEFF8;
 
 
-            >>> .ivu-input {
+            ::v-deep .ivu-input {
                 display: block;
                 width: 100%;
                 height: .68rem;
@@ -464,7 +464,7 @@ body {
                 border-radius: .39rem;
                 text-align center
             }
-            >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+            ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                 border transparent
                 box-shadow: none;
             }

template/admin/src/pages/kefu/mobile/index.vue

@@ -660,7 +660,7 @@ body {
 
             }
 
-            >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+            ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                 border transparent
                 box-shadow: none;
             }
@@ -775,10 +775,10 @@ body {
                 border-radius: .32rem;
                 overflow hidden
 
-                >>> .ivu-input{
+                ::v-deep .ivu-input{
                     background #F5F6F9
                 }
-                >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+                ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
                     border transparent
                     box-shadow: none;
                 }

template/admin/src/pages/kefu/mobile/orderList/index.vue

@@ -424,12 +424,12 @@ export default {
         margin: .2rem auto;
         background: #F5F6F9;
         border-radius: .39rem;
-        >>> .ivu-input{
+        ::v-deep .ivu-input{
             font-size: .28rem !important;
             background: #F5F6F9;
             border-radius: .39rem;
         }
-        >>> .ivu-input, .ivu-input:hover, .ivu-input:focus {
+        ::v-deep .ivu-input, .ivu-input:hover, .ivu-input:focus {
             border: transparent;
             box-shadow: none;
         }

template/admin/src/pages/kefu/mobile/orderList/orderDelivery.vue

@@ -392,7 +392,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="less">
+<style scoped lang="scss">
 .textarea {
   display: block;
   min-height: 1.92rem;

template/admin/src/pages/kefu/mobile/orderList/orderDetail.vue

@@ -232,7 +232,7 @@ export default {
   },
 };
 </script>
-<style scoped lang="less">
+<style scoped lang="scss">
 input {
   display: block;
   height: 100%;

template/admin/src/pages/kefu/mobile/user/index.vue

@@ -176,7 +176,7 @@ export default {
 };
 </script>
 
-<style scoped lang="less">
+<style scoped lang="scss">
 .userBox {
   background: #f0f1f2;
 }

template/admin/src/pages/kefu/mobile/user/userLabel.vue

@@ -128,7 +128,7 @@ export default {
     font-size 0.32rem
     color #282828
 </style>
-<style scoped lang="less">
+<style scoped lang="scss">
 .label {
   &-title {
     margin-bottom: 0.25rem;
@@ -152,10 +152,10 @@ export default {
   }
 }
 .labelCheck {
-  /deep/.ivu-checkbox {
+  ::v-deep.ivu-checkbox {
     display: none !important;
   }
-  /deep/.ivu-checkbox-wrapper-checked.ivu-checkbox-border {
+  ::v-deep.ivu-checkbox-wrapper-checked.ivu-checkbox-border {
     background: #3875ea;
     color: #fff;
   }

template/admin/src/pages/kefu/pc/components/emoji.vue

@@ -45,7 +45,7 @@ export default {
 };
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .emoji {
   width: 380px;
   height: 186px;

template/admin/src/pages/kefu/pc/components/msgWindow.vue

@@ -628,7 +628,7 @@ export default {
         .input-box {
           border-bottom: 1px solid #EEEEEE;
 
-          >>> .ivu-input {
+          ::v-deep .ivu-input {
             background: transparent;
             border: 0;
             border-radius: 0;
@@ -690,7 +690,7 @@ export default {
 }
 
 .right-scroll {
-  >>> .ivu-scroll-container .ivu-scroll-loader:nth-child(1) {
+  ::v-deep .ivu-scroll-container .ivu-scroll-loader:nth-child(1) {
     display: none;
   }
 }

template/admin/src/pages/kefu/pc/components/rightMenu.vue

@@ -623,7 +623,7 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-/deep/.ivu-select .ivu-select-dropdown, /deep/.ivu-date-picker .ivu-select-dropdown {
+::v-deep.ivu-select .ivu-select-dropdown, ::v-deep.ivu-date-picker .ivu-select-dropdown {
   top: unset !important;
 }
 .right-scroll{
@@ -780,7 +780,7 @@ color #6440C2, &.routine {
     padding: 0 8px;
     margin-top: 12px;
 
-    /deep/ .ivu-input {
+    ::v-deep .ivu-input {
       border-radius: 17px;
     }
   }
@@ -932,7 +932,7 @@ color #6440C2, &.routine {
     margin-top: 10px;
     padding: 0 8px;
 
-    /deep/ .ivu-input {
+    ::v-deep .ivu-input {
       border-radius: 17px;
     }
   }
@@ -989,7 +989,7 @@ color #6440C2, &.routine {
 }
 
 .label-box {
-  >>> .ivu-modal-header {
+  ::v-deep .ivu-modal-header {
     padding: 0;
     border: 0;
     background: #fff;

template/admin/src/pages/kefu/pc/index.vue

@@ -622,7 +622,7 @@ export default {
 <style lang="stylus" scoped>
 @import '../../../styles/emoji-awesome/css/google.min.css';
 
-/deep/ textarea.ivu-input {
+::v-deep textarea.ivu-input {
   border: none;
   resize: none;
 
@@ -902,7 +902,7 @@ export default {
   background: rgba(0, 0, 0, 0.5);
 }
 
-/deep/.happy-scroll-content {
+::v-deep.happy-scroll-content {
   width: 100%;
 
   .demo-spin-icon-load {
@@ -931,17 +931,17 @@ export default {
 }
 
 .isMsgbox {
-  >>> .ivu-modal-body {
+  ::v-deep .ivu-modal-body {
     padding: 0;
   }
 }
 .emoji-box::-webkit-scrollbar {
   width: 0;
 }
-.textarea-box /deep/ .ivu-input:focus{
+.textarea-box ::v-deep .ivu-input:focus{
   box-shadow: none;
 }
-.textarea-box /deep/ .el-textarea__inner{
+.textarea-box ::v-deep .el-textarea__inner{
   border:none;
   resize: none;
 }

template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue

@@ -531,7 +531,7 @@ export default {
 }
 
 .modelBox {
-  >>>, .ivu-table-header {
+  ::v-deep, .ivu-table-header {
     width: 100% !important;
   }
 }
@@ -555,11 +555,11 @@ export default {
   display: none;
 }
 
-/deep/ .ivu-menu-vertical .ivu-menu-item-group-title {
+::v-deep .ivu-menu-vertical .ivu-menu-item-group-title {
   display: none;
 }
 
-/deep/ .ivu-menu-vertical.ivu-menu-light:after {
+::v-deep .ivu-menu-vertical.ivu-menu-light:after {
   display: none;
 }
 

template/admin/src/pages/marketing/channelCode/createCode.vue

@@ -411,7 +411,7 @@ export default {
   max-width: 1100px;
 }
 
-.ivu-form >>> .ivu-form-item-label {
+.ivu-form ::v-deep .ivu-form-item-label {
   font-weight: 700;
   font-size: 14px !important;
 }
@@ -425,7 +425,7 @@ export default {
   font-size: 14px !important;
 }
 
-.ivu-radio-wrapper >>> .ivu-radio {
+.ivu-radio-wrapper ::v-deep .ivu-radio {
   margin-right: 10px;
 }
 
@@ -473,7 +473,7 @@ export default {
   transform: translate(50%, -50%);
 }
 
-.modelBox /deep/ .ivu-modal-body {
+.modelBox ::v-deep .ivu-modal-body {
   padding: 0 16px 16px 16px !important;
 }
 
@@ -530,7 +530,7 @@ textarea {
 
 .addfont {
   display: inline-block;
-  font-size: 13px;
+  font-size: 12px;
   font-weight: 400;
   color: var(--prev-color-primary);
   margin-left: 14px;

template/admin/src/pages/marketing/live/index.vue

@@ -335,7 +335,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .goodList .ivu-input-group {
+::v-deep .goodList .ivu-input-group {
   width: 200% !important;
 }
 </style>

template/admin/src/pages/marketing/lottery/create.vue

@@ -28,7 +28,7 @@
                 <el-form-item label="活动时间：">
                   <div class="acea-row row-middle">
                     <el-date-picker
-                      clearable
+                      v-model="formValidate.period"
                       :editable="false"
                       type="datetimerange"
                       format="yyyy-MM-dd HH:mm"
@@ -38,7 +38,6 @@
                       end-placeholder="结束日期"
                       @change="onchangeTime"
                       style="width: 460px"
-                      v-model="formValidate.period"
                     ></el-date-picker>
                   </div>
                 </el-form-item>
@@ -210,7 +209,7 @@
                       <template slot-scope="scope">
                         <div
                           class="acea-row scope.row-middle scope.row-center-wrapper"
-                          @click="modalPicTap('dan', 'goods', index)"
+                          @click="modalPicTap('dan', 'goods', scope.$index)"
                         >
                           <div class="pictrue pictrueTab" v-if="scope.row.image">
                             <img v-lazy="scope.row.image" />
@@ -674,9 +673,7 @@ export default {
     },
     // 具体日期
     onchangeTime(e) {
-      this.$nextTick(() => {
-        this.$set(this.formValidate, 'period', e);
-      });
+      this.$set(this.formValidate, 'period', e);
     },
     // 详情
     getInfo(e) {
@@ -690,11 +687,14 @@ export default {
             this.formValidate.is_svip = res.data.is_svip;
             this.content = res.data.is_content ? res.data.content : '';
             this.formValidate.factor = res.data.factor.toString();
-            this.formValidate.period = [
+            // setTimeout(() => {
+            //   this.formValidate.period = ;
+
+            // }, 2000);
+            this.$set(this.formValidate, 'period', [
               this.formatDate(res.data.start_time) || '',
               this.formatDate(res.data.end_time) || '',
-            ];
-
+            ]);
             this.specsData = res.data.prize;
             this.getProbability();
           } else {
@@ -796,9 +796,11 @@ export default {
               },
             ];
           }
+          this.$nextTick((e) => {
+            this.spinShow = false;
+          });
         })
         .catch((err) => {});
-      this.spinShow = false;
     },
     // 下一步
     next(name) {
@@ -870,6 +872,7 @@ export default {
     },
     // 获取单张图片信息
     getPic(pc) {
+      console.log(pc, this.tableIndex, this.picTit, this.specsData);
       switch (this.picTit) {
         case 'danFrom':
           this.formValidate.image = pc.att_dir;
@@ -1001,7 +1004,7 @@ export default {
 .content_width{
   width:460px;
 }
-/deep/ .el-tabs__item {
+::v-deep .el-tabs__item {
   height: 54px !important;
   line-height: 54px !important;
 }
@@ -1014,7 +1017,7 @@ export default {
   color: #999;
 }
 
-.maxW /deep/.ivu-select-dropdown {
+.maxW ::v-deep.ivu-select-dropdown {
   max-width: 600px;
 }
 

template/admin/src/pages/marketing/point_record/index.vue

@@ -267,15 +267,15 @@ export default {
   margin-bottom: 10px;
 }
 
-.status >>> .item~.item {
+.status ::v-deep .item~.item {
   margin-left: 6px;
 }
 
-.status >>> .statusVal {
+.status ::v-deep .statusVal {
   margin-bottom: 7px;
 }
 
-/* .ivu-mt >>> .ivu-table-header */
+/* .ivu-mt ::v-deep .ivu-table-header */
 /* border-top:1px dashed #ddd!important */
 .type {
   padding: 3px 0;