Compare commits

..

No commits in common. "bce9df6b1c083aa2e37ed05245b33ed3813d418d" and "a0e6e4b71fd1bb6ca1d4874fe011b80854b11aa7" have entirely different histories.

16 changed files with 49 additions and 48 deletions

View File

@ -1,2 +1,2 @@
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><title></title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="https://lcny.sk797.cn/h5/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://lcny.sk797.cn/h5/static/js/chunk-vendors.959091ef.js"></script><script src="https://lcny.sk797.cn/h5/static/js/index.da3e7cd2.js"></script></body></html>
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel="stylesheet" href="https://lcny.sk797.cn/h5/static/index.97465e7b.css"></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id="app"></div><script src="https://lcny.sk797.cn/h5/static/js/chunk-vendors.959091ef.js"></script><script src="https://lcny.sk797.cn/h5/static/js/index.0b310731.js"></script></body></html>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -234,15 +234,16 @@
"style" :
{
"navigationBarTitleText": "基地概况",
"enablePullDownRefresh": false
"enablePullDownRefresh": false,
"navigationStyle":"custom"
}
},{
"path" : "pages/basics/profile-detail",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
"navigationBarTitleText": "基地详情",
"enablePullDownRefresh": false,
"navigationStyle":"custom"
}
},{
"path" : "pages/crop/town-crop",

View File

@ -185,7 +185,7 @@ export default {
},
},
{
field: 'industry',
field: 'type',
label: '农业类型',
component: 'ApiSelect',
componentProps: ({ formActionType }) => {
@ -197,7 +197,7 @@ export default {
return data.data
},
labelField: 'name',
valueField: 'key',
valueField: 'id',
}
},
},

View File

@ -1,6 +1,6 @@
<template>
<view>
<!-- <Appbar :show="showAppbar" :title="title"> </Appbar> -->
<Appbar :show="showAppbar" :title="title"> </Appbar>
<view class="space-y-20rpx">
<BaseChat
:baseId="id"
@ -73,7 +73,7 @@ export default {
const { crops, devices, name } = data.data
this.title = name
this.devices = devices
uni.setNavigationBarTitle({ title: name })
console.log(this.devices);
this.crops = crops
})
},

View File

@ -1,6 +1,6 @@
<template>
<view>
<!-- <Appbar :show="showAppbar" title="基地概况"> </Appbar> -->
<Appbar :show="showAppbar" title="基地概况"> </Appbar>
<u-sticky>
<view class="bg-white">
<SearchForm
@ -157,7 +157,7 @@ export default {
},
},
{
field: 'industry',
field: 'type',
label: '农业类型',
component: 'ApiSelect',
componentProps: ({ formActionType }) => {
@ -169,7 +169,7 @@ export default {
return data.data
},
labelField: 'name',
valueField: 'key',
valueField: 'id',
}
},
},
@ -178,15 +178,15 @@ export default {
},
computed: {
options() {
return [].filter((e) => checkPermission(e.permission))
return [
].filter((e) => checkPermission(e.permission))
},
},
methods: {
handleSubmit(e) {
this.filterParmas = e
this.$nextTick(() => {
this.mescroll.resetUpScroll()
})
this.mescroll.resetUpScroll()
},
upCallback({ num, size }) {
this.getData({

View File

@ -135,7 +135,7 @@
</view>
<view class="content-box">
<view class="video_ul" v-show="current == 0">
<view class="video_li" v-for="(video, index) in videoList" :key="index+'s'">
<view class="video_li" v-for="(video, index) in videoList" :key="video.video_url+index">
<view class="video_cd">
<!-- #ifdef H5 -->
<!-- {{ video.video_url }} -->
@ -165,7 +165,7 @@
<view
class="video_li"
v-for="(video, index) in videoList2"
:key="index+'s2'"
:key="video.video_url+index"
>
<view class="video_cd">
<!-- #ifdef H5 -->