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
2021-12-03 17:04:32 +08:00
parent b9b9773513 64dcada48f
commit 65a6d28bbb
2 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/apps/AppAskForm/formDetail.vue
View File

@@ -126,6 +126,9 @@ export default {
}
},
methods: {
emitShow(){
document.title = this.form.title || "调查问卷"
},
getForm() {
let {id} = this.$route.query
this.$http.post("/app/appquestionnairetemplate/queryDetailById", null, {
@@ -223,9 +226,6 @@ export default {
},
created() {
this.isResult ? this.getResult() : this.getForm()
},
mounted() {
document.title = this.form.title || "调查问卷"
}
}
</script>

75
src/apps/AppNotification/AppNotification.vue
View File

@@ -6,7 +6,7 @@
</AiTopFixed>
<div class="body" v-if="dataList.length">
<div class="card" v-for="(item,idx) in dataList" :key="idx" @click="handeClick(item)">
<template>
<template v-if="!item.imgUrl">
<label>
<span class="status" v-if="index==0 && item.readStatus==0">未读</span>
<span class="status read" v-if="index==0 && item.readStatus!=0">已读</span>
@@ -21,25 +21,26 @@
<text>{{ item.releaseTime }}</text>
</span>
</template>
<!-- <template v-else>-->
<!-- <div class="has-pic">-->
<!-- <div class="left">-->
<!-- <label>-->
<!-- <b v-if="index==0 && item.readStatus==0"></b>-->
<!-- <div class="tag" v-if="index==1" :style="color(item.status)">-->
<!-- {{ $dict.getLabel("announcementStatus", item.status) }}-->
<!-- </div>-->
<!-- {{ item.title }}-->
<!-- </label>-->
<!-- <u-gap height="16"></u-gap>-->
<!-- <span class="info">-->
<!-- <text>{{ item.releaseUserName }}</text>-->
<!-- <text>{{ item.releaseTime }}</text>-->
<!-- </span>-->
<!-- </div>-->
<!-- <img :src="item.imgUrl" alt="">-->
<!-- </div>-->
<!-- </template>-->
<template v-else>
<div class="has-pic">
<div class="left">
<label>
<span class="status" v-if="index==0 && item.readStatus==0">未读</span>
<span class="status read" v-if="index==0 && item.readStatus!=0">已读</span>
<div class="tag" v-if="index==1" :style="color(item.status)">
{{ $dict.getLabel("announcementStatus", item.status) }}
</div>
{{ item.title }}
</label>
<u-gap height="16"></u-gap>
<span class="info">
<text>{{ item.releaseUserName }}</text>
<text>{{ item.releaseTime }}</text>
</span>
</div>
<img :src="item.imgUrl" alt="">
</div>
</template>
</div>
</div>
@@ -296,23 +297,6 @@ export default {
line-height: 44px;
}
.status {
display: inline-block;
width: 88px;
height: 36px;
font-size: 26px;
color: #FF8822;
background:rgba(255,136,34,.1);
line-height: 36px;
text-align: center;
margin-right: 4px;
}
.read{
background: rgba(102,102,102,.1);
color: #666666;
}
.tag {
width: 96px;
height: 44px;
@@ -361,6 +345,23 @@ export default {
}
}
}
.status {
display: inline-block;
width: 88px;
height: 36px;
font-size: 26px;
color: #FF8822;
background:rgba(255,136,34,.1);
line-height: 36px;
text-align: center;
margin-right: 4px;
}
.read{
background: rgba(102,102,102,.1);
color: #666666;
}
}
.popup-wrap {