Browse Source

日常更新 11/9

zhangyun 4 years ago
parent
commit
b2ca3df3ca
61 changed files with 4989 additions and 5879 deletions
  1. 19 11
      manifest.json
  2. 4 5
      pages.json
  3. 15 14
      pages/cb/bzy/equip-set/bzyhistoryile.vue
  4. 2 0
      pages/cb/cbd/equip-set/historyfile.vue
  5. 8 3
      pages/cb/xy/equip-set/xyhistoryile.vue
  6. 8 3
      pages/cb/xy2.0/historydatas.vue
  7. 2 2
      pages/environment/index.vue
  8. 1 1
      pages/equipList/modification.vue
  9. 2 1
      pages/expertDiagnosis/exchangeShare.vue
  10. 83 31
      pages/expertDiagnosis/particulars.vue
  11. 2 2
      pages/login/login.vue
  12. 9 6
      pages/my/about/about.vue
  13. 2 2
      pages/my/index/index.vue
  14. 10 3
      pages/prevention/ucharts.vue
  15. BIN
      unpackage/cache/apk/__UNI__DBA6730_cm.apk
  16. 1 1
      unpackage/cache/apk/apkurl
  17. 1 1
      unpackage/cache/apk/cmManifestCache.json
  18. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png
  19. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png
  20. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png
  21. BIN
      unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png
  22. 2 2
      unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js
  23. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-service.js
  24. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/app-view.js
  25. 1 1
      unpackage/cache/wgt/__UNI__DBA6730/manifest.json
  26. 2 2
      unpackage/dist/build/app-plus/app-config-service.js
  27. 1 1
      unpackage/dist/build/app-plus/app-service.js
  28. 1 1
      unpackage/dist/build/app-plus/app-view.js
  29. 1 1
      unpackage/dist/build/app-plus/manifest.json
  30. 2 2
      unpackage/dist/dev/app-plus/app-config-service.js
  31. 2594 1241
      unpackage/dist/dev/app-plus/app-service.js
  32. 2212 742
      unpackage/dist/dev/app-plus/app-view.js
  33. 1 1
      unpackage/dist/dev/app-plus/manifest.json
  34. 0 539
      unpackage/dist/dev/app-plus/static/font/demo.css
  35. 0 2534
      unpackage/dist/dev/app-plus/static/font/demo_index.html
  36. 0 1
      unpackage/dist/dev/app-plus/static/font/iconfont.js
  37. 0 723
      unpackage/dist/dev/app-plus/static/font/iconfont.json
  38. BIN
      unpackage/dist/dev/app-plus/static/font/iconfont.ttf
  39. BIN
      unpackage/dist/dev/app-plus/static/font/iconfont.woff
  40. BIN
      unpackage/dist/dev/app-plus/static/font/iconfont.woff2
  41. BIN
      unpackage/release/apk/__UNI__DBA6730__20211102145414.apk
  42. BIN
      unpackage/release/apk/__UNI__DBA6730__20211102145953.apk
  43. BIN
      unpackage/release/apk/__UNI__DBA6730__20211105165140.apk
  44. BIN
      unpackage/res/icons/1024x1024.png
  45. BIN
      unpackage/res/icons/120x120.png
  46. BIN
      unpackage/res/icons/144x144.png
  47. BIN
      unpackage/res/icons/152x152.png
  48. BIN
      unpackage/res/icons/167x167.png
  49. BIN
      unpackage/res/icons/180x180.png
  50. BIN
      unpackage/res/icons/192x192.png
  51. BIN
      unpackage/res/icons/20x20.png
  52. BIN
      unpackage/res/icons/29x29.png
  53. BIN
      unpackage/res/icons/40x40.png
  54. BIN
      unpackage/res/icons/58x58.png
  55. BIN
      unpackage/res/icons/60x60.png
  56. BIN
      unpackage/res/icons/72x72.png
  57. BIN
      unpackage/res/icons/76x76.png
  58. BIN
      unpackage/res/icons/80x80.png
  59. BIN
      unpackage/res/icons/87x87.png
  60. BIN
      unpackage/res/icons/96x96.png
  61. 1 0
      util/api.js

+ 19 - 11
manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智控",
+    "name" : "云飞智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.2.0",
-    "versionCode" : 120,
+    "versionName" : "1.2.2",
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -25,10 +25,11 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Geolocation" : {},
             "Webview-x5" : {},
             "Maps" : {},
-            "VideoPlayer" : {}
+            "VideoPlayer" : {},
+            "LivePusher" : {},
+            "Geolocation" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -69,15 +70,15 @@
             "sdkConfigs" : {
                 "geolocation" : {
                     "amap" : {
-                        "__platform__" : [ "android" ],
-                        "appkey_ios" : "0ff73cb4d88262325eea8c8dad1a6609",
-                        "appkey_android" : "0ff73cb4d88262325eea8c8dad1a6609"
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
+                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
                     }
                 },
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "0ff73cb4d88262325eea8c8dad1a6609",
-                        "appkey_android" : "0ff73cb4d88262325eea8c8dad1a6609"
+                        "appkey_ios" : "25716a10d462140d75820fd9f5b342a5",
+                        "appkey_android" : "25716a10d462140d75820fd9f5b342a5"
                     }
                 },
                 "ad" : {}
@@ -156,7 +157,14 @@
                 }
             }
         },
-        "template" : "static/tempalate.html"
+        "template" : "static/tempalate.html",
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "XGQBZ-MSGW6-KNDSO-MVOIJ-OM6LO-JXBKB"
+                }
+            }
+        }
     }
 }
 // "sdkConfigs" : {

+ 4 - 5
pages.json

@@ -259,7 +259,7 @@
 			"path": "pages/prevention/ucharts",
 			"style": {
 				"navigationBarTitleText": "历史数据",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 
@@ -334,7 +334,6 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
-
 		}, {
 			"path": "pages/cb/cbd/equip-set/statistics",
 			"style": {
@@ -347,7 +346,7 @@
 			"path": "pages/cb/bzy/equip-set/bzyhistoryile",
 			"style": {
 				"navigationBarTitleText": "孢子仪历史记录",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 		},
@@ -362,7 +361,7 @@
 			"path": "pages/cb/xy/equip-set/xyhistoryile",
 			"style": {
 				"navigationBarTitleText": "性诱设备历史记录",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationStyle": "custom"
 			}
 
@@ -432,7 +431,7 @@
 			"path": "pages/cb/xy2.0/historydatas",
 			"style": {
 				"navigationBarTitleText": "历史数据",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 
 		}, {

+ 15 - 14
pages/cb/bzy/equip-set/bzyhistoryile.vue

@@ -39,7 +39,7 @@
 							<td class="td">{{items.d_h_t.ah}}</td>
 							<td class="td">{{items.d_h_t.set_temp}}</td>
 							<td class="td">{{items.d_h_t.pre_temp}}</td>
-							<td class="td">{{items.d_h_t.bat_sta==0?"正常":"欠压"}}</td>
+							<td class="td">{{items.d_h_t.batStatus==0?"正常":"欠压"}}</td>
 							<td class="td">{{items.d_h_t.rps==0?"正常":"雨控"}}</td>
 							<td class="td">{{items.d_h_t.usb_sta==0?"正常":"异常"}}</td>
 							<td class="td">{{items.d_h_t.csq}}</td>
@@ -87,10 +87,8 @@
 				page: 1,
 				pagesum: 1,
 				historylistdata: [],
-				thdata: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓温度设定温度(°C)", "保温仓温度当前温度(°C)", "电池状态", "雨控状态", "摄像头状态",
-					"信号强度",
-					"电流(mA)",
-					"电压(V)", "设备版本"
+				thdata: ["上报时间", "设备开关", "环境温度(°C)", "环境湿度(%)", "保温仓设定温度(°C)", "保温仓当前温度(°C)", "电池状态", "雨控状态", "摄像头状态",
+					"信号强度", "电流(mA)", "电压(V)", "设备版本"
 				],
 				forbidden: false,
 				canvastishiTF: false, //暂无数据提示
@@ -155,7 +153,7 @@
 				}
 			},
 			//forecast.worm_lamp.device_history_data历史数据列表
-			async historylist() { //获取图片列表
+			async historylist() { 
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=forecast.worm_lamp.device_history_data',
 					data: {
@@ -285,9 +283,6 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
 				} else {
 					uni.showToast({
 						title: '刷新失败',
@@ -313,6 +308,16 @@
 				this.history()
 				this.historylist()
 			}, 1000)
+		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.this.historydatas = []
+			this.this.historylistdata = []
+			this.history()
+			this.historylist()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		}
 	}
 </script>
@@ -421,17 +426,13 @@
 				.td {
 					display: inline-block;
 					padding: 5rpx;
-					width: 240rpx;
+					width: 300rpx;
 					text-align: center;
 					height: 52rpx;
 					line-height: 52rpx;
 					border: 2rpx solid #F1F1F1;
 				}
 
-				.th {
-					height: 100rpx;
-				}
-
 				.th:first-child,
 				.td:first-child {
 					width: 300rpx;

+ 2 - 0
pages/cb/cbd/equip-set/historyfile.vue

@@ -315,6 +315,8 @@
 			this.historylist()
 		},
 		onPullDownRefresh() {
+			this.historydatas = []
+			this.historylistdata = []
 			this.history()
 			this.historylist()
 			setTimeout(() => {

+ 8 - 3
pages/cb/xy/equip-set/xyhistoryile.vue

@@ -323,9 +323,6 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
 				} else {
 					uni.showToast({
 						title: '刷新失败',
@@ -351,6 +348,14 @@
 				this.history()
 				this.historylist()
 			}, 1000)
+		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.history()
+			this.historylist()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		}
 	}
 </script>

+ 8 - 3
pages/cb/xy2.0/historydatas.vue

@@ -161,9 +161,6 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
 				} else {
 					uni.showToast({
 						title: '刷新失败',
@@ -296,6 +293,14 @@
 			// this.history()
 			this.Chistory()
 			this.historylist()
+		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.Chistory()
+			this.historylist()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
 		}
 	}
 </script>

+ 2 - 2
pages/environment/index.vue

@@ -29,7 +29,7 @@
 							:src="item.is_online==1?'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png':'http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/7.png'"
 							mode="" class="prevents_item_img"></image>
 						<view class="prevents_item_top">
-							<p>设备名称:{{item.equip_name==""?"无":item.equip_name}}</p>
+							<p>设备名称:{{item.equip_name==""?"环境监测":item.equip_name}}</p>
 							<p :class="item.is_online==1?'green':'red'" v-text="item.is_online==1?'在线':'离线'"></p>
 						</view>
 						<view class="prevents_item_bot">
@@ -42,7 +42,7 @@
 							src="http://www.hnyfwlw.com:8006/bigdata_app/image/prevention/6.png"
 							mode="" class="prevents_item_img"></image>
 						<view class="prevents_item_top">
-							<p>设备名称:{{item.device_name==""?"无":item.device_name}}</p>
+							<p>设备名称:{{item.device_name==""?"管式墒情":item.device_name}}</p>
 						</view>
 						<view class="prevents_item_bot">
 							<p>设备 ID:{{item.device_id}}</p>

+ 1 - 1
pages/equipList/modification.vue

@@ -149,7 +149,7 @@
 				uni.request({
 					type: "GET",
 					url: "https://restapi.amap.com/v3/geocode/regeo?output=JSON&location=" + lng + "," + lat +
-						"&key=27273b81090f78759e4057f94474516f&radius=1000&extensions=all",
+						"&key=78ce288400f4fc6d9458989875c833c2&radius=1000&extensions=all",
 					dataType: "json",
 					complete: ress => {
 						// console.log(ress)

+ 2 - 1
pages/expertDiagnosis/exchangeShare.vue

@@ -95,7 +95,7 @@
 			},
 			particulars(items) { //详情页
 				uni.navigateTo({
-					url: "particulars?items=" + JSON.stringify(items)
+					url: "particulars?items=" + items.id
 				})
 			},
 			postmessage() { //发帖
@@ -233,6 +233,7 @@
 				}
 				.invitations_item_right_contert {
 					width: 100%;
+					height: 40px;
 					margin: 10rpx 0;
 					overflow: hidden;
 					-webkit-line-clamp: 2;

+ 83 - 31
pages/expertDiagnosis/particulars.vue

@@ -1,20 +1,25 @@
 <template>
 	<view>
 		<view class="status_bar"></view>
-		<view style="position: fixed;top: 44px;">
+		<view style="position: fixed;top: 44px;background-color: #fff;z-index: 99;">
 			<uni-nav-bar @clickLeft="clickLeft" left-icon="back" left-text="返回" title="详情"></uni-nav-bar>
-			<!-- <u-swiper :list="list" height="428" @click="examine(list)"></u-swiper> -->
+		</view>
+		<view style="position: relative;top: 90px;">
 			<view class="partitlteimg">
-				<image :src="list" mode="" class="" @click="examine(list)"></image>
+				<!-- <image :src="list" mode="" class="" @click="examine(list)"></image> -->
+				<u-swiper :list="list" height='428' @click="examine(list)"></u-swiper>
 			</view>
 			<view class="quiz">
 				<view class="quiz_username">
-					<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'" mode="" v-if="Number(quizdata.heat)==1"></image>
+					<image
+						:src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/expertDiagnosis/6940a11a251770f1b0d8b7b10ebdf9b.png'"
+						mode="" v-if="Number(quizdata.heat)==1"></image>
 					<span>{{quizdata.title}}</span>
 				</view>
 				<view class="quiz_usertime">
 					<view style="display: flex;align-items: center;">
-						<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/fourMoodBase/touxiang.png'" mode=""></image>
+						<image :src="quizdata.image?quizdata.image:'http://www.hnyfwlw.com:8006/bigdata_app/image/fourMoodBase/touxiang.png'"
+							mode=""></image>
 						<span>{{quizdata.username}}</span>
 					</view>
 					<view>
@@ -44,10 +49,10 @@
 				</scroll-view>
 			</view>
 		</view>
-		<view class="issue_box" :style="{position: 'absolute',bottom: height+'px'}">
+		<view class="issue_box" :style="{position: 'fixed',bottom: height+'px'}">
 			<view class="issue">
-				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false' @blur="blur"
-				 @confirm="confirm" />
+				<input type="text" v-model="issuedata" @focus="focus" :auto-blur="true" :adjust-position='false'
+					@blur="blur" @confirm="confirm" />
 				<p @click="issue">发布</p>
 			</view>
 		</view>
@@ -58,7 +63,7 @@
 	export default {
 		data() {
 			return {
-				list: "",
+				list: [],
 				quizdata: {},
 				commentdata: [],
 				issuedata: '',
@@ -68,7 +73,7 @@
 			}
 		},
 		methods: { //
-			async getParticulars(datas) {//获取评论列表
+			async getParticulars(datas) { //获取评论列表
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
 					data: {
@@ -80,7 +85,7 @@
 				this.commentdata = this.commentdata.concat(res.data)
 				console.log(res.data)
 			},
-			async getDiscuss(data) {//发布评论
+			async getDiscuss(data) { //发布评论
 				const res = await this.$myRequest({
 					url: '/api/api_gateway?method=pest.pests.pests_new_idea',
 					data: {
@@ -88,7 +93,7 @@
 						content: data.content,
 					}
 				})
-				if(res.code==200){
+				if (res.code == 200) {
 					this.commentdata = []
 					this.page = 1
 					this.getParticulars(this.quizdata.lower)
@@ -122,27 +127,62 @@
 				this.page++
 				this.getParticulars(this.quizdata.lower)
 			},
-			examine(list){
+			examine(list) {
 				console.log(list)
-				var imgarr =[]
-				// for(var i=0;i<list.length;i++){
-					imgarr.unshift(list)
-				// }
+				var imgarr = []
+				for(var i=0;i<list.length;i++){
+					imgarr.unshift(list[0].image)
+				}
 				console.log(imgarr)
 				uni.previewImage({
 					urls: imgarr
 				});
+			},
+			async getInvitation(id) { //获取点击的帖子详细内容
+				const res = await this.$myRequest({
+					url: '/api/api_gateway?method=pest.pests.pests_answers_list',
+					data: {
+						d_id: id,
+						page: this.page,
+						page_size: 10
+					}
+				})
+				console.log(res)
+				this.quizdata = res.data[0]
+				console.log(this.quizdata)
+				var index2 = this.quizdata.content.indexOf('http')
+				this.recursion(index2)
+				if(!(index2+1)){
+					var obj = {
+						image: this.quizdata.img_urls
+					}
+					this.list.push(obj)
+				}
+				// if (this.quizdata.image == '' || this.quizdata.image == null) {
+				// 	this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
+				// } else {
+				// 	this.list = this.quizdata.image
+				// }
+				this.getParticulars(this.quizdata.lower)
+			},
+			recursion(index) {
+				if (index + 1) {
+					var src = this.quizdata.content.slice(index, this.quizdata.content.indexOf('"', index))
+					var length = src.length
+					var obj = {
+						image: src
+					}
+					this.list.push(obj)
+					console.log(src)
+					var index3 = this.quizdata.content.indexOf('http', index + length)
+					console.log(index3)
+					this.recursion(index3)
+				}
 			}
 		},
 		onLoad(option) {
-			this.quizdata = JSON.parse(option.items)
-			console.log(this.quizdata.lower)
-			if (this.quizdata.img_urls == '' || this.quizdata.img_urls == null) {
-				this.list = 'http://www.hnyfwlw.com:8006/projectimg' + this.defaultimg
-			} else {
-				this.list = this.quizdata.img_urls
-			}
-			this.getParticulars(this.quizdata.lower)
+			console.log(option.items)
+			this.getInvitation(option.items)
 		}
 	}
 </script>
@@ -151,20 +191,26 @@
 	// 	width: 95%;
 	// 	margin: 20rpx auto;
 	// }
-	.partitlteimg{
+	.partitlteimg {
 		width: 95%;
-		margin: 0 auto;
+		margin: 0 auto 20rpx;
 		height: 428rpx;
-		image{
-			width: 100%;
-			height: 100%;
+		image {
+			max-width: 100%;
+			max-height: 100%;
 		}
 	}
+
 	.quiz {
 		width: 95%;
 		margin: 20rpx auto;
 		border-bottom: 4rpx dashed #E8E8E8;
-
+		.quiz_title{
+			width: 100%;
+			font-size: 36rpx;
+			font-weight: 700;
+			text-align: center;
+		}
 		.quiz_username {
 			width: 100%;
 
@@ -191,6 +237,7 @@
 				width: 50rpx;
 				height: 50rpx;
 				margin-right: 20rpx;
+				border-radius: 50%;
 			}
 
 			span {
@@ -203,6 +250,10 @@
 		.quiz_usercontert {
 			padding: 20rpx;
 			margin-bottom: 20rpx;
+			/deep/img{
+				width: 0 !important;
+				height: 0 !important;
+			}
 		}
 	}
 
@@ -217,6 +268,7 @@
 
 		.scroll-view_H {
 			height: 600rpx;
+			padding-bottom: 100rpx;
 		}
 
 		.comment_unit {

+ 2 - 2
pages/login/login.vue

@@ -205,8 +205,8 @@
 			upgrade() {
 				console.log(this.appName)
 				// var url = this.value + "/app_file/" + this.appName
-				var appName = "big_data2"//中性
-				// var appName = "big_data"//云飞
+				// var appName = "big_data2"//中性
+				var appName = "big_data"//云飞
 				var url = "http://hnyfwlw.com/app/"+appName+".apk"
 				const downloadTask = uni.downloadFile({
 					url: url, //仅为示例,并非真实的资源

+ 9 - 6
pages/my/about/about.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<!-- <view class="line"></view>
+		<view class="line"></view>
 		<view class="logo-box">
 			<image :src="'http://www.hnyfwlw.com:8006/bigdata_app'+'/image/c9b4eb88c03b2f7460e8479e80f40fc.png'" mode="widthFix"></image>
 			<view class="version">
@@ -8,6 +8,9 @@
 					云飞物联网
 				</view>
 				<view>
+					当前版本号
+				</view>
+				<view>
 					V{{id}}
 				</view>
 			</view>
@@ -40,7 +43,7 @@
 				<text class="tit">公司邮箱</text>
 				<text class="val">hnyf826@163.com</text>
 			</view>
-		</view> -->
+		</view>
 		<view class="line"></view>
 		<view class="part">
 			<view class="info-item" @click="renewal">
@@ -55,7 +58,7 @@
 				<text class="tit">更新记录</text>
 				<u-icon name="arrow-right"></u-icon>
 			</view>
-		</view><!-- 
+		</view>
 		<view class="bottom">
 			©河南云飞科技发展有限公司
 		</view>
@@ -63,7 +66,7 @@
 			<view class="upgradeBox">
 				<u-line-progress v-show="isShow" active-color="#19be6b" :striped="true" :percent="percentNum" :striped-active="true"></u-line-progress>
 			</view>
-		</u-modal> -->
+		</u-modal>
 	</view>
 </template>
 
@@ -143,9 +146,9 @@
 				// console.log(this.appName)
 				// ---------------------------------------------------------------------------------------------------------------------------
 				//中性版
-				this.appName = "big_data2"
+				// this.appName = "big_data2"
 				//标准版
-				// this.appName = "big_data"
+				this.appName = "big_data"
 				var url = "http://hnyfwlw.com/app/" + this.appName + ".apk"
 				console.log(url)
 				const downloadTask = uni.downloadFile({

+ 2 - 2
pages/my/index/index.vue

@@ -19,8 +19,8 @@
 			<view style="background-color: #FFFFFF;margin: 20rpx auto 0;">
 				<view class="AboutUs" @click="about">
 					<u-icon name="pingtai" custom-prefix="custom-icon" class="icon_left"></u-icon>
-					<!-- 关于我们 -->
-					关于更新
+					关于我们
+					<!-- 关于更新 -->
 					<p class="update" v-if="updateTF">NEW</p>
 					<uni-icons type="arrowright" class="icon_right"></uni-icons>
 				</view>

+ 10 - 3
pages/prevention/ucharts.vue

@@ -144,6 +144,16 @@
 					1000))
 			}, 1000)
 		},
+		onPullDownRefresh() {
+			console.log('refresh');
+			this.getServerData(parseInt(presenttime / 1000), parseInt((presenttime - 24 * 60 * 60 * 1000) /
+				1000))
+			this.historydata(parseInt(presenttime / 1000), parseInt((presenttime - 24 * 60 * 60 * 1000) /
+				1000))
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 		methods: { // 
 			//forecast.worm_lamp.device_polyline_data
 			// 获取数据,发请求
@@ -407,9 +417,6 @@
 						duration: 2000,
 						icon: "none"
 					});
-					uni.navigateBack({
-						delta: 1
-					})
 				} else {
 					uni.showToast({
 						title: '刷新失败',

BIN
unpackage/cache/apk/__UNI__DBA6730_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/5ed1b0a0-21c8-11ec-a3bc-d5e290b6a1fd
+https://ide.dcloud.net.cn/build/download/97fae360-3e15-11ec-87f5-9fcf1ac36b5e

File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/apk/cmManifestCache.json


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-hdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxhdpi.png


BIN
unpackage/cache/wgt/__UNI__DBA6730/.manifest/icon-android-xxxhdpi.png


File diff suppressed because it is too large
+ 2 - 2
unpackage/cache/wgt/__UNI__DBA6730/app-config-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/cache/wgt/__UNI__DBA6730/manifest.json


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/build/app-plus/manifest.json


File diff suppressed because it is too large
+ 2 - 2
unpackage/dist/dev/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 2594 - 1241
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 2212 - 742
unpackage/dist/dev/app-plus/app-view.js


File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/app-plus/manifest.json


+ 0 - 539
unpackage/dist/dev/app-plus/static/font/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时,垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

File diff suppressed because it is too large
+ 0 - 2534
unpackage/dist/dev/app-plus/static/font/demo_index.html


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/dev/app-plus/static/font/iconfont.js


+ 0 - 723
unpackage/dist/dev/app-plus/static/font/iconfont.json

@@ -1,723 +0,0 @@
-{
-  "id": "1738837",
-  "name": "农业大数据",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "5930359",
-      "name": "温室、大棚",
-      "font_class": "wenshidapeng",
-      "unicode": "e665",
-      "unicode_decimal": 58981
-    },
-    {
-      "icon_id": "7562587",
-      "name": "出苗期",
-      "font_class": "chumiaoqi",
-      "unicode": "e62d",
-      "unicode_decimal": 58925
-    },
-    {
-      "icon_id": "18454498",
-      "name": "发票",
-      "font_class": "fapiao",
-      "unicode": "e6b6",
-      "unicode_decimal": 59062
-    },
-    {
-      "icon_id": "18555671",
-      "name": "监测",
-      "font_class": "jiance",
-      "unicode": "e6c3",
-      "unicode_decimal": 59075
-    },
-    {
-      "icon_id": "18735854",
-      "name": "实名",
-      "font_class": "shiming",
-      "unicode": "e6d3",
-      "unicode_decimal": 59091
-    },
-    {
-      "icon_id": "18736333",
-      "name": "大屏",
-      "font_class": "daping",
-      "unicode": "e6d8",
-      "unicode_decimal": 59096
-    },
-    {
-      "icon_id": "18772645",
-      "name": "水质",
-      "font_class": "shuizhi",
-      "unicode": "e6dc",
-      "unicode_decimal": 59100
-    },
-    {
-      "icon_id": "18928418",
-      "name": "数据监控",
-      "font_class": "shujujiankong",
-      "unicode": "e62a",
-      "unicode_decimal": 58922
-    },
-    {
-      "icon_id": "18930973",
-      "name": "电脑",
-      "font_class": "diannao2",
-      "unicode": "e64a",
-      "unicode_decimal": 58954
-    },
-    {
-      "icon_id": "12550616",
-      "name": "箭头",
-      "font_class": "jiantou",
-      "unicode": "e639",
-      "unicode_decimal": 58937
-    },
-    {
-      "icon_id": "7045043",
-      "name": "水泵",
-      "font_class": "shuibeng",
-      "unicode": "e627",
-      "unicode_decimal": 58919
-    },
-    {
-      "icon_id": "8453443",
-      "name": "水量",
-      "font_class": "shuiliang",
-      "unicode": "e692",
-      "unicode_decimal": 59026
-    },
-    {
-      "icon_id": "9962819",
-      "name": "小麦经验灌溉参数",
-      "font_class": "xiaomaijingyanguangaicanshu",
-      "unicode": "e630",
-      "unicode_decimal": 58928
-    },
-    {
-      "icon_id": "2077541",
-      "name": "刷新",
-      "font_class": "shuaxin",
-      "unicode": "e63d",
-      "unicode_decimal": 58941
-    },
-    {
-      "icon_id": "11647823",
-      "name": "多层土壤墒情",
-      "font_class": "duocengturangshangqing",
-      "unicode": "eb61",
-      "unicode_decimal": 60257
-    },
-    {
-      "icon_id": "7335483",
-      "name": "土壤湿度",
-      "font_class": "turangshidu",
-      "unicode": "eb26",
-      "unicode_decimal": 60198
-    },
-    {
-      "icon_id": "7335487",
-      "name": "土壤温度",
-      "font_class": "turangwendu",
-      "unicode": "eb23",
-      "unicode_decimal": 60195
-    },
-    {
-      "icon_id": "7335491",
-      "name": "大气压力",
-      "font_class": "daqiyali",
-      "unicode": "eb27",
-      "unicode_decimal": 60199
-    },
-    {
-      "icon_id": "7335583",
-      "name": "空气温度",
-      "font_class": "kongqiwendu",
-      "unicode": "eb3a",
-      "unicode_decimal": 60218
-    },
-    {
-      "icon_id": "7335588",
-      "name": "空气湿度",
-      "font_class": "kongqishidu",
-      "unicode": "eb3b",
-      "unicode_decimal": 60219
-    },
-    {
-      "icon_id": "17814534",
-      "name": "充值",
-      "font_class": "chongzhi1",
-      "unicode": "e604",
-      "unicode_decimal": 58884
-    },
-    {
-      "icon_id": "867786",
-      "name": "对勾",
-      "font_class": "duigou",
-      "unicode": "e712",
-      "unicode_decimal": 59154
-    },
-    {
-      "icon_id": "16480871",
-      "name": "灯泡",
-      "font_class": "dengpao",
-      "unicode": "e69e",
-      "unicode_decimal": 59038
-    },
-    {
-      "icon_id": "18928449",
-      "name": "平台",
-      "font_class": "pingtai",
-      "unicode": "e628",
-      "unicode_decimal": 58920
-    },
-    {
-      "icon_id": "18931223",
-      "name": "设置",
-      "font_class": "shezhi",
-      "unicode": "e679",
-      "unicode_decimal": 59001
-    },
-    {
-      "icon_id": "18931269",
-      "name": "首页",
-      "font_class": "shouye1",
-      "unicode": "e684",
-      "unicode_decimal": 59012
-    },
-    {
-      "icon_id": "18438522",
-      "name": "财务管理",
-      "font_class": "caiwuguanli",
-      "unicode": "e6b0",
-      "unicode_decimal": 59056
-    },
-    {
-      "icon_id": "18928432",
-      "name": "二维码",
-      "font_class": "erweima",
-      "unicode": "e626",
-      "unicode_decimal": 58918
-    },
-    {
-      "icon_id": "21273716",
-      "name": "cell-phone",
-      "font_class": "cell-phone",
-      "unicode": "e624",
-      "unicode_decimal": 58916
-    },
-    {
-      "icon_id": "5064096",
-      "name": "统计",
-      "font_class": "tongji2",
-      "unicode": "e646",
-      "unicode_decimal": 58950
-    },
-    {
-      "icon_id": "9241144",
-      "name": "手写签批",
-      "font_class": "iconzhengli_shouxieqianpi",
-      "unicode": "e648",
-      "unicode_decimal": 58952
-    },
-    {
-      "icon_id": "13173807",
-      "name": "识别",
-      "font_class": "shibie",
-      "unicode": "e603",
-      "unicode_decimal": 58883
-    },
-    {
-      "icon_id": "15726936",
-      "name": "统计",
-      "font_class": "tongji1",
-      "unicode": "e642",
-      "unicode_decimal": 58946
-    },
-    {
-      "icon_id": "20082758",
-      "name": "可视化大屏",
-      "font_class": "keshihuadaping",
-      "unicode": "e61c",
-      "unicode_decimal": 58908
-    },
-    {
-      "icon_id": "20082759",
-      "name": "退出关闭",
-      "font_class": "tuichuguanbi",
-      "unicode": "e61d",
-      "unicode_decimal": 58909
-    },
-    {
-      "icon_id": "20082258",
-      "name": "照片查看",
-      "font_class": "zhaopianchakan",
-      "unicode": "e61b",
-      "unicode_decimal": 58907
-    },
-    {
-      "icon_id": "20081037",
-      "name": "图标任务",
-      "font_class": "tubiaorenwu",
-      "unicode": "e61a",
-      "unicode_decimal": 58906
-    },
-    {
-      "icon_id": "19799572",
-      "name": "定位",
-      "font_class": "dingwei1",
-      "unicode": "e619",
-      "unicode_decimal": 58905
-    },
-    {
-      "icon_id": "19798147",
-      "name": "基地管理",
-      "font_class": "jidiguanli",
-      "unicode": "e618",
-      "unicode_decimal": 58904
-    },
-    {
-      "icon_id": "19798145",
-      "name": "基地面积",
-      "font_class": "jidimianji",
-      "unicode": "e617",
-      "unicode_decimal": 58903
-    },
-    {
-      "icon_id": "19798140",
-      "name": "建立时间",
-      "font_class": "jianlishijian",
-      "unicode": "e60d",
-      "unicode_decimal": 58893
-    },
-    {
-      "icon_id": "17654821",
-      "name": "录像",
-      "font_class": "luxiang",
-      "unicode": "e637",
-      "unicode_decimal": 58935
-    },
-    {
-      "icon_id": "774444",
-      "name": "扳手",
-      "font_class": "banshou",
-      "unicode": "e65c",
-      "unicode_decimal": 58972
-    },
-    {
-      "icon_id": "7335485",
-      "name": "地块",
-      "font_class": "chandi",
-      "unicode": "eb24",
-      "unicode_decimal": 60196
-    },
-    {
-      "icon_id": "7335489",
-      "name": "基础",
-      "font_class": "jichu",
-      "unicode": "eb25",
-      "unicode_decimal": 60197
-    },
-    {
-      "icon_id": "7335622",
-      "name": "迟到",
-      "font_class": "chidao",
-      "unicode": "eb44",
-      "unicode_decimal": 60228
-    },
-    {
-      "icon_id": "1391282",
-      "name": "日历",
-      "font_class": "rili",
-      "unicode": "e609",
-      "unicode_decimal": 58889
-    },
-    {
-      "icon_id": "5204808",
-      "name": "分类",
-      "font_class": "fenlei",
-      "unicode": "e616",
-      "unicode_decimal": 58902
-    },
-    {
-      "icon_id": "2678622",
-      "name": "全屏",
-      "font_class": "quanping",
-      "unicode": "e656",
-      "unicode_decimal": 58966
-    },
-    {
-      "icon_id": "772252",
-      "name": "扫描 识别 380%",
-      "font_class": "saomiaoshibie380",
-      "unicode": "e686",
-      "unicode_decimal": 59014
-    },
-    {
-      "icon_id": "11893490",
-      "name": "添加",
-      "font_class": "tianjia",
-      "unicode": "e615",
-      "unicode_decimal": 58901
-    },
-    {
-      "icon_id": "16364328",
-      "name": "统计",
-      "font_class": "tongji",
-      "unicode": "e636",
-      "unicode_decimal": 58934
-    },
-    {
-      "icon_id": "17709313",
-      "name": "未命名 -34",
-      "font_class": "weimingming-34",
-      "unicode": "e60b",
-      "unicode_decimal": 58891
-    },
-    {
-      "icon_id": "5327411",
-      "name": "臭虫bug",
-      "font_class": "chouchongbug",
-      "unicode": "e6e1",
-      "unicode_decimal": 59105
-    },
-    {
-      "icon_id": "802969",
-      "name": "楼房",
-      "font_class": "loufang",
-      "unicode": "e64f",
-      "unicode_decimal": 58959
-    },
-    {
-      "icon_id": "4348068",
-      "name": "电脑",
-      "font_class": "diannao1",
-      "unicode": "e623",
-      "unicode_decimal": 58915
-    },
-    {
-      "icon_id": "8835594",
-      "name": "图片",
-      "font_class": "tupian-xianxing",
-      "unicode": "e635",
-      "unicode_decimal": 58933
-    },
-    {
-      "icon_id": "10392628",
-      "name": "详情-",
-      "font_class": "xiangqing-",
-      "unicode": "e608",
-      "unicode_decimal": 58888
-    },
-    {
-      "icon_id": "36107",
-      "name": "面积",
-      "font_class": "mianji",
-      "unicode": "e602",
-      "unicode_decimal": 58882
-    },
-    {
-      "icon_id": "883904",
-      "name": "电话 (2)",
-      "font_class": "dianhua2",
-      "unicode": "e611",
-      "unicode_decimal": 58897
-    },
-    {
-      "icon_id": "1183130",
-      "name": "定位",
-      "font_class": "dingwei",
-      "unicode": "e675",
-      "unicode_decimal": 58997
-    },
-    {
-      "icon_id": "6129144",
-      "name": "102绑定",
-      "font_class": "bangding",
-      "unicode": "e784",
-      "unicode_decimal": 59268
-    },
-    {
-      "icon_id": "6970030",
-      "name": "用户",
-      "font_class": "yonghu11",
-      "unicode": "e705",
-      "unicode_decimal": 59141
-    },
-    {
-      "icon_id": "1106935",
-      "name": "雨",
-      "font_class": "yu",
-      "unicode": "e63a",
-      "unicode_decimal": 58938
-    },
-    {
-      "icon_id": "2155826",
-      "name": "温度",
-      "font_class": "thermometer_icon",
-      "unicode": "e67a",
-      "unicode_decimal": 59002
-    },
-    {
-      "icon_id": "4236632",
-      "name": "湿度",
-      "font_class": "shidu",
-      "unicode": "e60a",
-      "unicode_decimal": 58890
-    },
-    {
-      "icon_id": "7983631",
-      "name": "摄像头",
-      "font_class": "xingzhuang",
-      "unicode": "e614",
-      "unicode_decimal": 58900
-    },
-    {
-      "icon_id": "13638685",
-      "name": "电",
-      "font_class": "dian",
-      "unicode": "e655",
-      "unicode_decimal": 58965
-    },
-    {
-      "icon_id": "13638743",
-      "name": "温度",
-      "font_class": "wendu",
-      "unicode": "e660",
-      "unicode_decimal": 58976
-    },
-    {
-      "icon_id": "14095260",
-      "name": "定时",
-      "font_class": "dingshi",
-      "unicode": "e77e",
-      "unicode_decimal": 59262
-    },
-    {
-      "icon_id": "397065",
-      "name": "诱虫灯",
-      "font_class": "fangzhi",
-      "unicode": "e75c",
-      "unicode_decimal": 59228
-    },
-    {
-      "icon_id": "519489",
-      "name": "首页",
-      "font_class": "shouye",
-      "unicode": "e61e",
-      "unicode_decimal": 58910
-    },
-    {
-      "icon_id": "552767",
-      "name": "农药化肥",
-      "font_class": "nongchangguanli",
-      "unicode": "e62c",
-      "unicode_decimal": 58924
-    },
-    {
-      "icon_id": "689284",
-      "name": "设置 设定 配置 扳手",
-      "font_class": "shouhou",
-      "unicode": "e80e",
-      "unicode_decimal": 59406
-    },
-    {
-      "icon_id": "1119123",
-      "name": "系统",
-      "font_class": "xitong",
-      "unicode": "e60f",
-      "unicode_decimal": 58895
-    },
-    {
-      "icon_id": "1320048",
-      "name": "数据统计",
-      "font_class": "shujuzhanshi",
-      "unicode": "e621",
-      "unicode_decimal": 58913
-    },
-    {
-      "icon_id": "3483768",
-      "name": "地址",
-      "font_class": "jidi",
-      "unicode": "e672",
-      "unicode_decimal": 58994
-    },
-    {
-      "icon_id": "6756289",
-      "name": "专家",
-      "font_class": "zhuanjia",
-      "unicode": "e607",
-      "unicode_decimal": 58887
-    },
-    {
-      "icon_id": "7562834",
-      "name": "农事行为",
-      "font_class": "nongshiguanli",
-      "unicode": "e60c",
-      "unicode_decimal": 58892
-    },
-    {
-      "icon_id": "10544904",
-      "name": "多云转晴",
-      "font_class": "huanjingjiance",
-      "unicode": "e610",
-      "unicode_decimal": 58896
-    },
-    {
-      "icon_id": "13190141",
-      "name": "设备",
-      "font_class": "shebei",
-      "unicode": "e622",
-      "unicode_decimal": 58914
-    },
-    {
-      "icon_id": "13837385",
-      "name": "虫情监测 - 简",
-      "font_class": "cebaoguanli",
-      "unicode": "e776",
-      "unicode_decimal": 59254
-    },
-    {
-      "icon_id": "15282842",
-      "name": "树苗",
-      "font_class": "suyuan",
-      "unicode": "e6e8",
-      "unicode_decimal": 59112
-    },
-    {
-      "icon_id": "15631425",
-      "name": "监控",
-      "font_class": "jiankong",
-      "unicode": "e629",
-      "unicode_decimal": 58921
-    },
-    {
-      "icon_id": "992522",
-      "name": "信息",
-      "font_class": "xinxi1",
-      "unicode": "e64b",
-      "unicode_decimal": 58955
-    },
-    {
-      "icon_id": "1135940",
-      "name": "用户",
-      "font_class": "yonghu1",
-      "unicode": "e612",
-      "unicode_decimal": 58898
-    },
-    {
-      "icon_id": "7501066",
-      "name": "密码",
-      "font_class": "mima1",
-      "unicode": "e620",
-      "unicode_decimal": 58912
-    },
-    {
-      "icon_id": "715831",
-      "name": "电脑",
-      "font_class": "diannao",
-      "unicode": "e605",
-      "unicode_decimal": 58885
-    },
-    {
-      "icon_id": "4186778",
-      "name": "标签",
-      "font_class": "biaoqian",
-      "unicode": "e634",
-      "unicode_decimal": 58932
-    },
-    {
-      "icon_id": "6682541",
-      "name": "地址",
-      "font_class": "dizhi",
-      "unicode": "e606",
-      "unicode_decimal": 58886
-    },
-    {
-      "icon_id": "7404314",
-      "name": "时间",
-      "font_class": "shijian",
-      "unicode": "e77c",
-      "unicode_decimal": 59260
-    },
-    {
-      "icon_id": "8094230",
-      "name": "页面操作",
-      "font_class": "yemiancaozuo",
-      "unicode": "e64e",
-      "unicode_decimal": 58958
-    },
-    {
-      "icon_id": "10995780",
-      "name": "用户",
-      "font_class": "yonghu",
-      "unicode": "e60e",
-      "unicode_decimal": 58894
-    },
-    {
-      "icon_id": "354570",
-      "name": "编辑",
-      "font_class": "iconfontedit",
-      "unicode": "e61f",
-      "unicode_decimal": 58911
-    },
-    {
-      "icon_id": "813727",
-      "name": "充值",
-      "font_class": "chongzhi",
-      "unicode": "e633",
-      "unicode_decimal": 58931
-    },
-    {
-      "icon_id": "1761485",
-      "name": "禁用",
-      "font_class": "jinyong",
-      "unicode": "e641",
-      "unicode_decimal": 58945
-    },
-    {
-      "icon_id": "11391516",
-      "name": "密码",
-      "font_class": "mima",
-      "unicode": "e638",
-      "unicode_decimal": 58936
-    },
-    {
-      "icon_id": "9783463",
-      "name": "文档",
-      "font_class": "wendang",
-      "unicode": "e613",
-      "unicode_decimal": 58899
-    },
-    {
-      "icon_id": "4641118",
-      "name": "删除",
-      "font_class": "shanchu",
-      "unicode": "e625",
-      "unicode_decimal": 58917
-    },
-    {
-      "icon_id": "12685010",
-      "name": "铃",
-      "font_class": "icon_huabanfuben",
-      "unicode": "e62b",
-      "unicode_decimal": 58923
-    },
-    {
-      "icon_id": "2512619",
-      "name": "BAI-屋子",
-      "font_class": "BAI-wuzi",
-      "unicode": "e69c",
-      "unicode_decimal": 59036
-    },
-    {
-      "icon_id": "5387843",
-      "name": "主题_调色盘_o",
-      "font_class": "zhuti_tiaosepan_o",
-      "unicode": "eb6e",
-      "unicode_decimal": 60270
-    }
-  ]
-}

BIN
unpackage/dist/dev/app-plus/static/font/iconfont.ttf


BIN
unpackage/dist/dev/app-plus/static/font/iconfont.woff


BIN
unpackage/dist/dev/app-plus/static/font/iconfont.woff2


BIN
unpackage/release/apk/__UNI__DBA6730__20211102145414.apk


BIN
unpackage/release/apk/__UNI__DBA6730__20211102145953.apk


BIN
unpackage/release/apk/__UNI__DBA6730__20211105165140.apk


BIN
unpackage/res/icons/1024x1024.png


BIN
unpackage/res/icons/120x120.png


BIN
unpackage/res/icons/144x144.png


BIN
unpackage/res/icons/152x152.png


BIN
unpackage/res/icons/167x167.png


BIN
unpackage/res/icons/180x180.png


BIN
unpackage/res/icons/192x192.png


BIN
unpackage/res/icons/20x20.png


BIN
unpackage/res/icons/29x29.png


BIN
unpackage/res/icons/40x40.png


BIN
unpackage/res/icons/58x58.png


BIN
unpackage/res/icons/60x60.png


BIN
unpackage/res/icons/72x72.png


BIN
unpackage/res/icons/76x76.png


BIN
unpackage/res/icons/80x80.png


BIN
unpackage/res/icons/87x87.png


BIN
unpackage/res/icons/96x96.png


+ 1 - 0
util/api.js

@@ -5,6 +5,7 @@ export const myRequest=(options)=>{
 	if(BASE_URL==''){
 		BASE_URL = 'http://8.136.98.49:8002'
 	}
+	// BASE_URL = 'http://192.168.1.77:8002'
 	console.log(BASE_URL) 
 	var session_key=""
 	session_key=uni.getStorageSync('session_key')