联调支付

components/vipModal/index.js

@@ -11,10 +11,6 @@ Component({
     properties: {
 
     },
-
-    /**
-     * 组件的初始数据
-     */
     data: {
         show: false,
         type: '',
@@ -22,7 +18,6 @@ Component({
     },
     methods: {
         open() {
-            console.log(this.getTabBar());
             if (typeof this.getTabBar === 'function' && this.getTabBar()) {
                 this.getTabBar().setData({
                     mask: true

pages/my/index.js

@@ -48,6 +48,7 @@ Page({
         } else {
             this.setUserInfo()
         }
+        this.selectComponent('#vipModal').open()
     },
     // 设置用户信息及vip状态
     async setUserInfo() {

pages/my/index.wxml

@@ -13,11 +13,8 @@
                     <view class="uRtopleft">
                         <view class="nickName textOver">{{userInfo.user.nickName||'请输入昵称' }}</view>
                         <view class="gradeText textOver" catchtap="clipboar">学号：{{userInfo.user.eid}}</view>
-                        <!-- <view class="validity" wx:if="{{vipTime}}">
-                            会员使用至：{{filters.formatDate(vipTime,5)}}
-                        </view> -->
-                        <view class="validity">
-                            会员使用至：2024-05-01
+                        <view class="validity" wx:if="{{vipTime}}">
+                            会员使用至：{{vipTiem=='1'?'终身使用':filters.formatDate(vipTime,5)}}
                         </view>
                     </view>
                     <view class="uRtopRight">
@@ -74,7 +71,7 @@
                 {{isPreferential?'立即续费':'立即开通'}}
             </view>
         </view>
-        <view class="payBox pbbg1" bindtap="toBuy" data-id="{{products[1].id}}">
+        <view class="payBox pbbg1" bindtap="toBuy" data-id="{{products[2].id}}">
             <view class="pay">
                 {{isPreferential?'立即续费':'立即开通'}}
             </view>
@@ -85,21 +82,6 @@
             </view>
         </view>
     </scroll-view>
-    <!--   <view class="payBox {{vipTime=='1'?'payBox3':''}}" wx:if="{{!isPreferential||vipTime=='1'}}" bindtap="toBuy"
-        data-id="{{products[0].id}}" data-isclick="{{vipTime=='1'}}">
-        <view class="buyBtn" wx:if="{{!isPreferential}}">
-            立即开通
-        </view>
-    </view>
-    <view class="payBox {{vipTime?'payBox4':'payBox2'}}" wx:if="{{vipTime!='1'}}" bindtap="toBuy" data-id="{{products[1].id}}"
-        data-isclick="{{vipTime!=''}}">
-        <view class="validity" wx:if="{{vipTime}}">
-            有效期至：{{filters.formatDate(vipTime,5)}}
-        </view>
-        <view class="buyBtn" wx:else>
-            {{!vipTime&&!isPreferential?'立即开通':'立即续费'}}
-        </view>
-    </view> -->
     <!-- 弹窗 -->
     <view class="activationModal" wx:if="{{activationModal}}">
         <view class="box zoomIn">

pages/reading/buyVip/index.js

@@ -34,7 +34,7 @@ Component({
                 isPreferential
             })
         },
-        triggerPay({
+        toBuy({
             currentTarget
         }) {
             this.triggerEvent('toBuy', currentTarget.dataset.goods)

pages/reading/buyVip/index.wxml

@@ -11,47 +11,22 @@
         </view>
         <scroll-view class="goodsList" scroll-x="true" enhanced show-scrollbar="{{false}}" wx:if="{{vipTime!='1'}}">
             <view class="payBox pbbg2">
-                <view class="pay" bindtap="toBuy" data-id="{{products[0].id}}">
+                <view class="pay" bindtap="toBuy" data-goods="{{products[0]}}">
                     {{isPreferential?'立即续费':'立即开通'}}
                 </view>
             </view>
             <view class="payBox pbbg1">
-                <view class="pay" bindtap="toBuy" data-id="{{products[1].id}}">
+                <view class="pay" bindtap="toBuy" data-goods="{{products[2]}}">
                     {{isPreferential?'立即续费':'立即开通'}}
                 </view>
             </view>
             <view class="payBox pbbg3">
-                <view class="pay" bindtap="toBuy" data-id="{{products[1].id}}">
+                <view class="pay" bindtap="toBuy" data-goods="{{products[1]}}">
                     {{isPreferential?'立即续费':'立即开通'}}
                 </view>
             </view>
         </scroll-view>
-        <!--    <view wx:if="{{!isPreferential}}">
-            <view class="payBox" bindtap="triggerPay" data-goods="{{products[0]}}">
-            </view>
-            <view class="payBox payBox2" bindtap="triggerPay" data-goods="{{products[1]}}">
-            </view>
-        </view> -->
-        <!--   <view wx:else>
-            <view class="payBox payBox3">
-                <view class="validity">
-                    已到期 请续费使用
-                </view>
-            </view>
-            <view class="renewBox">
-                <view class="title">续费</view>
-                <view class="renew">
-                    <view class="left">升级成 SVIP会员-终身<view class="money">+{{products[0].price/100}}元</view>
-                    </view>
-                    <view class="pay" bindtap="triggerPay" data-goods="{{products[0]}}">开通</view>
-                </view>
-                <view class="renew">
-                    <view class="left">续费 VIP会员-12个月<view class="money">{{products[1].price/100}}元</view>
-                    </view>
-                    <view class="pay" bindtap="triggerPay" data-goods="{{products[1]}}">续费</view>
-                </view>
-            </view>
-        </view> -->
+        
     </view>
     <image src="/static/lollipop.png" class="close" catchtap="closeModal" />
 </view>

pages/reading/index.js

@@ -195,9 +195,6 @@ Page({
     },
     onShow() {
         this.getVipInfo()
-        this.selectComponent('#buyVip').open({
-            isVip: this.data.isVip
-        })
     },
     // 获取是否vip
     async getVipInfo() {