Commit 0f206077 authored by zhangyanni's avatar zhangyanni

已添加=> 等待通过

parent e3dc87a7
......@@ -587,11 +587,11 @@
if (this.circleType == 13 || this.circleType == 7 || this.circleType == 11 || this.circleType == 5) {
if (data.relationType == 1 || data.relationType == 2 || data.relationType == 3) {
//@ApiModelProperty(value ="添加联系人状态 0未添加 1已添加 2已同意")
//@ApiModelProperty(value ="添加联系人状态 0未添加 1等待通过 2已同意")
// private Byte isFriend;
if (data.isFriend == 0) return "+联系人";
else if (data.isFriend == 1) return "已添加";
else if (data.isFriend == 1) return "等待通过";
else {
//(this.circleType==5||this.circleType==11)&&!this.circleList
if (!this.circleList) return "电子名片";
......@@ -624,7 +624,7 @@
if (e && e.target.innerText == "已关注") {
this.cancelFollowEmpIdFunc(data, index);
}
if (e && e.target.innerText == "+联系人" || e && e.target.innerText == "已添加" || e && e.target.innerText == "互为联系人") {
if (e && e.target.innerText == "+联系人" || e && e.target.innerText == "等待通过" || e && e.target.innerText == "互为联系人") {
this.addFriendEmpIdFunc(data, index);
}
if (e && e.target.innerText == "电子名片") {
......
......@@ -367,7 +367,7 @@
<div class="buttonWrapper" v-if="showWhichCmpt==1">
<el-button class="contactButton" :type="contactState<=0?'danger':contactState==1?'default':'primary'"
:plain="contactState>0?true:false" @click="handleAdd(1)">
<span>{{contactState==-1?"+ 联系人":contactState==0?"+ 联系人":contactState==1?"已添加":"查看电子名片"}}</span>
<span>{{contactState==-1?"+ 联系人":contactState==0?"+ 联系人":contactState==1?"等待通过":"查看电子名片"}}</span>
</el-button>
<el-button @click="handleAdd(2)" :type="concernState==1?'default':'warning'"
:plain="concernState==1?true:false">
......@@ -634,7 +634,7 @@
documentFront: "",
frontImgUrl: "",
pathfrom: "",
contactState: -1,//0未添加 1已添加 2已同意
contactState: -1,//0未添加 1等待通过 2已同意
concernState: -1,//0未关注 1已关注
integralVisible: false,
completeVisible: false,
......
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