first commit

app.js

@@ -0,0 +1,39 @@
+//app.js
+App({
+  onLaunch: function () {
+    // 展示本地存储能力
+    var logs = wx.getStorageSync('logs') || []
+    logs.unshift(Date.now())
+    wx.setStorageSync('logs', logs)
+
+    // 登录
+    wx.login({
+      success: res => {
+        // 发送 res.code 到后台换取 openId, sessionKey, unionId
+      }
+    })
+    // 获取用户信息
+    wx.getSetting({
+      success: res => {
+        if (res.authSetting['scope.userInfo']) {
+          // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+          wx.getUserInfo({
+            success: res => {
+              // 可以将 res 发送给后台解码出 unionId
+              this.globalData.userInfo = res.userInfo
+
+              // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+              // 所以此处加入 callback 以防止这种情况
+              if (this.userInfoReadyCallback) {
+                this.userInfoReadyCallback(res)
+              }
+            }
+          })
+        }
+      }
+    })
+  },
+  globalData: {
+    userInfo: null
+  }
+})

app.json

@@ -0,0 +1,19 @@
+{
+  "pages": [
+    "pages/home/index",
+    "pages/login/login",
+    "pages/index/index",
+    "pages/logs/logs"
+  ],
+  "window": {
+    "backgroundTextStyle": "light",
+    "navigationBarBackgroundColor": "#ffffff",
+    "navigationBarTitleText": "数据采集",
+    "navigationBarTextStyle": "black"
+  },
+  "style": "v2",
+  "sitemapLocation": "sitemap.json",
+  "useExtendedLib": {
+    "weui": true
+  }
+}

app.wxss

@@ -0,0 +1,10 @@
+/**app.wxss**/
+.container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  padding: 200rpx 0;
+  box-sizing: border-box;
+} 

pages/common/common.js

@@ -0,0 +1,2 @@
+module.exports.base_host = "https://www.meitan.hongweisoft.com"
+// module.exports.base_host = "http://172.16.90.28:8310"

pages/home/index.js

@@ -0,0 +1,260 @@
+//index.js
+var common = require('../common/common.js')
+//获取应用实例
+const app = getApp()
+// const host_url = "https://www.meitan.hongweisoft.com"
+const host_url = common.base_host
+
+Page({
+  data: {
+    farming:[],
+    farming_index:0,
+    date:'2020-05-12',
+    base:[],
+    base_index:0,
+    executor:'',
+    note:'',
+    files: [],
+    loading:false,
+    showTopTips: false,
+    phone_number:'',
+    image_url:''
+  },
+  onLoad: function () {
+    const that = this
+    const eventChanner = this.getOpenerEventChannel()
+    this.setData({
+        selectFile: this.selectFile.bind(this),
+        uplaodFile: this.uplaodFile.bind(this)
+    })
+    //请求农事活动列表
+    this.request_farming()
+    wx.getStorage({
+      key: 'phone_number',
+      success(res){
+        console.log(res.data)
+        that.setData({
+          phone_number:res.data
+          },function(){
+            //请求基地数据
+            that.request_base();
+          })
+      },
+      fail(e){
+        wx.navigateTo({
+          url: '../login/login',
+        });
+      }
+    })
+  },
+  onShow: function (){
+    if(this.data.phone_number == ""){
+      const that = this
+      wx.getStorage({
+        key: 'phone_number',
+        success(res){
+          that.setData({
+            phone_number:res.data
+          },function(){
+            //请求基地数据
+            that.request_base();
+          })
+        }
+      })
+    }
+  },
+  request_base: function(){
+    if(this.data.phone_number == ""){
+      return
+    }
+    const that = this
+    wx.request({
+      url: host_url + '/orchardacqui/orderselect',
+      data:{phone:that.data.phone_number},
+      success(res){
+        let data = res.data
+        if(data.retHead.errCode == 0){
+          that.setData({
+            base:data.retBody,
+            base_index:0,
+            executor:(data.retBody)[0].leaderName
+          })
+        }else{
+          that.setData({
+            error:"基地获取出错：" + data.retHead.errMsg
+          })
+        }
+      }
+    })
+  },
+  request_farming: function(){
+    const that = this
+    wx.request({
+      url: host_url + '/orchardactivity/select',
+      success(res){
+        let data = res.data
+        if(data.retHead.errCode == 0){
+          that.setData({
+            farming:data.retBody,
+            farming_index:0
+          })
+        }else{
+          that.setData({
+            error:"农事活动列表获取出错：" + data.retHead.errMsg
+          })
+        }
+      }
+    })
+  },
+  bindChangePhone:function(e){
+    wx.navigateTo({
+      url: '../login/login',
+    })
+  },
+  bindPickerChange: function(e) {
+    console.log('farming picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+        farming_index: e.detail.value
+    })
+  },
+  bindDateChange: function(e) {
+    console.log('date picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+      date: e.detail.value
+    })
+  },
+  bindBaseChange: function(e) {
+    console.log('base picker发送选择改变，携带值为', e.detail.value)
+    this.setData({
+        base_index: e.detail.value,
+        executor:this.data.base[e.detail.value].leaderName
+    })
+  },
+  bindExecutor:function(e){
+    console.log('执行人' , e.detail.value)
+    this.data.executor = e.detail.value
+  },
+  bindNote: function(e){
+    console.log('备注说明' , e.detail.value)
+    this.data.note = e.detail.value
+  },
+  chooseImage: function (e) {
+    var that = this;
+    wx.chooseImage({
+        sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+        sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+        success: function (res) {
+            // 返回选定照片的本地文件路径列表，tempFilePath可以作为img标签的src属性显示图片
+            that.setData({
+                files: that.data.files.concat(res.tempFilePaths)
+            });
+        }
+    })
+  },
+  previewImage: function(e){
+      wx.previewImage({
+          current: e.currentTarget.id, // 当前显示图片的http链接
+          urls: this.data.files // 需要预览的图片http链接列表
+      })
+  },
+  selectFile(files) {
+      console.log('files', files)
+      // 返回false可以阻止某次文件上传
+  },
+  uplaodFile(files) {
+      console.log('upload files', files)
+      // 文件上传的函数，返回一个promise
+      return new Promise((resolve, reject) => {
+        wx.uploadFile({
+          filePath: files.tempFilePaths[0],
+          name: 'file',
+          url: host_url + '/file/uploadDocument',
+          success(res){
+            const data = res.data
+            let dataJ = JSON.parse(data)
+            console.log('body' , dataJ.retBody)
+            resolve({urls:[host_url + '/' + dataJ.retBody.fileUrl]})
+          },
+          fail(err){
+              reject(err)
+          }
+        })
+        //   setTimeout(() => {
+        //       //reject('some error')
+        //       resolve({urls:['http://mmbiz.qpic.cn/mmbiz_png/VUIF3v9blLsicfV8ysC76e9fZzWgy8YJ2bQO58p43Lib8ncGXmuyibLY7O3hia8sWv25KCibQb7MbJW3Q7xibNzfRN7A/0']})
+        //   }, 1000)
+      })
+  },
+  uploadError(e) {
+      console.log('upload error', e.detail)
+  },
+  uploadSuccess(e) {
+      console.log('upload success', e.detail)
+      let pic_url = e.detail.urls[0]
+      pic_url = pic_url.replace(host_url , "")
+      this.setData({
+        image_url:pic_url
+      })
+  },
+  submitForm(e){
+      console.log("上传数据" , "farming:" + this.data.farming[this.data.farming_index] + " date:" + this.data.date )
+      const that = this
+      //验证数据
+      let error_msg = ""
+      if(this.data.executor == null || this.data.executor.trim() == ""){
+        error_msg = "执行人不能为空"
+      }else if(this.data.phone_number == null || this.data.phone_number == ""){
+        error_msg = "手机号不能为空"
+      }
+      if( error_msg != ""){
+        this.setData({
+          error:error_msg
+        })
+        return
+      }
+      //显示加载框
+      this.setData({
+          loading:true
+      })
+      wx.request({
+        url: host_url  + '/orchardacqui',
+        method:"POST",
+        header:{
+          'content-type': 'application/json',
+        },
+        data:{
+          activityId:this.data.farming[this.data.farming_index].id,
+          executionTime:this.data.date + " 00:00:00",
+          tOrchardId:this.data.base[this.data.base_index].id,
+          executionUser:this.data.executor,
+          remarks:this.data.note,
+          imgUrl:this.data.image_url,
+          phone:this.data.phone_number
+        },
+        success(res){
+          that.setData({
+              loading:false
+          })
+          let data = res.data
+          if(data.retHead.errCode == 0){
+            wx.showToast({
+              title: '提交成功',
+              icon: 'success',
+              duration: 2000
+            })
+          }else{
+            that.setData({
+                error:data.retHead.errMsg,
+            })
+          }
+        },
+        fail(error){
+          that.setData({
+              error:error.errMsg,
+              loading:false
+          })
+        }
+      })
+      //提示
+  }
+})

pages/home/index.json

@@ -0,0 +1,10 @@
+{
+  "usingComponents": {
+    "mp-dialog": "/miniprogram_npm/weui-miniprogram/dialog/dialog",
+    "mp-icon": "/miniprogram_npm/weui-miniprogram/icon/icon",
+    "mp-uploader": "/miniprogram_npm/weui-miniprogram/uploader/uploader",
+    "mp-cells": "/miniprogram_npm/weui-miniprogram/cells/cells",
+    "mp-cell": "/miniprogram_npm/weui-miniprogram/cell/cell",
+    "mp-toptips": "/miniprogram_npm/weui-miniprogram/toptips/toptips"
+  }
+}

pages/home/index.wxml

@@ -0,0 +1,65 @@
+<!--index.wxml-->
+<import src="item.wxml"/>
+
+<template name="line">
+  <view style="width:95%;height:1px;margin:0 10px;background-color:#e5e5e5;box-sizing: border-box;"/>
+</template>
+<mp-toptips msg="{{error}}" type="error" show="{{error}}"></mp-toptips>
+<view class="main_container">
+  <text style="margin:15px;font-size:9pt;color:#AAAAAA;">您可以通过填写信息并点击提交，采集数据</text>
+  <view class="menu">
+    <view style="display:flex;justify-content:space-between;align-items:center;width:98%;background-color:#FFFFFF;height:50px;" bindtap="bindChangePhone">
+      <text style="width:85px;margin-left:10px;font-size:10pt;">手机号</text>
+      <view style="display:flex;justify-content:flex-start;align-items:center;width:100%;margin-left:5px;">
+        <text style="font-size:10pt;color:grey;">{{phone_number}}</text>
+      </view>
+      <mp-icon icon="arrow" color="#a1a1a1" size="{{8}}" mar></mp-icon>
+    </view>
+    <template is="line"></template>
+    <picker bindchange="bindPickerChange" value="{{farming_index}}" range="{{farming}}" range-key="name" style="width:100%">
+      <template is="main_item" data="{{title:'农事活动' , content:farming[farming_index].name}}"/>
+    </picker>
+    <template is="line"></template>
+    <picker mode="date" value="{{date}}" bindchange="bindDateChange" style="width:100%">
+      <template is="main_item" data="{{title:'执行时间' , content:date}}"/>
+    </picker>
+    <template is="line"></template>
+    <picker bindchange="bindBaseChange" value="{{base_index}}" range="{{base}}" range-key="name" style="width:100%">
+      <template is="main_item" data="{{title:'采集基地' , content:base[base_index].name}}"/>
+    </picker>
+    <template is="line"></template>
+    <view style="display:flex;justify-content:space-between;align-items:center;width:98%;background-color:#FFFFFF;height:50px;">
+      <text style="width:85px;margin-left:10px;font-size:10pt;">执行人</text>
+      <view style="display:flex;justify-content:flex-start;align-items:center;width:100%;margin-left:5px;">
+        <view  style="width:100%;">
+          <input  bindinput="bindExecutor" maxlength="10" placeholder="执行人名" style="width:100%;font-size:10pt;height:30pt" value="{{executor}}"/>
+        </view>
+      </view>
+      <mp-icon icon="arrow" color="#a1a1a1" size="{{8}}" mar></mp-icon>
+    </view>
+    <template is="line"></template>
+    <view style="display:flex;justify-content:space-between;align-items:center;width:98%;background-color:#FFFFFF;height:50px;">
+      <text style="width:85px;margin-left:10px;font-size:10pt;">备注说明</text>
+      <view style="display:flex;justify-content:flex-start;align-items:center;width:100%;margin-left:5px;">
+        <view  style="width:100%;">
+          <input class="weui-input" bindinput="bindNote"  maxlength="200" placeholder="备注" style="width:100%;font-size:10pt;height:30pt;border: none;"/>
+        </view>
+      </view>
+      <mp-icon icon="arrow" color="#a1a1a1" size="{{8}}" mar></mp-icon>
+    </view>
+  </view>
+  <view class="page__bd">
+    <mp-cells>
+        <mp-cell>
+            <mp-uploader ext-class="my-uploader" bindfail="uploadError" bindsuccess="uploadSuccess" select="{{selectFile}}" upload="{{uplaodFile}}" files="{{files}}" max-count="1" ></mp-uploader>
+        </mp-cell>
+    </mp-cells>
+  </view>
+  <view class="v-commit">
+    <button style="width:92%;height:40pt;text-align:center;line-height:30pt" class="commit-btn" loading="{{loading}}" bindtap="submitForm">确认并提交</button>
+  </view>
+  
+</view>
+
+
+

pages/home/index.wxss

@@ -0,0 +1,36 @@
+page{
+  height:100%;
+}
+
+.main_container {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  background-color: #e5e5e5;
+}
+.menu {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  background-color: white;
+}
+.my-uploader{
+  font-size: 10pt;
+}
+
+.page__bd {
+  width: 100%;
+}
+
+.v-commit{
+  width: 100%;
+  height: 100px;
+}
+
+.commit-btn {
+  margin-top: 40pt;
+  background-color: #2A82E4;
+  color: white;
+}

pages/home/item.wxml

@@ -0,0 +1,21 @@
+<template name="main_item">
+  <view style="display:flex;justify-content:space-between;align-items:center;width:98%;background-color:#FFFFFF;height:50px;">
+    <text style="width:85px;margin-left:10px;font-size:10pt;">{{title}}</text>
+    <view style="display:flex;justify-content:flex-start;align-items:center;width:100%;margin-left:5px;">
+      <text style="font-size:10pt;">{{content}}</text>
+    </view>
+    <mp-icon icon="arrow" color="#a1a1a1" size="{{8}}" mar></mp-icon>
+  </view>
+</template>
+
+<template name="main_item_input">
+  <view style="display:flex;justify-content:space-between;align-items:center;width:98%;background-color:#FFFFFF;height:50px;">
+    <text style="width:85px;margin-left:10px;font-size:10pt;">{{title}}</text>
+    <view style="display:flex;justify-content:flex-start;align-items:center;width:100%;margin-left:5px;">
+      <view class="weui-cells weui-cells_after-title" style="width:100%;">
+        <input class="weui-input" maxlength="10" placeholder="{{placeholder}}" style="width:100%;font-size:10pt;height:30pt;border: none;"/>
+      </view>
+    </view>
+    <mp-icon icon="arrow" color="#a1a1a1" size="{{8}}" mar></mp-icon>
+  </view>
+</template>

pages/login/login.js

@@ -0,0 +1,54 @@
+// pages/login/login.js
+var common = require('../common/common.js')
+const host_url = common.base_host
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    loading:false,
+    phone_value:""
+  },
+  bindPhoneInput:function(e){
+    this.data.phone_value = e.detail.value
+  },
+  bindLogin:function(e) {
+    const that = this
+    if(!(/^1[3456789]\d{9}$/.test(this.data.phone_value))){ 
+      this.setData({
+        error:"电话号码格式不对"
+      })
+      return 
+    }
+    wx.request({
+      url: host_url + "/orchardacqui/login",
+      method:'GET',
+      data:{
+        phone:this.data.phone_value
+      },
+      success(res){
+        let data = res.data
+        if(data.retHead.errCode == 0){
+          wx.setStorage({
+            data: that.data.phone_value,
+            key: 'phone_number',
+          })
+          wx.navigateBack()
+        }else{
+          that.setData({
+            error:data.retHead.errMsg
+          })
+        }
+      },
+      fail(error){
+        that.setData({
+          error:"网络出错"
+        })
+      }
+    })
+    
+  }
+
+})

pages/login/login.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "mp-toptips": "/miniprogram_npm/weui-miniprogram/toptips/toptips"
+  },
+  "navigationBarTitleText": "数据采集-登录"
+}

pages/login/login.wxml

@@ -0,0 +1,8 @@
+<!--pages/login/login.wxml-->
+<mp-toptips msg="{{error}}" type="error" show="{{error}}"></mp-toptips>
+<view class="container">
+  <view style="width:100%;height:50pt;background-color:white;">
+    <input placeholder="请输入采集系统电话号码" style="height:100%;width:100%;text-align:center;" type="number" bindinput="bindPhoneInput"></input>
+  </view>
+  <button style="width:92%;height:40pt;text-align:center;line-height:30pt;background-color:#2A82E4;color:white" class="commit-btn" loading="{{loading}}" bindtap="bindLogin">登录</button>
+</view>

pages/login/login.wxss

@@ -0,0 +1,8 @@
+/* pages/login/login.wxss */
+.container{
+  background-color: #e5e5e5;
+  height: 100%;
+}
+page{
+  height:100%;
+}

project.config.json

@@ -0,0 +1,54 @@
+{
+	"description": "项目配置文件",
+	"packOptions": {
+		"ignore": []
+	},
+	"setting": {
+		"urlCheck": false,
+		"es6": true,
+		"postcss": true,
+		"preloadBackgroundData": false,
+		"minified": true,
+		"newFeature": true,
+		"coverView": true,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		}
+	},
+	"compileType": "miniprogram",
+	"libVersion": "2.11.0",
+	"appid": "wx5de6ccb82abb0fa1",
+	"projectname": "dataCapture",
+	"debugOptions": {
+		"hidedInDevtools": []
+	},
+	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
+	"condition": {
+		"search": {
+			"current": -1,
+			"list": []
+		},
+		"conversation": {
+			"current": -1,
+			"list": []
+		},
+		"game": {
+			"currentL": -1,
+			"list": []
+		},
+		"miniprogram": {
+			"current": -1,
+			"list": []
+		}
+	}
+}

sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}

utils/util.js

@@ -0,0 +1,19 @@
+const formatTime = date => {
+  const year = date.getFullYear()
+  const month = date.getMonth() + 1
+  const day = date.getDate()
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+
+  return [year, month, day].map(formatNumber).join('/') + ' ' + [hour, minute, second].map(formatNumber).join(':')
+}
+
+const formatNumber = n => {
+  n = n.toString()
+  return n[1] ? n : '0' + n
+}
+
+module.exports = {
+  formatTime: formatTime
+}