Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developer

pages/search/search.vue

@@ -701,7 +701,7 @@ export default {
 			if (this.listQuery.keyword == '') {
 				this.$util.msg('请输入搜索关键词', 2000)
 			} else {
-                this.cmsKeywordHits(this.listQuery.keyword)
+                // this.cmsKeywordHits({ keyword: this.listQuery.keyword })
 				switch (this.searchKeyType) {
 					case 1:
 						this.listData = []

pages/seller/club/list.vue

@@ -130,7 +130,7 @@
 							</view>
 						</view>
 						<view class="club-list-bot">
-							<template v-if="tabSmallCurrentIndex === 0">
+							<template v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2">
 								<view class="btn" @click.stop="handleClickOper(1, club)">
 									<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
 								</view>
@@ -142,7 +142,7 @@
 								</view>
 								<view
 									class="btn"
-									v-if="tabSmallCurrentIndex === 0"
+									v-if="tabSmallCurrentIndex === 0 || tabSmallCurrentIndex === 2"
 									@click.stop="handleShowBubble(club, index)"
 								>
 									<text class="iconfont icon-gengduo2"></text>
@@ -173,7 +173,10 @@
 							<template v-if="tabSmallCurrentIndex === 1">
 								<view class="btn" @click.stop="handleClickOper(1, club)">
 									<text class="iconfont icon-jigouhuaxiang"></text> 机构画像
-								</view>
+								</view>
+                                <view v-if="!isManage" class="btn" @click.stop="handleClickOper(2, club)">
+                                	<text class="iconfont icon-tianxie"></text> 填写咨询记录
+                                </view>
 								<view class="btn" @click.stop="handleClickOper(3, club)">
 									<text class="iconfont icon-tianxie"></text> 商城访问记录
 								</view>