开发页面

components/activityList/index.less

@@ -6,26 +6,38 @@
   .ranking-class-1 {
     margin-bottom: 20rpx;
     width: 100%;
-    padding: 20rpx 20rpx 34rpx;
     box-sizing: border-box;
-    background-color: white;
     border-radius: 30rpx;
+    overflow: hidden;
     box-shadow: rgba(99, 99, 99, 0.1) 0px 2px 8px 0px;
 
     .header {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      padding: 0rpx 14rpx;
+      padding: 25rpx 30rpx;
       box-sizing: border-box;
 
-      .title {
-        font-size: 30rpx;
-        font-weight: bold;
+      .left {
+        display: flex;
+        align-items: center;
+        color: white;
+
+        .icon {
+          width: 26rpx;
+          height: 30rpx;
+        }
+
+        .title {
+          font-size: 30rpx;
+          font-weight: bold;
+          margin: 0rpx 10rpx;
+        }
       }
 
       .toAll {
         font-size: 28rpx;
+        color: white;
 
         .backIcon {
           width: 12rpx;
@@ -35,9 +47,9 @@
     }
 
     .body {
+      padding: 24rpx 10rpx 38rpx 10rpx;
 
       .top {
-        margin-top: 16rpx;
         display: flex;
         justify-content: space-around;
         align-items: flex-end;
@@ -53,6 +65,7 @@
           width: 140rpx;
           font-size: 26rpx;
           margin-top: 14rpx;
+          text-align: center;
         }
 
         .firstUser {
@@ -107,6 +120,7 @@
       }
 
       .btm {
+        margin-top: 10rpx;
         display: flex;
         justify-content: space-between;
         align-items: flex-end;
@@ -127,6 +141,7 @@
           .nickName {
             width: 120rpx;
             font-size: 26rpx;
+            text-align: center;
             margin-top: 14rpx;
           }
         }
@@ -279,7 +294,7 @@
 
     .cover {
       width: 100%;
-      height: 216rpx;
+      height: 410rpx;
       border-radius: 20rpx;
       background-color: #EBEBEB;
     }

components/activityList/index.wxml

@@ -1,12 +1,12 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 <view class="activityList">
-  <view class="activityBox">
+  <!-- <view class="activityBox">
     <image src="" class="cover" />
     <view class="footer">
       <view class="info">
         <view class="title">标题</view>
-        <!--  <view class="time">{{filters.formatDate(item.startTime,2)}}—{{filters.formatDate(item.endTime,2)}}
-        </view> -->
+        <view class="time">{{filters.formatDate(item.startTime,2)}}—{{filters.formatDate(item.endTime,2)}}
+        </view>
         <view class="timeOut {{item.second=='00'?'closing':''}}" wx:if="{{item.second}}">距活动结束：
           <view class="outNum">{{item.hour}}</view>
           <view class="outSplit">:</view>
@@ -17,24 +17,28 @@
       </view>
       <view class="btn {{item.second=='00'?'closingBtn':''}}" bindtap="drawVoucher">立即领取</view>
     </view>
-  </view>
+  </view> -->
   <block wx:for="{{activityList}}" wx:key="id">
     <view class="activityBox" wx:if="{{item.bannerType==1}}" bindtap="activityEvent" data-info="{{item}}">
       <image src="{{item.icon}}" class="cover" />
-      <view class="footer">
+      <!--  <view class="footer">
         <view class="info">
           <view class="title">{{item.title}}</view>
           <view class="time">{{filters.formatDate(item.startTime,2)}}—{{filters.formatDate(item.endTime,2)}}
           </view>
         </view>
         <view class="btn">立即参与</view>
-      </view>
+      </view> -->
     </view>
-    <view class="ranking-class-1" wx:if="{{item.bannerType==2}}">
+    <view class="ranking-class-1 {{item.type=='2'?'yxb':item.type=='3'?'rbb':'pkb'}}" wx:if="{{item.bannerType==2}}">
       <view class="header">
-        <view class="title">{{item.title}}</view>
+        <view class="left">
+          <image src="{{item.type=='2'?'/static/yxb.png':item.type=='3'?'/static/rbb.png':'/static/pkb.png'}}"
+            class="icon" />
+          <view class="title">{{item.title}}</view>
+        </view>
         <view class="toAll" bindtap="activityEvent" data-info="{{item}}">查看全部
-          <image src="/static/black.png" class="backIcon" />
+          <image src="/static/rBtn.png" class="backIcon" />
         </view>
       </view>
       <view class="body">

components/activityList/index.wxss

@@ -6,32 +6,44 @@
 .activityList .ranking-class-1 {
   margin-bottom: 20rpx;
   width: 100%;
-  padding: 20rpx 20rpx 34rpx;
   box-sizing: border-box;
-  background-color: white;
   border-radius: 30rpx;
+  overflow: hidden;
   box-shadow: rgba(99, 99, 99, 0.1) 0px 2px 8px 0px;
 }
 .activityList .ranking-class-1 .header {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 0rpx 14rpx;
+  padding: 25rpx 30rpx;
   box-sizing: border-box;
 }
-.activityList .ranking-class-1 .header .title {
+.activityList .ranking-class-1 .header .left {
+  display: flex;
+  align-items: center;
+  color: white;
+}
+.activityList .ranking-class-1 .header .left .icon {
+  width: 26rpx;
+  height: 30rpx;
+}
+.activityList .ranking-class-1 .header .left .title {
   font-size: 30rpx;
   font-weight: bold;
+  margin: 0rpx 10rpx;
 }
 .activityList .ranking-class-1 .header .toAll {
   font-size: 28rpx;
+  color: white;
 }
 .activityList .ranking-class-1 .header .toAll .backIcon {
   width: 12rpx;
   height: 22rpx;
 }
+.activityList .ranking-class-1 .body {
+  padding: 24rpx 10rpx 38rpx 10rpx;
+}
 .activityList .ranking-class-1 .body .top {
-  margin-top: 16rpx;
   display: flex;
   justify-content: space-around;
   align-items: flex-end;
@@ -46,6 +58,7 @@
   width: 140rpx;
   font-size: 26rpx;
   margin-top: 14rpx;
+  text-align: center;
 }
 .activityList .ranking-class-1 .body .top .firstUser {
   width: 130rpx;
@@ -90,6 +103,7 @@
   border-radius: 50%;
 }
 .activityList .ranking-class-1 .body .btm {
+  margin-top: 10rpx;
   display: flex;
   justify-content: space-between;
   align-items: flex-end;
@@ -109,6 +123,7 @@
 .activityList .ranking-class-1 .body .btm .userBox .nickName {
   width: 120rpx;
   font-size: 26rpx;
+  text-align: center;
   margin-top: 14rpx;
 }
 .activityList .ranking-class-2 {
@@ -225,7 +240,7 @@
 }
 .activityList .activityBox .cover {
   width: 100%;
-  height: 216rpx;
+  height: 410rpx;
   border-radius: 20rpx;
   background-color: #EBEBEB;
 }

components/readingTips/index.less

@@ -33,189 +33,204 @@
 
 
   .payBox {
-      margin-top: 20rpx;
-      padding: 13rpx 30rpx;
-      background-color: white;
-      border-radius: 20rpx;
+    margin-top: 20rpx;
+    padding: 13rpx 30rpx;
+    background-color: white;
+    border-radius: 20rpx;
+
+    .title {
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #000;
+    }
+
+    .pay {
+      margin: 20rpx 0rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0rpx 30rpx;
+      border-radius: 22rpx;
+      overflow: hidden;
 
-      .title {
-          font-size: 34rpx;
+      .payLeft {
+        .pLTitle {
+          font-size: 36rpx;
           font-weight: bold;
-          color: #000;
-      }
+        }
 
-      .pay {
-          margin: 20rpx 0rpx;
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 0rpx 30rpx;
-          border-radius: 22rpx;
-          overflow: hidden;
-
-          .payLeft {
-              .pLTitle {
-                  font-size: 36rpx;
-                  font-weight: bold;
-              }
-
-              .pLcontent {
-                  font-size: 22rpx;
-              }
-          }
+        .pLcontent {
+          font-size: 22rpx;
+        }
+      }
 
-          .payRight {
-              margin: 24rpx 0rpx;
-              padding: 12rpx 28rpx;
-              border-radius: 40rpx;
-              font-size: 24rpx;
-              font-weight: bold;
-          }
+      .payRight {
+        margin: 24rpx 0rpx;
+        padding: 12rpx 28rpx;
+        border-radius: 40rpx;
+        font-size: 24rpx;
+        font-weight: bold;
       }
+    }
 
-      .vipPay {
-          background: url('http://reader-wx.ai160.com/images/reader/v3/year.png') no-repeat;
-          background-size: cover;
+    .vipPay {
+      background: url('http://reader-wx.ai160.com/images/reader/v3/year.png') no-repeat;
+      background-size: cover;
 
-          .vipTitle {
-              color: #FFE6B9;
-          }
+      .vipTitle {
+        color: #FFE6B9;
+      }
 
-          .vipContent {
-              margin-top: 4rpx;
-              color: #FFE6B9;
-          }
+      .vipContent {
+        margin-top: 4rpx;
+        color: #FFE6B9;
+      }
 
-          .vipBtn {
-              background-image: linear-gradient(to bottom, #F4E7A8, #F9EDCF);
-              color: #211501;
-          }
+      .vipBtn {
+        background-image: linear-gradient(to bottom, #F4E7A8, #F9EDCF);
+        color: #211501;
       }
+    }
 
-      .buyPay {
-          background: url('http://reader-wx.ai160.com/images/reader/v3/10yuan.png') no-repeat;
-          background-size: cover;
+    .buyPay {
+      background: url('http://reader-wx.ai160.com/images/reader/v3/10yuan.png') no-repeat;
+      background-size: cover;
 
-          .payLeft {
-              color: #7D320A;
-              font-size: 36rpx;
-              font-weight: bold;
-          }
+      .payLeft {
+        color: #7D320A;
+        font-size: 36rpx;
+        font-weight: bold;
+      }
 
-          .buyBtn {
-              border: 1rpx solid white;
-              color: white;
-              background-color: #7D320A;
-          }
+      .buyBtn {
+        border: 1rpx solid white;
+        color: white;
+        background-color: #7D320A;
       }
+    }
   }
 
-  .surplus {
-      margin-top: 20rpx;
-      padding: 22rpx 30rpx;
-      background-color: white;
-      border-radius: 20rpx;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      font-size: 32rpx;
+  .bindNumber {
+    padding: 22rpx 30rpx;
+    margin-top: 20rpx;
+    display: flex;
+    align-items: center;
+    background: url('http://reader-wx.ai160.com/images/reader/v3/year.png') no-repeat;
+    background-size: cover;
+    border-radius: 20rpx;
 
-      .title {
-          font-size: 34rpx;
-          font-weight: bold;
-          color: #000;
-      }
+    .desc {
+      color: white;
+    }
 
-      .num {
-          color: #F97419;
-          font-weight: bold;
-          margin-right: 10rpx;
-      }
   }
 
-  .taskBox {
-      margin-top: 20rpx;
-      padding: 20rpx 10rpx 0rpx;
-      background-color: white;
-      border-radius: 20rpx;
-
-      .title {
-          padding: 0rpx 20rpx;
-          font-size: 34rpx;
-          font-weight: bold;
-          color: #000;
-      }
+  .surplus {
+    margin-top: 20rpx;
+    padding: 22rpx 30rpx;
+    background-color: white;
+    border-radius: 20rpx;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 32rpx;
+
+    .title {
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #000;
+    }
+
+    .num {
+      color: #F97419;
+      font-weight: bold;
+      margin-right: 10rpx;
+    }
+  }
 
-      .task {
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 30rpx 22rpx;
-          border-bottom: 1px solid #EAEAEA;
-
-          .taskLeft {
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-
-              .img {
-                  width: 76rpx;
-                  height: 76rpx;
-                  border-radius: 50%;
-              }
-
-              .taskContent {
-                  margin-left: 40rpx;
-
-                  .tcTitle {
-                      font-size: 30rpx;
-                      font-weight: bold;
-                      color: #333;
-                  }
-
-                  .tcNum {
-                      color: #FF6259;
-                      font-size: 26rpx;
-                  }
-              }
+  .taskBox {
+    margin-top: 20rpx;
+    padding: 20rpx 10rpx 0rpx;
+    background-color: white;
+    border-radius: 20rpx;
+
+    .title {
+      padding: 0rpx 20rpx;
+      font-size: 34rpx;
+      font-weight: bold;
+      color: #000;
+    }
+
+    .task {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 30rpx 22rpx;
+      border-bottom: 1px solid #EAEAEA;
+
+      .taskLeft {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        .img {
+          width: 76rpx;
+          height: 76rpx;
+          border-radius: 50%;
+        }
+
+        .taskContent {
+          margin-left: 40rpx;
+
+          .tcTitle {
+            font-size: 30rpx;
+            font-weight: bold;
+            color: #333;
           }
 
-          .taskRight {
-              width: 138rpx;
-              text-align: center;
-              padding: 10rpx 0rpx;
-              border-radius: 40rpx;
-              color: white;
-              background-color: #FC614E;
-              font-size: 30rpx;
+          .tcNum {
+            color: #FF6259;
+            font-size: 26rpx;
           }
+        }
+      }
 
-          .taskRight-close {
-              color: #6C6C6C;
-              background: #D0D0D0;
-              box-shadow: 0 2px 2px 0 #AEABAB;
-          }
+      .taskRight {
+        width: 138rpx;
+        text-align: center;
+        padding: 10rpx 0rpx;
+        border-radius: 40rpx;
+        color: white;
+        background-color: #FC614E;
+        font-size: 30rpx;
+      }
 
-          .taskSurplus {
-              text-align: center;
-              margin-top: 4rpx;
-              color: #686868;
-              font-size: 20rpx;
-          }
+      .taskRight-close {
+        color: #6C6C6C;
+        background: #D0D0D0;
+        box-shadow: 0 2px 2px 0 #AEABAB;
       }
 
-      .advert {
-          border: none;
+      .taskSurplus {
+        text-align: center;
+        margin-top: 4rpx;
+        color: #686868;
+        font-size: 20rpx;
       }
+    }
+
+    .advert {
+      border: none;
+    }
   }
 
   .share_cancel {
-      position: absolute;
-      left: 0px;
-      right: 0px;
-      margin: auto;
-      top: -64rpx;
-      width: 60rpx;
-      height: 60rpx;
+    position: absolute;
+    left: 0px;
+    right: 0px;
+    margin: auto;
+    top: -64rpx;
+    width: 60rpx;
+    height: 60rpx;
   }
 }

components/readingTips/index.wxml

@@ -1,11 +1,12 @@
 <view class="half-screen">
   <!--屏幕背景变暗的背景  -->
-  <view class="background_screen" bindtap="hideModal" wx:if="{{showModalStatus}}"></view>
+  <view class="background_screen" bindtap="hideModal"></view>
   <!--弹出框  -->
-  <view animation="{{animationData}}" class="attr_box" wx:if="{{showModalStatus}}">
+  <!--  wx:if="{{showModalStatus}}" -->
+  <view animation="{{animationData}}" class="attr_box">
     <image class="share_cancel" bindtap="hideModal" src="/static/lollipop.png"></image>
     <!-- 支付 -->
-    <view class="payBox" wx:if="{{!isIos}}">
+    <view class="payBox">
       <view class="title">
         付费购
       </view>
@@ -31,6 +32,10 @@
         </view>
       </view>
     </view>
+    <view class="bindNumber">
+      <view class="desc">绑定手机号赠送7天VIP</view>
+      <view class="bindBtn">立即绑定</view>
+    </view>
     <!-- 剩余使用次数 -->
     <view class="surplus">
       <view class="title">剩余使用次数：</view>
@@ -46,20 +51,6 @@
             <view class="tcTitle">
               {{tasks[0].title}}
             </view>
-            <view class="tcNum">+{{tasks[0].award}}天VIP</view>
-          </view>
-        </view>
-        <view class="taskRight {{tasks[0].completed?'taskRight-close':''}}" bindtap="submitTask"
-          data-type='{{tasks[0].id}}'>
-          {{tasks[0].completed?'已绑定':'绑定'}}</view>
-      </view>
-      <view class="task">
-        <view class="taskLeft">
-          <image class="img" src="/static/task1.png" alt="" mode="" />
-          <view class="taskContent">
-            <view class="tcTitle">
-              {{tasks[0].title}}
-            </view>
             <view class="tcNum">+{{tasks[0].award}}次</view>
           </view>
         </view>

components/readingTips/index.wxss

@@ -93,6 +93,18 @@
   color: white;
   background-color: #7D320A;
 }
+.attr_box .bindNumber {
+  padding: 22rpx 30rpx;
+  margin-top: 20rpx;
+  display: flex;
+  align-items: center;
+  background: url('http://reader-wx.ai160.com/images/reader/v3/year.png') no-repeat;
+  background-size: cover;
+  border-radius: 20rpx;
+}
+.attr_box .bindNumber .desc {
+  color: white;
+}
 .attr_box .surplus {
   margin-top: 20rpx;
   padding: 22rpx 30rpx;

custom-tab-bar/index.wxml

@@ -1,7 +1,7 @@
 <view class="tab-bar">
   <view wx:for="{{listTab}}" wx:key="index" class="tab-bar-item" data-path="{{item.pagePath}}" data-index="{{index}}"
     bindtap="switchTab">
-    <view class="noticeTips" wx:if="{{item.pagePath=='/pages/my/index'}}">31</view>
+    <!-- <view class="noticeTips" wx:if="{{item.pagePath=='/pages/my/index'}}">31</view> -->
     <image src="{{selected === index ? item.selectedIconPath : item.iconPath}}"></image>
     <view style="color: {{selected === index ? selectedColor : color}}">{{item.text}}</view>
   </view>

pages/editUser/index.wxml

@@ -62,15 +62,6 @@
       <image class='black' src='/static/black.png'></image>
     </view>
   </view>
-  <!-- <view class="editRow mt40">
-    <view class="name">绑定手机</view>
-    <view class="right">
-      <view class="name">
-        手机号
-      </view>
-      <image class='black' src='/static/black.png'></image>
-    </view>
-  </view> -->
   <!--    <view class="switchAccount mt40">
         切换账号
     </view> -->

pages/match/index.less

@@ -7,22 +7,11 @@
     height: 216rpx;
   }
 
-  .rule {
-    position: absolute;
-    padding: 6rpx 10rpx 6rpx 24rpx;
-    right: 0rpx;
-    top: 20rpx;
-    font-size: 26rpx;
-    border-top-left-radius: 25rpx;
-    border-bottom-left-radius: 25rpx;
-    color: white;
-    background-color: rgba(0, 0, 0, 0.4);
-  }
-
+ 
   .kaka {
     position: fixed;
     right: 10rpx;
-    top: 150rpx;
+    top: 220rpx;
     width: 120rpx;
     height: 120rpx;
     z-index: 3;

pages/match/index.wxml

@@ -1,10 +1,7 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 <navigationBar bind:reload='reload' showNav="{{false}}"></navigationBar>
 <view class="matchBox">
-  <image src="http://reader-wx.ai160.com/images/reader/v3/enter_banner.jpg" class="headerImg" />
-  <view class="rule" bindtap="jumpIntro">
-    比赛规则
-  </view>
+  <image src="http://reader-wx.ai160.com/images/reader/v3/enter_banner.jpg" class="headerImg" bindtap="jumpIntro"/>
   <button class="resetBtn" style="border: none;" open-type="contact" plain="true">
     <image src="/static/kaka.png" class="kaka" />
   </button>

pages/match/index.wxss

@@ -6,21 +6,10 @@
   width: 100%;
   height: 216rpx;
 }
-.matchBox .rule {
-  position: absolute;
-  padding: 6rpx 10rpx 6rpx 24rpx;
-  right: 0rpx;
-  top: 20rpx;
-  font-size: 26rpx;
-  border-top-left-radius: 25rpx;
-  border-bottom-left-radius: 25rpx;
-  color: white;
-  background-color: rgba(0, 0, 0, 0.4);
-}
 .matchBox .kaka {
   position: fixed;
   right: 10rpx;
-  top: 150rpx;
+  top: 220rpx;
   width: 120rpx;
   height: 120rpx;
   z-index: 3;

pages/my/index.wxml

@@ -42,7 +42,7 @@
         <text class="title">作品 {{1234}}</text>
       </view>
       <view class="sBox" bindtap='jump' data-url="/pages/notice/index">
-        <view class="noticeTips">31</view>
+        <!-- <view class="noticeTips">31</view> -->
         <image class="img" src="/static/message.png" mode="" />
         <text class="title">消息通知</text>
       </view>
@@ -59,7 +59,7 @@
     会员至：{{filters.formatDate(vipTime,4)}}
   </view>
   <!-- 勋章 -->
-  <view class="medalBox">
+  <!--   <view class="medalBox">
     <view class="header">
       <view class="title">我的勋章</view>
       <view class="jump" bindtap='jump' data-url="/pages/medalStore/index">查看全部
@@ -69,7 +69,7 @@
     <view class="body">
       <image src="/static/concern.png" class="medal" wx:for="{{5}}" wx:key="index" />
     </view>
-  </view>
+  </view> -->
   <!-- 支付 -->
   <view class="payBox" wx:if="{{!isIos}}">
     <view class="title">

pages/pkPage/index.js

@@ -18,6 +18,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    console.log(options, 'options');
     let videoId = options.videoId
     this.setData({
       videoId,

pages/reading/index.js

@@ -667,6 +667,7 @@ Page({
                         }
                       }
                       setTimeout(() => {
+                        console.log(wx.getStorageSync('shareVideoId'),'reading-wx.getStorageSync');
                         wx.canvasToTempFilePath({
                           canvas: canvas,
                           success(res) {

pages/score/index.js

@@ -143,6 +143,7 @@ Page({
                         }
                       }
                       setTimeout(() => {
+                        console.log(wx.getStorageSync('shareVideoId'), 'reading-wx.score');
                         wx.canvasToTempFilePath({
                           canvas: canvas,
                           success(res) {
@@ -195,6 +196,7 @@ Page({
                       wx.canvasToTempFilePath({
                         canvas: canvas,
                         success(res) {
+                          console.log(wx.getStorageSync('shareVideoId'), 'reading-wx.score2');
                           resolve({
                             title: '我的新作品发布啦，快来捧场点赞！',
                             path: `/pages/pkPage/index?videoId=${wx.getStorageSync('shareVideoId')}&uid=${wx.getStorageSync('uid')}&isShare=true`,

utils/request.js

@@ -6,12 +6,12 @@ const {
     envVersion
   }
 } = wx.getAccountInfoSync();
-// if (envVersion == 'develop') {
-baseUrl = 'https://reader-api.efunbox.cn/wx'
-oldUrl = 'https://reader-api.efunbox.cn'
-// } else {
-//   baseUrl = 'https://reader-api.ai160.com/wx'
-//   oldUrl = 'https://reader-api.ai160.com'
+/* if (envVersion == 'develop') {
+  baseUrl = 'https://reader-api.efunbox.cn/wx'
+  oldUrl = 'https://reader-api.efunbox.cn'
+} else { */
+  baseUrl = 'https://reader-api.ai160.com/wx'
+  oldUrl = 'https://reader-api.ai160.com'
 // }
 
 function request(url, method, data, oldBaseUrl = false) {