Преглед на файлове

做了菜谱相关的所有页面,做了智选,智选详情,相关参数所有页面

不夜浮尘 преди 1 седмица
родител
ревизия
7fdd49e731
променени са 37 файла, в които са добавени 884 реда и са изтрити 118 реда
  1. 6 2
      sources/client/smart-cooker/app.json
  2. BIN
      sources/client/smart-cooker/assets/images/xian/icon_barrow.png
  3. BIN
      sources/client/smart-cooker/assets/images/xian/icon_btnadd.png
  4. BIN
      sources/client/smart-cooker/assets/images/xian/icon_btnminus.png
  5. BIN
      sources/client/smart-cooker/assets/images/xian/icon_car.png
  6. BIN
      sources/client/smart-cooker/assets/images/xian/icon_cart.png
  7. BIN
      sources/client/smart-cooker/assets/images/xian/icon_menu.png
  8. BIN
      sources/client/smart-cooker/assets/images/xian/icon_menulike.png
  9. BIN
      sources/client/smart-cooker/assets/images/xian/icon_note.png
  10. BIN
      sources/client/smart-cooker/assets/images/xian/icon_searchm.png
  11. BIN
      sources/client/smart-cooker/assets/images/xian/icon_smartselect.png
  12. BIN
      sources/client/smart-cooker/assets/images/xian/icon_starp.png
  13. 78 0
      sources/client/smart-cooker/pages/cart/index.js
  14. 9 0
      sources/client/smart-cooker/pages/cart/index.json
  15. 60 0
      sources/client/smart-cooker/pages/cart/index.tyml
  16. 35 0
      sources/client/smart-cooker/pages/cart/index.tyss
  17. 66 22
      sources/client/smart-cooker/pages/cookbook/index.js
  18. 7 3
      sources/client/smart-cooker/pages/cookbook/index.json
  19. 34 20
      sources/client/smart-cooker/pages/cookbook/index.tyml
  20. 31 14
      sources/client/smart-cooker/pages/cookbook/index.tyss
  21. 18 0
      sources/client/smart-cooker/pages/goods/index.js
  22. 10 0
      sources/client/smart-cooker/pages/goods/index.json
  23. 150 0
      sources/client/smart-cooker/pages/goods/index.tyml
  24. 74 0
      sources/client/smart-cooker/pages/goods/index.tyss
  25. 1 0
      sources/client/smart-cooker/pages/menudesc/index.js
  26. 18 0
      sources/client/smart-cooker/pages/menusearch/index.js
  27. 12 0
      sources/client/smart-cooker/pages/menusearch/index.json
  28. 25 0
      sources/client/smart-cooker/pages/menusearch/index.tyml
  29. 18 0
      sources/client/smart-cooker/pages/menusearch/index.tyss
  30. 73 0
      sources/client/smart-cooker/pages/mymenu/index.js
  31. 9 0
      sources/client/smart-cooker/pages/mymenu/index.json
  32. 24 0
      sources/client/smart-cooker/pages/mymenu/index.tyml
  33. 24 0
      sources/client/smart-cooker/pages/mymenu/index.tyss
  34. 48 22
      sources/client/smart-cooker/pages/smartselection/index.js
  35. 7 3
      sources/client/smart-cooker/pages/smartselection/index.json
  36. 29 20
      sources/client/smart-cooker/pages/smartselection/index.tyml
  37. 18 12
      sources/client/smart-cooker/pages/smartselection/index.tyss

+ 6 - 2
sources/client/smart-cooker/app.json

@@ -1,7 +1,7 @@
 {
   "themeLocation": "theme.json",
   "pages": [
-    "pages/menudesc/index",  
+    "pages/cart/index",  
     "pages/home/index",
     "pages/cookbook/index",
     "pages/smartselection/index",
@@ -16,7 +16,11 @@
     "pages/workstate/index", 
     "pages/definemenu/index",
     "pages/moremenu/index",
-    "pages/menudesc/index"
+    "pages/menudesc/index",
+    "pages/menusearch/index",
+    "pages/mymenu/index",
+    "pages/goods/index",
+    "pages/cart/index"
   ],
   "tabBar": {
     "color": "@tabFontColor",

BIN
sources/client/smart-cooker/assets/images/xian/icon_barrow.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_btnadd.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_btnminus.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_car.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_cart.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_menu.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_menulike.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_note.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_searchm.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_smartselect.png


BIN
sources/client/smart-cooker/assets/images/xian/icon_starp.png


+ 78 - 0
sources/client/smart-cooker/pages/cart/index.js

@@ -0,0 +1,78 @@
+Page({
+  data: {
+    imgUrl: '/assets/images/xian/moremenu_img1.jpg',
+    menuList: [
+      {
+        name: '香滑皮蛋瘦肉粥十五分钟快...',
+        imgUrl: '/assets/images/xian/moremenu_img1.jpg',
+        text: '十五分钟快手之香滑皮蛋瘦肉粥,香滑皮蛋瘦肉粥十五分钟快手之香滑皮蛋',
+        time: '20',
+        level: '中等',
+        num: '202',
+        collect: '100',
+      },
+      {
+        name: '网红芝士烤牛奶',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '网红芝士烤牛奶/哄娃神器系列',
+        time: '40',
+        level: '中等',
+        num: '1.2w',
+        collect: '234',
+      }, 
+      {
+        name: '奶香豆沙',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '奶香豆沙小馒头,仅需一次松弛',
+        time: '20',
+        level: '中等',
+        num: '1246',
+        collect: '574',
+      },
+      {
+        name: '爆好吃的卤鸡腿!卤蛋(电饭煲)',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '晚上做好,剩下的汤汁不要倒掉',
+        time: '40',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
+      },
+      {
+        name: '糖醋鸡胸肉',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '酸酸甜甜的糖醋鸡胸肉,小朋友的最爱!',
+        time: '20',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
+      },
+      {
+        name: '家庭版油焖大虾',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '虾含蛋白质含钙量高,外酥里嫩。关键做法…',
+        time: '40',
+        level: '中等',
+        num: '2.4w',
+        collect: '1.2w',
+      },
+    ], 
+  },
+
+  onShow() {
+    this.setData({
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()             
+  },
+  goMenuSearch() {
+    ty.navigateTo({
+      url: '/pages/menusearch/index',
+    })
+  },
+
+  checkboxChange(ev) {
+    console.log(ev.detail.value);
+  },
+})

+ 9 - 0
sources/client/smart-cooker/pages/cart/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "购物车",
+  "backgroundColor": "#FFFFFF",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

+ 60 - 0
sources/client/smart-cooker/pages/cart/index.tyml

@@ -0,0 +1,60 @@
+<view class="cart">
+    <view class="cart_delete"></view>
+    <checkbox-group class="cart_list" bind:change="checkboxChange">
+        <view class="cart_box card" >
+            <!-- <label > -->
+                <checkbox class="checkItem cart_box_checkbox" value="value4" checked="true"></checkbox>
+                <view class="cart_box_info">
+                    <view class="cart_box_img img_box">
+                        <image class="image" src="{{imgUrl}}" mode="widthFix"></image>
+                    </view>
+                    <view class="cart_box_content">
+                        <view class="cart_box_title">摩飞电器电压力锅 电高压锅电饭锅… </view>
+                        <view class="cart_box_detail">极地白/4L</view>
+                        <view class="cart_box_price">¥358.00</view>
+                        <view class="computer">
+                            <view class="computer_btn minus"></view> 
+                            <view class="computer_num">1</view>  
+                            <view class="computer_btn add"></view> 
+                        </view> 
+                    </view>
+                </view>
+            <!-- </label> -->
+        </view>
+        <view class="cart_box card" >
+            <!-- <label > -->
+                <checkbox class="checkItem cart_box_checkbox" value="value4" checked="true"></checkbox>
+                <view class="cart_box_info">
+                    <view class="cart_box_img img_box">
+                        <image class="image" src="{{imgUrl}}" mode="widthFix"></image>
+                    </view>
+                    <view class="cart_box_content">
+                        <view class="cart_box_title">摩飞电器电压力锅 电高压锅电饭锅…</view>
+                        <view class="cart_box_detail">极地白/4L</view>
+                        <view class="cart_box_price">¥358.00</view>
+                        <view class="computer">
+                            <view class="computer_btn minus"></view> 
+                            <view class="computer_num">1</view>  
+                            <view class="computer_btn add"></view> 
+                        </view> 
+                    </view>
+                </view>
+            <!-- </label> -->
+        </view>
+    </checkbox-group>
+
+    
+</view>
+<view class="cart_footer">
+    <view class="cart_footer_all">
+        <checkbox class="cart_footer_checkbox" value="value4" checked="true"></checkbox>
+        <view value="cart_footer_text">全选</view>
+    </view>
+    <view class="cart_footer_content">
+        <view class="cart_footer_info">
+            <view class="cart_footer_sum">合计:<view class="cart_footer_price">¥358.00</view></view>
+            <view class="cart_footer_express">配送费 ¥100.00</view>
+        </view>
+        <view class="cart_footer_btn">加入购物车</view>
+    </view>
+</view>

Файловите разлики са ограничени, защото са твърде много
+ 35 - 0
sources/client/smart-cooker/pages/cart/index.tyss


+ 66 - 22
sources/client/smart-cooker/pages/cookbook/index.js

@@ -1,34 +1,78 @@
 Page({
   data: {
-    resultData: [
+    menuList: [
       {
-        name: 'phone',
-        value: 'dsasfaf',
+        name: '香滑皮蛋瘦肉粥十五分钟快...',
+        imgUrl: '/assets/images/xian/moremenu_img1.jpg',
+        text: '十五分钟快手之香滑皮蛋瘦肉粥,香滑皮蛋瘦肉粥十五分钟快手之香滑皮蛋',
+        time: '20',
+        level: '中等',
+        num: '202',
+        collect: '100',
       },
       {
-        name: 'password',
-        value: '15151',
+        name: '网红芝士烤牛奶',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '网红芝士烤牛奶/哄娃神器系列',
+        time: '40',
+        level: '中等',
+        num: '1.2w',
+        collect: '234',
+      }, 
+      {
+        name: '奶香豆沙',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '奶香豆沙小馒头,仅需一次松弛',
+        time: '20',
+        level: '中等',
+        num: '1246',
+        collect: '574',
+      },
+      {
+        name: '爆好吃的卤鸡腿!卤蛋(电饭煲)',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '晚上做好,剩下的汤汁不要倒掉',
+        time: '40',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
+      },
+      {
+        name: '糖醋鸡胸肉',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '酸酸甜甜的糖醋鸡胸肉,小朋友的最爱!',
+        time: '20',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
       },
-    ],
+      {
+        name: '家庭版油焖大虾',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '虾含蛋白质含钙量高,外酥里嫩。关键做法…',
+        time: '40',
+        level: '中等',
+        num: '2.4w',
+        collect: '1.2w',
+      },
+    ], 
   },
 
-  handleSubmit(ev) {
-    const value = ev.detail.value;
-    const resultData = [];
-    for (let name in value) {
-      resultData.push({
-        name,
-        value: value[name],
-      });
-    }
+  onShow() {
     this.setData({
-      resultData,
-    });
-    console.log(resultData)
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()             
   },
-
-  getRegister() {
-    ty.switchTab({url: '/pages/my/index'})
+  goMenuSearch() {
+    ty.navigateTo({
+      url: '/pages/menusearch/index',
+    })
+  },
+  goMyMenu() {
+    ty.navigateTo({
+      url: '/pages/mymenu/index',
+    })
   },
-
 })

+ 7 - 3
sources/client/smart-cooker/pages/cookbook/index.json

@@ -1,8 +1,12 @@
 {
+  "navigationBarBackgroundColor": "#FFFFFF",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "index",
-  "backgroundColor": "#f2f4f6",
+  "navigationBarTitleText": "更多食谱",
+  "backgroundColor": "#FFFFFF",
   "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "navigation": "/components/navigation/index"
+  }
 }

+ 34 - 20
sources/client/smart-cooker/pages/cookbook/index.tyml

@@ -1,24 +1,38 @@
-<view class="login">
-    <view class="login_title">
-        <text >智能改变生活</text>
+<view class="workmode cookbook">
+    <!-- <navigation></navigation> -->
+    <view class="cookbook_header"></view>
+    <view class="cookbook_header">
+        <view class="navigator-btn">
+            <navigator url="pages/multifunctional/index" class="link" open-type="navigateBack" hover-class="other-navigator-hover"></navigator>
+        </view>
+        <view class="cookbook_search">
+            <input class="cookbook_input" name="cookname" placeholder="搜索食谱/菜谱" bind:confirm="goMenuSearch" />
+            <view class="cookbook_icon"></view>
+        </view>
+        <view class="cookbook_btn img_box" bind:tap="goMyMenu">
+             <image class="image" src="/assets/images/xian/icon_menulike.png" mode="widthFix"></image>
+        </view>
     </view>
-    <view class="login_form">
-        <form bind:submit="handleSubmit" id="formSelf" >
-            <view class="row">
-                <icon class="row_icon" type="warn" size="23" color="yellow"></icon>
-                <input class="row_input" name="phone" placeholder="请输入手机号" />
+    <view class="cookbook_list" ty:if="{{menuList.length > 0}}">
+        <view class="cookbook_box" ty:for="{{menuList}}" ty:key="{{index}}">
+            <view class="cookbook_box_img img_box">
+                <image class="image" src="{{item.imgUrl}}" mode="widthFix"></image>
+                <view class="cookbook_box_border"></view>
+                <view class="cookbook_box_star"></view>
             </view>
-            <view class="row">
-                <icon class="row_icon" type="warn" size="23" color="yellow"></icon>
-                <input class="row_input" name="password" type="password" placeholder="请输入密码" />
+            <view class="cookbook_box_content">
+                <view class="cookbook_box_title">{{item.name}}</view>
+                <view class="cookbook_box_text">{{item.text}}</view>
+                <view class="cookbook_box_type">
+                    <view class="cookbook_box_num none grid">{{item.time}}分钟</view>
+                    <view class="cookbook_box_line grid"></view>
+                    <view class="cookbook_box_num none grid">{{item.level}}</view>
+                    <view class="cookbook_box_line grid"></view>
+                    <view class="cookbook_box_num none grid">{{item.num}}做过</view>
+                    <view class="cookbook_box_num">{{item.num}}做过</view>
+                    <view class="cookbook_box_num">{{item.collect}}收藏</view>
+                </view>
             </view>
-            <view class="row_tip">
-                <text bind:tap="getRegister">忘记密码?新用户注册</text>
-            </view>
-            <view class="row_btn">
-                <button form-type="submit" id="triggerBtn" data-info="提交的按钮" type="primary" class="submit-btn">登录</button>
-            </view>
-        </form>
+        </view>
     </view>
-</view>
-
+</view>

+ 31 - 14
sources/client/smart-cooker/pages/cookbook/index.tyss

@@ -1,15 +1,32 @@
-/* .intro {
-  margin: 30px;
-  text-align: center;
-} */
-.cont_1200 {width: 1200px;margin: 0 auto;max-width: 92%;}
-
-.login {width: 100%;margin: 0 auto;padding: 0 20px;}
-.login .login_title {font-size: 30px; font-weight: bold; margin: 60px auto;}
-.login .login_form {display: flex; flex-direction: column; justify-content: center; align-items: center;}
-.login .login_form form .row {display: flex;padding: 10px 10px;border-radius: 5px;background-color: #ffffff;margin-bottom: 20px;}
-.login .login_form form .row .row_input {margin-left: 10px;}
-.login .login_form form .row_tip {color: orange;text-align: right;}
-.login .login_form form .row_btn {color: orange;box-shadow: 2px 4px 20px #00000033;}
-
+page {background-color: #FFFFFF;}
+.cookbook .cookbook_header {height: 88rpx;padding: 6rpx 24rpx;box-sizing: border-box;display: flex;justify-content: space-between;align-items: center;}
+.cookbook .cookbook_header .navigator-btn {margin-left: 6rpx;width: 20rpx;height: 36rpx;width: 36rpx;height: 36rpx;}
+.cookbook .cookbook_header .navigator-btn .link {width: 100%;height: 100%;background: #181818;background: url(/assets/images/xian/icon_larrow.png) no-repeat center;background-size: contain;display: inline-block;}
+.cookbook .cookbook_header .cookbook_search {position: relative;}
+.cookbook .cookbook_header .cookbook_search .cookbook_input {width: 522rpx;height: 76rpx;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;text-indent: 24rpx;}
+.cookbook .cookbook_header .cookbook_search .cookbook_icon {position: absolute;width: 36rpx;height: 36rpx;background: url(/assets/images/xian/icon_search.png) no-repeat center;background-size: contain;top: 50%;transform: translateY(-50%);right: 24rpx;} 
+.cookbook .cookbook_header .cookbook_btn {width: 76rpx;padding-top: 76rpx;}
 
+.cookbook .cookbook_list {padding: 0 24rpx;box-sizing: border-box;margin-top: 40rpx;margin-bottom: 25rpx;}
+.cookbook .cookbook_list .cookbook_box {display: flex;justify-content: space-between;align-items: center;margin-bottom: 41rpx;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_img {width: 238rpx;padding-top: 178rpx;box-sizing: border-box;border-radius: 16rpx;overflow: hidden;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content {width: calc(100% - 238rpx);padding-left: 24rpx;box-sizing: border-box;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 32rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;margin-top: 4rpx;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_text {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #999999;text-align: left;font-style: normal;text-transform: none;margin-top: 8rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;text-overflow: ellipsis;overflow: hidden;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_type {display: flex;align-items: center;margin-top: 26rpx;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_type .cookbook_box_num.none {display: none;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_type .cookbook_box_num {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #666666;text-align: left;font-style: normal;text-transform: none;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_content .cookbook_box_type .cookbook_box_num:last-child {margin-left: 24rpx;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_img .cookbook_box_border {position: absolute;top: 0;right: 0;border: 56rpx solid #EE742F;border-left: 56rpx solid transparent;border-bottom: 56rpx solid transparent;border: 28rpx solid #EE742F;border-left: 28rpx solid transparent;border-bottom: 28rpx solid transparent;}
+.cookbook .cookbook_list .cookbook_box .cookbook_box_img .cookbook_box_star {position: absolute;top: 6rpx;right: 6rpx;width: 24rpx;height: 24rpx;background: url(/assets/images/xian/icon_starp.png) no-repeat center;background-size: contain;}
+.cookbook .cookbook_list.grid {display: flex;flex-wrap: wrap;justify-content: space-between;margin-bottom: 52rpx;}
+.cookbook .cookbook_list.grid .cookbook_box {flex-direction: column;justify-content: flex-start;align-items: flex-start;width: calc((100% - 22rpx) / 2);}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_img {width: 100%;padding-top: 254rpx;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content {width: 100%;padding-left: 0rpx;margin-top: 24rpx;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_title {font-size: 28rpx;margin-top: 0rpx;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_text {display: none;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_type {margin-top: 8rpx;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_num {display: none;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_num.grid {display: block;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_line {display: none;width: 1rpx;height: 24rpx;background-color: #DDDDDD;margin : auto 16rpx;}
+.cookbook .cookbook_list.grid .cookbook_box .cookbook_box_content .cookbook_box_line.grid {display: block;}

+ 18 - 0
sources/client/smart-cooker/pages/goods/index.js

@@ -0,0 +1,18 @@
+Page({
+  data: {
+    showDialog: true,
+    ParamDialog: false, 
+    ServerProtectDialog: false,
+    AddCartDialog: true,
+    imgUrl: '/assets/images/xian/device_action3.png',
+  },
+
+  onShow() {
+    this.setData({
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()     
+  },
+})
+ 

+ 10 - 0
sources/client/smart-cooker/pages/goods/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "食谱详情",
+  "backgroundColor": "#F6F7F8",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true, 
+  "navigationStyle": "custom",
+  "usingComponents": {}
+}

+ 150 - 0
sources/client/smart-cooker/pages/goods/index.tyml

@@ -0,0 +1,150 @@
+<view class="goods">
+    <view class="goods_back"></view>
+    <view class="goods_img img_box">
+        <image class="image" src="{{imgUrl}}" mode="widthFix"></image>
+    </view>
+    <view class="goods_content">
+        <view class="goods_price">¥358.00</view>
+        <view class="goods_title">摩飞电器电压力锅 电高压锅电饭锅电饭煲 家用2.5L</view>
+        <view class="goods_info card">
+            <view class="goods_info_content">
+                <view class="goods_info_item menu">
+                    <view class="goods_info_list">米色 / 2L / 一件</view>
+                </view>
+                <view class="goods_info_item car">
+                    <view class="goods_info_list">48小时内发货</view>
+                    <!-- <view class="goods_info_address">
+                        <view class="span">有货</view>
+                        <view class="line"></view>
+                        <view class="span">广东廉江</view>
+                        <view class="line"></view>
+                        <view class="span">快递:免运费</view>
+                    </view> -->
+                    <view class="goods_info_address">有货 | 广东廉江 | 快递:免运费</view>
+                </view>
+                <view class="goods_info_item note">
+                    <view class="goods_info_list">品牌 · 型号 · 售后服务· 保修期· 容量</view>
+                </view>
+            </view>
+        </view>
+        <view class="goods_detail">
+            <view class="goods_detail_title">— 商品详情 —</view>
+            <view class="goods_detail_list">
+                <view class="goods_detail_item">
+                    <image class="image" src="{{imgUrl}}" mode="widthFix"></image>
+                </view>
+            </view>
+        </view>
+    </view>
+    <view class="goods_footer">
+        <view class="goods_footer_option">
+            <view class="goods_footer_item">
+                <view class="goods_footer_icon img_box">
+                    <image class="image" src="/assets/images/xian/icon_smartselect.png" mode="widthFix"></image>
+                </view>
+                <view class="goods_footer_text">智选</view>
+            </view>
+            <view class="goods_footer_item">
+                <view class="goods_footer_icon img_box">
+                    <image class="image" src="/assets/images/xian/icon_cart.png" mode="widthFix"></image>
+                </view>
+                <view class="goods_footer_text">购物车</view>
+            </view>
+        </view>
+        
+        <view class="goods_footer_btn">
+            <view class="goods_footer_btn_item">加入购物车</view>
+            <view class="goods_footer_btn_item orange">立即购买</view>
+        </view>
+    </view>
+</view>
+
+<page-container show="{{showDialog}}" duration="300" round="{{true}}" custom-style="border-radius: 16rpx 16rpx 0rpx 0rpx;" position="bottom" bind:clickoverlay="onClickOverlay">
+    <view ty:if="{{ParamDialog}}" class="param_dialog dialog">
+        <view class="dialog_title">产品参数</view> 
+        <view class="dialog_delete" bindtap="closeDefinemenuDialog"></view> 
+        <view class="dialog_list">
+            <view class="dialog_item">
+                <view class="dialog_text fixed">品牌</view> 
+                <view class="dialog_text">Joyong/九阳</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">型号</view> 
+                <view class="dialog_text">F-40F316L</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">售后服务</view> 
+                <view class="dialog_text">全国联保</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">保修期</view> 
+                <view class="dialog_text">12个月</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">容量</view> 
+                <view class="dialog_text">4L</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">附加功能</view> 
+                <view class="dialog_text">保温 预约 定时</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_text fixed">内胆材质</view> 
+                <view class="dialog_text">合金</view> 
+            </view> 
+        </view> 
+        <view class="dialog_btn">完成</view> 
+    </view>
+    <view ty:if="{{ServerProtectDialog}}" class="serverprotect_dialog dialog">
+        <view class="dialog_title">服务保障</view> 
+        <view class="dialog_delete" bindtap="closeDefinemenuDialog"></view> 
+        <view class="dialog_list">
+            <view class="dialog_item">
+                <view class="dialog_item_title">退货运费险</view> 
+                <view class="dialog_item_text">商家赠送运费险,退换货选择上门取件,自动减免XXXXXXxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxXXxX.</view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_item_title">7天无理由退货</view> 
+                <view class="dialog_item_text">满足7天无理由退货申请的前提下,包邮商品需要XXXXXXXxxxxxxxxxxxxxxxxxxxxxxx.</view> 
+            </view> 
+        </view> 
+        <view class="dialog_btn">知道了</view> 
+    </view>
+
+    <view ty:if="{{AddCartDialog}}" class="addcart_dialog dialog">
+        <view class="dialog_delete" bindtap="closeDefinemenuDialog"></view> 
+        <view class="dialog_info">
+            <view class="dialog_info_img img_box">
+                <image class="image" src="{{imgUrl}}" mode="widthFix"></image>
+            </view> 
+            <view class="dialog_info_txt">
+                <view class="dialog_info_price">¥358.00<view class="dialog_info_origin_price">¥678.00</view></view> 
+                <view class="dialog_item_stock">库存 374件</view> 
+            </view> 
+        </view> 
+        <view class="dialog_list">
+            <view class="dialog_item">
+                <view class="dialog_item_title">颜色分类</view> 
+                <view class="dialog_item_list">
+                    <view class="dialog_item_box">极地白</view> 
+                </view> 
+            </view> 
+            <view class="dialog_item">
+                <view class="dialog_item_title">规格</view> 
+                 <view class="dialog_item_list">
+                    <view class="dialog_item_box">3L</view> 
+                    <view class="dialog_item_box checked">4L</view> 
+                </view> 
+            </view> 
+            <view class="dialog_item num">
+                <view class="dialog_item_title">数量</view> 
+                <view class="dialog_item_list">
+                    <view class="dialog_item_btn minus"></view> 
+                    <view class="dialog_item_num">1</view>  
+                    <view class="dialog_item_btn add"></view> 
+                </view> 
+            </view> 
+        </view> 
+        <view class="dialog_btn">立即购买</view> 
+    </view>
+</page-container> 

+ 74 - 0
sources/client/smart-cooker/pages/goods/index.tyss

@@ -0,0 +1,74 @@
+page {background-color: #F6F7F8;}
+.goods {position: relative;}
+.goods .goods_back {position: absolute;width: 36rpx;height: 36rpx;background: #FFFFFF;background: url(/assets/images/xian/icon_larrow.png) no-repeat center;background-size: contain;filter: brightness(0) invert(1);top: 114rpx;left: 30rpx;z-index: 99;}
+.goods .goods_img {padding-top: 560rpx;} 
+.goods .goods_footer {position: fixed;z-index: 99;bottom: 0;width: 100%;height: 100rpx;padding: 12rpx 24rpx;box-sizing: border-box;display: flex;justify-content: space-between;align-items: center;background: #FFFFFF; }
+.goods .goods_footer .goods_footer_option {display: flex;align-items: center;}
+.goods .goods_footer .goods_footer_option .goods_footer_item {display: flex;flex-direction: column;justify-content: center;align-items: center;margin-right: 50rpx;}
+.goods .goods_footer .goods_footer_option .goods_footer_item .goods_footer_icon {width: 36rpx;padding-top: 36rpx;}
+.goods .goods_footer .goods_footer_option .goods_footer_item .goods_footer_text {margin-top: 8rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.goods .goods_footer .goods_footer_btn {display: flex;}
+.goods .goods_footer .goods_footer_btn .goods_footer_btn_item {width: 240rpx;height: 76rpx;line-height: 76rpx;background: #88C161;border-radius: 50rpx 0rpx 0rpx 50rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #FFFFFF;text-align: center;font-style: normal;text-transform: none;}
+.goods .goods_footer .goods_footer_btn .goods_footer_btn_item:last-child {border-radius: 0rpx 50rpx 50rpx 0rpx;}
+.goods .goods_footer .goods_footer_btn .goods_footer_btn_item.orange {background: #EE742F;}
+
+.goods .goods_content {padding: 0 24rpx;box-sizing: border-box;}
+.goods .goods_content .goods_price {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 28rpx;color: #EE742F;text-align: left;font-style: normal;text-transform: none;margin-top: 40rpx;}
+.goods .goods_content .goods_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;margin-top: 8rpx;}
+.goods .goods_content .card {background: #FFFFFF;box-shadow: 0rpx 4rpx 16rpx 1rpx rgba(0,0,0,0.06);border-radius: 16rpx;}
+.goods .goods_content .goods_info {margin-top: 40rpx;padding: 0 24rpx;box-sizing: border-box;}
+.goods .goods_content .goods_info .goods_info_content {display: flex;flex-direction: column;padding-bottom: 16rpx;box-sizing: border-box;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item {padding: 24rpx 0;box-sizing: border-box;width: 100%;border-bottom: 1rpx solid #DDDDDD;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item:last-child {border-bottom: 1rpx solid transparent;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item .goods_info_list {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;padding-left: 48rpx;padding-right: 24rpx;box-sizing: border-box;position: relative;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item .goods_info_list::before {content: '';position: absolute;left: 0;top: 50%;transform: translateY(-50%);z-index: 99;width: 32rpx;height: 32rpx;background: url(/assets/images/xian/icon_menu.png) no-repeat center;background-size: contain;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item .goods_info_list::after {content: '';position: absolute;right: 0;top: 50%;transform: translateY(-50%);z-index: 99;width: 24rpx;height: 24rpx;background: url(/assets/images/xian/icon_rarrow.png) no-repeat center;background-size: contain;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item.car .goods_info_list::before {background-image: url(/assets/images/xian/icon_car.png);}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item.note .goods_info_list::before {background-image: url(/assets/images/xian/icon_note.png);}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item .goods_info_address {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 24rpx;color: #999999;text-align: left;font-style: normal;text-transform: none;display: flex;align-items: center;padding-left: 48rpx;margin-top: 13rpx;}
+.goods .goods_content .goods_info .goods_info_content .goods_info_item .goods_info_address .line {width: 1rpx;height: 30rpx;background-color: #DDDDDD;margin: 0 16rpx;}
+.goods .goods_content .goods_detail .goods_detail_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #666666;text-align: center;font-style: normal;text-transform: none;padding: 40rpx 0;box-sizing: border-box;}
+.goods .goods_content .goods_detail .goods_detail_list {margin-bottom: 128rpx;display: flex;flex-direction: column;}
+.goods .goods_content .goods_detail .goods_detail_list .goods_detail_item .image {width: 100%;height: auto;}
+
+.dialog {background: #FFFFFF;box-shadow: 0rpx 4rpx 16rpx 1rpx rgba(0,0,0,0.06);border-radius: 16rpx 16rpx 0rpx 0rpx;padding: 40rpx;box-sizing: border-box;position: relative;}
+.dialog .dialog_delete {position: absolute;width: 36rpx;height: 42.01rpx;background: url(/assets/images/xian/icon_wrong.png) no-repeat center;background-size: cover;top: 44rpx;right: 24rpx;z-index: 99;}                   
+
+.param_dialog .dialog_title {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 36rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.param_dialog .dialog_list {margin-top: 16rpx;}
+.param_dialog .dialog_list .dialog_item {display: flex;align-items: center;padding: 24rpx 0;box-sizing: border-box;border-bottom: 1px solid #DDDDDD;}
+.param_dialog .dialog_list .dialog_item:last-child {border: none;}
+.param_dialog .dialog_list .dialog_item .dialog_text {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.param_dialog .dialog_list .dialog_item .dialog_text.fixed {width: 252rpx;} 
+.param_dialog .dialog_btn {width: 600rpx;height: 100rpx;line-height: 100rpx;background: #EE742F;box-shadow: 0rpx 10rpx 20rpx 1rpx rgba(238,116,47,0.5);border-radius: 50rpx 50rpx 50rpx 50rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 36rpx;color: #FFFFFF;text-align: center;font-style: normal;text-transform: none;margin: 60rpx auto 20rpx;}
+ 
+.serverprotect_dialog .dialog_title {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 36rpx;color: #150132;text-align: center;font-style: normal;text-transform: none;}
+.serverprotect_dialog .dialog_list {margin-top: 40rpx;}
+.serverprotect_dialog .dialog_list .dialog_item {margin-bottom: 60rpx;}
+.serverprotect_dialog .dialog_list .dialog_item .dialog_item_title {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 32rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.serverprotect_dialog .dialog_list .dialog_item .dialog_item_text {margin-top: 16rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #666666;text-align: left;font-style: normal;text-transform: none;}
+.serverprotect_dialog .dialog_btn {width: 600rpx;height: 100rpx;line-height: 100rpx;background: #88C161;box-shadow: 0rpx 10rpx 20rpx 1rpx rgba(136,193,97,0.5);border-radius: 50rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 36rpx;color: #FFFFFF;text-align: center;font-style: normal;text-transform: none;margin: auto;margin-top: 16rpx;margin-bottom: 100rpx;}
+
+.addcart_dialog {padding: 40rpx 24rpx;}
+.addcart_dialog .dialog_info {display: flex;}
+.addcart_dialog .dialog_info .dialog_info_img {width: 170rpx;padding-top: 127rpx;border-radius: 16rpx 16rpx 16rpx 16rpx;}
+.addcart_dialog .dialog_info .dialog_info_txt {padding-left: 24rpx;box-sizing: border-box;display: flex;flex-direction: column;}
+.addcart_dialog .dialog_info .dialog_info_txt .dialog_info_price {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 22rpx;color: #EE742F;text-align: left;font-style: normal;text-transform: none;display: flex;}
+.addcart_dialog .dialog_info .dialog_info_txt .dialog_info_price .dialog_info_origin_price {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #999999;text-align: left;font-style: normal;text-decoration-line: line-through;text-transform: none;margin-left: 16rpx;}
+.addcart_dialog .dialog_info .dialog_info_txt .dialog_item_stock {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;margin-top: 57rpx;}
+.addcart_dialog .dialog_list {display: flex;flex-direction: column;}
+.addcart_dialog .dialog_list .dialog_item {margin-top: 40rpx;}
+.addcart_dialog .dialog_list .dialog_item.num {display: flex;justify-content: space-between;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list {display: flex;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list .dialog_item_box {width: 230rpx;height: 76rpx;line-height: 76rpx;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;font-family: PingFangSC-Regular, PingFangSC-Regular;font-weight: normal;font-size: 28rpx;color: #666666;text-align: center;font-style: normal;text-transform: none;margin-top: 24rpx;margin-right: 16rpx;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list .dialog_item_box.checked {background: rgba(238,116,47,0.1);border-radius: 38rpx;border: 1rpx solid #EE742F;color: #EE742F;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list .dialog_item_btn {width: 56rpx;height: 56rpx;background: url(/assets/images/xian/icon_btnminus.png) no-repeat center;background-size: contain;}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list .dialog_item_btn.add {background-image: url(/assets/images/xian/icon_btnadd.png);}
+.addcart_dialog .dialog_list .dialog_item .dialog_item_list .dialog_item_num {width: 88rpx;height: 56rpx;line-height: 56rpx;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;font-family: PingFangSC-Regular, PingFangSC-Regular;font-weight: normal;font-size: 28rpx;color: #666666;text-align: center;font-style: normal;text-transform: none;margin: 0 8rpx;}
+.addcart_dialog .dialog_btn {margin: 100rpx auto 111rpx;width: 600rpx;height: 100rpx;line-height: 100rpx;background: #EE742F;box-shadow: 0rpx 10rpx 20rpx 1rpx rgba(238,116,47,0.5);border-radius: 50rpx 50rpx 50rpx 50rpx;font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 36rpx;color: #FFFFFF;text-align: center;font-style: normal;text-transform: none;}
+
+
+
+ 
+

+ 1 - 0
sources/client/smart-cooker/pages/menudesc/index.js

@@ -11,3 +11,4 @@ Page({
     ty.hideMenuButton()     
   },
 })
+ 

+ 18 - 0
sources/client/smart-cooker/pages/menusearch/index.js

@@ -0,0 +1,18 @@
+Page({
+  data: {
+    searchRecord: ['这是搜索的内容','这是搜索的','这是搜索的','这是搜索的','这是搜索的'], 
+  },
+
+  onShow() {
+    this.setData({
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()             
+  },
+  goMenuSearch() {
+    ty.navigateTo({
+      url: '/pages/menusearch/index',
+    })
+  },
+})

+ 12 - 0
sources/client/smart-cooker/pages/menusearch/index.json

@@ -0,0 +1,12 @@
+{
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "更多食谱",
+  "backgroundColor": "#FFFFFF",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "navigation": "/components/navigation/index"
+  }
+}

+ 25 - 0
sources/client/smart-cooker/pages/menusearch/index.tyml

@@ -0,0 +1,25 @@
+<view class="menusearch">
+    <view class="menusearch_header"></view>
+    <view class="menusearch_header">
+        <view class="navigator-btn">
+            <navigator url="pages/multifunctional/index" class="link" open-type="navigateBack" hover-class="other-navigator-hover"></navigator>
+        </view>
+        <view class="menusearch_search">
+            <input class="menusearch_input" name="cookname" placeholder="搜索食谱/菜谱" bind:tap="goMenuSearch" />
+            <view class="menusearch_icon"></view>
+        </view>
+        <view class="menusearch_btn img_box" bind:tap="goMyMenu">
+             <image class="image" src="/assets/images/xian/icon_searchm.png" mode="widthFix"></image>
+        </view>
+    </view>
+    <view class="menusearch_record">
+        <view class="menusearch_record_header">
+            <view class="menusearch_record_title">历史记录</view>
+            <view class="menusearch_record_delete">清除</view>
+        </view>
+        <view class="menusearch_record_list">
+            <view class="menusearch_record_item" ty:for="{{searchRecord}}" ty:key="index" bind:tap="goMenuSearch" data-cookname="{{item}}">{{item}}</view>
+        </view>
+   
+    </view>
+</view>

+ 18 - 0
sources/client/smart-cooker/pages/menusearch/index.tyss

@@ -0,0 +1,18 @@
+page {background-color: #FFFFFF;}
+.menusearch .menusearch_header {height: 88rpx;padding: 6rpx 24rpx;box-sizing: border-box;display: flex;justify-content: space-between;align-items: center;}
+.menusearch .menusearch_header .navigator-btn {margin-left: 6rpx;width: 20rpx;height: 36rpx;width: 36rpx;height: 36rpx;}
+.menusearch .menusearch_header .navigator-btn .link {width: 100%;height: 100%;background: #181818;background: url(/assets/images/xian/icon_larrow.png) no-repeat center;background-size: contain;display: inline-block;}
+.menusearch .menusearch_header .menusearch_search {position: relative;}
+.menusearch .menusearch_header .menusearch_search .menusearch_input {width: 522rpx;height: 76rpx;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;text-indent: 24rpx;}
+.menusearch .menusearch_header .menusearch_search .menusearch_icon {position: absolute;width: 36rpx;height: 36rpx;background: url(/assets/images/xian/icon_search.png) no-repeat center;background-size: contain;top: 50%;transform: translateY(-50%);right: 24rpx;} 
+.menusearch .menusearch_header .menusearch_btn {width: 76rpx;padding-top: 76rpx;}
+
+.menusearch .menusearch_record {margin-top: 40rpx;padding: 0 24rpx;box-sizing: border-box;position: relative;}
+.menusearch .menusearch_record .menusearch_record_header {display: flex;justify-content: space-between;align-items: center;}
+.menusearch .menusearch_record .menusearch_record_header .menusearch_record_title {font-family: PingFang SC, PingFang SC;font-weight: 500;font-size: 28rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;}
+.menusearch .menusearch_record .menusearch_record_header .menusearch_record_delete {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 28rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;position: relative;padding-left: 36rpx;}
+.menusearch .menusearch_record .menusearch_record_header .menusearch_record_delete::before {content: '';position: absolute;width: 28rpx;height: 28rpx;background: url(/assets/images/xian/icon_delete.png) no-repeat center;background-size: contain;left: 0;top: 50%;transform: translateY(-50%);}
+
+.menusearch .menusearch_record .menusearch_record_list {margin-top: 36rpx;display: flex;align-items: center;flex-wrap: wrap;}
+.menusearch .menusearch_record .menusearch_record_list .menusearch_record_item {padding: 18rpx 24rpx;box-sizing: border-box;font-family: PingFangSC-Regular, PingFangSC-Regular;font-weight: normal;font-size: 28rpx;color: #666666;text-align: center;font-style: normal;text-transform: none;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;margin-right: 16rpx;margin-bottom: 16rpx;}
+

+ 73 - 0
sources/client/smart-cooker/pages/mymenu/index.js

@@ -0,0 +1,73 @@
+Page({
+  data: {
+    menuList: [
+      {
+        name: '香滑皮蛋瘦肉粥十五分钟快...',
+        imgUrl: '/assets/images/xian/moremenu_img1.jpg',
+        text: '十五分钟快手之香滑皮蛋瘦肉粥,香滑皮蛋瘦肉粥十五分钟快手之香滑皮蛋',
+        time: '20',
+        level: '中等',
+        num: '202',
+        collect: '100',
+      },
+      {
+        name: '网红芝士烤牛奶',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '网红芝士烤牛奶/哄娃神器系列',
+        time: '40',
+        level: '中等',
+        num: '1.2w',
+        collect: '234',
+      }, 
+      {
+        name: '奶香豆沙',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '奶香豆沙小馒头,仅需一次松弛',
+        time: '20',
+        level: '中等',
+        num: '1246',
+        collect: '574',
+      },
+      {
+        name: '爆好吃的卤鸡腿!卤蛋(电饭煲)',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '晚上做好,剩下的汤汁不要倒掉',
+        time: '40',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
+      },
+      {
+        name: '糖醋鸡胸肉',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '酸酸甜甜的糖醋鸡胸肉,小朋友的最爱!',
+        time: '20',
+        level: '中等',
+        num: '1.4w',
+        collect: '2526',
+      },
+      {
+        name: '家庭版油焖大虾',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        text: '虾含蛋白质含钙量高,外酥里嫩。关键做法…',
+        time: '40',
+        level: '中等',
+        num: '2.4w',
+        collect: '1.2w',
+      },
+    ], 
+  },
+
+  onShow() {
+    this.setData({
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()             
+  },
+  goMenuSearch() {
+    ty.navigateTo({
+      url: '/pages/menusearch/index',
+    })
+  },
+})

+ 9 - 0
sources/client/smart-cooker/pages/mymenu/index.json

@@ -0,0 +1,9 @@
+{
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "navigationBarTextStyle": "black",
+  "navigationBarTitleText": "我的菜谱 2",
+  "backgroundColor": "#FFFFFF",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

+ 24 - 0
sources/client/smart-cooker/pages/mymenu/index.tyml

@@ -0,0 +1,24 @@
+<view class="mymenu">
+    <view class="mymenu_list" ty:if="{{menuList.length > 0}}">
+        <view class="mymenu_box" ty:for="{{menuList}}" ty:key="{{index}}">
+            <view class="mymenu_box_img img_box">
+                <image class="image" src="{{item.imgUrl}}" mode="widthFix"></image>
+                <view class="mymenu_box_border"></view>
+                <view class="mymenu_box_star"></view>
+            </view>
+            <view class="mymenu_box_content">
+                <view class="mymenu_box_title">{{item.name}}</view>
+                <view class="mymenu_box_text">{{item.text}}</view>
+                <view class="mymenu_box_type">
+                    <view class="mymenu_box_num none grid">{{item.time}}分钟</view>
+                    <view class="mymenu_box_line grid"></view>
+                    <view class="mymenu_box_num none grid">{{item.level}}</view>
+                    <view class="mymenu_box_line grid"></view>
+                    <view class="mymenu_box_num none grid">{{item.num}}做过</view>
+                    <view class="mymenu_box_num">{{item.num}}做过</view>
+                    <view class="mymenu_box_num">{{item.collect}}收藏</view>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>

+ 24 - 0
sources/client/smart-cooker/pages/mymenu/index.tyss

@@ -0,0 +1,24 @@
+page {background-color: #FFFFFF;}
+.mymenu .mymenu_list {padding: 0 24rpx;box-sizing: border-box;margin-top: 40rpx;margin-bottom: 25rpx;}
+.mymenu .mymenu_list .mymenu_box {display: flex;justify-content: space-between;align-items: center;margin-bottom: 41rpx;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_img {width: 238rpx;padding-top: 178rpx;box-sizing: border-box;border-radius: 16rpx;overflow: hidden;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content {width: calc(100% - 238rpx);padding-left: 24rpx;box-sizing: border-box;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 32rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;margin-top: 4rpx;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_text {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #999999;text-align: left;font-style: normal;text-transform: none;margin-top: 8rpx;display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;text-overflow: ellipsis;overflow: hidden;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_type {display: flex;align-items: center;margin-top: 26rpx;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_type .mymenu_box_num.none {display: none;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_type .mymenu_box_num {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #666666;text-align: left;font-style: normal;text-transform: none;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_content .mymenu_box_type .mymenu_box_num:last-child {margin-left: 24rpx;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_img .mymenu_box_border {position: absolute;top: 0;right: 0;border: 56rpx solid #EE742F;border-left: 56rpx solid transparent;border-bottom: 56rpx solid transparent;border: 28rpx solid #EE742F;border-left: 28rpx solid transparent;border-bottom: 28rpx solid transparent;}
+.mymenu .mymenu_list .mymenu_box .mymenu_box_img .mymenu_box_star {position: absolute;top: 6rpx;right: 6rpx;width: 24rpx;height: 24rpx;background: url(/assets/images/xian/icon_starp.png) no-repeat center;background-size: contain;}
+.mymenu .mymenu_list.grid {display: flex;flex-wrap: wrap;justify-content: space-between;margin-bottom: 52rpx;}
+.mymenu .mymenu_list.grid .mymenu_box {flex-direction: column;justify-content: flex-start;align-items: flex-start;width: calc((100% - 22rpx) / 2);}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_img {width: 100%;padding-top: 254rpx;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content {width: 100%;padding-left: 0rpx;margin-top: 24rpx;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_title {font-size: 28rpx;margin-top: 0rpx;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_text {display: none;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_type {margin-top: 8rpx;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_num {display: none;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_num.grid {display: block;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_line {display: none;width: 1rpx;height: 24rpx;background-color: #DDDDDD;margin : auto 16rpx;}
+.mymenu .mymenu_list.grid .mymenu_box .mymenu_box_content .mymenu_box_line.grid {display: block;}

+ 48 - 22
sources/client/smart-cooker/pages/smartselection/index.js

@@ -1,34 +1,60 @@
 Page({
   data: {
-    resultData: [
+    background: ['/assets/images/godzilla.png', '/assets/images/godzilla.png', '/assets/images/xian/swiper1.png'],
+    indicatorDots: true,
+    indicatorColor: '#FFFFFF',
+    indicatorActiveColor: '#EE742F',
+    autoplay: false,
+    circular: true,
+    interval: 2000,
+    duration: 500,
+    menuList: [
       {
-        name: 'phone',
-        value: 'dsasfaf',
+        name: '【热销】 电饭煲4L容量 20分钟热水快煮 智能…',
+        imgUrl: '/assets/images/xian/moremenu_img1.jpg',
+        price: '¥358.00',
+        origin_price: '¥678.00',
+        sales: '2w+',
       },
       {
-        name: 'password',
-        value: '15151',
+        name: '苏泊尔(SUPOR)小型电饭煲电饭锅3升2-6人',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        price: '¥358.00',
+        origin_price: '¥678.00',
+        sales: '2w+',
+      }, 
+      {
+        name: '奶香豆沙',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        price: '¥358.00',
+        origin_price: '¥678.00',
+        sales: '2w+',
+      },
+      {
+        name: '爆好吃的卤鸡腿!卤蛋(电饭煲)',
+        imgUrl: '/assets/images/xian/home_device1.png',
+        price: '¥358.00',
+        origin_price: '¥678.00',
+        sales: '2w+',
       },
-    ],
+    ], 
   },
 
-  handleSubmit(ev) {
-    const value = ev.detail.value;
-    const resultData = [];
-    for (let name in value) {
-      resultData.push({
-        name,
-        value: value[name],
-      });
-    }
+  onShow() {
     this.setData({
-      resultData,
-    });
-    console.log(resultData)
+      // hasHiddenTabBar: true,
+      message_list: []
+    })
+    ty.hideMenuButton()             
   },
-
-  getRegister() {
-    ty.switchTab({url: '/pages/my/index'})
+  goMenuSearch() {
+    ty.navigateTo({
+      url: '/pages/menusearch/index',
+    })
+  },
+  goMyMenu() {
+    ty.navigateTo({
+      url: '/pages/mymenu/index',
+    })
   },
-
 })

+ 7 - 3
sources/client/smart-cooker/pages/smartselection/index.json

@@ -1,8 +1,12 @@
 {
+  "navigationBarBackgroundColor": "#FFFFFF",
   "navigationBarTextStyle": "black",
-  "navigationBarTitleText": "index",
-  "backgroundColor": "#f2f4f6",
+  "navigationBarTitleText": "更多食谱",
+  "backgroundColor": "#FFFFFF",
   "backgroundTextStyle": "dark",
   "enablePullDownRefresh": true,
-  "usingComponents": {}
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "navigation": "/components/navigation/index"
+  }
 }

+ 29 - 20
sources/client/smart-cooker/pages/smartselection/index.tyml

@@ -1,24 +1,33 @@
-<view class="login">
-    <view class="login_title">
-        <text >智能改变生活</text>
+<view class="smartselection_bg"></view>
+<view class="smartselection">
+    <view class="smartselection_header"></view>
+    <view class="smartselection_header">
+        <view class="smartselection_search">
+            <input class="smartselection_input" name="cookname" placeholder="搜索商品" bind:confirm="goMenuSearch" />
+            <view class="smartselection_icon"></view>
+        </view>
     </view>
-    <view class="login_form">
-        <form bind:submit="handleSubmit" id="formSelf" >
-            <view class="row">
-                <icon class="row_icon" type="warn" size="23" color="yellow"></icon>
-                <input class="row_input" name="phone" placeholder="请输入手机号" />
-            </view>
-            <view class="row">
-                <icon class="row_icon" type="warn" size="23" color="yellow"></icon>
-                <input class="row_input" name="password" type="password" placeholder="请输入密码" />
-            </view>
-            <view class="row_tip">
-                <text bind:tap="getRegister">忘记密码?新用户注册</text>
+    <view class="smartselection_swiper">
+        <swiper style="height: 100%" indicator-dots="{{indicatorDots}}" indicator-color="{{indicatorColor}}" indicator-active-color="{{indicatorActiveColor}}" autoplay="{{autoplay}}" circular="{{circular}}" interval="{{interval}}" duration="{{duration}}">
+            <block ty:for="{{background}}" ty:key="*this">
+                <swiper-item>
+                    <image src="{{item}}" mode="widthFix" lazy-load="true"></image>
+                </swiper-item>
+            </block>
+        </swiper>
+    </view>
+    <view class="smartselection_list" ty:if="{{menuList.length > 0}}">
+        <view class="smartselection_box" ty:for="{{menuList}}" ty:key="{{index}}">
+            <view class="smartselection_box_img img_box">
+                <image class="image" src="{{item.imgUrl}}" mode="widthFix"></image>
             </view>
-            <view class="row_btn">
-                <button form-type="submit" id="triggerBtn" data-info="提交的按钮" type="primary" class="submit-btn">登录</button>
+            <view class="smartselection_box_content">
+                <view class="smartselection_box_title">{{item.name}}</view>
+                <view class="smartselection_box_type">
+                    <view class="smartselection_box_price">{{item.price}}<text class="smartselection_box_count">{{item.origin_price}}</text></view>
+                    <view class="smartselection_box_num">{{item.sales}}人付款</view>
+                </view>
             </view>
-        </form>
+        </view>
     </view>
-</view>
-
+</view>

+ 18 - 12
sources/client/smart-cooker/pages/smartselection/index.tyss

@@ -1,15 +1,21 @@
-/* .intro {
-  margin: 30px;
-  text-align: center;
-} */
-.cont_1200 {width: 1200px;margin: 0 auto;max-width: 92%;}
+page {background-color: #F6F7F8;}
+.smartselection_bg {position: fixed;width: 750rpx;height: 600rpx;background: linear-gradient( 180deg, #FFF3E0 0%, rgba(255,243,224,0) 100%);}
+.smartselection {position: relative;}
+.smartselection .smartselection_header {height: 88rpx;padding: 6rpx 24rpx;box-sizing: border-box;display: flex;justify-content: space-between;align-items: center;}
+.smartselection .smartselection_header .smartselection_search {position: relative;width: 100%;}
+.smartselection .smartselection_header .smartselection_search .smartselection_input {width: 100%;height: 76rpx;background: #F6F7F8;border-radius: 38rpx;border: 1rpx solid #DDDDDD;text-indent: 24rpx;}
+.smartselection .smartselection_header .smartselection_search .smartselection_icon {position: absolute;width: 36rpx;height: 36rpx;background: url(/assets/images/xian/icon_search.png) no-repeat center;background-size: contain;top: 50%;transform: translateY(-50%);right: 24rpx;} 
 
-.login {width: 100%;margin: 0 auto;padding: 0 20px;}
-.login .login_title {font-size: 30px; font-weight: bold; margin: 60px auto;}
-.login .login_form {display: flex; flex-direction: column; justify-content: center; align-items: center;}
-.login .login_form form .row {display: flex;padding: 10px 10px;border-radius: 5px;background-color: #ffffff;margin-bottom: 20px;}
-.login .login_form form .row .row_input {margin-left: 10px;}
-.login .login_form form .row_tip {color: orange;text-align: right;}
-.login .login_form form .row_btn {color: orange;box-shadow: 2px 4px 20px #00000033;}
+.smartselection .smartselection_swiper {margin-top: 40rpx;width: 100%;height: 340rpx;padding: 0 24rpx;box-sizing: border-box;}
+.smartselection .smartselection_swiper image {width: 100%;display: inline-block;border-radius: 16rpx;overflow: hidden;}
 
+.smartselection .smartselection_list {padding: 0 24rpx;box-sizing: border-box;margin-top: 40rpx;margin-bottom: 18rpx;display: flex;flex-wrap: wrap;justify-content: space-between;}
+.smartselection .smartselection_list .smartselection_box {display: flex;flex-direction: column;margin-bottom: 22rpx;width: calc((100% - 22rpx) / 2);background: #FFFFFF;box-shadow: 0rpx 4rpx 16rpx 1rpx rgba(0,0,0,0.06);border-radius: 16rpx;} 
+.smartselection .smartselection_list .smartselection_box .smartselection_box_img {width: 100%;padding-top: 254rpx;box-sizing: border-box;border-radius: 16rpx;overflow: hidden;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content {width: 100%;padding: 24rpx 16rpx;box-sizing: border-box;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content .smartselection_box_title {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 24rpx;color: #150132;text-align: left;font-style: normal;text-transform: none;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content .smartselection_box_type {margin-top: 40rpx;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content .smartselection_box_type .smartselection_box_price {font-family: PingFang SC, PingFang SC;font-weight: 600;font-size: 22rpx;color: #EE742F;text-align: left;font-style: normal;text-transform: none;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content .smartselection_box_type .smartselection_box_price .smartselection_box_count {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #999999;text-align: left;font-style: normal;text-decoration-line: line-through;text-transform: none;margin-left: 16rpx;}
+.smartselection .smartselection_list .smartselection_box .smartselection_box_content .smartselection_box_type .smartselection_box_num {font-family: PingFang SC, PingFang SC;font-weight: 400;font-size: 22rpx;color: #666666;text-align: left;font-style: normal;text-transform: none;margin-top: 8rpx;}