Rorschach 5 years ago
parent
commit
84dd208caa

+ 2 - 2
component/myModal/myModal.wxml

@@ -13,14 +13,14 @@
         <cover-view class="paySuccess">恭喜您支付成功</cover-view>
         <cover-view class="btn" bindtap="confirm">确定</cover-view>
     </cover-view>
-    <cover-view class="box havePadding" wx:if="{{type === 'androidVIP'}}">
+    <cover-view class="box" wx:if="{{type === 'androidVIP'}}">
         <!-- <cover-view class="text" wx:for="{{text}}"></cover-view> -->
         <cover-image class="androidVIPImg" src="../../static/vip/crown.png"></cover-image>
         <cover-view class="androidVIPText">快去开通VIP</cover-view>
         <cover-view class="androidVIPText">享受更多权益吧</cover-view>
         <cover-view class="btn" bindtap="confirm">确定</cover-view>
     </cover-view>
-    <cover-view class="box havePadding" wx:if="{{type === 'iosCode'}}">
+    <cover-view class="box" wx:if="{{type === 'iosCode'}}">
         <cover-image class="androidVIPImg" src="../../static/vip/crown.png"></cover-image>
         <cover-view class="androidVIPText">由于相关规范,ios功能暂不可用</cover-view>
         <cover-view class="androidVIPText">联系客服解锁哦</cover-view>

+ 3 - 3
component/myModal/myModal.wxss

@@ -87,8 +87,8 @@
 .androidVIPImg {
     width: 160rpx;
     height: 160rpx;
-    position: absolute;
-    top: -89rpx;
+    /* position: absolute; */
+    /* top: -89rpx; */
     margin: 0 auto;
     left: 0;
     right: 0;
@@ -99,5 +99,5 @@
     color: #0D0D0D;
     font-size: 40rpx;
     text-align: center;
-    margin-top: 30rpx;
+    margin-top: 5rpx;
 }

+ 6 - 6
pages/groupPage/grade-details/grade-details.js

@@ -271,13 +271,13 @@ Page({
     }
     // const productId = options.productId;
     this.getBookInfo(options.productId);
-    if(this.data.isIOS){
-      this.areYouBookSuper('IOS',options.productId)
-    } else {
-      this.areYouBookSuper('ANDROID',options.productId)
-    }
+    // if(this.data.isIOS){
+    //   this.areYouBookSuper('IOS',options.productId)
+    // } else {
+    //   this.areYouBookSuper('ANDROID',options.productId)
+    // }
     
-    this.getGroupInfo(options.productId)
+    // this.getGroupInfo(options.productId)
     // if (productId) {
     this.setData({
       productId: options.productId

+ 1 - 1
pages/index/index.wxml

@@ -27,7 +27,7 @@
   </view> -->
 </view>
  <!-- <MyToast /> -->
-<view hidden="false">
+<view hidden="{{hide}}">
   <Dialog bindmyevent="jurisdiction" />
 </view>
 <!-- <view class="index-dialog" wx:if="{{indexSignDialog}}">

+ 10 - 3
pages/main/class/class.js

@@ -172,9 +172,16 @@ Page({
     this.setData({
       isModalShow: false
     })
-    wx.navigateTo({
-      url: `../../groupPage/grade-details/grade-details?productId=${this.data.productId}`
-    })
+    if(this.data.isIOS){
+      wx.navigateTo({
+        url: `../../vipPage/vipCode/vipCode`
+      })
+    }else{
+      wx.navigateTo({
+        url: `../../vipPage/vip/vip`
+      })
+    }
+   
   },
   modalCloseHandler: function () {
     this.setData({

+ 14 - 13
pages/social/works/works.js

@@ -160,14 +160,19 @@ Page({
     },
     getWorks: function (uid, id) {
         httpRequestApi.getWorksDetail(uid, id, this.data.goBackHome ? 'READ_SHARE' : '').success((res) => {
+
             const others = res.data.data.otherRead;
             const author = res.data.data.user;
             const works = res.data.data.userRead;
+            console.log(11111111,author)
+            console.log(22222222,others)
+
             wx.setNavigationBarTitle({
                 title: works.title //页面标题为路由参数
             })
             const othersTemp = [];
             others.forEach((item) => {
+                if(!item) return
                 const temp = {};
                 temp.uid = item.userRead.id;
                 temp.title = item.userRead.title;
@@ -742,22 +747,18 @@ Page({
         })
     },
     modalConfirmHandler: function () {
-        if (this.data.isIOS) {
-            wx.setClipboardData({
-                data: '微信号',
-                success: function (res) {
-                    wx.getClipboardData({
-                        success: function (res) {
-                            console.log(res.data) // data
-                        }
-                    })
-                }
+        this.setData({
+            isModalShow: false
+        })
+        if(this.data.isIOS){
+            wx.navigateTo({
+              url: `../../vipPage/vipCode/vipCode`
             })
-        } else {
+          }else{
             wx.navigateTo({
-                url: `../../vipPage/vip/vip`
+              url: `../../vipPage/vip/vip`
             })
-        }
+          }
 
     },
     modalCloseHandler: function () {

+ 1 - 1
pages/vipPage/vip/vip.wxml

@@ -13,5 +13,5 @@
         </view>
     </view>
     <view class="buyBtn" bindtap="createOrder">{{isVIP? '续费' : '立即开通'}}</view>
-    <myModal id="myModal" type="{{'androidVIP'}}" isCloseShow="{{false}}" wx:if="{{isModalShow}}" bindconfirm="modalConfirmHandler" />
+    <myModal id="myModal" type="{{modalType}}" isCloseShow="{{false}}" wx:if="{{isModalShow}}" bindconfirm="modalConfirmHandler" />
 </view>

BIN
static/groupImg/liwu.png


BIN
static/groupImg/step.png


BIN
static/groupImg/success.png


BIN
static/vip/crown.png


BIN
static/vip/discount.png


BIN
static/vip/idcard.png


BIN
static/vip/product_bg.png


BIN
static/vip/small_crown.png


+ 3 - 3
utils/const.js

@@ -1,9 +1,9 @@
 // 常量列表
 module.exports = {
   // productApi: 'https://reader.lingjiao.cn/readerProduct/',
-  // productApi: 'https://readertest.lingjiao.cn/readerProduct/',
-  productApi:  'https://readertest.lingjiao.cn:442/readerProduct/',
+  productApi: 'https://readertest.lingjiao.cn:442/readerProduct/',
+  // productApi:  'https://reader-efun.lingjiao.cn/readerProduct/',
   // baseApi: 'https://reader.lingjiao.cn/readerBase/'
-  // baseApi: 'https://readertest.lingjiao.cn:442/readerBase/'
   baseApi: 'https://readertest.lingjiao.cn:442/readerBase/'
+  // baseApi: 'https://reader-efun.lingjiao.cn/readerBase/'
 }