diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/WeChartAppletServiceImp.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/WeChartAppletServiceImp.java index 34cff1c6a..ff6d2c647 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/WeChartAppletServiceImp.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/WeChartAppletServiceImp.java @@ -75,7 +75,7 @@ public class WeChartAppletServiceImp implements IWechatAppletService { @Override public Integer postSubscribeMessage(Long cusId, Long planId, String name, String startDate, String endDate, String remark) { SysWxUserInfo sysWxUserInfo = sysWxUserInfoService.selectSysWxUserInfoByCusId(cusId); - if (StringUtils.isNull(sysWxUserInfo)) { + if (StringUtils.isNull(sysWxUserInfo) || StringUtils.isNull(sysWxUserInfo.getAppid())) { return -1; } diff --git a/stdiet-ui/src/layout/components/Navbar.vue b/stdiet-ui/src/layout/components/Navbar.vue index 9cc3b8233..c54f5c976 100644 --- a/stdiet-ui/src/layout/components/Navbar.vue +++ b/stdiet-ui/src/layout/components/Navbar.vue @@ -11,7 +11,7 @@ <div class="right-menu"> <template v-if="device !== 'mobile'"> - <search id="header-search" class="right-menu-item" /> + <!-- <search id="header-search" class="right-menu-item" /> --> <!-- <el-tooltip content="源码地址" effect="dark" placement="bottom"> <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" /> @@ -21,11 +21,18 @@ <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" /> </el-tooltip> --> - <screenfull id="screenfull" class="right-menu-item hover-effect" /> + <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" /> --> - <el-tooltip content="布局大小" effect="dark" placement="bottom"> + <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom"> <size-select id="size-select" class="right-menu-item hover-effect" /> - </el-tooltip> + </el-tooltip> --> + <div class="right-menu-item hover-effect badge_style"> + <el-badge :value="12"> + <el-tooltip content="消息" effect="dark" placement="bottom"> + <em class="el-icon-message" :style="{ fontSize: '28px' }" /> + </el-tooltip> + </el-badge> + </div> </template> <el-dropdown @@ -56,21 +63,19 @@ import { mapGetters, mapActions } from "vuex"; import Breadcrumb from "@/components/Breadcrumb"; import Hamburger from "@/components/Hamburger"; -import Screenfull from "@/components/Screenfull"; -import SizeSelect from "@/components/SizeSelect"; -import Search from "@/components/HeaderSearch"; -import RuoYiGit from "@/components/RuoYi/Git"; -import RuoYiDoc from "@/components/RuoYi/Doc"; +// import Screenfull from "@/components/Screenfull"; +// import SizeSelect from "@/components/SizeSelect"; +// import Search from "@/components/HeaderSearch"; +// import RuoYiGit from "@/components/RuoYi/Git"; +// import RuoYiDoc from "@/components/RuoYi/Doc"; export default { components: { Breadcrumb, Hamburger, - Screenfull, - SizeSelect, - Search, - RuoYiGit, - RuoYiDoc, + // Screenfull, + // SizeSelect, + // Search, }, created() { this.init(); @@ -110,6 +115,12 @@ export default { </script> <style lang="scss" scoped> +/deep/ .badge_style { + margin-right: 8px; + .el-badge__content.is-fixed { + top: 10px !important; + } +} .navbar { height: 50px; overflow: hidden;