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:
yanran200730
2022-01-14 14:46:05 +08:00
parent 8a4ca75e01 351593a3aa
commit 6d56043aa3
9 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/AppEpidemicSituation/HealthDetail.vue
View File

@@ -145,10 +145,12 @@ export default {
</script>
<style scoped lang="scss">
uni-page-body {
height: 100%;
}
.HealthDetail {
height: 100%;
// padding-bottom: 120px;
background: #f3f6f9;
background: #f5f5f5 !important;
.top {
.templates {
display: flex;

4
src/apps/AppGridManagement/FamilyList.vue
View File

@@ -6,8 +6,8 @@
<li>
<div class="user">
<div>
<img src="./components/img/user-img.png" alt="" class="userImg">
<!-- <img src="./components/img/user-img.png" alt="" class="userImg"> -->
<img :src="item.photo" class="userImg" v-if="item.photo">
<img src="./components/img/user-img.png" alt="" class="userImg" v-else>
</div>
<div class="info">
<div class="name">

1
src/apps/AppGridManagement/Organization.vue
View File

@@ -29,6 +29,7 @@
<p>{{item.girdName}} </p>
</div>
</div>
<AiEmpty description="暂无数据" class="emptyWrap" v-if="!dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
<div class="pad-b112"></div>
</div>
</template>

3
src/apps/AppGridManagement/SelectGird.vue
View File

@@ -24,7 +24,7 @@
<AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
</div>
</div>
<div style="padding-bottom: 70px;background:#f5f5f5;"></div>
<!-- <div style="padding-bottom: 70px;"></div> -->
<div class="subBtn" @click="submit">
<div>确定选择</div>
</div>
@@ -156,6 +156,7 @@ export default {
.SelectGird {
height: 100%;
background: #fff;
padding-bottom: 140px;
.header-top {
background: #fff;
padding: 20px 32px;

3
src/apps/AppGridManagement/SelectUser.vue
View File

@@ -25,7 +25,7 @@
<AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
</div>
</div>
<div style="padding-bottom: 70px;background:#f5f5f5;"></div>
<!-- <div style="padding-bottom: 70px;background:#fff;"></div> -->
<div class="subBtn" @click="submit">
<div>确定选择</div>
</div>
@@ -103,6 +103,7 @@ export default {
<style scoped lang="scss">
.SelectUser {
height: 100%;
padding-bottom: 140px;
background: #fff;
.header-top {
background: #fff;

5
src/apps/AppGridManagement/SetGird.vue
View File

@@ -25,7 +25,7 @@
<AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
</div>
</div>
<div style="padding-bottom: 70px;background:#f5f5f5;"></div>
<!-- <div style="padding-bottom: 70px;"></div> -->
<div class="subBtn" @click="toAddGird">
<div>添加网格</div>
</div>
@@ -44,7 +44,7 @@
</div>
<div v-if="form.girdMemberManageList && form.girdMemberManageList.length">
<div class="info-flex" v-for="(item, index) in form.girdMemberManageList" :key="index">
<span class="label">网格负责人</span>
<span class="label">网格长</span>
<span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
<img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
v-if="item.phone">
@@ -223,6 +223,7 @@ export default {
.setGird {
height: 100%;
background: #fff;
padding-bottom: 140px;
.header-top {
background: #fff;
padding: 20px 32px;

22
src/apps/AppGridManagement/Statistics.vue
View File

@@ -15,14 +15,14 @@
<div class="card">
<div class="box">
<span class="count" v-if="peopleList && peopleList['网格长']">{{ peopleList['网格长']}}</span>
<span class="count" v-if="peopleList && peopleList['网格长']">{{ peopleList['网格长'] }}</span>
<span class="count" v-else>0</span>
<span class="girdCount">网格长</span>
</div>
<div class="box">
<span class="count" v-if="peopleList && peopleList['网格员'] ">{{ peopleList['网格员']}}</span>
<span class="count" v-else>0</span>
<span class="count" v-if="peopleList && peopleList['网格员']">{{ peopleList['网格员'] }}</span>
<span class="count" v-else>0</span>
<span class="girdCount">网格员</span>
</div>
@@ -56,7 +56,7 @@
<div class="boxes">
<span class="boxesLeft">网格层级</span>
<span class="boxesRight">{{ $dict.getLabel('girdType', girdMsgList.girdLevel) || '' }}</span>
<span class="boxesRight">{{ $dict.getLabel('girdLevel', girdMsgList.girdLevel) || '' }}</span>
</div>
</div>
</div>
@@ -77,19 +77,21 @@ export default {
girdUser: [],
peopleList: {},
girdMsgList: {},
checkType: ''
checkType: '',
}
},
computed: {},
watch: {},
onLoad() {},
mounted() {
this.$dict.load('girdType', 'girdLevel').then(() => {})
this.isGirdUser()
this.$dict.load('girdType', 'girdLevel').then(() => {
this.isGirdUser()
})
uni.$on('goback', (res) => {
this.girdMsgList = res
this.getList()
})
})
},
methods: {
isGirdUser() {
@@ -117,8 +119,8 @@ export default {
})
},
linkTo(url) {
uni.navigateTo({url})
}
uni.navigateTo({ url })
},
},
}
</script>

1
src/apps/AppResidentActivitie/AppResidentActivities.vue
View File

@@ -103,6 +103,7 @@ export default {
.then((res) => {
if (res.code == 0) {
this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
this.$forceUpdate()
this.total = res.data.total
this.pages = res.data.pages

16
src/apps/AppResidentDocument/AppResidentDocument.vue
View File

@@ -20,7 +20,7 @@
<u-search v-model="keyword" :clearabled="true" placeholder="姓名/联系方式/身份证后6位" :show-action="false" bg-color="#F5F5F5" search-icon-color="#E2E8F1" color="#666" height="58" @search="handerSearch" @clear="handerClear"></u-search>
</div>
<div class="datas" v-if="datas.length > 0">
<div class="dataes" v-if="datas.length > 0">
<div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
<div class="left">
<img :src="item.photo" alt="" v-if="item.photo" />
@@ -38,7 +38,7 @@
</div>
</div>
<AiEmpty v-else></AiEmpty>
<AiEmpty class="emptyWrap" v-else></AiEmpty>
</div>
</template>
@@ -66,7 +66,7 @@ export default {
],
currentTabs: 0,
areaId: '',
areaName: ''
areaName: '',
}
},
computed: {
@@ -153,11 +153,13 @@ export default {
height: 16px;
background: #f5f5f5;
}
.seachObjs {
border-bottom: 2px solid #f5f5f5;
border-top: 2px solid #f5f5f5;
padding: 20px 32px;
}
::v-deep .u-form {
width: 100%;
.areaIds {
@@ -186,7 +188,8 @@ export default {
}
}
}
.datas {
.dataes {
.datass {
display: flex;
padding: 24px 32px;
@@ -215,5 +218,10 @@ export default {
}
}
}
.emptyWrap {
background: #f5f5f5;
margin: 0;
}
}
</style>