add: 老会员弹框文案

src/component/authorization-modal/authorization-modal.wxml

 <view class="modal" wx:if='{{isAuthorization}}'>
     <view class="modal-mask"></view>
-    <view class="modal-container">
+    <view class="modal-container" style="top:{{isAuthorizationActiveText ? '12%' : '26%' }};">
       <view class='auth-avatar'>
         <image class='auth-avatar-img' src='/assets/imgs/auth-avatar.png'></image>
       </view>
-      <view class='auth-shop' wx:if="{{isAuthorizationActiveText}}">{{isAuthorizationActiveText}}</view>
+      <view class='auth-shop' wx:if="{{isAuthorizationActiveText}}">
+        <view class="auto-old"><span class="auto-old-num">1. </span>老会员无需领取新会员卡,即可在会员小程序享受全部会员权益。</view>
+        <view class="auto-old"><span class="auto-old-num">2. </span>若在领取新会员卡过程中输入新手机号,会造成原会员及积分信息的更替。</view>
+        <view class="auto-old"><span class="auto-old-num">3. </span>领取后的新会员卡,将存放在"微信-卡包"。</view>
+      </view>
       <view class='auth-shop' wx:else>广东7-Eleven申请获取授权，用于会员服务</view>
       <button type='primary'  wx:if="{{!isAuthorizationActiveText}}" bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' disabled='{{!checkAll}}'>同意</button>
       <button type='primary'  wx:else class='agree' disabled='{{!checkAll}}' bindtap="handleActiveAgree">同意</button>
       <view class='rule-wrap'>
         <view class='agree-rule'>
           <view class="agree-icon"><icon size="18" type="{{checkAll ? 'success' : 'circle'}}" bindtap="checkAll"></icon></view>
-          <view><text>我已阅读并同意</text><text class='rule-text' bindtap="handelToMemberRules">《会员规则》</text></view>
+          <view wx:if="{{!isAuthorizationActiveText}}"><text>我已阅读并同意</text><text class='rule-text' bindtap="handelToMemberRules">《会员规则》</text></view>
+          <view wx:else><text>我已阅读并同意</text><text class='rule-text' bindtap="handelToMemberRules">《激活领卡规则》</text></view>
         </view>
       </view>
       <view class='close' bindtap='close'>

src/component/authorization-modal/authorization-modal.wxss

@@ -7,6 +7,14 @@
   top: 0;
   background-color: transparent;
 }
+.auto-old {
+  display: flex;
+  padding-bottom: 10rpx;
+}
+.auto-old-num {
+  display: inline-block;
+  width: 60rpx;
+}
 
 .modal-mask {
   position: fixed;
@@ -23,17 +31,19 @@
 .modal-container {
   position: fixed;
   left: 96rpx;
-  top: 262rpx;
+  /* top: 262rpx; */
+  /* top: 18%; */
   background-color: #fff;
   width: 570rpx;
-  height: 712rpx;
+  min-height: 450rpx;
   z-index: 4;
   border-radius: 20rpx;
 }
 .auth-avatar{
   width: 126rpx;
   height: 126rpx;
-  margin: 120rpx auto 92rpx;
+  /* margin: 120rpx auto 92rpx; */
+  margin: 60rpx auto 60rpx;
 }
 .auth-avatar-img{
   width: 126rpx;
@@ -57,6 +67,7 @@
   font-size: 22rpx;
   color: #666666;
   display: flex;
+  padding-bottom: 50rpx;
 }
 .agree-icon{
   margin-right: 10rpx;

src/component/picNav/picNav.js

@@ -84,17 +84,19 @@ Component({
         if (currentClickType == 1) {
           wxService.openCard()
         } else if (currentClickType == 2) {
+          // wxService.openCard()
+          if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
+            // 手机号存在 但未激活 跳转激活领卡页面 老用户
+            this.setData({
+              isAuthorizationActiveText: '新激活领卡',
+              isAuthorization: true,
+              isAuthorizationType: 3
+            }, () => {
+              return false
+            })
+          } else {
             wxService.openCard()
-          // if (userInfo && userInfo.member && userInfo.member.mobile && !userInfo.memberActivateStatus) {
-          //   // 手机号存在 但未激活 跳转激活领卡页面 老用户
-          //   this.setData({
-          //     isAuthorizationActiveText: '新激活领卡',
-          //     isAuthorization: true,
-          //     isAuthorizationType: 3
-          //   }, () => {
-          //     return false
-          //   })
-          // }
+          }
         }
       }
     },

src/pages/memberRules/memberRules.js

@@ -21,7 +21,7 @@ wxService.page({
       })
     }else if (type == 3){
       wx.setNavigationBarTitle({
-        title: '激活规则'
+        title: '激活领卡规则'
       })
     }
     this.setData({