Commit a5a224f1 authored by zhengke's avatar zhengke

Merge branch 'master' into 1.4.0

parents 63b2a589 2adaef2e
......@@ -92,7 +92,10 @@
<img :src="item.icon" width="34" height="34" />
<span v-if="item.Id==2" style="position: absolute;background: red;right: -25px;top: 0;border-radius: 50%;opacity: 0;" @click.stop="forward(item,1)">&nbsp;</span>
</div>
<span>{{ item.Id==2?(personalInfor.IsOpenId?item.Name:'已关注公众号' ):item.Name }}</span>
<span>
{{ item.Id==2?(personalInfor.IsOpenId?item.Name:item.Name):item.Name }}
<!-- {{ item.Id==2?(personalInfor.IsOpenId?item.Name:'已关注公众号'):item.Name }} -->
</span>
</div>
</div>
</template>
......
......@@ -131,8 +131,8 @@
<p class="q-mt-md row flex-between items-center">
<div class="row items-center">
<span class="Required q-mr-md">*</span>选择颜色:
</div>
<el-button v-if="searchData.isTeamManage" size="small"
</div>
<el-button size="small"
class="button-new-tag q-ml-md ml-1"
@click="setColorsShow">
+ 颜色
......
......@@ -33,7 +33,7 @@
<div class="shrink q-px-lg" v-if="RecycleBinDatas.RecycleBinList&&RecycleBinDatas.RecycleBinList.length>0">
<el-button @click="BatchDeletion">
<el-icon><Delete /></el-icon>
<span class="">批量删除</span>
<span class="">彻底删除</span>
</el-button>
</div>
<div v-else style="height: 32px;"></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment