Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-manager-ui into developerC

package.json

@@ -39,6 +39,7 @@
     "three-dots": "^0.3.2",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
+    "vue-preview": "^1.1.3",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",

pnpm-lock.yaml

@@ -77,6 +77,9 @@ dependencies:
   vue-count-to:
     specifier: 1.0.13
     version: 1.0.13
+  vue-preview:
+    specifier: ^1.1.3
+    version: 1.1.3
   vue-router:
     specifier: 3.0.2
     version: 3.0.2(vue@2.6.10)
@@ -10326,6 +10329,11 @@ packages:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==, tarball: https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz}
     dev: true
 
+  /photoswipe@4.1.3:
+    resolution: {integrity: sha512-89Z43IRUyw7ycTolo+AaiDn3W1EEIfox54hERmm9bI12IB9cvRfHSHez3XhAyU8XW2EAFrC+2sKMhh7SJwn0bA==, tarball: https://registry.npmmirror.com/photoswipe/-/photoswipe-4.1.3.tgz}
+    engines: {node: '>= 0.8.0'}
+    dev: false
+
   /picocolors@0.2.1:
     resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==, tarball: https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz}
     dev: true
@@ -13546,6 +13554,12 @@ packages:
       - whiskers
     dev: true
 
+  /vue-preview@1.1.3:
+    resolution: {integrity: sha512-ko/W1vxgmngiDTL/cMSc36Hq2k7ZPynKBdPoRGupNMlESGkjSdo1RTJcHmYDZZgtSbm10OBJPuPYmzdW1N76xQ==, tarball: https://registry.npmmirror.com/vue-preview/-/vue-preview-1.1.3.tgz}
+    dependencies:
+      photoswipe: 4.1.3
+    dev: false
+
   /vue-router@3.0.2(vue@2.6.10):
     resolution: {integrity: sha512-opKtsxjp9eOcFWdp6xLQPLmRGgfM932Tl56U9chYTnoWqKxQ8M20N7AkdEbM5beUh6wICoFGYugAX9vQjyJLFg==, tarball: https://registry.npmmirror.com/vue-router/-/vue-router-3.0.2.tgz}
     peerDependencies:

src/views/library/supplierTag/list.vue

@@ -25,7 +25,6 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" :index="indexMethod" type="index" sortable="custom" align="center" width="80" />
       <el-table-column prop="keyword" label="关键词" align="center" />
-      <el-table-column prop="frequency" label="搜索次数" width="120" align="center" sortable />
       <el-table-column width="180" label="来源" align="center">
         <template slot-scope="{ row }">
           <span v-if="row.fromSearch === 1">单个添加</span>
@@ -33,12 +32,6 @@
           <span v-else>导入</span>
         </template>
       </el-table-column>
-      <el-table-column label="最近搜索时间" align="center" width="200">
-        <template slot-scope="{ row }">
-          <span v-if="row.searchTime">{{ row.searchTime | parseTime }}</span>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
       <el-table-column label="添加时间" align="center" width="200">
         <template slot-scope="{ row }">
           <span v-if="row.pickTime">{{ row.pickTime | parseTime }}</span>
@@ -85,16 +78,16 @@
           <el-button type="primary" @click="handleAddTag">新增标签</el-button>
         </div>
       </div>
-      <el-table ref="table" v-loading="isLoading" :data="labelList" height="340px" border @selection-change="handleSelectionTagChange">
+      <el-table
+        ref="table"
+        v-loading="isLoading"
+        :data="labelList"
+        height="340px"
+        border
+        @selection-change="handleSelectionTagChange"
+      >
         <el-table-column type="selection" width="55" />
         <el-table-column prop="keyword" label="标签" align="center" />
-        <el-table-column prop="frequency" label="搜索次数" width="120" align="center" sortable />
-        <el-table-column label="最近搜索时间" align="center" width="200">
-          <template slot-scope="{ row }">
-            <span v-if="row.searchTime">{{ row.searchTime | parseTime }}</span>
-            <span v-else>-</span>
-          </template>
-        </el-table-column>
         <el-table-column label="添加时间" align="center" width="200">
           <template slot-scope="{ row }">
             <span v-if="row.addTime">{{ row.addTime | parseTime }}</span>
@@ -130,7 +123,13 @@
 </template>
 
 <script>
-import { fetchShopLabelList, fetchLabelList, relevanceInsertLabel, delShopLabelList, addInsertSearch } from '@/api/user/supplier/supplier'
+import {
+  fetchShopLabelList,
+  fetchLabelList,
+  relevanceInsertLabel,
+  delShopLabelList,
+  addInsertSearch
+} from '@/api/user/supplier/supplier'
 export default {
   data() {
     return {
@@ -152,7 +151,7 @@ export default {
         shopId: '', // 供应商Id
         keyword: '', // 标签名
         pageNum: 1, // 页码
-        pageSize: 100// 页面数据数
+        pageSize: 100 // 页面数据数
       },
       tagForm: {
         keyword: ''

src/views/sys/menus/list.vue

@@ -5,47 +5,61 @@
       <el-select v-model="listQuery.status" style="width: 140px" class="filter-item" @change="handleFilter">
         <el-option v-for="item in statusOptions" :key="item.key" :label="item.label" :value="item.key" />
       </el-select>
-      <el-button v-if="checkPermission('sys:menu:edit')" class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-edit" @click="handleCreate">
+      <el-button
+        v-if="checkPermission('sys:menu:edit')"
+        class="filter-item"
+        style="margin-left: 10px"
+        type="primary"
+        icon="el-icon-edit"
+        @click="handleCreate"
+      >
         添加菜单
       </el-button>
     </div>
-    <el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row style="width:100%">
+    <el-table :key="tableKey" v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
       <el-table-column label="序号" align="center" width="50">
         <template slot-scope="scope">{{ scope.$index + 1 }}</template>
       </el-table-column>
       <el-table-column label="菜单ID" align="center">
-        <template slot-scope="{row}">{{ row.id }}</template>
+        <template slot-scope="{ row }">{{ row.id }}</template>
       </el-table-column>
       <el-table-column label="菜单名称" align="center">
-        <template slot-scope="{row}">{{ row.title }}</template>
+        <template slot-scope="{ row }">{{ row.title }}</template>
       </el-table-column>
       <el-table-column label="路由名称" align="center">
-        <template slot-scope="{row}">{{ row.name }}</template>
+        <template slot-scope="{ row }">{{ row.name }}</template>
       </el-table-column>
       <el-table-column label="前端图标" width="80" align="center">
-        <template slot-scope="{row}">
-          <i v-if="isElementIcon(row.icon)" :class="row.icon" />
+        <template slot-scope="{ row }">
+          <i v-if="isElementIcon(row.icon)" :class="row.icon"> </i>
           <svg-icon v-else-if="row.icon" :icon-class="row.icon" />
         </template>
       </el-table-column>
       <el-table-column label="状态" width="80" align="center">
-        <template slot-scope="{row}">
-          <el-switch v-model="row.status" :active-value="0" :inactive-value="1" active-color="#1890ff" inactive-color="#DCDFE6" @change="handleHiddenChange($index, row)" />
+        <template slot-scope="{ row }">
+          <el-switch
+            v-model="row.status"
+            :active-value="0"
+            :inactive-value="1"
+            active-color="#1890ff"
+            inactive-color="#DCDFE6"
+            @change="handleHiddenChange($index, row)"
+          />
         </template>
       </el-table-column>
       <el-table-column label="排序" width="80" align="center">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           <el-input v-model="row.sort" maxlength="4" minlength="1" @blur="handleOnInputBlur(row)" />
         </template>
       </el-table-column>
       <el-table-column label="设置" width="250" align="center">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           <el-button plain size="mini" :disabled="row.childCount | disableNextLevel" @click="handleShowNextLevel(row)">查看子菜单</el-button>
           <el-button v-if="checkPermission('sys:menu:edit')" plain size="mini" @click="handleCreateNextLevel(row)">添加子菜单</el-button>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="150" align="center">
-        <template slot-scope="{row}">
+        <template slot-scope="{ row }">
           <el-button v-if="checkPermission('sys:menu:edit')" size="mini" type="primary" @click="handleUpdate(row)">编辑
           </el-button>
           <el-button v-if="checkPermission('sys:menu:del')" size="mini" type="danger" @click="handleDelete(row)">删除
@@ -54,8 +68,13 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total>0" :total="total" :page.sync="listQuery.pageNum" :limit.sync="listQuery.pageSize" @pagination="getList" />
-
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
@@ -128,7 +147,7 @@ export default {
     },
     getList() {
       this.listLoading = true
-      fetchList(this.listQuery).then(response => {
+      fetchList(this.listQuery).then((response) => {
         this.listLoading = false
         this.list = response.data.results
         this.total = response.data.totalRecord
@@ -145,10 +164,16 @@ export default {
       this.$router.go(-1)
     },
     handleCreate() {
-      this.$router.push({ path: '/sys/menus/add', query: { parentId: this.listQuery.parentId, title: this.parentTitle }})
+      this.$router.push({
+        path: '/sys/menus/add',
+        query: { parentId: this.listQuery.parentId, title: this.parentTitle }
+      })
     },
     handleUpdate(row) {
-      this.$router.push({ path: '/sys/menus/edit', query: { id: row.id, parentId: this.listQuery.parentId, title: this.parentTitle }})
+      this.$router.push({
+        path: '/sys/menus/edit',
+        query: { id: row.id, parentId: this.listQuery.parentId, title: this.parentTitle }
+      })
     },
     handleShowNextLevel(row) {
       this.$router.push({ path: '/sys/menus/list', query: { parentId: row.id, title: row.title }})
@@ -162,7 +187,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteMenu(row.id).then(response => {
+        deleteMenu(row.id).then((response) => {
           this.$message({
             message: '删除成功',
             type: 'success',
@@ -174,7 +199,7 @@ export default {
     },
     handleOnInputBlur(row) {
       // 更新排序
-      updateSelective(row.id, { sort: row.sort }).then(response => {
+      updateSelective(row.id, { sort: row.sort }).then((response) => {
         this.$message({
           message: '操作成功',
           type: 'success',
@@ -185,7 +210,7 @@ export default {
     },
     handleHiddenChange(index, row) {
       // 操作开关
-      updateSelective(row.id, { status: row.status }).then(response => {
+      updateSelective(row.id, { status: row.status }).then((response) => {
         this.$message({
           message: '操作成功',
           type: 'success',
@@ -210,5 +235,4 @@ export default {
 }
 </script>
 
-<style scoped>
-</style>
+<style scoped></style>

src/views/user/consult/detail.vue

@@ -185,7 +185,7 @@
               <el-col v-if="item.consultType" :span="12">
                 <b>咨询类别：</b>
                 <el-tag
-                  v-for="(consultType, consultTypeIndex) in item.consultType.split(',')"
+                  v-for="(consultType, consultTypeIndex) in handleFormatStr(item.consultType)"
                   :key="consultTypeIndex"
                   style="margin: 0 1px"
                   type="info"
@@ -214,7 +214,7 @@
               <el-col :span="24">
                 <b>标签词：</b>
                 <el-tag
-                  v-for="(remarks, remarksIndex) in item.remarks.split(',')"
+                  v-for="(remarks, remarksIndex) in handleFormatStr(item.remarks)"
                   :key="remarksIndex"
                   style="margin: 0 1px"
                   type="success"
@@ -236,17 +236,19 @@
                 <b>图片：</b>
               </el-col>
               <el-col :span="24">
-                <div
+                <a
                   v-for="(image, imageIndex) in item.imageList"
                   :key="imageIndex"
+                  :href="image"
                   class="item-image"
+                  target="_blank"
                   style="width: 100px; height: 100px; margin: 5px; float: left"
                 >
                   <el-popover placement="top-start" title="" width="180" trigger="hover">
                     <img :src="image" alt="" style="width: 150px; height: 150px" />
                     <img slot="reference" :src="image" alt="" style="width: 100px; height: 100px" />
                   </el-popover>
-                </div>
+                </a>
               </el-col>
             </el-row>
             <el-row v-if="item.fileList.length > 0" :gutter="24" class="box-row">
@@ -272,7 +274,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -434,6 +436,9 @@ export default {
       } catch (error) {
         console.log(error)
       }
+    },
+    handleFormatStr(data) {
+      return data.split(',')
     }
   }
 }

src/views/user/consult/genre-list.vue

@@ -67,7 +67,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

src/views/user/consult/list.vue

@@ -240,7 +240,7 @@
               <el-col v-if="item.consultType" :span="12">
                 <b>咨询类别：</b>
                 <el-tag
-                  v-for="(consultType, consultTypeIndex) in item.consultType.split(',')"
+                  v-for="(consultType, consultTypeIndex) in handleFormatStr(item.consultType)"
                   :key="consultTypeIndex"
                   style="margin: 0 1px"
                   type="info"
@@ -269,7 +269,7 @@
               <el-col :span="24">
                 <b>标签词：</b>
                 <el-tag
-                  v-for="(remarks, remarksIndex) in item.remarks.split(',')"
+                  v-for="(remarks, remarksIndex) in handleFormatStr(item.remarks)"
                   :key="remarksIndex"
                   style="margin: 0 1px"
                   type="success"
@@ -291,17 +291,19 @@
                 <b>图片：</b>
               </el-col>
               <el-col :span="24">
-                <div
+                <a
                   v-for="(image, imageIndex) in item.imageList"
                   :key="imageIndex"
+                  :href="image"
                   class="item-image"
+                  target="_blank"
                   style="width: 100px; height: 100px; margin: 5px; float: left"
                 >
                   <el-popover placement="top-start" title="" width="180" trigger="hover">
                     <img :src="image" alt="" style="width: 150px; height: 150px" />
                     <img slot="reference" :src="image" alt="" style="width: 100px; height: 100px" />
                   </el-popover>
-                </div>
+                </a>
               </el-col>
             </el-row>
             <el-row v-if="item.fileList.length > 0" :gutter="24" class="box-row">
@@ -327,7 +329,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -404,6 +406,7 @@ export default {
       listQuery: {
         remarks: '', // 标签词
         consult: '', // 咨询类别
+        clubId: '', // 机构Id
         clubName: '', // 机构名称
         newDeal: '', // 新分配机构状态 0 全部 1 是  2否
         isRegister: '', // 是否注册 0 全部 1 未注册 2已注册
@@ -431,13 +434,23 @@ export default {
   methods: {
     initDate() {
       // 初始化获取当前年月
-      if (this.$route.query.clubName) {
-        this.listQuery.clubName = this.$route.query.clubName
-      }
+      this.handleInfo()
       this.getClassName()
       this.getServiceList(this.listQuery.startTime, this.listQuery.endTime)
       this.getList()
     },
+    handleInfo() {
+      if (this.$route.query.clubId) {
+        this.listQuery.clubId = this.$route.query.clubId
+      } else {
+        this.listQuery.clubId = ''
+      }
+      if (this.$route.query.clubName) {
+        this.listQuery.clubName = this.$route.query.clubName
+      } else {
+        this.listQuery.clubName = ''
+      }
+    },
     // 选择时间
     handleDatePick() {
       if (this.time && this.time.length > 0) {
@@ -452,6 +465,7 @@ export default {
     },
     // 获取行为记录列表
     getList() {
+      this.handleInfo()
       this.listQuery.pageNum = 1
       this.getRemarksRegistList()
     },
@@ -559,6 +573,9 @@ export default {
       this.listQuery.serviceProviderId = item.serviceProviderId
       this.listQuery.pageNum = 1
       this.getList()
+    },
+    handleFormatStr(data) {
+      return data.split(',')
     }
   }
 }

src/views/user/consult/report-list.vue

@@ -117,7 +117,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

src/views/user/consult/unreg-detail.vue

@@ -156,7 +156,7 @@
               <el-col v-if="item.consultType" :span="12">
                 <b>咨询类别：</b>
                 <el-tag
-                  v-for="(consultType, consultTypeIndex) in item.consultType.split(',')"
+                  v-for="(consultType, consultTypeIndex) in handleFormatStr(item.consultType)"
                   :key="consultTypeIndex"
                   style="margin: 0 1px"
                   type="info"
@@ -185,7 +185,7 @@
               <el-col :span="24">
                 <b>标签词：</b>
                 <el-tag
-                  v-for="(remarks, remarksIndex) in item.remarks.split(',')"
+                  v-for="(remarks, remarksIndex) in handleFormatStr(item.remarks)"
                   :key="remarksIndex"
                   style="margin: 0 1px"
                   type="success"
@@ -207,17 +207,19 @@
                 <b>图片：</b>
               </el-col>
               <el-col :span="24">
-                <div
+                <a
                   v-for="(image, imageIndex) in item.imageList"
                   :key="imageIndex"
+                  :href="image"
                   class="item-image"
+                  target="_blank"
                   style="width: 100px; height: 100px; margin: 5px; float: left"
                 >
                   <el-popover placement="top-start" title="" width="180" trigger="hover">
                     <img :src="image" alt="" style="width: 150px; height: 150px" />
                     <img slot="reference" :src="image" alt="" style="width: 100px; height: 100px" />
                   </el-popover>
-                </div>
+                </a>
               </el-col>
             </el-row>
             <el-row v-if="item.fileList.length > 0" :gutter="24" class="box-row">
@@ -243,7 +245,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
@@ -387,6 +389,9 @@ export default {
       const params = `fileName=${encodeURIComponent(file.fileName)}&ossName=${encodeURIComponent(file.ossName)}`
       const url = process.env.VUE_APP_BASE_API + `/user/remarks/remarks/download?${params}`
       downloadWithUrl(url, file.fileName)
+    },
+    handleFormatStr(data) {
+      return data.split(',')
     }
   }
 }

src/views/user/consult/unreg-list.vue

@@ -72,7 +72,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
-      :page-sizes="[20]"
+      :page-sizes="[10, 20, 30, 100]"
       :page-size="20"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"

src/views/user/record/detail-list.vue

@@ -1,13 +1,20 @@
 <template>
   <div class="app-container">
+    <div v-if="summarize.length > 0" class="tags-sms">
+      <span class="tags-sms-span">意向标签：</span>
+      <el-tag v-for="(sum, sumIndex) in summarize" :key="sumIndex" effect="dark" style="font-size: 15px; margin: 0 2px">
+        {{ sum.value }}
+      </el-tag>
+    </div>
     <!-- 顶部操作区域 -->
-    <div class="filter-container">
+    <div class="filter-container" style="margin-top: 10px">
       <!-- 关键词列表 -->
       <el-table v-loading="isLoading" :data="list" border>
         <el-table-column prop="pagePath" label="页面路径" align="center" width="300">
           <template slot-scope="{ row }">
-            <a v-if="row.accessClient === '0'" style="color: #2fa4e7" target="_blank" :href="row.pagePath">
-              {{ row.pagePath }}</a>
+            <a v-if="row.accessClient === '0'" style="color: #2fa4e7" target="_blank" :href="row.pagePath">{{
+              row.pagePath
+            }}</a>
             <span v-else> {{ row.pagePath }} </span>
           </template>
         </el-table-column>
@@ -30,7 +37,7 @@
           <template v-if="row.productId" slot-scope="{ row }">
             <el-popover placement="top-start" title="" width="180" trigger="hover">
               <img :src="row.productImage" alt="" style="width: 150px; height: 150px" />
-              <img slot="reference" :src="row.productImage" alt="" style="width: 30px; height: 30px" />
+              <img slot="reference" :src="row.productImage" alt="" style="width: 80px; height: 80px" />
             </el-popover>
           </template>
           <template v-else>
@@ -60,8 +67,8 @@
       <!-- 页码 -->
       <pagination
         :total="total"
-        :page-sizes="[20]"
-        :page-size="20"
+        :page-sizes="[10, 20, 30, 100]"
+        :page-size="100"
         :page.sync="listQuery.pageNum"
         :limit.sync="listQuery.pageSize"
         @pagination="fetchBehaviorList"
@@ -94,12 +101,13 @@ export default {
   data() {
     return {
       isLoading: true,
+      summarize: [],
       listQuery: {
         ip: '',
         accessDate: '',
         userId: 0,
         pageNum: 1,
-        pageSize: 20
+        pageSize: 100
       },
       list: [],
       total: 0
@@ -122,8 +130,10 @@ export default {
       try {
         this.isLoading = true
         const res = await fetchBehaviorList(this.listQuery)
-        this.list = res.data.results
-        this.total = res.data.totalRecord
+        const data = res.data
+        this.summarize = data.label
+        this.list = data.page.results
+        this.total = data.page.totalRecord
         this.isLoading = false
       } catch (error) {
         console.log(error)
@@ -137,4 +147,21 @@ export default {
 }
 </script>
 
-<style></style>
+<style>
+.tags-sms {
+  width: 100%;
+  height: auto;
+  font-size: 14px;
+  color: #666666;
+  line-height: 40px;
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 5px;
+  border: 1px solid #e1e1e1;
+}
+.tags-sms .tags-sms-span {
+  font-size: 18px;
+  font-weight: bold;
+  color: #333333;
+}
+</style>

src/views/user/record/list.vue

@@ -205,7 +205,7 @@
       <!-- 页码 -->
       <pagination
         :total="total"
-        :page-sizes="[100]"
+        :page-sizes="[10, 20, 30, 100]"
         :page-size="100"
         :page.sync="listQuery.pageNum"
         :limit.sync="listQuery.pageSize"
@@ -224,6 +224,7 @@ import pickerOptions from '@/utils/time-picker.js'
 const defaultListQuery = {
   todayType: 0, // 0 今日数据 1 以往数据
   ip: '', // 访问人ID
+  clubId: '', // 机构Id
   corporateName: '', // 公司名称
   companyType: '', // 公司类型
   accessClient: '', // 访问客户端
@@ -296,19 +297,15 @@ export default {
     }
   },
   created() {
-    console.log('query', this.$route.query)
     if (this.$route.query.type === 'second') {
       this.activeName = 'second'
       this.tabsCurrent = this.listQuery.todayType = 1
-      this.listQuery.corporateName = this.$route.query.corporateName
-      this.time.push(this.$route.query.startTime)
-      this.time.push(this.$route.query.endTime)
     } else {
       this.activeName = 'first'
       this.tabsCurrent = this.listQuery.todayType = 0
-      this.listQuery.corporateName = this.$route.query.corporateName
     }
     this.getHeigth()
+    this.handleInfo()
     this.getList()
     this.getKeyword()
     this.getPageType()
@@ -334,14 +331,35 @@ export default {
       }
       console.log('tabheight', this.tableheight)
     },
+    handleInfo() {
+      // 初始化
+      console.log('query', this.$route.query)
+      if (this.$route.query.type === 'second') {
+        this.listQuery.clubId = this.$route.query.clubId
+        this.listQuery.corporateName = this.$route.query.corporateName
+        this.time.push(this.$route.query.startTime)
+        this.time.push(this.$route.query.endTime)
+      } else {
+        this.listQuery.clubId = this.$route.query.clubId
+        this.listQuery.corporateName = this.$route.query.corporateName
+      }
+    },
     // tab切换
     handleClick(tab, event) {
       if (tab.name === 'first') {
-        this.listQuery = Object.assign({}, defaultListQuery)
+        if (this.$route.query.type) {
+          this.handleInfo()
+        } else {
+          this.listQuery = Object.assign({}, defaultListQuery)
+        }
         this.tabsCurrent = this.listQuery.todayType = 0
         this.getList()
       } else if (tab.name === 'second') {
-        this.listQuery = Object.assign({}, defaultListQuery)
+        if (this.$route.query.type) {
+          this.handleInfo()
+        } else {
+          this.listQuery = Object.assign({}, defaultListQuery)
+        }
         this.tabsCurrent = this.listQuery.todayType = 1
         this.getList()
       }