Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!254 修复食谱展示

Browse Source 
Merge pull request !254 from 德仔/develop
This commit is contained in:
德仔 2021-05-19 18:02:39 +08:00 committed by Gitee
commit 02a3e487f7
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,7 +509,6 @@ public class WechatAppletController extends BaseController {
} }
} }
SysOrderPause orderPause = new SysOrderPause(); SysOrderPause orderPause = new SysOrderPause();
orderPause.setCusId(cusId); orderPause.setCusId(cusId);
List<SysOrderPause> pauses = sysOrderPauseService.selectSysOrderPauseList(orderPause); List<SysOrderPause> pauses = sysOrderPauseService.selectSysOrderPauseList(orderPause);
@ -557,9 +556,15 @@ public class WechatAppletController extends BaseController {
return request.getParameter("echostr"); return request.getParameter("echostr");
} }
@GetMapping("/getToken") // @GetMapping("/getToken")
public String getToken(@RequestParam String appId) { // public String getToken(@RequestParam String appId) {
return iWechatAppletService.getAccessToken(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") @GetMapping("/subscribe")

8
stdiet-ui/src/layout/components/Navbar.vue
View File

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

2
stdiet-ui/src/views/custom/recipesShow/index.vue
View File

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