修改富文本样式展示问题 添加合作伙伴功能

package.json

@@ -38,6 +38,7 @@
     "vue": "^2.6.11",
     "vue-i18n": "^8.15.1",
     "vue-pdf": "^4.2.0",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2"
   },

src/api/con.client.js

@@ -90,3 +90,12 @@ export function getCustomPageList (params) {
     params
   })
 }
+
+// 获取合作伙伴
+export function getPartner (params) {
+  return request({
+    url: '/tp/customer/getPartner',
+    method: 'get',
+    params
+  })
+}

src/assets/style/public.scss

@@ -152,6 +152,9 @@ ul{list-style: none; padding: 0}
   .mt-2 {
     margin-top: .2rem;
   }
+  .mt-4 {
+    margin-top: .4rem;
+  }
   .mt-1 {
     margin-top: .1rem;
   }

src/components/HeaderLayout/index.vue

@@ -20,7 +20,7 @@
                 <a class="no-line" href="http://111.203.232.175:8085/" target="_blank">管理端 </a>
               </el-dropdown-item>
               <el-dropdown-item divided @click.native="logout">
-                <span style="display:block; width: 60px">登出</span>
+                <span style="display:block; width: 60px">退出</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>

src/views/content/client/components/customList.vue

@@ -8,8 +8,8 @@
       </div>
       <div class="news-content">
         <el-table stripe :data="tableData" style="width: 100%">
-          <el-table-column prop="customerName"></el-table-column>
-          <el-table-column align="right" prop="createTime"></el-table-column>
+          <el-table-column prop="name"></el-table-column>
+          <el-table-column align="right" prop="createAt"></el-table-column>
         </el-table>
         <Pagination
           v-show="pageObj.total > 0"
@@ -41,13 +41,30 @@ export default {
     }
   },
   mounted () {
-    this.getCustomList()
+    this.type = this.$route.query.type
+    console.log(this.type)
+    if (this.type === 1) {
+      this.getCustomList()
+    } else {
+      this.getPartner()
+    }
   },
   methods: {
+    getPartner () {
+      API_CLIENT.getPartner({ _index: this.pageObj.pageNo, _size: this.pageObj.pageSize }).then(res => {
+        this.tableData = res.data.records
+        this.pageObj.total = Number(res.data.total)
+      })
+    },
     // 查询概况页面数据
     getCustomList () {
       API_CLIENT.getCustomPageList({ _index: this.pageObj.pageNo, _size: this.pageObj.pageSize }).then(res => {
-        this.tableData = res.data.records
+        this.tableData = res.data.records.map(item => {
+          return {
+            name: item.customerName,
+            createAt: item.createTime
+          }
+        })
         this.pageObj.total = Number(res.data.total)
       })
     },
@@ -58,7 +75,11 @@ export default {
     pageChange (page) {
       this.pageObj.pageSize = page.limit
       this.pageObj.pageNo = page.page
-      this.getCustomList()
+      if (this.type === 1) {
+        this.getCustomList()
+      } else {
+        this.getPartner()
+      }
     }
   }
 }

src/views/content/client/page.vue

@@ -145,7 +145,7 @@
             </div>
             <div class="boxHeight-3 mt-2" style="position:relative;">
               <div class="title">重要客户</div>
-              <div class="lookMore" @click="goCustomerList">查看更多</div>
+              <div class="lookMore" @click="goCustomerList(1)">查看更多</div>
               <div class="d-flex search-box jc-end">
                 <el-select v-model="selectYear" size="mini" @change="getImportantCus">
                     <el-option
@@ -160,13 +160,11 @@
                   <div class="customer-name" v-for="(item,index) in customerList" :key="index">{{item}}</div>
               </div>
             </div>
-            <div class="boxHeight-3 mt-2">
+            <div class="boxHeight-3 mt-2" style="position:relative;">
               <div class="title">合作伙伴</div>
-              <div class="iconBlock">
-                  <i class="icon20 icon-datangjituan"></i>
-                  <i class="icon20 icon-zhongguoshiyou"></i>
-                  <i class="icon20 icon-changjiangdianli"></i>
-                  <i class="icon5 icon-guojiadianwang"></i>
+              <div class="lookMore" @click="goCustomerList(2)">查看更多</div>
+              <div class="customer-list mt-4">
+                  <div class="customer-name" v-for="(item,index) in partnerList" :key="index">{{item.name}}</div>
               </div>
             </div>
         </div>
@@ -199,7 +197,8 @@ export default {
         { id: '2', name: '按资金' },
         { id: '3', name: '按项目' }
       ], // 重要客户下拉框
-      customerList: [] // 重要客户
+      customerList: [], // 重要客户
+      partnerList: [] // 合作伙伴
     }
   },
   mounted () {
@@ -208,6 +207,7 @@ export default {
     this.getCustomerByAmount()
     this.getImportantCus()
     this.getStatisticsCustomer()
+    this.getPartner()
   },
   methods: {
     // 客户统计
@@ -282,8 +282,16 @@ export default {
       this.clickDistributeId = item.id || null
       this.getDistribution()
     },
-    goCustomerList () {
-      this.$router.push('/customList')
+    goCustomerList (item) {
+      this.$router.push({
+        path: '/customList',
+        query: { type: item }
+      })
+    },
+    getPartner () {
+      API_CLIENT.getPartner({ _index: 1, _size: 5 }).then(res => {
+        this.partnerList = res.data.records
+      })
     }
   }
 }

src/views/system/index/components/enterpriseDetail.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="news-content" v-if="type===0 ||type===2|| type===3|| type===4 ">
         <h3>{{contentData.name}}</h3>
-        <div v-html="contentData.content"></div>
+        <div class="ql-editor" v-html="contentData.content"></div>
       </div>
       <div class="news-content" v-if="type===1">
           <a class="image-box" v-for="(item,index) in contentData" :key="index">
@@ -20,6 +20,9 @@
 </template>
 
 <script>
+import 'quill/dist/quill.core.css'
+import 'quill/dist/quill.snow.css'
+import 'quill/dist/quill.bubble.css'
 import headerLayout from '@/components/headerLayout/index' // 公共头部
 import * as API_BASIC from '@/api/sys.basic.js'
 
@@ -103,13 +106,16 @@ export default {
       cursor: pointer;
     }
   }
+  .ql-editor {
+    overflow-x: hidden;
+  }
   .news-content {
     color: #fff;
     font-size: .14rem;
     width: 12rem;
     height: calc(100vh - 3rem);
-    overflow-y: auto;
-    overflow-x: hidden;
+    // overflow-y: auto;
+    // overflow-x: hidden;
     margin: 0 auto;
     padding:20px;
     ::v-deep img {