Browse Source

优化

master
zhaoyongnian 5 years ago
parent
commit
740d009661
  1. 38
      app.json
  2. 6
      components/activity/activity.wxml
  3. 12
      pages/complete/complete.js
  4. 2
      pages/mine/mine.wxss
  5. 3
      subpages/association/pages/replyOrRemark/replyOrRemark.js
  6. 23
      subpages/association/utils/api.js
  7. 1
      subpages/heart/pages/leaderboard/leaderboard.wxss
  8. 2
      subpages/integralCentre/pages/index/index.wxss

38
app.json

@ -123,44 +123,6 @@
] ]
} }
}, },
"tabBar": {
"color": "#666666",
"selectedColor": "#FF0000",
"backgroundColor": "#FFFFFF",
"borderStyle": "white",
"list": [
{
"pagePath": "pages/indexNew/indexNew",
"text": "首页",
"iconPath": "images/home.png",
"selectedIconPath": "images/homeSelected.png"
},
{
"pagePath": "pages/discussion/discussion",
"text": "我有事说",
"iconPath": "images/discuss.png",
"selectedIconPath": "images/discussSelected.png"
},
{
"pagePath": "pages/association/association",
"text": "党群互动",
"iconPath": "images/association.png",
"selectedIconPath": "images/association-select.png"
},
{
"pagePath": "pages/heart/heart",
"text": "初心互助",
"iconPath": "images/mutual.png",
"selectedIconPath": "images/mutualSelected.png"
},
{
"pagePath": "pages/mine/mine",
"text": "我的",
"iconPath": "images/mine.png",
"selectedIconPath": "images/mineSelected.png"
}
]
},
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",

6
components/activity/activity.wxml

@ -15,12 +15,12 @@
<view class="infos_title">{{item.title}}</view> <view class="infos_title">{{item.title}}</view>
<view class="infos_times"> <view class="infos_times">
<view> <view>
<image class="imgsize" src="/images/when.png" /> <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A6WAcS1lAAABQRNkl7Y828.png" />
活动时间:{{item.actStartTime}}至 活动时间:{{item.actStartTime}}至
</view> </view>
<view class="endtime">{{item.actEndTime}}</view> <view class="endtime">{{item.actEndTime}}</view>
<view> <view>
<image class="imgsize" src="/images/where.png" /> <image class="imgsize" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A7-AKfhbAAABTg-ZMDk458.png" />
<text>活动地点:{{item.actAddress}}</text> <text>活动地点:{{item.actAddress}}</text>
</view> </view>
</view> </view>
@ -32,7 +32,7 @@
</view> </view>
</view> </view>
</view> </view>
<image class="signed-logo" wx:if="{{item.signupFlag=='1'}}" src="/images/signed.png" /> <image class="signed-logo" wx:if="{{item.signupFlag=='1'}}" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7165A-CAIEeKAABSBTxj8ns662.png" />
</view> </view>
<!-- <view hidden="{{nomore}}" class="loadmore">上滑加载更多</view> <!-- <view hidden="{{nomore}}" class="loadmore">上滑加载更多</view>
<view hidden="{{!nomore}}" class="loadmore">没有更多了~</view> --> <view hidden="{{!nomore}}" class="loadmore">没有更多了~</view> -->

12
pages/complete/complete.js

@ -184,6 +184,14 @@ Page({
}) })
return false return false
} }
if (this.data.street.length > 30) {
wx.showToast({
title: '所在街道不超过30字',
icon: 'none',
duration: 3000
})
return false
}
if (this.data.submitEvent === true) { if (this.data.submitEvent === true) {
wx.showToast({ wx.showToast({
title: '加载中...', title: '加载中...',
@ -252,7 +260,7 @@ Page({
content: res.data.resultMsg, content: res.data.resultMsg,
success: function (res) { success: function (res) {
wx.reLaunch({ wx.reLaunch({
url: '/pages/index/index' url: '/pages/indexNew/indexNew'
}) })
} }
}) })
@ -264,7 +272,7 @@ Page({
complete: function () { complete: function () {
setTimeout(function () { setTimeout(function () {
wx.reLaunch({ wx.reLaunch({
url: '/pages/index/index' url: '/pages/indexNew/indexNew'
}) })
}, 3000); }, 3000);
} }

2
pages/mine/mine.wxss

@ -63,6 +63,7 @@ page {
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
width: calc(100% - 130rpx);
} }
.personal-info .box .content .top .avatar { .personal-info .box .content .top .avatar {
width: 100rpx; width: 100rpx;
@ -77,6 +78,7 @@ page {
} }
.personal-info .box .content .top .right { .personal-info .box .content .top .right {
height: 100%; height: 100%;
width: calc(100% - 100rpx);
margin-left: 14rpx; margin-left: 14rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;

3
subpages/association/pages/replyOrRemark/replyOrRemark.js

@ -1,5 +1,4 @@
import { import {
// remarkOrReply,
topicCom, topicCom,
topicReply } from '../../utils/api' topicReply } from '../../utils/api'
@ -47,7 +46,7 @@ Page({
wx.showLoading({ wx.showLoading({
title: '加载中' title: '加载中'
}) })
if (faCommentId) {//对评论进行回复 if (this.data.faCommentId.length > 0) {//对评论进行回复
topicReply(para).then(res => { topicReply(para).then(res => {
wx.hideLoading() wx.hideLoading()
console.log('回复', res) console.log('回复', res)

23
subpages/association/utils/api.js

@ -184,6 +184,29 @@ export function remarkOrReply ({ topicId, faCommentId, content }) {
}) })
} }
/**
* 话题评论 v2
*/
export function topicCom({ issueId, faCommentId, content, itemId }) {
return request.post('group/comment/topicCom', {
issueId,
faCommentId,
content,
itemId
})
}
/**
* 话题回复 v2
*/
export function topicReply({ issueId, faCommentId, content, itemId }) {
return request.post('group/comment/topicReply', {
issueId,
faCommentId,
content,
itemId
})
}
/** /**
* 关闭话题 * 关闭话题
*/ */

1
subpages/heart/pages/leaderboard/leaderboard.wxss

@ -3,6 +3,7 @@ page {
min-height: 100vh; min-height: 100vh;
height: auto; height: auto;
overflow-y: auto; overflow-y: auto;
background: #f7f7f7;
} }
.love-ranking { .love-ranking {
width: 100%; width: 100%;

2
subpages/integralCentre/pages/index/index.wxss

@ -264,5 +264,5 @@ button::after {
line-height: 80rpx; line-height: 80rpx;
font-size: 32rpx; font-size: 32rpx;
font-weight: 500; font-weight: 500;
color: rgba(178, 0, 4, 1); color: #B20004;
} }

Loading…
Cancel
Save