diff --git a/api/file.js b/api/file.js index e527b01..01e33ea 100644 --- a/api/file.js +++ b/api/file.js @@ -24,22 +24,25 @@ export const addland = (data) => syhttp.post('/land/add', data) export const plantlist = (data) => syhttp.get('/plant/list', data) //新增种植 export const addplant = (data) => syhttp.post('/plant/add', data) + +//种植详情 +export const plantdetail = (data) => syhttp.get('/plant/detail', data) + //操作列表 export const actionlist = (data) => syhttp.get('/action/list', data) //添加操作 export const addaction = (data) => syhttp.post('/action/add', data) + //添加操作 -export const binddevice = (data) => syhttp.post('/device/bind', data) +export const binddevice = (data) => syhttp.post('/land/bind', data) //首页 export const lindexist = (data) => syhttp.get('/index/index', data) +//产品列表 +export const landproduct = (data) => syhttp.get('/land/product', data) - - - - - - +//绑定产品 +export const bindproduct = (data) => syhttp.post('/land/bind', data) diff --git a/api/upload.js b/api/upload.js index 41e9505..bbea5a2 100644 --- a/api/upload.js +++ b/api/upload.js @@ -2,11 +2,12 @@ // let baseUrl = 'https://ceshi.excellentkk.cn/api'; // import store from '../store'; import { config } from '@/config/app'; +import store from "@/store/index.js" let header = {}; -console.log(config) -if (uni.getStorageSync('SY_TOKEN')){ - header.token = uni.getStorageSync('SY_TOKEN'); + +if (store.state.userInfo){ + header.token = store.state.userInfo.token; } function uploads(src, type) { diff --git a/components/plant/landInfo.vue b/components/plant/landInfo.vue index 937c46d..6ca7c33 100644 --- a/components/plant/landInfo.vue +++ b/components/plant/landInfo.vue @@ -5,17 +5,25 @@ {{info.title}} 号土地 - - 溯源码: {{}} - + - 当前种植: {{info.residual_area}}亩 + 当前种植: {{info.total_area-info.residual_area}}亩 + + + + 种植品种: {{info.kind}} + @@ -55,6 +63,13 @@ info: Object, }) + + const perviewFn = (url) => { + console.log(url) + uni.previewImage({ + urls: [url] + }) + }