页面优化2

496_dongfengqichen/pages/guessPrize/guessPrize.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "猜出惊喜",
+  "disableScroll":true,
   "usingComponents": {
     "tabBar": "../component/tabBar/index",
     "yuyue": "/pages/yuyue/yuyue"

496_dongfengqichen/pages/guessPrize/guessPrize.wxml

@@ -1,7 +1,7 @@
 <!--pages/guessPrize/guessPrize.wxml-->
 <view class="all">
   <view class="main" style="overflow:{{slideState?'hidden':'auto'}};">
-    <image class="pageBg" src="{{imgUrl+'/versions/20.png'}}"></image>
+    <image class="pageBg" src="{{imgUrl+'/versions/20.png?v=002'}}"></image>
     <image class="ruleBtn" bindtap="ruleControl" src="{{imgUrl+'/versions/7.png'}}"></image>
     <image class="versions-14" src="{{imgUrl+'/versions/14.png'}}"></image>
     <image class="versions-15" src="{{imgUrl+'/versions/15.png'}}"></image>

496_dongfengqichen/pages/guessPrize/guessPrize.wxss

@@ -15,7 +15,7 @@ view{
   left: 0;
   bottom: 0;
   width: 750rpx;
-  height: 1388rpx;
+  height: 1506rpx;
   z-index: -1;
 }
 .ruleBtn{

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -50,7 +50,12 @@ Page({
       page:1,
       count:20
     },
+    parames2:{
+      page:1,
+      count:20
+    },
     noData:false,
+    noData2:false,
     optionsData:null,
     lookDescId: null,
     agreement: false,//是否显示协议
@@ -353,9 +358,12 @@ Page({
     if (e.currentTarget.dataset.value == 1) {
       this.getFriendBuCarNum();
     } else if (e.currentTarget.dataset.value == 2) {
+      this.data.parames2.page = 1;
+      this.data.noData2 = false;
       this.getMyAwardList();
     } else if (e.currentTarget.dataset.value == 3){
-      this.data.parames.page = 0;
+      this.data.parames.page = 1;
+      this.data.noData = false;
       this.setData({
         parames: this.data.parames,
         shareFriendList:[]
@@ -388,6 +396,8 @@ Page({
       recordList:[],
       recordNow: e.currentTarget.dataset.type
     })
+    this.data.parames2.page = 1;
+    this.data.noData2 = false;
     this.getMyAwardList();
   },
   getUserLocation: function (e) {
@@ -732,6 +742,13 @@ Page({
       this.getShareList();
     }
   },
+  scrolltolower2:function(){
+    console.log(this.data.noData2);
+    if(!this.data.noData2){
+      this.data.parames2.page+=1;
+      this.getMyAwardList();
+    }
+  },
   getMyAwardList: function () {//获取获奖记录
     this.setData({
       getState:true
@@ -739,7 +756,8 @@ Page({
     wx.showLoading({
       title: '获取数据中'
     })
-    app.wxRequest(app.globalData.urlRoot + "award/getMyAwardList", { awardSource: this.data.recordNow }, res => {
+    this.data.parames2.awardSource = this.data.recordNow;
+    app.wxRequest(app.globalData.urlRoot + "award/getMyAwardList", this.data.parames2, res => {
       wx.hideLoading();
       if(res.code == 200){
         // res.data[0].awardState = 0;
@@ -755,9 +773,22 @@ Page({
         //   couponCode:"450610985",
         //   productId:0
         // }]
+        // if(this.data.parames2.page<3){
+        //   for(let i=0;i<20;i++){
+        //     res.data.push(res.data[0])
+        //   }
+        // }
+        for(let i=0;i<res.data.length;i++){
+          this.data.recordList.push(res.data[i]);
+        }
         this.setData({
-          recordList:res.data
+          recordList: this.data.recordList
         })
+        if (res.data.length<this.data.parames2.count){
+          this.setData({
+            noData2: true
+          })
+        }
       }
       this.setData({
         getState: false
@@ -801,6 +832,8 @@ Page({
       this.getAddress();
     }
     if(this.data.selectNow==2 && this.data.recordNow == 1 && !this.data.addressShow){
+      this.data.parames2.page = 1;
+      this.data.noData2 = false;
       this.getMyAwardList();
     }
   },

496_dongfengqichen/pages/myCenter/myCenter.wxml

@@ -113,39 +113,27 @@
         <!-- <view bindtap="selectRecord" data-type='2' class="taskText recordText {{recordNow==2?'taskText2':''}}">每日任务奖品</view> -->
         <view bindtap="selectRecord" data-type='3' class="taskText recordText {{recordNow==3?'taskText2':''}}">星探奖励</view>
       </view>
-      <view class="recordFrame">
+      <!-- <view class="recordFrame"> -->
+      <scroll-view class="recordFrame" wx:if="{{recordList.length}}" scroll-y bindscrolltolower="scrolltolower2">
         <image class="newImages1" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages3/16.png'}}"></image>
         <image class="newImages2-64" bindtap="enterLucky" wx:if="{{!recordList.length && recordNow==1 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         <image class="newImages5" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/65.png'}}"></image>
         <image class="newImages6" bindtap="enterEvery" wx:if="{{!recordList.length && recordNow==2 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
         <image class="newImages8" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages3/19.png'}}"></image>
         <image class="newImages6" bindtap="starGo" wx:if="{{!recordList.length && recordNow==3 && !getState}}" src="{{imgUrl+'/newImages2/64.png'}}"></image>
-        <view class="recordGroup" wx:if="{{recordList.length}}" wx:for="{{recordList}}" wx:key="index">
-          <view class="recordGroupLeft">
-            <!-- <view class="recordHeadGroup">
-              <image class="recordUserImg" src="{{userData.avatarUrl?userData.avatarUrl:imgUrl+'/images/defaultHead.png'}}"></image>
-            </view> -->
-            <image class="awardPicurl" mode="aspectFit" src="{{item.awardPicurl}}"></image>
-            <view class="recordMainGroup" style="width:230rpx;">
-              <view class="rewardName">{{item.awardName}}</view>
-              <view class="rewardTerm">{{item.cdate}}</view>
-            </view>
-          </view>
-          <image class="lookDetail" bindtap="lookDesc" data-index="{{index}}" src="{{imgUrl+'/newImages3/34.png'}}"></image>
-          <!-- <view class="recordPic">
-            <image class="recordTip" bindtap="lookDesc" data-value="{{index}}" src="{{imgUrl+'/images/recordTip.png'}}"></image> 
-            <image wx:if="{{item.awardId!=1 && recordNow!=3}}" class="rewardIcon" mode="aspectFit" src="{{item.awardPicurl}}"></image>
-            <image wx:if="{{item.awardId!=1 && recordNow==3}}" class="luckyClaw" mode="aspectFit" src="{{item.awardPicurl}}"></image>
-            <view class="rewardCash" wx:if="{{item.awardId==1}}">
-              <view class="cashGroup">
-                <view class="cashNum">{{item.awardMoney}}</view>
-                <view class="cashCompany">元</view>
+        
+          <view class="recordGroup" wx:if="{{recordList.length}}" wx:for="{{recordList}}" wx:key="index">
+            <view class="recordGroupLeft">
+              <image class="awardPicurl" mode="aspectFit" src="{{item.awardPicurl}}"></image>
+              <view class="recordMainGroup" style="width:230rpx;">
+                <view class="rewardName">{{item.awardName}}</view>
+                <view class="rewardTerm">{{item.cdate}}</view>
               </view>
-              <view class="rewardCashText">购车红包</view>
             </view>
-          </view> -->
-        </view>
-      </view>
+            <image class="lookDetail" bindtap="lookDesc" data-index="{{index}}" src="{{imgUrl+'/newImages3/34.png'}}"></image>
+          </view>
+        </scroll-view>
+      <!-- </view> -->
     </view>
     <view class="ranksGroup" wx:if="{{selectNow==3}}">
       <image class="newImages3" wx:if="{{!shareFriendList.length && !getFriendListState}}" src="{{imgUrl+'/newImages3/18.png'}}"></image>

496_dongfengqichen/pages/poster/poster.js

@@ -51,7 +51,7 @@ Page({
         this.data.windowH = option.windowHeight;
         for (let i = 0; i < 3; i++) {
           wx.getImageInfo({//缓存海报背景
-            src: this.data.imgUrl + '/newImages3/tempImg'+(i+1)+'.jpg?v=007',
+            src: this.data.imgUrl + '/newImages3/tempImg'+(i+1)+'.jpg?v=008',
             success: res => {
               this.data.posterBg[i] = res.path;
             }

496_dongfengqichen/pages/poster/poster.wxml

@@ -18,7 +18,7 @@
           <swiper-item wx:for="{{3}}" wx:key="index">
             <view class="selectTempFrame {{index==swiperCurrent?'selectTempFrameBorder':''}}">
               <view class="imgGroup">
-                <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/tempImg'+(index+1)+'.jpg?v=004'}}"></image>
+                <image style="width:100%;height:100%;" src="{{imgUrl+'/newImages3/tempImg'+(index+1)+'.jpg?v=006'}}"></image>
                 <view class="userMsg">
                   <image class="userHead" src="{{userHead}}"></image>
                   <!-- <image class="userHead" src="{{imgUrl+'/images/posterChoose.png'}}"></image> -->
@@ -61,7 +61,7 @@
     <view wx:if="{{selectType==2}}">
       <view class="shareGroup">
        <image class="newImages19" src="{{imgUrl+'/newImages/19.png'}}"></image>
-       <image class="posterShareImg" src="{{imgUrl+'/newImages3/28_' + (swiperCurrent+1)+'.png?v=004'}}"></image>
+       <image class="posterShareImg" src="{{imgUrl+'/newImages3/28_' + (swiperCurrent+1)+'.png?v=005'}}"></image>
       </view>
       <view class="newImages20">
         <image class="newImages3-10" src="{{imgUrl+'/newImages3/10.png'}}"></image>