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-03 15:00:58 +08:00
parent e54e316ec9 fe31129da2
commit 4761ff7e82
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/apps/AppAskForm/components/List.vue
View File

@@ -11,8 +11,8 @@
<div class="form-item__left">
<h2>{{ item.title }}</h2>
<div class="form-item__left--info">
<span>{{ item.createUserName }}</span>
<span>{{ item.createUnitName }}</span>
<ai-open-data type="departmentName" :openid="item.createUnitName"></ai-open-data>
<ai-open-data type="username" :openid="item.createUserName"></ai-open-data>
<span>{{ item.createTime.substr(0, item.createTime.length - 3) }}</span>
<span>{{ $dict.getLabel('questionnaireType', item.type) }}</span>
</div>
@@ -86,11 +86,12 @@
import {mapActions} from 'vuex'
import AiTopFixed from "../../../components/AiTopFixed";
import AiEmpty from "../../../components/AiEmpty";
import AiOpenData from "../../../components/AiOpenData";
export default {
name: 'formList',
label: '表单列表',
components: {AiEmpty, AiTopFixed},
components: {AiEmpty, AiTopFixed, AiOpenData},
data() {
return {
search: {
@@ -448,7 +449,7 @@ export default {
color: #999;
font-size: 20px;
span {
span, div {
position: relative;
margin-right: 24px;

40
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 v-if="!item.imgUrl">
<template>
<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,25 @@
<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>-->
<!-- <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>-->
</div>
</div>