@@ -27,9 +27,8 @@ var app = getApp();
2727Page ( {
2828 data : {
2929 postsList : [ ] ,
30- postsList1 : [ ] ,
31- //postsList2: [],
32- postsList3 : [ ] ,
30+ recommendPostsList : [ ] ,
31+ selectionPostsList : [ ] ,
3332 postsShowSwiperList : [ ] ,
3433 isLastPage : false ,
3534 page : 1 ,
@@ -46,8 +45,17 @@ Page({
4645 currentIndex : 0 ,
4746 topNav : [ ] ,
4847 userInfo : app . globalData . userInfo ,
49- isLoginPopup : false
50-
48+ isLoginPopup : false ,
49+ appId : "wx8abaf00ee8c3202e" ,
50+ extraData : {
51+ // 把1221数字换成你的产品ID,否则会跳到别的产品
52+ id : "45980" ,
53+ // 自定义参数,具体参考文档
54+ customData : {
55+ clientInfo : `iPhone OS 10.3.1 / 3.2.0.43 / 0` ,
56+ imei : '7280BECE2FC29544172A2B858E9E90D0'
57+ }
58+ }
5159
5260 } ,
5361 formSubmit : function ( e ) {
@@ -173,7 +181,7 @@ Page({
173181 } ,
174182 fetchTopFivePosts : function ( ) {
175183 var self = this ;
176- //取置顶的文章
184+ //获取幻灯片的文章
177185 var getPostsRequest = wxRequest . getRequest ( Api . getSwiperPosts ( ) ) ;
178186 getPostsRequest . then ( response => {
179187 if ( response . data . status == '200' && response . data . posts . length > 0 ) {
@@ -323,7 +331,7 @@ Page({
323331 getPostsRequest . then ( response => {
324332 if ( response . statusCode === 200 ) {
325333 self . setData ( {
326- postsList1 : self . data . postsList1 . concat ( response . data . map ( function ( item ) {
334+ recommendPostsList : self . data . recommendPostsList . concat ( response . data . map ( function ( item ) {
327335
328336 var strdate = item . date
329337 if ( item . category_name != null ) {
@@ -350,7 +358,7 @@ Page({
350358 getPostsRequest . then ( response => {
351359 if ( response . statusCode === 200 ) {
352360 self . setData ( {
353- postsList3 : self . data . postsList3 . concat ( response . data . map ( function ( item ) {
361+ selectionPostsList : self . data . selectionPostsList . concat ( response . data . map ( function ( item ) {
354362
355363 var strdate = item . date
356364 if ( item . category_name != null ) {
@@ -371,44 +379,6 @@ Page({
371379 } )
372380 } ,
373381
374-
375- //获取浏览排行
376- fetchPostsHostData : function ( tab ) {
377- var self = this ;
378- self . setData ( {
379- postsList2 : [ ]
380- } ) ;
381- wx . showLoading ( {
382- title : '正在加载' ,
383- mask : true
384- } ) ;
385- var getTopHotPostsRequest = wxRequest . getRequest ( Api . getTopHotPosts ( tab ) ) ;
386- getTopHotPostsRequest . then ( response => {
387- if ( response . statusCode === 200 ) {
388- self . setData ( {
389- postsList2 : self . data . postsList2 . concat ( response . data . map ( function ( item ) {
390- var strdate = item . post_date
391- if ( item . post_thumbnail_image == null || item . post_thumbnail_image == '' ) {
392- item . post_thumbnail_image = '../../images/logo700.png' ;
393- }
394- item . post_date = util . cutstr ( strdate , 10 , 1 ) ;
395- return item ;
396- } ) ) ,
397- } ) ;
398- } else if ( response . statusCode === 404 ) {
399- console . log ( '加载数据失败,可能缺少相应的数据' ) ;
400- }
401- } )
402- . catch ( function ( ) {
403- wx . hideLoading ( ) ;
404- } )
405- . finally ( function ( ) {
406- setTimeout ( function ( ) {
407- wx . hideLoading ( ) ;
408- } , 1500 ) ;
409- } ) ;
410- } ,
411-
412382 //加载分页
413383 loadMore : function ( e ) {
414384
@@ -519,7 +489,7 @@ Page({
519489 } ) ;
520490 } ,
521491
522- userAuthorization : function ( ) {
492+ userAuthorization : function ( ) {
523493 var self = this ;
524494 // 判断是否是第一次授权,非第一次授权且授权失败则进行提醒
525495 wx . getSetting ( {
@@ -544,7 +514,7 @@ Page({
544514 cancelColor : '#296fd0' ,
545515 confirmColor : '#296fd0' ,
546516 confirmText : '设置权限' ,
547- success : function ( res ) {
517+ success : function ( res ) {
548518 if ( res . confirm ) {
549519 console . log ( '用户点击确定' )
550520 wx . openSetting ( {
@@ -566,7 +536,7 @@ Page({
566536 }
567537 } ) ;
568538 } ,
569- agreeGetUser : function ( e ) {
539+ agreeGetUser : function ( e ) {
570540 var userInfo = e . detail . userInfo ;
571541 var self = this ;
572542 if ( userInfo ) {
@@ -575,7 +545,7 @@ Page({
575545 userInfo : userInfo
576546 } )
577547 }
578- setTimeout ( function ( ) {
548+ setTimeout ( function ( ) {
579549 self . setData ( {
580550 isLoginPopup : false
581551 } )
@@ -592,14 +562,14 @@ Page({
592562 isLoginPopup : true
593563 } ) ;
594564 } ,
595- confirm : function ( ) {
565+ confirm : function ( ) {
596566 this . setData ( {
597567 'dialog.hidden' : true ,
598568 'dialog.title' : '' ,
599569 'dialog.content' : ''
600570 } )
601571 } ,
602- getUsreInfo : function ( ) {
572+ getUsreInfo : function ( ) {
603573 var self = this ;
604574 var wxLogin = wxApi . wxLogin ( ) ;
605575 var jscode = '' ;
@@ -608,43 +578,43 @@ Page({
608578 var wxGetUserInfo = wxApi . wxGetUserInfo ( )
609579 return wxGetUserInfo ( )
610580 } ) .
611- //获取用户信息
612- then ( response => {
613- console . log ( response . userInfo ) ;
614- console . log ( "成功获取用户信息(公开信息)" ) ;
615- app . globalData . userInfo = response . userInfo ;
616- app . globalData . isGetUserInfo = true ;
617- self . setData ( {
618- userInfo : response . userInfo
619- } ) ;
581+ //获取用户信息
582+ then ( response => {
583+ console . log ( response . userInfo ) ;
584+ console . log ( "成功获取用户信息(公开信息)" ) ;
585+ app . globalData . userInfo = response . userInfo ;
586+ app . globalData . isGetUserInfo = true ;
587+ self . setData ( {
588+ userInfo : response . userInfo
589+ } ) ;
620590
621- var url = Api . getOpenidUrl ( ) ;
622- var data = {
623- js_code : jscode ,
624- encryptedData : response . encryptedData ,
625- iv : response . iv ,
626- avatarUrl : response . userInfo . avatarUrl
591+ var url = Api . getOpenidUrl ( ) ;
592+ var data = {
593+ js_code : jscode ,
594+ encryptedData : response . encryptedData ,
595+ iv : response . iv ,
596+ avatarUrl : response . userInfo . avatarUrl
597+ }
598+ var postOpenidRequest = wxRequest . postRequest ( url , data ) ;
599+ //获取openid
600+ postOpenidRequest . then ( response => {
601+ if ( response . data . status == '200' ) {
602+ //console.log(response.data.openid)
603+ console . log ( "openid 获取成功" ) ;
604+ app . globalData . openid = response . data . openid ;
605+ app . globalData . isGetOpenid = true ;
606+ } else {
607+ console . log ( response . data . message ) ;
627608 }
628- var postOpenidRequest = wxRequest . postRequest ( url , data ) ;
629- //获取openid
630- postOpenidRequest . then ( response => {
631- if ( response . data . status == '200' ) {
632- //console.log(response.data.openid)
633- console . log ( "openid 获取成功" ) ;
634- app . globalData . openid = response . data . openid ;
635- app . globalData . isGetOpenid = true ;
636- } else {
637- console . log ( response . data . message ) ;
638- }
639- } )
640- } ) . catch ( function ( error ) {
641- console . log ( 'error: ' + error . errMsg ) ;
642- self . userAuthorization ( ) ;
643609 } )
610+ } ) . catch ( function ( error ) {
611+ console . log ( 'error: ' + error . errMsg ) ;
612+ self . userAuthorization ( ) ;
613+ } )
644614 } ,
645615
646616 //设置首页咨询按钮点击事件:当用户点击咨询按钮时,自动推送一条消息给管理员
647- notifyAdmin : function ( ) {
617+ notifyAdmin : function ( ) {
648618 console . log ( ' 用户咨询,开始通知管理员。' ) ;
649619 wx . request ( {
650620 url : 'https://cloud.safedog.cc/vpush/functions/PUSH_API' ,
0 commit comments