From 78ae327fb9d342ab008fe3ae418b1b769ff2d43a Mon Sep 17 00:00:00 2001
From: Tuzki <1720599558@qq.com>
Date: Tue, 16 Apr 2024 15:06:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=97=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E5=B7=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/system/block/block.js            |  54 ++++
 manifest.json                        |  10 +-
 pages.json                           |   9 +-
 pages/block/index.vue                |  53 +++-
 plugins/qqmap-wx-jssdk.min.js        |   1 +
 sunPages/addBlock/addBlock.vue       | 411 ++++++++++++++++++++++++-
 sunPages/blockDetail/blockDetail.vue | 269 ++++++++++++++++-
 sunPages/drawMap/drawMap.vue         |  32 ++
 sunPages/editBlock/editBlock.vue     | 430 ++++++++++++++++++++++++++-
 9 files changed, 1241 insertions(+), 28 deletions(-)
 create mode 100755 plugins/qqmap-wx-jssdk.min.js
 create mode 100644 sunPages/drawMap/drawMap.vue

diff --git a/api/system/block/block.js b/api/system/block/block.js
index 78f1bee..90c6208 100644
--- a/api/system/block/block.js
+++ b/api/system/block/block.js
@@ -1,9 +1,63 @@
 import request from '@/utils/request'
 
+//地块列表分页
 export function getBlockPage(query) {
   return request({
     url: '/traceability/block/page',
     method: 'get',
     params: query
   })
+}
+
+// 获得农作物信息;分页
+export function getCropperPage(query) {
+  return request({
+    url: '/traceability/cropper/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得种植历史分页
+export function getGrowRecordPage(query) {
+  return request({
+    url: '/traceability/grow-record/page',
+    method: 'get',
+     params: query
+  })
+}
+
+// 获得采收记录分页
+export function getRecoveryRecordPage(query) {
+  return request({
+    url: '/traceability/recovery-record/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建地块信息
+export function createBlock(data) {
+  return request({
+    url: '/traceability/block/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 删除地块信息
+export function deleteBlock(id) {
+  return request({
+    url: '/traceability/block/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 更新地块信息
+export function updateBlock(data) {
+  return request({
+    url: '/traceability/block/update',
+    method: 'put',
+    data: data
+  })
 }
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index daadeea..30a8388 100644
--- a/manifest.json
+++ b/manifest.json
@@ -52,7 +52,15 @@
             "subPackages" : true
         },
         "usingComponents" : true,
-        "permission" : {}
+        "permission": {
+        		"scope.userLocation": {
+        			"desc": "你的位置信息将用于小程序位置接口的效果展示"
+        		},
+                "scope.userFuzzyLocation": {
+        			"desc": "你的位置信息将用于小程序位置接口的效果展示"
+        		}
+        	},
+        "requiredPrivateInfos": ["chooseLocation","getLocation"]
     },
     "vueVersion" : "2",
     "h5" : {
diff --git a/pages.json b/pages.json
index ff2ba11..6890bc7 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
-	"pages": [{
+	"pages": [
+		{
 			"path": "pages/login",
 			"style": {
 				"navigationBarTitleText": "登录"
@@ -167,6 +168,12 @@
 					"navigationBarTitleText": "新增地块",
 					"enablePullDownRefresh": false
 				}
+			}, {
+				"path": "drawMap/drawMap",
+				"style": {
+					"navigationBarTitleText": "绘制地块",
+					"enablePullDownRefresh": false
+				}
 			}
 		]
 	}],
diff --git a/pages/block/index.vue b/pages/block/index.vue
index 7ae2c67..b119384 100644
--- a/pages/block/index.vue
+++ b/pages/block/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view class="m-top-bar">
-			<uni-search-bar v-model="queryParams.blockName" bgColor="#EEEEEE" placeholder="请输入地块名称" @confirm="search" @cancel=cacel />
+			<uni-search-bar v-model="queryParams.blockName" bgColor="#EEEEEE" placeholder="请输入地块名称" @confirm="search" @cancel="cacel" />
 			<uni-section class="m-block-pick" title="地块类型">
 				<uni-data-select v-model="queryParams.blockType" :localdata="range" @change="change"></uni-data-select>
 			</uni-section>
@@ -33,7 +33,7 @@
 
 <script>
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
-import { getBlockPage } from '@/api/system/block/block';
+import { getBlockPage, deleteBlock } from '@/api/system/block/block';
 import DictTag from '@/components/DictTag/index.vue';
 
 export default {
@@ -63,13 +63,14 @@ export default {
 			item.text = item.label;
 		});
 		this.range = arr;
+		this.queryList();
 	},
 	methods: {
 		search(res) {
 			this.queryList();
 		},
-		cacel(){
-			this.queryParams.blockName = null
+		cacel() {
+			this.queryParams.blockName = null;
 			this.queryList();
 		},
 		change(e) {
@@ -81,8 +82,8 @@ export default {
 			//这里的pageNo和pageSize会自动计算好，直接传给服务器即可
 			//模拟请求服务器获取分页数据，请替换成自己的网络请求
 			this_.$nextTick(() => {
-				this_.queryParams.pageNo = pageNo
-				this_.queryParams.pageSize = pageSize
+				this_.queryParams.pageNo = pageNo;
+				this_.queryParams.pageSize = pageSize;
 				const params = this_.queryParams;
 				getBlockPage(params)
 					.then((res) => {
@@ -104,16 +105,48 @@ export default {
 				url: '/sunPages/addBlock/addBlock'
 			});
 		},
-		editBlock() {
+		editBlock(item) {
+			const data = JSON.stringify(item)
 			uni.navigateTo({
-				url: '/sunPages/editBlock/editBlock'
+				url: '/sunPages/editBlock/editBlock?data='+data
 			});
 		},
 		detailBlock(item) {
-			const obj = JSON.stringify(item)
+			const obj = JSON.stringify(item);
 			uni.navigateTo({
-				url: '/sunPages/blockDetail/blockDetail?val='+obj
+				url: '/sunPages/blockDetail/blockDetail?val=' + obj
 			});
+		},
+		deleteBlock(val) {
+			let this_ = this
+			if (val.id) {
+				uni.showModal({
+					title: '提示',
+					content: '确定删除编号' + val.id + '地块吗',
+					success: function (res) {
+							if (res.confirm) {
+								deleteBlock(val.id).then(res=>{
+									uni.showToast({
+										title:'删除成功',
+										icon:'none',
+										success() {
+											this_.queryList();
+										}
+									})
+								}).catch(err=>{
+									console.log(err)
+								})
+							} else if (res.cancel) {
+								console.log('用户点击取消');
+							}
+						}
+				});
+			} else {
+				uni.showToast({
+					icon: 'error',
+					title: '该条数据有问题，请检查数据。'
+				});
+			}
 		}
 	}
 };
diff --git a/plugins/qqmap-wx-jssdk.min.js b/plugins/qqmap-wx-jssdk.min.js
new file mode 100755
index 0000000..8fa1477
--- /dev/null
+++ b/plugins/qqmap-wx-jssdk.min.js
@@ -0,0 +1 @@
+var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key格式错误', PARAM_ERR: 310, PARAM_ERR_MSG: '请求参数信息有误', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '系统错误', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '参数格式有误'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key值不能为空') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '全国', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file
diff --git a/sunPages/addBlock/addBlock.vue b/sunPages/addBlock/addBlock.vue
index 8c3b35f..e820c87 100644
--- a/sunPages/addBlock/addBlock.vue
+++ b/sunPages/addBlock/addBlock.vue
@@ -1,19 +1,416 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="map-view">
+			<map
+				id="map"
+				v-if="formData.positionStr && formData.positionStr != ''"
+				class="m-map"
+				:longitude="longitude"
+				:latitude="latitude"
+				:polygons="polygons"
+				enable-satellite="true"
+			></map>
+			<view class="no-map" v-else>
+				<uv-empty icon="https://cdn.uviewui.com/uview/demo/empty/history.png"></uv-empty>
+			</view>
+			<view class="map-btn-group">
+				<button v-if="formData.positionStr && formData.positionStr != ''" @click="reset">清除地块</button>
+				<button v-else @click="drawMap">绘制地块</button>
+			</view>
+		</view>
+		<view class="form-box">
+			<uni-forms label-width="80px" ref="valiForm" :rules="rules" :modelValue="formData">
+				<uni-forms-item label="地块名称" required name="blockName">
+					<uni-easyinput v-model="formData.blockName" placeholder="请输入地块名称"></uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="标识颜色" name="blockColor">
+					<view
+						class="color"
+						:style="{
+							background: formData.blockColor
+						}"
+						@click="openColor"
+					></view>
+				</uni-forms-item>
+				<uni-forms-item label="地块类型" required name="blockType">
+					<uni-data-select v-model="formData.blockType" :localdata="range"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="地块面积" required name="blockArea">
+					<uni-easyinput v-model="formData.blockArea" placeholder="请输入地块面积">
+						<template #right>
+							<view class="input-slot-right">亩</view>
+						</template>
+					</uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="地块坐标" name="positionStr">
+					<uni-easyinput disabled v-model="formData.positionStr" placeholder="地块坐标"></uni-easyinput>
+				</uni-forms-item>
+			</uni-forms>
+			<button type="primary" @click="submit('valiForm')">提交</button>
+		</view>
+
+		<uv-pick-color ref="pickerColor" @confirm="confirm"></uv-pick-color>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+import { createBlock } from '@/api/system/block/block.js';
+// 引入SDK核心类
+var QQMapWX = require('@/plugins/qqmap-wx-jssdk.min.js');
+var qqmapsdk;
+var self;
+export default {
+	data() {
+		return {
+			data: [],
+			IsOption: false,
+			polygons: [],
+			longitude: null,
+			latitude: null,
+			range: [],
+			formData: {
+				blockName: undefined,
+				blockColor: undefined,
+				blockType: undefined,
+				blockArea: undefined,
+				positionStr: undefined,
+				baseId: undefined
+			},
+			rules: {
+				blockName: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '地块名不能为空'
+						}
+					]
+				},
+				blockArea: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '面积名不能为空'
+						}
+					]
+				},
+				blockType: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '地块类型不能为空'
+						}
+					]
+				}
+				// positionStr: {
+				// 	rules: [
+				// 		{
+				// 			required: true,
+				// 			errorMessage: '请先绘制地块'
+				// 		}
+				// 	]
+				// }
+			}
+		};
+	},
+	onShow() {
+		let arr = this.getDictDatas(DICT_TYPE.LAND_TYPE);
+		arr.forEach((item) => {
+			item.text = item.label;
+		});
+		this.range = arr;
+	},
+	onLoad(options) {
+		if (options.val) {
+			console.log(JSON.parse(decodeURIComponent(options.val)));
+			const obj = JSON.parse(decodeURIComponent(options.val));
+			this.formData.blockArea = obj.blockArea;
+			this.formData.positionStr = obj.positionStr;
+			this.initmapPolygon();
+		}
+		self = this;
+		// self.getAuthorizeInfo();
+		// 实例化API核心类
+		qqmapsdk = new QQMapWX({
+			key: 'PEFBZ-ELL64-MVDUZ-KDV4N-RISMO-VCB7A'
+		});
+	},
+	methods: {
+		openColor() {
+			this.$refs.pickerColor.open();
+		},
+		confirm(e) {
+			this.formData.blockColor = e.hex;
+			if (this.polygons.length > 0) {
+				this.polygons[0].strokeColor = e.hex;
+				this.polygons[0].fillColor = e.hex + '5c';
+			}
+		},
+
+		toLocation: function (obj) {
+			self.mapCtx.moveToLocation(obj);
+			self.mapCtx.translateMarker({
+				markerId: 1,
+				autoRotate: true,
+				duration: 100,
+				destination: {
+					latitude: obj.latitude,
+					longitude: obj.longitude
+				},
+				animationEnd() {
+					console.log('animation end');
+				}
+			});
+		},
+		// 位置授权
+		getAuthorizeInfo() {
+			uni.authorize({
+				scope: 'scope.userLocation',
+				success() {
+					// 允许授权
+					self.getLocationInfo();
+				},
+				fail() {
+					// 拒绝授权
+					self.openConfirm();
+					console.log('你拒绝了授权，无法获得周边信息');
+				}
+			});
+		},
+		// 获取地理位置
+		getLocationInfo() {
+			uni.getLocation({
+				type: 'wgs84',
+				success(res) {
+					console.log(res, '当前位置');
+					self.toLocation(res);
+					self.latitude = res.latitude;
+					self.longitude = res.longitude;
+					// uni.openLocation({
+					//     latitude: latitude,
+					//     longitude: longitude,
+					//     success: function () {
+					//         console.log('success');
+					//     }
+					// })
+				}
+			});
+		},
+
+		// 再次获取授权
+		// 当用户第一次拒绝后再次请求授权
+		openConfirm() {
+			uni.showModal({
+				title: '请求授权当前位置',
+				content: '需要获取您的地理位置，请确认授权',
+				success: (res) => {
+					if (res.confirm) {
+						uni.openSetting(); // 打开地图权限设置
+					} else if (res.cancel) {
+						uni.showToast({
+							title: '你拒绝了授权，无法获得周边信息',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}
+			});
+		},
+
+		poitap: function (e) {
+			console.log(e, 'poitap');
+			var obj = e.detail;
+			self.searchKey = obj.name;
+			// this.$api.msg(e)
+			self.toLocation(obj);
+		},
+		// 取消删除
+		Cancel: function () {},
+
+		submit(ref) {
+			let this_ = this
+			if (this.formData.positionStr == undefined || this.formData.positionStr == '') {
+				uni.showToast({
+					title: `请先绘制地块`,
+					icon: 'error'
+				});
+				return false;
+			}
+			this.$refs[ref]
+				.validate()
+				.then((res) => {
+					console.log('success', res);
+					createBlock(res)
+						.then((res) => {
+							uni.showToast({
+								title: `创建成功`,
+								duration: 1500,
+								success() {
+									setTimeout(()=>{
+										this_.reset();
+										uni.switchTab({
+											url: '/pages/block/index'
+										});
+									},1500)
+								}
+							});
+						})
+						.catch((err) => {
+							console.log(err);
+						});
+				})
+				.catch((err) => {
+					console.log('err', err);
+				});
+		},
+		drawMap() {
+			uni.navigateTo({
+				url: '/sunPages/drawMap/drawMap'
+			});
+		},
+		reset() {
+			this.formData = {
+				blockName: undefined,
+				blockColor: undefined,
+				blockType: undefined,
+				blockArea: undefined,
+				positionStr: undefined,
+				baseId: undefined
 			};
+			this.polygons = [];
+		},
+		initmapPolygon() {
+			let this_ = this;
+			const mapCon = uni.createMapContext('map');
+			const arr = JSON.parse(this.formData.positionStr);
+			const center = this_.calculateCenter(arr);
+			let Arr = arr.map((item) => {
+				const obj = {
+					latitude: item[1],
+					longitude: item[0]
+				};
+				return obj;
+			});
+			console.log(Arr);
+			let Obj = {
+				points: Arr,
+				strokeColor: this_.formData.blockColor && this_.formData.blockColor != null ? this_.formData.blockColor : '#007969',
+				fillColor: this_.formData.blockColor && this_.formData.blockColor != null ? this_.formData.blockColor + '5c' : '#0079695c',
+				zIndex: 1
+			};
+			this_.$nextTick(() => {
+				this_.polygons.push(Obj);
+				mapCon.includePoints({
+					padding: [20, 20, 20, 20],
+					points: Arr
+				});
+				this_.longitude = center[0];
+				this_.latitude = center[1];
+			});
+		},
+		//计算中心点
+		calculateCenter(coordinates) {
+			let sumLat = 0;
+			let sumLng = 0;
+			coordinates.forEach((coord) => {
+				sumLat += coord[0];
+				sumLng += coord[1];
+			});
+			const count = coordinates.length;
+			const centerLat = sumLat / count;
+			const centerLng = sumLng / count;
+			return [centerLat, centerLng];
 		}
 	}
+};
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
+.content {
+	background-color: #f1f1f1;
+	overflow: hidden;
+	min-height: 100vh;
+	color: #646464;
+	font-size: 40rpx;
+}
+.option {
+	max-height: 300rpx;
+	width: 90%;
+	line-height: 60rpx;
+	position: fixed;
+	top: 110rpx;
+	z-index: 99999;
+	border-radius: 150rpx;
+	overflow: scroll;
+	left: 50%;
+	transform: translateX(-50%);
+}
+.column_item {
+	padding: 0 40rpx;
+	height: 60rpx;
+	font-size: 28rpx;
+	width: 100%;
+	overflow: hidden;
+	margin: 0rpx auto;
+	background-color: #00000080;
+	text-overflow: ellipsis;
+	color: #fff;
+	white-space: nowrap;
+}
+.column_item:active {
+	background-color: #8f8f94;
+}
+
+.page-section-gap {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	z-index: 0;
+}
+.color {
+	width: 50rpx;
+	height: 50rpx;
+	border-radius: 6rpx;
+	border: solid 1rpx #d0d0d0;
+	background-color: transparent;
+}
+.input-slot-right {
+	background-color: #eee;
+	padding: 10rpx;
+}
+.map-view {
+	width: 100%;
+	height: 500rpx;
+	overflow: hidden;
+	position: relative;
+	margin-bottom: 30rpx;
 
+	.m-map {
+		width: 100%;
+		height: 110%;
+	}
+
+	.map-btn-group {
+		position: absolute;
+		z-index: 9;
+		bottom: 20rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+.form-box {
+	padding: 40rpx 20rpx;
+	margin: 0 20rpx;
+	background: #fff;
+	box-shadow: 0 0 10px 1px #dadada;
+	border-radius: 15rpx;
+
+	/deep/ .uni-forms-item {
+		align-items: center;
+
+		&:last-child {
+			display: none;
+		}
+	}
+}
 </style>
diff --git a/sunPages/blockDetail/blockDetail.vue b/sunPages/blockDetail/blockDetail.vue
index 1762007..84ae627 100644
--- a/sunPages/blockDetail/blockDetail.vue
+++ b/sunPages/blockDetail/blockDetail.vue
@@ -1,17 +1,103 @@
 <template>
 	<view>
 		<view class="m-mapbox">
-			<map class="m-map" name="" :longitude="longitude" :latitude="latitude" :polygons="polygons" enable-satellite="true"></map>
+			<map class="m-map" name="" id="map" :longitude="longitude" :latitude="latitude" :polygons="polygons" enable-satellite="true"></map>
 			<view class="m-shadow">
 				<view class="m-mj">{{ blockData.blockArea || '0' }}亩</view>
 				<view class="m-type"><dict-tag :type="'land_type'" :value="blockData.blockType" class="m-dic-tag" /></view>
 			</view>
 		</view>
+		<view class="m-tabs-box">
+			<z-paging ref="paging" :pagingStyle="padingStyle" v-model="dataList" @query="queryList">
+				<!-- 需要固定在顶部不滚动的view放在slot="top"的view中，如果需要跟着滚动，则不要设置slot="top" -->
+				<!-- 注意！此处的z-tabs为独立的组件，可替换为第三方的tabs，若需要使用z-tabs，请在插件市场搜索z-tabs并引入，否则会报插件找不到的错误 -->
+				<template #top>
+					<z-tabs :list="tabList" @change="tabChange" />
+					<template class="m-data-pick"v-if="tabIndex == 2">
+						<uni-datetime-picker @change='searchData' v-model="datetimerange" type="datetimerange" rangeSeparator="至" />
+					</template>
+				</template>
+				<!-- 如果希望其他view跟着页面滚动，可以放在z-paging标签内 -->
+				<view class="item" v-for="(item, index) in dataList" :key="index" @click="itemClick(item, index)">
+					<template v-if="tabIndex == 0 && dataList.length > 0">
+						<view class="m-item-box">
+							<view class="m-item-top">
+								<image class="m-item-img" :mode="aspectFill" :src="item.productPic"></image>
+								<view class="m-pro-custrom">
+									<view class="m-pro-name">
+										{{ item.productName }}
+									</view>
+									<view class="m-pro-species">品种：{{ item.speciesName }}</view>
+									<view class="m-pro-Type">
+										标准：
+										<dict-tag class="m-dic-tag" :type="'authentication_type'" :value="item.authenticationType" />
+									</view>
+									<view class="m-pro-Time">
+										种植时间：{{ parseTime(item.plantingTime, '{y}-{m}-{d}') }}
+										<view class="m-daysdiff">第{{ calculateDaysDifference(item.plantingTime) }}天</view>
+									</view>
+								</view>
+							</view>
+							<view class="m-item-bottom">
+								<view class="m-note">农事记录</view>
+								<view class="m-end-pro">种植结束</view>
+							</view>
+						</view>
+					</template>
+					<template v-if="tabIndex == 1 && dataList.length > 0">
+						<view class="m-item-box">
+							<view class="m-item-top">
+								<image class="m-item-img" :mode="aspectFill" :src="item.productPic"></image>
+								<view class="m-pro-custrom">
+									<view class="m-pro-name">
+										{{ item.productName }}
+									</view>
+									<view class="m-pro-species">品种：{{ item.speciesName }}</view>
+									<view class="m-pro-Type">
+										标准：
+										<dict-tag class="m-dic-tag" :type="'authentication_type'" :value="item.authenticationType" />
+									</view>
+								</view>
+							</view>
+							<view class="m-item-bottom noflex">
+								<uni-steps :active-color="'#3f3f3f'" :options="[{title:'种植时间',desc:parseTime(item.plantTime,'{y}-{m}-{d}')},{title:'结束时间',desc:parseTime(item.endTime,'{y}-{m}-{d}')}]" :active="3"></uni-steps>
+							</view>
+						</view>
+					</template>
+					<template v-if="tabIndex == 2 && dataList.length > 0">
+						<view class="m-item-box">
+							<view class="m-item-top no-border">
+								<image class="m-item-img" :mode="aspectFill" :src="item.productPic"></image>
+								<view class="m-pro-custrom">
+									<view class="m-pro-name">
+										{{ item.productName }}
+									</view>
+									<view class="m-pro-species">品种：{{ item.speciesName }}</view>
+									<view class="m-pro-Type">
+										标准：
+										<dict-tag class="m-dic-tag" :type="'authentication_type'" :value="item.authenticationType" />
+									</view>
+									<view class="m-pro-Time">
+										采收时间：{{ parseTime(item.jobTime, '{y}-{m}-{d}') }}
+									</view>
+								</view>
+								<view class="m-big-num">
+									{{item.production}}<br>公斤
+								</view>
+							</view>
+						</view>
+					</template>
+				</view>
+			</z-paging>
+			<tempalte class="m-add-pro" v-if="tabIndex == 0 && dataList.length == 0">+新增种养品种</tempalte>
+		</view>
 	</view>
 </template>
 
 <script>
 import DictTag from '@/components/DictTag/index.vue';
+import { parseTime } from '@/utils/ruoyi';
+import { getCropperPage,getGrowRecordPage,getRecoveryRecordPage } from '@/api/system/block/block.js';
 export default {
 	components: {
 		DictTag
@@ -22,7 +108,16 @@ export default {
 			polygons: [],
 			includePoints: [],
 			longitude: null,
-			latitude: null
+			latitude: null,
+			padingStyle: {
+				top: '500rpx',
+				'z-index': 9
+			},
+			datetimerange:[],
+
+			dataList: [],
+			tabList: ['种植产品', '种植历史', '采收记录'],
+			tabIndex: 0
 		};
 	},
 	onReady() {},
@@ -36,6 +131,15 @@ export default {
 		this.initmapPolygon();
 	},
 	methods: {
+		parseTime(time, pattern) {
+			return parseTime(time, pattern);
+		},
+		calculateDaysDifference(val) {
+			console.log(val);
+			const timestampDate = new Date(val);
+			const timeDiff = new Date().getTime() - timestampDate.getTime();
+			return Math.floor(timeDiff / (1000 * 3600 * 24));
+		},
 		initmapPolygon() {
 			let this_ = this;
 			const mapCon = uni.createMapContext('map');
@@ -77,12 +181,105 @@ export default {
 			const centerLat = sumLat / count;
 			const centerLng = sumLng / count;
 			return [centerLat, centerLng];
+		},
+		tabChange(index) {
+			this.tabIndex = index;
+			//当切换tab或搜索时请调用组件的reload方法，请勿直接调用：queryList方法！！
+			this.$refs.paging.reload();
+		},
+		queryList(pageNo, pageSize) {
+			//组件加载时会自动触发此方法，因此默认页面加载时会自动触发，无需手动调用
+			//这里的pageNo和pageSize会自动计算好，直接传给服务器即可
+			//模拟请求服务器获取分页数据，请替换成自己的网络请求
+			if (this.tabIndex == 0) {
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					baseId: null,
+					blockId: this.blockData.id
+				};
+				getCropperPage(params)
+					.then((res) => {
+						//将请求的结果数组传递给z-paging
+						this.$nextTick(() => {
+							this.$refs.paging.complete(res.data.list);
+						});
+					})
+					.catch((res) => {
+						//如果请求失败写this.$refs.paging.complete(false);
+						//注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+						//在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+						this.$refs.paging.complete(false);
+					});
+			}
+			if (this.tabIndex == 1) {
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					baseId: null,
+					blockId: this.blockData.id
+				};
+				getGrowRecordPage(params)
+					.then((res) => {
+						//将请求的结果数组传递给z-paging
+						this.$nextTick(() => {
+							this.$refs.paging.complete(res.data.list);
+						});
+					})
+					.catch((res) => {
+						//如果请求失败写this.$refs.paging.complete(false);
+						//注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+						//在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+						this.$refs.paging.complete(false);
+					});
+			}
+			if (this.tabIndex == 2) {
+				const params = {
+					pageNo: pageNo,
+					pageSize: pageSize,
+					baseId: null,
+					blockId: this.blockData.id,
+					jobTime:this.datetimerange
+				};
+				getRecoveryRecordPage(params)
+					.then((res) => {
+						//将请求的结果数组传递给z-paging
+						this.$nextTick(() => {
+							this.$refs.paging.complete(res.data.list);
+						});
+					})
+					.catch((res) => {
+						//如果请求失败写this.$refs.paging.complete(false);
+						//注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理
+						//在底层的网络请求抛出异常时，写uni.$emit('z-paging-error-emit');即可
+						this.$refs.paging.complete(false);
+					});
+			}
+		},
+		itemClick(item, index) {
+			console.log('点击了', item.title);
+		},
+		searchData(val){
+			console.log(val,this.datetimerange)
+			this.$refs.paging.reload();
 		}
 	}
 };
 </script>
 
 <style lang="scss" scoped>
+.m-add-pro {
+	display: block;
+	position: fixed;
+	bottom: 200rpx;
+	left: 50%;
+	transform: translate(-50%);
+	background-color: #32c38f;
+	padding: 10rpx 15rpx;
+	border: none;
+	border-radius: 10rpx;
+	color: #eee;
+}
 .m-mapbox {
 	width: 100%;
 	height: 500rpx;
@@ -110,4 +307,72 @@ export default {
 		}
 	}
 }
+.item {
+	margin: 30rpx 10rpx;
+	box-shadow: 0 0 7px 1px #a2a2a2;
+	padding: 20rpx 15rpx;
+
+	.m-item-box {
+		.m-item-top {
+			border-bottom: solid 1rpx #666;
+			display: flex;
+			padding-bottom: 20rpx;
+			align-items: center;
+
+			.m-item-img {
+				width: 150rpx;
+				height: 150rpx;
+				border-radius: 50%;
+				margin-right: 30rpx;
+			}
+			.m-pro-custrom {
+				flex: 1;
+				.m-pro-name {
+					font-size: 35rpx;
+					font-weight: bold;
+				}
+
+				.m-pro-Time {
+					display: flex;
+					justify-content: space-between;
+					width: 100%;
+
+					.m-daysdiff {
+						color: #00af7f;
+					}
+				}
+
+				/deep/ .m-dic-tag .v-dict-text {
+					font-size: 28rpx;
+				}
+			}
+			.m-big-num{
+				width: 20%;
+				font-size: 35rpx;
+				font-weight: bold;
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				text-align: center;
+			}
+		}
+		.m-item-bottom{
+			    margin-top: 20rpx;
+			    display: flex;
+			    justify-content: flex-end;
+			    margin-right: 20rpx;
+			    align-items: center;
+					
+					.m-note{
+						margin-right: 20rpx;
+					}
+		}
+		.noflex{
+			display: block;
+		}
+		.no-border{
+			border: none;
+		}
+	}
+}
 </style>
diff --git a/sunPages/drawMap/drawMap.vue b/sunPages/drawMap/drawMap.vue
new file mode 100644
index 0000000..e2e1597
--- /dev/null
+++ b/sunPages/drawMap/drawMap.vue
@@ -0,0 +1,32 @@
+<template>
+	<view>
+		<web-view :src="src"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			positionStr: null,
+			blockColor: null,
+			blockName: null,
+			blockType: null,
+			id: null,
+			str: null,
+			src:''
+		};
+	},
+	onLoad(options) {
+		if (options.str) {
+			this.str = options.str;
+			this.src = 'http://192.168.130.193:8848/H5/map.html?str=' + this.str
+		}else{
+			this.src = 'http://192.168.130.193:8848/H5/map.html?str=null'
+		}
+		console.log(this.src)
+	}
+};
+</script>
+
+<style lang="scss"></style>
diff --git a/sunPages/editBlock/editBlock.vue b/sunPages/editBlock/editBlock.vue
index 8c3b35f..376b3fd 100644
--- a/sunPages/editBlock/editBlock.vue
+++ b/sunPages/editBlock/editBlock.vue
@@ -1,19 +1,435 @@
 <template>
-	<view>
-		
+	<view class="content">
+		<view class="map-view">
+			<map
+				id="map"
+				v-if="formData.positionStr && formData.positionStr != ''"
+				class="m-map"
+				:longitude="longitude"
+				:latitude="latitude"
+				:polygons="polygons"
+				enable-satellite="true"
+			></map>
+			<view class="no-map" v-else>
+				<uv-empty icon="https://cdn.uviewui.com/uview/demo/empty/history.png"></uv-empty>
+			</view>
+			<view class="map-btn-group">
+				<button v-if="formData.positionStr && formData.positionStr != ''" @click="drawMap(formData)">编辑地块</button>
+				<button v-else @click="drawMap(formData)">绘制地块</button>
+			</view>
+		</view>
+		<view class="form-box">
+			<uni-forms label-width="80px" ref="valiForm" :rules="rules" :modelValue="formData">
+				<uni-forms-item label="" required name="id">
+					<uni-easyinput v-model="formData.id" placeholder=""></uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="地块名称" required name="blockName">
+					<uni-easyinput v-model="formData.blockName" placeholder="请输入地块名称"></uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="标识颜色" name="blockColor">
+					<view
+						class="color"
+						:style="{
+							background: formData.blockColor
+						}"
+						@click="openColor"
+					></view>
+				</uni-forms-item>
+				<uni-forms-item label="地块类型" required name="blockType">
+					<uni-data-select v-model="formData.blockType" :localdata="range"></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="地块面积" required name="blockArea">
+					<uni-easyinput v-model="formData.blockArea" placeholder="请输入地块面积">
+						<template #right>
+							<view class="input-slot-right">亩</view>
+						</template>
+					</uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item label="地块坐标" name="positionStr">
+					<uni-easyinput disabled v-model="formData.positionStr" placeholder="地块坐标"></uni-easyinput>
+				</uni-forms-item>
+			</uni-forms>
+			<button type="primary" @click="submit('valiForm')">提交</button>
+		</view>
+
+		<uv-pick-color ref="pickerColor" @confirm="confirm"></uv-pick-color>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
+import { getDictDatas, DICT_TYPE } from '@/utils/dict';
+import { updateBlock } from '@/api/system/block/block.js';
+// 引入SDK核心类
+var QQMapWX = require('@/plugins/qqmap-wx-jssdk.min.js');
+var qqmapsdk;
+var self;
+export default {
+	data() {
+		return {
+			data: [],
+			IsOption: false,
+			polygons: [],
+			longitude: null,
+			latitude: null,
+			range: [],
+			realName: undefined,
+			formData: {
+				id: undefined,
+				blockName: undefined,
+				blockColor: undefined,
+				blockType: undefined,
+				blockArea: undefined,
+				positionStr: undefined,
+				baseId: undefined
+			},
+			rules: {
+				blockName: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '地块名不能为空'
+						}
+					]
+				},
+				blockArea: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '面积名不能为空'
+						}
+					]
+				},
+				blockType: {
+					rules: [
+						{
+							required: true,
+							errorMessage: '地块类型不能为空'
+						}
+					]
+				}
+				// positionStr: {
+				// 	rules: [
+				// 		{
+				// 			required: true,
+				// 			errorMessage: '请先绘制地块'
+				// 		}
+				// 	]
+				// }
+			}
+		};
+	},
+	onShow() {
+		let arr = this.getDictDatas(DICT_TYPE.LAND_TYPE);
+		arr.forEach((item) => {
+			item.text = item.label;
+		});
+		this.range = arr;
+	},
+	onLoad(options) {
+		if (options.val) {
+			const obj = JSON.parse(decodeURIComponent(options.val));
+			console.log(obj);
+			this.formData = obj;
+			this.initmapPolygon();
+		}
+		if (options.data) {
+			const obj = JSON.parse(options.data);
+			this.formData = obj;
+			this.initmapPolygon();
+			console.log(this.formData);
+		}
+		// self = this;
+		// self.getAuthorizeInfo();
+		// 实例化API核心类
+		qqmapsdk = new QQMapWX({
+			key: 'PEFBZ-ELL64-MVDUZ-KDV4N-RISMO-VCB7A'
+		});
+	},
+	methods: {
+		openColor() {
+			this.$refs.pickerColor.open();
+		},
+		confirm(e) {
+			this.formData.blockColor = e.hex;
+			if (this.polygons.length > 0) {
+				this.polygons[0].strokeColor = e.hex;
+				this.polygons[0].fillColor = e.hex + '5c';
+			}
+		},
+
+		toLocation: function (obj) {
+			self.mapCtx.moveToLocation(obj);
+			self.mapCtx.translateMarker({
+				markerId: 1,
+				autoRotate: true,
+				duration: 100,
+				destination: {
+					latitude: obj.latitude,
+					longitude: obj.longitude
+				},
+				animationEnd() {
+					console.log('animation end');
+				}
+			});
+		},
+		// 位置授权
+		getAuthorizeInfo() {
+			uni.authorize({
+				scope: 'scope.userLocation',
+				success() {
+					// 允许授权
+					self.getLocationInfo();
+				},
+				fail() {
+					// 拒绝授权
+					self.openConfirm();
+					console.log('你拒绝了授权，无法获得周边信息');
+				}
+			});
+		},
+		// 获取地理位置
+		getLocationInfo() {
+			uni.getLocation({
+				type: 'wgs84',
+				success(res) {
+					console.log(res, '当前位置');
+					self.toLocation(res);
+					self.latitude = res.latitude;
+					self.longitude = res.longitude;
+					// uni.openLocation({
+					//     latitude: latitude,
+					//     longitude: longitude,
+					//     success: function () {
+					//         console.log('success');
+					//     }
+					// })
+				}
+			});
+		},
+
+		// 再次获取授权
+		// 当用户第一次拒绝后再次请求授权
+		openConfirm() {
+			uni.showModal({
+				title: '请求授权当前位置',
+				content: '需要获取您的地理位置，请确认授权',
+				success: (res) => {
+					if (res.confirm) {
+						uni.openSetting(); // 打开地图权限设置
+					} else if (res.cancel) {
+						uni.showToast({
+							title: '你拒绝了授权，无法获得周边信息',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}
+			});
+		},
+
+		poitap: function (e) {
+			console.log(e, 'poitap');
+			var obj = e.detail;
+			self.searchKey = obj.name;
+			// this.$api.msg(e)
+			self.toLocation(obj);
+		},
+		// 取消删除
+		Cancel: function () {},
+
+		submit(ref) {
+			let this_ = this;
+			if (this.formData.positionStr == undefined || this.formData.positionStr == '') {
+				uni.showToast({
+					title: `请先绘制地块`,
+					icon: 'error'
+				});
+				return false;
+			}
+			this.$refs[ref]
+				.validate()
+				.then((res) => {
+					console.log('success', res);
+					updateBlock(res)
+						.then((res) => {
+							uni.showToast({
+								title: `修改成功`,
+								duration: 1500,
+								success() {
+									setTimeout(() => {
+										this_.reset();
+										uni.switchTab({
+											url: '/pages/block/index'
+										});
+									}, 1500);
+								}
+							});
+						})
+						.catch((err) => {
+							console.log(err);
+						});
+				})
+				.catch((err) => {
+					console.log('err', err);
+				});
+		},
+		drawMap(val) {
+			const str = encodeURIComponent(JSON.stringify(val))
+			uni.navigateTo({
+				url:'/sunPages/drawMap/drawMap?str=' + str
+			});
+		},
+		reset() {
+			this.formData = {
+				id: undefined,
+				blockName: undefined,
+				blockColor: undefined,
+				blockType: undefined,
+				blockArea: undefined,
+				positionStr: undefined,
+				baseId: undefined
 			};
+			this.polygons = [];
+		},
+		resetBlock() {
+			this.polygons = [];
+			this.formData.positionStr = undefined;
+		},
+		initmapPolygon() {
+			let this_ = this;
+			const mapCon = uni.createMapContext('map');
+			const arr = JSON.parse(this.formData.positionStr);
+			const center = this_.calculateCenter(arr);
+			let Arr = arr.map((item) => {
+				const obj = {
+					latitude: item[1],
+					longitude: item[0]
+				};
+				return obj;
+			});
+			console.log(Arr);
+			let Obj = {
+				points: Arr,
+				strokeColor: this_.formData.blockColor && this_.formData.blockColor != null ? this_.formData.blockColor : '#007969',
+				fillColor: this_.formData.blockColor && this_.formData.blockColor != null ? this_.formData.blockColor + '5c' : '#0079695c',
+				zIndex: 1
+			};
+			this_.$nextTick(() => {
+				this_.polygons.push(Obj);
+				mapCon.includePoints({
+					padding: [20, 20, 20, 20],
+					points: Arr
+				});
+				this_.longitude = center[0];
+				this_.latitude = center[1];
+			});
+		},
+		//计算中心点
+		calculateCenter(coordinates) {
+			let sumLat = 0;
+			let sumLng = 0;
+			coordinates.forEach((coord) => {
+				sumLat += coord[0];
+				sumLng += coord[1];
+			});
+			const count = coordinates.length;
+			const centerLat = sumLat / count;
+			const centerLng = sumLng / count;
+			return [centerLat, centerLng];
 		}
 	}
+};
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
+.content {
+	background-color: #f1f1f1;
+	overflow: hidden;
+	min-height: 100vh;
+	color: #646464;
+	font-size: 40rpx;
+}
+.option {
+	max-height: 300rpx;
+	width: 90%;
+	line-height: 60rpx;
+	position: fixed;
+	top: 110rpx;
+	z-index: 99999;
+	border-radius: 150rpx;
+	overflow: scroll;
+	left: 50%;
+	transform: translateX(-50%);
+}
+.column_item {
+	padding: 0 40rpx;
+	height: 60rpx;
+	font-size: 28rpx;
+	width: 100%;
+	overflow: hidden;
+	margin: 0rpx auto;
+	background-color: #00000080;
+	text-overflow: ellipsis;
+	color: #fff;
+	white-space: nowrap;
+}
+.column_item:active {
+	background-color: #8f8f94;
+}
+
+.page-section-gap {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	z-index: 0;
+}
+.color {
+	width: 50rpx;
+	height: 50rpx;
+	border-radius: 6rpx;
+	border: solid 1rpx #d0d0d0;
+	background-color: transparent;
+}
+.input-slot-right {
+	background-color: #eee;
+	padding: 10rpx;
+}
+.map-view {
+	width: 100%;
+	height: 500rpx;
+	overflow: hidden;
+	position: relative;
+	margin-bottom: 30rpx;
 
+	.m-map {
+		width: 100%;
+		height: 110%;
+	}
+
+	.map-btn-group {
+		position: absolute;
+		z-index: 9;
+		bottom: 20rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+.form-box {
+	padding: 40rpx 20rpx;
+	margin: 0 20rpx;
+	background: #fff;
+	box-shadow: 0 0 10px 1px #dadada;
+	border-radius: 15rpx;
+
+	/deep/ .uni-forms-item {
+		align-items: center;
+
+		&:last-child,{
+			display: none;
+		}
+		&:first-child{
+			display: none;
+		}
+	}
+}
 </style>