diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index e4ce581..c98c066 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -1,6 +1,6 @@
const install = (Vue, vm) => {
Vue.prototype.$u.http.setConfig({
- // baseUrl: 'http://192.168.2.27:3202',
+ // baseUrl: 'http://192.168.2.18:3202',
baseUrl: 'https://fen.ccttiot.com/prod-api',
loadingText: '努力加载中~',
loadingTime: 800,
diff --git a/page_Beehive/Beehive_woring.vue b/page_Beehive/Beehive_woring.vue
index 9626076..2c33c1f 100644
--- a/page_Beehive/Beehive_woring.vue
+++ b/page_Beehive/Beehive_woring.vue
@@ -668,7 +668,7 @@
margin-top: 20rpx;
padding: 20rpx 26rpx;
width: 462rpx;
- height: 260rpx;
+ max-height: 600rpx;
background: #F6F6F6;
border-radius: 20rpx 20rpx 20rpx 20rpx;
diff --git a/pages/Beehive.vue b/pages/Beehive.vue
index a1492b3..cb02b71 100644
--- a/pages/Beehive.vue
+++ b/pages/Beehive.vue
@@ -16,27 +16,45 @@
-
-
- {{item.label == null ? '--' : item.label}} ({{item.count == null ? '0' : item.count}})
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{item.name == null ? '--' : item.name}} ({{item.count == null ? '0' : item.count}})
+
+
+
+
+
+
+
+
+
+
+ 暂未添加蜂箱...
+
+
+
@@ -45,9 +63,6 @@
{{item.onlineStatus == 0 ? '离线' : '在线'}}
-
更新数据
@@ -175,10 +190,12 @@
-
+
+
+
@@ -194,15 +211,20 @@
code: '',
swiperHeight:554,
curtitidx:0,
- miyuancolumns: [{label:'全部',count:'0'}],
+ miyuancolumns: [{name:'全部',count:'0'}],
pagesum: 1,
pagesize: 99,
- pagesizes: 5,
+ pagesizes: 10,
fxlist:[],
total: '',
apiaryId:'',
indextab:0,
logoflag:false,
+ wateringList:[],
+ touchStartX: 0, // 触屏起始点x
+ touchStartY: 0, // 触屏起始点y
+ qingqiuflag:true,
+ shujuflag: false,
}
},
onLoad() {
@@ -211,34 +233,61 @@
onShow() {
this.indextab = 0
this.pagesum = 1
+ this.miyuancolumns = []
this.getmiyuancolumns()
+ },
+ onUnload() {
+
},
methods: {
+
+ touchStart(e) {
+ this.touchStartX = e.touches[0].clientX;
+ this.touchStartY = e.touches[0].clientY;
+ },
+ // 松开
+ touchEnd(e) {
+ let deltaX = e.changedTouches[0].clientX - this.touchStartX;
+ let deltaY = e.changedTouches[0].clientY - this.touchStartY;
+ if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
+ if (deltaX >= 0) {
+ // console.log("左滑")
+ } else {
+ // console.log("右滑")
+ }
+ } else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
+ if (deltaY < 100) {
+ console.log("上滑")
+ if(this.qingqiuflag == true){
+ if (this.miyuancolumns[0].wateringList.length < this.total) {
+ this.qingqiuflag = false
+ this.getlist()
+ }
+ }
+ } else {
+ console.log(deltaY)
+ if (deltaY > 250) {
+
+ }
+ }
+ }
+ },
+
+
// 刷新蜂箱最新数据
btngengxin(){
uni.showLoading({
title: '更新数据中...',
mask: true
})
- this.indextab = 0
+ this.curtitidx = 0
this.pagesum = 1
this.getlist()
},
// 进行蜂箱搜索
changserch(){
- let data = {
- pageNum:this.pagesum,
- pageSize:this.pagesizes,
- name:this.code,
- sn:this.code
- }
- this.$u.get('/farm/beehive/list', data).then(res => {
- if(res.code == 200){
- this.fxlist = []
- this.total = res.total
- this.fxlist = res.rows
- }
- })
+ this.pagesum = 1
+ this.getlist()
},
// 点击蜂箱详情进行页面跳转
todetail(beehiveId){
@@ -248,9 +297,9 @@
},
// 点击tab请求tab中的蜂箱
btntab(index,item){
- this.indextab = index
+ this.curtitidx = index
this.pagesum = 1
- this.apiaryId = item.value
+ this.apiaryId = this.miyuancolumns[this.curtitidx].value
this.getlist()
},
// 请求蜂箱列表
@@ -259,40 +308,61 @@
pageNum:this.pagesum,
pageSize:this.pagesizes,
apiaryId:this.apiaryId,
- refreshIot:true
+ refreshIot:true,
+ name:this.code,
}
this.$u.get('/farm/beehive/list', data).then(res => {
if(res.code == 200){
uni.hideLoading()
this.total = res.total
- if(this.total < 1){
- this.logoflag = true
- }else{
- this.logoflag = false
if(this.pagesum > 1){
- this.fxlist = this.fxlist .concat(res.rows)
+ this.wateringList = res.rows
+ this.qingqiuflag = true
+ this.miyuancolumns.forEach(groupItem => {
+ groupItem.wateringList
+ })
+ this.wateringList.forEach(wateringItem => {
+ this.miyuancolumns[0].wateringList.push(wateringItem)
+ })
+ this.wateringList.forEach(wateringItem => {
+ this.miyuancolumns.forEach(groupItem => {
+ if (groupItem.value !== null && wateringItem.apiaryId !== null && groupItem.value == wateringItem.apiaryId) {
+ if (!groupItem.wateringList.some(item => item.apiaryId === wateringItem.apiaryId)) {
+ groupItem.wateringList.push(wateringItem)
+ }
+ }
+ })
+ })
+ uni.hideLoading()
+ if(this.total > this.miyuancolumns.length){
+ this.pagesum++
+ }
}else{
- this.fxlist = res.rows
+ this.wateringList = res.rows
+ this.qingqiuflag = true
+ this.miyuancolumns.forEach(groupItem => {
+ groupItem.wateringList = []
+ })
+ this.wateringList.forEach(wateringItem => {
+ this.miyuancolumns[0].wateringList.push(wateringItem);
+ })
+ this.wateringList.forEach(wateringItem => {
+ this.miyuancolumns.forEach(groupItem => {
+ if (groupItem.value !== null && wateringItem.apiaryId !== null && groupItem.value == wateringItem.apiaryId) {
+ groupItem.wateringList.push(wateringItem)
+ }
+ })
+ })
+ uni.hideLoading()
+ if(this.total > this.miyuancolumns.length){
+ this.pagesum++
+ }
}
- this.pagesum++
- }
}else{
uni.hideLoading()
}
})
},
- // 请求更多蜂箱列表
- loadMore() {
- if (this.fxlist.length < this.total) {
- this.getlist()
- } else {
- this.$refs.uToast.show({
- title: '没有更多蜂箱了',
- type: 'default',
- position:'bottom'
- })
- }
- },
// 请求蜂箱tab导航栏
getmiyuancolumns() {
let data = {
@@ -303,20 +373,23 @@
if (res.code === 200) {
this.miyuancolumns = res.rows.map(item => ({
value: item.apiaryId,
- label: item.name,
+ name: item.name,
count:item.beehiveCount
}))
- this.miyuancolumns.unshift({ label: '全部',value:'',count:'-1'})
+ this.miyuancolumns.unshift({ name: '全部',value:'',count:'-1'})
+ console.log(this.miyuancolumns);
this.apiaryId = this.miyuancolumns[0].value
- this.logoflag = false
this.getlist()
} else {
- this.logoflag = true
+
}
})
},
swiperchange(e) {
this.curtitidx = e.detail.current
+ this.pagesum = 1
+ this.apiaryId = this.miyuancolumns[this.curtitidx].value
+ this.getlist()
},
// 点击跳转到添加蜂箱页面
addApiary(){
@@ -329,11 +402,20 @@
\ No newline at end of file