开关完善
This commit is contained in:
		
							parent
							
								
									ae1b256a92
								
							
						
					
					
						commit
						b6e0d261cf
					
				|  | @ -21,7 +21,7 @@ const install = (Vue, vm) => { | |||
| 	Vue.prototype.$u.http.setConfig({  | ||||
| 			// baseUrl: 'http://192.168.2.15:10002',
 | ||||
| 			baseUrl: 'https://kg.chuangtewl.com/prod-api', | ||||
| 			// loadingText: '努力加载中~',
 | ||||
| 			// loadingText: '加载中...',
 | ||||
| 			// loadingTime: 1000,
 | ||||
| 			// 设置自定义头部content-type
 | ||||
| 			header: { | ||||
|  |  | |||
|  | @ -698,6 +698,7 @@ | |||
| 									duration: 5000 | ||||
| 								}) | ||||
| 								this.czflag = false | ||||
| 								this.zhifuflag = false | ||||
| 								setTimeout(()=>{ | ||||
| 									uni.hideLoading() | ||||
| 								},5000) | ||||
|  | @ -1035,6 +1036,7 @@ | |||
| 						console.log("1收到设备发来的自定义数据结果:", this.ver_data); | ||||
| 						setTimeout(()=>{ | ||||
| 							this.czflag = false | ||||
| 							this.zhifuflag = false | ||||
| 							uni.hideLoading() | ||||
| 							// uni.showToast({ | ||||
| 							// 	title: '切换成功,请点击支付', | ||||
|  |  | |||
|  | @ -178,7 +178,7 @@ | |||
| 							</view> | ||||
| 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image> | ||||
| 						</view> | ||||
| 						<view class="cont" @click="topage(1)"> | ||||
| 						<!-- <view class="cont" @click="topage(1)"> | ||||
| 							<view class="top"> | ||||
| 								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode="" | ||||
| 									style="width: 44rpx;height: 44rpx;"></image> | ||||
|  | @ -194,7 +194,7 @@ | |||
| 								<view class="bot">充值</view> | ||||
| 							</view> | ||||
| 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image> | ||||
| 						</view> | ||||
| 						</view> --> | ||||
| 					</view> | ||||
| 					<view class=""> | ||||
| 						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)"> | ||||
|  |  | |||
|  | @ -265,7 +265,7 @@ | |||
| 				storeId: '', | ||||
| 				pagenum: 1, | ||||
| 				wateringList: [], | ||||
| 				pagesize: 20, | ||||
| 				pagesize: 999, | ||||
| 				isLoading: false, | ||||
| 				noMoreData: false, | ||||
| 				total: 0, | ||||
|  | @ -790,9 +790,9 @@ | |||
| 					} | ||||
| 				} else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) { | ||||
| 					if (deltaY < 100) { | ||||
| 						// console.log("上滑")   | ||||
| 						console.log("上滑")   | ||||
| 						let sum = this.total / this.pagesize | ||||
| 						// console.log(this.wateringList.length,this.total); | ||||
| 						console.log(this.wateringList.length,this.total); | ||||
| 						if (this.wateringList.length  < this.total) { | ||||
| 							this.getlist()  | ||||
| 						} | ||||
|  | @ -1041,7 +1041,7 @@ | |||
| 			getlist() { | ||||
| 				this.shujuflag = false | ||||
| 				// if (this.storeId == null) { | ||||
| 					this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=asc`).then((res) => { | ||||
| 					this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=desc`).then((res) => { | ||||
| 						if (res.code == 200) { | ||||
| 							this.xiaflag = true | ||||
| 							this.shuaxin = false | ||||
|  | @ -1049,14 +1049,13 @@ | |||
| 							if (res.rows.length > 0) { | ||||
| 								// 有数据,追加到列表   | ||||
| 								this.shujuflag = false | ||||
| 								uni.hideLoading() | ||||
| 							} else { | ||||
| 								// 没有更多数据   | ||||
| 								this.shujuflag = true | ||||
| 								uni.hideLoading() | ||||
| 							} | ||||
| 							if (this.pagenum > 1) { | ||||
| 								this.pagenum++ | ||||
| 								// this.wateringList = [] | ||||
| 								this.wateringList = this.wateringList.concat(res.rows) | ||||
| 								this.shujuflag = false | ||||
|                                 // console.log(this.wateringList); | ||||
|  | @ -1075,6 +1074,7 @@ | |||
| 								        }   | ||||
| 								    })   | ||||
| 								}) | ||||
| 								uni.hideLoading() | ||||
| 							} else { | ||||
| 								this.pagenum++ | ||||
| 								this.wateringList = res.rows   | ||||
|  | @ -1093,11 +1093,13 @@ | |||
| 								    }) | ||||
| 								})    | ||||
| 								// console.log(this.groupLists) | ||||
| 								uni.hideLoading() | ||||
| 							}  | ||||
| 							this.isLoading = false | ||||
| 						} else { | ||||
| 							this.shuaxin = false | ||||
| 							this.xiaflag = true | ||||
| 							uni.hideLoading() | ||||
| 						} | ||||
| 					}) | ||||
| 			}, | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ | |||
| 		}, | ||||
| 		onShareAppMessage: function() { | ||||
| 			return { | ||||
| 				title: '创亿康',  | ||||
| 				title: '创享物联',  | ||||
| 				path: '/pages/index/index' | ||||
| 			} | ||||
| 		}, | ||||
|  | @ -26,7 +26,7 @@ | |||
| 		// 分享到朋友圈   | ||||
| 		onShareTimeline: function() { | ||||
| 			return { | ||||
| 				title: '创亿康', | ||||
| 				title: '创享物联', | ||||
| 				query: '', | ||||
| 				path: '/pages/index/index' | ||||
| 			} | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ | |||
| 		}, | ||||
| 		onShareAppMessage: function() { | ||||
| 			return { | ||||
| 				title: '创亿康',  | ||||
| 				title: '创享物联',  | ||||
| 				path: '/pages/index/index' | ||||
| 			} | ||||
| 		}, | ||||
|  | @ -26,7 +26,7 @@ | |||
| 		// 分享到朋友圈   | ||||
| 		onShareTimeline: function() { | ||||
| 			return { | ||||
| 				title: '创亿康', | ||||
| 				title: '创享物联', | ||||
| 				query: '', | ||||
| 				path: '/pages/index/index' | ||||
| 			} | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user