'51活动'

app.json

@@ -33,9 +33,9 @@
   ],
   "window": {
     "backgroundTextStyle": "light",
-    "navigationBarBackgroundColor": "#12C962",
+    "navigationBarBackgroundColor": "#ededed",
     "navigationBarTitleText": "小学语文朗读配音",
-    "navigationBarTextStyle": "white",
+    "navigationBarTextStyle": "black",
     "onReachBottomDistance": 50,
     "enablePullDownRefresh": true
   },

component/my/my.wxss

@@ -30,7 +30,7 @@
   height: 66rpx;
   position: absolute;
   top: 0;
-  background: #12C962;
+  background: #ededed;
 }
 
 .set-msg {

pages/activity/index/index.js

@@ -84,6 +84,12 @@ Page({
         })
       }
     })
+    if(this.data.fromReading){
+      this.setData({
+        selectInd: 1
+      })
+      this.getMyRead();
+    }
   },
 
   /**

pages/activity/index/index.wxml

@@ -7,9 +7,9 @@
   <view class="strategy" bindtap="strategy">
     <image src="../../../static/activity/strategy-img.png"></image>
   </view>
-  <view class="strategy" bindtap="getPrice">
+  <!-- <view class="strategy" bindtap="getPrice">
     <image src="../../../static/activity/get_price.png"></image>
-  </view>
+  </view> -->
   <view class="activity-works">
     <image class="swiper-bg" src="http://reader-wx.ai160.com/images/reader/activity/swiper-bg.png" mode="scaleToFill"></image>
     <text class="gradeText">{{grades}}朗读范文素材</text>

pages/activity/index/index.wxss

@@ -5,7 +5,7 @@
   height: 100%;
   box-sizing: border-box;
   overflow: scroll;
-  background: #34D6B0;
+  background: #FFC76C;
 }
 .activity-bg {
   width: 100%;
@@ -24,7 +24,7 @@
 }
 .strategy {
   position: fixed;
-  top: 241rpx;
+  top: 284rpx;
   right: 0;
   width: 205rpx;
   height: 155rpx;
@@ -47,7 +47,7 @@
   top: 30rpx;
   transform: translateX(-50%);
   font-size: 34rpx;
-  color: #9B4716;
+  color: #fff;
   font-weight: 600;
 }
 .swiper-bg {
@@ -85,7 +85,7 @@
   display: flex;
   justify-content: space-between;
   height: 88rpx;
-  background: #007a5b;
+  background: #ff7d30;
 border-radius: 0 20rpx 0 20rpx;
 }
 .tab-bg {
@@ -121,14 +121,14 @@ border-radius: 0 20rpx 0 20rpx;
   z-index: 1;
 }
 .activity-ranking-tab .select {
-  color: #007A5B;
+  color: #FF6000;
 }
 .activity-ranking-title {
   display: flex;
   justify-content: space-between;
   align-items: center;
   padding: 21rpx 42rpx;
-  color: #007A5B;
+  color: #FF6000;
   font-size: 38rpx;
   background: #fff;
   box-sizing: border-box;
@@ -211,6 +211,10 @@ border-radius: 0 20rpx 0 20rpx;
   height: 24rpx;
   vertical-align: middle;
 }
+
+.scroll-view{
+  min-height: 200rpx;
+}
 .scroll-view-item .popularity,
 .activity-my-ranking  .popularity {
   color: #F76346;

pages/activity/rule/rule.wxss

@@ -6,6 +6,6 @@
 }
 .rule-bg {
   width: 100%;
-  height: 5407rpx;
+  height: 4047rpx;
   display: block;
 }

pages/activity/strategy/strategy.wxml

@@ -3,7 +3,7 @@
   <image class="strategy-bg" src="http://reader-wx.ai160.com/images/reader/activity/activity_strategy.jpg" />
       <video
       class="myVideo"
-      src="http://yfklxt-video.ai160.com/fastStudy/video/20210302001.mp4"
+      src="http://reader-wx.ai160.com/images/reader/activity/ad.mp4"
       autoplay
     ></video>
     <view class="copy-btn" bindtap="copyWx">复制</view>

pages/index/index.wxml

@@ -45,17 +45,16 @@
       <text>资源</text>
     </view>
   </view>
-  <!-- <view hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || 0 != myIndex}}" class="activity-img" bindtap="goToActivity"> -->
-  <!-- <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity">
+  <view hidden="{{gradeActivity === 'PRIMARY_SENIOR_GRADE' || gradeActivity === 'PRESCHOOL' || 0 != myIndex}}" class="activity-img" bindtap="goToActivity">
+  <!-- <view hidden="{{0 != myIndex}}" class="activity-img" bindtap="goToActivity"> -->
     <image src="http://reader-wx.ai160.com/images/reader/activity/banner.jpg"></image>
-  </view> -->
-  <view hidden="{{(!isIos && isVip) || 0 != myIndex }}" class="activity-img" bindtap="bannerTap">
-  <!-- <view hidden="{{0 != myIndex }}"  class="activity-img" bindtap="bannerTap"> -->
+  </view>
+  <!-- <view hidden="{{(!isIos && isVip) || 0 != myIndex }}" class="activity-img" bindtap="bannerTap">
     <image src="http://reader-wx.ai160.com/images/reader/pay/{{isIos ? 'ios_banner' : 'android_banner'}}.jpg"></image>
   </view>
   <view wx:if="{{isIos ||  isVip}}" class="activity-buy" bindtap="myPlase">
     <image src="http://reader-wx.ai160.com/images/reader/pay/vip_icon.png"></image>
-  </view>
+  </view> -->
   <!-- 调用组件 -->
   <template is="{{templates}}" wx:if="{{myIndex === 3 || myIndex === 2}}" data="{{myData: myData,coursesData:coursesData,noMoreWork:noMoreWork}}"></template>
   <VideoSwiper wx:if="{{videoList.length > 0}}" class="video-swiper" video-list="{{videoList}}" nextMargin="{{nextMargin}}" isSwiper="{{isSwiper}}" noMoreWork="{{noMoreWork}}" ifHeadTap="{{true}}" bindopenShare="openShare" bindopenComment="openComment" bindheadTap="headTapHandler" bindgoToReading="goToReading" bindcollectTap="collectTap" bindlikeTap="likeTap" binddelHideMyWork="delHideMyWork" bindaddShareAmount="addShareAmount" bindchange="videoChange">

pages/index/index.wxss

@@ -30,7 +30,7 @@
   /* top: 118rpx; */
   width: 100%;
   height: 80rpx;
-  background: #12C962;
+  background: #ededed;
   /* color: #383838; */
   box-sizing: border-box;
   display: flex;
@@ -91,16 +91,16 @@
   /* border-radius: 30rpx; */
   /* background: #fff; */
   border-bottom: none;
-  color: #fff;
+  color: #333;
 }
 
 .select {
-  color: #fff;
+  color: #333;
   /* font-size: 40rpx; */
   /* font-family: SourceHanSansSC-bold; */
   /* background: #61ca54; */
   font-size: 40rpx;
-  border-bottom: 6rpx solid #fff;
+  border-bottom: 6rpx solid #14c962;
   opacity: 1;
 }
 

pages/reading/reading.js

@@ -76,6 +76,7 @@ Page({
                 summary: res.data.data.userRead.summary,
                 coverImg: res.data.data.userRead.coverImg,
                 shareImg: res.data.data.userRead.shareImg,
+                isActivityRead: res.data.data.isActivityRead
             })
             this.getReadInfo(id)
             httpRequestApi.userIntoPage('pages/reading/reading', '朗读页面').success((res) => {
@@ -246,9 +247,10 @@ Page({
     audioRecord: function () {
 
         console.log('111111111111111recordFlag', this.data.recordFlag)
-        // 判断是否有权限朗读
+        // 判断是否有权限朗读 不是vip 并且 不是活动作品
         const isVip = wx.getStorageSync('vip');
-        if (!isVip) {
+        console.log('判断',!isVip && !this.data.isActivityRead)
+        if (!isVip && !this.data.isActivityRead) {
             const imgName = this.data.isIOS ? 'ios_read' : 'android_read';
             if(!this.data.isIOS) {
                 this.setData({

utils/const.js

@@ -5,6 +5,6 @@ module.exports = {
   productApi:  'https://reader-test.efunbox.cn/readerProduct/',
   // baseApi: 'https://reader.lingjiao.cn/readerBase/'
   // baseApi: 'https://readertest.lingjiao.cn:442/readerBase/'
-  baseApi: 'https://reader-api.ai160.com/'
-  // baseApi: 'https://reader-api.efunbox.cn/'
+  // baseApi: 'https://reader-api.ai160.com/'
+  baseApi: 'https://reader-api.efunbox.cn/'
 }