From 053af0cdba72b2ce68a3c4db19b1f71900dca5ad Mon Sep 17 00:00:00 2001
From: douzhuo <17611323298@163.com>
Date: Fri, 1 Jul 2022 00:31:25 +0800
Subject: [PATCH] tijiaoxiugai

---
 src/page/check/chose.vue                 | 172 ++++++++++++++---------
 src/page/index/top/index.vue             |   2 +-
 src/views/Statistics/ConsultantBrand.vue |   8 +-
 vue.config.js                            |   4 +-
 4 files changed, 109 insertions(+), 77 deletions(-)

diff --git a/src/page/check/chose.vue b/src/page/check/chose.vue
index b7fb4c9..8117e40 100644
--- a/src/page/check/chose.vue
+++ b/src/page/check/chose.vue
@@ -42,7 +42,9 @@
               >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
             >
           </div>
-          <div class="text-3">{{ (item.provinceName||'-')+'-'+(item.cityName|| "-") }}</div>
+          <div class="text-3">
+            {{ (item.provinceName || "-") + "-" + (item.cityName || "-") }}
+          </div>
         </div>
       </div>
     </div>
@@ -107,7 +109,11 @@
               >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
             >
           </div> -->
-          <div class="text-3">区域位置:{{ (item.provinceName||'-')+'-'+(item.cityName|| "-") }}</div>
+          <div class="text-3">
+            区域位置:{{
+              (item.provinceName || "-") + "-" + (item.cityName || "-")
+            }}
+          </div>
         </div>
       </div>
     </div>
@@ -149,7 +155,7 @@
         >
         </el-input>
         <el-button
-          style="height: 32px; line-height: 13px;margin-left:10px;"
+          style="height: 32px; line-height: 13px; margin-left: 10px"
           type="primary"
           size="medium"
           @click="screenzkhousePage"
@@ -161,11 +167,21 @@
           v-for="item in list"
           :key="item.id"
           class="tab"
-          style="width:220px;height:130px;"
+          style="width: 220px; height: 130px"
           @click="chose(item)"
         >
           <div class="text-1">{{ item.propertyName }}</div>
-          <div class="text-2">项目类型:{{ item.houseType==0?'正式':item.houseType==1?'试用':item.houseType==2?'演示':'测试' }}</div>
+          <div class="text-2">
+            项目类型:{{
+              item.houseType == 0
+                ? "正式"
+                : item.houseType == 1
+                ? "试用"
+                : item.houseType == 2
+                ? "演示"
+                : "测试"
+            }}
+          </div>
           <div class="text-2">
             服务状态:
             <span
@@ -174,7 +190,9 @@
               >{{ item.residueTime > 0 ? "服务中" : "已过期" }}</span
             >
           </div>
-          <div class="text-3">{{ (item.provinceName||'-')+'-'+(item.cityName|| "-") }}</div>
+          <div class="text-3">
+            {{ (item.provinceName || "-") + "-" + (item.cityName || "-") }}
+          </div>
         </div>
       </div>
     </div>
@@ -184,10 +202,9 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="currentPage"
-      :page-size="30"
+      :page-size="size"
       :total="total"
       layout="total, sizes, prev, pager, next, jumper"
-      hide-on-single-page
     >
     </el-pagination>
   </div>
@@ -202,7 +219,7 @@ export default {
       props: {
         lazy: true,
         checkStrictly: true,
-        expandTrigger:'hover',
+        expandTrigger: "hover",
         async lazyLoad(node, resolve) {
           const { level } = node;
           if (level == 0) {
@@ -239,6 +256,7 @@ export default {
       agentName: "", //代理商名称
       companyName: "",
       total: 20,
+      size: 10,
       list: [],
       options: [],
       info: {},
@@ -270,7 +288,7 @@ export default {
       this.$api.api
         .zkagentPage({
           current: this.currentPage,
-          pageSize: 10,
+          pageSize: this.size,
           agentName: this.agentName,
         })
         .then((res) => {
@@ -279,13 +297,13 @@ export default {
           this.total = res.data.total;
         });
     },
-    screengetAgentList(){
-      this.currentPage=1
-      this.getAgentList()
+    screengetAgentList() {
+      this.currentPage = 1;
+      this.getAgentList();
     },
-    screengetCompanyList(){
-    this.currentPage=1
-    this.getCompanyList()
+    screengetCompanyList() {
+      this.currentPage = 1;
+      this.getCompanyList();
     },
     findByUserName() {
       this.$api.api
@@ -294,15 +312,15 @@ export default {
         })
         .then((res) => {
           // console.log(res);
-          this.info.selectHouseType=res.selectHouseType
+          this.info.selectHouseType = res.selectHouseType;
           // 获取项目
           this.zkhousePage();
           // 获取区域列表
           this.findArea();
         });
     },
-    screenzkhousePage(){
-      this.currentPage=1
+    screenzkhousePage() {
+      this.currentPage = 1;
       this.zkhousePage();
     },
     getCompanyList() {
@@ -332,23 +350,25 @@ export default {
         orgType: localStorage.getItem("orgType"),
       };
       if (this.info.selectHouseType == 1) {
-        this.$api.api.zkhousePage({
-          propertyName: this.propertyName,
-          provinceId :this.provinceId ,
-          cityId:this.cityId,
-            sortBy:1,
-          ...obj
-        }).then((res) => {
-          // console.log(res)
-          this.list = res.data.records;
-          this.total = res.data.total;
-        });
+        this.$api.api
+          .zkhousePage({
+            propertyName: this.propertyName,
+            provinceId: this.provinceId,
+            cityId: this.cityId,
+            sortBy: 1,
+            ...obj,
+          })
+          .then((res) => {
+            // console.log(res)
+            this.list = res.data.records;
+            this.total = res.data.total;
+          });
       }
       if (this.info.selectHouseType == 2) {
         this.$api.api
           .findHouseByArea({
             id: this.area,
-            ...obj
+            ...obj,
           })
           .then((res) => {
             // console.log(res)
@@ -359,9 +379,9 @@ export default {
     },
     chose(item) {
       console.log(item);
-      if(item.lockFlag!=0){
-        this.$message.warning('您已经被禁用')
-        return
+      if (item.lockFlag != 0) {
+        this.$message.warning("您已经被禁用");
+        return;
       }
       // if(item.residueTime<=0){
       //   this.$message.warning('您已过期')
@@ -369,40 +389,52 @@ export default {
       // }
       if (this.flag == 1) {
         localStorage.setItem("agentId", item.id);
-        localStorage.setItem("orgCode", '');
+        localStorage.setItem("orgCode", "");
         localStorage.setItem("topName", item.agentName);
-        localStorage.setItem("houseId", '');
+        localStorage.setItem("houseId", "");
       }
       if (this.flag == 2) {
-        localStorage.setItem("agentId", '');
+        localStorage.setItem("agentId", "");
         localStorage.setItem("orgCode", item.orgCode);
         localStorage.setItem("topName", item.name);
-        localStorage.setItem("houseId", '');
+        localStorage.setItem("houseId", "");
       }
       if (this.flag == 3) {
         localStorage.setItem("orgCode", item.orgCode);
-        localStorage.setItem("agentId", '');
+        localStorage.setItem("agentId", "");
         localStorage.setItem("topName", item.propertyName);
         localStorage.setItem("houseId", item.id);
-        this.addLoginCount(item.id)
+        this.addLoginCount(item.id);
       }
       this.$router.push({ path: "/wel" });
-      localStorage.setItem('allClose',true)
+      localStorage.setItem("allClose", true);
     },
-    addLoginCount(houseId){
-      this.$api.api.addLoginCount({
-        houseId: houseId,
-        serviceId: 'pig',
-      }).then(res=>{
-        console.log(res);
-      })
+    addLoginCount(houseId) {
+      this.$api.api
+        .addLoginCount({
+          houseId: houseId,
+          serviceId: "pig",
+        })
+        .then((res) => {
+          console.log(res);
+        });
     },
     goback() {
       this.$router.back();
-      localStorage.setItem('allClose',false)
+      localStorage.setItem("allClose", false);
     },
     handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+      this.size = val;
+      if (this.flag == 1) {
+        // 获取代理商
+        // return
+        this.getAgentList();
+      } else if (this.flag == 2) {
+        // 获取公司
+        this.getCompanyList();
+      } else {
+        this.findByUserName();
+      }
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
@@ -417,15 +449,15 @@ export default {
       //   // 获取项目
       // }
       if (this.flag == 1) {
-      // 获取代理商
-      // return
-      this.getAgentList();
-    } else if (this.flag == 2) {
-      // 获取公司
-      this.getCompanyList();
-    } else {
-      this.findByUserName();
-    }
+        // 获取代理商
+        // return
+        this.getAgentList();
+      } else if (this.flag == 2) {
+        // 获取公司
+        this.getCompanyList();
+      } else {
+        this.findByUserName();
+      }
     },
     locationsChange(e) {
       console.log(e);
@@ -440,12 +472,12 @@ export default {
 <style lang="scss" scoped >
 .box-center {
   min-width: 1200px;
-   height: 100vh;
+  height: 100vh;
   background: #ffffff;
 }
 .head {
   height: 64px;
-  background: #2671E2;
+  background: #2671e2;
   display: flex;
   padding: 0 20%;
   box-sizing: border-box;
@@ -493,9 +525,9 @@ export default {
       font-size: 16px;
       line-height: 30px;
       margin-top: 10px;
-       white-space: nowrap;
-      overflow:hidden; /*超出部分省略号显示*/
-      text-overflow:ellipsis; /*省略号显示*/
+      white-space: nowrap;
+      overflow: hidden; /*超出部分省略号显示*/
+      text-overflow: ellipsis; /*省略号显示*/
     }
     .text-2 {
       font-size: 14px;
@@ -506,11 +538,11 @@ export default {
       line-height: 20px;
       margin-bottom: 10px;
       white-space: nowrap;
-      overflow:hidden; /*超出部分省略号显示*/
-      text-overflow:ellipsis; /*省略号显示*/
+      overflow: hidden; /*超出部分省略号显示*/
+      text-overflow: ellipsis; /*省略号显示*/
     }
   }
-  .tab:hover{
+  .tab:hover {
     // color: white;
     border: 1px solid #2671e2 !important;
     background: rgba(38, 113, 226, 0.04);
@@ -522,8 +554,8 @@ export default {
   // left: 30%;
   text-align: center;
 }
-/deep/ .el-button--primary{
-  background: #2671E2 !important;
-  border: 1px solid #2671E2 !important;
+/deep/ .el-button--primary {
+  background: #2671e2 !important;
+  border: 1px solid #2671e2 !important;
 }
 </style>
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 8f65f63..8314c38 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -61,7 +61,7 @@
           <img class="daili2img" src="/img/qh1.png" alt="" />
         </div> -->
         <div class="daili">
-          {{ companyName }}1
+          {{ companyName }}
         </div>
           <el-button @click="goBack" class="avue-header" style="margin-left: 10px;color: #2671E2;border:1px solid #2671E2;padding: 10px;">{{
             orgType == 0
diff --git a/src/views/Statistics/ConsultantBrand.vue b/src/views/Statistics/ConsultantBrand.vue
index 48d6139..c088e50 100644
--- a/src/views/Statistics/ConsultantBrand.vue
+++ b/src/views/Statistics/ConsultantBrand.vue
@@ -49,13 +49,13 @@
         <div class="titel-text">筛选日期：</div>
         <div style="margin-left: 14px;">
           <el-button
-            :class="{ 'el-button--primary': dateType == 4 }"
-            @click="tabtimetap(4)"
+            :class="{ 'el-button--primary': dateType == 0 }"
+            @click="tabtimetap(0)"
             >今天</el-button
           >
           <el-button
-            :class="{ 'el-button--primary': dateType == 5 }"
-            @click="tabtimetap(5)"
+            :class="{ 'el-button--primary': dateType == 4 }"
+            @click="tabtimetap(4)"
             >近7天</el-button
           >
           <el-button
diff --git a/vue.config.js b/vue.config.js
index 6b91abe..f60d653 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,8 +7,8 @@
 // const url = 'http://192.168.31.100:9999' //王笑
 // const url = 'http://62.234.122.43:9999' //正式
 // const url = 'http://81.70.55.170:9999' // 新测试服务器IP
-// const url = 'http://192.168.31.89:9999' //sh
-const url = 'https://zanyong.hfju.com' // 正式域名
+const url = 'http://192.168.31.86:9999' // 胜浩
+// const url = 'https://zanyong.hfju.com' // 正式域名
 // const url = 'http://81.70.55.170:9999' // 新测试
 // const url = 'http://82.156.35.22:9999' // 新正式ip
 const CompressionWebpackPlugin = require('compression-webpack-plugin')