fix: some bugs

LeeJim · Oct 27, 2022 · 99e2040 · 99e2040
1 parent f72cb45
commit 99e2040
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/cloudfunctions/setCookbook/index.js b/cloudfunctions/setCookbook/index.js
@@ -62,5 +62,5 @@ exports.main = async (event) => {
     }
   }
 
-  return res
+  return null
 }
diff --git a/miniprogram/config/index.js b/miniprogram/config/index.js
@@ -1,4 +1,4 @@
-const chineseMap = {
+export const chineseMap = {
   breakfast: '早餐',
   condiment: '佐料',
   dessert: '甜品',
@@ -9,7 +9,7 @@ const chineseMap = {
   'staple': '主食'
 }
 
-const titleMap = {
+export const titleMap = {
   breakfast: '早餐 Breakfast',
   condiment: '佐料 Condiment',
   dessert: '甜品 Dessert',

diff --git a/miniprogram/pages/detail/index.js b/miniprogram/pages/detail/index.js
@@ -82,7 +82,7 @@ Page({
   },
 
   toMyCenter() {
-    wx.navigateTo({
+    wx.switchTab({
       url: '/pages/my/index'
     })
   },

diff --git a/miniprogram/pages/detail/index.wxml b/miniprogram/pages/detail/index.wxml
@@ -85,12 +85,10 @@
 
 <view class="actions actions--{{done ? 'active' : ''}}">
   <t-button-group>
-    <t-button t-class="actions__button" size="large" block data-type="liked" bind:tap="toggleStarOrLike">
-      <t-icon name="heart{{liked ? '-filled' : ''}}" color="{{liked ? '#e34d59' : ''}}" size="36rpx" class="actions__icon"/>
+    <t-button t-class="actions__button" size="large" block data-type="liked" bind:tap="toggleStarOrLike" icon-props="{{ { name: liked ? 'heart-filled' : 'heart', color: liked ? '#e34d59': '', size: '36rpx' } }}">
       <text class="actions__text">{{likeds ? likeds + ' 人' : ''}}喜欢</text>
     </t-button>
-    <t-button t-class="actions__button" size="large" block data-type="starred" bind:tap="toggleStarOrLike">
-      <t-icon name="star{{starred ? '-filled' : ''}}" color="{{starred ? '#ed7b2f': ''}}" size="36rpx" class="actions__icon"/>
+    <t-button t-class="actions__button" size="large" block data-type="starred" bind:tap="toggleStarOrLike" icon-props="{{ { name: starred ? 'star-filled' : 'star', color: starred ? '#ed7b2f': '', size: '36rpx' } }}">
       <text class="actions__text">收藏</text>
     </t-button>
   </t-button-group>

diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js
@@ -1,6 +1,6 @@
 import infos from '../../data'
 import utils from '../../utils/index.js'
-import config from '../../config/index.js'
+import { chineseMap, titleMap } from '../../config/index.js'
 import Toast from 'tdesign-miniprogram/toast/index';
 
 let isSubscribeShow = false;
@@ -17,7 +17,7 @@ Page({
     const menu = utils.groupBy(infos, 'category');
     const list = Object.entries(menu).filter(([item]) => item !== 'template').map(([catetory, list]) => {
       return {
-        name: config.titleMap[catetory],
+        name: titleMap[catetory],
         icon: `/assets/images/${catetory}.png`,
         list
       }
@@ -41,7 +41,7 @@ Page({
   },
 
   handleTap(e) {
-    const { id } = e.currentTarget.dataset;
+    const { id } = e.detail.item;
 
     wx.navigateTo({
       url: '../detail/index?id=' + id

diff --git a/miniprogram/pages/index/index.json b/miniprogram/pages/index/index.json
@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "程序员做饭",
+  "navigationStyle": "custom",
   "backgroundColor": "#fff",
   "usingComponents": {
   }

diff --git a/miniprogram/pages/index/index.less b/miniprogram/pages/index/index.less
@@ -1,4 +1,6 @@
-
+page {
+  padding-bottom: 100px;
+}
 
 .brand {
   display: flex;

diff --git a/retry.json b/retry.json
@@ -0,0 +1 @@
+{"retry":[]}
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,5 +62,5 @@ exports.main = async (event) => { @@
         }
       }
-      return res
+      return null
     }