修改弹窗

pagesme/message/info.vue

@@ -54,23 +54,6 @@
         </view>
       </template>
     </z-paging>
-    <u-popup
-        :show="showApply"
-        mode="center"
-        @close="closeApply"
-        @open="openApply"
-        customStyle="min-height: 15vh; width: 500rpx; background: linear-gradient(135deg, #E3D4FC 0%, #ffdbd1 50%, #FFFFFF 100%); border-radius: 10rpx;"
-        class="custom-popup"
-        :round="10"
-    >
-      <view class="popup-content">
-        <text style="font-weight: bold">是否接受对方的请求</text>
-      </view>
-      <view class="u-popup__footer">
-        <u-button color="#F7C8E1" @click="apply">接受</u-button>
-        <u-button color="#CECCCD" @click="refuse" customStyle="margin-left: 20rpx">拒绝</u-button>
-      </view>
-    </u-popup>
     <u-popup :show="show" mode="center"  @close="close" @open="open" customStyle="min-height: 15vh; width: 700rpx; background: linear-gradient(135deg, #E3D4FC 0%, #ffdbd1 50%, #FFFFFF 100%); border-radius: 10rpx;">
       <view class="popup-content">
         <text style="font-weight: bold">互换微信成功</text>
@@ -85,6 +68,7 @@
     </u-popup>
 
     <ELM ref="elm" :msg="tipMsg" :isConfirm="isConfirm" @confirm="confirm"></ELM>
+    <ELM ref="elm" :msg='tipMsg' :isConfirm="showApply" @confirm="apply" @cancel="refuse"></ELM>
     <ELM ref="elmMessage" :msg="tipMsg" :isConfirm="isMessageConfirm" @confirm="messageConfirm"></ELM>
   </view>
 </template>
@@ -392,6 +376,8 @@ export default {
     },
     openApply(){
       this.showApply = true
+      this.tipMsg = '是否接受对方的请求'
+      this.$refs.elm.showDialog();
     },
     apply(){
       uni.showModal({
@@ -462,7 +448,7 @@ export default {
       getWeChatTask(form).then(res=>{
         if (res.data.code == 200){
           this.wxTask = res.data.data
-          if (this.wxTask.type === '2'){
+          if (this.wxTask.type === '2' && this.wxTask.status === '1'){
             //请求已经被回应了.让tabbar变色
               this.tabbarValue = 1
           }