Merge remote-tracking branch 'origin/master'

pagesArticle/articleDetail.vue

@@ -108,6 +108,7 @@
 <!--      </view>-->
     </view>
     <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+    <ELM ref="elmReject" :msg="tipMsg" :isConfirm="isRejectConfirm" :isCancel="false" @confirm="rejectConfirm"></ELM>
   </view>
 </template>
 
@@ -141,6 +142,7 @@ export default{
       parentId:null,
       tipMsg: '',
       isConfirm: false,
+      isRejectConfirm: false,
     }
   },
   onLoad(params){
@@ -260,6 +262,13 @@ export default{
             comment(params).then(res=>{
               if (res.data.code == 200){
                 //方便回到动态页的时候刷新数据
+                if (res.data.data.examStatus == '3'){
+                  const remarks = JSON.parse(res.data.data.remarks)
+                  this.tipMsg = remarks[0].msg;
+                  this.isRejectConfirm = true;
+                  this.$refs.elmReject.showDialog();
+                  return
+                }
                 uni.setStorageSync("isRefresh", true)
                 this.getArticleDetail()
               } else {
@@ -354,6 +363,9 @@ export default{
         url: "/pagesme/me/doubleauth"
       })
     },
+    rejectConfirm(){
+      this.isRejectConfirm = false;
+    }
   }
 }
 </script>