Merge remote-tracking branch 'company/master'

# Conflicts:
#	src/views/member/list.vue

src/views/member/list.vue

@@ -76,12 +76,12 @@
     </el-form>
 
     <!-- Tab Selection -->
-    <el-tabs v-model="queryParams.tabValue" @tab-click="handleTabChange">
+<!--    <el-tabs v-model="queryParams.tabValue" @tab-click="handleTabChange">-->
 <!--      <el-tab-pane label="全部" name="0"></el-tab-pane>-->
 <!--      <el-tab-pane label="今日新增" name="1"></el-tab-pane>-->
 <!--      <el-tab-pane label="今日完播" name="2"></el-tab-pane>-->
 <!--      <el-tab-pane label="未看过课" name="3"></el-tab-pane>-->
-    </el-tabs>
+<!--    </el-tabs>-->
 
     <!-- Toolbar -->
     <el-row :gutter="10" class="mb8">

src/views/qw/externalContact/index.vue

@@ -261,6 +261,13 @@
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="描述信息" align="center" prop="description" />
+      <el-table-column label="是否重粉" align="center" prop="isRepeat" >
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isRepeat === 1 ? 'success' : 'info'">
+            {{ scope.row.isRepeat === 1 ? '是' : '否' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="标签" align="center" prop="tagIds" width="250px">
         <template slot-scope="scope">
           <div v-for="i in JSON.parse(scope.row.tagIds)" :key="i" style="display: inline;">
@@ -356,13 +363,11 @@
 		     @click="handledetails(scope.row)"
 		     >用户信息
 		  </el-button>
-
-<!--          <el-button v-if="scope.row.customerId"
-                     size="mini"
-                     type="text"
-                     icon="el-icon-setting"
-                     @click="setCourseSOP(scope.row)"
-          >设置课程SOP</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleViewRepeat(scope.row)"
+          >查看重粉</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -379,6 +384,10 @@
       <customer-details  ref="customerDetails" @refreshList="refreshList"/>
     </el-drawer>
 
+    <el-dialog visible.sync="true" width="800px">
+
+    </el-dialog>
+
     <el-dialog title="批量添加标签" :visible.sync="tagOpen" width="800px" append-to-body>
       <div>搜索标签：
         <el-input v-model="tagChange.tagName" placeholder="请输入标签名称" clearable size="small" style="width: 200px;margin-right: 10px" />
@@ -436,6 +445,7 @@
         <el-button @click="DelTagCancel">取 消</el-button>
       </div>
     </el-dialog>
+
     <!-- 添加或修改企业微信客户对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
@@ -706,6 +716,10 @@ export default {
 
   },
   methods: {
+    // 查看重粉
+    handleViewRepeat(row){
+
+    },
     updateCorpId(){
       var listTagFrom={corpId:this.queryParams.corpId}
         allListTagGroup(listTagFrom).then(response => {