Merge remote-tracking branch 'origin/master'

src/api/users/user.js

@@ -65,7 +65,7 @@ export function listUser(data) {
 // 转移客户
 export function transferUser(data) {
   return request({
-    url: '/fsUser/user/transfer',
+    url: '/fsuser/user/transfer',
     method: 'post',
     data: data
   })

src/views/statistics/section/channel.vue

@@ -61,7 +61,7 @@
       <el-col :span="1.5">
         <el-button
           type="warning"
-          plain
+          plains
           icon="el-icon-download"
           size="mini"
           @click="handleExport"

src/views/users/user/darkRoom.vue

@@ -65,6 +65,12 @@
       <el-table-column label="完播时间" align="center" prop="completeWatchDate" width="160px"/>
       <el-table-column label="标签名称" align="center" prop="tag" />
       <el-table-column label="所属销售名称" align="center" prop="companyUserNickName" width="120px"/>
+      <el-table-column label="是否重粉" align="center" prop="isRepeatFans" width="120px">
+        <template slot-scope="scope">
+          <el-tag effect="dark" type="success" v-if="scope.row.isRepeatFans === 0">否</el-tag>
+          <el-tag effect="dark" type="danger"    v-else-if="scope.row.isRepeatFans === 1">是</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -73,6 +79,7 @@
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['users:user:darkRoomList']"
+            v-if="scope.row.isRepeatFans !== 1"
           >启用</el-button>
         </template>
       </el-table-column>

src/views/users/user/transfer.vue

@@ -76,7 +76,7 @@
     <el-dialog title="客户转移" :visible.sync="openTransferDialog" width="500px" append-to-body>
       <el-form ref="transferForm" :model="transferForm" label-width="100px" :rules="cusTransfer">
         <el-alert
-          title="会经过总后台审核后才进行转移"
+          title="会自动通过审核"
           type="warning">
         </el-alert>
         <el-form-item label="转移至销售" prop="targetUserId">