1.1.23

pages/index/index.js

@@ -118,7 +118,8 @@ Page({
           // app.globalData.userInfo.IsShow = isShow;
           app.globalData.userInfo.IsShow = data.IsShow;
 
-          app.globalData.IsLocked = data.IsLocked;
+          //app.globalData.IsLocked = data.IsLocked;
+          app.globalData.IsLocked = 0;
 
           //app.globalData.userInfo.AvatarUrl = param.avatarUrl;
           that.getQuestionType(function () {

pages/main/default.wxml

@@ -62,8 +62,8 @@
                 </view>
               </view>
             </view>
-            <view class="panel00201 FlexRow" bindtap="gotoMemberCenter">
-              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo' />
+            <view class="panel00201 FlexRow" bindtap="gotoMemberCenter0">
+              <image wx:if="{{!IsAccredit}}" class="universalpic_face_default_black_size01" src="../images/universalpic_face_default_black_size01.png" bindtap='gotoBindGetUserInfo0' />
               <image wx:if="{{IsAccredit}}" class="universalpic_face_default_black_size01" src="{{AvatarUrl}}" />
               <image wx:if="{{IsRemind}}" src='../images/message_home_01.png' class="message_home_01" />
 
@@ -101,11 +101,13 @@
             <image src="../images/cpxl_logo_03.png" class="cpxl_logo_01"></image>
             <view class="panelProduct111">练口算</view>
             <view class="panelProduct112">好玩的口算敏捷训练</view>
+            <view class="panelProduct113">免费</view>
           </view>
           <view class="panelProduct11 FlexColumn" bind:tap="switchProgram" data-appid="wx1fef080f74481cbd">
             <image src="../images/cpxl_logo_04.png" class="cpxl_logo_01"></image>
             <view class="panelProduct111">练笔算</view>
             <view class="panelProduct112">竖式计算题出题+打印</view>
+            <view class="panelProduct113">免费</view>
           </view>
         </view>
         <view class="panelProduct1 FlexRow">

pages/main/detail.js

@@ -43,6 +43,7 @@ Page({
       Containnerheight: server.getWindowHeight(),
       ID: id,
       ShowAndroidNotice: isAndroid,
+      IsMember:app.globalData.userInfo.IsMember,
     });
     var systemInfo = wx.getSystemInfoSync();
     if (systemInfo.system && systemInfo.system.indexOf("Android") >= 0) {
@@ -61,17 +62,17 @@ Page({
       });
     }
 
-    common.getStorageValue(this, "IsShare", 0, function () {
-      if (that.data.IsShare == 0 &&
-        app.globalData.userInfo.IsMember == 0 &&
-        app.globalData.userInfo.IsShow == 1 &&
-        app.globalData.IsLocked == 1
-      ) {
-        wx.navigateTo({
-          url: '../../package4/main/share',
-        })
-      }
-    });
+    // common.getStorageValue(this, "IsShare", 0, function () {
+    //   if (that.data.IsShare == 0 &&
+    //     app.globalData.userInfo.IsMember == 0 &&
+    //     app.globalData.userInfo.IsShow == 1 &&
+    //     app.globalData.IsLocked == 1
+    //   ) {
+    //     wx.navigateTo({
+    //       url: '../../package4/main/share',
+    //     })
+    //   }
+    // });
 
   },
   onShow: function () {
@@ -134,22 +135,82 @@ Page({
   },
   getFinish: function () {
     server.playSound("/sounds/click.mp3");
+    var that=this;
 
-    this.setData({
-      ShowLoading: true,
-      BtnText: "全部保存到相册",
-    });
-    wx.hideLoading();
-    arrAnswerID = [];
-    tempAnswerList = [];
-    this.getAnswerID();
-    if (this.data.ID > 0) {
-      this.getList(this.data.ID);
-    } else {
-      this.getErrorList();
+    if (app.globalData.userInfo.IsMember==1){
+      that.setData({
+        ShowLoading: true,
+        BtnText: "全部保存到相册",
+      });
+      wx.hideLoading();
+      arrAnswerID = [];
+      tempAnswerList = [];
+      that.getAnswerID();
+      if (that.data.ID > 0) {
+        that.getList(that.data.ID);
+      } else {
+        that.getErrorList();
+      }
+  
+      that.closeHelp();
     }
+    else{
+      // 若在开发者工具中无法预览广告，请切换开发者工具中的基础库版本
+      // 在页面中定义激励视频广告
+      let videoAd = null;
+
+      // 在页面onLoad回调事件中创建激励视频广告实例
+      if (wx.createRewardedVideoAd) {
+        videoAd = wx.createRewardedVideoAd({
+          adUnitId: 'adunit-5cc4270e78bbcf35'
+        });
+        videoAd.onLoad(() => {
+          
+        });
+        videoAd.onError((err) => {
+          console.error('激励视频光告加载失败', err)
+        });
+        videoAd.onClose((res) => {
+          console.log(res);
+          if (res.isEnded){
+            that.setData({
+              ShowLoading: true,
+              BtnText: "全部保存到相册",
+            });
+            wx.hideLoading();
+            arrAnswerID = [];
+            tempAnswerList = [];
+            that.getAnswerID();
+            if (that.data.ID > 0) {
+              that.getList(that.data.ID);
+            } else {
+              that.getErrorList();
+            }
+        
+            that.closeHelp();
+          }
+          else{
+            wx.showToast({
+              title: '请播放完广告',
+            });
+          }
+        });
+      }
 
-    this.closeHelp();
+      // 用户触发广告后，显示激励视频广告
+      if (videoAd) {
+        videoAd.show().catch(() => {
+          // 失败重试
+          videoAd.load()
+            .then(() => videoAd.show())
+            .catch(err => {
+              console.error('激励视频 广告显示失败', err)
+            });
+        });
+      }
+    }
+
+    
   },
   //重新生成试卷
   ResetFinish: function () {

pages/main/detail.wxml

@@ -59,6 +59,9 @@
 
       <view class="text5">每张含 {{PageCount}} 道题目</view>
 
+      <view class="panel11 FlexColumn" wx:if="{{IsMember==0}}">
+        <view>说明：看15秒广告免费出题一次。</view>
+      </view>
       <view class="btnStart" bindtap='getFinish'>
         <view class="btnStart1">
           出题
@@ -71,11 +74,11 @@
 
       <image class="error2 universalpic_indicator_cell_size01" src="../images/universalpic_indicator_cell_size01.png" />
       <view class="panel10 FlexRow" bindtap='gotoError'>
-          <view class="error3 btnSelect">
-            {{QuestionTypeItem.ErrorList.length}}道
-          </view>
-          <view class="btnAddSub"></view>
+        <view class="error3 btnSelect">
+          {{QuestionTypeItem.ErrorList.length}}道
         </view>
+        <view class="btnAddSub"></view>
+      </view>
       
       <view class="btnStart0 btnStart" bindtap='getFinish'>
         <view class="btnStart1">
@@ -83,7 +86,8 @@
         </view>
       </view>
     </view>
-    <view style='height:230rpx'></view>
+    <view class="panel3"></view>
+    <ad-custom class="ad_02" unit-id="adunit-b54dfbcc0a0197c0" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
   </block>
 
   <block wx:if="{{IsFinished}}">
@@ -147,7 +151,6 @@
       <view class="panel FlexRow" bindtap='closeMenu'>
         <view>取消</view>
       </view>
-
     </view>
   </view>
 </view>

pages/main/detail.wxss

@@ -88,7 +88,6 @@
 
 .panel1 {
   width: 680rpx;
-  height: 782rpx;
   background-color: #262626;
   margin-top: -30rpx;
   z-index: 10;
@@ -136,12 +135,12 @@
   color:#D2D2D2;
   text-align: center;
   line-height: 90rpx;
-  margin-top: 15rpx;
+  margin-top: -10rpx;
 }
 .universalpic_line_dashed_size01{
   width:634rpx;
   height:4rpx;
-  margin-top: 52rpx;
+  margin-top: 45rpx;
 }
 
 .panel1 .text4{
@@ -192,12 +191,12 @@
 .panel1 .Number{
   color:#D2D2D2;
   font-size: 36rpx;
-  margin-top: 10rpx;
+  margin-top: -30rpx;
 }
 
 .panel1 .text5{
   font-size:24rpx;
-  margin-top: 30rpx;
+  margin-top: 10rpx;
   color:#868686;
   font-weight: 400;
 }
@@ -205,15 +204,15 @@
 
 .btnStart {
   width: 680rpx;
-  height: 200rpx;
+  height:150rpx;
   background-color: #7D2B25;
   border-bottom-left-radius: 40rpx;
   border-bottom-right-radius: 40rpx;
   position: relative;
-  margin-top: 80rpx;
+  margin-top: 30rpx;
 }
 .btnStart0 {
-  height: 170rpx;
+  height: 150rpx;
 }
 
 .btnStart1 {
@@ -574,3 +573,24 @@
   bottom: 0rpx;
   z-index: 100;
 }
+
+.panel11{
+  width: 640rpx;
+  height:92rpx;
+  margin: 60rpx 0 0 0;
+  background: #4D4D4D;
+  border-radius: 20rpx;
+  font-size: 28rpx;
+  color: #D2D2D2;
+}
+
+.panel3{
+  width: 100%;
+  height:20rpx;
+  background-color: #262626;
+  margin: 80rpx 0 0 0;
+}
+
+.ad_02{
+  width:750rpx;
+}