Merge branch 'feature/销售线索4' of http://git.gicdev.com/office/haoban-3 into dev

src/views/apps/customerApp/index.vue

@@ -64,7 +64,46 @@ export default {
           path: '/memberShowSet'
         }
       ],
-      tabListData: [],
+      tabListData: [
+        {
+          tabId: '1',
+          tabName: '会员基础设置',
+          icon: 'iconjichushezhi',
+          onlyIconActive: false,
+          children: [
+            {
+              tabId: '11',
+              tabName: '会员展示设置',
+              icon: ''
+            },
+            {
+              tabId: '12',
+              tabName: '会员分组设置',
+              icon: ''
+            },
+            {
+              tabId: '13',
+              tabName: '会员搜索设置',
+              icon: ''
+            },
+            {
+              tabId: '14',
+              tabName: '会员详情设置',
+              icon: ''
+            }
+            // {
+            //   tabId: '15',
+            //   tabName: '会员标签设置',
+            //   icon: ''
+            // }
+          ]
+        },
+        {
+          tabId: '2',
+          tabName: '我的顾客列表',
+          icon: 'icongukeguanliicon'
+        }
+      ],
       navName: {
         1: '会员基础设置',
         11: '会员展示设置',
@@ -132,6 +171,46 @@ export default {
       let para = {
         enterpriseId: this.activeBrand
       };
+      let list = [
+        {
+          tabId: '1',
+          tabName: '会员基础设置',
+          icon: 'iconjichushezhi',
+          onlyIconActive: false,
+          children: [
+            {
+              tabId: '11',
+              tabName: '会员展示设置',
+              icon: ''
+            },
+            {
+              tabId: '12',
+              tabName: '会员分组设置',
+              icon: ''
+            },
+            {
+              tabId: '13',
+              tabName: '会员搜索设置',
+              icon: ''
+            },
+            {
+              tabId: '14',
+              tabName: '会员详情设置',
+              icon: ''
+            }
+            // {
+            //   tabId: '15',
+            //   tabName: '会员标签设置',
+            //   icon: ''
+            // }
+          ]
+        },
+        {
+          tabId: '2',
+          tabName: '我的顾客列表',
+          icon: 'icongukeguanliicon'
+        }
+      ];
       getRequest('/haoban-app-customer-web/tag/open-tag', para)
         .then(res => {
           if (!!res.data.result) {

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -41,6 +41,7 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
         <el-table-column label="门店名称" width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <div style="width: 100%;white-space:nowrap;overflow:hidden;text-overflow: ellipsis;">{{ scope.row.storeName }}</div>
+            <p style="color:#909399">{{ scope.row.storeCode }}</p>
           </template>
         </el-table-column>
         <el-table-column prop="" label="任务总数">