|
|
@@ -20,7 +20,7 @@ Component({
|
|
|
bottomNavHeight: 0, // 底部导航栏高度
|
|
|
contentHeight: 0, // 可用内容高度
|
|
|
contentpadding: 0, //顶部padding高度
|
|
|
- navheight:0,//nav栏高度
|
|
|
+ navheight: 0, //nav栏高度
|
|
|
//朋友圈
|
|
|
cardList: [],
|
|
|
|
|
|
@@ -28,7 +28,7 @@ Component({
|
|
|
pageSize: 6, // 每次加载的商品数量
|
|
|
noMoreItems: false, // 是否还有更多商品
|
|
|
|
|
|
-
|
|
|
+ ActivityList:[],
|
|
|
},
|
|
|
lifetimes: {
|
|
|
|
|
|
@@ -45,10 +45,10 @@ Component({
|
|
|
const customHeight = custom.height + 10 + 2 || 0;
|
|
|
const bottomNavHeight = systemInfo.screenHeight - systemInfo.safeArea.bottom || 0;
|
|
|
const contentHeight = (screenHeight - 50 - bottomNavHeight - statusBarHeight - customHeight) * 750 / systemInfo.windowWidth;
|
|
|
- const navheight = (statusBarHeight+customHeight) * 750 / systemInfo.windowWidth;
|
|
|
+ const navheight = (statusBarHeight + customHeight) * 750 / systemInfo.windowWidth;
|
|
|
this.setData({
|
|
|
statusBarHeight,
|
|
|
- screenHeight:(screenHeight-50-bottomNavHeight) * 750 / systemInfo.windowWidth,
|
|
|
+ screenHeight: (screenHeight - 50 - bottomNavHeight) * 750 / systemInfo.windowWidth,
|
|
|
customHeight,
|
|
|
bottomNavHeight,
|
|
|
contentHeight,
|
|
|
@@ -57,6 +57,7 @@ Component({
|
|
|
// console.log('123', contentHeight);
|
|
|
// this.iddepe()
|
|
|
this.getcircle()
|
|
|
+ this.getact()
|
|
|
},
|
|
|
|
|
|
},
|
|
|
@@ -128,8 +129,8 @@ Component({
|
|
|
getcircle2() {
|
|
|
this.setData({
|
|
|
cardList: [],
|
|
|
- loadedItems:0,
|
|
|
- noMoreItems:false
|
|
|
+ loadedItems: 0,
|
|
|
+ noMoreItems: false
|
|
|
})
|
|
|
console.log('运行了');
|
|
|
this.getcircle()
|
|
|
@@ -142,23 +143,38 @@ Component({
|
|
|
});
|
|
|
},
|
|
|
//判断是否有部门
|
|
|
- // async iddepe(){
|
|
|
- // const currentUser = Parse.User.current();
|
|
|
- // let Profilequery2 = new Parse.Query('Profile');
|
|
|
- // Profilequery2.equalTo('company', company);
|
|
|
- // Profilequery2.equalTo('user', currentUser.id);
|
|
|
- // Profilequery2.equalTo('isCheck', true);
|
|
|
- // Profilequery2.notEqualTo('isDeleted', true)
|
|
|
- // let P2 = await Profilequery2.first();
|
|
|
- // if(P2){
|
|
|
- // this.getcircle()
|
|
|
- // }else{
|
|
|
- // wx.navigateTo({
|
|
|
- // url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
|
|
|
- // });
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
+ // async iddepe(){
|
|
|
+ // const currentUser = Parse.User.current();
|
|
|
+ // let Profilequery2 = new Parse.Query('Profile');
|
|
|
+ // Profilequery2.equalTo('company', company);
|
|
|
+ // Profilequery2.equalTo('user', currentUser.id);
|
|
|
+ // Profilequery2.equalTo('isCheck', true);
|
|
|
+ // Profilequery2.notEqualTo('isDeleted', true)
|
|
|
+ // let P2 = await Profilequery2.first();
|
|
|
+ // if(P2){
|
|
|
+ // this.getcircle()
|
|
|
+ // }else{
|
|
|
+ // wx.navigateTo({
|
|
|
+ // url: '../../pages/my/my-profile/index?type='+'资料认证'// 目标页面的路径
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
|
|
|
+ //首页活动
|
|
|
+ async getact() {
|
|
|
+ let Activityquery = new Parse.Query('Activity');
|
|
|
+ Activityquery.equalTo('company', company);
|
|
|
+ Activityquery.notEqualTo('isDeleted', true);
|
|
|
+ Activityquery.equalTo('isEnabled', true);
|
|
|
+ Activityquery.ascending('index'); // 按index升序排序
|
|
|
+ Activityquery.limit(4); // 限制结果为前四个
|
|
|
+
|
|
|
+ let P = await Activityquery.find();
|
|
|
+ let ActivityList = P.map(item => item.toJSON());
|
|
|
+
|
|
|
+ this.setData({
|
|
|
+ ActivityList,
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
})
|
