From 7df3bc8e92d0ec80eed1c3745af6234ed0cf4a7f Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 23 Jun 2020 17:51:29 +0800
Subject: [PATCH] 1.弹出框的关闭

---
 pages/user/cardinfo/cardinfo.js   | 4 +++-
 pages/user/cardinfo/cardinfo.wxml | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 2c9f692..faa64b2 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -873,7 +873,9 @@ Page({
       });
   },
   //显示弹出框
-  show_change:function () { this.setData({is_show_change_pop:1}); }
+  show_change:function () { this.setData({is_show_change_pop:1}); },
+  //关闭弹出框
+  close_card_change_pop:function () { this.setData({is_show_change_pop:0}); }
   
 
 
diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml
index 5ec3555..e21972f 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/pages/user/cardinfo/cardinfo.wxml
@@ -164,8 +164,8 @@
 
 <!-- 购买更换,升级 -->
 <view class="card_change_pop" wx:if="{{is_show_change_pop==1}}">
-     <view class="cover-layer" bindtap="close_card_change_pop"></view>
-     <view class="content flex jc-center ai-center">
+     <view class="cover-layer"></view>
+     <view class="content flex jc-center ai-center" bindtap="close_card_change_pop">
             <view class="card_list">
                   <image class="hg" src="{{url}}/miniapp/images/plus/plustopimg.png"></image>
                   <view class="list">
@@ -173,7 +173,7 @@
                             <view class="flex ai-center"><image class="hg_img" src="{{url}}/miniapp/images/vip_hg0.png"></image>
                                 <text class="ellipsis-1 card_name">{{item.CardName}}</text></view>
                             <view class="price_show flex ai-center">
-                                <view style="width: 100%; line-height: 24rpx" data-days="{{item.ExpiryDate}}"  bindtap="change_card" data-cid="{{item.CardId}}">
+                                <view style="width: 100%; line-height: 24rpx" data-days="{{item.ExpiryDate}}"  catchtap="change_card" data-cid="{{item.CardId}}">
                                    <view style="text-align: right" class="fs26">￥<text class="pri fs40">{{item.CardFee}}</text></view>
                                    <view style="text-align: center" class="fs30" wx:if="{{is_guoqi}}">立即变更</view>
                                    <view style="text-align: center" class="fs30" wx:else>立即升级</view>
--
libgit2 0.21.4