Merge branch 'master' of https://git.yuzhankeji.cn/TmOct5/ZhHealth

pages/menu/classify.vue

@@ -1,6 +1,6 @@
 <template>
     <view class="content">
-        <u-sticky bgColor="#fff" zIndex="99">
+        <view class="tab-sticky">
             <u-tabs
                 :current="tabsIndex"
                 :list="tabArr"
@@ -8,7 +8,7 @@
                 lineColor="#34CE98"
                 :activeStyle="{fontWeight: 'bold', fontSize: '30rpx'}"
             />
-        </u-sticky>
+        </view>
         <view class="box">
             <oct-menu
                 :lists="menuData"
@@ -88,6 +88,14 @@
 </script>
 
 <style lang="scss" scoped>
+	.tab-sticky{
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		background: white;
+		z-index: 99;
+	}
     .content {
         background-color: $window-color;
 		min-height: 100vh;
@@ -100,9 +108,8 @@
     }
     
     .box {
-        padding: 0 $padding;
+        padding: 40px $padding 0;
         box-sizing: border-box;
         margin-top: $margin;
     }
-    // 34CE98
 </style>

pages/menu/index.vue

@@ -16,11 +16,11 @@
                     :btnStyle="{'padding': '30rpx'}"
                     @onMenu="$Router.push({ name: 'menuDetails', params: {id: $event.recipe_id, title: $event.name }})" 
                 />
-                <u-empty
+                <!-- <u-empty
                     v-else
                     mode="list"
                     text="暂无食谱"
-                />
+                /> -->
             </view>
         </view>
     </view>
@@ -75,8 +75,7 @@
             }
         }
         .box {
-            padding: 0 $padding;
-            box-sizing: border-box;
+
         }
     }
 </style>