解决冲突

src/pages/messageCenter/reject-detail.vue

@@ -37,7 +37,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.notice_detail = res.info.notice_detail
+          vm.notice_detail = res.info.notice_body
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -73,6 +73,8 @@ export default {
         line-height: 20px;
         p{
             text-indent: 35px;
+            color: #666666;
+            font-size: 14px;
         }
     }
 }

src/pages/myInfo/my-info.vue

@@ -162,6 +162,7 @@ export default {
       upLoadObj: defaultImg, // 上传的图片
       flag: true,
       isAGENT: false,
+      popSetect: false, // true:待提交或者审核未通过
       elecStatusDesceibe: '',
       user_bp_status: '',
       user_bp_class: '',
@@ -313,6 +314,7 @@ export default {
       } else if (this.bp_id && this.user_bp_status === 'NEW') {
         this.description = '待提交'
         this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
       } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
         this.description = '解除绑定'
         this.approveBtn = true
@@ -322,6 +324,7 @@ export default {
       ) {
         this.description = '审核未通过'
         this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
       } else {
         this.description = '审批中'
         this.approveBtn = false