Showing
22 changed files
with
194 additions
and
87 deletions
| @@ -14,6 +14,7 @@ Page({ | @@ -14,6 +14,7 @@ Page({ | ||
| 14 | index1: '', | 14 | index1: '', |
| 15 | num: '', | 15 | num: '', |
| 16 | list: [], | 16 | list: [], |
| 17 | + animate: 'zoomIn animated', | ||
| 17 | con: [ | 18 | con: [ |
| 18 | { | 19 | { |
| 19 | name: '按时间', | 20 | name: '按时间', |
| @@ -216,7 +217,8 @@ Page({ | @@ -216,7 +217,8 @@ Page({ | ||
| 216 | var con = that.data.con | 217 | var con = that.data.con |
| 217 | var index = e.currentTarget.dataset.index | 218 | var index = e.currentTarget.dataset.index |
| 218 | that.setData({ | 219 | that.setData({ |
| 219 | - index1: index | 220 | + index1: index, |
| 221 | + animate:'' | ||
| 220 | }) | 222 | }) |
| 221 | console.log('this', this) | 223 | console.log('this', this) |
| 222 | if (this.data.currentTab === e.target.dataset.index) { | 224 | if (this.data.currentTab === e.target.dataset.index) { |
| @@ -250,7 +252,8 @@ Page({ | @@ -250,7 +252,8 @@ Page({ | ||
| 250 | that.setData({ | 252 | that.setData({ |
| 251 | // con: res.data.data | 253 | // con: res.data.data |
| 252 | list: res.data.data, | 254 | list: res.data.data, |
| 253 | - num: res.data.data.length | 255 | + num: res.data.data.length, |
| 256 | + animate:'zoomIn animated' | ||
| 254 | }) | 257 | }) |
| 255 | } | 258 | } |
| 256 | }) | 259 | }) |
| @@ -279,7 +282,8 @@ Page({ | @@ -279,7 +282,8 @@ Page({ | ||
| 279 | that.setData({ | 282 | that.setData({ |
| 280 | // con: res.data.data | 283 | // con: res.data.data |
| 281 | list: res.data.data, | 284 | list: res.data.data, |
| 282 | - num: res.data.data.length | 285 | + num: res.data.data.length, |
| 286 | + animate:'zoomIn animated' | ||
| 283 | }) | 287 | }) |
| 284 | } | 288 | } |
| 285 | }) | 289 | }) |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view wx:if="{{list}}"> | 3 | <view wx:if="{{list}}"> |
| 4 | <view class="content2"> | 4 | <view class="content2"> |
| 5 | <block wx:for="{{list}}"> | 5 | <block wx:for="{{list}}"> |
| 6 | - <view class="li"> | 6 | + <view class="li {{animate}}"> |
| 7 | <navigator url='../academic/academic?id={{item.id}}'> | 7 | <navigator url='../academic/academic?id={{item.id}}'> |
| 8 | <view class="bg"> | 8 | <view class="bg"> |
| 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> | 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> |
| @@ -263,4 +263,24 @@ page { | @@ -263,4 +263,24 @@ page { | ||
| 263 | text-align: center; | 263 | text-align: center; |
| 264 | color: #7a838c; | 264 | color: #7a838c; |
| 265 | margin-top: 25rpx; | 265 | margin-top: 25rpx; |
| 266 | +} | ||
| 267 | + | ||
| 268 | + | ||
| 269 | +.animated { | ||
| 270 | + animation-duration: 1s; | ||
| 271 | + animation-fill-mode: both; | ||
| 272 | +} | ||
| 273 | +@keyframes zoomIn { | ||
| 274 | + from { | ||
| 275 | + opacity: 0; | ||
| 276 | + } | ||
| 277 | + 50% { | ||
| 278 | + opacity: .4; | ||
| 279 | + } | ||
| 280 | + 100% { | ||
| 281 | + opacity: 1; | ||
| 282 | + } | ||
| 283 | +} | ||
| 284 | +.zoomIn { | ||
| 285 | + animation-name: zoomIn; | ||
| 266 | } | 286 | } |
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <view wx:if="{{list}}"> | 2 | <view wx:if="{{list}}"> |
| 3 | <view class="content2"> | 3 | <view class="content2"> |
| 4 | <block wx:for="{{list}}"> | 4 | <block wx:for="{{list}}"> |
| 5 | - <view class="li"> | 5 | + <view class="li zoomIn animated"> |
| 6 | <navigator url="../../xzpxdetail/xzpxdetail?id={{item.content.id}}"> | 6 | <navigator url="../../xzpxdetail/xzpxdetail?id={{item.content.id}}"> |
| 7 | <view class="bg"> | 7 | <view class="bg"> |
| 8 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> | 8 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> |
| @@ -256,4 +256,22 @@ page{ | @@ -256,4 +256,22 @@ page{ | ||
| 256 | text-align: center; | 256 | text-align: center; |
| 257 | color: #7a838c; | 257 | color: #7a838c; |
| 258 | margin-top: 25rpx; | 258 | margin-top: 25rpx; |
| 259 | +} | ||
| 260 | + | ||
| 261 | + | ||
| 262 | +.animated { | ||
| 263 | + animation-duration: 1s; | ||
| 264 | + animation-fill-mode: both; | ||
| 265 | +} | ||
| 266 | + | ||
| 267 | +@keyframes zoomIn { | ||
| 268 | + from { | ||
| 269 | + opacity: 0; | ||
| 270 | + } | ||
| 271 | + 100% { | ||
| 272 | + opacity: 1; | ||
| 273 | + } | ||
| 274 | +} | ||
| 275 | +.zoomIn { | ||
| 276 | + animation-name: zoomIn; | ||
| 259 | } | 277 | } |
| 1 | <view style="font-size:28rpx;"> | 1 | <view style="font-size:28rpx;"> |
| 2 | - <view style='height:112rpx;'></view> | 2 | + <view style='height:104rpx;'></view> |
| 3 | <view wx:if="{{list}}"> | 3 | <view wx:if="{{list}}"> |
| 4 | <view class="content2"> | 4 | <view class="content2"> |
| 5 | <block wx:for="{{list}}"> | 5 | <block wx:for="{{list}}"> |
| 6 | <view class="li"> | 6 | <view class="li"> |
| 7 | - <view wx:if="{{item.type == 'job_fair'}}"> | 7 | + <view wx:if="{{item.type == 'job_fair'}}" class="zoomIn animated"> |
| 8 | <navigator url="../../jobfairdetail/jobfairdetail?id={{item.content.id}}"> | 8 | <navigator url="../../jobfairdetail/jobfairdetail?id={{item.content.id}}"> |
| 9 | <view class="bg"> | 9 | <view class="bg"> |
| 10 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> | 10 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | </view> | 23 | </view> |
| 24 | </navigator> | 24 | </navigator> |
| 25 | </view> | 25 | </view> |
| 26 | - <view wx:if="{{item.type == 'academic_conference'}}"> | 26 | + <view wx:if="{{item.type == 'academic_conference'}}" class="zoomIn animated"> |
| 27 | <navigator url="../../academic/academic?id={{item.content.id}}"> | 27 | <navigator url="../../academic/academic?id={{item.content.id}}"> |
| 28 | <view class="bg"> | 28 | <view class="bg"> |
| 29 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> | 29 | <image src='{{item.content.listImage[0].url}}' mode='widthFix'></image> |
| @@ -102,6 +102,9 @@ page { | @@ -102,6 +102,9 @@ page { | ||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | .aaa { | 104 | .aaa { |
| 105 | + padding-bottom:30rpx; | ||
| 106 | + padding-right:45rpx; | ||
| 107 | + border-bottom:8rpx solid #5c5c5c; | ||
| 105 | float: left; | 108 | float: left; |
| 106 | margin-left: 30%; | 109 | margin-left: 30%; |
| 107 | } | 110 | } |
| @@ -112,7 +115,7 @@ page { | @@ -112,7 +115,7 @@ page { | ||
| 112 | 115 | ||
| 113 | .content3 .connum { | 116 | .content3 .connum { |
| 114 | color: #5c5c5c; | 117 | color: #5c5c5c; |
| 115 | - margin-left: 15rpx; | 118 | + margin-left: -30rpx; |
| 116 | float: left; | 119 | float: left; |
| 117 | background:#fff; | 120 | background:#fff; |
| 118 | border-radius: 50%; | 121 | border-radius: 50%; |
| @@ -126,17 +129,23 @@ page { | @@ -126,17 +129,23 @@ page { | ||
| 126 | 129 | ||
| 127 | .content3 .li { | 130 | .content3 .li { |
| 128 | float: left; | 131 | float: left; |
| 129 | - padding-bottom:30rpx; | ||
| 130 | - padding-top:30rpx; | ||
| 131 | - border-bottom:8rpx solid #5c5c5c; | 132 | + margin-top:30rpx; |
| 132 | font-size: 28rpx; | 133 | font-size: 28rpx; |
| 133 | width: 49%; | 134 | width: 49%; |
| 134 | text-align: center; | 135 | text-align: center; |
| 136 | + position:relative; | ||
| 135 | } | 137 | } |
| 136 | 138 | ||
| 137 | -.content3 .li:nth-child(1) { | ||
| 138 | - width: 50%; | ||
| 139 | - border-right: #fff solid 2rpx; | 139 | +.content3 .li:first-child:after { |
| 140 | + content:''; | ||
| 141 | + background-color:#ffffff; | ||
| 142 | + display:block; | ||
| 143 | + position:absolute; | ||
| 144 | + width:2rpx; | ||
| 145 | + right:-1rpx; | ||
| 146 | + bottom:38rpx; | ||
| 147 | + top:0; | ||
| 148 | + margin-left:-1rpx; | ||
| 140 | } | 149 | } |
| 141 | 150 | ||
| 142 | .content3 .li text { | 151 | .content3 .li text { |
| @@ -289,4 +298,22 @@ page { | @@ -289,4 +298,22 @@ page { | ||
| 289 | text-align: center; | 298 | text-align: center; |
| 290 | color: #7a838c; | 299 | color: #7a838c; |
| 291 | margin-top: 25rpx; | 300 | margin-top: 25rpx; |
| 301 | +} | ||
| 302 | + | ||
| 303 | + | ||
| 304 | +.animated { | ||
| 305 | + animation-duration: 1s; | ||
| 306 | + animation-fill-mode: both; | ||
| 307 | +} | ||
| 308 | + | ||
| 309 | +@keyframes zoomIn { | ||
| 310 | + from { | ||
| 311 | + opacity: 0; | ||
| 312 | + } | ||
| 313 | + 100% { | ||
| 314 | + opacity: 1; | ||
| 315 | + } | ||
| 316 | +} | ||
| 317 | +.zoomIn { | ||
| 318 | + animation-name: zoomIn; | ||
| 292 | } | 319 | } |
| @@ -38,7 +38,6 @@ Page({ | @@ -38,7 +38,6 @@ Page({ | ||
| 38 | 38 | ||
| 39 | // var skey = wx.getStorageSync('skey') | 39 | // var skey = wx.getStorageSync('skey') |
| 40 | var skey = wx.getStorageSync('key') | 40 | var skey = wx.getStorageSync('key') |
| 41 | - console.log('skey', skey) | ||
| 42 | that.setData({ | 41 | that.setData({ |
| 43 | skey: skey | 42 | skey: skey |
| 44 | }) | 43 | }) |
| @@ -57,10 +56,8 @@ Page({ | @@ -57,10 +56,8 @@ Page({ | ||
| 57 | // id:'1' | 56 | // id:'1' |
| 58 | }, | 57 | }, |
| 59 | success: function (res) { | 58 | success: function (res) { |
| 60 | - console.log('res',res) | ||
| 61 | that.setData({ | 59 | that.setData({ |
| 62 | list: that.data.list.concat(res.data.data), | 60 | list: that.data.list.concat(res.data.data), |
| 63 | - | ||
| 64 | getlist: res.data.data, | 61 | getlist: res.data.data, |
| 65 | // con: res.data.data[].content | 62 | // con: res.data.data[].content |
| 66 | }) | 63 | }) |
| @@ -131,7 +128,6 @@ Page({ | @@ -131,7 +128,6 @@ Page({ | ||
| 131 | var that = this | 128 | var that = this |
| 132 | var list = that.data.list | 129 | var list = that.data.list |
| 133 | var con = that.data.con | 130 | var con = that.data.con |
| 134 | - console.log('this', this) | ||
| 135 | if (this.data.currentTab === e.target.dataset.index) { | 131 | if (this.data.currentTab === e.target.dataset.index) { |
| 136 | return false; | 132 | return false; |
| 137 | } else { | 133 | } else { |
| @@ -165,7 +161,6 @@ Page({ | @@ -165,7 +161,6 @@ Page({ | ||
| 165 | // id:'1' | 161 | // id:'1' |
| 166 | }, | 162 | }, |
| 167 | success: function (res) { | 163 | success: function (res) { |
| 168 | - console.log('con', res.data) | ||
| 169 | if (index == 0) { | 164 | if (index == 0) { |
| 170 | that.setData({ | 165 | that.setData({ |
| 171 | list: res.data.data | 166 | list: res.data.data |
| @@ -189,7 +184,6 @@ Page({ | @@ -189,7 +184,6 @@ Page({ | ||
| 189 | // id:'1' | 184 | // id:'1' |
| 190 | }, | 185 | }, |
| 191 | success: function (res) { | 186 | success: function (res) { |
| 192 | - console.log('con111', res.data) | ||
| 193 | if (index == 1) { | 187 | if (index == 1) { |
| 194 | that.setData({ | 188 | that.setData({ |
| 195 | list: res.data.data | 189 | list: res.data.data |
| @@ -237,7 +231,6 @@ Page({ | @@ -237,7 +231,6 @@ Page({ | ||
| 237 | var skey = that.data.skey | 231 | var skey = that.data.skey |
| 238 | var index = e.target.dataset.current | 232 | var index = e.target.dataset.current |
| 239 | var id = e.target.dataset.id | 233 | var id = e.target.dataset.id |
| 240 | - console.log("id", id) | ||
| 241 | wx.request({ | 234 | wx.request({ |
| 242 | url: app.url + '/mpapi/1.0.0/job-opportunities?city=&offset=&limit=', | 235 | url: app.url + '/mpapi/1.0.0/job-opportunities?city=&offset=&limit=', |
| 243 | method: 'GET', | 236 | method: 'GET', |
| @@ -253,7 +246,6 @@ Page({ | @@ -253,7 +246,6 @@ Page({ | ||
| 253 | // id:'1' | 246 | // id:'1' |
| 254 | }, | 247 | }, |
| 255 | success: function (res) { | 248 | success: function (res) { |
| 256 | - console.log('con222222', res.data) | ||
| 257 | that.setData({ | 249 | that.setData({ |
| 258 | getlist: res.data.data | 250 | getlist: res.data.data |
| 259 | // con: res.data.data | 251 | // con: res.data.data |
| @@ -276,7 +268,6 @@ Page({ | @@ -276,7 +268,6 @@ Page({ | ||
| 276 | // id:'1' | 268 | // id:'1' |
| 277 | }, | 269 | }, |
| 278 | success: function (res) { | 270 | success: function (res) { |
| 279 | - console.log('con1111111', res.data) | ||
| 280 | that.setData({ | 271 | that.setData({ |
| 281 | getlist: res.data.data | 272 | getlist: res.data.data |
| 282 | // con: res.data.data | 273 | // con: res.data.data |
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | <view class="{{block3 ? 'block' : 'hide'}} bottt" bindtap='gethide'></view> | 11 | <view class="{{block3 ? 'block' : 'hide'}} bottt" bindtap='gethide'></view> |
| 12 | <view class="getlist {{block3 ? 'block' : 'hide'}}"> | 12 | <view class="getlist {{block3 ? 'block' : 'hide'}}"> |
| 13 | <block wx:for="{{list}}"> | 13 | <block wx:for="{{list}}"> |
| 14 | - <view class="ol "> | 14 | + <view class="ol"> |
| 15 | <navigator bindtap='getJobOpportunities' data-id='{{item.id}}'>{{item.name}}</navigator> | 15 | <navigator bindtap='getJobOpportunities' data-id='{{item.id}}'>{{item.name}}</navigator> |
| 16 | </view> | 16 | </view> |
| 17 | </block> | 17 | </block> |
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | <view wx:if='{{list}}'> | 20 | <view wx:if='{{list}}'> |
| 21 | <view class="content"> | 21 | <view class="content"> |
| 22 | <block wx:for="{{getlist}}"> | 22 | <block wx:for="{{getlist}}"> |
| 23 | - <view class="li"> | 23 | + <view class="li zoomIn animated"> |
| 24 | <navigator url="../recruit/recruit?id={{item.id}}"> | 24 | <navigator url="../recruit/recruit?id={{item.id}}"> |
| 25 | <view class="top"> | 25 | <view class="top"> |
| 26 | <view class="left"> | 26 | <view class="left"> |
| @@ -39,7 +39,6 @@ page { | @@ -39,7 +39,6 @@ page { | ||
| 39 | .head .li { | 39 | .head .li { |
| 40 | padding-top: 30rpx; | 40 | padding-top: 30rpx; |
| 41 | padding-bottom: 30rpx; | 41 | padding-bottom: 30rpx; |
| 42 | - border-bottom:8rpx solid #5c5c5c; | ||
| 43 | color: #adadad; | 42 | color: #adadad; |
| 44 | float: left; | 43 | float: left; |
| 45 | font-size: 28rpx; | 44 | font-size: 28rpx; |
| @@ -287,4 +286,22 @@ page { | @@ -287,4 +286,22 @@ page { | ||
| 287 | text-align: center; | 286 | text-align: center; |
| 288 | color: #7a838c; | 287 | color: #7a838c; |
| 289 | margin-top: 25rpx; | 288 | margin-top: 25rpx; |
| 289 | +} | ||
| 290 | + | ||
| 291 | + | ||
| 292 | +.animated { | ||
| 293 | + animation-duration: 1s; | ||
| 294 | + animation-fill-mode: both; | ||
| 295 | +} | ||
| 296 | + | ||
| 297 | +@keyframes zoomIn { | ||
| 298 | + from { | ||
| 299 | + opacity: 0; | ||
| 300 | + } | ||
| 301 | + 100% { | ||
| 302 | + opacity: 1; | ||
| 303 | + } | ||
| 304 | +} | ||
| 305 | +.zoomIn { | ||
| 306 | + animation-name: zoomIn; | ||
| 290 | } | 307 | } |
| @@ -239,9 +239,6 @@ Page({ | @@ -239,9 +239,6 @@ Page({ | ||
| 239 | scrollTop: scrollTop | 239 | scrollTop: scrollTop |
| 240 | }) | 240 | }) |
| 241 | 241 | ||
| 242 | - | ||
| 243 | - | ||
| 244 | - | ||
| 245 | 242 | ||
| 246 | if (scrollTop == 0) { | 243 | if (scrollTop == 0) { |
| 247 | // var that = this | 244 | // var that = this |
| @@ -390,6 +387,8 @@ Page({ | @@ -390,6 +387,8 @@ Page({ | ||
| 390 | * 生命周期函数--监听页面显示 | 387 | * 生命周期函数--监听页面显示 |
| 391 | */ | 388 | */ |
| 392 | onShow: function () { | 389 | onShow: function () { |
| 390 | + | ||
| 391 | + // zoomIn animated | ||
| 393 | }, | 392 | }, |
| 394 | imagesHeight: function (t) { | 393 | imagesHeight: function (t) { |
| 395 | var a = t.detail.width, | 394 | var a = t.detail.width, |
| @@ -13,6 +13,7 @@ Page({ | @@ -13,6 +13,7 @@ Page({ | ||
| 13 | list: '', | 13 | list: '', |
| 14 | index1: '', | 14 | index1: '', |
| 15 | num: '', | 15 | num: '', |
| 16 | + animate: 'zoomIn animated', | ||
| 16 | con: [ | 17 | con: [ |
| 17 | { | 18 | { |
| 18 | name: '按时间', | 19 | name: '按时间', |
| @@ -217,7 +218,8 @@ Page({ | @@ -217,7 +218,8 @@ Page({ | ||
| 217 | var con = that.data.con | 218 | var con = that.data.con |
| 218 | var index = e.currentTarget.dataset.index | 219 | var index = e.currentTarget.dataset.index |
| 219 | that.setData({ | 220 | that.setData({ |
| 220 | - index1: index | 221 | + index1: index, |
| 222 | + animate:'' | ||
| 221 | }) | 223 | }) |
| 222 | console.log('this', this) | 224 | console.log('this', this) |
| 223 | if (this.data.currentTab === e.target.dataset.index) { | 225 | if (this.data.currentTab === e.target.dataset.index) { |
| @@ -251,7 +253,8 @@ Page({ | @@ -251,7 +253,8 @@ Page({ | ||
| 251 | that.setData({ | 253 | that.setData({ |
| 252 | num: res.data.data.length, | 254 | num: res.data.data.length, |
| 253 | // con: res.data.data | 255 | // con: res.data.data |
| 254 | - list: res.data.data | 256 | + list: res.data.data, |
| 257 | + animate:'zoomIn animated' | ||
| 255 | }) | 258 | }) |
| 256 | } | 259 | } |
| 257 | }) | 260 | }) |
| @@ -280,7 +283,8 @@ Page({ | @@ -280,7 +283,8 @@ Page({ | ||
| 280 | that.setData({ | 283 | that.setData({ |
| 281 | // con: res.data.data | 284 | // con: res.data.data |
| 282 | num: res.data.data.length, | 285 | num: res.data.data.length, |
| 283 | - list: res.data.data | 286 | + list: res.data.data, |
| 287 | + animate:'zoomIn animated' | ||
| 284 | }) | 288 | }) |
| 285 | } | 289 | } |
| 286 | }) | 290 | }) |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view wx:if="{{list}}"> | 3 | <view wx:if="{{list}}"> |
| 4 | <view class="content2"> | 4 | <view class="content2"> |
| 5 | <block wx:for="{{list}}"> | 5 | <block wx:for="{{list}}"> |
| 6 | - <view class="li"> | 6 | + <view class="li {{animate}}"> |
| 7 | <navigator url='../jobfairdetail/jobfairdetail?id={{item.id}}'> | 7 | <navigator url='../jobfairdetail/jobfairdetail?id={{item.id}}'> |
| 8 | <view class="bg"> | 8 | <view class="bg"> |
| 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> | 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> |
| @@ -225,4 +225,22 @@ page{ | @@ -225,4 +225,22 @@ page{ | ||
| 225 | text-align: center; | 225 | text-align: center; |
| 226 | color: #7a838c; | 226 | color: #7a838c; |
| 227 | margin-top: 25rpx; | 227 | margin-top: 25rpx; |
| 228 | +} | ||
| 229 | + | ||
| 230 | + | ||
| 231 | +.animated { | ||
| 232 | + animation-duration: 1s; | ||
| 233 | + animation-fill-mode: both; | ||
| 234 | +} | ||
| 235 | + | ||
| 236 | +@keyframes zoomIn { | ||
| 237 | + from { | ||
| 238 | + opacity: 0; | ||
| 239 | + } | ||
| 240 | + 100% { | ||
| 241 | + opacity: 1; | ||
| 242 | + } | ||
| 243 | +} | ||
| 244 | +.zoomIn { | ||
| 245 | + animation-name: zoomIn; | ||
| 228 | } | 246 | } |
| @@ -29,10 +29,8 @@ Page({ | @@ -29,10 +29,8 @@ Page({ | ||
| 29 | onReachBottom: function () { | 29 | onReachBottom: function () { |
| 30 | var that = this | 30 | var that = this |
| 31 | var num = that.data.num | 31 | var num = that.data.num |
| 32 | - console.log('num', num) | ||
| 33 | var skey = that.data.skey | 32 | var skey = that.data.skey |
| 34 | var index1 = that.data.index1 | 33 | var index1 = that.data.index1 |
| 35 | - console.log('index1', index1) | ||
| 36 | if (index1 == 0) { | 34 | if (index1 == 0) { |
| 37 | wx.request({ | 35 | wx.request({ |
| 38 | url: app.url + '/mpapi/1.0.0/writing-training?tag=&offset=&limit=', | 36 | url: app.url + '/mpapi/1.0.0/writing-training?tag=&offset=&limit=', |
| @@ -49,7 +47,6 @@ Page({ | @@ -49,7 +47,6 @@ Page({ | ||
| 49 | }, | 47 | }, |
| 50 | success: function (res) { | 48 | success: function (res) { |
| 51 | if (res.data.data.length < 8) { | 49 | if (res.data.data.length < 8) { |
| 52 | - console.log(res.data.data) | ||
| 53 | var num1 = that.data.num + res.data.data.length | 50 | var num1 = that.data.num + res.data.data.length |
| 54 | that.setData({ | 51 | that.setData({ |
| 55 | list: that.data.list.concat(res.data.data), | 52 | list: that.data.list.concat(res.data.data), |
| @@ -58,16 +55,13 @@ Page({ | @@ -58,16 +55,13 @@ Page({ | ||
| 58 | }) | 55 | }) |
| 59 | } | 56 | } |
| 60 | else { | 57 | else { |
| 61 | - console.log(5555555555555555555) | ||
| 62 | var num1 = that.data.num + 8 | 58 | var num1 = that.data.num + 8 |
| 63 | - console.log('num1', num1) | ||
| 64 | that.setData({ | 59 | that.setData({ |
| 65 | num: num1, | 60 | num: num1, |
| 66 | list: that.data.list.concat(res.data.data), | 61 | list: that.data.list.concat(res.data.data), |
| 67 | }) | 62 | }) |
| 68 | - setTimeout(function () { | ||
| 69 | - console.log(1111111111111111111111111111111111111111) | ||
| 70 | - }, 3500); | 63 | + // setTimeout(function () { |
| 64 | + // }, 3500); | ||
| 71 | } | 65 | } |
| 72 | } | 66 | } |
| 73 | }) | 67 | }) |
| @@ -88,7 +82,6 @@ Page({ | @@ -88,7 +82,6 @@ Page({ | ||
| 88 | }, | 82 | }, |
| 89 | success: function (res) { | 83 | success: function (res) { |
| 90 | if (res.data.data.length < 8) { | 84 | if (res.data.data.length < 8) { |
| 91 | - console.log(res.data.data) | ||
| 92 | var num1 = that.data.num + res.data.data.length | 85 | var num1 = that.data.num + res.data.data.length |
| 93 | that.setData({ | 86 | that.setData({ |
| 94 | list: that.data.list.concat(res.data.data), | 87 | list: that.data.list.concat(res.data.data), |
| @@ -97,16 +90,13 @@ Page({ | @@ -97,16 +90,13 @@ Page({ | ||
| 97 | }) | 90 | }) |
| 98 | } | 91 | } |
| 99 | else { | 92 | else { |
| 100 | - console.log(5555555555555555555) | ||
| 101 | var num1 = that.data.num + 8 | 93 | var num1 = that.data.num + 8 |
| 102 | - console.log('num1', num1) | ||
| 103 | that.setData({ | 94 | that.setData({ |
| 104 | num: num1, | 95 | num: num1, |
| 105 | list: that.data.list.concat(res.data.data), | 96 | list: that.data.list.concat(res.data.data), |
| 106 | }) | 97 | }) |
| 107 | - setTimeout(function () { | ||
| 108 | - console.log(1111111111111111111111111111111111111111) | ||
| 109 | - }, 3500); | 98 | + // setTimeout(function () { |
| 99 | + // }, 3500); | ||
| 110 | } | 100 | } |
| 111 | } | 101 | } |
| 112 | }) | 102 | }) |
| @@ -119,7 +109,6 @@ Page({ | @@ -119,7 +109,6 @@ Page({ | ||
| 119 | var that = this | 109 | var that = this |
| 120 | console.log("刷新了") | 110 | console.log("刷新了") |
| 121 | var skey = wx.getStorageSync('key') | 111 | var skey = wx.getStorageSync('key') |
| 122 | - console.log('skey', skey) | ||
| 123 | that.setData({ | 112 | that.setData({ |
| 124 | skey: skey | 113 | skey: skey |
| 125 | }) | 114 | }) |
| @@ -137,7 +126,6 @@ Page({ | @@ -137,7 +126,6 @@ Page({ | ||
| 137 | // id:'1' | 126 | // id:'1' |
| 138 | }, | 127 | }, |
| 139 | success: function (res) { | 128 | success: function (res) { |
| 140 | - console.log('con', res.data) | ||
| 141 | that.setData({ | 129 | that.setData({ |
| 142 | list: res.data.data, | 130 | list: res.data.data, |
| 143 | num: res.data.data.length | 131 | num: res.data.data.length |
| @@ -210,7 +198,6 @@ Page({ | @@ -210,7 +198,6 @@ Page({ | ||
| 210 | var list = that.data.list | 198 | var list = that.data.list |
| 211 | var con = that.data.con | 199 | var con = that.data.con |
| 212 | var index = e.currentTarget.dataset.index | 200 | var index = e.currentTarget.dataset.index |
| 213 | - console.log('this', this) | ||
| 214 | if (this.data.currentTab === e.target.dataset.index) { | 201 | if (this.data.currentTab === e.target.dataset.index) { |
| 215 | return false; | 202 | return false; |
| 216 | } else { | 203 | } else { |
| @@ -220,7 +207,6 @@ Page({ | @@ -220,7 +207,6 @@ Page({ | ||
| 220 | } | 207 | } |
| 221 | if (index == 0) { | 208 | if (index == 0) { |
| 222 | var skey = wx.getStorageSync('key') | 209 | var skey = wx.getStorageSync('key') |
| 223 | - console.log('skey', skey) | ||
| 224 | that.setData({ | 210 | that.setData({ |
| 225 | skey: skey | 211 | skey: skey |
| 226 | }) | 212 | }) |
| @@ -238,7 +224,6 @@ Page({ | @@ -238,7 +224,6 @@ Page({ | ||
| 238 | // id:'1' | 224 | // id:'1' |
| 239 | }, | 225 | }, |
| 240 | success: function (res) { | 226 | success: function (res) { |
| 241 | - console.log('con1', res.data) | ||
| 242 | that.setData({ | 227 | that.setData({ |
| 243 | // con: res.data.data | 228 | // con: res.data.data |
| 244 | list: res.data.data, | 229 | list: res.data.data, |
| @@ -249,7 +234,6 @@ Page({ | @@ -249,7 +234,6 @@ Page({ | ||
| 249 | } | 234 | } |
| 250 | if (index == 1) { | 235 | if (index == 1) { |
| 251 | var skey = wx.getStorageSync('key') | 236 | var skey = wx.getStorageSync('key') |
| 252 | - console.log('skey', skey) | ||
| 253 | that.setData({ | 237 | that.setData({ |
| 254 | skey: skey | 238 | skey: skey |
| 255 | }) | 239 | }) |
| @@ -267,7 +251,6 @@ Page({ | @@ -267,7 +251,6 @@ Page({ | ||
| 267 | // id:'1' | 251 | // id:'1' |
| 268 | }, | 252 | }, |
| 269 | success: function (res) { | 253 | success: function (res) { |
| 270 | - console.log('con2', res.data) | ||
| 271 | that.setData({ | 254 | that.setData({ |
| 272 | // con: res.data.data | 255 | // con: res.data.data |
| 273 | list: res.data.data, | 256 | list: res.data.data, |
| @@ -313,7 +296,6 @@ Page({ | @@ -313,7 +296,6 @@ Page({ | ||
| 313 | }, 1500) | 296 | }, 1500) |
| 314 | if (that.data.index1 == 1) { | 297 | if (that.data.index1 == 1) { |
| 315 | var skey = wx.getStorageSync('key') | 298 | var skey = wx.getStorageSync('key') |
| 316 | - console.log('skey', skey) | ||
| 317 | that.setData({ | 299 | that.setData({ |
| 318 | skey: skey, | 300 | skey: skey, |
| 319 | }) | 301 | }) |
| @@ -331,7 +313,6 @@ Page({ | @@ -331,7 +313,6 @@ Page({ | ||
| 331 | // id:'1' | 313 | // id:'1' |
| 332 | }, | 314 | }, |
| 333 | success: function (res) { | 315 | success: function (res) { |
| 334 | - console.log('con', res.data) | ||
| 335 | that.setData({ | 316 | that.setData({ |
| 336 | // con: res.data.data | 317 | // con: res.data.data |
| 337 | list: res.data.data, | 318 | list: res.data.data, |
| 1 | <view style="font-size:28rpx;"> | 1 | <view style="font-size:28rpx;"> |
| 2 | <view style="height:94rpx;"></view> | 2 | <view style="height:94rpx;"></view> |
| 3 | <view wx:if="{{list}}"> | 3 | <view wx:if="{{list}}"> |
| 4 | - <view class="content2"> | 4 | + <view class="content2 zoomIn animated"> |
| 5 | <block wx:for="{{list}}"> | 5 | <block wx:for="{{list}}"> |
| 6 | <view class="li"> | 6 | <view class="li"> |
| 7 | <navigator url='../xzpxdetail/xzpxdetail?id={{item.id}}'> | 7 | <navigator url='../xzpxdetail/xzpxdetail?id={{item.id}}'> |
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | <!-- <image src='/static/images/kongliebiao.png' mode='aspectFit' class="konglie"></image> --> | 24 | <!-- <image src='/static/images/kongliebiao.png' mode='aspectFit' class="konglie"></image> --> |
| 25 | 正在加载... | 25 | 正在加载... |
| 26 | </view> | 26 | </view> |
| 27 | - <view class="content3"> | 27 | + <view class="content3 zoomIn animated"> |
| 28 | <block wx:for="{{con}}"> | 28 | <block wx:for="{{con}}"> |
| 29 | <view class="{{currentTab==index ? 'on' : ''}} li" bindtap='getlist' data-index="{{index}}" data-current="{{index}}"> | 29 | <view class="{{currentTab==index ? 'on' : ''}} li" bindtap='getlist' data-index="{{index}}" data-current="{{index}}"> |
| 30 | {{item.name}} | 30 | {{item.name}} |
| @@ -270,4 +270,25 @@ page { | @@ -270,4 +270,25 @@ page { | ||
| 270 | text-align: center; | 270 | text-align: center; |
| 271 | color: #7a838c; | 271 | color: #7a838c; |
| 272 | margin-top: 25rpx; | 272 | margin-top: 25rpx; |
| 273 | +} | ||
| 274 | + | ||
| 275 | + | ||
| 276 | +.animated { | ||
| 277 | + animation-duration: 1s; | ||
| 278 | + animation-fill-mode: both; | ||
| 279 | +} | ||
| 280 | + | ||
| 281 | +@keyframes zoomIn { | ||
| 282 | + from { | ||
| 283 | + opacity: 0; | ||
| 284 | + } | ||
| 285 | + 50% { | ||
| 286 | + opacity: .4; | ||
| 287 | + } | ||
| 288 | + 100% { | ||
| 289 | + opacity: 1; | ||
| 290 | + } | ||
| 291 | +} | ||
| 292 | +.zoomIn { | ||
| 293 | + animation-name: zoomIn; | ||
| 273 | } | 294 | } |
| @@ -14,6 +14,7 @@ Page({ | @@ -14,6 +14,7 @@ Page({ | ||
| 14 | index1: '', | 14 | index1: '', |
| 15 | num: '', | 15 | num: '', |
| 16 | list: '', | 16 | list: '', |
| 17 | + animate: 'zoomIn animated', | ||
| 17 | con: [ | 18 | con: [ |
| 18 | { | 19 | { |
| 19 | name: '按时间', | 20 | name: '按时间', |
| @@ -34,10 +35,9 @@ Page({ | @@ -34,10 +35,9 @@ Page({ | ||
| 34 | onReachBottom: function () { | 35 | onReachBottom: function () { |
| 35 | var that = this | 36 | var that = this |
| 36 | var num = that.data.num | 37 | var num = that.data.num |
| 37 | - console.log('num', num) | ||
| 38 | var skey = that.data.skey | 38 | var skey = that.data.skey |
| 39 | var index1 = that.data.index1 | 39 | var index1 = that.data.index1 |
| 40 | - console.log('index1', index1) | 40 | + |
| 41 | if (index1 == 0) { | 41 | if (index1 == 0) { |
| 42 | wx.request({ | 42 | wx.request({ |
| 43 | url: app.url + '/mpapi/1.0.0/career-advice?tag=&offset=&limit=', | 43 | url: app.url + '/mpapi/1.0.0/career-advice?tag=&offset=&limit=', |
| @@ -54,7 +54,6 @@ Page({ | @@ -54,7 +54,6 @@ Page({ | ||
| 54 | }, | 54 | }, |
| 55 | success: function (res) { | 55 | success: function (res) { |
| 56 | if (res.data.data.length < 8) { | 56 | if (res.data.data.length < 8) { |
| 57 | - console.log(res.data.data) | ||
| 58 | var num1 = that.data.num + res.data.data.length | 57 | var num1 = that.data.num + res.data.data.length |
| 59 | that.setData({ | 58 | that.setData({ |
| 60 | list: that.data.list.concat(res.data.data), | 59 | list: that.data.list.concat(res.data.data), |
| @@ -63,17 +62,14 @@ Page({ | @@ -63,17 +62,14 @@ Page({ | ||
| 63 | }) | 62 | }) |
| 64 | } | 63 | } |
| 65 | else { | 64 | else { |
| 66 | - console.log(5555555555555555555) | ||
| 67 | var num1 = that.data.num + 8 | 65 | var num1 = that.data.num + 8 |
| 68 | - console.log('num1', num1) | ||
| 69 | that.setData({ | 66 | that.setData({ |
| 70 | num: num1, | 67 | num: num1, |
| 71 | // xiala:true, | 68 | // xiala:true, |
| 72 | list: that.data.list.concat(res.data.data), | 69 | list: that.data.list.concat(res.data.data), |
| 73 | }) | 70 | }) |
| 74 | - setTimeout(function () { | ||
| 75 | - console.log(1111111111111111111111111111111111111111) | ||
| 76 | - }, 3500); | 71 | + // setTimeout(function () { |
| 72 | + // }, 3500); | ||
| 77 | } | 73 | } |
| 78 | } | 74 | } |
| 79 | }) | 75 | }) |
| @@ -94,7 +90,6 @@ Page({ | @@ -94,7 +90,6 @@ Page({ | ||
| 94 | }, | 90 | }, |
| 95 | success: function (res) { | 91 | success: function (res) { |
| 96 | if (res.data.data.length < 8) { | 92 | if (res.data.data.length < 8) { |
| 97 | - console.log(res.data.data) | ||
| 98 | var num1 = that.data.num + res.data.data.length | 93 | var num1 = that.data.num + res.data.data.length |
| 99 | that.setData({ | 94 | that.setData({ |
| 100 | list: that.data.list.concat(res.data.data), | 95 | list: that.data.list.concat(res.data.data), |
| @@ -103,17 +98,15 @@ Page({ | @@ -103,17 +98,15 @@ Page({ | ||
| 103 | }) | 98 | }) |
| 104 | } | 99 | } |
| 105 | else { | 100 | else { |
| 106 | - console.log(5555555555555555555) | ||
| 107 | var num1 = that.data.num + 8 | 101 | var num1 = that.data.num + 8 |
| 108 | - console.log('num1', num1) | ||
| 109 | that.setData({ | 102 | that.setData({ |
| 110 | num: num1, | 103 | num: num1, |
| 111 | list: that.data.list.concat(res.data.data), | 104 | list: that.data.list.concat(res.data.data), |
| 112 | }) | 105 | }) |
| 113 | - setTimeout(function () { | ||
| 114 | - console.log(1111111111111111111111111111111111111111) | ||
| 115 | - }, 3500); | 106 | + // setTimeout(function () { |
| 107 | + // }, 3500); | ||
| 116 | } | 108 | } |
| 109 | + | ||
| 117 | } | 110 | } |
| 118 | }) | 111 | }) |
| 119 | } | 112 | } |
| @@ -122,7 +115,6 @@ Page({ | @@ -122,7 +115,6 @@ Page({ | ||
| 122 | var that = this | 115 | var that = this |
| 123 | 116 | ||
| 124 | var skey = wx.getStorageSync('key') | 117 | var skey = wx.getStorageSync('key') |
| 125 | - console.log('skey', skey) | ||
| 126 | that.setData({ | 118 | that.setData({ |
| 127 | skey: skey | 119 | skey: skey |
| 128 | }) | 120 | }) |
| @@ -140,7 +132,6 @@ Page({ | @@ -140,7 +132,6 @@ Page({ | ||
| 140 | // id:'1' | 132 | // id:'1' |
| 141 | }, | 133 | }, |
| 142 | success: function (res) { | 134 | success: function (res) { |
| 143 | - console.log('con', res.data) | ||
| 144 | if (res.data.countTotal < 10) { | 135 | if (res.data.countTotal < 10) { |
| 145 | that.setData({ | 136 | that.setData({ |
| 146 | toubu: false, | 137 | toubu: false, |
| @@ -149,7 +140,8 @@ Page({ | @@ -149,7 +140,8 @@ Page({ | ||
| 149 | that.setData({ | 140 | that.setData({ |
| 150 | list: res.data.data, | 141 | list: res.data.data, |
| 151 | num: res.data.data.length, | 142 | num: res.data.data.length, |
| 152 | - xiala: true | 143 | + xiala: true, |
| 144 | + animate:'zoomIn animated' | ||
| 153 | }) | 145 | }) |
| 154 | } | 146 | } |
| 155 | }) | 147 | }) |
| @@ -217,7 +209,9 @@ Page({ | @@ -217,7 +209,9 @@ Page({ | ||
| 217 | var list = that.data.list | 209 | var list = that.data.list |
| 218 | var con = that.data.con | 210 | var con = that.data.con |
| 219 | var index = e.currentTarget.dataset.index | 211 | var index = e.currentTarget.dataset.index |
| 220 | - console.log('this', this) | 212 | + |
| 213 | + that.setData({ animate:'' }) | ||
| 214 | + | ||
| 221 | if (this.data.currentTab === e.target.dataset.index) { | 215 | if (this.data.currentTab === e.target.dataset.index) { |
| 222 | return false; | 216 | return false; |
| 223 | } else { | 217 | } else { |
| @@ -227,7 +221,6 @@ Page({ | @@ -227,7 +221,6 @@ Page({ | ||
| 227 | } | 221 | } |
| 228 | if (index == 0) { | 222 | if (index == 0) { |
| 229 | var skey = wx.getStorageSync('key') | 223 | var skey = wx.getStorageSync('key') |
| 230 | - console.log('skey', skey) | ||
| 231 | that.setData({ | 224 | that.setData({ |
| 232 | skey: skey | 225 | skey: skey |
| 233 | }) | 226 | }) |
| @@ -245,18 +238,17 @@ Page({ | @@ -245,18 +238,17 @@ Page({ | ||
| 245 | // id:'1' | 238 | // id:'1' |
| 246 | }, | 239 | }, |
| 247 | success: function (res) { | 240 | success: function (res) { |
| 248 | - console.log('con', res.data) | ||
| 249 | that.setData({ | 241 | that.setData({ |
| 250 | // con: res.data.data | 242 | // con: res.data.data |
| 251 | list: res.data.data, | 243 | list: res.data.data, |
| 252 | - num: res.data.data.length | 244 | + num: res.data.data.length, |
| 245 | + animate:'zoomIn animated' | ||
| 253 | }) | 246 | }) |
| 254 | } | 247 | } |
| 255 | }) | 248 | }) |
| 256 | } | 249 | } |
| 257 | if (index == 1) { | 250 | if (index == 1) { |
| 258 | var skey = wx.getStorageSync('key') | 251 | var skey = wx.getStorageSync('key') |
| 259 | - console.log('skey', skey) | ||
| 260 | that.setData({ | 252 | that.setData({ |
| 261 | skey: skey | 253 | skey: skey |
| 262 | }) | 254 | }) |
| @@ -274,11 +266,11 @@ Page({ | @@ -274,11 +266,11 @@ Page({ | ||
| 274 | // id:'1' | 266 | // id:'1' |
| 275 | }, | 267 | }, |
| 276 | success: function (res) { | 268 | success: function (res) { |
| 277 | - console.log('con', res.data) | ||
| 278 | that.setData({ | 269 | that.setData({ |
| 279 | // con: res.data.data | 270 | // con: res.data.data |
| 280 | list: res.data.data, | 271 | list: res.data.data, |
| 281 | - num: res.data.data.length | 272 | + num: res.data.data.length, |
| 273 | + animate:'zoomIn animated' | ||
| 282 | }) | 274 | }) |
| 283 | } | 275 | } |
| 284 | }) | 276 | }) |
| @@ -303,7 +295,6 @@ Page({ | @@ -303,7 +295,6 @@ Page({ | ||
| 303 | * 生命周期函数--监听页面卸载 | 295 | * 生命周期函数--监听页面卸载 |
| 304 | */ | 296 | */ |
| 305 | onUnload: function () { | 297 | onUnload: function () { |
| 306 | - | ||
| 307 | }, | 298 | }, |
| 308 | 299 | ||
| 309 | /** | 300 | /** |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view wx:if="{{list}}"> | 3 | <view wx:if="{{list}}"> |
| 4 | <view class="content2"> | 4 | <view class="content2"> |
| 5 | <block wx:for="{{list}}"> | 5 | <block wx:for="{{list}}"> |
| 6 | - <view class="li"> | 6 | + <view class="li {{animate}}"> |
| 7 | <navigator url='../zyjydetail/zyjydetail?id={{item.id}}'> | 7 | <navigator url='../zyjydetail/zyjydetail?id={{item.id}}'> |
| 8 | <view class="bg"> | 8 | <view class="bg"> |
| 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> | 9 | <image src='{{item.listImage[0].url}}' mode='widthFix'></image> |
| @@ -261,4 +261,21 @@ page { | @@ -261,4 +261,21 @@ page { | ||
| 261 | text-align: center; | 261 | text-align: center; |
| 262 | color: #7a838c; | 262 | color: #7a838c; |
| 263 | margin-top: 25rpx; | 263 | margin-top: 25rpx; |
| 264 | +} | ||
| 265 | + | ||
| 266 | +.animated { | ||
| 267 | + animation-duration: 1s; | ||
| 268 | + animation-fill-mode: both; | ||
| 269 | +} | ||
| 270 | + | ||
| 271 | +@keyframes zoomIn { | ||
| 272 | + from { | ||
| 273 | + opacity: 0; | ||
| 274 | + } | ||
| 275 | + 100% { | ||
| 276 | + opacity: 1; | ||
| 277 | + } | ||
| 278 | +} | ||
| 279 | +.zoomIn { | ||
| 280 | + animation-name: zoomIn; | ||
| 264 | } | 281 | } |
Please
register
or
login
to post a comment