kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
aixianling
2021-12-31 16:59:21 +08:00
parent 45f6112774 45f795814c
commit 77f52fd8d4
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/AppPageBasic/AppPageBasic.vue
View File

@@ -22,11 +22,11 @@ export default {
icon: require('./img/shgk.png'), icon: require('./img/shgk.png'),
url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开' url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
}, },
{ // {
name: '问卷表单', // name: '问卷表单',
icon: require('./img/wjbd.png'), // icon: require('./img/wjbd.png'),
url: '../AppAskForm/AppAskForm' // url: '../AppAskForm/AppAskForm'
} // }
], ],
headerBg: require('./img/header-bg.png'), headerBg: require('./img/header-bg.png'),
} }

2
src/apps/AppResidentActivitie/Detail.vue
View File

@@ -102,7 +102,7 @@
<div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div> <div class="fixedBtns" v-if="this.current == 0 && detail.status == 0 && this.createUserId == this.user.id" @click="toAdd">编辑活动</div>
</div> </div>
<AiFixedBtn v-if="this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000"> <AiFixedBtn v-if="detail.status != 0 && this.createUserId == this.user.id && this.timeNow * 1 - this.timeEnd * 1 < 24 * 60 * 60 * 1000">
<div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" /> <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="AddPosts()" />
</AiFixedBtn> </AiFixedBtn>
</div> </div>

2
src/apps/AppWalkask/AppWalkask.vue
View File

@@ -154,6 +154,7 @@ export default {
areaSelect(e) { areaSelect(e) {
this.data = [] this.data = []
this.areaId = e this.areaId = e
this.current = 1
this.getList() this.getList()
}, },
@@ -162,6 +163,7 @@ export default {
this.areaId = this.user.areaId this.areaId = this.user.areaId
this.keyword = '' this.keyword = ''
this.currentTabs = index this.currentTabs = index
this.current = 1
this.getList() this.getList()
}, },

6
src/apps/AppWalkask/selectType.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<div class="selectType"> <div class="selectType">
<div class="header-top"> <div class="header-top" v-if="!showType">
<u-search v-model="keyword" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search> <u-search v-model="keyword" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
</div> </div>
@@ -116,10 +116,6 @@ export default {
}) })
this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => { this.$http.post(`/app/appapplicationinfo/list?appId=${this.appId}&current=${this.current}&size=${999}`, { searchParam: this.keyword }).then((res) => {
if (res.code == 0) { if (res.code == 0) {
uni.showToast({
title: '加载完毕',
icon: 'none',
})
res.data.records.map((item) => { res.data.records.map((item) => {
item.isChecked = false item.isChecked = false
}) })