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
2023-01-03 10:18:02 +08:00
parent 7a062635af f431e4b509
commit 2466b52670
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/project/qianxinan/AppMessageNotification/AppMessageNotification.vue
View File

@@ -5,14 +5,14 @@
<p>每个用户每天可以接受10条群发消息，不限企业发布的群发还是个人发布的群发。</p> <p>每个用户每天可以接受10条群发消息，不限企业发布的群发还是个人发布的群发。</p>
<p>个人群发每天可以给用户发送10条群发消息。</p> <p>个人群发每天可以给用户发送10条群发消息。</p>
</div> </div>
<div class="select-user"> <!-- <div class="select-user">
<div class="label color-666"><span class="tips">*</span>发送方式</div> <div class="label color-666"><span class="tips">*</span>发送方式</div>
<div class="right"> <div class="right">
<u-radio-group v-model="form.messageSource" @change="radioGroupChange"> <u-radio-group v-model="form.messageSource" @change="radioGroupChange">
<u-radio v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.type">{{ item.name }}</u-radio> <u-radio v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.type">{{ item.name }}</u-radio>
</u-radio-group> </u-radio-group>
</div> </div>
</div> </div> -->
<div class="select-user"> <div class="select-user">
<div class="label color-666"><span class="tips">*</span>部门选择</div> <div class="label color-666"><span class="tips">*</span>部门选择</div>
<div class="right"> <div class="right">

2
src/project/qianxinan/AppPointsRanking/AppPointsRanking.vue
View File

@@ -130,6 +130,7 @@
} }
.list-data { .list-data {
padding: 32px; padding: 32px;
margin-bottom: 80px;
.item { .item {
width: 100%; width: 100%;
display: flex; display: flex;
@@ -184,6 +185,7 @@
} }
.footer { .footer {
padding: 0; padding: 0;
margin-bottom: 0;
width: 100%; width: 100%;
position: fixed; position: fixed;
bottom: 0; bottom: 0;

6
src/project/saas/AppDataStatistics/components/wechat.vue
View File

@@ -23,7 +23,7 @@
</div> </div>
<div class="friends_box"> <div class="friends_box">
<div id="friends" v-if="friendsData.length"></div> <div id="friends" v-if="friendsData"></div>
<AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty> <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
</div> </div>
@@ -53,7 +53,7 @@
</div> </div>
<div class="groups_box"> <div class="groups_box">
<div id="groups" v-if="groupsData.length"></div> <div id="groups" v-if="groupsData"></div>
<AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty> <AiEmpty style="padding-top: 10px;" description="暂无数据" v-else></AiEmpty>
</div> </div>
</div> </div>
@@ -96,7 +96,9 @@ export default {
this.groupsCard = res.data.居民群统计 this.groupsCard = res.data.居民群统计
this.groupsData = res.data.群成员数 this.groupsData = res.data.群成员数
this.groupsMonth = this.groupsData.map(e=> e.month) this.groupsMonth = this.groupsData.map(e=> e.month)
// this.groupsMonth = ['2022-09','2022-10','2022-12','2023-01']
this.groupsNumber = this.groupsData.map(e=> e.totalNumber) this.groupsNumber = this.groupsData.map(e=> e.totalNumber)
// this.groupsNumber = ['6','6','7','7']
this.getGroupsEcharts(this.groupsMonth,this.groupsNumber) this.getGroupsEcharts(this.groupsMonth,this.groupsNumber)
} }
}) })