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-24 09:59:28 +08:00
parent 16ed27006c 78a28c56c5
commit a5261dcd61
12 changed files with 46 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/AppBuilding/detail.vue
View File

@@ -41,7 +41,7 @@
</div> </div>
<u-select v-model="showSelect" :list="selectList" label-name="cellName" value-name="id" <u-select v-model="showSelect" :list="selectList" label-name="cellName" value-name="id"
@confirm="confirmSelect"></u-select> @confirm="confirmSelect"></u-select>
<u-popup v-model="show" mode="bottom" border-radius="14"> <u-popup v-model="show" mode="bottom" border-radius="14" height="1000">
<div class="popup"> <div class="popup">
<div class="bg"></div> <div class="bg"></div>
<div class="title">{{ houseInfo.createAddress }}</div> <div class="title">{{ houseInfo.createAddress }}</div>
@@ -127,6 +127,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pad-b112"></div>
<div class="pop-btn" @click="toAdd(houseInfo.id)">编辑修改</div> <div class="pop-btn" @click="toAdd(houseInfo.id)">编辑修改</div>
</u-popup> </u-popup>
</div> </div>
@@ -520,6 +521,12 @@ export default {
font-weight: 500; font-weight: 500;
color: #FFF; color: #FFF;
background: #1365DD; background: #1365DD;
position: fixed;
bottom: 0;
left: 0;
}
.pad-b112{
padding-bottom: 112px;
} }
} }

2
src/apps/AppCountryAlbum/list.vue
View File

@@ -50,7 +50,7 @@ export default {
getList() { getList() {
this.$http.post(`/app/appvillagepicturealbum/queryAlbumMenu`, null, { this.$http.post(`/app/appvillagepicturealbum/queryAlbumMenu`, null, {
params: { params: {
areaId: this.user.areaId, areaId: this.areaId,
} }
}).then(res => { }).then(res => {
if (res.code == 0) { if (res.code == 0) {

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

@@ -395,7 +395,7 @@ uni-page-body {
.imgs { .imgs {
margin-top: 8px; margin-top: 8px;
img { img {
width: 201px; width: 32%;
height: 204px; height: 204px;
margin-right: 8px; margin-right: 8px;
} }

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

@@ -29,7 +29,7 @@
<span>| 2天</span> <span>| 2天</span>
</div> </div>
<div class="areaNmae">{{ item.address }}</div> <div class="areaNmae" v-if="item.areaName || item.address">{{ item.areaName }}{{ item.address }}</div>
</div> </div>
<img :src="item.url[0].url" alt="" /> <img :src="item.url[0].url" alt="" />

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

@@ -1,6 +1,9 @@
<template> <template>
<div class="AppResidentDocument"> <div class="AppResidentDocument">
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker> <div class="areatop">
<div>区域选择</div>
<AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
</div>
<div class="line"></div> <div class="line"></div>
@@ -25,23 +28,6 @@
<span>{{ item.phone }}</span> <span>{{ item.phone }}</span>
</div> </div>
</div> </div>
<!-- <div class="left">
<img :src="item.avatar" alt="" v-if="item.photo" />
<img src="./components/img/4.png" alt="" v-else />
</div>
<div class="right">
<div class="rightTop">
{{ item.corpName }}
<span v-if="item.corpFullName" style="margin-left: 4px">@{{ item.corpFullName }}</span>
</div>
<div class="rightBottom">
<span>{{ item.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
<span>{{ item.phone }}</span>
</div>
</div> -->
</div> </div>
</div> </div>
@@ -143,6 +129,13 @@ export default {
.AppResidentDocument { .AppResidentDocument {
height: 100%; height: 100%;
background: #fff; background: #fff;
.areatop {
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 32px;
}
.line { .line {
height: 16px; height: 16px;
background: #f5f5f5; background: #f5f5f5;

6
src/apps/AppResidentDocument/DetailCard.vue
View File

@@ -12,7 +12,7 @@
</div> </div>
<div class="bottom"> <div class="bottom">
<div class="hints">家庭成员 {{ data.family.length }}人</div> <div class="hints">家庭成员 {{ data.family && data.family.length }}人</div>
<div v-if="data.family && data.family.length > 0"> <div v-if="data.family && data.family.length > 0">
<div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)"> <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
@@ -26,8 +26,8 @@
<div class="rightTop-lefts"> <div class="rightTop-lefts">
<span class="names">{{ item.name }}</span> <span class="names">{{ item.name }}</span>
<span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span> <span class="fileStatuss" v-if="item.fileStatus == 1"> {{ $dict.getLabel('fileStatus', item.fileStatus) }}</span>
<span class="householdNames" v-if="item.householdRelation == 1">户主</span>
<span class="householdNames" v-else> <span class="householdNames">
{{ $dict.getLabel('householdRelation', item.householdRelation) }} {{ $dict.getLabel('householdRelation', item.householdRelation) }}
</span> </span>
</div> </div>

39
src/apps/AppResidentDocument/DetailPeople.vue
View File

@@ -2,21 +2,20 @@
<div class="DetailPeople"> <div class="DetailPeople">
<div class="top"> <div class="top">
<div class="photos"> <div class="photos">
<img :src="data.resident.photo" alt="" v-if="data.resident.photo" /> <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
<img src="./components/img/44.png" alt="" v-else /> <img src="./components/img/44.png" alt="" v-else />
</div> </div>
<div class="right"> <div class="right">
<div class="rightTop"> <div class="rightTop">
<span class="names">{{ data.resident.name }}</span> <span class="names">{{ data.resident && data.resident.name }}</span>
<span class="householdNames" v-if="data.resident.householdRelation == 1">户主</span> <span class="householdNames">
<span class="householdNames" v-else> {{ $dict.getLabel('householdRelation', data.resident && data.resident.householdRelation) }}
{{ $dict.getLabel('householdRelation', data.resident.householdRelation) }}
</span> </span>
</div> </div>
<div class="rightBottom">{{ data.resident.phone }}</div> <div class="rightBottom" v-if="data.resident && data.resident.phone">{{ data.resident.phone }}</div>
</div> </div>
</div> </div>
@@ -28,47 +27,47 @@
<div class="contents"> <div class="contents">
<div class="item"> <div class="item">
<span>籍贯</span> <span>籍贯</span>
<span>{{ data.resident.birthplaceAreaName }}</span> <span>{{ data.resident && data.resident.birthplaceAreaName }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>身份证号</span> <span>身份证号</span>
<span>{{ data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span> <span>{{ data.resident && data.resident.idNumber.replace(/^(\w{6})\w{8}(.*)$/, '$1****$2') }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>民族</span> <span>民族</span>
<span> {{ $dict.getLabel('nation', data.resident.householdName) }}</span> <span v-if="data.resident && data.resident.householdName"> {{ $dict.getLabel('nation', data.resident.householdName) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>文化程度</span> <span>文化程度</span>
<span>{{ $dict.getLabel('education', data.resident.education) }}</span> <span v-if="data.resident && data.resident.education">{{ $dict.getLabel('education', data.resident.education) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>婚姻状况</span> <span>婚姻状况</span>
<span>{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span> <span v-if="data.resident && data.resident.maritalStatus">{{ $dict.getLabel('maritalStatus', data.resident.maritalStatus) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>政治面貌</span> <span>政治面貌</span>
<span>{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span> <span v-if="data.resident && data.resident.politicsStatus">{{ $dict.getLabel('politicsStatus', data.resident.politicsStatus) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>兵役状况</span> <span>兵役状况</span>
<span>{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span> <span v-if="data.resident && data.resident.militaryStatus">{{ $dict.getLabel('militaryStatus', data.resident.militaryStatus) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>宗教信仰</span> <span>宗教信仰</span>
<span>{{ $dict.getLabel('faithType', data.resident.faithType) }}</span> <span v-if="data.resident && data.resident.faithType">{{ $dict.getLabel('faithType', data.resident.faithType) }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>职业</span> <span>职业</span>
<span>{{ $dict.getLabel('job', data.resident.job) }}</span> <span v-if="data.resident && data.resident.job">{{ $dict.getLabel('job', data.resident.job) }}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -81,27 +80,27 @@
<div class="contents"> <div class="contents">
<div class="item"> <div class="item">
<span>联系方式</span> <span>联系方式</span>
<span class="phones" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span> <span class="phones" v-if="data.resident && data.resident.phone" @click="callPhone(data.resident.phone)">{{ data.resident.phone }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>现住址</span> <span>现住址</span>
<span>{{ data.resident.currentAreaName }}</span> <span v-if="data.resident && data.resident.currentAreaName">{{ data.resident.currentAreaName }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>现住详细地址</span> <span>现住详细地址</span>
<span>{{ data.resident.currentAddress }}</span> <span v-if="data.resident && data.resident.currentAddress">{{ data.resident.currentAddress }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>户籍地址</span> <span>户籍地址</span>
<span>{{ data.resident.householdAreaName }}</span> <span v-if="data.resident && data.resident.householdAreaName">{{ data.resident.householdAreaName }}</span>
</div> </div>
<div class="item"> <div class="item">
<span>户籍详细地址</span> <span>户籍详细地址</span>
<span>{{ data.resident.householdAddress }}</span> <span v-if="data.resident && data.resident.householdAddress">{{ data.resident.householdAddress }}</span>
</div> </div>
</div> </div>
</div> </div>

BIN
src/apps/AppResourcesManage/img/play-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
src/apps/AppResourcesManage/img/stop-img.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

2
src/apps/AppResourcesManage/recording.vue
View File

@@ -109,7 +109,7 @@
</div> </div>
<div class="footer"> <div class="footer">
<span v-if="isRecording || isStop" @click="restart">重新开始</span> <span v-if="isRecording || isStop" @click="restart">重新开始</span>
<img v-if="isStop" :src="`${$cdn}video/${!isPlay ? 'play-icon' : 'stop-img'}.png`" @click="play"> <img v-if="isStop" :src="`${!isPlay ? './img/play-icon' : './img/stop-img'}.png`" @click="play">
<img v-else :src="isRecording ? stopImg : microphone" @click="record"> <img v-else :src="isRecording ? stopImg : microphone" @click="record">
<span v-if="isStop" @click="save">保存</span> <span v-if="isStop" @click="save">保存</span>
</div> </div>

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

@@ -17,7 +17,7 @@
<div class="line"></div> <div class="line"></div>
<u-form-item label="图片上传 (最多9张)" prop="images" :border-bottom="false" class="avatars" label-position="top"> <u-form-item label="图片上传 (最多9张)" prop="images" :border-bottom="false" class="avatars" label-position="top">
<AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9"></AiUploader> <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
</u-form-item> </u-form-item>
<div class="line"></div> <div class="line"></div>

3
src/apps/AppWorkonline/AppWorkonline.vue
View File

@@ -165,9 +165,6 @@ uni-page-body {
font-weight: 500; font-weight: 500;
margin-bottom: 16px; margin-bottom: 16px;
width: 80%; width: 80%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.plan, .plan,
.modetpye, .modetpye,