首页增加色诱入口

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "云飞智控",
+    "name" : "智控",
     "appid" : "__UNI__DBA6730",
     "description" : "",
-    "versionName" : "1.8.4",
-    "versionCode" : 184,
+    "versionName" : "1.8.5",
+    "versionCode" : 185,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/cb/index/index.vue

@@ -124,6 +124,12 @@
 						list: [],
 						pageIndex: 1,
 						tf: false
+					}, {
+						name: '病虫害可视监测',
+						type: 14, //3虫情测报灯 7孢子仪 4智能性诱 性诱2.0
+						list: [],
+						pageIndex: 1,
+						tf: false
 					}
 				],
 				device_type: '3', //筛选的设备id
@@ -172,6 +178,10 @@
 								this.equipArr[5].tf = true //"性诱3.0"
 								this.getxctEquipList(5)
 								break
+							case 167:
+								this.equipArr[6].tf = true //"性诱3.0"
+								this.getEquipList(6)
+								break
 						}
 					}
 					for(var i=0;i<this.equipArr.length;i++){
@@ -346,6 +356,10 @@
 					uni.navigateTo({
 						url: '/pages/cb/xctdetail/xctdetail?info=' + data
 					});
+				} else if (item.type == 14) {
+					uni.navigateTo({
+						url: '/pages/cb/sy/detail?detail=' + data
+					});
 				} else{
 					uni.navigateTo({
 						url: '/pages/cb/equip-detail/equip-detail?info=' + data
@@ -531,19 +545,21 @@
 		font-size: 30rpx;
 		line-height: 80rpx;
 		background-color: #ffffff;
-		width: 100%;
+		width: 100vw;
 		z-index: 2;
-		overflow: hidden;
-		overflow-x: scroll;
+		overflow-y: hidden;
+		overflow-x: auto;
 		white-space: nowrap;
 
 		.tab-item {
 			cursor: pointer;
 			position: relative;
-			width: 25%;
+			padding: 10rpx 20rpx;
 			text-align: center;
 			display: inline-block;
-			padding: 10rpx 0;
+			span{
+				display: inline-block;
+			}
 		}
 
 		.tab-item.active {

pages/index/index.vue

@@ -88,7 +88,7 @@
 						测报系统
 					</view>
 				</view>
-				<view class="facilitybox_item" v-if="$QueryPermission(243)" @click="tabequipment('../cbqxyj/cbwarn')">
+				<view class="facilitybox_item" v-if="jurisdiction.cbyj" @click="tabequipment('../cbqxyj/cbwarn')">
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/cbyj.png" mode="" class="itemimg">
 					</image>
 					<view class="">
@@ -116,14 +116,14 @@
 						环境监测
 					</view>
 				</view>
-				<view class="facilitybox_item" v-if="$QueryPermission(242)" @click="tabequipment('../qxzyj/cbwarn', '5')">
+				<view class="facilitybox_item" v-if="jurisdiction.qxz" @click="tabequipment('../qxzyj/cbwarn', '5')">
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/qxyj.png" mode="" class="itemimg">
 					</image>
 					<view class="">
 						气象预警
 					</view>
 				</view>
-				<view class="facilitybox_item" v-if="$QueryPermission(284)" @click="tabequipment('../qxzyj/cbwarn', '15')">
+				<view class="facilitybox_item" v-if="jurisdiction.sq" @click="tabequipment('../qxzyj/cbwarn', '15')">
 					<image src="http://www.hnyfwlw.com:8006/bigdata_app/newindex/sqyj.png" mode="" class="itemimg">
 					</image>
 					<view class="">
@@ -328,7 +328,10 @@
 					sqtf: false,
 					zjtf: false,
 					sftf: false,
-					ggtf: false
+					ggtf: false,
+					qxz: false,
+					sq: false,
+					cbyj: false
 				},
 				show: false,
 				url: "",
@@ -376,6 +379,26 @@
 					key: 'myuid',
 					data: JSON.stringify(res.myuid),
 				})
+				let QueryPermission = (id) =>  {
+					let list = res.children;
+					for (var i = 0; i < list.length; i++) {
+						if (list[i].children) {
+							var data = list[i].children
+							for (var j = 0; j < data.length; j++) {
+								if (data[j].children) {
+									var item = data[j].children
+									for (var k = 0; k < item.length; k++) {
+										if (item[k].pur_id == id) {
+											return true
+										}
+									}
+								}
+				
+							}
+						}
+					}
+					return false
+				};
 				this.jurisdiction = {
 					cbtf: false,
 					jktf: false,
@@ -385,9 +408,10 @@
 					sbtf: false,
 					sqtf: false,
 					zjtf: false,
-					sftf: false,
-					ggtf: false
-				}
+					qxz: QueryPermission(242),
+					sq: QueryPermission(284),
+					cbyj: QueryPermission(243)
+				};
 				// console.log(res.children)
 				for (var i = 0; i < res.children.length; i++) {
 					switch (res.children[i].pur_id) {

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://app.liuyingyong.cn/build/download/748867d0-0de6-11ef-b96e-4de533c7e0a0
+https://app.liuyingyong.cn/build/download/adef8330-135b-11ef-8289-d96268c0f620

util/neutral.js

@@ -1,4 +1,4 @@
 export default{
-	isneutral:true//云飞智控
-	// isneutral:false//智控
+	// isneutral:true//云飞智控
+	isneutral:false//智控
 }