Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java

@@ -509,7 +509,6 @@ public class WechatAppletController extends BaseController {
             }
         }
 
-
         SysOrderPause orderPause = new SysOrderPause();
         orderPause.setCusId(cusId);
         List<SysOrderPause> pauses = sysOrderPauseService.selectSysOrderPauseList(orderPause);
@@ -557,9 +556,15 @@ public class WechatAppletController extends BaseController {
         return request.getParameter("echostr");
     }
 
-    @GetMapping("/getToken")
-    public String getToken(@RequestParam String appId) {
-        return iWechatAppletService.getAccessToken(appId);
+//    @GetMapping("/getToken")
+//    public String getToken(@RequestParam String appId) {
+//        return iWechatAppletService.getAccessToken(appId);
+//    }
+
+    @GetMapping("/trans")
+    public AjaxResult transId(@RequestParam String customerId) {
+        Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
+        return AjaxResult.success(String.valueOf(cusId));
     }
 
     @GetMapping("/subscribe")

stdiet-ui/src/layout/components/Navbar.vue

@@ -26,7 +26,10 @@
         <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
-        <div class="right-menu-item hover-effect badge_style">
+        <div
+          class="right-menu-item hover-effect badge_style"
+          @click="handleOnMessageClick"
+        >
           <el-badge :value="12">
             <el-tooltip content="消息" effect="dark" placement="bottom">
               <em class="el-icon-message" :style="{ fontSize: '28px' }" />
@@ -98,6 +101,9 @@ export default {
     ...mapActions(["init"]),
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
+    },
+    handleOnMessageClick() {
+
     },
     async logout() {
       this.$confirm("确定注销并退出系统吗？", "提示", {

stdiet-ui/src/views/custom/recipesShow/index.vue

@@ -104,7 +104,7 @@ export default {
       let curPlanId, curMenuId, curDate;
       const toDay = dayjs().format("YYYY-MM-DD");
       this.planList = plansRes.data.reduce((arr, plan) => {
-        if (plan.menus) {
+        if (plan.menus && !!plan.sendFlag) {
           let tmpDate = dayjs(plan.startDate).subtract(1, "days");
           arr.push({
             menus: plan.menus.map((menu) => {