From d038254e82d807731065c347328ab2d02463eafa Mon Sep 17 00:00:00 2001 From: subing008 <275120420@qq.com> Date: Mon, 28 Jul 2025 16:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=A8=E6=88=BF=E7=A7=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/common.scss | 22 +- components/bluetooth_new.vue | 563 ++ components/food_item.vue | 80 + components/search.vue | 43 +- components/search2.vue | 103 + manifest.json | 9 +- pageTwo/count/food.vue | 1339 +-- pageTwo/me/foodlist.vue | 138 +- pageTwo/me/menudetail.vue | 1122 +-- pages.json | 7 + pages/count/count.vue | 23 +- pages/index/index.vue | 500 +- pages/menu/menu.vue | 87 +- pages/search/search.vue | 334 + static/111.jpg | Bin 0 -> 31174 bytes store/index.js | 1 + tools/model.js | 20 + .../.automator/mp-weixin/.automator.json | 0 unpackage/dist/build/mp-weixin/app.js | 4 + unpackage/dist/build/mp-weixin/app.json | 89 + unpackage/dist/build/mp-weixin/app.wxss | 3 + unpackage/dist/build/mp-weixin/common/main.js | 1 + .../dist/build/mp-weixin/common/main.wxss | 14 + .../dist/build/mp-weixin/common/runtime.js | 4 + .../dist/build/mp-weixin/common/vendor.js | 14 + .../mp-weixin/components/bluetooth_new.js | 10 + .../mp-weixin/components/bluetooth_new.json} | 0 .../mp-weixin/components/bluetooth_new.wxml | 1 + .../mp-weixin/components/bluetooth_new.wxss | 1 + .../build/mp-weixin/components/food_item.js | 10 + .../build/mp-weixin/components/food_item.json | 4 + .../build/mp-weixin/components/food_item.wxml | 1 + .../build/mp-weixin/components/food_item.wxss | 1 + .../dist/build/mp-weixin/components/list.js | 10 + .../dist/build/mp-weixin/components/list.json | 4 + .../dist/build/mp-weixin/components/list.wxml | 1 + .../dist/build/mp-weixin/components/search.js | 10 + .../build/mp-weixin/components/search.json | 6 + .../build/mp-weixin/components/search.wxml | 1 + .../build/mp-weixin/components/search.wxss | 1 + .../build/mp-weixin/components/search2.js | 10 + .../build/mp-weixin/components/search2.json | 4 + .../build/mp-weixin/components/search2.wxml | 1 + .../build/mp-weixin/components/search2.wxss | 1 + .../build/mp-weixin/pageTwo/count/KcalEdit.js | 1 + .../mp-weixin/pageTwo/count/KcalEdit.json | 5 + .../mp-weixin/pageTwo/count/KcalEdit.wxml | 1 + .../mp-weixin/pageTwo/count/KcalEdit.wxss | 1 + .../build/mp-weixin/pageTwo/count/food.js | 1 + .../build/mp-weixin/pageTwo/count/food.json | 10 + .../build/mp-weixin/pageTwo/count/food.wxml | 1 + .../build/mp-weixin/pageTwo/count/food.wxss | 3 + .../build/mp-weixin/pageTwo/count/setting.js | 1 + .../mp-weixin/pageTwo/count/setting.json | 5 + .../mp-weixin/pageTwo/count/setting.wxml | 1 + .../mp-weixin/pageTwo/count/setting.wxss | 1 + .../mp-weixin/pageTwo/login/forgetPassword.js | 1 + .../pageTwo/login/forgetPassword.json | 5 + .../pageTwo/login/forgetPassword.wxml | 1 + .../pageTwo/login/forgetPassword.wxss | 1 + .../build/mp-weixin/pageTwo/login/login.js | 1 + .../build/mp-weixin/pageTwo/login/login.json | 6 + .../build/mp-weixin/pageTwo/login/login.wxml | 1 + .../build/mp-weixin/pageTwo/login/login.wxss | 1 + .../build/mp-weixin/pageTwo/me/feedBack.js | 1 + .../build/mp-weixin/pageTwo/me/feedBack.json | 5 + .../build/mp-weixin/pageTwo/me/feedBack.wxml | 1 + .../build/mp-weixin/pageTwo/me/feedBack.wxss | 1 + .../build/mp-weixin/pageTwo/me/foodlist.js | 1 + .../build/mp-weixin/pageTwo/me/foodlist.json | 7 + .../build/mp-weixin/pageTwo/me/foodlist.wxml | 1 + .../build/mp-weixin/pageTwo/me/foodlist.wxss | 1 + .../build/mp-weixin/pageTwo/me/menuEdit.js | 1 + .../build/mp-weixin/pageTwo/me/menuEdit.json | 6 + .../build/mp-weixin/pageTwo/me/menuEdit.wxml | 1 + .../build/mp-weixin/pageTwo/me/menuEdit.wxss | 3 + .../build/mp-weixin/pageTwo/me/menudetail.js | 1 + .../mp-weixin/pageTwo/me/menudetail.json | 7 + .../mp-weixin/pageTwo/me/menudetail.wxml | 1 + .../mp-weixin/pageTwo/me/menudetail.wxss | 1 + .../dist/build/mp-weixin/pageTwo/me/mymenu.js | 1 + .../build/mp-weixin/pageTwo/me/mymenu.json | 7 + .../build/mp-weixin/pageTwo/me/mymenu.wxml | 1 + .../dist/build/mp-weixin/pageTwo/me/record.js | 1 + .../build/mp-weixin/pageTwo/me/record.json | 8 + .../build/mp-weixin/pageTwo/me/record.wxml | 1 + .../build/mp-weixin/pageTwo/me/record.wxss | 1 + .../build/mp-weixin/pageTwo/me/userEdit.js | 1 + .../build/mp-weixin/pageTwo/me/userEdit.json | 5 + .../build/mp-weixin/pageTwo/me/userEdit.wxml | 1 + .../build/mp-weixin/pageTwo/me/userEdit.wxss | 1 + .../build/mp-weixin/pageTwo/setting/email.js | 1 + .../mp-weixin/pageTwo/setting/email.json | 5 + .../mp-weixin/pageTwo/setting/email.wxml | 1 + .../mp-weixin/pageTwo/setting/email.wxss | 1 + .../mp-weixin/pageTwo/setting/password.js | 1 + .../mp-weixin/pageTwo/setting/password.json | 5 + .../mp-weixin/pageTwo/setting/password.wxml | 1 + .../mp-weixin/pageTwo/setting/password.wxss | 1 + .../build/mp-weixin/pageTwo/setting/phone.js | 1 + .../mp-weixin/pageTwo/setting/phone.json | 5 + .../mp-weixin/pageTwo/setting/phone.wxml | 1 + .../mp-weixin/pageTwo/setting/phone.wxss | 1 + .../mp-weixin/pageTwo/setting/setting.js | 1 + .../mp-weixin/pageTwo/setting/setting.json | 7 + .../mp-weixin/pageTwo/setting/setting.wxml | 1 + .../mp-weixin/pageTwo/setting/setting.wxss | 1 + .../mp-weixin/pageTwo/webview/webview.js | 1 + .../mp-weixin/pageTwo/webview/webview.json | 5 + .../mp-weixin/pageTwo/webview/webview.wxml | 1 + .../dist/build/mp-weixin/pages/add/Preview.js | 1 + .../build/mp-weixin/pages/add/Preview.json | 4 + .../build/mp-weixin/pages/add/Preview.wxml | 1 + .../build/mp-weixin/pages/add/Preview.wxss | 1 + .../dist/build/mp-weixin/pages/add/add.js | 1 + .../dist/build/mp-weixin/pages/add/add.json | 7 + .../dist/build/mp-weixin/pages/add/add.wxml | 1 + .../dist/build/mp-weixin/pages/add/add.wxss | 3 + .../dist/build/mp-weixin/pages/count/count.js | 1 + .../build/mp-weixin/pages/count/count.json | 8 + .../build/mp-weixin/pages/count/count.wxml | 1 + .../build/mp-weixin/pages/count/count.wxss | 1 + .../dist/build/mp-weixin/pages/index/index.js | 1 + .../build/mp-weixin/pages/index/index.json | 8 + .../build/mp-weixin/pages/index/index.wxml | 1 + .../build/mp-weixin/pages/index/index.wxss | 2 + unpackage/dist/build/mp-weixin/pages/me/me.js | 1 + .../dist/build/mp-weixin/pages/me/me.json | 7 + .../dist/build/mp-weixin/pages/me/me.wxml | 1 + .../dist/build/mp-weixin/pages/me/me.wxss | 1 + .../dist/build/mp-weixin/pages/menu/menu.js | 1 + .../dist/build/mp-weixin/pages/menu/menu.json | 7 + .../dist/build/mp-weixin/pages/menu/menu.wxml | 1 + .../dist/build/mp-weixin/pages/menu/menu.wxss | 1 + .../build/mp-weixin/pages/search/search.js | 1 + .../build/mp-weixin/pages/search/search.json | 4 + .../build/mp-weixin/pages/search/search.wxml | 1 + .../build/mp-weixin/pages/search/search.wxss | 1 + .../dist/build/mp-weixin/project.config.json | 36 + unpackage/dist/build/mp-weixin/static/111.jpg | Bin 0 -> 31174 bytes .../dist/build/mp-weixin/static/Clear.png | Bin 0 -> 4490 bytes unpackage/dist/build/mp-weixin/static/add.png | Bin 0 -> 4057 bytes unpackage/dist/build/mp-weixin/static/cai.png | Bin 0 -> 1410 bytes .../dist/build/mp-weixin/static/cai01.png | Bin 0 -> 1401 bytes .../dist/build/mp-weixin/static/cheng.png | Bin 0 -> 6883 bytes .../dist/build/mp-weixin/static/close.png | Bin 0 -> 4982 bytes .../dist/build/mp-weixin/static/home.png | Bin 0 -> 1443 bytes .../dist/build/mp-weixin/static/home01.png | Bin 0 -> 1342 bytes unpackage/dist/build/mp-weixin/static/ji.png | Bin 0 -> 1933 bytes .../dist/build/mp-weixin/static/ji01.png | Bin 0 -> 1772 bytes .../dist/build/mp-weixin/static/lianjie.png | Bin 0 -> 1287 bytes unpackage/dist/build/mp-weixin/static/me.png | Bin 0 -> 1894 bytes .../dist/build/mp-weixin/static/me01.png | Bin 0 -> 1562 bytes .../dist/build/mp-weixin/static/none.png | Bin 0 -> 13419 bytes unpackage/dist/build/mp-weixin/static/pan.png | Bin 0 -> 3327 bytes .../dist/build/mp-weixin/static/phone.png | Bin 0 -> 6191 bytes unpackage/dist/build/mp-weixin/static/xia.png | Bin 0 -> 2304 bytes .../components/qiun-data-charts.js | 10 + .../components/qiun-data-charts.json | 4 + .../components/qiun-data-charts.wxml | 1 + .../components/qiun-data-charts.wxss | 1 + .../uni_modules/ren-calendar/ren-calendar.js | 10 + .../ren-calendar/ren-calendar.json | 6 + .../ren-calendar/ren-calendar.wxml | 1 + .../ren-calendar/ren-calendar.wxss | 2 + .../components/uni-icons/uni-icons.js | 10 + .../components/uni-icons/uni-icons.json | 4 + .../components/uni-icons/uni-icons.wxml | 1 + .../components/uni-icons/uni-icons.wxss | 1 + .../.sourcemap/mp-weixin/common/main.js.map | 2 +- .../mp-weixin/common/runtime.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/bluetooth.js.map | 1 - .../mp-weixin/components/bluetooth_new.js.map | 1 + .../components/circleProgress.js.map | 1 - .../mp-weixin/components/food_item.js.map | 1 + .../mp-weixin/components/list.js.map | 2 +- .../mp-weixin/components/search.js.map | 2 +- .../mp-weixin/components/search2.js.map | 1 + .../mp-weixin/components/tabbar.js.map | 1 - .../mp-weixin/pageTwo/count/KcalEdit.js.map | 2 +- .../mp-weixin/pageTwo/count/food.js.map | 2 +- .../mp-weixin/pageTwo/count/foodlist.js.map | 1 - .../mp-weixin/pageTwo/count/setting.js.map | 2 +- .../mp-weixin/pageTwo/login/detail.js.map | 1 - .../pageTwo/login/forgetPassword.js.map | 2 +- .../mp-weixin/pageTwo/login/login.js.map | 2 +- .../mp-weixin/pageTwo/me/feedBack.js.map | 2 +- .../mp-weixin/pageTwo/me/foodlist.js.map | 2 +- .../mp-weixin/pageTwo/me/mendEdit.js.map | 1 - .../mp-weixin/pageTwo/me/menuEdit.js.map | 2 +- .../mp-weixin/pageTwo/me/menudetail.js.map | 2 +- .../mp-weixin/pageTwo/me/menulist.js.map | 1 - .../mp-weixin/pageTwo/me/mymenu.js.map | 2 +- .../mp-weixin/pageTwo/me/record.js.map | 2 +- .../mp-weixin/pageTwo/me/userEdit.js.map | 2 +- .../mp-weixin/pageTwo/mendEdit.js.map | 1 - .../mp-weixin/pageTwo/menudetail.js.map | 1 - .../mp-weixin/pageTwo/mymenu.js.map | 1 - .../pageTwo/pageTwo/me/userEdit.js.map | 1 - .../mp-weixin/pageTwo/record.js.map | 1 - .../mp-weixin/pageTwo/setting.js.map | 1 - .../mp-weixin/pageTwo/setting/email.js.map | 2 +- .../mp-weixin/pageTwo/setting/password.js.map | 2 +- .../mp-weixin/pageTwo/setting/phone.js.map | 2 +- .../mp-weixin/pageTwo/setting/setting.js.map | 2 +- .../mp-weixin/pageTwo/webview/webview.js.map | 2 +- .../mp-weixin/pages/add/Preview.js.map | 2 +- .../.sourcemap/mp-weixin/pages/add/add.js.map | 2 +- .../mp-weixin/pages/count/count.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../.sourcemap/mp-weixin/pages/me/me.js.map | 2 +- .../mp-weixin/pages/me/menulist.js.map | 1 - .../mp-weixin/pages/menu/menu.js.map | 2 +- .../mp-weixin/pages/menu/menu/menu.js.map | 1 - .../mp-weixin/pages/search/search.js.map | 1 + .../as-calendar/as-calendar.js.map | 1 - .../components/qiun-data-charts.js.map | 2 +- .../ren-calendar/ren-calendar.js.map | 2 +- .../uni-datetime-picker/calendar-item.js.map | 1 - .../uni-datetime-picker/calendar.js.map | 1 - .../uni-datetime-picker/time-picker.js.map | 1 - .../uni-datetime-picker.js.map | 1 - .../uni-file-picker/uni-file-picker.js.map | 1 - .../uni-file-picker/upload-file.js.map | 1 - .../uni-file-picker/upload-image.js.map | 1 - .../components/uni-icons/uni-icons.js.map | 2 +- unpackage/dist/dev/mp-weixin/app.json | 9 +- unpackage/dist/dev/mp-weixin/common/main.js | 56 +- unpackage/dist/dev/mp-weixin/common/main.wxss | 11 + .../dist/dev/mp-weixin/common/runtime.js | 39 - unpackage/dist/dev/mp-weixin/common/vendor.js | 7723 +++++++++-------- .../dev/mp-weixin/components/bluetooth.js | 459 - .../dev/mp-weixin/components/bluetooth.wxml | 1 - .../dev/mp-weixin/components/bluetooth_new.js | 641 ++ .../mp-weixin/components/bluetooth_new.json | 6 + .../mp-weixin/components/bluetooth_new.wxml | 1 + .../{bluetooth.wxss => bluetooth_new.wxss} | 22 +- .../dev/mp-weixin/components/food_item.js | 196 + .../dev/mp-weixin/components/food_item.json | 4 + .../dev/mp-weixin/components/food_item.wxml | 1 + .../dev/mp-weixin/components/food_item.wxss | 71 + .../dist/dev/mp-weixin/components/list.js | 68 +- .../dist/dev/mp-weixin/components/search.js | 146 +- .../dist/dev/mp-weixin/components/search.json | 4 +- .../dist/dev/mp-weixin/components/search.wxml | 2 +- .../dist/dev/mp-weixin/components/search.wxss | 15 + .../dist/dev/mp-weixin/components/search2.js | 197 + .../dev/mp-weixin/components/search2.json | 4 + .../dev/mp-weixin/components/search2.wxml | 1 + .../dev/mp-weixin/components/search2.wxss | 86 + .../dev/mp-weixin/pageTwo/count/KcalEdit.js | 104 +- .../dist/dev/mp-weixin/pageTwo/count/food.js | 329 +- .../dev/mp-weixin/pageTwo/count/food.json | 4 +- .../dev/mp-weixin/pageTwo/count/food.wxml | 2 +- .../dev/mp-weixin/pageTwo/count/food.wxss | 111 +- .../dev/mp-weixin/pageTwo/count/setting.js | 104 +- .../mp-weixin/pageTwo/login/forgetPassword.js | 122 +- .../dist/dev/mp-weixin/pageTwo/login/login.js | 104 +- .../dist/dev/mp-weixin/pageTwo/me/feedBack.js | 104 +- .../dist/dev/mp-weixin/pageTwo/me/foodlist.js | 148 +- .../dev/mp-weixin/pageTwo/me/foodlist.wxss | 28 +- .../dist/dev/mp-weixin/pageTwo/me/menuEdit.js | 106 +- .../dev/mp-weixin/pageTwo/me/menudetail.js | 164 +- .../dev/mp-weixin/pageTwo/me/menudetail.json | 2 +- .../dev/mp-weixin/pageTwo/me/menudetail.wxml | 2 +- .../dev/mp-weixin/pageTwo/me/menudetail.wxss | 31 +- .../dist/dev/mp-weixin/pageTwo/me/mymenu.js | 80 +- .../dist/dev/mp-weixin/pageTwo/me/record.js | 108 +- .../dist/dev/mp-weixin/pageTwo/me/userEdit.js | 104 +- .../dev/mp-weixin/pageTwo/setting/email.js | 104 +- .../dev/mp-weixin/pageTwo/setting/password.js | 104 +- .../dev/mp-weixin/pageTwo/setting/phone.js | 104 +- .../dev/mp-weixin/pageTwo/setting/setting.js | 106 +- .../dev/mp-weixin/pageTwo/webview/webview.js | 78 +- .../dist/dev/mp-weixin/pages/add/Preview.js | 78 +- unpackage/dist/dev/mp-weixin/pages/add/add.js | 80 +- .../dist/dev/mp-weixin/pages/count/count.js | 82 +- .../dist/dev/mp-weixin/pages/count/count.wxml | 2 +- .../dist/dev/mp-weixin/pages/count/count.wxss | 14 + .../dist/dev/mp-weixin/pages/index/index.js | 119 +- .../dist/dev/mp-weixin/pages/index/index.json | 2 +- .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/index/index.wxss | 2 +- unpackage/dist/dev/mp-weixin/pages/me/me.js | 80 +- .../dist/dev/mp-weixin/pages/menu/menu.js | 140 +- .../dist/dev/mp-weixin/pages/menu/menu.json | 2 +- .../dist/dev/mp-weixin/pages/menu/menu.wxml | 2 +- .../dist/dev/mp-weixin/pages/menu/menu.wxss | 3 + .../dist/dev/mp-weixin/pages/search/search.js | 338 + .../dev/mp-weixin/pages/search/search.json | 4 + .../dev/mp-weixin/pages/search/search.wxml | 1 + .../dev/mp-weixin/pages/search/search.wxss | 198 + .../dist/dev/mp-weixin/project.config.json | 18 +- .../dev/mp-weixin/project.private.config.json | 27 - unpackage/dist/dev/mp-weixin/static/111.jpg | Bin 0 -> 31174 bytes .../components/qiun-data-charts.js | 100 +- .../uni_modules/ren-calendar/ren-calendar.js | 96 +- .../components/uni-icons/uni-icons.js | 96 +- 299 files changed, 11357 insertions(+), 7143 deletions(-) create mode 100644 components/bluetooth_new.vue create mode 100644 components/food_item.vue create mode 100644 components/search2.vue create mode 100644 pages/search/search.vue create mode 100644 static/111.jpg create mode 100644 unpackage/dist/build/.automator/mp-weixin/.automator.json create mode 100644 unpackage/dist/build/mp-weixin/app.js create mode 100644 unpackage/dist/build/mp-weixin/app.json create mode 100644 unpackage/dist/build/mp-weixin/app.wxss create mode 100644 unpackage/dist/build/mp-weixin/common/main.js create mode 100644 unpackage/dist/build/mp-weixin/common/main.wxss create mode 100644 unpackage/dist/build/mp-weixin/common/runtime.js create mode 100644 unpackage/dist/build/mp-weixin/common/vendor.js create mode 100644 unpackage/dist/build/mp-weixin/components/bluetooth_new.js rename unpackage/dist/{dev/mp-weixin/components/bluetooth.json => build/mp-weixin/components/bluetooth_new.json} (100%) create mode 100644 unpackage/dist/build/mp-weixin/components/bluetooth_new.wxml create mode 100644 unpackage/dist/build/mp-weixin/components/bluetooth_new.wxss create mode 100644 unpackage/dist/build/mp-weixin/components/food_item.js create mode 100644 unpackage/dist/build/mp-weixin/components/food_item.json create mode 100644 unpackage/dist/build/mp-weixin/components/food_item.wxml create mode 100644 unpackage/dist/build/mp-weixin/components/food_item.wxss create mode 100644 unpackage/dist/build/mp-weixin/components/list.js create mode 100644 unpackage/dist/build/mp-weixin/components/list.json create mode 100644 unpackage/dist/build/mp-weixin/components/list.wxml create mode 100644 unpackage/dist/build/mp-weixin/components/search.js create mode 100644 unpackage/dist/build/mp-weixin/components/search.json create mode 100644 unpackage/dist/build/mp-weixin/components/search.wxml create mode 100644 unpackage/dist/build/mp-weixin/components/search.wxss create mode 100644 unpackage/dist/build/mp-weixin/components/search2.js create mode 100644 unpackage/dist/build/mp-weixin/components/search2.json create mode 100644 unpackage/dist/build/mp-weixin/components/search2.wxml create mode 100644 unpackage/dist/build/mp-weixin/components/search2.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/KcalEdit.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/KcalEdit.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/KcalEdit.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/KcalEdit.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/food.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/food.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/food.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/food.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/setting.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/setting.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/setting.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/count/setting.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/forgetPassword.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/forgetPassword.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/forgetPassword.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/forgetPassword.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/login.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/login.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/login.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/login/login.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/feedBack.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/feedBack.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/feedBack.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/feedBack.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/foodlist.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/foodlist.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/foodlist.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/foodlist.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menuEdit.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menuEdit.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menuEdit.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menuEdit.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menudetail.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menudetail.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menudetail.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/menudetail.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/mymenu.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/mymenu.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/mymenu.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/record.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/record.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/record.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/record.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/userEdit.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/userEdit.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/userEdit.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/me/userEdit.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/email.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/email.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/email.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/email.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/password.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/password.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/password.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/password.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/phone.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/phone.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/phone.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/phone.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/setting.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/setting.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/setting.wxml create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/setting/setting.wxss create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/webview/webview.js create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/webview/webview.json create mode 100644 unpackage/dist/build/mp-weixin/pageTwo/webview/webview.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/add/Preview.js create mode 100644 unpackage/dist/build/mp-weixin/pages/add/Preview.json create mode 100644 unpackage/dist/build/mp-weixin/pages/add/Preview.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/add/Preview.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/add/add.js create mode 100644 unpackage/dist/build/mp-weixin/pages/add/add.json create mode 100644 unpackage/dist/build/mp-weixin/pages/add/add.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/add/add.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/count/count.js create mode 100644 unpackage/dist/build/mp-weixin/pages/count/count.json create mode 100644 unpackage/dist/build/mp-weixin/pages/count/count.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/count/count.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/index/index.js create mode 100644 unpackage/dist/build/mp-weixin/pages/index/index.json create mode 100644 unpackage/dist/build/mp-weixin/pages/index/index.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/index/index.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/me/me.js create mode 100644 unpackage/dist/build/mp-weixin/pages/me/me.json create mode 100644 unpackage/dist/build/mp-weixin/pages/me/me.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/me/me.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/menu/menu.js create mode 100644 unpackage/dist/build/mp-weixin/pages/menu/menu.json create mode 100644 unpackage/dist/build/mp-weixin/pages/menu/menu.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/menu/menu.wxss create mode 100644 unpackage/dist/build/mp-weixin/pages/search/search.js create mode 100644 unpackage/dist/build/mp-weixin/pages/search/search.json create mode 100644 unpackage/dist/build/mp-weixin/pages/search/search.wxml create mode 100644 unpackage/dist/build/mp-weixin/pages/search/search.wxss create mode 100644 unpackage/dist/build/mp-weixin/project.config.json create mode 100644 unpackage/dist/build/mp-weixin/static/111.jpg create mode 100644 unpackage/dist/build/mp-weixin/static/Clear.png create mode 100644 unpackage/dist/build/mp-weixin/static/add.png create mode 100644 unpackage/dist/build/mp-weixin/static/cai.png create mode 100644 unpackage/dist/build/mp-weixin/static/cai01.png create mode 100644 unpackage/dist/build/mp-weixin/static/cheng.png create mode 100644 unpackage/dist/build/mp-weixin/static/close.png create mode 100644 unpackage/dist/build/mp-weixin/static/home.png create mode 100644 unpackage/dist/build/mp-weixin/static/home01.png create mode 100644 unpackage/dist/build/mp-weixin/static/ji.png create mode 100644 unpackage/dist/build/mp-weixin/static/ji01.png create mode 100644 unpackage/dist/build/mp-weixin/static/lianjie.png create mode 100644 unpackage/dist/build/mp-weixin/static/me.png create mode 100644 unpackage/dist/build/mp-weixin/static/me01.png create mode 100644 unpackage/dist/build/mp-weixin/static/none.png create mode 100644 unpackage/dist/build/mp-weixin/static/pan.png create mode 100644 unpackage/dist/build/mp-weixin/static/phone.png create mode 100644 unpackage/dist/build/mp-weixin/static/xia.png create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts.js create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts.json create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts.wxml create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/qiun-data-charts/components/qiun-data-charts.wxss create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/ren-calendar/ren-calendar.js create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/ren-calendar/ren-calendar.json create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/ren-calendar/ren-calendar.wxml create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/ren-calendar/ren-calendar.wxss create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.json create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxml create mode 100644 unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.wxss delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/bluetooth.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/bluetooth_new.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/circleProgress.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/food_item.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/search2.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/tabbar.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/count/foodlist.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/login/detail.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/me/mendEdit.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/me/menulist.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/mendEdit.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/menudetail.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/mymenu.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/pageTwo/me/userEdit.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/record.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pageTwo/setting.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/me/menulist.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/menu/menu/menu.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/search/search.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/as-calendar/as-calendar.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/uni-file-picker.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-file.js.map delete mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-file-picker/components/uni-file-picker/upload-image.js.map delete mode 100644 unpackage/dist/dev/mp-weixin/components/bluetooth.js delete mode 100644 unpackage/dist/dev/mp-weixin/components/bluetooth.wxml create mode 100644 unpackage/dist/dev/mp-weixin/components/bluetooth_new.js create mode 100644 unpackage/dist/dev/mp-weixin/components/bluetooth_new.json create mode 100644 unpackage/dist/dev/mp-weixin/components/bluetooth_new.wxml rename unpackage/dist/dev/mp-weixin/components/{bluetooth.wxss => bluetooth_new.wxss} (81%) create mode 100644 unpackage/dist/dev/mp-weixin/components/food_item.js create mode 100644 unpackage/dist/dev/mp-weixin/components/food_item.json create mode 100644 unpackage/dist/dev/mp-weixin/components/food_item.wxml create mode 100644 unpackage/dist/dev/mp-weixin/components/food_item.wxss create mode 100644 unpackage/dist/dev/mp-weixin/components/search2.js create mode 100644 unpackage/dist/dev/mp-weixin/components/search2.json create mode 100644 unpackage/dist/dev/mp-weixin/components/search2.wxml create mode 100644 unpackage/dist/dev/mp-weixin/components/search2.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/search/search.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/search/search.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/search/search.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/search/search.wxss delete mode 100644 unpackage/dist/dev/mp-weixin/project.private.config.json create mode 100644 unpackage/dist/dev/mp-weixin/static/111.jpg diff --git a/assets/common.scss b/assets/common.scss index bacb490..ddb13f0 100644 --- a/assets/common.scss +++ b/assets/common.scss @@ -205,11 +205,22 @@ page { font-size: 14px; font-weight: bold; overflow-y: scroll; + overflow-x: hidden; height: calc(100vh - 70px); .name { padding-left: 15px; + white-space: nowrap; + overflow-x: auto; + width: 160rpx; + font-size: 26rpx; } + .name::-webkit-scrollbar { + display: none; + width: 0; + height: 0; + color: transparent; + } .active { color: $maincolor; @@ -246,11 +257,10 @@ page { } .list { - display: flex; - flex-wrap: wrap; - align-items: center; - justify-content: space-between; - + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; image { width: 140rpx; height: 140rpx; @@ -260,7 +270,7 @@ page { text { display: block; text-align: center; - margin-bottom: 10px; + margin-bottom: 10px; } } } diff --git a/components/bluetooth_new.vue b/components/bluetooth_new.vue new file mode 100644 index 0000000..96739af --- /dev/null +++ b/components/bluetooth_new.vue @@ -0,0 +1,563 @@ + + + + + \ No newline at end of file diff --git a/components/food_item.vue b/components/food_item.vue new file mode 100644 index 0000000..00e68f7 --- /dev/null +++ b/components/food_item.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/components/search.vue b/components/search.vue index c27334f..287aa65 100644 --- a/components/search.vue +++ b/components/search.vue @@ -5,6 +5,10 @@ + + + + 搜索 @@ -16,12 +20,22 @@ @@ -66,6 +92,21 @@ display: flex; z-index: 99999; } + .voice { + display: flex; + justify-content: flex-end; + align-items: center; + position: absolute; + right: 10px; + top: 0; + bottom: 0; + width: 150rpx; + display: flex; + z-index: 99999; + .mic { + margin-right: 10rpx; + } + } } .searchBtn { diff --git a/components/search2.vue b/components/search2.vue new file mode 100644 index 0000000..41e7298 --- /dev/null +++ b/components/search2.vue @@ -0,0 +1,103 @@ + + + + + diff --git a/manifest.json b/manifest.json index bfeca51..5d722a5 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,11 @@ { "name" : "kitchendDevice", - "appid" : "__UNI__2494015", + "appid" : "__UNI__9A0614A", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, + "sassImplementationName" : "node-sass", /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, @@ -65,8 +66,12 @@ "plugins" : { "sdkPlugin" : { //这里是引用的插件名称 地图路线规划 - "version" : "2.3.4", //插件版本 + "version" : "2.4.0", //插件版本 "provider" : "wx17e93aad47cdae1a" //插件appid + }, + "WechatSI" : { + "version" : "0.3.6", + "provider" : "wx069ba97219f66d99" } } }, diff --git a/pageTwo/count/food.vue b/pageTwo/count/food.vue index 733a433..c36d9a4 100644 --- a/pageTwo/count/food.vue +++ b/pageTwo/count/food.vue @@ -1,587 +1,844 @@ \ No newline at end of file diff --git a/pageTwo/me/foodlist.vue b/pageTwo/me/foodlist.vue index 7ec12b5..31eb230 100644 --- a/pageTwo/me/foodlist.vue +++ b/pageTwo/me/foodlist.vue @@ -28,6 +28,7 @@ {{ite.name}} + @@ -70,7 +71,6 @@ menu3: [], menulist: [], ActiveList: [], - searchResults: [], page: 1, type: "", name: "", @@ -80,8 +80,17 @@ computed: { ...mapState(["foodList"]), menuTop() { - this.menu2 = this.foodList.length ? this.foodList[0].list : [] - return this.foodList + this.menu2 = this.foodList.length ? this.foodList[0].list : [], + console.log([...this.foodList, { + id: 4, + list: [], + name: '搜索' + }]) + return [...this.foodList, { + id: 4, + list: [], + name: '搜索' + }] }, }, onLoad(options) { @@ -176,22 +185,20 @@ let that = this let list = [] if (name != "") { - that.searchResults = [] - that.menu.forEach((item, index) => { - item.list.forEach((ite, ind) => { - ite.list.forEach((it, id) => { - if (it.name.indexOf(name) !== -1) { - that.searchResults.push(it) - return - } - }) - }) + that.$model.getFoodSearch({ + food_name: name + }).then(res => { + if (res.code != 0) { + uni.showToast({ + title: res.msg, + icon: 'error' + }) + return + } + that.index = 3 + that.menu2 = [] + that.menu3 = res.data }) - that.index = that.menu.findIndex(ite => ite.id == that.searchResults[0].one_id) - console.log("arr", that.searchResults, ) - } else { - that.index = 0 - that.searchResults = [] } }, @@ -236,47 +243,49 @@ position: relative; margin-top: 101px; height: calc(100vh - 101px) !important; - } - - .left { - top: 101px !important; - position: fixed; - background-color: #f7f7f7; - } - - .right { - top: 0px !important; - - .list { - display: flex; - flex-wrap: wrap; - } - - .item { - width: 29%; - border: 1px solid #dfdfdf; - display: flex; - align-items: center; - box-sizing: border-box; - justify-content: space-between; - height: 30px; - border-radius: 5px; - margin: 0 2% 10px; - padding: 0 5px; - - text { - margin-bottom: 0 !important; - } - } - - - .icon-xuanzhong { - color: $maincolor; - } - - .active0 { - border: 1px solid $maincolor; - } + + .left { + top: 101px !important; + position: fixed; + background-color: #f7f7f7; + height: calc(100vh - 100px); + } + + .right { + top: 0px !important; + height: calc(100vh - 100px); + + .list { + display: flex; + flex-wrap: wrap; + } + + .item { + width: 29%; + border: 1px solid #dfdfdf; + display: flex; + align-items: center; + box-sizing: border-box; + justify-content: space-between; + height: 30px; + border-radius: 5px; + margin: 0 2% 10px; + padding: 0 5px; + + text { + margin-bottom: 0 !important; + } + } + + + .icon-xuanzhong { + color: $maincolor; + } + + .active0 { + border: 1px solid $maincolor; + } + } } .activeList { @@ -298,7 +307,6 @@ // flex-wrap: wrap; .item { - width: 29%; border: 1px solid $maincolor; display: flex; justify-content: space-between; @@ -308,11 +316,12 @@ align-items: center; margin: 0 2% 10px; float: left; - padding: 0 5px; + padding: 0 10px; icon { color: $maincolor; font-size: 16px; + margin-left: 10rpx; } } } @@ -346,10 +355,11 @@ } .maxheight { - padding-bottom: 265rpx; - .left { - height: calc(100vh - 500rpx); + height: calc(100vh - 680rpx); } + .right { + height: calc(100vh - 680rpx); + } } \ No newline at end of file diff --git a/pageTwo/me/menudetail.vue b/pageTwo/me/menudetail.vue index 402574a..fedf287 100644 --- a/pageTwo/me/menudetail.vue +++ b/pageTwo/me/menudetail.vue @@ -1,605 +1,629 @@ \ No newline at end of file diff --git a/pages.json b/pages.json index 73a8a3a..a68ac0c 100644 --- a/pages.json +++ b/pages.json @@ -41,6 +41,13 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path" : "pages/search/search", + "style" : + { + "navigationBarTitleText" : "搜索" + } } ], "subPackages": [{ diff --git a/pages/count/count.vue b/pages/count/count.vue index 8387357..1f46057 100644 --- a/pages/count/count.vue +++ b/pages/count/count.vue @@ -27,30 +27,32 @@ 还能吃 {{remaining_kcal}} + Kcal 建议摄入 {{suggestion.kcal}} + Kcal - 碳水化合物 + 碳水化合物(克) {{today_intake.carbohydrate}}/{{suggestion.carbohydrate}} - 蛋白质 + 蛋白质(克) {{today_intake.protein}}/{{suggestion.protein}} - 脂肪 + 脂肪(克) {{today_intake.fat}}/{{suggestion.fat}} @@ -411,6 +413,13 @@ font-size: 22px; font-weight: bold; } + .unit { + position: absolute; + font-size: 22px; + font-weight: bold; + bottom: 20rpx; + text-align: center; + } } } @@ -431,6 +440,14 @@ display: inline-block; margin-top: 5px; } + + .unit { + position: absolute; + font-size: 22px; + font-weight: bold; + bottom: 20rpx; + text-align: center; + } } } diff --git a/pages/index/index.vue b/pages/index/index.vue index a0fd565..3289046 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,276 +1,278 @@ \ No newline at end of file diff --git a/pages/menu/menu.vue b/pages/menu/menu.vue index 84ced2f..add300e 100644 --- a/pages/menu/menu.vue +++ b/pages/menu/menu.vue @@ -1,7 +1,7 @@