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-09 18:02:36 +08:00
parent 58df0db9ec 4278b1bdac
commit ebff9340b2
7 changed files with 282 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/AppMeetingNotice/AppMeetingNotice.vue
View File

@@ -35,8 +35,8 @@
<AiOpenData type="userName" :openid="item.createUserId"/>
</u-row>
<u-gap height="20"></u-gap>
<u-row class="info">
<span>会议地点：</span>
<u-row class="info" style="align-items: start;flex-wrap: nowrap;">
<span style="flex-shrink: 0">会议地点：</span>
<span>{{ item.address }}</span>
</u-row>
<div class="tag" :style="{background:'url(' + $cdn + tag(item.joinStatus) + ')'}"></div>

2
src/apps/AppMeetingNotice/components/detail.vue
View File

@@ -24,7 +24,7 @@
<span>{{ detail.startTime && detail.startTime.substr(0, 16) }} 至 {{ detail.endTime && detail.endTime.substr(0, 16) }}</span>
</u-row>
<u-gap height="8"></u-gap>
<u-row>
<u-row style="align-items: start;flex-wrap: nowrap;">
<img :src="$cdn + 'common/location.png'" alt="">
<span>{{ detail.address }}</span>
</u-row>

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

@@ -1,7 +1,7 @@
<template>
<div class="AppWalkask">
<template v-if="isList">
<u-navbar title="走访慰问" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :background="backgroundNavbar"> </u-navbar>
<u-navbar title="走访慰问" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :border-bottom="false" :background="backgroundNavbar"> </u-navbar>
<div class="header-top">
<u-tabs :list="tabList" :is-scroll="false" :current="current" height="96" bg-color="#3975C6" inactive-color="#fff" active-color="#fff" @change="change"></u-tabs>
@@ -23,7 +23,7 @@
</div>
<!-- v-if="data.length > 0" -->
<div @click.stop="btnHide" class="datas">
<div @click.stop="btnHide" class="datas" v-if="data.length > 0">
<div class="cards" @click.stop="toDetail" v-for="(item, i) in 4" :key="i">
<div class="cards-top">
<div class="cards-left">
@@ -55,9 +55,11 @@
</div>
</div>
<!-- <ai-empty description="您还未添加过入户调查走访" class="emptyWrap" v-else> </ai-empty> -->
<div v-else>
<ai-empty description="您还未添加过入户调查走访" class="emptyWrap"> </ai-empty>
<div class="addBtn">点击<span class="toAdd">新增按钮</span>试试试吧~</div>
<div class="addBtn">点击<span class="toAdd" @click="toAdd">新增按钮</span>试试试吧~</div>
</div>
</div>
<div class="currentRight" v-if="current == 1">1</div>
@@ -179,11 +181,10 @@ export default {
<style lang="scss" scoped>
.AppWalkask {
height: 100%;
// background: #fff;
// padding: 0 0 100% 0;
.header-middle {
padding-bottom: 56px;
.currentLeft {
padding-bottom: 56px;
background: #fff;
.currentLeft-top {
display: flex;
align-items: center;

17
src/apps/AppWalkask/components/add.vue
View File

@@ -1,5 +1,6 @@
<template>
<div class="add">
<div v-if="addList">
<u-navbar title="新建走访" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :background="backgroundNavbar"> </u-navbar>
<div class="header-content">
@@ -13,7 +14,8 @@
</u-form-item>
<u-form-item label="走访对象" prop="object" style="position: relative">
<u-input v-model="forms.object" disabled placeholder="请选择走访对象" @click="showObject = true" />
<u-input v-model="forms.object" disabled placeholder="请选择走访对象" @click="toWalkObject" />
<!-- @click="showObject = true" -->
<u-select v-model="showObject" :list="Objectlist" @confirm="changeObject"></u-select>
@@ -48,15 +50,19 @@
<AiBack></AiBack>
</div>
<component v-else :is="comp" :params="params"></component>
</div>
</template>
<script>
import AiUploader from '../../../components/AiUploader.vue'
import AiBack from '../../../components/AiBack.vue'
import walkObject from './walkObject.vue'
export default {
name: 'add',
components: { AiUploader, AiBack },
components: { AiUploader, AiBack, walkObject },
props: {},
data() {
return {
@@ -95,6 +101,7 @@ export default {
showObject: false,
showStstus: false,
flag: false,
addList: true,
}
},
computed: {},
@@ -156,6 +163,12 @@ export default {
this.forms.nowStstuslabel = e[0].label
},
toWalkObject() {
this.addList = false
this.comp = 'walkObject'
this.params = 111
},
change(e) {
console.log(e)
},

71
src/apps/AppWalkask/components/detail.vue
View File

@@ -1,8 +1,41 @@
<template>
<div class="detail">
<u-navbar title="" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :background="backgroundNavbar"> </u-navbar>
<u-navbar title="走访详情" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :border-bottom="false" :background="backgroundNavbar"> </u-navbar>
<div>detail</div>
<div class="header-top">
<div class="hint">花园小区1栋101脱贫攻坚走访——沙堡村李维民</div>
<div class="walk-item">
<span>走访对象：</span>
<span>李维民</span>
</div>
<div class="walk-item">
<span>现实状态：</span>
<span>李维民</span>
</div>
<div class="walk-item">
<span>走访人员：</span>
<span>李维民</span>
</div>
<div class="walk-item">
<span>走访时间：</span>
<span>2021-12-28 14:00</span>
</div>
</div>
<div class="header-middle">
<div class="hint-con">本次议事会通过“7步议事法”即收集意见、确认议题、制定方案、发布公告、组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的学习性和功能性会议。 组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的线上学习性和功能性会议。作为基层民主自治的新亮点，已经全面铺开的互联网+“议事大厅”使得三联村成功走出了一条集思广益、民主决策和村民自治的新路子。</div>
<div class="imgs">
<img src="../components/images/天使彦5.jpg" alt="" />
<img src="../components/images/天使彦5.jpg" alt="" />
<img src="../components/images/天使彦5.jpg" alt="" />
<img src="../components/images/天使彦5.jpg" alt="" />
</div>
</div>
<AiBack></AiBack>
</div>
@@ -32,5 +65,39 @@ export default {
<style lang="scss" scoped>
.detail {
height: 100%;
.header-top {
background: #3975c6;
padding: 24px 32px 32px;
.hint {
font-size: 40px;
font-weight: 500;
color: #ffffff;
}
.walk-item {
font-size: 28px;
color: #d7e3f3;
margin-top: 16px;
}
}
.header-middle {
background: #fff;
padding: 32px 32px 32px 32px;
.hint-con {
font-size: 32px;
color: #666666;
}
.imgs {
margin: 32px 0 48px 0;
img {
width: 218px;
height: 218px;
margin-right: 16px;
}
img:nth-child(3n + 0) {
margin-right: 0;
}
}
}
}
</style>

BIN
src/apps/AppWalkask/components/images/user.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

155
src/apps/AppWalkask/components/walkObject.vue Normal file
View File

@@ -0,0 +1,155 @@
<template>
<div class="walkObject">
<u-navbar title="选择走访慰问对象" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :border-bottom="false" :background="backgroundNavbar"> </u-navbar>
<div class="header-top">
<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 class="header-middle">
<div class="hint">可选范围</div>
<div class="empty-div"></div>
<div class="Checkbox">
<u-checkbox-group :wrap="true" @change="checkboxGroupChange">
<u-checkbox @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list" shape="circle" :key="index" :name="item.name">
<img src="./images/user.png" alt="" style="width: 36px; height: 36px; border-radius: 8px; vertical-align: middle; margin: 0 18px 0 17px" />
<span>{{ item.name }}</span>
<u-icon name="arrow-right" color="#ccc" style="position: absolute; right: 0; top: 20px"></u-icon>
</u-checkbox>
</u-checkbox-group>
</div>
</div>
<div class="fixedBtn">
<div class="typeName">
<span class="typeName-box" v-for="(item, index) in list" :key="index" v-if="item.checked == true">
{{ item.name }}
</span>
</div>
<div class="subBtn" @click="submit">确定选择</div>
</div>
</div>
</template>
<script>
export default {
name: 'walkObject',
components: {},
props: {},
data() {
return {
backgroundNavbar: {
backgroundColor: '#3975C6',
},
keyword: '',
list: [
{
name: '残疾人',
},
{
name: '精神病患者',
},
{
name: '吸毒人员',
},
],
nameList: [],
}
},
computed: {},
onLoad() {},
onShow() {},
methods: {
checkboxGroupChange(e) {
console.log(1, e)
e.map((item) => {
console.log(item)
})
// list.map((item) => {
// if (item.checked == true) {
// var obj = { name: item.name }
// this.nameList.push(obj)
// }
// })
},
checkboxChange(e) {
console.log(2, e)
},
submit() {},
},
}
</script>
<style lang="scss" scoped>
.walkObject {
background: #ffffff;
padding-bottom: 118px;
.header-top {
background: #fff;
padding: 20px 32px;
}
.header-middle {
.hint {
padding: 0 20px 0 32px;
height: 112px;
line-height: 112px;
box-shadow: 0px 1px 0px 0px #e4e5e6;
font-size: 30px;
font-weight: 500;
}
.empty-div {
height: 16px;
background: #f5f5f5;
}
.Checkbox {
padding: 0 20px 0 30px;
::v-deep .u-checkbox-group {
.u-checkbox {
position: relative;
height: 112px;
}
}
}
}
.fixedBtn {
display: flex;
justify-content: space-between;
position: fixed;
bottom: 0;
width: 100%;
box-sizing: border-box;
padding: 0 32px;
.subBtn {
margin: 20px 0 18px 0;
padding: 18px 32px;
background: #1365dd;
border-radius: 4px;
font-size: 32px;
color: #ffffff;
}
.typeName {
// margin: 48px 0 44px 0;
margin: 36px 0 22px 0;
.typeName-box {
padding: 16px 14px;
background: #eaeef1;
border-radius: 8px;
font-size: 30px;
font-weight: 500;
margin-left: 10px;
}
.typeName-box:first-child {
margin-left: 0;
}
}
}
}
</style>