updated

.env.development

@@ -5,8 +5,8 @@ ENV = 'development'
 # 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 = 'http://192.168.2.103:18015'
-#VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
+# VUE_APP_BASE_API = 'http://192.168.2.103:18015'
+VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
 # 图片上传，索引更新等
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'
 

src/api/user/customer/customer.js

@@ -471,7 +471,7 @@ export function saveMarketShop(params) {
  */
 export function uploadShopLogo(params) {
   return request({
-    url: '/user/market/uploadShopLogo	',
+    url: '/user/market/uploadShopLogo',
     method: 'get',
     params
   })
@@ -558,3 +558,85 @@ export function saveReport(params) {
     params
   })
 }
+/**
+ * 供应商相关商品
+ * @param {*} shopId
+ * @param {*} productId
+ * @param {*} productName
+ * @param {*} pageNum,
+ * @param {*} pageSize
+ * @returns
+ */
+export function getProductList(params) {
+  return request({
+    url: '/user/customer/getProductList',
+    method: 'get',
+    params
+  })
+}
+/**
+ * 供应商商品列表
+ * @param {*} id
+ * @param {*} productId
+ * @param {*} productName
+ * @param {*} pageNum,
+ * @param {*} pageSize
+ * @returns
+ */
+export function getShopProduct(params) {
+  return request({
+    url: '/user/customer/getShopProduct',
+    method: 'get',
+    params
+  })
+}
+/**
+ * 保存潜客供应商统计商品
+ * @param {*} id
+ * @param {*} productIds
+ * @returns
+ */
+export function saveShopProduct(params) {
+  return request({
+    url: '/user/customer/saveShopProduct',
+    method: 'get',
+    params
+  })
+}
+/**
+ * 设置供应商商品统计状态
+ * @param {*} id 统计供应商商品表的ID
+ * @param {*} status 状态
+ * @returns
+ */
+export function renewShopProduct(params) {
+  return request({
+    url: '/user/customer/renewShopProduct',
+    method: 'get',
+    params
+  })
+}
+/**
+ * 删除供应商相关商品
+ * @param {*} id
+ * @returns
+ */
+export function deleteShopProduct(params) {
+  return request({
+    url: '/user/customer/deleteShopProduct',
+    method: 'get',
+    params
+  })
+}
+/**
+ * 获取供应商关联商品列表
+ * @param {*} shopId
+ * @returns
+ */
+export function getShopProductList(params) {
+  return request({
+    url: '/user/customer/getShopProductList',
+    method: 'get',
+    params
+  })
+}

src/router/modules/user.js

@@ -106,6 +106,13 @@ const userRouter = {
           meta: { title: '相关文章' },
           hidden: true
         },
+        {
+          path: 'customer-goods-list',
+          name: 'CustomerGoodsList',
+          component: () => import('@/views/user/customer/customer-goods-list'),
+          meta: { title: '相关商品' },
+          hidden: true
+        },
         {
           path: 'customer-search-list',
           name: 'CustomerSearchList',

src/styles/index.scss

@@ -252,3 +252,22 @@ aside {
 .el-submenu [class^='el-icon-'] {
   font-size: 16px;
 }
+.el-dialog__body {
+  padding: 20px;
+}
+/*定义滚动条样式*/
+::-webkit-scrollbar {
+  width: 4px;
+  height: 4px;
+  background-color: #f6f6f6;
+}
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
+  border-radius: 2px;
+  background-color: #f6f6f6;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 8px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1);
+  background-color: rgba(0, 0, 0, 0.2);
+}

src/views/member/coupon/edit.vue

@@ -1,9 +1,15 @@
+<!-- eslint-disable space-before-function-paren -->
+<!-- eslint-disable space-before-function-paren -->
 <template>
   <div ref="scrollDiv" class="app-container">
     <div v-if="editType === 'add'" class="filter-container">
       <div class="filter-control">
-        <span style="color: red;">在本页面，对每三个月给超级会员自动发放的优惠券进行配置，配置完成后下一阶段才生效（最少配置1个，最多5个）。</span>
-        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" @click="handleAddList">新增优惠券</el-button>
+        <span style="color: red">
+          在本页面，对每三个月给超级会员自动发放的优惠券进行配置，配置完成后下一阶段才生效（最少配置1个，最多5个）。
+        </span>
+        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" @click="handleAddList">
+          新增优惠券
+        </el-button>
       </div>
     </div>
     <div v-else class="filter-container">
@@ -15,7 +21,7 @@
           clearable
           suffix-icon="el-icon-date"
           :disabled="true"
-          style="width:100px;"
+          style="width: 100px"
         />
         -
         <el-input
@@ -24,14 +30,23 @@
           clearable
           suffix-icon="el-icon-date"
           :disabled="true"
-          style="width:100px;"
+          style="width: 100px"
         />
-        <el-button type="primary" icon="el-icon-plus" size="mini" :disabled="disabled" style="margin-left: 30px;" @click="handleAddList">新增优惠券</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          :disabled="disabled"
+          style="margin-left: 30px"
+          @click="handleAddList"
+        >
+          新增优惠券
+        </el-button>
       </div>
     </div>
     <el-form ref="couponFrom" :model="form" label-width="100px">
-      <div v-for="(formItem,index) in form.formList" :key="formItem.key" class="form-cell" :data-key="formItem.key">
-        <el-form-item :label="`优惠券${index+1}:`" style="margin-bottom: 10px;" :rules="rules.couponType">
+      <div v-for="(formItem, index) in form.formList" :key="formItem.key" class="form-cell" :data-key="formItem.key">
+        <el-form-item :label="`优惠券${index + 1}:`" style="margin-bottom: 10px" :rules="rules.couponType">
           <el-radio-group v-model="formItem.couponType">
             <el-radio :label="0">活动券</el-radio>
             <el-radio :label="1">品类券</el-radio>
@@ -41,7 +56,15 @@
         <template v-if="formItem.couponType === 3">
           <el-form-item label="供应商" :prop="`formList.${index}.shopData`" :rules="rules.shopData">
             <template v-if="formItem.shopData && formItem.shopData.length === 0">
-              <el-button type="primary" autofocussize="mini" size="mini" icon="el-icon-plus" @click="handleShopDialogVisible(index)">选择供应商</el-button>
+              <el-button
+                type="primary"
+                autofocussize="mini"
+                size="mini"
+                icon="el-icon-plus"
+                @click="handleShopDialogVisible(index)"
+              >
+                选择供应商
+              </el-button>
               <el-checkbox-group v-show="false" v-model="formItem.shopData" />
             </template>
             <template v-else>
@@ -55,7 +78,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center">
-                  <el-button type="text" @click="deleteShop(formItem,index)">删除</el-button>
+                  <el-button type="text" @click="deleteShop(formItem, index)">删除</el-button>
                 </el-table-column>
               </el-table>
             </template>
@@ -66,31 +89,45 @@
         </el-form-item>
         <el-form-item label="优惠条件:" :prop="`formList.${index}.touchPrice`" :rules="rules.touchPrice">
           <el-input v-model="formItem.touchPrice" style="width: 220px" size="mini">
-            <template slot="prepend" style="padding: 0 10px;">订单商品总额满：</template>
+            <template slot="prepend" style="padding: 0 10px">订单商品总额满：</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="优惠商品:" :hidden="formItem.couponType === 0 ? false : true" style="margin-bottom: 10px;" :rules="rules.productType">
+        <el-form-item
+          label="优惠商品:"
+          :hidden="formItem.couponType === 0 ? false : true"
+          style="margin-bottom: 10px"
+          :rules="rules.productType"
+        >
           <el-radio-group v-model="formItem.productType">
             <el-radio :label="'1'">全商城商品</el-radio>
             <el-radio :label="'2'">指定商品</el-radio>
           </el-radio-group>
         </el-form-item>
-        <template v-if="formItem.productType === '2'&& formItem.couponType === 0">
+        <template v-if="formItem.productType === '2' && formItem.couponType === 0">
           <el-form-item label="商品信息" :prop="`formList.${index}.associateList`" :rules="rules.associateList">
-            <el-button type="primary" icon="el-icon-sort" size="mini" :disabled="disabled3(formItem.associateList)" @click="handleOnInputBlur(formItem,index)">一键排序</el-button>
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGoodDialogVisible(index)">添加商品</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-sort"
+              size="mini"
+              :disabled="disabled3(formItem.associateList)"
+              @click="handleOnInputBlur(formItem, index)"
+            >
+              一键排序
+            </el-button>
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGoodDialogVisible(index)">
+              添加商品
+            </el-button>
             <el-checkbox-group v-show="false" v-model="formItem.associateList" />
-            <el-table v-show="formItem.associateList && formItem.associateList.length>0" :data="formItem.associateList" border>
+            <el-table
+              v-show="formItem.associateList && formItem.associateList.length > 0"
+              :data="formItem.associateList"
+              border
+            >
               <el-table-column property="mainImage" label="商品图片" align="center" width="80">
                 <template slot-scope="{ row }">
-                  <el-popover
-                    placement="top-start"
-                    title=""
-                    width="180"
-                    trigger="hover"
-                  >
-                    <img :src="row.mainImage" alt="" style="width:150px;height:150px;">
-                    <img slot="reference" :src="row.mainImage" alt="" style="width:30px;height:30px;">
+                  <el-popover placement="top-start" title="" width="180" trigger="hover">
+                    <img :src="row.mainImage" alt="" style="width: 150px; height: 150px" />
+                    <img slot="reference" :src="row.mainImage" alt="" style="width: 30px; height: 30px" />
                   </el-popover>
                 </template>
               </el-table-column>
@@ -119,25 +156,34 @@
                 </template>
               </el-table-column>
               <el-table-column label="排序" align="center" width="100">
-                <template slot-scope="{row}">
+                <template slot-scope="{ row }">
                   <el-input v-model="row.sort" maxlength="4" minlength="1" />
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="handleDeletePros(formItem,scope.$index)">删除</el-button>
+                  <el-button type="text" @click="handleDeletePros(formItem, scope.$index)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
           </el-form-item>
         </template>
-        <el-form-item label="优惠品类:" :hidden="formItem.couponType ===1 ? false : true" :rules="rules.categoryType">
+        <el-form-item label="优惠品类:" :hidden="formItem.couponType === 1 ? false : true" :rules="rules.categoryType">
           <el-radio-group v-model="formItem.categoryType">
             <el-radio :label="'1'">产品</el-radio>
             <el-radio :label="'2'">仪器</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-button class="delete_label" :disabled="disabled1" icon="el-icon-delete" size="mini" type="danger" @click="handleDelete(formItem,index)">删除</el-button>
+        <el-button
+          class="delete_label"
+          :disabled="disabled1"
+          icon="el-icon-delete"
+          size="mini"
+          type="danger"
+          @click="handleDelete(formItem, index)"
+        >
+          删除
+        </el-button>
       </div>
     </el-form>
     <div class="el-dialog__footer">
@@ -163,7 +209,7 @@ const defaultForm = () => {
     touchPrice: '',
     productType: '1',
     categoryType: '1',
-    associateList: []// 指定商品信息
+    associateList: [] // 指定商品信息
   }
 }
 export default {
@@ -171,10 +217,6 @@ export default {
   components: { goodDialog, shopDialog },
   data() {
     return {
-      defaultShop: {
-        shopId: 0,
-        shopData: []
-      },
       form: {
         formList: []
       },
@@ -244,13 +286,14 @@ export default {
       if (data.coupons.length > 0) {
         this.delFlag = true
         this.form.formList = data.coupons.map((el) => {
-          el = { ...el, ...this.defaultShop }
           if (el.shop) {
+            el.shopData = []
             el.shopData.push(el.shop)
+          } else {
+            el.shopData = []
           }
           return el
         })
-        console.log('formList', this.form.formList)
       } else {
         for (let i = 0; i <= 2; i++) {
           this.form.formList.push(defaultForm())
@@ -273,10 +316,11 @@ export default {
       formItem.shopId = ''
       formItem.shopData = []
       this.$nextTick(() => {
-        console.log('index', formItem)
-        this.form.formList[index].shopId
-        this.form.formList[index].shopData
+        this.form.formList[index].shopId = ''
+        this.form.formList[index].shopData = []
       })
+      this.$forceUpdate()
+      console.log('shopData', this.form.formList)
     },
     handleShopConfirm(data) {
       // 确认选择供应商
@@ -305,7 +349,7 @@ export default {
       })
     },
     onSubmit(formName) {
-      this.$refs[formName].validate(valid => {
+      this.$refs[formName].validate((valid) => {
         if (valid) {
           this.handleFormParams()
           this.$confirm('是否提交数据', '提示', {
@@ -431,7 +475,7 @@ export default {
 </script>
 
 <style>
-.form-cell{
+.form-cell {
   border: 1px solid #e1e1e1;
   border-radius: 8px;
   box-sizing: border-box;
@@ -440,7 +484,7 @@ export default {
   position: relative;
   margin-bottom: 20px;
 }
-.delete_label{
+.delete_label {
   position: absolute;
   right: 2%;
   top: 20px;

src/views/user/consult/detail.vue

@@ -68,6 +68,9 @@
         <div v-for="(item, index) in list" v-else :key="index" class="list-main">
           <div class="list-main-item">
             <span class="list-times">{{ item.addTime }}</span>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="24"><b>协销：</b> {{ item.spName ? item.spName : '--' }}</el-col>
+            </el-row>
             <el-row :gutter="24" class="box-row">
               <el-col v-if="item.clubName" :span="6"><b>机构：</b> {{ item.clubName }}</el-col>
               <el-col :span="6"><b>咨询人：</b> {{ item.questionMan }}</el-col>

src/views/user/consult/list.vue

@@ -133,6 +133,9 @@
         <div v-for="(item, index) in list" v-else :key="index" class="list-main">
           <div class="list-main-item consult-list">
             <span class="list-time">{{ item.addTime }}</span>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="24"><b>协销：</b> {{ item.spName ? item.spName : '--' }}</el-col>
+            </el-row>
             <el-row :gutter="24" class="box-row">
               <el-col v-if="item.clubName" :span="6"><b>机构：</b> {{ item.clubName }}</el-col>
               <el-col :span="6"><b>咨询人：</b> {{ item.questionMan }}</el-col>

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

@@ -50,6 +50,9 @@
         <div v-for="(item, index) in list" v-else :key="index" class="list-main">
           <div class="list-main-item unreg">
             <span class="list-times">{{ item.addTime }}</span>
+            <el-row :gutter="24" class="box-row">
+              <el-col :span="24"><b>协销：</b> {{ item.spName ? item.spName : '--' }}</el-col>
+            </el-row>
             <el-row :gutter="24" class="box-row">
               <el-col :span="6"><b>咨询人：</b> {{ item.questionMan }}</el-col>
               <el-col v-if="item.contractMobile" :span="12"><b>手机号：</b> {{ item.contractMobile }}</el-col>

src/views/user/customer/components/article.vue

@@ -15,6 +15,19 @@
           @change="getList"
         />
       </div>
+      <div class="filter-control">
+        <span>关联商品:</span>
+        <el-select v-model="listQuery.productId" filterable @change="getList">
+          <el-option value="" label="请选择" />
+          <el-option
+            v-for="item in goodsOptions"
+            :key="item.productId"
+            :label="item.productName"
+            :value="item.productId"
+            :style="{ width: '250px' }"
+          />
+        </el-select>
+      </div>
       <div class="filter-control">
         <el-button type="primary" @click="getList"> 查询 </el-button>
       </div>
@@ -30,6 +43,15 @@
         </template>
       </el-table-column>
       <el-table-column prop="title" label="文章标题" align="center" />
+      <el-table-column prop="mainImage" label="关联商品" align="center" width="350">
+        <template slot-scope="{ row }">
+          <div v-if="row.mainImage" class="cell-ps">
+            <img :src="row.mainImage" alt="" />
+            <p>{{ row.productName }}</p>
+          </div>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="link" label="文章链接" align="center">
         <template slot-scope="{ row }">
           <a style="color: #2fa4e7" target="_blank" :href="row.link">
@@ -68,66 +90,19 @@
 </template>
 
 <script>
-import { getPageShopInfo } from '@/api/user/customer/customer'
-
+import { getPageShopInfo, getShopProductList } from '@/api/user/customer/customer'
+import pickerOptions from '@/utils/time-picker.js'
 export default {
   name: 'Article',
   filters: {},
   data() {
-    const pickerOptions = {
-      shortcuts: [
-        {
-          text: '近1年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 183)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近1月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近1周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '昨天',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24)
-            picker.$emit('pick', [start, end])
-          }
-        }
-      ]
-    }
     return {
       pickerOptions,
       time: '',
+      goodsOptions: [],
       listQuery: {
         shopId: this.$route.query.shopId, // 供应商Id
+        productId: '', // 关联商品Id
         startTime: '', // 统计开始时间
         endTime: '', // 统计结束时间
         pageNum: 1,
@@ -141,6 +116,7 @@ export default {
   computed: {},
   created() {
     this.getList()
+    this.getShopProductList()
   },
   methods: {
     // 商品列表
@@ -167,8 +143,45 @@ export default {
       } catch (error) {
         console.log(error)
       }
+    },
+    // 供应商关联商品
+    async getShopProductList() {
+      try {
+        const res = await getShopProductList({ shopId: this.listQuery.shopId })
+        this.goodsOptions = res.data
+      } catch (error) {
+        console.log(error)
+      }
     }
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.cell-ps {
+  width: 300px;
+  height: 100px;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.cell-ps img {
+  width: 80px;
+  height: 80px;
+  display: block;
+  float: left;
+}
+.cell-ps p {
+  width: 200px;
+  height: 80px;
+  box-sizing: border-box;
+  padding: 10px 0;
+  line-height: 24px;
+  font-size: 14px;
+  float: left;
+  white-space: normal;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2; /* 设置显示的行数 */
+  -webkit-box-orient: vertical;
+}
+</style>

src/views/user/customer/components/goods-dialog.vue

@@ -0,0 +1,157 @@
+<template>
+  <el-dialog title="添加商品" :visible.sync="visible" width="1200px" :close-on-click-modal="false" :show-close="false">
+    <div class="filter-container">
+      <div class="filter-control">
+        <span>ID:</span>
+        <el-input
+          v-model="listQuery.productId"
+          placeholder="商品ID"
+          clearable
+          style="width: 160px"
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
+      </div>
+      <div class="filter-control">
+        <span>商品名称:</span>
+        <el-input
+          v-model="listQuery.productName"
+          placeholder="商品名称"
+          clearable
+          style="width: 160px"
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
+      </div>
+      <div class="filter-control">
+        <el-button type="primary" @click="getList"> 查询 </el-button>
+      </div>
+    </div>
+    <el-table
+      ref="table"
+      v-loading="isLoading"
+      :data="list"
+      height="400px"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" :selectable="selectable" />
+      <el-table-column label="商品ID" prop="productId" align="center" width="100" />
+      <el-table-column prop="mainImage" label="商品图片" align="center" width="120">
+        <template slot-scope="{ row }">
+          <el-popover v-if="row.mainImage" placement="top-start" title="" width="120" trigger="hover">
+            <img :src="row.mainImage" alt="" style="width: 80px; height: 80px" />
+            <img slot="reference" :src="row.mainImage" alt="" style="width: 80px; height: 80px" />
+          </el-popover>
+          <span v-else>---</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品名称" prop="productName" align="center" />
+      <el-table-column label="供应商" prop="shopName" align="center" />
+    </el-table>
+    <!-- 页码 -->
+    <pagination
+      :total="total"
+      :page-sizes="[100, 200]"
+      :page-size="100"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="getProductList"
+    />
+    <div slot="footer">
+      <el-button @click="handleCanle"> 取 消 </el-button>
+      <el-button type="primary" :disabled="disabled" @click="handleConfirm"> 确 定 </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { getProductList } from '@/api/user/customer/customer'
+
+export default {
+  name: 'ShopDialog',
+  filters: {
+    NumFormat(value) {
+      // 处理金额
+      return Number(value).toFixed(2)
+    }
+  },
+  data() {
+    return {
+      visible: true,
+      listQuery: {
+        shopId: this.$route.query.shopId,
+        productId: '',
+        productName: '',
+        pageNum: 1, // 页码
+        pageSize: 100 // 页面数据数
+      },
+      list: [],
+      total: 0,
+      shopsRadio: null,
+      isLoading: true
+    }
+  },
+  computed: {
+    disabled() {
+      return this.shopsRadio === null
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    // 获取所有供应商列表
+    async getList() {
+      this.list = []
+      this.listQuery.pageNum = 1
+      this.getProductList()
+    },
+    // 获取所有供应商列表
+    async getProductList() {
+      try {
+        const res = await getProductList(this.listQuery)
+        this.list = res.data.results
+        this.total = res.data.totalRecord
+        this.isLoading = false
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 选择供应商
+    handleSelectionChange(row) {
+      this.shopsRadio = row
+      console.log('row', row)
+    },
+    // 确认选择供应商
+    handleConfirm() {
+      this.$emit('confirm', this.shopsRadio)
+    },
+    handleCanle() {
+      // 取消弹窗
+      this.$emit('cancel')
+    },
+    // 已选择的禁用勾选框
+    selectable(row) {
+      if (row.flag) {
+        return true
+      } else {
+        return false
+      }
+    },
+    checkedInput(event, type) {
+      let pattern = ''
+      switch (type) {
+        case 1:
+          pattern = /[^\d]/g
+          break
+        case 2:
+          pattern = /[^u4E00-u9FA5|d|a-zA-Z|rns,.?!，。？！…—&$=()-+/*{}[]]|s/g
+          break
+      }
+      return event.replace(pattern, '')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped></style>

src/views/user/customer/components/search.vue

@@ -15,12 +15,34 @@
           @change="getList"
         />
       </div>
+      <div class="filter-control">
+        <span>关联商品:</span>
+        <el-select v-model="listQuery.productId" filterable @change="getList">
+          <el-option value="" label="请选择" />
+          <el-option
+            v-for="item in goodsOptions"
+            :key="item.productId"
+            :label="item.productName"
+            :value="item.productId"
+            :style="{ width: '250px' }"
+          />
+        </el-select>
+      </div>
       <div class="filter-control">
         <el-button type="primary" @click="getList"> 查询 </el-button>
       </div>
     </div>
     <el-table v-loading="isLoading" :data="list" border style="width: 100%" height="600">
-      <el-table-column prop="keyword" fixed label="搜索词" align="center" width="300" />
+      <el-table-column prop="keyword" label="搜索词" align="center" width="200" />
+      <el-table-column prop="mainImage" label="关联商品" align="center" width="350">
+        <template slot-scope="{ row }">
+          <div v-if="row.mainImage" class="cell-ps">
+            <img :src="row.mainImage" alt="" />
+            <p>{{ row.productName }}</p>
+          </div>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="link" label="搜索链接" align="center">
         <template v-if="row.link" slot-scope="{ row }">
           <a style="color: #2fa4e7" target="_blank" :href="row.link">
@@ -28,12 +50,12 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column prop="accessNumber" label="访问次数" align="center" width="200">
+      <el-table-column prop="accessNumber" label="访问次数" align="center" width="80">
         <template slot-scope="{ row }">
           {{ row.accessNumber }}
         </template>
       </el-table-column>
-      <el-table-column prop="average" label="平均访问时长" align="center" width="200">
+      <el-table-column prop="average" label="平均访问时长" align="center" width="120">
         <template slot-scope="{ row }">
           {{ row.average }}
         </template>
@@ -52,66 +74,19 @@
 </template>
 
 <script>
-import { getPageShopKeyword } from '@/api/user/customer/customer'
-
+import { getPageShopKeyword, getShopProductList } from '@/api/user/customer/customer'
+import pickerOptions from '@/utils/time-picker.js'
 export default {
   name: 'Search',
   filters: {},
   data() {
-    const pickerOptions = {
-      shortcuts: [
-        {
-          text: '近1年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 365)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近半年',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 183)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近1月',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '近1周',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        },
-        {
-          text: '昨天',
-          onClick(picker) {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.getTime() - 3600 * 1000 * 24)
-            picker.$emit('pick', [start, end])
-          }
-        }
-      ]
-    }
     return {
       pickerOptions,
       time: '',
+      goodsOptions: [],
       listQuery: {
         shopId: this.$route.query.shopId, // 供应商Id
+        productId: '', // 关联商品Id
         startTime: '', // 统计开始时间
         endTime: '', // 统计结束时间
         pageNum: 1,
@@ -125,6 +100,7 @@ export default {
   computed: {},
   created() {
     this.getList()
+    this.getShopProductList()
   },
   methods: {
     // 商品列表
@@ -151,8 +127,45 @@ export default {
       } catch (error) {
         console.log(error)
       }
+    },
+    // 供应商关联商品
+    async getShopProductList() {
+      try {
+        const res = await getShopProductList({ shopId: this.listQuery.shopId })
+        this.goodsOptions = res.data
+      } catch (error) {
+        console.log(error)
+      }
     }
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.cell-ps {
+  width: 300px;
+  height: 100px;
+  box-sizing: border-box;
+  padding: 10px;
+}
+.cell-ps img {
+  width: 80px;
+  height: 80px;
+  display: block;
+  float: left;
+}
+.cell-ps p {
+  width: 200px;
+  height: 80px;
+  box-sizing: border-box;
+  padding: 10px 0;
+  line-height: 24px;
+  font-size: 14px;
+  float: left;
+  white-space: normal;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2; /* 设置显示的行数 */
+  -webkit-box-orient: vertical;
+}
+</style>

src/views/user/customer/customer-article-list.vue

@@ -118,7 +118,7 @@ export default {
     return {
       isLoading: true,
       listQuery: {
-        shopId: this.$route.query.shopId,
+        shopProductId: this.$route.query.shopProductId,
         infoId: '',
         title: '',
         status: '',
@@ -169,7 +169,7 @@ export default {
       data.forEach((ele) => {
         infoIds.push(ele.id)
       })
-      this.saveShopInfo({ shopId: this.listQuery.shopId, infoIds: infoIds.join(',') })
+      this.saveShopInfo({ shopProductId: this.listQuery.shopProductId, infoIds: infoIds.join(',') })
     },
     // 保存添加供应商文章
     async saveShopInfo(params) {

src/views/user/customer/customer-goods-list.vue

@@ -0,0 +1,448 @@
+<template>
+  <div class="app-container">
+    <!-- 顶部操作区域 -->
+    <div class="filter-container">
+      <div class="filter-control">
+        <span>商品ID:</span>
+        <el-input
+          v-model="listQuery.productId"
+          placeholder="商品ID"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
+      </div>
+      <div class="filter-control">
+        <span>商品名称:</span>
+        <el-input
+          v-model="listQuery.productName"
+          placeholder="商品名称"
+          clearable
+          @keyup.enter.native="getList"
+          @clear="getList"
+        />
+      </div>
+      <div class="filter-control">
+        <span>统计状态:</span>
+        <el-select v-model="listQuery.status" style="width: 120px" clearable @change="getList">
+          <el-option value="" label="请选择" />
+          <el-option :value="0" label="统计中" />
+          <el-option :value="1" label="暂停统计" />
+        </el-select>
+      </div>
+      <div class="filter-control">
+        <el-button type="primary" @click="getList"> 查询 </el-button>
+        <el-button type="primary" @click="goodsDialogVisible = true"> 添加商品 </el-button>
+      </div>
+    </div>
+    <div class="tags-sms">
+      <span class="tags-sms-span">供应商：{{ shopName }}</span>
+    </div>
+    <!-- 列表 -->
+    <el-table v-loading="isLoading" :data="list" border style="width: 100%" height="660">
+      <el-table-column prop="productId" label="商品ID" align="center" width="80" />
+      <el-table-column prop="productImage" label="商品图片" align="center" width="120">
+        <template slot-scope="{ row }">
+          <el-popover v-if="row.productImage" placement="top-start" title="" width="100" trigger="hover">
+            <img :src="row.productImage" alt="" style="width: 80px; height: 80px" />
+            <img slot="reference" :src="row.productImage" alt="" style="width: 80px; height: 80px" />
+          </el-popover>
+          <span v-else>---</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="productName" label="商品名称" align="center" />
+      <el-table-column prop="status" label="统计状态" align="center" width="100">
+        <template slot-scope="{ row }">
+          <el-tag v-if="row.status === 0" type="success" size="small">统计中</el-tag>
+          <el-tag v-if="row.status === 1" type="danger" size="small">暂停统计</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="logo" label="logo" align="center" width="150">
+        <template slot-scope="{ row }">
+          <el-popover v-if="row.logo" placement="top-start" title="" width="180" trigger="hover">
+            <img :src="row.logo" alt="" style="width: 94px; height: 50px" />
+            <img slot="reference" :src="row.logo" alt="" style="width: 94px; height: 50px" />
+          </el-popover>
+          <span v-else>---</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="recentlyTime" label="最近报表时间" align="center" width="100">
+        <template slot-scope="{ row }">
+          {{ row.recentlyTime ? row.recentlyTime : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="addTime" label="添加时间" align="center" width="100">
+        <template slot-scope="{ row }">
+          {{ row.addTime ? row.addTime : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" align="center">
+        <template slot-scope="{ row }">
+          <el-button type="primary" size="mini" style="margin: 2px" @click="handleRecordDetail(7, row)">
+            营销数据报表
+          </el-button>
+          <el-button type="primary" size="mini" style="margin: 2px" @click="handleRecordDetail(1, row)">
+            潜客统计列表
+          </el-button>
+          <el-button type="primary" size="mini" style="margin: 2px" @click="handleRecordDetail(2, row)">
+            相关文章
+          </el-button>
+          <el-button type="primary" size="mini" style="margin: 2px" @click="handleRecordDetail(3, row)">
+            相关搜索词
+          </el-button>
+          <el-button type="success" size="mini" style="margin: 2px" @click="handleRecordDetail(8, row)">
+            上传LOGO
+          </el-button>
+          <el-button type="success" size="mini" style="margin: 2px" @click="handleRecordDetail(5, row)">
+            弹窗样式
+          </el-button>
+          <el-button type="success" size="mini" style="margin: 2px" @click="handleRecordDetail(6, row)">
+            设置统计状态
+          </el-button>
+          <el-button type="danger" size="mini" style="margin: 2px" @click="handleRecordDetail(4, row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 页码 -->
+    <pagination
+      :total="total"
+      :page-sizes="[10, 20, 30, 100]"
+      :page-size="20"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="getShopProduct"
+    />
+    <!--  选择供应商弹窗 -->
+    <goods-dialog v-if="goodsDialogVisible" ref="shopDialog" @confirm="handleAddShopConfirm" @cancel="handleCancel" />
+    <!-- 设置统计状态 -->
+    <el-dialog title="设置统计状态" :visible.sync="dialogFormVisible" width="500px">
+      <el-form ref="dataForm" :model="renewCustome" :rules="rules" label-position="right">
+        <el-form-item prop="status">
+          <el-radio v-model="renewCustome.status" :label="0">统计中</el-radio>
+          <el-radio v-model="renewCustome.status" :label="1">暂停统计</el-radio>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleConfirm">确定</el-button>
+      </div>
+    </el-dialog>
+    <!-- 上传LOGO -->
+    <el-dialog title="上传LOGO" :visible.sync="logoFormVisible" width="500px">
+      <el-form ref="logoForm" :model="logoForm" :rules="rules" label-position="right">
+        <el-form-item prop="logo" label="logo">
+          <div class="form-el-upload" style="width: 126px; height: 126px">
+            <el-upload
+              class="avatar-uploader"
+              :action="actionUrl"
+              :headers="getToken"
+              :show-file-list="false"
+              :on-success="handleSuccess"
+              :before-upload="beforeUpload"
+            >
+              <div v-loading="loadImgLoading" class="avatar" style="width: 126px; height: 126px; display: block">
+                <img
+                  v-if="logoForm.logo"
+                  :src="logoForm.logo"
+                  style="width: 126px; height: 126px; display: block"
+                  @error="reloadImage"
+                  @load="loadSucess"
+                />
+                <i
+                  v-elseopProduct
+                  class="el-icon-plus avatar-uploader-icon"
+                  style="width: 126px; height: 126px; line-height: 126px"
+                ></i>
+              </div>
+            </el-upload>
+            <p class="uploader-tips">注：请尽量上传126*50(px)尺寸的图片。</p>
+          </div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="logoFormVisible = false">取消</el-button>
+        <el-button type="primary" @click="handleConfirmLogo">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getShopProduct,
+  saveShopProduct,
+  renewShopProduct,
+  uploadShopLogo,
+  deleteShopProduct
+} from '@/api/user/customer/customer'
+import GoodsDialog from './components/goods-dialog'
+export default {
+  name: 'RecordList',
+  components: { GoodsDialog },
+  filters: {},
+  data() {
+    return {
+      isLoading: true,
+      shopName: this.$route.query.shopName,
+      listQuery: {
+        id: this.$route.query.id,
+        productName: '',
+        productId: '',
+        pageNum: 1,
+        pageSize: 20
+      },
+      list: [],
+      total: 0,
+      goodsDialogVisible: false,
+      dialogFormVisible: false,
+      logoFormVisible: false,
+      loadImgLoading: false,
+      renewCustome: {
+        id: '',
+        status: ''
+      },
+      logoForm: {
+        id: '',
+        logo: ''
+      },
+      rules: {
+        status: [{ required: true, message: '请设置统计状态', trigger: 'blur' }],
+        logo: [{ required: true, message: '请上传弹窗图片', trigger: 'blur' }]
+      }
+    }
+  },
+  computed: {
+    getToken() {
+      return {
+        token: this.$store.getters.token
+      }
+    },
+    actionUrl() {
+      return process.env.VUE_APP_BASE_API + '/formData/MultiPictareaddData'
+    }
+  },
+  created() {
+    this.getList()
+  },
+  mounted() {},
+  methods: {
+    // 获取行为记录列表
+    getList() {
+      this.list = []
+      this.listQuery.pageNum = 1
+      this.getShopProduct()
+    },
+    // 确认选择供应商
+    handleAddShopConfirm(data) {
+      console.log('data', data)
+      const productIds = []
+      data.forEach((ele) => {
+        productIds.push(ele.productId)
+      })
+      this.saveShopProduct({ id: this.listQuery.id, productIds: productIds.join(',') })
+    },
+    // 取消选择供应商
+    handleCancel() {
+      this.goodsDialogVisible = false
+      this.$refs.shopDialog.visible = false
+    },
+    // 确认设置统计状态
+    handleConfirm() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.renewShopProduct(this.renewCustome)
+        } else {
+          return false
+        }
+      })
+    },
+    // 获取潜客搜集供应商列表
+    async getShopProduct() {
+      try {
+        this.isLoading = true
+        const res = await getShopProduct(this.listQuery)
+        this.list = res.data.results
+        this.total = res.data.totalRecord
+        this.isLoading = false
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 保存添加统计供应商
+    async saveShopProduct(params) {
+      try {
+        await saveShopProduct(params)
+        this.goodsDialogVisible = false
+        this.$message.success('操作成功')
+        this.getList()
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 统计状态
+    async renewShopProduct(params) {
+      try {
+        await renewShopProduct(params)
+        this.dialogFormVisible = false
+        this.$message.success('操作成功')
+        this.getList()
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 上传logo
+    handleConfirmLogo() {
+      this.$refs['logoForm'].validate((valid) => {
+        if (valid) {
+          this.uploadShopLogo(this.logoForm)
+        } else {
+          return false
+        }
+      })
+    },
+    // 上传logo
+    async uploadShopLogo(params) {
+      try {
+        await uploadShopLogo(params)
+        this.logoFormVisible = false
+        this.$message.success('操作成功')
+        this.$refs['logoForm'].clearValidate()
+        this.getList()
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 查看详情
+    handleRecordDetail(type, row) {
+      switch (type) {
+        case 1: // 潜客统计列表
+          this.$router.push({
+            path: '/user/customer/customer-stat-list',
+            query: { shopProductId: row.id }
+          })
+          break
+        case 2: // 相关文章
+          this.$router.push({
+            path: '/user/customer/customer-article-list',
+            query: { shopProductId: row.id }
+          })
+          break
+        case 3: // 相关搜索词
+          this.$router.push({
+            path: '/user/customer/customer-search-list',
+            query: { shopProductId: row.id }
+          })
+          break
+        case 4: // 页面访问
+          this.handleDelete(row)
+          break
+        case 5: // 弹窗样式
+          this.$router.push({
+            path: '/user/customer/customer-popup-edit',
+            query: { shopProductId: row.id, shopId: row.shopId, id: this.listQuery.id, shopName: this.shopName }
+          })
+          break
+        case 6: // 设置统计状态
+          this.renewCustome.id = row.id
+          this.renewCustome.status = row.status
+          console.log('renewCustome', this.renewCustome)
+          this.dialogFormVisible = true
+          break
+        case 7: // 跳转数据报表
+          this.$router.push({
+            path: '/user/customer/market-report-list',
+            query: { marketId: row.id, productName: row.productName }
+          })
+          break
+        case 8: // 上传LOGO
+          this.logoForm.id = row.id
+          this.logoFormVisible = true
+          break
+      }
+    },
+    // 操作删除广告图
+    async handleDelete(row) {
+      try {
+        await this.$confirm('确定删除该商品吗？', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        this.deleteShopProduct(row)
+      } catch (error) {
+        this.$message.info('已取消删除操作')
+      }
+    },
+    // 调用删除广告图
+    async deleteShopProduct(row) {
+      try {
+        await deleteShopProduct({ id: row.id })
+        this.$message.success('操作成功')
+        this.getList()
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 上传图标事件
+    handleSuccess(res, file) {
+      this.loadImgLoading = true
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.logoForm.logo = res.data
+        }, 1000 * 2)
+      })
+    },
+    // 对上传图片的大小、格式进行限制
+    beforeUpload(file) {
+      const isJPG = file.type === 'image/jpeg'
+      const isJPG2 = file.type === 'image/jpg'
+      const isPNG = file.type === 'image/png'
+      const isLt5M = file.size / 1024 / 1024 < 5
+      if (!isJPG && !isJPG2 && !isPNG) {
+        this.$message.error('只支持jpg或png格式图片')
+      }
+      if (!isLt5M) {
+        this.$message.error('请上传5MB以内的图片!')
+      }
+      return (isJPG || isJPG2 || isPNG) && isLt5M
+    },
+    reloadImage() {
+      this.loadImgLoading = true
+      setTimeout(() => {
+        this.logoForm.logo = this.logoForm.logo.split('?')[0] + '?r=' + Math.floor(Math.random() * 1000)
+      }, 1000 * 2)
+    },
+    loadSucess() {
+      this.loadImgLoading = false
+    }
+  }
+}
+</script>
+
+<style>
+.tags-sms {
+  width: 100%;
+  height: auto;
+  font-size: 16px;
+  color: #333333;
+  line-height: 28px;
+  box-sizing: border-box;
+  padding: 5px;
+}
+.avatar-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  float: left;
+}
+.uploader-tips {
+  position: absolute;
+  bottom: 0;
+  left: 160px;
+  line-height: 28px;
+  color: red;
+  margin: 0;
+}
+</style>

src/views/user/customer/customer-popup-edit.vue

@@ -62,7 +62,7 @@ export default {
     const defaultForm = () => {
       return {
         id: '',
-        shopId: this.$route.query.shopId,
+        shopProductId: this.$route.query.shopProductId,
         image: '', // 弹窗图片
         guidingOne: '', // 引导语1
         guidingTwo: '', // 引导语2
@@ -90,7 +90,7 @@ export default {
     }
   },
   created() {
-    this.getShopPopUp({ shopId: this.$route.query.shopId })
+    this.getShopPopUp({ shopProductId: this.$route.query.shopProductId })
   },
   methods: {
     // 获取供应商弹窗详情
@@ -123,7 +123,10 @@ export default {
       await saveShopPopUp(params)
       this.$message.success('保存成功')
       setTimeout(() => {
-        this.$router.push({ path: '/user/customer/list' })
+        this.$router.push({
+          path: '/user/customer/customer-goods-list',
+          query: { id: this.$route.query.id, shopId: this.$route.query.shopId, shopName: this.$route.query.shopName }
+        })
       }, 1000)
     },
     // 上传图标事件
@@ -161,7 +164,10 @@ export default {
     backToList() {
       this.$store.dispatch('tagsView/delView', this.$route).then(() => {
         this.$nextTick(() => {
-          this.$router.replace({ path: '/user/customer/list' })
+          this.$router.replace({
+            path: '/user/customer/customer-goods-list',
+            query: { id: this.$route.query.id, shopId: this.$route.query.shopId, shopName: this.$route.query.shopName }
+          })
         })
       })
     }

src/views/user/customer/customer-search-list.vue

@@ -101,7 +101,7 @@ export default {
       isLoading: true,
       time: '',
       listQuery: {
-        shopId: this.$route.query.shopId,
+        shopProductId: this.$route.query.shopProductId,
         keyword: '',
         status: '',
         pageNum: 1,
@@ -151,7 +151,7 @@ export default {
       data.forEach((ele) => {
         keyWordIds.push(ele.id)
       })
-      this.saveShopKeyword({ shopId: this.listQuery.shopId, keyWordIds: keyWordIds.join(',') })
+      this.saveShopKeyword({ shopProductId: this.listQuery.shopProductId, keyWordIds: keyWordIds.join(',') })
     },
     // 保存添加供应商关键词
     async saveShopKeyword(params) {

src/views/user/customer/customer-stat-list.vue

@@ -112,7 +112,7 @@ export default {
       isLoading: true,
       time: '',
       listQuery: {
-        shopId: this.$route.query.shopId,
+        shopProductId: this.$route.query.shopProductId,
         consultName: '',
         consultMobile: '',
         pageNum: 1,

src/views/user/customer/list.vue

@@ -45,20 +45,6 @@
           <el-tag v-if="row.status === 1" type="danger" size="small">暂停统计</el-tag>
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="logo" align="center" width="180">
-        <template slot-scope="{ row }">
-          <el-popover v-if="row.logo" placement="top-start" title="" width="180" trigger="hover">
-            <img :src="row.logo" alt="" style="width: 94px; height: 50px" />
-            <img slot="reference" :src="row.logo" alt="" style="width: 94px; height: 50px" />
-          </el-popover>
-          <span v-else>---</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="recentlyTime" label="最近报表时间" align="center">
-        <template slot-scope="{ row }">
-          {{ row.recentlyTime ? row.recentlyTime : '---' }}
-        </template>
-      </el-table-column>
       <el-table-column prop="addTime" label="添加时间" align="center" width="100">
         <template slot-scope="{ row }">
           {{ row.addTime ? row.addTime : '---' }}
@@ -66,30 +52,15 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center" width="400">
         <template slot-scope="{ row }">
-          <el-button type="primary" size="mini" style="margin: 4px" @click="handleRecordDetail(7, row)">
-            营销数据报表
-          </el-button>
-          <el-button type="primary" size="mini" style="margin: 4px" @click="handleRecordDetail(1, row)">
-            潜客统计列表
-          </el-button>
-          <el-button type="primary" size="mini" style="margin: 4px" @click="handleRecordDetail(2, row)">
-            相关文章
-          </el-button>
-          <el-button type="primary" size="mini" style="margin: 4px" @click="handleRecordDetail(3, row)">
-            相关搜索词
-          </el-button>
-          <el-button type="success" size="mini" style="margin: 4px" @click="handleRecordDetail(8, row)">
-            上传LOGO
-          </el-button>
-          <el-button type="success" size="mini" style="margin: 4px" @click="handleRecordDetail(4, row)">
+          <el-button type="success" size="mini" style="margin: 4px" @click="handleRecordDetail(1, row)">
             页面访问统计
           </el-button>
-          <el-button type="success" size="mini" style="margin: 4px" @click="handleRecordDetail(5, row)">
-            弹窗样式
-          </el-button>
-          <el-button type="warning" size="mini" style="margin: 4px" @click="handleRecordDetail(6, row)">
+          <el-button type="success" size="mini" style="margin: 4px" @click="handleRecordDetail(2, row)">
             设置统计状态
           </el-button>
+          <el-button type="primary" size="mini" style="margin: 4px" @click="handleRecordDetail(3, row)">
+            相关商品
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -117,48 +88,11 @@
         <el-button type="primary" @click="handleConfirm">确定</el-button>
       </div>
     </el-dialog>
-    <!-- 上传LOGO -->
-    <el-dialog title="上传LOGO" :visible.sync="logoFormVisible" width="500px">
-      <el-form ref="logoForm" :model="logoForm" :rules="rules" label-position="right">
-        <el-form-item prop="logo" label="logo">
-          <div class="form-el-upload" style="width: 126px; height: 126px">
-            <el-upload
-              class="avatar-uploader"
-              :action="actionUrl"
-              :headers="getToken"
-              :show-file-list="false"
-              :on-success="handleSuccess"
-              :before-upload="beforeUpload"
-            >
-              <div v-loading="loadImgLoading" class="avatar" style="width: 126px; height: 126px; display: block">
-                <img
-                  v-if="logoForm.logo"
-                  :src="logoForm.logo"
-                  style="width: 126px; height: 126px; display: block"
-                  @error="reloadImage"
-                  @load="loadSucess"
-                />
-                <i
-                  v-else
-                  class="el-icon-plus avatar-uploader-icon"
-                  style="width: 126px; height: 126px; line-height: 126px"
-                ></i>
-              </div>
-            </el-upload>
-            <p class="uploader-tips">注：请尽量上传126*50(px)尺寸的图片。</p>
-          </div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="logoFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="handleConfirmLogo">确定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getCustomerShopList, saveCustomerShop, renewCustomerShop, uploadShopLogo } from '@/api/user/customer/customer'
+import { getCustomerShopList, saveCustomerShop, renewCustomerShop } from '@/api/user/customer/customer'
 import ShopDialog from './components/shop-dialog'
 export default {
   name: 'RecordList',
@@ -177,32 +111,16 @@ export default {
       total: 0,
       shopDialogVisible: false,
       dialogFormVisible: false,
-      logoFormVisible: false,
-      loadImgLoading: false,
       renewCustome: {
         id: '',
         status: ''
       },
-      logoForm: {
-        id: '',
-        logo: ''
-      },
       rules: {
-        status: [{ required: true, message: '请设置统计状态', trigger: 'blur' }],
-        logo: [{ required: true, message: '请上传弹窗图片', trigger: 'blur' }]
-      }
-    }
-  },
-  computed: {
-    getToken() {
-      return {
-        token: this.$store.getters.token
+        status: [{ required: true, message: '请设置统计状态', trigger: 'blur' }]
       }
-    },
-    actionUrl() {
-      return process.env.VUE_APP_BASE_API + '/formData/MultiPictareaddData'
     }
   },
+  computed: {},
   created() {
     this.getList()
   },
@@ -272,110 +190,28 @@ export default {
         console.log(error)
       }
     },
-    // 上传logo
-    handleConfirmLogo() {
-      this.$refs['logoForm'].validate((valid) => {
-        if (valid) {
-          this.uploadShopLogo(this.logoForm)
-        } else {
-          return false
-        }
-      })
-    },
-    // 上传logo
-    async uploadShopLogo(params) {
-      try {
-        await uploadShopLogo(params)
-        this.logoFormVisible = false
-        this.$message.success('操作成功')
-        this.$refs['logoForm'].clearValidate()
-        this.getList()
-      } catch (error) {
-        console.log(error)
-      }
-    },
     // 查看详情
     handleRecordDetail(type, row) {
       switch (type) {
-        case 1: // 潜客统计列表
-          this.$router.push({
-            path: '/user/customer/customer-stat-list',
-            query: { shopId: row.shopId }
-          })
-          break
-        case 2: // 相关文章
-          this.$router.push({
-            path: '/user/customer/customer-article-list',
-            query: { shopId: row.shopId }
-          })
-          break
-        case 3: // 相关搜索词
-          this.$router.push({
-            path: '/user/customer/customer-search-list',
-            query: { shopId: row.shopId }
-          })
-          break
-        case 4: // 页面访问
+        case 1: // 页面访问统计
           this.$router.push({
             path: '/user/customer/customer-page-list',
             query: { shopId: row.shopId }
           })
           break
-        case 5: // 弹窗样式
-          this.$router.push({
-            path: '/user/customer/customer-popup-edit',
-            query: { shopId: row.shopId }
-          })
-          break
-        case 6:
+        case 2: // 设计统计状态
           this.renewCustome.id = row.id
           this.renewCustome.status = row.status
           console.log('renewCustome', this.renewCustome)
           this.dialogFormVisible = true
           break
-        case 7: // 跳转数据报表
+        case 3: // 相关商品
           this.$router.push({
-            path: '/user/customer/market-report-list',
-            query: { marketId: row.id, shopName: row.shopName }
+            path: '/user/customer/customer-goods-list',
+            query: { id: row.id, shopId: row.shopId, shopName: row.shopName }
           })
           break
-        case 8: // 上传LOGO
-          this.logoForm.id = row.id
-          this.logoFormVisible = true
-          break
       }
-    },
-    // 上传图标事件
-    handleSuccess(res, file) {
-      this.loadImgLoading = true
-      this.$nextTick(() => {
-        setTimeout(() => {
-          this.logoForm.logo = res.data
-        }, 1000 * 2)
-      })
-    },
-    // 对上传图片的大小、格式进行限制
-    beforeUpload(file) {
-      const isJPG = file.type === 'image/jpeg'
-      const isJPG2 = file.type === 'image/jpg'
-      const isPNG = file.type === 'image/png'
-      const isLt5M = file.size / 1024 / 1024 < 5
-      if (!isJPG && !isJPG2 && !isPNG) {
-        this.$message.error('只支持jpg或png格式图片')
-      }
-      if (!isLt5M) {
-        this.$message.error('请上传5MB以内的图片!')
-      }
-      return (isJPG || isJPG2 || isPNG) && isLt5M
-    },
-    reloadImage() {
-      this.loadImgLoading = true
-      setTimeout(() => {
-        this.logoForm.logo = this.logoForm.logo.split('?')[0] + '?r=' + Math.floor(Math.random() * 1000)
-      }, 1000 * 2)
-    },
-    loadSucess() {
-      this.loadImgLoading = false
     }
   }
 }

src/views/user/customer/market-report-list.vue

@@ -19,7 +19,7 @@
       </div>
     </div>
     <div class="tags-sms">
-      <span class="tags-sms-span">供应商：{{ shopName }}</span>
+      <span class="tags-sms-span">商品{{ productName }}</span>
     </div>
     <!-- 列表 -->
     <el-table v-loading="isLoading" :data="list" border style="width: 100%" height="600">
@@ -74,7 +74,7 @@ export default {
   filters: {},
   data() {
     return {
-      shopName: this.$route.query.shopName,
+      productName: this.$route.query.productName,
       isLoading: true,
       time: '',
       listQuery: {
@@ -162,12 +162,17 @@ export default {
       if (type === 'add') {
         this.$router.push({
           path: '/user/customer/market-edit',
-          query: { marketId: this.listQuery.marketId, type: type, shopName: this.$route.query.shopName }
+          query: { marketId: this.listQuery.marketId, type: type, productName: this.$route.query.productName }
         })
       } else {
         this.$router.push({
           path: '/user/customer/market-edit',
-          query: { marketId: this.listQuery.marketId, type: type, id: row.id, shopName: this.$route.query.shopName }
+          query: {
+            marketId: this.listQuery.marketId,
+            type: type,
+            id: row.id,
+            productName: this.$route.query.productName
+          }
         })
       }
     }

src/views/user/record/components/detail-dialog.vue

@@ -0,0 +1,188 @@
+<template>
+  <el-dialog
+    title="用户行为详情"
+    :visible.sync="visible"
+    width="1300px"
+    :close-on-click-modal="false"
+    :show-close="false"
+  >
+    <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>
+    <!-- 列表 -->
+    <el-table v-loading="isLoading" :data="list" border height="400px">
+      <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>
+          <span v-else> {{ row.pagePath }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accessSource" label="访问来源" align="center" width="100">
+        <template slot-scope="{ row }">
+          {{ row.accessSource | accessSourceFilters }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="pageTypes" label="页面类型" align="center">
+        <template slot-scope="{ row }">
+          {{ row.pageTypes ? row.pageTypes : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="pageLabel" label="页面标签" align="center">
+        <template slot-scope="{ row }">
+          {{ row.pageLabel ? row.pageLabel : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="pagePath" label="商品图片" align="center" width="100">
+        <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: 80px; height: 80px" />
+          </el-popover>
+        </template>
+        <template v-else>
+          <span>---</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商品ID" align="center" width="100">
+        <template slot-scope="{ row }">
+          {{ row.productId ? row.productId : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="productName" label="商品名称" align="center">
+        <template slot-scope="{ row }">
+          {{ row.productName ? row.productName : '---' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="关联供应商" align="center">
+        <template slot-scope="{ row }">
+          <p v-for="item in handleRelevanceShop(row.relevanceShop)" :key="item">
+            {{ item ? item : '---' }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column prop="accessTime" label="访问时间" align="center" />
+      <el-table-column prop="accessDuration" label="访问时长" align="center" />
+    </el-table>
+    <!-- 页码 -->
+    <pagination
+      :total="total"
+      :page-sizes="[10, 20, 30, 100]"
+      :page-size="100"
+      :page.sync="listQuery.pageNum"
+      :limit.sync="listQuery.pageSize"
+      @pagination="fetchBehaviorList"
+    />
+    <div slot="footer">
+      <el-button type="primary" :disabled="disabled" @click="handleCanle"> 关闭 </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { fetchBehaviorList } from '@/api/user/record/record'
+
+export default {
+  name: 'SearchDialog',
+  filters: {
+    accessSourceFilters(value) {
+      // 公司类型
+      const map = {
+        0: '直接访问',
+        1: '百度搜索',
+        2: '360搜索',
+        3: '谷歌搜索',
+        4: '神马搜索',
+        5: '头条搜索',
+        6: '搜狗搜索',
+        7: '直接访问'
+      }
+      return map[value]
+    }
+  },
+  props: {
+    detailQuery: {
+      type: Object,
+      // eslint-disable-next-line vue/require-valid-default-prop
+      default: {}
+    }
+  },
+  data() {
+    return {
+      visible: true,
+      isLoading: true,
+      summarize: [],
+      listQuery: {
+        ip: '',
+        accessDate: '',
+        userId: 0,
+        pageNum: 1,
+        pageSize: 100
+      },
+      list: [],
+      total: 0
+    }
+  },
+  computed: {
+    disabled() {
+      return this.productRadio === null
+    }
+  },
+  created() {
+    this.listQuery = { ...this.listQuery, ...this.detailQuery }
+    console.log('listQuery', this.listQuery)
+    this.getList()
+  },
+  methods: {
+    // 获取详情列表
+    getList() {
+      this.listQuery.pageNum = 1
+      this.fetchBehaviorList()
+    },
+    // 获取关键词列表
+    async fetchBehaviorList() {
+      try {
+        this.isLoading = true
+        const res = await fetchBehaviorList(this.listQuery)
+        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)
+      }
+    },
+    handleRelevanceShop(value) {
+      console.log('va', value.split(','))
+      return value.split(',')
+    },
+    handleCanle() {
+      // 取消弹窗
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.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

@@ -17,7 +17,13 @@
         </div>
         <div class="filter-control">
           <span>IP:</span>
-          <el-input v-model="listQuery.ip" placeholder="IP" clearable @keyup.enter.native="getList" @clear="getList" />
+          <el-input
+            v-model="listQuery.ip"
+            placeholder="IP"
+            clearable
+            @keyup.enter.native="getList"
+            @clear="getList"
+          />
         </div>
         <div class="filter-control">
           <span>手机号:</span>
@@ -43,7 +49,12 @@
         </div>
         <div class="filter-control">
           <span>公司类型:</span>
-          <el-select v-model="listQuery.companyType" style="width: 120px" clearable @change="getList">
+          <el-select
+            v-model="listQuery.companyType"
+            style="width: 120px"
+            clearable
+            @change="getList"
+          >
             <el-option value="" label="请选择" />
             <el-option :value="1" label="游客" />
             <el-option :value="2" label="机构" />
@@ -52,7 +63,12 @@
         </div>
         <div class="filter-control">
           <span>访问客户端:</span>
-          <el-select v-model="listQuery.accessClient" style="width: 120px" clearable @change="getList">
+          <el-select
+            v-model="listQuery.accessClient"
+            style="width: 120px"
+            clearable
+            @change="getList"
+          >
             <el-option value="" label="请选择" />
             <el-option :value="0" label="网站" />
             <el-option :value="1" label="小程序" />
@@ -62,27 +78,53 @@
           <span>关联供应商:</span>
           <el-select v-model="listQuery.relevanceShop" filterable @change="getList">
             <el-option value="" label="请选择" />
-            <el-option v-for="item in supplierList" :key="item.shopId" :label="item.shopName" :value="item.shopName" />
+            <el-option
+              v-for="item in supplierList"
+              :key="item.shopId"
+              :label="item.shopName"
+              :value="item.shopName"
+            />
           </el-select>
         </div>
         <div class="filter-control">
           <span>供应商标签:</span>
-          <el-select v-model="tagsList" multiple filterable placeholder="请选择" @change="handleTagsOptions">
-            <el-option v-for="item in tagsOptions" :key="item.id" :label="item.value" :value="item.value" />
+          <el-select
+            v-model="tagsList"
+            multiple
+            filterable
+            placeholder="请选择"
+            @change="handleTagsOptions"
+          >
+            <el-option
+              v-for="(item, index) in tagsOptions"
+              :key="index"
+              :label="item.value"
+              :value="item.value"
+            />
           </el-select>
         </div>
         <div class="filter-control">
           <span>父标签:</span>
           <el-select v-model="listQuery.pageLabels" filterable @change="getList">
             <el-option value="" label="请选择" />
-            <el-option v-for="item in labelsOptions" :key="item.id" :label="item.value" :value="item.value" />
+            <el-option
+              v-for="item in labelsOptions"
+              :key="item.id"
+              :label="item.value"
+              :value="item.value"
+            />
           </el-select>
         </div>
         <div class="filter-control">
           <span>页面类型:</span>
           <el-select v-model="listQuery.pageTypes" filterable @change="getList">
             <el-option value="" label="请选择" />
-            <el-option v-for="item in typesOptions" :key="item.id" :label="item.pageType" :value="item.pageType" />
+            <el-option
+              v-for="item in typesOptions"
+              :key="item.id"
+              :label="item.pageType"
+              :value="item.pageType"
+            />
           </el-select>
         </div>
         <div v-if="tabsCurrent === 1" class="filter-control">
@@ -99,6 +141,20 @@
             @change="getList"
           />
         </div>
+        <div class="filter-control">
+          <span>注册时间:</span>
+          <el-date-picker
+            v-model="time1"
+            type="daterange"
+            unlink-panels
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            :picker-options="pickerOptions"
+            @change="getList"
+          />
+        </div>
         <div class="filter-control">
           <span>协销:</span>
           <el-select v-model="listQuery.headUserId" placeholder="协销" @change="getList">
@@ -123,19 +179,43 @@
         </div>
         <div class="filter-control">
           <el-button type="primary" @click="getList">查询</el-button>
-          <el-button v-permission="'keyword:list:export'" type="primary" @click="handleExport"> 导出 </el-button>
+          <el-button
+            v-permission="'keyword:list:export'"
+            type="primary"
+            @click="handleExport"
+          >
+            导出
+          </el-button>
         </div>
       </div>
       <!-- 关键词列表 -->
-      <el-table v-loading="isLoading" :data="list" border style="width: 100%" :height="tableHeight">
+      <el-table
+        v-loading="isLoading"
+        :data="list"
+        border
+        style="width: 100%"
+        :height="tableHeight"
+      >
         <el-table-column prop="ip" fixed label="IP" align="center" width="80" />
         <el-table-column prop="region" fixed label="地区" align="center" width="100" />
-        <el-table-column prop="accessClient" fixed label="访问客户端" align="center" width="70">
+        <el-table-column
+          prop="accessClient"
+          fixed
+          label="访问客户端"
+          align="center"
+          width="70"
+        >
           <template slot-scope="{ row }">
             {{ row.accessClient | accessClientFilters }}
           </template>
         </el-table-column>
-        <el-table-column prop="companyType" fixed label="公司类型" align="center" width="70">
+        <el-table-column
+          prop="companyType"
+          fixed
+          label="公司类型"
+          align="center"
+          width="70"
+        >
           <template slot-scope="{ row }">
             {{ row.companyType | companyTypeFilters }}
           </template>
@@ -144,11 +224,11 @@
           <template slot-scope="{ row }">
             <template v-if="row.companyType === '2'">
               <a style="color: #2fa4e7" target="_blank" :href="handleClubHrefLink(row)">
-                {{ row.corporateName ? row.corporateName : '---' }}
+                {{ row.corporateName ? row.corporateName : "---" }}
               </a>
             </template>
             <template v-else>
-              {{ row.corporateName ? row.corporateName : '---' }}
+              {{ row.corporateName ? row.corporateName : "---" }}
             </template>
           </template>
         </el-table-column>
@@ -156,29 +236,34 @@
           <template slot-scope="{ row }">
             <template v-if="row.companyType === '2'">
               <a style="color: #2fa4e7" target="_blank" :href="handleClubHrefLink(row)">
-                {{ row.contacts ? row.contacts : '---' }}
+                {{ row.contacts ? row.contacts : "---" }}
               </a>
             </template>
             <template v-else>
-              {{ row.contacts ? row.contacts : '---' }}
+              {{ row.contacts ? row.contacts : "---" }}
             </template>
           </template>
         </el-table-column>
         <el-table-column prop="phoneNumber" label="手机号" align="center" width="110">
           <template slot-scope="{ row }">
-            {{ row.phoneNumber ? row.phoneNumber : '---' }}
+            {{ row.phoneNumber ? row.phoneNumber : "---" }}
           </template>
         </el-table-column>
         <el-table-column prop="spName" label="所属协销" align="center" width="100">
           <template slot-scope="{ row }">
-            {{ row.spName ? row.spName : '---' }}
+            {{ row.spName ? row.spName : "---" }}
           </template>
         </el-table-column>
-        <el-table-column prop="relevanceShop" label="关联供应商" align="center" width="210">
+        <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">
-                {{ item ? item : '---' }}
+                {{ item ? item : "---" }}
               </p>
             </template>
             <p v-else>---</p>
@@ -187,25 +272,32 @@
         <el-table-column prop="spName" label="供应商标签" align="center" width="120">
           <template slot-scope="{ row }">
             <el-popover placement="top-start" width="400" trigger="hover">
-              <span>{{ row.label ? row.label : '---' }}</span>
-              <span slot="reference">{{ row.label ? row.label.substr(0, 9) + '...' : '--' }}</span>
+              <span>{{ row.label ? row.label : "---" }}</span>
+              <span slot="reference">{{
+                row.label ? row.label.substr(0, 9) + "..." : "--"
+              }}</span>
             </el-popover>
             <!-- {{ row.label ? row.label : '---' }} -->
           </template>
         </el-table-column>
         <el-table-column prop="addTime" label="注册时间" align="center" width="100">
           <template slot-scope="{ row }">
-            {{ row.addTime ? row.addTime : '---' }}
+            {{ row.addTime ? row.addTime : "---" }}
           </template>
         </el-table-column>
         <el-table-column prop="numbers" label="访问页面数量" align="center" width="50">
           <template slot-scope="{ row }">
-            {{ row.numbers ? row.numbers : '0' }}
+            {{ row.numbers ? row.numbers : "0" }}
           </template>
         </el-table-column>
         <el-table-column prop="accessDuration" label="总时长" align="center" width="80" />
         <el-table-column prop="accessDate" label="访问日期" align="center" width="100" />
-        <el-table-column prop="lastAccessTime" label="最后访问时间" align="center" width="100" />
+        <el-table-column
+          prop="lastAccessTime"
+          label="最后访问时间"
+          align="center"
+          width="100"
+        />
         <el-table-column fixed="right" label="操作" align="center" width="120">
           <template slot-scope="{ row }">
             <el-button type="primary" size="mini" @click="handleRecordDetail(row)">查看详情</el-button>
@@ -223,6 +315,13 @@
         @pagination="fetchRecordList"
       />
     </el-tabs>
+    <!--  详情弹窗 -->
+    <detail-dialog
+      v-if="dialogVisible"
+      ref="detailDialog"
+      :detail-query="detailQuery"
+      @cancel="handleCancel"
+    />
   </div>
 </template>
 
@@ -233,6 +332,7 @@ import { fetchShopRelevanceList, searchBehaviorList } from '@/api/user/supplier/
 import { export_json_to_excel } from '@/vendor/Export2Excel'
 import pickerOptions from '@/utils/time-picker.js'
 import { getServiceList } from '@/api/library/keyword'
+import DetailDialog from './components/detail-dialog'
 const defaultListQuery = {
   todayType: 0, // 0 今日数据 1 以往数据
   ip: '', // 访问人ID
@@ -249,6 +349,8 @@ const defaultListQuery = {
   pageLabels: '', // 父级标签
   startTime: '',
   endTime: '',
+  registerStartTime: '', // 注册开始时间
+  registerEndTime: '', // 注册结束时间
   pageNum: 1,
   pageSize: 100,
   headUserId: '', // 协销id
@@ -256,6 +358,9 @@ const defaultListQuery = {
 }
 export default {
   name: 'RecordList',
+  components: {
+    DetailDialog
+  },
   filters: {
     companyTypeFilters(value) {
       // 公司类型
@@ -281,6 +386,7 @@ export default {
       isLoading: true,
       pickerOptions,
       time: [],
+      time1: [],
       listQuery: Object.assign({}, defaultListQuery),
       shopListQuery: {
         shopName: '',
@@ -300,7 +406,9 @@ export default {
       sellerList: [], // 协销列表
       tabsCurrent: 0,
       tableHeight: window.innerHeight - 120, // 表格动态高度
-      screenHeight: window.innerHeight // 内容区域高度
+      screenHeight: window.innerHeight, // 内容区域高度
+      dialogVisible: false,
+      detailQuery: {}
     }
   },
   computed: {},
@@ -395,6 +503,13 @@ export default {
         this.listQuery.startTime = ''
         this.listQuery.endTime = ''
       }
+      if (this.time1 && this.time1.length > 0) {
+        this.listQuery.registerStartTime = this.time1[0]
+        this.listQuery.registerEndTime = this.time1[1]
+      } else {
+        this.listQuery.registerStartTime = ''
+        this.listQuery.registerEndTime = ''
+      }
       this.fetchRecordList()
       this.fetchShopRelevanceList()
       this.searchBehaviorList()
@@ -458,17 +573,24 @@ export default {
     },
     // 查看详情
     handleRecordDetail(row) {
-      this.$router.push({
-        path: '/user/detail-list',
-        query: { ip: row.ip, accessDate: row.accessDate, userId: row.userId }
-      })
+      console.log('111111111')
+      this.detailQuery = { ip: row.ip, accessDate: row.accessDate, userId: row.userId }
+      this.dialogVisible = true
+      // this.$router.push({
+      //   path: '/user/detail-list',
+      //   query: { ip: row.ip, accessDate: row.accessDate, userId: row.userId }
+      // })
+    },
+    // 关闭详情弹窗
+    handleCancel() {
+      this.dialogVisible = false
     },
-
     // 导出
     async handleExport() {
       if (this.tabsCurrent === 0) {
         // 导出今日数据
-        const url = process.env.VUE_APP_BASE_API + '/user/behavior/exportToday?todayType=0'
+        const url =
+          process.env.VUE_APP_BASE_API + '/user/behavior/exportToday?todayType=0'
         downloadWithUrl(url, '用户行为记录')
       } else {
         const url =