From 276634fe0b966f40d80bec62a5cbb1c04dfd7586 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Mon, 23 Oct 2023 17:57:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 5 + components/InformationAdd/plant.vue | 4 +- components/index/chick.vue | 350 + components/index/cultivation.vue | 32 +- components/index/fishing.vue | 189 +- components/index/planting.vue | 2 +- components/myTable/index.vue | 67 + pages.json | 25 + pages/aquatic/addAquatic.vue | 207 + pages/aquatic/detail.vue | 375 + pages/aquatic/updateGrow.vue | 130 + pages/detail/plant.vue | 153 +- pages/feedIng/addPoultry.vue | 190 +- pages/feedIng/allFeed.vue | 9 +- pages/feedIng/allRecording.vue | 9 +- pages/feedIng/feedDetail.vue | 103 +- pages/feedIng/feedList.vue | 27 +- pages/feedIng/histroyFeed.vue | 49 +- .../feedIng/histroyNote.vue | 2 +- pages/feedIng/vaccineInfo.vue | 70 +- pages/growRecord/index.vue | 29 +- pages/index/index.vue | 42 +- pages/profile/index.vue | 23 +- pages/records/index.vue | 14 +- static/img/CKGD.png | Bin 0 -> 1294 bytes static/img/DJSC.png | Bin 0 -> 1792 bytes static/img/XLJT.png | Bin 0 -> 335 bytes static/img/XLZZ.png | Bin 0 -> 358 bytes unpackage/dist/dev/app-plus/__uniappview.html | 4 +- .../dist/dev/app-plus/app-config-service.js | 4 +- unpackage/dist/dev/app-plus/app-service.js | 9879 +++++++++++++++-- unpackage/dist/dev/app-plus/app.css | 5 + unpackage/dist/dev/app-plus/manifest.json | 1 - .../dist/dev/app-plus/pages/index/index.css | 757 +- 34 files changed, 11914 insertions(+), 842 deletions(-) create mode 100644 components/index/chick.vue create mode 100644 components/myTable/index.vue create mode 100644 pages/aquatic/addAquatic.vue create mode 100644 pages/aquatic/detail.vue create mode 100644 pages/aquatic/updateGrow.vue rename components/biaoge/index.vue => pages/feedIng/histroyNote.vue (82%) create mode 100644 static/img/CKGD.png create mode 100644 static/img/DJSC.png create mode 100644 static/img/XLJT.png create mode 100644 static/img/XLZZ.png diff --git a/App.vue b/App.vue index 94c3e1a..502747f 100644 --- a/App.vue +++ b/App.vue @@ -39,5 +39,10 @@ min-height: 100vh; } + .more-jt { + display: flex; + align-items: center; + } + /*每个页面公共css */ \ No newline at end of file diff --git a/components/InformationAdd/plant.vue b/components/InformationAdd/plant.vue index 8e817c6..aba3434 100644 --- a/components/InformationAdd/plant.vue +++ b/components/InformationAdd/plant.vue @@ -50,9 +50,7 @@ - - 确认 - + diff --git a/components/index/chick.vue b/components/index/chick.vue new file mode 100644 index 0000000..b4fc24f --- /dev/null +++ b/components/index/chick.vue @@ -0,0 +1,350 @@ + + + + + \ No newline at end of file diff --git a/components/index/cultivation.vue b/components/index/cultivation.vue index fe386a1..c3b70ad 100644 --- a/components/index/cultivation.vue +++ b/components/index/cultivation.vue @@ -44,12 +44,11 @@ 养殖情况 - - 更新养殖情况 - + - + 编号: 56565 @@ -73,8 +72,9 @@ - - 查看全部养殖动物> + + 查看全部养殖动物 @@ -82,26 +82,25 @@ 饲养情况 - + 更新饲养情况 - - + + 消毒情况 - + 更新消毒情况 - + - @@ -149,6 +148,7 @@ ref, reactive } from "vue" + import myTable from "@/components/myTable/index.vue" const data = reactive([{ tit: "环境温度", icon: 'TRWD', @@ -226,6 +226,11 @@ const img = (w, h, m) => { return `width:${w}rpx;height:${h};margin:0 ${m}rpx ` } + const navgo = (url) => { + uni.navigateTo({ + url + }) + } \ No newline at end of file diff --git a/components/index/planting.vue b/components/index/planting.vue index ce8d637..d4a1012 100644 --- a/components/index/planting.vue +++ b/components/index/planting.vue @@ -63,7 +63,7 @@ 批量处理 - + 增加种植 diff --git a/components/myTable/index.vue b/components/myTable/index.vue new file mode 100644 index 0000000..936d32e --- /dev/null +++ b/components/myTable/index.vue @@ -0,0 +1,67 @@ + + + + + \ No newline at end of file diff --git a/pages.json b/pages.json index 506b33b..70fdd71 100644 --- a/pages.json +++ b/pages.json @@ -129,8 +129,33 @@ "navigationBarBackgroundColor": "#F4F4F4", "navigationBarTextStyle": "black" } + }, { + "path": "pages/aquatic/addAquatic", + "style": { + "navigationBarTitleText": "添加养殖", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } + }, { + "path": "pages/aquatic/updateGrow", + "style": { + "navigationBarTitleText": "更新生长记录", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } + }, { + "path": "pages/aquatic/detail", + "style": { + "navigationBarTitleText": "详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#F4F4F4", + "navigationBarTextStyle": "black" + } }, + { "path": "pages/test/index", "style": { diff --git a/pages/aquatic/addAquatic.vue b/pages/aquatic/addAquatic.vue new file mode 100644 index 0000000..1037289 --- /dev/null +++ b/pages/aquatic/addAquatic.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/pages/aquatic/detail.vue b/pages/aquatic/detail.vue new file mode 100644 index 0000000..df9873e --- /dev/null +++ b/pages/aquatic/detail.vue @@ -0,0 +1,375 @@ + + + + + \ No newline at end of file diff --git a/pages/aquatic/updateGrow.vue b/pages/aquatic/updateGrow.vue new file mode 100644 index 0000000..d68967f --- /dev/null +++ b/pages/aquatic/updateGrow.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/pages/detail/plant.vue b/pages/detail/plant.vue index ce78fbd..b1ec039 100644 --- a/pages/detail/plant.vue +++ b/pages/detail/plant.vue @@ -1,27 +1,20 @@ \ No newline at end of file diff --git a/pages/feedIng/allFeed.vue b/pages/feedIng/allFeed.vue index 85c258d..f4fab5b 100644 --- a/pages/feedIng/allFeed.vue +++ b/pages/feedIng/allFeed.vue @@ -40,15 +40,16 @@ - 历史养殖状态 - - + + 饲养记录 + - \ No newline at end of file diff --git a/pages/feedIng/feedList.vue b/pages/feedIng/feedList.vue index 4b1580a..9a7ddf0 100644 --- a/pages/feedIng/feedList.vue +++ b/pages/feedIng/feedList.vue @@ -47,7 +47,7 @@ 搜索 - + 编号: 12378 @@ -79,16 +79,24 @@ - - 展开更多> - - + + 添加新动物 - \ No newline at end of file diff --git a/pages/feedIng/histroyFeed.vue b/pages/feedIng/histroyFeed.vue index 85a8629..280083f 100644 --- a/pages/feedIng/histroyFeed.vue +++ b/pages/feedIng/histroyFeed.vue @@ -52,7 +52,7 @@ - + 上传新的种植情况 @@ -62,6 +62,53 @@