Merge branch 'feature/7月迭代-会员' of http://git.gicdev.com/gicmember/member into feature/7月迭代-会员

src/components/allCustomers/components/customerLog.vue

@@ -27,7 +27,7 @@
           <div v-if="row.operRemark" style="width: 100%" ref="operRemark">
             <el-tooltip placement="top" :disabled="row.hideTip">
               <div style="max-width: 400px" slot="content" v-html="row.operRemark"></div>
-              <span style="display:inline-block; max-width: 95%;overflow: hidden; text-overflow:ellipsis;white-space:nowrap;vertical-align:middle" v-html="row.operRemark"></span>
+              <span style="display:inline-block; max-width: 90%;overflow: hidden; text-overflow:ellipsis;white-space:nowrap;vertical-align:middle" v-html="row.operRemark"></span>
             </el-tooltip>
             <el-button v-if="memberId && (row.operType == '客户合并' && row.referLogId && (row.referLogId != -1 && row.referLogId != ''))" type="text" @click="goLink('/customerLog',row.referLogId)">查看</el-button>
           </div>