Merge branch 'dev' into dev_7.0.1

src/component/personCenter/personCenter.wxml

@@ -3,7 +3,7 @@
     <button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
 </view>-->
 <view wx:if='{{!currentMobile}}' class="member-unActive" bindtap="handleTtoActiveMemebr">
-  <text class="un-active-btn" >激活立享会员特权</text>
+  <text class="un-active-btn" >升级7-Eleven会员2.0版本</text>
 </view>
 <view wx:if='{{currentMobile}}' catchtap="handleToMemberOfOwn" class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">
     <view class='user-info' wx:if='{{currentMobile}}'>
@@ -21,7 +21,7 @@
       </view>
 
      <view class='qr-code pr'>
-        <image src='/assets/imgs/711_11.png' catchtap="handleGoWxCard"></image>
+        <image src='/assets/imgs/711_11.png'></image>
       </view>
     </view>
   </view>

src/component/personCenter/personCenter.wxss

@@ -92,12 +92,13 @@
   background-color: rgb(11, 170, 52);
   color: #FFF;
   text-align: center;
-  height: 100rpx;
-  line-height: 100rpx;
+  height: 200rpx;
+  line-height: 200rpx;
   border-radius: 6rpx;
-  font-size: 30rpx;
+  font-size: 36rpx;
   font-weight: 700;
-  letter-spacing:2rpx;
+  letter-spacing: 5rpx;
+  cursor: pointer;
 }
 .un-active-btn{
   /* font-family:"iconfont-711" !important; */