修改跳转

.env.development

@@ -4,10 +4,13 @@ ENV = 'development'
 # base api
 # VUE_APP_BASE_API = 'http://192.168.2.67:18015'
 # VUE_APP_BASE_API = 'http://localhost:18015'
-VUE_APP_BASE_API = 'http://192.168.2.102:18015'
-# VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.102:18015'
+VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
 # 图片上传，索引更新等
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'
 
 # 采美网站url
-VUE_APP_CAIMEI_URL = 'https://zzjtest.gz.aeert.com'
+VUE_APP_CAIMEI_URL = 'https://zzjtest.gz.aeert.com'
+
+# 采美旧后台
+VUE_APP_ADMIN_URL = 'https://admin-b.caimei365.com'

.env.production

@@ -7,4 +7,7 @@ VUE_APP_BASE_API = 'https://mapi.caimei365.com'
 VUE_APP_CORE_API = 'https://core.caimei365.com'
 
 # 采美网站url
-VUE_APP_CAIMEI_URL = 'https://www.caimei365.com'
+VUE_APP_CAIMEI_URL = 'https://www.caimei365.com'
+
+# 采美旧后台
+VUE_APP_ADMIN_URL = 'https://admin-b.caimei365.com'

.env.staging

@@ -9,4 +9,7 @@ VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'
 
 # 采美网站url
-VUE_APP_CAIMEI_URL = 'https://www.caimei365.com'
+VUE_APP_CAIMEI_URL = 'https://www.caimei365.com'
+
+# 采美旧后台
+VUE_APP_ADMIN_URL = 'https://admin.caimei365.com'

src/router/modules/user.js

@@ -29,7 +29,7 @@ const userRouter = {
           hidden: true,
           component: () => import('@/views/user/record/detail-list.vue'),
           name: 'RecordDtails',
-          meta: { title: '查看详情', noCache: true, activeMenu: '/user/record/' }
+          meta: { title: '查看详情', activeMenu: '/user/record/' }
         }
       ]
     },

src/store/modules/tagsView.js

@@ -1,11 +1,11 @@
 const state = {
   visitedViews: [],
-  cachedViews: []
+  cachedViews: ['AppChildMain']
 }
 
 const mutations = {
   ADD_VISITED_VIEW: (state, view) => {
-    if (state.visitedViews.some(v => v.path === view.path)) return
+    if (state.visitedViews.some((v) => v.path === view.path)) return
     state.visitedViews.push(
       Object.assign({}, view, {
         title: view.meta.title || 'no-name'
@@ -33,7 +33,7 @@ const mutations = {
   },
 
   DEL_OTHERS_VISITED_VIEWS: (state, view) => {
-    state.visitedViews = state.visitedViews.filter(v => {
+    state.visitedViews = state.visitedViews.filter((v) => {
       return v.meta.affix || v.path === view.path
     })
   },
@@ -47,12 +47,12 @@ const mutations = {
     }
   },
 
-  DEL_ALL_VISITED_VIEWS: state => {
+  DEL_ALL_VISITED_VIEWS: (state) => {
     // keep affix tags
-    const affixTags = state.visitedViews.filter(tag => tag.meta.affix)
+    const affixTags = state.visitedViews.filter((tag) => tag.meta.affix)
     state.visitedViews = affixTags
   },
-  DEL_ALL_CACHED_VIEWS: state => {
+  DEL_ALL_CACHED_VIEWS: (state) => {
     state.cachedViews = []
   },
 
@@ -79,7 +79,7 @@ const actions = {
   },
 
   delView({ dispatch, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       dispatch('delVisitedView', view)
       dispatch('delCachedView', view)
       resolve({
@@ -89,20 +89,20 @@ const actions = {
     })
   },
   delVisitedView({ commit, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_VISITED_VIEW', view)
       resolve([...state.visitedViews])
     })
   },
   delCachedView({ commit, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_CACHED_VIEW', view)
       resolve([...state.cachedViews])
     })
   },
 
   delOthersViews({ dispatch, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       dispatch('delOthersVisitedViews', view)
       dispatch('delOthersCachedViews', view)
       resolve({
@@ -112,20 +112,20 @@ const actions = {
     })
   },
   delOthersVisitedViews({ commit, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_OTHERS_VISITED_VIEWS', view)
       resolve([...state.visitedViews])
     })
   },
   delOthersCachedViews({ commit, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_OTHERS_CACHED_VIEWS', view)
       resolve([...state.cachedViews])
     })
   },
 
   delAllViews({ dispatch, state }, view) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       dispatch('delAllVisitedViews', view)
       dispatch('delAllCachedViews', view)
       resolve({
@@ -135,13 +135,13 @@ const actions = {
     })
   },
   delAllVisitedViews({ commit, state }) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_ALL_VISITED_VIEWS')
       resolve([...state.visitedViews])
     })
   },
   delAllCachedViews({ commit, state }) {
-    return new Promise(resolve => {
+    return new Promise((resolve) => {
       commit('DEL_ALL_CACHED_VIEWS')
       resolve([...state.cachedViews])
     })

src/views/index.vue

@@ -1,3 +1,19 @@
 <template>
-  <router-view />
+  <keep-alive :include="cachedViews">
+    <router-view :key="key" />
+  </keep-alive>
 </template>
+
+<script>
+export default {
+  name: 'AppChildMain',
+  computed: {
+    cachedViews() {
+      return this.$store.state.tagsView.cachedViews
+    },
+    key() {
+      return this.$route.path
+    }
+  }
+}
+</script>

src/views/user/record/list.vue

@@ -61,7 +61,7 @@
         <div class="filter-control">
           <span>公司类型:</span>
           <el-select v-model="listQuery.companyType" style="width:120px;" clearable @change="getList">
-            <el-option :value="0" label="请选择" />
+            <el-option value="" label="请选择" />
             <el-option :value="1" label="游客" />
             <el-option :value="2" label="机构" />
             <el-option :value="3" label="供应商" />
@@ -133,7 +133,14 @@
         </el-table-column>
         <el-table-column prop="corporateName" label="公司名称" align="center">
           <template slot-scope="{ row }">
-            {{ row.corporateName ? row.corporateName : '---' }}
+            <template v-if="row.companyType === '2'">
+              <a style="color:#2fa4e7;" target="_blank" :href="handleClubHrefLink(row)">
+                {{ row.corporateName ? row.corporateName : '---' }}
+              </a>
+            </template>
+            <template v-else>
+              {{ row.corporateName ? row.corporateName : '---' }}
+            </template>
           </template>
         </el-table-column>
         <el-table-column prop="contacts" label="联系人" align="center">
@@ -151,7 +158,7 @@
             {{ row.spName ? row.spName : '---' }}
           </template>
         </el-table-column>
-        <el-table-column prop="relevanceShop" label="关联供应商" align="center" width="200">
+        <el-table-column prop="relevanceShop" label="关联供应商" align="center" width="210">
           <template slot-scope="{ row }">
             <template v-if="row.relevanceShop">
               <p v-for="item in handleRelevanceShop(row.relevanceShop)" :key="item">
@@ -204,8 +211,24 @@ import { downloadWithUrl } from '@/utils'
 import { fetchRecordList } from '@/api/user/record/record'
 import { fetchShopRelevanceList, searchBehaviorList } from '@/api/user/supplier/supplier'
 import { export_json_to_excel } from '@/vendor/Export2Excel'
-
+const defaultListQuery = {
+  todayType: 0, // 0 今日数据 1 以往数据
+  ip: '', // 访问人ID
+  corporateName: '', // 公司名称
+  companyType: '', // 公司类型
+  accessClient: '', // 访问客户端
+  relevanceShop: '', // 供应商名称
+  label: '', // 标签
+  contacts: '', //  联系人
+  phoneNumber: '', // 手机号
+  spName: '', // 协销
+  startTime: '',
+  endTime: '',
+  pageNum: 1,
+  pageSize: 100
+}
 export default {
+  name: 'RecordList',
   filters: {
     companyTypeFilters(value) {
       // 公司类型
@@ -280,22 +303,7 @@ export default {
       isLoading: true,
       pickerOptions,
       time: '',
-      listQuery: {
-        todayType: 0, // 0 今日数据 1 以往数据
-        ip: '', // 访问人ID
-        corporateName: '', // 公司名称
-        companyType: '', // 公司类型
-        accessClient: '', // 访问客户端
-        relevanceShop: '', // 供应商名称
-        label: '', // 标签
-        contacts: '', //  联系人
-        phoneNumber: '', // 手机号
-        spName: '', // 协销
-        startTime: '',
-        endTime: '',
-        pageNum: 1,
-        pageSize: 100
-      },
+      listQuery: Object.assign({}, defaultListQuery),
       shopListQuery: {
         shopName: '',
         linkMan: '',
@@ -322,13 +330,11 @@ export default {
     // tab切换
     handleClick(tab, event) {
       if (tab.name === 'first') {
-        console.log('data', '今日数据')
+        this.listQuery = Object.assign({}, defaultListQuery)
         this.tabsCurrent = this.listQuery.todayType = 0
-        this.listQuery.startTime = ''
-        this.listQuery.endTime = ''
         this.getList()
       } else if (tab.name === 'second') {
-        console.log('data', '以往数据')
+        this.listQuery = Object.assign({}, defaultListQuery)
         this.tabsCurrent = this.listQuery.todayType = 1
         this.getList()
       }
@@ -336,7 +342,6 @@ export default {
     handleTagsOptions(arr) {
       this.listQuery.label = arr.join(',')
       this.getList()
-      console.log('label', this.listQuery.label)
     },
     // 获取行为记录列表
     getList() {
@@ -386,7 +391,11 @@ export default {
         console.log(error)
       }
     },
-
+    // 机构跳转
+    handleClubHrefLink(row) {
+      console.log('VUE_APP_ADMIN_URL', process.env.VUE_APP_ADMIN_URL)
+      return process.env.VUE_APP_ADMIN_URL + `/a/user/jumpLink/toOldAdmin?type=1&clubId=${row.clubId}&clubName=${row.corporateName}`
+    },
     // 查看详情
     handleRecordDetail(row) {
       this.$router.push({ path: '/user/record/detail', query: { ip: row.ip, accessDate: row.accessDate, userId: row.userId }})