zhengjinyi před 2 roky
rodič
revize
5d91934cfa

+ 2 - 2
.env.development

@@ -4,8 +4,8 @@ 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'
 

+ 1 - 0
src/views/library/supplierTag/list.vue

@@ -55,6 +55,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
+      :page-size="10"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
       @pagination="fetchShopLabelList"

+ 2 - 1
src/views/library/supplierTag/supplier-list.vue

@@ -61,6 +61,7 @@
     <!-- 页码 -->
     <pagination
       :total="total"
+      :page-size="10"
       :page.sync="listQuery.pageNum"
       :limit.sync="listQuery.pageSize"
       @pagination="fetchShopRelevanceList"
@@ -141,7 +142,7 @@ export default {
         linkMan: '',
         contractMobile: '',
         pageNum: 1,
-        pageSize: 100
+        pageSize: 10
       },
       list: [],
       total: 0,

+ 7 - 1
src/views/user/record/detail-list.vue

@@ -53,7 +53,9 @@
         </el-table-column>
         <el-table-column label="关联供应商" align="center">
           <template slot-scope="{ row }">
-            {{ row.relevanceShop ? row.relevanceShop : '---' }}
+            <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" />
@@ -131,6 +133,10 @@ export default {
       } catch (error) {
         console.log(error)
       }
+    },
+    handleRelevanceShop(value) {
+      console.log('va', value.split(','))
+      return value.split(',')
     }
   }
 }

+ 10 - 4
src/views/user/record/list.vue

@@ -118,7 +118,7 @@
         </div>
       </div>
       <!-- 关键词列表 -->
-      <el-table v-loading="isLoading" :data="list" border>
+      <el-table v-loading="isLoading" :data="list" border style="width:100%;">
         <el-table-column prop="ip" label="IP" align="center" />
         <el-table-column prop="region" label="地区" align="center" width="160" />
         <el-table-column prop="accessClient" label="访问客户端" align="center" width="80">
@@ -151,12 +151,14 @@
             {{ row.spName ? row.spName : '---' }}
           </template>
         </el-table-column>
-        <el-table-column prop="relevanceShop" label="关联供应商" align="center" width="250">
+        <el-table-column prop="relevanceShop" label="关联供应商" align="center" width="220">
           <template slot-scope="{ row }">
-            {{ row.relevanceShop ? row.relevanceShop : '---' }}
+            <p v-for="item in handleRelevanceShop(row.relevanceShop)" :key="item">
+              {{ item ? item : '---' }}
+            </p>
           </template>
         </el-table-column>
-        <el-table-column prop="spName" label="标签" align="center">
+        <el-table-column prop="spName" label="标签" align="center" width="100">
           <template slot-scope="{ row }">
             {{ row.label ? row.label : '---' }}
           </template>
@@ -428,6 +430,10 @@ export default {
           return v[key]
         })
       )
+    },
+    handleRelevanceShop(value) {
+      console.log('va', value.split(','))
+      return value.split(',')
     }
   }
 }