Merge branch 'dev/v1.0.10_tsz' of jianyu/page_pc_stationSocial into feature/v1.0.10

src/api/modules/index.js

@@ -7,8 +7,5 @@ export * from './entbase'
 export * from './bigmember'
 export * from './publicapply'
 export * from './communicateBook'
-<<<<<<< HEAD
 export * from './biService'
-=======
 export * from './problem'
->>>>>>> master

src/components/CustomerInfo.vue

@@ -20,48 +20,23 @@
     </div>
     <div class="info-content" v-loading="loading">
       <div class="item_" v-show="active === 1">
-<<<<<<< HEAD
-        <Cell>
-          <template v-slot:title>
-            <div class="custom-title flex">
-              <span class="title">客户基础信息</span>
-              <div @click="getDetail" class="get-detail-btn">查看详情</div>
-            </div>
-          </template>
-          <div class="item-main">
-            <span class="account-info">用户手机号：{{ userInfo.phone }}</span>
-            <span v-if="userInfo.vipStatus > 0" class="account-icon icon-vip"></span>
-            <span v-if="userInfo.memberStatus > 0" class="account-icon icon-member"></span>
-            <!-- <span v-if="userInfo.entStatus" class="account-icon icon-ent"></span> -->
-          </div>
-        </Cell>
-        <Cell title="订阅设置" isLink>
-          <div class="item-main" v-if="userInfo.keywords && userInfo.keywords.length > 0">
-            <div class="keyword-item" v-for="(item, index) in userInfo.keywords" :key="index">{{ item }}</div>
-          </div>
-          <div v-else class="empty-text">暂无订阅</div>
-        </Cell>
-        <Cell title="订单信息">
-          <div class="item-main order" v-if="listInfo.list && listInfo.list.length > 0">
-            <Order v-for="order in listInfo.list" :key="order.id" v-bind="order"></Order>
-            <div class="pagination">
-              <el-pagination background layout="prev, pager, next" :pager-count="5" :page-size="listInfo.pageSize"
-                :current-page="listInfo.pageNum" @current-change="handleCurrentChange" :hide-on-single-page="true"
-                :total="listInfo.total">
-              </el-pagination>
-=======
         <div v-show="showProblemList">
           <problemList :uid="userId" :list="clintProblemInfo.list" @back="viewMoreProblem"></problemList>
         </div>
         <div  v-show="!showProblemList">
           <!-- P570需求--游客 --客户信息仅展示服务总结模块-->
-          <Cell title="客户基础信息" v-if="userInfo.isTourist !== 2">
+          <Cell v-if="userInfo.isTourist !== 2">
+            <template v-slot:title>
+              <div class="custom-title flex">
+                <span class="title">客户基础信息</span>
+                <div @click="getDetail" class="get-detail-btn">查看详情</div>
+              </div>
+            </template>
             <div class="item-main">
               <span class="account-info">用户手机号：{{ userInfo.phone }}</span>
               <span v-if="userInfo.vipStatus > 0" class="account-icon icon-vip"></span>
               <span v-if="userInfo.memberStatus > 0" class="account-icon icon-member"></span>
               <!-- <span v-if="userInfo.entStatus" class="account-icon icon-ent"></span> -->
->>>>>>> master
             </div>
           </Cell>
           <Cell title="订阅设置" isLink v-if="userInfo.isTourist !== 2">
@@ -126,15 +101,10 @@ import { Pagination, Input, Popover } from 'element-ui'
 import Cell from '@/components/fold-cell/'
 import Order from '@/components/order-item/'
 import Summary from '@/components/summary/'
-<<<<<<< HEAD
-import { getUserInfo, getOrderList, isEvalInfo, setSummary, commonPhrasesClassList, getFindClueInfo } from '@/api/modules/'
-=======
-import { getUserInfo, getOrderList, isEvalInfo, setSummary, commonPhrasesClassList, getClientProblemList } from '@/api/modules/'
->>>>>>> master
+import { getUserInfo, getOrderList, isEvalInfo, setSummary, commonPhrasesClassList, getClientProblemList, getFindClueInfo } from '@/api/modules/'
 import { momentTime, formatNum } from '@/utils/'
 import tagRow from '@/components/problem-tag/tag-row.vue'
 import problemList from '@/components/problem-tag/list.vue'
-import { throttle } from 'lodash'
 export default {
   name: 'CustomerInfo',
   props: {