diff --git a/pages/massif/add_transaction.vue b/pages/massif/add_transaction.vue
new file mode 100644
index 0000000..ee2eeb1
--- /dev/null
+++ b/pages/massif/add_transaction.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+ 蔬菜 精品小黄瓜
+
+
+ 提示:当前可交易数量150kg 采收日期:2022-12-26
+
+
+
+
+
+
+
+
+ /
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/massif/mana/index.vue b/pages/massif/mana/index.vue
index 82f1f62..e3ca4a3 100644
--- a/pages/massif/mana/index.vue
+++ b/pages/massif/mana/index.vue
@@ -35,6 +35,9 @@
+
+
+
@@ -42,17 +45,20 @@
import plantPlan from './plantPlan.vue'
import farmRecord from './farmRecord.vue'
import recovery from './recovery.vue'
+import transactions from './transactions.vue'
+
import request from '@/common/request.js'
import {computeArea} from '@/common/utils'
export default {
- components:{plantPlan,farmRecord,recovery},
+ components:{plantPlan,farmRecord,recovery,transactions},
data(){
return{
tabIndex:0,
tabs:[
- {name:"种植计划",},
- {name:"农事记录",},
- {name:"采收记录",},
+ {name:"种植计划"},
+ {name:"农事操作"},
+ {name:"采收记录"},
+ {name:"交易记录"},
],
plotId:"",
diff --git a/pages/massif/mana/plantPlan.vue b/pages/massif/mana/plantPlan.vue
index b18703c..177bb63 100644
--- a/pages/massif/mana/plantPlan.vue
+++ b/pages/massif/mana/plantPlan.vue
@@ -61,8 +61,7 @@
.mu{
display:flex;
align-items: center;
- justify-content: space-between;
- &>text{
+ &>text.area{
color:#10C176;
font-size:32rpx;
font-weight: bold;
@@ -70,8 +69,17 @@
content:"亩";
}
}
+ &>.farm{
+ font-size:22rpx;
+ color:#10C176;
+ height:40rpx;
+ line-height: 40rpx;
+ margin-left:18rpx;
+ background: rgba(16, 193, 119, 0.1);
+ padding:0 6rpx;
+ }
button{
- margin:-20rpx 0!important;
+ margin:-20rpx 0 -20rpx auto!important;
padding:20rpx;
height: auto;
background: transparent;
@@ -123,16 +131,17 @@
- 加载失败
+
{{v.plantStandard}} {{v.varietyName}}
- 种植批次号:{{v.plantBatch}}
+ 种植批次号:{{v.plantBatch}}
已采收:{{v.harvested}}kg
- {{v.plantArea}}
+ {{v.plantArea}}
+ 农事操作{{v.farmNum||0}}次
diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 9cea496..dbb749d 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -117,7 +117,9 @@
closeOnClickOverlay
@close="show=false"
@cancel="show=false"
- :value="date"
+ :minDate="dateType=='endTime'&&searchVal.startTime?new Date(searchVal.startTime).getTime():new Date().set('y',-15).getTime()"
+ :maxDate="dateType=='startTime'&&searchVal.endTime?new Date(searchVal.endTime).getTime():new Date().set('y',15).getTime()"
+ :value="searchVal[dateType] || new Date().format('yyyy-MM-dd')"
@confirm="searchVal[dateType]=new Date($event.value).format('yyyy-MM-dd');clean();search();show=false"/>
@@ -146,11 +148,6 @@ export default {
total:0,
}
},
- computed:{
- date(){
- return this.searchVal[this.dateType] || new Date().format('yyyy-MM-dd')
- }
- },
created(){
this.search()
},
diff --git a/pages/massif/mana/transactions.vue b/pages/massif/mana/transactions.vue
new file mode 100644
index 0000000..b3329ab
--- /dev/null
+++ b/pages/massif/mana/transactions.vue
@@ -0,0 +1,144 @@
+
+
+
+
+ {{searchVal.startTime||"请选择开始日期"}}
+ ~
+ {{searchVal.endTime||"请选择结束日期"}}
+
+
+
+
+
+
+
+
+ 精品小黄瓜
+
+ 规格:20kg/箱
+ 云南云天化股份有限公司
+
+
+ 20箱
+ 交易日期:2022-12-12
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/router/massif.js b/router/massif.js
index 2649d1f..7598ed8 100644
--- a/router/massif.js
+++ b/router/massif.js
@@ -101,4 +101,15 @@ module.exports=[
}
}
},
+ {
+ path:"pages/massif/add_transaction",
+ style:{
+ navigationBarTitleText:"交易信息",
+ navigationBarBackgroundColor:"#10C176",
+ navigationBarTextStyle:"white",
+ "app-plus":{
+ titleNView:true,
+ }
+ }
+ },
]
\ No newline at end of file
diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue
index 18373a2..063dd44 100644
--- a/uni_modules/d-form/components/d-form/d-form.vue
+++ b/uni_modules/d-form/components/d-form/d-form.vue
@@ -212,7 +212,7 @@
- {{suffix}}
+ {{suffix}}
@@ -240,7 +240,7 @@
{{value||placeholder||`请选择${label}`}}
-
+
{{tip}}