From 58a08c0536f28610a33fd5e29e0de2950627d084 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Fri, 11 Feb 2022 16:15:09 +0800
Subject: [PATCH 1/3] init

---
 src/views/Customer/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue
index d784be4..96b3092 100644
--- a/src/views/Customer/index.vue
+++ b/src/views/Customer/index.vue
@@ -233,8 +233,10 @@
           <div class="labeltext">违禁标签：</div>
           <el-select
             v-model="searchForm.sensitiveWords"
+            multiple
             clearable
             filterable
+            collapse-tags
             placeholder="请选择"
             class="div-inpbox"
           >
@@ -515,7 +517,7 @@ export default {
         timeType: "0",
         clientStage: "",
         orderBy:'',
-        sensitiveWords:'',
+        sensitiveWords:[],
       },
       clientStagelist: [],
       sensitiveList:[],//违禁词
@@ -572,6 +574,7 @@ export default {
         ...this.searchForm,
       };
       obj.keywordIds = obj.keywordsId.join(",");
+      obj.sensitiveWords = JSON.stringify(obj.sensitiveWords);
       (obj.dateType = this.searchForm.staDate
         ? null
         : this.searchForm.dateType),
@@ -596,7 +599,7 @@ export default {
         searchForm: "",
         timeType: "0",
         orderBy:'',
-        sensitiveWords:'',
+        sensitiveWords:[],
         projectId:
           this.orgType == 3
             ? localStorage.getItem("houseId")
@@ -605,7 +608,7 @@ export default {
       this.findbypage();
     },
     houseChange() {
-      this.searchForm.sensitiveWords=''
+      this.searchForm.sensitiveWords=[]
       this.searchForm.keywordsId=[]
       this.findbypage();
       this.findKeywords();

From 88bb2926b6417ee7bf663123f862abf100abbda2 Mon Sep 17 00:00:00 2001
From: lancer <1905818361@qq.com>
Date: Tue, 15 Feb 2022 10:17:11 +0800
Subject: [PATCH 2/3] init

---
 src/views/Statistics/ConsultantBrand.vue | 2 +-
 vue.config.js                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue
index a3f277c..e03ac51 100644
--- a/src/views/Statistics/ConsultantBrand.vue
+++ b/src/views/Statistics/ConsultantBrand.vue
@@ -5,7 +5,7 @@
        <div class="app-titel" v-if="role!=3" style="margin-bottom:10px;">
         <div class="titel-text">楼盘选择:</div>
         <div style="margin-left: 26px">
-           <el-select v-model="houseId" placeholder="请选择"  @change="houseChange">
+           <el-select v-model="houseId" filterable placeholder="请选择"   @change="houseChange">
             <el-option
               v-for="item in houseList"
               :key="item.id"
diff --git a/vue.config.js b/vue.config.js
index 41846be..0646ad8 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,10 +4,10 @@
  */
 // const url = 'http://pigx-gateway'
 // const url = 'http://39.97.167.65:9999' //测试
-const url = 'http://192.168.31.167:9999' //长龙
+// const url = 'http://192.168.31.167:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
-// const url = 'http://62.234.122.43:9999' //正式
+const url = 'http://62.234.122.43:9999' //正式
 
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']

From 5205d013d6caf86ac6e5445364fdfd5180226b23 Mon Sep 17 00:00:00 2001
From: jyt <1592211625@qq.com>
Date: Tue, 15 Feb 2022 11:05:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Calendar/calendar.vue | 11 ++++++++++-
 vue.config.js                        |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/Calendar/calendar.vue b/src/components/Calendar/calendar.vue
index a4c61ad..7d560c1 100644
--- a/src/components/Calendar/calendar.vue
+++ b/src/components/Calendar/calendar.vue
@@ -3,6 +3,8 @@
   .wh_item_date:hover {
     background: #71c7a5;
     cursor: pointer;
+    color: #fff;
+    border-radius: 50%;
   }
 }
 * {
@@ -115,7 +117,8 @@ wh_content_item_tag {
 .wh_content_item > .wh_isMark {
   margin: auto;
   border-radius: 100px;
-  background: blue;
+  background: #7d7df5;
+  color: #fff;
   z-index: 2;
 }
 .wh_content_item .wh_other_dayhide {
@@ -154,6 +157,7 @@ wh_content_item_tag {
         <div class="wh_content_item" v-for="(item,index) in list" :key="index" @click="clickDay(item,index)">
           <div
             class="wh_item_date"
+            :style="{background:item.isMark?theme:''}"
             v-bind:class="[{ wh_isMark: item.isMark},{wh_other_dayhide:item.otherMonth!=='nowMonth'},{wh_want_dayhide:item.dayHide},{wh_isToday:item.isToday},{wh_chose_day:item.chooseDay},setClass(item)]"
           >{{item.id}}</div>
         </div>
@@ -163,6 +167,8 @@ wh_content_item_tag {
 </template>
 <script>
 import timeUtil from "./calendar";
+import { mapGetters } from "vuex";
+const c = console.log.bind(document);
 export default {
   data() {
     return {
@@ -202,6 +208,9 @@ export default {
     this.intStart();
     this.myDate = new Date();
   },
+  computed:{
+    ...mapGetters(['theme'])
+  },
   methods: {
     intStart() {
       timeUtil.sundayStart = this.sundayStart;
diff --git a/vue.config.js b/vue.config.js
index 41846be..ae7c759 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@
  * https://cli.vuejs.org/zh/config/
  */
 // const url = 'http://pigx-gateway'
-// const url = 'http://39.97.167.65:9999' //测试
-const url = 'http://192.168.31.167:9999' //长龙
+const url = 'http://39.97.167.65:9999' //测试
+// const url = 'http://192.168.31.167:9999' //长龙
 // const url = 'http://192.168.31.134:9999' //嘉豪
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://62.234.122.43:9999' //正式