Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm into master

.gitignore

@@ -19,3 +19,4 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
+yarn.lock

src/App.vue

@@ -5,59 +5,56 @@
 </template>
 <script>
 export default {
-  data () {
-    return {
-    }
+  data() {
+    return {};
   },
   mounted() {
     if (!this.getLocalStorage()) {
       this.$router.push({
-        path: '/login'
-      })
-    }else{
+        path: "/login",
+      });
+    } else {
       this.$router.push({
-        name: "Home"
+        name: "Home",
       });
     }
   },
-  methods: {
-    
-  }
-}
+  methods: {},
+};
 </script>
 
 <style>
-
-@import './assets/css/tablevoerride.css';
-@import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_1627123_thgo3iypqwi.css';
-@import url('//at.alicdn.com/t/font_1627123_grz80mbm3sv.css');
+@import "./assets/css/tablevoerride.css";
+@import "./assets/global/font.css";
+@import "//at.alicdn.com/t/font_1627123_thgo3iypqwi.css";
+@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
 /* @import './assets/css/common.css'; */
-@import './assets/css/init.css';
+@import "./assets/css/init.css";
 
-body,html{
+body,
+html {
   padding: 0px;
   margin: 0px;
-  font-family:'微软雅黑',' Microsoft YaHei','PingFang','PingFangR';
+  font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR";
   -webkit-font-smoothing: antialiased;
   height: 100%;
 }
-#app{
+#app {
   height: 100%;
 }
-.el-scrollbar{
+.el-scrollbar {
   height: 100%;
 }
-.el-scrollbar__wrap{
+.el-scrollbar__wrap {
   overflow: auto !important;
   width: 100%;
-  height: 100%
+  height: 100%;
 }
-.el-scrollbar__view{
+.el-scrollbar__view {
   width: 100%;
   height: 100%;
 }
-.page-component-up{
+.page-component-up {
   position: fixed;
   right: calc(8.3% - 60px);
   bottom: 150px;
@@ -65,29 +62,39 @@ body,html{
   height: 90px;
   z-index: 2000;
 }
-.page-component-up img{
+.page-component-up img {
   width: 38px;
   height: 38px;
 }
-.page-component-up i{
-    background-color: #fff;
-    
-    cursor: pointer;
-    transition: .3s;
-    /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
-    z-index: 5;
-    border:1px solid #ddd;
-    box-sizing: border-box;
-    line-height: 40px;
-    text-align: center;
-    display: inline-block;
+.page-component-up i {
+  background-color: #fff;
+
+  cursor: pointer;
+  transition: 0.3s;
+  /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
+  z-index: 5;
+  border: 1px solid #ddd;
+  box-sizing: border-box;
+  line-height: 40px;
+  text-align: center;
+  display: inline-block;
+}
+.page-component-up i {
+  font-size: 36px;
+  color: #bbb;
+}
+.page-component-up i:hover {
+  background-color: #ef4455;
+  border: 1px solid #ec3346;
+}
+.page-component-up:hover i {
+  color: #f1f1f1;
 }
-.page-component-up i{font-size: 36px;color: #bbb;}
-.page-component-up i:hover{
-  background-color: #EF4455;
-  border:1px solid #ec3346;
+.el-form-item .el-form-item__label {
+  color: #3d3b4f !important;
 }
-.page-component-up:hover i{
-  color: #F1f1f1;
+.el-button [class*="el-icon-"] + span {
+  margin-left: 5px;
+  font-family: "perfectFont";
 }
 </style>

src/assets/css/customerManage.css

-.customerManage .tools{
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: 20px;
-    border-bottom: 1px solid rgba(226,228,235,1);
-    align-items: center;
-}
-.customerManage .tools h1{
-    font-weight: bold;
-    font-size: 18px;
-    font-family: perfectFont;
-}
-.customerManage .tools .rightmenu{
-    display: flex;
-    align-items: center;
-}
-.customerManage .tools .gaoji{
-    font-size:12px;
-    font-weight:400;
-    color:rgba(13,36,129,1);
-    margin-right: 35px;
-    cursor: pointer;
-}
-.customerManage .tools .gaoji:hover{
-    color:rgba(13,36,129,.8);
-}
-.customerManage .tools .gaoji .iconfont{
-    font-size: 12px;
-    padding-left: 5px;
-}
-.customerManage .query-box{
-    padding: 15px 10px;
-    background-color: white;
-}
-.customerManage .table-btn{
-    display: inline-block;
-    width: 24px;
-    height: 24px;
-    line-height: 24px;
-    text-align: center;
-    cursor: pointer;
-    margin-right: 10px;
-}
-.customerManage .table-btn.blue{
-    color: rgba(13, 36, 129, 1);
-    background-color: rgba(13, 36, 129, .3);
-}
-.customerManage .table-btn.org{
-    color: #FFA475;
-    background-color: rgba(255, 164, 117, .3);
-}
-.customerManage .table-btn.green{
-    color: rgba(148, 184, 119, 1);
-    background-color: rgba(148, 184, 119, .3);
-}
-.customerManage .table-btn.blue:hover{
-    background-color: rgba(13, 36, 129, .5);
-}
-.customerManage .table-btn.org:hover{
-    background-color: rgba(255, 164, 117, .5);
-}
-.customerManage .table-btn.green:hover{
-    background-color: rgba(148, 184, 119, .5);
-}
-.customerManage .add-box1 .el-dialog{
-    min-width: 760px;
-}
-.customerManage .add-box1 .el-tag.el-tag--info{
-    background-color: rgba(0,0,0,0);
-    border-color: rgba(0,0,0,0);
-    display: inline-block;
-    white-space: nowrap; 
-    width: 60%; 
-    overflow: hidden;
-    text-overflow:ellipsis;
-}
-.customerManage .add-box2 .el-tag.el-tag--info{
-    background-color: rgba(0,0,0,0);
-    border-color: rgba(0,0,0,0);
-    display: inline-block;
-    white-space: nowrap; 
-    overflow: hidden;
-    text-overflow:ellipsis;
-}
-.customerManage .add-box2 .el-form-item__label{
-    text-align: left;
-}
-.customerManage .selection-box{
-    display: flex;
-    align-items: center;
-}
-.customerManage .selection-box span{
-    font-size: 12px;
-    text-align: center;
+.customerManage .tools {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 20px;
+  border-bottom: 1px solid rgba(226, 228, 235, 1);
+  align-items: center;
+}
+.customerManage .tools h1 {
+  font-weight: bold;
+  font-size: 18px;
+  font-family: perfectFont;
+}
+.customerManage .tools .rightmenu {
+  display: flex;
+  align-items: center;
+}
+.customerManage .tools .gaoji {
+  font-size: 12px;
+  font-weight: 400;
+  color: #409efe;
+  margin-right: 35px;
+  cursor: pointer;
+}
+.customerManage .tools .gaoji:hover {
+  color: #409efecc;
+}
+.customerManage .tools .gaoji .iconfont {
+  font-size: 12px;
+  padding-left: 5px;
+}
+.customerManage .query-box {
+  padding: 15px 10px;
+  background-color: white;
+}
+.customerManage .table-btn {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+  text-align: center;
+  cursor: pointer;
+  margin-right: 10px;
+}
+.customerManage .table-btn.blue {
+  color: #409efe;
+  background-color: rgba(13, 36, 129, 0.3);
+}
+.customerManage .table-btn.org {
+  color: #ffa475;
+  background-color: rgba(255, 164, 117, 0.3);
+}
+.customerManage .table-btn.green {
+  color: rgba(148, 184, 119, 1);
+  background-color: rgba(148, 184, 119, 0.3);
+}
+.customerManage .table-btn.blue:hover {
+  background-color: rgba(13, 36, 129, 0.5);
+}
+.customerManage .table-btn.org:hover {
+  background-color: rgba(255, 164, 117, 0.5);
+}
+.customerManage .table-btn.green:hover {
+  background-color: rgba(148, 184, 119, 0.5);
+}
+.customerManage .add-box1 .el-dialog {
+  min-width: 760px;
+}
+.customerManage .add-box1 .el-tag.el-tag--info {
+  background-color: rgba(0, 0, 0, 0);
+  border-color: rgba(0, 0, 0, 0);
+  display: inline-block;
+  white-space: nowrap;
+  width: 60%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.customerManage .add-box2 .el-tag.el-tag--info {
+  background-color: rgba(0, 0, 0, 0);
+  border-color: rgba(0, 0, 0, 0);
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.customerManage .add-box2 .el-form-item__label {
+  text-align: left;
+}
+.customerManage .selection-box {
+  display: flex;
+  align-items: center;
+}
+.customerManage .selection-box span {
+  font-size: 12px;
+  text-align: center;
 }
 .customerManage .selection-box .el-button {
-    color: #666;
-    background-color: #f6f8fa;
-    border-color: #f6f8fa;
-    font-size: 12px;
-    height: 28px;
-    border-radius: 14px;
-    padding: 5px 12px;
-    margin-left: 15px;
-}
-.customerManage .selection-box .el-button i{
-    margin-right: 5px;
+  color: #666;
+  background-color: #f6f8fa;
+  border-color: #f6f8fa;
+  font-size: 12px;
+  height: 28px;
+  border-radius: 14px;
+  padding: 5px 12px;
+  margin-left: 15px;
+}
+.customerManage .selection-box .el-button i {
+  margin-right: 5px;
 }
 .customerManage .selection-box .el-button:hover {
-    background: #2362fb;
-    border-color: #2362fb;
-    color: #fff;
-}
-.customerManage .dialog-footer{
-    text-align: center;
-    background-color: rgba(248,250,251,1);
-    padding-bottom: 20px;
-}
-.customerManage .el-dialog__footer{
-    padding: 0;
-}
-.transfer-box .add-tit{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    height: 20px;
-}
-.transfer-box .add-tit p{
-    display: flex;
-    align-items: center;
-    font-weight: bold;
-    color:rgba(17,17,17,1);
-    font-size:14px;
-}
-.transfer-box .add-tit p span{
-    display: inline-block;
-    width:6px;
-    height:6px;
-    background:rgba(13,36,129,1);
-    border-radius:50%;
-    margin-right: 10px;
-}
-.iconstar_full{
-    color: #fac23d;
-}
-.bold18{
-    font-weight: bold;
-    font-size: 18px;
-}
\ No newline at end of file
+  background: #2362fb;
+  border-color: #2362fb;
+  color: #fff;
+}
+.customerManage .dialog-footer {
+  text-align: center;
+  background-color: rgba(248, 250, 251, 1);
+  padding-bottom: 20px;
+}
+.customerManage .el-dialog__footer {
+  padding: 0;
+}
+.transfer-box .add-tit {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 20px;
+}
+.transfer-box .add-tit p {
+  display: flex;
+  align-items: center;
+  font-weight: bold;
+  color: rgba(17, 17, 17, 1);
+  font-size: 14px;
+}
+.transfer-box .add-tit p span {
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  background: #409efe;
+  border-radius: 50%;
+  margin-right: 10px;
+}
+.iconstar_full {
+  color: #fac23d;
+}
+.bold18 {
+  font-weight: bold;
+  font-size: 18px;
+}

src/assets/global/font.css

-@font-face{
+@font-face {
     font-family: 'pingfang';
-    src:url('../fonts/pingfang.woff2')  format('woff');
+    src: url('../fonts/PingFangMedium.ttf') format('truetype');
 }
+
 @font-face {
     font-family: "PingFangR";
-    src: url("../fonts/Semibold.eot"); /* IE9 */
-    src: url("../fonts/Semibold.eot?#iefix") format("embedded-opentype"), /* IE6-IE8 */
-    url("../fonts/Semibold.woff") format("woff"), /* chrome, firefox */
-    url("../fonts/Semibold.ttf") format("truetype"); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+    src: url("../fonts/PingFangBold.ttf") format('truetype');
     font-style: normal;
     font-weight: normal;
 }
-@font-face{
+
+@font-face {
     font-family: 'perfectFont';
-    src:url('../fonts/MicrosoftYaHeiLight.woff')  format('woff');
+    src: url('../fonts/MicrosoftYaHeiUISemilight.ttf') format('truetype');
 }
\ No newline at end of file

src/components/Home.vue

@@ -379,14 +379,14 @@ export default {
   components: {
     ticheng,
     notincome,
-    sjld
+    sjld,
   },
   data() {
     return {
       rankType: 1,
       rankType2: "1",
       RankingList: [],
-      Briefing: { model: { TotalPrice: 0 } }
+      Briefing: { model: { TotalPrice: 0 } },
     };
   },
   mounted() {
@@ -395,7 +395,7 @@ export default {
   },
   methods: {
     GetBriefing() {
-      this.apipost("/api/CustomerDashboard/GetBriefing", {}, res => {
+      this.apipost("/api/CustomerDashboard/GetBriefing", {}, (res) => {
         if (res.data.resultCode == 1) {
           this.Briefing = res.data.data;
         }
@@ -405,14 +405,14 @@ export default {
       this.apipost(
         "/api/CustomerDashboard/GetRankingList",
         { rankType: this.rankType },
-        res => {
+        (res) => {
           if (res.data.resultCode == 1) {
             this.RankingList = res.data.data;
           }
         }
       );
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -444,7 +444,7 @@ export default {
   padding: 0px 20px !important;
   margin-top: 20px;
 }
-.box-card .el-card__body{
+.box-card .el-card__body {
   height: 237px;
 }
 /* .box-card .el-card__body:hover, */
@@ -465,7 +465,7 @@ export default {
   height: 26px;
   line-height: 26px;
   text-align: center;
-  background: rgba(13, 36, 129, 1);
+  background: #409efe;
   color: #fff;
   margin: 0 25px;
 }
@@ -473,9 +473,9 @@ export default {
   font-size: 14px;
   color: #333333;
   width: 80px;
-  padding-top:18px;
+  padding-top: 18px;
   font-weight: bold;
-    font-family: perfectFont;
+  font-family: perfectFont;
 }
 .box-card .shang-list .shang-list-item .result {
   flex: 1;
@@ -485,7 +485,7 @@ export default {
   color: #000;
   font-weight: bold;
   text-align: right;
-  padding-right:25px;
+  padding-right: 25px;
 }
 .box-card .shang-list .shang-list-item .eq {
   width: 200px;
@@ -573,13 +573,13 @@ export default {
 .zhou-card {
   padding: 0px;
   border: none;
-  background: rgba(13, 36, 129, 1);
+  background: #409efe;
   margin-top: 25px;
   height: 236px;
 }
 .zhou-card .el-card__body {
   padding: 0px;
-  background: url("../assets/img/home/zhouguan.png") rgba(13, 36, 129, 1);
+  background: url("../assets/img/home/zhouguan.png") #409efe;
   height: 100%;
   background-repeat: no-repeat;
   background-size: cover;
@@ -655,7 +655,7 @@ export default {
   background: #94b877;
 }
 .sum-card .sum-list .sum-list-item .icon.blue {
-  background: #0d2481;
+  background: #409efe;
 }
 .sum-card .sum-list .sum-list-item .icon.zi {
   background: rgb(210, 197, 240);
@@ -737,7 +737,7 @@ export default {
   font-weight: bold;
 }
 .rank-list .rank-list-item .rank.blue {
-  color: #0d2481;
+  color: #409efe;
 }
 .rank-list .rank-list-item .rank.red {
   color: rgb(195, 0, 82);
@@ -772,25 +772,25 @@ export default {
 }
 .option-item .el-select > .el-input {
   display: block;
-  background: #0d2481;
+  background: #409efe;
   border-radius: 0;
 }
 .option-item .el-input--mini .el-input__inner {
   height: 28px;
   line-height: 28px;
-  background: #0d2481;
+  background: #409efe;
   border-radius: 0;
   color: #f1f1f1;
 }
 .option-item .el-select .el-input.is-focus .el-input__inner {
-  border-color: #0d2481;
+  border-color: #409efe;
 }
 .el-select-dropdown {
   border-radius: 0px !important;
 }
 .el-select-dropdown__item.selected {
   font-family: perfectFont !important;
-  color: #0d2481 !important;
+  color: #409efe !important;
 }
 .el-select-dropdown__item {
   /* font-family: perfectFont !important; */
@@ -799,4 +799,4 @@ export default {
 .loudou-card .el-card__header {
   border: none;
 }
-</style>
\ No newline at end of file
+</style>

src/components/HomeNav/HomeNavLeft.vue

@@ -15,7 +15,7 @@
 .log-box > div {
   height: 100%;
   width: 100%;
-  background: rgba(13, 36, 129, 1);
+  background: #3d3b4f;
   /* border-radius:0px 40px 40px 0px; */
   display: flex;
   align-items: center;
@@ -25,7 +25,7 @@
   width: 42px;
 }
 .home-nav .home-menu {
-  padding-left: 19px;
+  padding: 0 8px;
 }
 .home-nav .home-menu .home-menu-item {
   color: rgba(255, 255, 255, 1);
@@ -33,22 +33,25 @@
   cursor: pointer;
   transition: all linear 0.2s;
   background-color: #f4f5f9;
+  border-radius: 4px;
+  overflow: hidden;
+  font-family: "perfectFont";
 }
 .home-nav .home-menu .home-menu-item > div {
   padding: 0 0 0 15px;
-  background-color: rgba(13, 36, 129, 1);
+  background-color: #3d3b4f;
   height: 50px;
   line-height: 50px;
 }
 .home-nav .home-menu .home-menu-item.active {
-  background-color: rgba(13, 36, 129, 1);
+  background-color: #3d3b4f;
 }
 .home-nav .home-menu .home-menu-item.active > div {
   /* font-weight: bold; */
-  color: rgba(13, 36, 129, 1);
+  color: #fff;
   opacity: 1;
   transition: all linear 0.2s;
-  background-color: #f4f5f9;
+  background-color: #409efe;
   /* border-radius: 19px 0 0 19px; */
 }
 .home-nav .home-menu .home-menu-item > div .iconfont {
@@ -87,70 +90,70 @@ export default {
         {
           class: "iconfont iconyibiaopan",
           name: "仪表盘",
-          path: '/Home'
+          path: "/Home",
         },
         {
           class: "iconfont icondaiban",
           name: "待办事项",
-          path: '/waitMatter'
+          path: "/waitMatter",
         },
         {
           class: "iconfont iconxiansuo",
           name: "线索",
-          path: '/clueManagement'
+          path: "/clueManagement",
         },
         {
           class: "iconfont iconkehu",
           name: "客户",
-          path: '/customerManage'
+          path: "/customerManage",
         },
         {
           class: "iconfont iconkehu1",
           name: "联系人",
-          path: "/contactsManagement"
+          path: "/contactsManagement",
         },
         {
           class: "iconfont icongonghaiguanli",
           name: "公海",
-          path: '/watersManagement'
+          path: "/watersManagement",
         },
         {
           class: "iconfont iconshangji",
           name: "商机",
-          path: '/businessManagement'
+          path: "/businessManagement",
         },
         {
           class: "iconfont iconhetong",
-          name: "合同"
+          name: "合同",
         },
         {
           class: "iconfont iconchanpin1",
-          name: "产品"
+          name: "产品",
         },
         {
           class: "iconfont icondingdan1",
-          name: "订单"
-        }
-      ]
+          name: "订单",
+        },
+      ],
     };
   },
   mounted() {
-    let userInfo = this.getLocalStorage()
-    this.userInfo = userInfo
-    this.navList = userInfo.UserMenu[0].ChildMenu[0].ChildMenu
-    let $this = this
-    this.MsgBus.$on('setLeftNav', function (val){
+    let userInfo = this.getLocalStorage();
+    this.userInfo = userInfo;
+    this.navList = userInfo.UserMenu[0].ChildMenu[0].ChildMenu;
+    let $this = this;
+    this.MsgBus.$on("setLeftNav", function(val) {
       $this.activeIndex = 0;
-      $this.navList = userInfo.UserMenu[0].ChildMenu[val].ChildMenu
-    })
+      $this.navList = userInfo.UserMenu[0].ChildMenu[val].ChildMenu;
+    });
   },
   methods: {
     changeMenu: function(item, ind) {
       this.activeIndex = ind;
       this.$router.push({
-        path: item.MenuUrl
+        path: item.MenuUrl,
       });
-    }
-  }
+    },
+  },
 };
 </script>

src/components/HomeNav/HomeNavTop.vue

@@ -27,15 +27,16 @@
   margin: 0 20px;
   color: #666;
   font-size: 16px;
-  font-weight: 600;
   cursor: pointer;
+  font-family: perfectFont;
 }
 .nav-right .nav-right-menu ul li:first-child {
   margin-left: 0px;
 }
 .nav-right .nav-right-menu ul li.active {
-  color: rgba(13, 36, 129, 1);
-  border-bottom-color: rgba(13, 36, 129, 1);
+  color: #409efe;
+  border-bottom-color: #409efe;
+  font-family: pingfangR;
 }
 .nav-right .nav-right-menu ul li i {
   font-size: 16px;
@@ -70,7 +71,7 @@
 }
 .nav-right .nav-right-info .right-item i {
   font-size: 20px;
-  color: #0d2481;
+  color: #409efe;
 }
 </style>
 <template>
@@ -102,7 +103,7 @@
               退出
             </li>
           </ul>
-          <el-avatar slot="reference" :size="34" :src="userInfo.Icon" style="background:rgba(13, 36, 129, 1);" @error="errorHandler">
+          <el-avatar slot="reference" :size="34" :src="userInfo.Icon" style="background:#409efe;" @error="errorHandler">
             {{userInfo.EmName.substring(0,1)}}
           </el-avatar>
         </el-popover>
@@ -116,36 +117,36 @@ export default {
     return {
       activeIndex: 0,
       value: 0,
-      menuList: [{ChildMenu: []}],
+      menuList: [{ ChildMenu: [] }],
       chosenMenuId: 0,
       userInfo: {
-        EmName: '',
-        Icon: '',
+        EmName: "",
+        Icon: "",
       },
-      visible:false
+      visible: false,
     };
   },
   mounted() {
-    let userInfo = this.getLocalStorage()
-    this.userInfo = userInfo
-    this.menuList = userInfo.UserMenu
-    this.chosenMenuId = userInfo.UserMenu[0].ChildMenu[0].MenuId
+    let userInfo = this.getLocalStorage();
+    this.userInfo = userInfo;
+    this.menuList = userInfo.UserMenu;
+    this.chosenMenuId = userInfo.UserMenu[0].ChildMenu[0].MenuId;
   },
   methods: {
-      chosenFirstLeaveMenu(item, index){
-        this.chosenMenuId = item.MenuId
-        this.MsgBus.$emit('setLeftNav', index)
-        this.$router.push({
-          path: item.ChildMenu[0].MenuUrl
-        });
-      },
-      errorHandler() {
-        return true;
-      },
-      signout(){
-        window.localStorage.removeItem("userInfo");
-        this.$router.push('/login');
-      }
-  }
+    chosenFirstLeaveMenu(item, index) {
+      this.chosenMenuId = item.MenuId;
+      this.MsgBus.$emit("setLeftNav", index);
+      this.$router.push({
+        path: item.ChildMenu[0].MenuUrl,
+      });
+    },
+    errorHandler() {
+      return true;
+    },
+    signout() {
+      window.localStorage.removeItem("userInfo");
+      this.$router.push("/login");
+    },
+  },
 };
 </script>

src/components/assembly/Coupon.vue

 <style>
-.MyCoupon{
-    background-color: RGBA(246, 245, 248, 1);
-    height: 100%;
-}
-.MyCoupon .menu_list ul{
-height: 40px;
-line-height: 40px;
-}
-.MyCoupon .menu_list ul li{
-float: left;
-width: 137px;
-text-align: center;
-cursor: pointer;
-}
-.MyCoupon .menu_list ul li:last-child{
-    float: right;
-    width: 60px;
-}
-.MyCoupon .menu_list ul li .__cp i{
-padding-left: 25px;
-}
-.MyCoupon .menu_list ul li span.__cp{
-font-size: 14px;
-}
-.MyCoupon .menu_list ul li span.__cp._active{
-color: rgba(13, 36, 129, 1);
-border-bottom: 2px solid rgba(13, 36, 129, 1);
-display: inline-block;
-}
-.Coupon-box{
-    position: relative;
-    max-height: calc(100vh - 45px);
-    overflow: auto;
-    padding: 20px;
-    box-sizing: border-box;
-    display: flex;
-    flex-flow:row wrap;
-}
-.Coupon-item{
-    position: relative;
-    height: 205px;
-    margin-bottom: 25px;
-    width: 218px;
-    margin-right: 25px;
-}
-.Coupon-item .top{
-    position: absolute;
-    width: calc(100%);
-    height: 104px;
-    background: url('../../assets/img/cust/bg1.png');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    padding: 10px 30px;
-    box-sizing: border-box;
-    color: white
-}
-.Coupon-item .top2{
-    background: url('../../assets/img/cust/bg2.png');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-}
-.Coupon-item .top3{
-    background: url('../../assets/img/cust/bg3.png');
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-}
-.Coupon-item .top .zhe{
-    font-size: 30px;
-}
-.Coupon-item .top .zhe span{
-    font-size: 20px;
-}
-.Coupon-item .top .di{
-    font-size: 20px;
-}
-.Coupon-item .top .di span{
-    font-size: 30px;
-}
-.Coupon-item .top .man{
-    color: white;
-    font-size: 12px;
-    margin-bottom: 5px;
-}
-.Coupon-item .top .time{
-    font-size: 12px;
-    color: rgba(80, 105, 204, 1);
-}
-.Coupon-item .bottom{
-    position: absolute;
-    top: 104px;
-    background-color: white;
-    width: calc(100%);
-    padding: 10px 14px;
-    box-sizing: border-box;
-}
-.Coupon-item .bottom .bold{
-    margin-bottom: 4px;
+.MyCoupon {
+  background-color: RGBA(246, 245, 248, 1);
+  height: 100%;
+}
+.MyCoupon .menu_list ul {
+  height: 40px;
+  line-height: 40px;
+}
+.MyCoupon .menu_list ul li {
+  float: left;
+  width: 137px;
+  text-align: center;
+  cursor: pointer;
+}
+.MyCoupon .menu_list ul li:last-child {
+  float: right;
+  width: 60px;
+}
+.MyCoupon .menu_list ul li .__cp i {
+  padding-left: 25px;
+}
+.MyCoupon .menu_list ul li span.__cp {
+  font-size: 14px;
+}
+.MyCoupon .menu_list ul li span.__cp._active {
+  color: #409efe;
+  border-bottom: 2px solid #409efe;
+  display: inline-block;
+}
+.Coupon-box {
+  position: relative;
+  max-height: calc(100vh - 45px);
+  overflow: auto;
+  padding: 20px;
+  box-sizing: border-box;
+  display: flex;
+  flex-flow: row wrap;
+}
+.Coupon-item {
+  position: relative;
+  height: 205px;
+  margin-bottom: 25px;
+  width: 218px;
+  margin-right: 25px;
+}
+.Coupon-item .top {
+  position: absolute;
+  width: calc(100%);
+  height: 104px;
+  background: url("../../assets/img/cust/bg1.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  padding: 10px 30px;
+  box-sizing: border-box;
+  color: white;
+}
+.Coupon-item .top2 {
+  background: url("../../assets/img/cust/bg2.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+.Coupon-item .top3 {
+  background: url("../../assets/img/cust/bg3.png");
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+}
+.Coupon-item .top .zhe {
+  font-size: 30px;
+}
+.Coupon-item .top .zhe span {
+  font-size: 20px;
+}
+.Coupon-item .top .di {
+  font-size: 20px;
+}
+.Coupon-item .top .di span {
+  font-size: 30px;
+}
+.Coupon-item .top .man {
+  color: white;
+  font-size: 12px;
+  margin-bottom: 5px;
+}
+.Coupon-item .top .time {
+  font-size: 12px;
+  color: rgba(80, 105, 204, 1);
+}
+.Coupon-item .bottom {
+  position: absolute;
+  top: 104px;
+  background-color: white;
+  width: calc(100%);
+  padding: 10px 14px;
+  box-sizing: border-box;
+}
+.Coupon-item .bottom .bold {
+  margin-bottom: 4px;
 }
 </style>
 <template>
@@ -161,74 +161,73 @@ display: inline-block;
     </div>
 </template>
 <script>
-import moment from 'moment'
+import moment from "moment";
 export default {
-  props: ['CustomerAccountId'],
+  props: ["CustomerAccountId"],
   data() {
     return {
-        loading: false,
-        dropdownText: "不限",
-        typeActive: 1,
-        msg: {
-            pageIndex: 1,
-            pageSize: 999,
-            useState: 1,
-            lineId: 0,
-            lineteamId: 0,
-            couponsName: "",
-            couponsType: "",
-            couponStatus: 1,
-            couponEffectStatus: 1,
-            couponsUseScope: 0,
-            userId:'',
-        },
-        dataList: [],
-        totalCount: 0,
-        Count: 0,
+      loading: false,
+      dropdownText: "不限",
+      typeActive: 1,
+      msg: {
+        pageIndex: 1,
+        pageSize: 999,
+        useState: 1,
+        lineId: 0,
+        lineteamId: 0,
+        couponsName: "",
+        couponsType: "",
+        couponStatus: 1,
+        couponEffectStatus: 1,
+        couponsUseScope: 0,
+        userId: "",
+      },
+      dataList: [],
+      totalCount: 0,
+      Count: 0,
     };
-  },watch:{
-    
- },
+  },
+  watch: {},
   mounted() {
-    this.getList()
+    this.getList();
   },
   methods: {
     // 获取数据
     getList() {
-        this.msg.userId = this.CustomerAccountId
-        this.loading = true;
-        this.apiJavaPost(
-            "/api/b2b/user/getUserCouponAllotList",
-            this.msg,
-            res => {
-            let nowTime = moment().format("YYYY-MM-DD HH:mm:ss");
-            if (res.data.resultCode == 1) {
-                let data = res.data.data.pageData;
-                data.forEach((x, i) => {
-                let cha = this.DateDiff(nowTime, x.expirationDate);
-                if (cha < 3) {
-                    x.warning = true;
-                } else {
-                    x.warning = false;
-                }
-                });
-                this.dataList = data;
-                this.totalCount = res.data.data.pageCount;
-                this.Count = res.data.data.count;
-                this.$forceUpdate()
-            } else {
-                this.Error(res.data.message);
-            }
-            this.loading = false;
-            },
-            null
-        );
+      this.msg.userId = this.CustomerAccountId;
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/b2b/user/getUserCouponAllotList",
+        this.msg,
+        (res) => {
+          let nowTime = moment().format("YYYY-MM-DD HH:mm:ss");
+          if (res.data.resultCode == 1) {
+            let data = res.data.data.pageData;
+            data.forEach((x, i) => {
+              let cha = this.DateDiff(nowTime, x.expirationDate);
+              if (cha < 3) {
+                x.warning = true;
+              } else {
+                x.warning = false;
+              }
+            });
+            this.dataList = data;
+            this.totalCount = res.data.data.pageCount;
+            this.Count = res.data.data.count;
+            this.$forceUpdate();
+          } else {
+            this.Error(res.data.message);
+          }
+          this.loading = false;
+        },
+        null
+      );
     },
-   
+
     //查询初始化页码
     resetPageIndex() {
       this.msg.pageIndex = 1;
     },
-  }
-}
-</script>
\ No newline at end of file
+  },
+};
+</script>

src/components/assembly/Details.vue

 <style>
-.Details{
+.Details {
   padding: 17px 20px;
   margin-top: 20px;
   background-color: white;
   height: calc(100% - 54px);
   overflow-y: auto;
-  font-size: 12px
+  font-size: 12px;
 }
-.Details .Details_box .tit{
-  border: 4px solid rgba(13,36,129,1);
+.Details .Details_box .tit {
+  border: 4px solid #409efe;
   border-top: 0;
   border-bottom: 0;
   border-right: 0;
   padding-left: 10px;
   font-size: 14px;
   color: #111;
-  font-weight:bold;
+  font-weight: bold;
 }
-.Details_box_row{
+.Details_box_row {
   margin-top: 30px;
 }
-.Details_box_lable{
-  color: #999999
+.Details_box_lable {
+  color: #999999;
 }
 </style>
 <template>
@@ -181,23 +181,17 @@
 </template>
 <script>
 export default {
-  props:{
+  props: {
     detailsData: {
       type: Object,
-      default: {}
-    }
+      default: {},
+    },
   },
   data() {
-    return {
-      
-    };
-  },watch:{
-    
- },
-  mounted() {
+    return {};
   },
-  methods: {
-    
-  }
-}
-</script>
\ No newline at end of file
+  watch: {},
+  mounted() {},
+  methods: {},
+};
+</script>

src/components/dialogModel/sceneBox.vue

@@ -47,7 +47,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-input v-if="!item.Setting.length && item.nameStr !== '负责人' && item.nameStr !== '创建人'" v-model="item.SceneName" placeholder="请输入筛选条件"></el-input>
-                            <el-select v-else-if="item.nameStr === '负责人' || item.nameStr === '创建人'" v-model="item.id" @change="changeFC(index)" placeholder="请选择" style="width: 100%;" >
+                            <el-select v-else-if="item.nameStr === '负责人' || item.nameStr === '创建人'" v-model="item.id" filterable @change="changeFC(index)" placeholder="请选择" style="width: 100%;" >
                                 <el-option
                                     filterable
                                     v-for="item in EmployeeList"
@@ -56,7 +56,7 @@
                                     :key='item.EmployeeId'>
                                 </el-option>
                             </el-select>
-                            <el-select v-else v-model="item.SceneName" placeholder="请选择" style="width: 100%;" >
+                            <el-select v-else v-model="item.SceneName" filterable placeholder="请选择" style="width: 100%;" >
                                 <el-option v-for="(select, sIndex) in item.Setting" :label="select" :value="select" :key="sIndex"></el-option>
                             </el-select>
                         </el-col>

vue.config.js

@@ -8,7 +8,7 @@ module.exports = {
       }
     },
     devServer: {
-      host: 'crmyx.oytour.com',
+      host: 'localhost',
       port: 8080,
     },
     externals: [