Browse Source

版本1.4.13 修改进入社群名称

master tagv1.4.13
lihenian 5 years ago
parent
commit
d9c1ff9eb1
  1. 2
      pages/toRegister/toRegister.js
  2. 6
      project.config.json
  3. 6
      subpages/associationNew/components/communityList/communityList.wxml
  4. 28
      subpages/associationNew/components/communityList/communityList.wxss
  5. 52
      subpages/associationNew/pages/associationlist/associationlist.js

2
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
// } // }
// }) // })
let that = this let that = this
const versionNum = "1.4.12" const versionNum = "1.4.13"
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag

6
project.config.json

@ -88,6 +88,12 @@
"pathName": "subpages/home/pages/newsDetail/newsDetail", "pathName": "subpages/home/pages/newsDetail/newsDetail",
"query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1", "query": "id=7c8bc749ff4b6380bf1d902c0bde0ba1",
"scene": null "scene": null
},
{
"id": -1,
"name": "社群列表",
"pathName": "subpages/associationNew/pages/associationlist/associationlist",
"scene": null
} }
] ]
} }

6
subpages/associationNew/components/communityList/communityList.wxml

@ -9,7 +9,11 @@
<view class="community-name"> <view class="community-name">
<text>{{item.partyGroupName}}</text> <text>{{item.partyGroupName}}</text>
</view> </view>
<button bindtap="navigateToAss"data-join="{{item.isJoin}}" data-code="{{item.id}}" class="community-add" plain='true' hover-class="hover-btn"><image src="../../images/add.png"/></button> <view class="btn-container">
<button bindtap="navigateToAss"data-join="{{item.isJoin}}" data-code="{{item.id}}" class="community-add" plain='true' hover-class="hover-btn">
<view>{{item.groupName}}</view>
</button>
</view>
</view> </view>
</view> </view>
</view> </view>

28
subpages/associationNew/components/communityList/communityList.wxss

@ -38,13 +38,29 @@
color: white; color: white;
text-shadow: 2rpx 2rpx 0rpx #999; text-shadow: 2rpx 2rpx 0rpx #999;
} }
.btn-container {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
}
.community-item .cover-image .community-add{ .community-item .cover-image .community-add{
width: 150rpx; height: 54rpx;
height: 46rpx; line-height: 54rpx;
text-align: left; color:#fff;
padding: 0; font-size: 28rpx;
margin-top: 32rpx; text-align: center;
border: 0px; background: linear-gradient(to right, #fd3539, #fa695c);
border-radius: 27rpx;
box-sizing: content-box;
padding: 0;
margin: 0;
margin-top: 32rpx;
border: 0;
width: 240rpx;
}
.community-item .cover-image .hover-btn {
background: #cb0000;
} }
.community-item .cover-image .community-add image{ .community-item .cover-image .community-add image{
width: 100%; width: 100%;

52
subpages/associationNew/pages/associationlist/associationlist.js

@ -5,10 +5,6 @@ import {
getImageUrl2 getImageUrl2
} from "../../utils/api" } from "../../utils/api"
Page({ Page({
/**
* 页面的初始数据
*/
data: { data: {
associationList: [], associationList: [],
loadMoreVisible: false, loadMoreVisible: false,
@ -17,10 +13,6 @@ Page({
pageSize: 10, pageSize: 10,
imageUrlList: [], imageUrlList: [],
}, },
/**
* 生命周期函数--监听页面加载
*/
onLoad: function () { onLoad: function () {
// this.getPartyGroupList(); // this.getPartyGroupList();
getImageUrl2().then(res => { getImageUrl2().then(res => {
@ -29,48 +21,12 @@ Page({
}) })
}) })
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () { onShow: function () {
this.setData({ this.setData({
associationList: [] associationList: []
}) })
this.getPartyGroupList() this.getPartyGroupList()
}, },
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () { onReachBottom: function () {
this.setData({ this.setData({
loadMoreVisible: true loadMoreVisible: true
@ -87,6 +43,14 @@ Page({
getPartyGroupList () { getPartyGroupList () {
getPartyGroupList().then(res => { getPartyGroupList().then(res => {
console.log("获取党群列表", res) console.log("获取党群列表", res)
const groupNameList = ["进入玫瑰苑社群", "进入玫瑰湖社群", "进入锦水园社群", "进入锦祥园社群"]
res.data.forEach((item, index) => {
if (index <= 3) {
item.groupName = groupNameList[index]
} else {
item.groupName = "进入社群"
}
})
this.setData({ this.setData({
associationList: [...this.data.associationList, ...res.data], associationList: [...this.data.associationList, ...res.data],
loadMoreType: res.data.length === this.data.pageSize ? "loading": "none" loadMoreType: res.data.length === this.data.pageSize ? "loading": "none"

Loading…
Cancel
Save