fix(build): build latest data

build latest data

Signed-off-by: liubaixun <liubaixun@yinxiang.com>

api/nvuerequest.js

@@ -14,8 +14,10 @@ export const myRequest = (options) => {
 			data: options.data || {},
 			success: (res) => {
 					resolve(res.data)
-					
-					if (res.data.code == 401) {
+					if(res.data.code==200){
+						
+					}
+					else if (res.data.code == 401) {
 				
 						uni.reLaunch({
 							url: '/pages/login/login'
@@ -32,6 +34,14 @@ export const myRequest = (options) => {
 							}
 						});
 
+					}else{
+						uni.hideLoading()
+						uni.stopPullDownRefresh();
+						uni.showToast({
+							icon:'none',
+							title: res.data.msg,
+							duration: 2000,
+						})
 					}
 					// 接口成功可以在此写成功需要的步骤
 					if (res.data.code != 1) {

pages.json

@@ -7,7 +7,8 @@
 			"path": "pages/timeEnvironment/timeEnvironment",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		}, {
 			"path": "pages/timeVideo/timeVideo",

pages/fertilizer_machine/fertilizer_machine.vue

@@ -59,12 +59,14 @@
 				</view>
 				<view class="bottom">
 					<view class="btn-1" :class="inputData['30'] == 1 || inputData['30'] == 3 ? 'in' : 'out'">
-						<image v-if="inputData['30'] == 1 || inputData['30'] == 3" src="../../static/in-sel.png" mode=""></image>
+						<image v-if="inputData['30'] == 1 || inputData['30'] == 3" src="../../static/in-sel.png"
+							mode=""></image>
 						<image v-else src="../../static/in.png" mode=""></image>
 						<text>进水泵</text>
 					</view>
 					<view class="btn-2" :class="inputData['30'] == 2 || inputData['30'] == 3 ? 'in' : 'out'">
-						<image v-if="inputData['30'] == 2 || inputData['30'] == 3" src="../../static/out-sel.png" mode=""></image>
+						<image v-if="inputData['30'] == 2 || inputData['30'] == 3" src="../../static/out-sel.png"
+							mode=""></image>
 						<image v-else src="../../static/out.png" mode=""></image>
 						<text>配肥泵</text>
 					</view>
@@ -90,7 +92,8 @@
 				</view>
 			</view>
 
-			<u-popup v-model="show" mode="center" :mask-close-able='false' width="640rpx" height="880rpx" :closeable='false'>
+			<u-popup v-model="show" mode="center" :mask-close-able='false' width="640rpx" height="880rpx"
+				:closeable='false'>
 				<view class="contentPop">
 					<view class="contentPop_box">
 						<view class="title">
@@ -112,7 +115,8 @@
 							手动启动时间
 							<view class="irrigate_input">
 								<input v-model="inputData1[10 + (indexs - 1) + '01']"
-									@blur="changeData10(10 + (indexs - 1) + '01', $event)" type="digit" placeholder="0" step="0.1" />
+									@blur="changeData10(10 + (indexs - 1) + '01', $event)" type="digit" placeholder="0"
+									step="0.1" />
 								<!-- <u-input v-model="inputData[10 + (indexs - 1) + '01']" type="text" :border="false" input-align='center'
 									height='66' :clearable='false' /> -->
 							</view>
@@ -218,46 +222,51 @@
 
 				topActive: 0,
 				indexs: 1,
-				inputData1: []
+				inputData1: [],
+
+				// timer: null
 			};
 		},
 		watch: {
-		
+
 		},
 		onLoad(option) {
 			this.deviceId = option.id
 			this.dataInit()
-      let that = this
-      setInterval(function() {
-        that.dataInit();
-        that.getReg();
-      }, 3000);
+			let that = this
+			// this.timer = setInterval(function() {
+			// 	that.dataInit();
+			// 	that.getReg();
+			// }, 3000);
+		},
+		onUnload() {
+			// clearTimeout(this.timer)
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中...'
+			})
+			this.dataInit();
+			this.getReg();
 		},
-    onPullDownRefresh() {
-        uni.showLoading({
-          title: '加载中...'
-        })
-        this.dataInit();
-        this.getReg();
-    },
 		methods: {
-      toWebView(){
-        uni.navigateTo({
-          url:'/pages/web_view/web_view'
-        })
-      },
-      countData10(data){
-            if(data){
-                return data/10
-            }else{
-                return 0
-            }
-      },
+			toWebView() {
+				uni.navigateTo({
+					url: '/pages/web_view/web_view'
+				})
+			},
+			countData10(data) {
+				if (data) {
+					return data / 10
+				} else {
+					return 0
+				}
+			},
 			dataInit() {
-        // uni.showLoading({
-        //   title: '加载中...'
-        // })
-				const that= this
+				// uni.showLoading({
+				//   title: '加载中...'
+				// })
+				const that = this
 				var deviceId = this.deviceId
 				var data = {
 					"equipmentId": deviceId,
@@ -269,8 +278,8 @@
 					data: data
 				}).then(res => {
 					if (res.code == 200) {
-            uni.hideLoading()
-            uni.stopPullDownRefresh();
+						uni.hideLoading()
+						uni.stopPullDownRefresh();
 						this.inputData = res.data;
 						this.getData30() //数据30/进水出水泵
 						this.getData29() //数据29 启动方式/信号
@@ -278,42 +287,43 @@
 						this.getcenterBottom() //获取电磁阀
 					} else {
 						that.$refs.uToast.show({
-											title: res.msg,
-											type: 'error',
-										})
+							title: res.msg,
+							type: 'error',
+						})
 					}
 				})
 
 
 			},
 			getReg() {
-        // uni.showLoading({
-        //   title: '加载中...'
-        // })
-				const that= this
+				// uni.showLoading({
+				//   title: '加载中...'
+				// })
+				const that = this
 				var data = {
 					equipmentId: this.deviceId,
 					pattern: 10 + (this.indexs - 1) + "00", //需要根据文档填写 //6目标ph-数值
 					regNum: 61,
 				};
-		
+
 				this.$http({
 					url: this.api.readFs_reg,
 					data: data
 				}).then((res) => {
 					console.log(res, 11);
 					if (res.code == 200) {
-            uni.hideLoading()
-            uni.stopPullDownRefresh();
+						uni.hideLoading()
+						uni.stopPullDownRefresh();
 						this.inputData1 = res.data;
 						this.getType00();
-						     this.inputData1[10 + (this.indexs - 1) + '01']=this.countData10(this.inputData1[10 + (this.indexs - 1) + '01'])
-					console.log(this.inputData1[10 + (this.indexs - 1) + '01'],111);
+						this.inputData1[10 + (this.indexs - 1) + '01'] = this.countData10(this.inputData1[10 + (
+							this.indexs - 1) + '01'])
+						console.log(this.inputData1[10 + (this.indexs - 1) + '01'], 111);
 					} else {
 						that.$refs.uToast.show({
-											title: res.msg,
-											type: 'error',
-										})
+							title: res.msg,
+							type: 'error',
+						})
 					}
 				})
 			},
@@ -334,9 +344,9 @@
 				}
 			},
 			change00(index) {
-        uni.showLoading({
-          title: '加载中...'
-        })
+				uni.showLoading({
+					title: '加载中...'
+				})
 				this.topActive = index
 				var list = ["0", "0", "0"];
 				if (index == 1) {
@@ -400,17 +410,17 @@
 				// } else {
 				// 	this.left1Act = 3
 				// }
-        
+
+			},
+			changeData10(code, el) {
+				var data = el.target.value * 10
+				var sendData = {
+					target: {
+						value: data
+					}
+				}
+				this.change(code, sendData)
 			},
-			   changeData10(code,el){
-			          var data=el.target.value*10
-			          var sendData={
-			            target:{
-			              value:data
-			            }
-			          }
-			          this.change(code,sendData)
-			        },
 			//间隔灌溉天数
 			change(code, el) {
 				var data = {
@@ -437,24 +447,24 @@
 				}, 100);
 			},
 			changeData(data) {
-        const that= this
+				const that = this
 				this.$http({
 					url: this.api.writeFs,
 					data: data
 				}).then((res) => {
 					if (res.code == 200) {
-            uni.hideLoading()
+						uni.hideLoading()
 						this.getReg()
-						
+
 						that.$refs.uToast.show({
-											title: res.msg,
-											type: 'success',
-										})
+							title: res.msg,
+							type: 'success',
+						})
 					} else {
-					that.$refs.uToast.show({
-										title: res.msg,
-										type: 'error',
-									})
+						that.$refs.uToast.show({
+							title: res.msg,
+							type: 'error',
+						})
 					}
 				});
 			},
@@ -570,8 +580,8 @@
 			},
 
 			closePop() {
-        this.dataInit();
-        this.getReg();
+				this.dataInit();
+				this.getReg();
 				this.show = false
 			}
 		}
@@ -653,12 +663,12 @@
 
 				.item,
 				.item1 {
-          width: 25%;
+					width: 25%;
 					display: flex;
 					flex-direction: column;
 					align-items: center;
 					justify-content: center;
-          flex-shrink: 0;
+					flex-shrink: 0;
 
 
 					>text:nth-child(2) {
@@ -1023,7 +1033,8 @@
 							border: 2px solid #E1E2E6;
 							border-radius: 10rpx;
 							margin: 0 15rpx;
-							>input{
+
+							>input {
 								width: 100%;
 								height: 100%;
 								text-align: center;

pages/login/login.vue

@@ -85,7 +85,15 @@
 				success: (res) => {
 					// console.log(res,'removeStorage');
 				}
-			})
+			});
+			
+			let HBusername = uni.getStorageSync('HBusername');
+			let HBpassword = uni.getStorageSync('HBpassword');
+			if (HBusername && HBpassword) {
+				this.form.name = HBusername;
+				this.form.password = HBpassword;
+				this.checked = true
+			}
 		},
 		methods: {
 			submit() {
@@ -108,6 +116,14 @@
 									key: 'userid',
 									data: res.data.userid
 								});
+								uni.setStorage({
+									key: 'HBusername',
+									data: this.form.name
+								});
+								uni.setStorage({
+									key: 'HBpassword',
+									data: this.form.password
+								});
 								uni.showToast({
 									icon: 'success',
 									title: '登录成功!',

pages/timeEnvironment/timeEnvironment.vue

@@ -234,7 +234,7 @@
 					{ label: '土壤氮含量', value: 41, countType: 0,unit: 'mg/kg' },
 					{ label: '土壤磷含量', value: 42, countType: 0,unit: 'mg/kg' },
 					{ label: '土壤钾含量', value: 43, countType: 0,unit: 'mg/kg' },
-					{ label: '臭氧', value: 44, countType: 0,unit: 'ppm' },
+					{ label: '管道压力', value: 44, countType: 0,unit: 'Kpa' },
 					{ label: '一氧化碳', value: 45, countType: 0,unit: 'ppm' },
 					{ label: '氨气', value: 46, countType: 0,unit: 'ppm' },
 					{ label: '硫化氢', value: 47, countType: 0,unit: 'ppm' },
@@ -250,10 +250,42 @@
 					{ label: '无线传感器无线信号强度', value: 57, countType: 1,unit: 'dBm' },
 					{ label: '无线传感器信噪比（SNR）', value: 58, countType: 1,unit: 'dB' },
 				],
+			
+				timer:null
 			}
 		},
-		onShow() {
-			
+		onLoad() {
+			let that = this
+			this.timer = setInterval(function() {
+				uni.getStorage({
+					key: 'token',
+					success: function(res) {
+						that.getEquipmentInfo(uni.getStorageSync('userid'))
+					},
+					// fail:function(err){
+					// 	uni.reLaunch({
+					// 		url:'/pages/login/login'
+					// 	})
+					// }
+				})		
+			}, 60000);
+		},
+		onUnload() {
+			clearTimeout(this.timer)
+		},
+		onPullDownRefresh() {
+		    let that = this
+			uni.getStorage({
+				key: 'token',
+				success: function(res) {
+					that.getEquipmentInfo(uni.getStorageSync('userid'))
+				},
+				// fail:function(err){
+				// 	uni.reLaunch({
+				// 		url:'/pages/login/login'
+				// 	})
+				// }
+			})	
 		},
 		mounted() {
 			let that = this
@@ -280,7 +312,7 @@
 					url: this.api.sel_eqbyid + userid,
 					method: 'GET'
 				}).then(res => {
-					console.log(res, '根据用户id查询对应的设备数据');
+					// console.log(res, '根据用户id查询对应的设备数据');
 					if (res.code == 200) {
 						
 						this.waterAndFertilizerParamsList = res.data.map((item,index)=>{
@@ -299,9 +331,14 @@
 									uni.hideLoading({
 										title: '完成'
 									});
+									uni.stopPullDownRefresh();
 									i.childList= res.data;
-									console.log(this.waterAndFertilizerParamsList);
+									// console.log(this.waterAndFertilizerParamsList);
+								}else{
+									
 								}
+							}).catch(err=>{
+								console.log('接口失败');
 							})
 						})
 						

pages/userCenter/userCenter.vue

@@ -112,7 +112,7 @@
 				}).then(res => {
 					console.log(res, '退出');
 					if (res.code == 200) {
-						uni.navigateTo({
+						uni.reLaunch({
 							url: '/pages/login/login'
 						});
 						uni.removeStorage({

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "greenhouse-wisdom-applet",
+  "projectname": "wszhyWx",
   "setting": {
     "compileHotReLoad": true
   }

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -12029,7 +12029,7 @@ var myRequest = function myRequest(options) {
       data: options.data || {},
       success: function success(res) {
         resolve(res.data);
-        if (res.data.code == 401) {
+        if (res.data.code == 200) {} else if (res.data.code == 401) {
           uni.reLaunch({
             url: '/pages/login/login'
           });
@@ -12042,6 +12042,14 @@ var myRequest = function myRequest(options) {
               });
             }
           });
+        } else {
+          uni.hideLoading();
+          uni.stopPullDownRefresh();
+          uni.showToast({
+            icon: 'none',
+            title: res.data.msg,
+            duration: 2000
+          });
         }
         // 接口成功可以在此写成功需要的步骤
         if (res.data.code != 1) {
@@ -21361,7 +21369,8 @@ var _default = {
     "path": "pages/timeEnvironment/timeEnvironment",
     "style": {
       "navigationBarTitleText": "",
-      "navigationStyle": "custom"
+      "navigationStyle": "custom",
+      "enablePullDownRefresh": true
     }
   }, {
     "path": "pages/timeVideo/timeVideo",

unpackage/dist/dev/mp-weixin/pages/fertilizer_machine/fertilizer_machine.js

@@ -360,6 +360,10 @@ var _methods;
 //
 //
 //
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -409,17 +413,23 @@ var _default = {
       topActive: 0,
       indexs: 1,
       inputData1: []
+
+      // timer: null
     };
   },
+
   watch: {},
   onLoad: function onLoad(option) {
     this.deviceId = option.id;
     this.dataInit();
     var that = this;
-    setInterval(function () {
-      that.dataInit();
-      that.getReg();
-    }, 3000);
+    // this.timer = setInterval(function() {
+    // 	that.dataInit();
+    // 	that.getReg();
+    // }, 3000);
+  },
+  onUnload: function onUnload() {
+    // clearTimeout(this.timer)
   },
   onPullDownRefresh: function onPullDownRefresh() {
     uni.showLoading({

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -263,6 +263,13 @@ var _default = {
         // console.log(res,'removeStorage');
       }
     });
+    var HBusername = uni.getStorageSync('HBusername');
+    var HBpassword = uni.getStorageSync('HBpassword');
+    if (HBusername && HBpassword) {
+      this.form.name = HBusername;
+      this.form.password = HBpassword;
+      this.checked = true;
+    }
   },
   methods: {
     submit: function submit() {
@@ -286,6 +293,14 @@ var _default = {
                 key: 'userid',
                 data: res.data.userid
               });
+              uni.setStorage({
+                key: 'HBusername',
+                data: _this.form.name
+              });
+              uni.setStorage({
+                key: 'HBpassword',
+                data: _this.form.password
+              });
               uni.showToast({
                 icon: 'success',
                 title: '登录成功!',

unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.js

@@ -623,10 +623,10 @@ var _default = {
         countType: 0,
         unit: 'mg/kg'
       }, {
-        label: '臭氧',
+        label: '管道压力',
         value: 44,
         countType: 0,
-        unit: 'ppm'
+        unit: 'Kpa'
       }, {
         label: '一氧化碳',
         value: 45,
@@ -697,10 +697,43 @@ var _default = {
         value: 58,
         countType: 1,
         unit: 'dB'
-      }]
+      }],
+      timer: null
     };
   },
-  onShow: function onShow() {},
+  onLoad: function onLoad() {
+    var that = this;
+    this.timer = setInterval(function () {
+      uni.getStorage({
+        key: 'token',
+        success: function success(res) {
+          that.getEquipmentInfo(uni.getStorageSync('userid'));
+        }
+        // fail:function(err){
+        // 	uni.reLaunch({
+        // 		url:'/pages/login/login'
+        // 	})
+        // }
+      });
+    }, 60000);
+  },
+  onUnload: function onUnload() {
+    clearTimeout(this.timer);
+  },
+  onPullDownRefresh: function onPullDownRefresh() {
+    var that = this;
+    uni.getStorage({
+      key: 'token',
+      success: function success(res) {
+        that.getEquipmentInfo(uni.getStorageSync('userid'));
+      }
+      // fail:function(err){
+      // 	uni.reLaunch({
+      // 		url:'/pages/login/login'
+      // 	})
+      // }
+    });
+  },
   mounted: function mounted() {
     var that = this;
     uni.getStorage({
@@ -727,7 +760,7 @@ var _default = {
         url: this.api.sel_eqbyid + userid,
         method: 'GET'
       }).then(function (res) {
-        console.log(res, '根据用户id查询对应的设备数据');
+        // console.log(res, '根据用户id查询对应的设备数据');
         if (res.code == 200) {
           _this.waterAndFertilizerParamsList = res.data.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -744,9 +777,12 @@ var _default = {
                 uni.hideLoading({
                   title: '完成'
                 });
+                uni.stopPullDownRefresh();
                 i.childList = res.data;
-                console.log(_this.waterAndFertilizerParamsList);
-              }
+                // console.log(this.waterAndFertilizerParamsList);
+              } else {}
+            }).catch(function (err) {
+              console.log('接口失败');
             });
           });
         }

unpackage/dist/dev/mp-weixin/pages/timeEnvironment/timeEnvironment.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "",
   "navigationStyle": "custom",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "u-navbar": "/node-modules/uview-ui/components/u-navbar/u-navbar"
   }

unpackage/dist/dev/mp-weixin/pages/userCenter/userCenter.js

@@ -140,7 +140,7 @@ var _default = {
       }).then(function (res) {
         console.log(res, '退出');
         if (res.code == 200) {
-          uni.navigateTo({
+          uni.reLaunch({
             url: '/pages/login/login'
           });
           uni.removeStorage({

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -1,6 +1,6 @@
 {
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "projectname": "greenhouse-wisdom-applet",
+  "projectname": "wszhyWx",
   "setting": {
     "compileHotReLoad": true
   }