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:
wanglei
2021-12-09 16:03:49 +08:00
parent 6c4f61b6ff 946984907b
commit 47ded7350f
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/apps/AppAskForm/components/AddForm.vue
View File

@@ -92,13 +92,13 @@
</div> </div>
<div class="add-form__footer"> <div class="add-form__footer">
<div class="add-form__footer--item-wrapper"> <div class="add-form__footer--item-wrapper">
<div class="add-form__footer--item"> <div class="add-form__footer--item" @click="toPreview">
<image :src="`${$cdn}sass/preview.png`"> <image :src="`${$cdn}sass/preview.png`">
<span @click="toPreview">预览</span> <span>预览</span>
</div> </div>
<div class="add-form__footer--item"> <div class="add-form__footer--item" @click="toSetting">
<image :src="`${$cdn}sass/setting.png`"> <image :src="`${$cdn}sass/setting.png`">
<span @click="toSetting">设置</span> <span>设置</span>
</div> </div>
</div> </div>
<div @click="onConfirm">立即发布</div> <div @click="onConfirm">立即发布</div>

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

@@ -135,7 +135,6 @@ export default {
}, },
created() { created() {
this.$loading()
document.title = "通知公告"; document.title = "通知公告";
this.$dict.load("announcementStatus"); this.$dict.load("announcementStatus");
}, },
@@ -153,8 +152,11 @@ export default {
this.showList = false; this.showList = false;
} }
this.current = 1; this.current = 1;
this.$loading()
this.injectJWeixin(['sendChatMessage']).then(() => { this.injectJWeixin(['sendChatMessage']).then(() => {
this.getList(); this.getList();
}).catch(() => {
this.$hideLoading()
}) })
}, },
emitReachBottom() { emitReachBottom() {
@@ -258,6 +260,8 @@ export default {
this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records this.dataList = this.current > 1 ? [...this.dataList, ...res.data.records] : res.data.records
} }
this.$hideLoading()
}).catch(() => {
this.$hideLoading() this.$hideLoading()
}) })
}, },