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 @@
-
+
-
+
阳光玫瑰种植1号地块
diff --git a/pages/massif/agrSpecs.vue b/pages/massif/agrSpecs.vue
index 2a116b7..7ae0441 100644
--- a/pages/massif/agrSpecs.vue
+++ b/pages/massif/agrSpecs.vue
@@ -104,9 +104,9 @@
-
+
-
+
diff --git a/pages/massif/index.vue b/pages/massif/index.vue
index 13d1175..12f01a7 100644
--- a/pages/massif/index.vue
+++ b/pages/massif/index.vue
@@ -76,9 +76,9 @@
-
+
-
+
diff --git a/pages/massif/info.vue b/pages/massif/info.vue
index 2eeda79..a98e897 100644
--- a/pages/massif/info.vue
+++ b/pages/massif/info.vue
@@ -17,7 +17,7 @@
:value="(/^dateRange$|^select$/.test(v.type)?fields[k].value:formData[k])"
@input="formData[k]=$event"
@selectRDate="selectDate"
- @select="fields[k].value=$event;formData[k]=fields[k].columns[0][$event[0]].value"
+ @select="fields[k].value=$event.indexs;formData[k]=$event.value[0].value"
@imgs="fields[k].value=$event"/>
@@ -82,7 +82,7 @@ import request from '@/common/request'
params:{companyId:this.$store.getters.userInfo.companyId}
})
if(res.statu){
- this.fields.plantBaseName.columns = [res.data.map(v=>({label:v,value:v}))]
+ this.fields.plantBaseName.columns = [res.data.map(v=>({label:v.baseName,value:v.id}))]
}else{
uni.showModal({
title:"提示",
diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 024111e..2b8efeb 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -90,9 +90,16 @@
import request from '@/common/request'
export default {
name:"recovery",
+ props:{
+ plotId:{
+ type:String,
+ defaylt:""
+ }
+ },
data(){
return{
searchVal:{
+ plotId:"",
plantScheduleId:"",// 种植计划id
pageNo:"",
pageSize:"",
diff --git a/pages/massif/plant_info.vue b/pages/massif/plant_info.vue
index 52fec26..82a335e 100644
--- a/pages/massif/plant_info.vue
+++ b/pages/massif/plant_info.vue
@@ -3,26 +3,13 @@
min-height:100%;
background:#f6f6f6;
padding:30rpx 0;
-
- .cu-navbar{
- .action>button{
- background:rgba(255, 255, 255, 0.1);
- width:96rpx;
- height:48rpx;
- line-height: 48rpx;
- text-align: center;
- font-size:32rpx;
- padding:0;
- color:#fff;
- }
- }
}
-
+
-
+
+ :value="/^select$/.test(v.type)?fields[k].value:formData[k]"
+ @select="fields[k].value=$event.indexs;formData[k]=$event.value[0].value"
+ @input="formData[k]=$event"/>
@@ -41,9 +30,9 @@ export default {
data(){
return{
fields:{
- harvestNum:{label:"采收数量",suffix:'kg'},
+ harvestNum:{label:"采收数量",suffix:'kg',type:"digit"},
harvestBatch:{label:"收获批次号",btnText:"生成", btnFun:()=>this.formData.harvestBatch=`CS${new Date().format('yyyyMMdd')}${new Date().getTime()}`},
- principal:{label:"负责人",type:"select"},
+ principal:{label:"负责人",type:"select",columns:[],value:[null]},
harvestTime:{label:"采收时间",type:"calendar"},
status:{label:"采收状态",type:"select",columns:[[{label:"本次采收完后续还会采收",value:"1"},{label:"已全部采收完",value:"2"}]],value:[null]},
},
@@ -69,8 +58,21 @@ export default {
onLoad(options){
this.formData.plantSchedulId=options.plantId
this.formData.plotId=options.plotId
+ this.init()
},
methods:{
+ async init(){
+ var res=await request("/api/plantHarvest/getUser")
+ if(res.statu){
+ this.fields.principal.columns=[res.data.map(v=>({label:v,value:v}))]
+ }else{
+ uni.showModal({
+ title:"提示",
+ content:res.msg||"获取负责人选项失败！",
+ showCancel:false,
+ })
+ }
+ },
submit(){},
},
}
diff --git a/pages/purchase/agrProdList.vue b/pages/purchase/agrProdList.vue
index 77f9be1..6332aae 100644
--- a/pages/purchase/agrProdList.vue
+++ b/pages/purchase/agrProdList.vue
@@ -48,9 +48,9 @@
-
+
-
+
diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index d7b02b3..6d013de 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -100,12 +100,12 @@
-
+
-
+
diff --git a/pages/warehouse/info.vue b/pages/warehouse/info.vue
index 37cc42a..35278ae 100644
--- a/pages/warehouse/info.vue
+++ b/pages/warehouse/info.vue
@@ -13,9 +13,7 @@
\ No newline at end of file
diff --git a/uni_modules/d-navbar/package.json b/uni_modules/d-navbar/package.json
new file mode 100644
index 0000000..9604935
--- /dev/null
+++ b/uni_modules/d-navbar/package.json
@@ -0,0 +1,81 @@
+{
+ "id": "d-navbar",
+ "displayName": "d-navbar",
+ "version": "1.0.0",
+ "description": "d-navbar",
+ "keywords": [
+ "d-navbar"
+],
+ "repository": "",
+ "engines": {
+ "HBuilderX": "^3.1.0"
+ },
+ "dcloudext": {
+ "type": "component-vue",
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "",
+ "data": "",
+ "permissions": ""
+ },
+ "npmurl": ""
+ },
+ "uni_modules": {
+ "dependencies": [],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "u",
+ "aliyun": "u"
+ },
+ "client": {
+ "Vue": {
+ "vue2": "u",
+ "vue3": "u"
+ },
+ "App": {
+ "app-vue": "u",
+ "app-nvue": "u"
+ },
+ "H5-mobile": {
+ "Safari": "u",
+ "Android Browser": "u",
+ "微信浏览器(Android)": "u",
+ "QQ浏览器(Android)": "u"
+ },
+ "H5-pc": {
+ "Chrome": "u",
+ "IE": "u",
+ "Edge": "u",
+ "Firefox": "u",
+ "Safari": "u"
+ },
+ "小程序": {
+ "微信": "u",
+ "阿里": "u",
+ "百度": "u",
+ "字节跳动": "u",
+ "QQ": "u",
+ "钉钉": "u",
+ "快手": "u",
+ "飞书": "u",
+ "京东": "u"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/d-navbar/readme.md b/uni_modules/d-navbar/readme.md
new file mode 100644
index 0000000..76c8662
--- /dev/null
+++ b/uni_modules/d-navbar/readme.md
@@ -0,0 +1 @@
+# d-navbar
\ No newline at end of file