From b1ae0824806b364c3f0d36e6fd317ecf8c3ceb2a Mon Sep 17 00:00:00 2001 From: dingtalk_umvbsp Date: Tue, 17 Jan 2023 11:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/request.js | 2 +- main.js | 6 +- pages/home/index.vue | 4 +- pages/home/login.vue | 3 +- pages/massif/add_farming.vue | 4 +- pages/massif/agrSpecs.vue | 4 +- pages/massif/index.vue | 4 +- pages/massif/info.vue | 4 +- pages/massif/mana/recovery.vue | 7 ++ pages/massif/plant_info.vue | 38 ++++----- pages/purchase/agrProdList.vue | 4 +- pages/stock/mana.vue | 4 +- pages/warehouse/info.vue | 2 - pages/warehouse/mana.vue | 4 +- uni_modules/d-form/changelog.md | 0 .../d-form/components/d-form/d-form.vue | 11 ++- uni_modules/d-form/package.json | 81 +++++++++++++++++++ uni_modules/d-form/readme.md | 1 + uni_modules/d-navbar/changelog.md | 0 .../d-navbar/components/d-navbar/d-navbar.vue | 72 +++++++++++++++++ uni_modules/d-navbar/package.json | 81 +++++++++++++++++++ uni_modules/d-navbar/readme.md | 1 + 22 files changed, 292 insertions(+), 45 deletions(-) create mode 100644 uni_modules/d-form/changelog.md rename components/form.vue => uni_modules/d-form/components/d-form/d-form.vue (97%) create mode 100644 uni_modules/d-form/package.json create mode 100644 uni_modules/d-form/readme.md create mode 100644 uni_modules/d-navbar/changelog.md create mode 100644 uni_modules/d-navbar/components/d-navbar/d-navbar.vue create mode 100644 uni_modules/d-navbar/package.json create mode 100644 uni_modules/d-navbar/readme.md diff --git a/common/request.js b/common/request.js index c3e7e5b..42aafc8 100644 --- a/common/request.js +++ b/common/request.js @@ -4,7 +4,7 @@ export function host(host='default',suffix='/plant_manage'){ return( process.env.NODE_ENV === 'development'?{ // default:`http://10.0.0.217${suffix}` //陈 - default:`http://nrmmg7.natappfree.cc${suffix}` //马 + default:`http://mq3s8b.natappfree.cc${suffix}` //马 }:{ default:`http://qv6mj8.natappfree.cc${suffix}` } diff --git a/main.js b/main.js index 5d5ab87..34c3620 100644 --- a/main.js +++ b/main.js @@ -2,13 +2,11 @@ import Vue from 'vue' import App from './App' import store from './store' import uView from 'uview-ui'; -import cuNavbar from './components/cu-navbar.vue' -import dForm from './components/form.vue' +// import cuNavbar from './components/cu-navbar.vue' import {defineObj} from 'black-knight/lib/config/custom' Vue.use(uView) -Vue.component("cuNavbar", cuNavbar) -Vue.component("dForm", dForm) +// Vue.component("cuNavbar", cuNavbar) Vue.prototype.$store=store Vue.config.productionTip = false diff --git a/pages/home/index.vue b/pages/home/index.vue index 776178a..9dbf84a 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -249,13 +249,13 @@ - 422.25 + {{massif.plantArea}} - 12 + {{massif.productCount}} diff --git a/pages/home/login.vue b/pages/home/login.vue index af6d11f..10a0857 100644 --- a/pages/home/login.vue +++ b/pages/home/login.vue @@ -54,7 +54,7 @@ - + 还没有账号?立即注册 @@ -64,6 +64,7 @@ export default { data(){ return{ demo:[], + formData:{ password:"", username:"", diff --git a/pages/massif/add_farming.vue b/pages/massif/add_farming.vue index 3eda4b6..182383f 100644 --- a/pages/massif/add_farming.vue +++ b/pages/massif/add_farming.vue @@ -88,9 +88,9 @@