Browse Source

我有事说页面调整;积分火火banner调整;

feature/optimise
ZhaoTongYao 5 years ago
parent
commit
f385817e68
  1. 7
      project.config.json
  2. 11
      subpages/discussion/pages/addIssue/addIssue.wxml
  3. 6
      subpages/discussion/pages/addIssue/addIssue.wxss
  4. 14
      subpages/heart/pages/clockIn/clockIn.js
  5. 2
      subpages/heart/pages/clockIn/clockIn.wxml
  6. 8
      subpages/heart/pages/leaderboardNew/leaderboardNew.wxml
  7. 11
      subpages/heart/pages/leaderboardNew/leaderboardNew.wxss
  8. 4
      utils/config.js

7
project.config.json

@ -130,6 +130,13 @@
"pathName": "pages/toRegister/toRegister", "pathName": "pages/toRegister/toRegister",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "subpages/heart/pages/leaderboardNew/leaderboardNew",
"pathName": "subpages/heart/pages/leaderboardNew/leaderboardNew",
"query": "",
"scene": null
} }
] ]
} }

11
subpages/discussion/pages/addIssue/addIssue.wxml

@ -22,10 +22,17 @@
</view> </view>
<view class="info-tips"> <view class="info-tips">
<view class="tips" bindtap="toOperationDesc" data-phrase="希望人大代表倾听"> <view class="tips" bindtap="toOperationDesc" data-phrase="人大在倾听">
<!-- <view class="spot"></view> --> <!-- <view class="spot"></view> -->
<checkbox></checkbox> <checkbox></checkbox>
<view class="content display-inline">希望人大代表倾听</view> <view class="content display-inline">人大在倾听</view>
</view>
</view>
<view class="info-tips">
<view class="tips" bindtap="toOperationDesc" data-phrase="政协委员有事好商量">
<!-- <view class="spot"></view> -->
<checkbox></checkbox>
<view class="content display-inline">政协委员有事好商量</view>
</view> </view>
</view> </view>
<!-- <view class="new-info">希望人大代表倾听</view> --> <!-- <view class="new-info">希望人大代表倾听</view> -->

6
subpages/discussion/pages/addIssue/addIssue.wxss

@ -13,7 +13,7 @@ page {
.add-issue .issue-content { .add-issue .issue-content {
width: 100%; width: 100%;
height: 650rpx; height: 730rpx;
border-radius: 16rpx; border-radius: 16rpx;
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
@ -137,7 +137,7 @@ page {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: 180rpx; margin-top: 100rpx;
} }
.add-issue .publish-issue button { .add-issue .publish-issue button {
@ -164,7 +164,7 @@ page {
} }
.info-tips { .info-tips {
width: 300rpx; width: 400rpx;
height: auto; height: auto;
/* display: flex; /* display: flex;
flex-direction: column; flex-direction: column;

14
subpages/heart/pages/clockIn/clockIn.js

@ -25,7 +25,8 @@ Page({
phraseId: "", //常用语id phraseId: "", //常用语id
ldata: false, ldata: false,
violationsCount: 0, //违规次数 violationsCount: 0, //违规次数
isConReview: false isConReview: false,
submissionDisabled: false
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
@ -236,6 +237,9 @@ Page({
return false return false
} }
this.setData({
submissionDisabled: true
})
if (this.data.phraseId) { if (this.data.phraseId) {
api.sagenumAddOne(this.data.phraseId).then(function () { api.sagenumAddOne(this.data.phraseId).then(function () {
// console.log('常用语言:' + res) // console.log('常用语言:' + res)
@ -298,6 +302,9 @@ Page({
// console.log('~~~~~~~":::::' + JSON.stringify(params)) // console.log('~~~~~~~":::::' + JSON.stringify(params))
let that = this let that = this
api.clock(params).then(function (res) { api.clock(params).then(function (res) {
that.setData({
submissionDisabled: false
})
if (res.code == 0) { if (res.code == 0) {
wx.showToast({ wx.showToast({
title: "打卡成功", title: "打卡成功",
@ -337,6 +344,11 @@ Page({
}) })
} }
} }
}).catch(err => {
console.log(err)
that.setData({
submissionDisabled: false
})
}) })
}, },
Rad (d) { //经纬度转换成三角函数中度分表形式。 Rad (d) { //经纬度转换成三角函数中度分表形式。

2
subpages/heart/pages/clockIn/clockIn.wxml

@ -41,5 +41,5 @@
<view class="clear"></view> <view class="clear"></view>
</view> </view>
<view class="button" bindtap="submission">提交打卡</view> <view class="button" bindtap="submission" disabled="{{submissionDisabled}}">提交打卡</view>
</view> </view>

8
subpages/heart/pages/leaderboardNew/leaderboardNew.wxml

@ -1,6 +1,10 @@
<view class="banner" wx:if="{{banner.length > 0}}"> <view class="banner" wx:if="{{banner.length > 0}}">
<image data-src="{{banner[0].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[0].bannerImg}}"></image> <swiper class="swiper">
<image data-src="{{banner[1].bannerImg}}" data-list="{{banner}}" bindtap="preViewImage" src="{{banner[1].bannerImg}}"></image> <swiper-item class="swiper-item" wx:for="{{banner}}" wx:for-item="item" wx:for-index="index" wx:key="index" wx:if="{{index%2==0&&(index+1)%2==1}}">
<image data-src="{{banner[index].bannerImg}}" data-list="{{banner[index]}}" bindtap="preViewImage" src="{{banner[index].bannerImg}}"></image>
<image data-src="{{banner[index+1].bannerImg}}" data-list="{{banner[index+1]}}" bindtap="preViewImage" src="{{banner[index+1].bannerImg}}" wx:if="{{banner[index+1].bannerImg!=undefined}}"></image>
</swiper-item>
</swiper>
</view> </view>
<!-- tabbar --> <!-- tabbar -->
<view class="tab-bar"> <view class="tab-bar">

11
subpages/heart/pages/leaderboardNew/leaderboardNew.wxss

@ -248,4 +248,15 @@ button::after {
.banner image{ .banner image{
width: 310rpx; width: 310rpx;
height: 440rpx; height: 440rpx;
}
.banner .swiper {
width: 100%;
height: 100%;
}
.banner .swiper .swiper-item {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
} }

4
utils/config.js

@ -6,13 +6,13 @@ module.exports = {
}; };
function BASEURL() { function BASEURL() {
return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
// return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址 // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
// return "http://192.168.43.19:9094/epdc-api/api/" // 测试环境 ip接口地址 // return "http://192.168.43.19:9094/epdc-api/api/" // 测试环境 ip接口地址
// return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址 // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
// return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址 // return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
// return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
// return 'http://10.10.10.63:9094/epdc-api/api/' // return 'http://10.10.10.63:9094/epdc-api/api/'
} }

Loading…
Cancel
Save