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

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

Browse Source
This commit is contained in:
花有清香月有阴
2022-01-07 18:31:42 +08:00
parent 4f2e13a795 c183494165
commit 0c463a52c0
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/AppHandSnapshot/Content.vue
View File

@@ -136,7 +136,11 @@ export default {
uni.$emit('updateDeatil') uni.$emit('updateDeatil')
uni.$emit('getListInit') uni.$emit('getListInit')
setTimeout(() => { setTimeout(() => {
uni.navigateBack() if(this.status == 1) {
uni.navigateBack({delta: 2})
}else {
uni.navigateBack()
}
},600) },600)
} }
}) })

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

@@ -114,7 +114,7 @@
<div class="doIt" @click="doItShow = true">我来受理</div> <div class="doIt" @click="doItShow = true">我来受理</div>
</div> </div>
<div class="endDoIt" v-if="data.eventStatus == 1" @click="toContent(3)">前往办理</div> <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div>
</div> </div>
<u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal> <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定受理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>

2
src/apps/AppVillageDiscuss/Add.vue
View File

@@ -52,7 +52,7 @@
</div> </div>
</div> </div>
<div class="submitType">提交方式</div> <div class="submitType">投票方式</div>
<div class="summitOpt"> <div class="summitOpt">
<div class="leftopt" @click="opts = 0" :class="!opts ? 'current' : ''">单选</div> <div class="leftopt" @click="opts = 0" :class="!opts ? 'current' : ''">单选</div>

16
src/apps/AppVillageDiscuss/Detail.vue
View File

@@ -67,12 +67,12 @@
</div> </div>
</div> </div>
<div class="votePeople"> <div class="votePeople" v-if="data.type === '1'">
<div class="leftPeople">共23人参与投票</div> <div class="leftPeople">共{{ data.voteCount }}人参与投票</div>
<div class="right"> <div class="right">
<span>查看详情</span> <span @click="toUserList">查看详情</span>
<u-icon name="arrow-right" color="#999" @click="toUserList"></u-icon> <u-icon name="arrow-right" color="#999"></u-icon>
</div> </div>
</div> </div>
@@ -307,7 +307,10 @@ export default {
.then((res) => { .then((res) => {
if (res?.code == 0) { if (res?.code == 0) {
this.$u.toast('结束公示成功!') this.$u.toast('结束公示成功!')
this.getDetail()
setTimeout(() => {
this.getDetail()
}, 600)
} }
}) })
}) })
@@ -324,6 +327,7 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
.Detail { .Detail {
padding-bottom: 40px; padding-bottom: 40px;
background: #F6F7F9;
.end-btn { .end-btn {
position: fixed; position: fixed;
@@ -538,7 +542,7 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
margin-top: 8px; margin-top: 16px;
height: 112px; height: 112px;
padding: 0 32px 0 52px; padding: 0 32px 0 52px;
background: #fff; background: #fff;