Skip to content

S
smart-agriculture
Commit 978fa9b1 authored by zhangzedan's avatar zhangzedan
Browse files
Options

pages:add farm

parent e7b0e287
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 187 deletions
app.json
View file @ 978fa9b1
......@@ -34,7 +34,7 @@
"text": "信息台"
},
{
"pagePath": "pages/report/baseinfo",
"pagePath": "pages/report/examine/examine",
"iconPath": "pages/public/image/tab_2.png",
"selectedIconPath": "pages/public/image/tab_2_2.png",
"text": "农场体检"
......
pages/component/datashow/datashow.js
View file @ 978fa9b1
......@@ -25,7 +25,11 @@ Component({
* 组件的属性列表
*/
properties: {
items: Array
items: Array,
registe:{
type:"Boolean",
value:false
}
},
/**
......@@ -111,6 +115,7 @@ Component({
return item
}
})
console.log(value);
// 获取多选框的值
res[field] = value
this.setData({
......
pages/component/datashow/datashow.json
View file @ 978fa9b1
{
"component": true,
"usingComponents": {}
"usingComponents": {
"sub-data":"../subdata/subdata"
}
}
\ No newline at end of file
pages/component/datashow/datashow.wxml
View file @ 978fa9b1
<!--pages/component/datashow/datashow.wxml-->
<view wx:for-items="{{items}}" wx:for-item="item" wx:key="{{idx}}" class="page-section">
<view class="{{'title_'+item.level}}">{{item.title}}</view>
<view wx:for-items="{{item.info}}" wx:for-item="info" wx:key="{{idx}}" class="page-section">
<view class="weui-cells weui-cells_after-title info">
<view class="weui-cell weui-cell_input" wx:if="{{info.show==='input'}}">
<view class="weui-cell__hd">
<view class="weui-label field">{{info.label}}</view>
</view>
<view class="weui-cell__bd">
<input class="weui-input value" data-field="{{info.field}}" bindinput="inputChange" placeholder="请输入" />
</view>
</view>
<view class="weui-cell weui-cell_select" wx:if="{{info.show==='picker'}}">
<view class="weui-cell__hd weui-cell__hd_in-select-after">
<view class="weui-label field">{{info.label}}</view>
</view>
<view class="weui-cell__bd">
<picker bindchange="bindCountryChange" value="{{}}" range="{{info.selects}}" range-key="value">
<view class="weui-select weui-select_in-select-after value">{{info.selects[0].value}}</view>
</picker>
</view>
</view>
</view>
<view class="page__bd">
<view class="section section_gap">
<!-- 单选样式 -->
<radio-group class="radio-group" wx:if="{{item.show==='radio'}}" bindchange="radioChange" data-field="{{item.field}}" data-value="{{checkmul[item.field]}}">
<radio class="radio" wx:for-items="{{item.selects}}" wx:for-item="select" wx:key="{{select.id}}" value="{{select.id}}">
<text wx:if="{{select.id>-1}}">{{select.value}}</text>
<!-- "其他请注明"的输入框 -->
<wxs src="../../public/tools.wxs" module="tools"></wxs>
<view wx:for-items="{{items}}" wx:for-item="item" wx:key="{{idx}}">
<view wx:if="{{item.level>=0}}">
<view class="{{registe?'':'title_'+item.level}}">{{item.title}}</view>
<view class="{{registe?'':'report-section'}}">
<view wx:for-items="{{item.info}}" wx:for-item="info" wx:key="{{idx}}" class="weui-cells weui-cells_after-title {{registe?'page-section':'page-section_data'}}">
<!-- input样式 -->
<view class="weui-cell weui-cell_input" wx:if="{{info.show=='input'}}">
<view class="weui-cell__hd">
<view class="weui-label {{registe?'field':''}}">{{info.label}}</view>
</view>
<view class="weui-cell__bd">
<input class="weui-input {{registe?'value':''}}" data-field="{{info.field}}" bindinput="inputChange" type="{{tools.formType(info.field)}}" password="{{info.field=='password'}}" placeholder="请输入" />
</view>
</view>
<!-- picker样式 -->
<view class="weui-cell weui-cell_select" wx:if="{{info.show==='picker'||(info.show==='radio'&&info.selects.length>2)}}">
<view class="weui-cell__hd weui-cell__hd_in-select-after">
<view class="weui-label {{registe?'field':''}}">{{info.label}}</view>
</view>
<view class="weui-cell__bd">
<block wx:if="{{tools.formType(info.field)=='date'}}">
<picker mode="date" bindchange="bindCountryChange" value="0" start="1800-01-01" end="2200-01-01">
<view class="weui-select weui-select_in-select-after {{registe?'value':''}}">{{info.selects[0].value}}</view>
</picker>
</block>
<block wx:else="{{tools.formType(info.field)!='date'}}}}">
<picker bindchange="bindCountryChange" range="{{info.selects}}" range-key="value">
<view class="weui-select weui-select_in-select-after {{registe?'value':''}}">{{info.selects[0].value}}</view>
</picker>
</block>
</view>
</view>
<view class="form_item">
<view class="form_item_bd" wx:if="{{info.show==='radio'&&info.selects.length==2}}">
<view class="radio_text {{registe?'field':''}}">
{{info.label}}
</view>
<radio-group wx:if="{{info.selects.length==2}}" bindchange="radioChange" data-field="{{info.field}}" data-value="{{checkmul[info.field]}}">
<radio wx:for-items="{{info.selects}}" wx:for-item="select" wx:key="{{select.id}}" value="{{select.id}}">
<text wx:if="{{select.id>-1}}">{{select.value}}</text>
<!-- "其他请注明"的输入框 -->
<view class="weui-cells weui-cells_after-title" wx:if="{{select.id===-1}}">
<view class="weui-cell weui-cell_input">
<input class="weui-input" placeholder="{{select.value}}" bindinput="radioOther" data-field="{{item.field}}"/>
<input class="weui-input" placeholder="{{select.value}}" bindinput="radioOther" data-field="{{info.field}}"/>
</view>
</view>
</radio>
</radio-group>
<!-- 多选样式 -->
<checkbox-group class="checkbox-group" wx:if="{{item.show==='checkbox'}}" bindchange="checkboxChange" data-field="{{item.field}}" data-value="{{checkmul[item.field]}}" >
<view wx:for-items="{{item.selects}}" wx:for-item="select" wx:key="{{select.id}}">
<label class="checkbox">
<checkbox value="{{select.id}}" />
<text wx:if="{{select.id>-1}}">{{select.value}}</text>
<!-- "其他请注明"的输入框 -->
<view class="weui-cells weui-cells_after-title weui-checkbox-input" wx:if="{{select.id===-1}}">
<view class="weui-cell weui-cell_input">
<input id="{{item.field}}" class="weui-input" placeholder="{{select.value}}" bindinput="checkOther" data-field="{{item.field}}"/>
</view>
</view>
</label>
</view>
</checkbox-group>
</radio>
</radio-group>
</view>
<!-- 多选样式 -->
<view class="form_item_bd" wx:if="{{info.show==='checkbox'}}">
<view class="radio_text {{registe?'field':''}}">
{{info.label}}
</view>
<checkbox-group bindchange="checkboxChange" data-field="{{info.field}}" data-value="{{checkmul[info.field]}}" >
<view wx:for-items="{{info.selects}}" wx:for-item="select" wx:key="{{select.id}}">
<label class="checkbox">
<checkbox value="{{select.id}}" />
<text wx:if="{{select.id>-1}}">{{select.value}}</text>
<!-- "其他请注明"的输入框 -->
<view class="weui-cells weui-cells_after-title weui-checkbox-input" wx:if="{{select.id===-1}}">
<view class="weui-cell weui-cell_input">
<input class="weui-input" placeholder="{{select.value}}" bindinput="checkOther" data-field="{{info.field}}"/>
</view>
</view>
</label>
</view>
</checkbox-group>
</view>
<!-- 定位地址 -->
<view wx:if="{{item.show==='location'}}" >
<button type="default" data-field="{{item.field}}" bindtap="getLoc">设置地理位置</button>
<text wx:if="{{fieldData.location}}">您的位置是 {{fieldData.location.address}}</text>
<view wx:if="{{info.show==='position'}}">
<view class="weui-cell">
<view class="weui-cell__bd {{registe?'field':''}}">{{info.label}}</view>
<view style="width: 70%">
<view class="weui-cell__ft weui-cell__ft_in-access {{registe?'value':''}}" data-field="{{info.field}}" bindtap="getLoc">{{fieldData.location.address||"设置地理位置"}}</view>
</view>
</view>
<!-- <button class="weui-btn" type="primary" plain="true">设置地理位置</button>
<text wx:if="{{fieldData.location}}">您的位置是 {{fieldData.location.address}}</text> -->
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/component/datashow/datashow.wxss
View file @ 978fa9b1
......@@ -7,7 +7,39 @@
.field{
font-size:30rpx;
}
.info{
margin-bottom: 15rpx;
border: 1px solid #3cc51f;
radio-group,
check-group{
position: flex;
align-items:center;
}
radio{
width: 50%;
text-align: center;
}
.form_item{
display: flex;
flex-direction: column;
}
.form_item_bd{
padding:10px 15px;
position: relative;
}
.form_item_bd .field{
padding: 5rpx;
}
.radio_text{
/* margin-left: 10px; */
margin-bottom: 8px;
}
.report-section{
box-shadow: 0 0 10px rgb(200,255,180);
margin: 5px 10px;
}
.page-section_data{
padding-top: 3px;
padding-bottom: 3px;
line-height: none;
position: static;
border-bottom: 1px solid rgb(240,240,230);
}
\ No newline at end of file
pages/data/dataFields.js
View file @ 978fa9b1
This diff is collapsed.
pages/farm/farm_list.js
View file @ 978fa9b1
......@@ -22,7 +22,11 @@ Page({
},
]
},
addFarm:function(){
wx.navigateTo({
url:"../report/baseinfo"
})
},
/**
* 生命周期函数--监听页面加载
*/
......
pages/farm/farm_list.wxml
View file @ 978fa9b1
......@@ -5,7 +5,7 @@
<view class="kind-list__item">
</view>
<view class="kind-list__item">
<button class="weui-btn btn_img" type="primary" plain="true" >
<button class="weui-btn btn_img" type="primary" plain="true" bindtap="addFarm">
<image class="kind-list__img img_btn" src="../public/image/add.png"/>
<text>添加新农场</text>
</button>
......
pages/index/index.wxml
View file @ 978fa9b1
......@@ -5,7 +5,7 @@
<text>注册个人信息</text>
</view>
<view class="show">
<data-show id="baseinfo" items="{{reportinfo.baseinfo}}"></data-show>
<data-show id="baseinfo" registe="true" items="{{reportinfo.baseinfo}}"></data-show>
</view>
<button class="weui-btn btn" type="primary" plain="true" bindtap="commitUserinfo">提交</button>
</view>
......
pages/public/public.wxss
View file @ 978fa9b1
......@@ -13,16 +13,20 @@
display:block;
position:relative;
}
/* .page-section{
border-left: 1px solid lightgrey;
} */
.page-section{
border: 1px solid #3cc51f;
margin-bottom: 15rpx;
}
.weui-input{
width: 100%;
}
.title_0,
.title_1{
margin-top: 5rpx;
/* margin-top: 5rpx; */
text-align: center;
color: #3cc51f;
height: 35px;
line-height: 33px;
}
.title_0{
font-weight: bold;
......@@ -34,7 +38,7 @@
content: "---";
}
.title_1{
font-size: 30rpx;
font-size: 33rpx;
}
.title_1::before{
content: "---";
......
pages/public/tools.wxs
View file @ 978fa9b1
var licence = function (subdata,field) {
return subdata.showField.indexOf(field)>-1;
}
var getArray=function (dict){
var arr=[];
for(var i=0;i<dict.length;i++){
......@@ -8,12 +9,28 @@ var getArray=function (dict){
}
return arr;
}
// 根据日期格式获取日期显示
var showDate=function(ds){
var dsArr=ds.split("-")
return dsArr[0]+"年"+dsArr[1]+"月"+dsArr[2]+"日"
}
// 根据字段判断输入框格式
var formType=function(field){
if(field=="age"||field.indexOf("Worker")>-1||field=="phone"){
return "number"
}
if(field.indexOf("Area")>-1||field.indexOf("Money")>-1
||field.indexOf("distance")>-1||field.indexOf("Ratio")>-1
||field.indexOf("Asset")>-1||field.indexOf("Invest")>-1){
return "digit"
}
if(field.indexOf("Time")>-1){
return "date"
}
}
module.exports = {
licence: licence,
getArray:getArray,
showDate:showDate
showDate:showDate,
formType:formType
};
\ No newline at end of file
pages/report/baseinfo.js
View file @ 978fa9b1
......@@ -22,6 +22,7 @@ Page({
this.setData({
reportinfo:datafileds.plantFarm.model1
})
console.log(this.data.reportinfo)
},
commitInfo: function() {
......
pages/report/baseinfo.json
View file @ 978fa9b1
{
"navigationBarTitleText": "农场体检",
"navigationBarTitleText": "新增农场",
"usingComponents": {
"data-show": "../component/datashow/datashow"
}
......
pages/report/baseinfo.wxml
View file @ 978fa9b1
<!--pages/report/baseinfo.wxml-->
<button type="primary" bindtap="commitInfo">开启智慧农场!</button>
<data-show id="user" items="{{reportinfo.user}}"></data-show>
<data-show id="farmbase" items="{{reportinfo.farmbase}}"></data-show>
<data-show id="farmmanager" items="{{reportinfo.farmmanager}}"></data-show>
<data-show id="farmcredent" items="{{reportinfo.farmcredent}}"></data-show>
<view class="page">
<view class="page__bd page__bd_spacing" style="padding-bottom: 5px;">
<data-show id="farmbase" items="{{reportinfo.farmbase}}"></data-show>
<data-show id="farmmanager" items="{{reportinfo.farmmanager}}"></data-show>
<data-show id="farmcredent" items="{{reportinfo.farmcredent}}"></data-show>
<button type="primary" bindtap="commitInfo">新增农场信息</button>
</view>
</view>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment