Merge branch 'feature/7月迭代-会员' into dev

# Conflicts:
#	src/components/allCustomers/index.js

src/components/allCustomers/allCustomersList.vue

@@ -36,9 +36,7 @@
             <vue-gic-select-tree :options="selectTreeOptions" @change="onSelectTreeChange" style="display: inline-block;margin:0 10px; height: 32px" />
           </el-form-item>
           <el-form-item style="margin-right:10px;">
-            <el-select v-model="channelType" multiple collapse-tags style="width: 200px">
-              <el-option v-for="el in selectChannelList" :key="el.id" :value="el.id" :label="el.label"></el-option>
-            </el-select>
+            <vue-gic-select-tree :options="selectChannelList" @change="onSelectChannelChange" style="display: inline-block;height: 32px;width:200px" />
           </el-form-item>
           <el-form-item>
             <el-button type="text" @click="showSearch = !showSearch" class="senior-search">

src/components/allCustomers/index.js

@@ -21,7 +21,31 @@ export default {
   name: "allCustomersList",
   data() {
     return {
-      selectChannelList: [],
+      selectChannelValue: '',
+      selectChannelList: {
+        selectOptions: {
+          collapseTags: true,
+          allCheckText: '全部关联渠道',
+          placeholder: '全部关联渠道',
+          width: 260
+        },
+        treeOptions: {
+          data: [
+        // {
+        //   id: '1',
+        //   label: '微信公众号',
+        //   disabled: false
+        // },
+          ],
+          props: {
+            label: 'label',
+            children: 'children',
+            value: 'id'
+          }
+        },
+        searchAble: false,
+        multipleAble: true
+    },
       importList:[
         {
           importType: 11,
@@ -232,6 +256,12 @@ export default {
     onSelectTreeChange(data) {
       this.customerType = data;
     },
+    // 关联渠道选中数据
+    onSelectChannelChange(data) {
+      this.channelType = data.map(item=>{
+        return item.id
+      });
+    },
     initialize() {
       this.pageParam.phoneNameCard = sessionStorage.getItem("phoneNameCard")
         ? sessionStorage.getItem("phoneNameCard")
@@ -260,7 +290,7 @@ export default {
     getMemberSourceList() {
       doFetchGet(url.getMemberSourceList, {}).then(res=>{
         if (res.data.errorCode === 0 && res.data.result) {
-          this.selectChannelList = res.data.result.map(item=>{
+          this.selectChannelList.treeOptions.data = res.data.result.map(item=>{
             return {
               id: item.key,
               label: item.value,