a

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

App.vue

@@ -1,37 +1,9 @@
 <script>
 	export default {
 		onLaunch: function() {
-			let timer = null
-
-			uni.$on('close', function(data) {
-
-				timer = setTimeout(() => {
-
-					// uni.request({
-					// 	url: 'https://iot.lihaink.cn/close_stream', //仅为示例，并非真实接口地址。
-
-					// });
-
-					console.log("关闭定时器")
-
-				}, 60000)
 
 
 
-			})
-			uni.$on('push', function(data) {
-				if (timer) {
-					clearTimeout(timer);
-				}
-
-
-				// uni.request({
-				// 	url: 'https://iot.lihaink.cn/push_stream',
-
-				// });
-
-
-			})
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -40,10 +12,6 @@
 		onHide: function() {
 			console.log('App Hide')
 
-			// uni.request({
-			// 	url: 'https://iot.lihaink.cn/close_stream',
-
-			// });
 		},
 
 	}

manifest.json

@@ -1,47 +1,47 @@
 {
-    "name" : "种植溯源",
-    "appid" : "__UNI__D087881",
-    "description" : "",
-    "versionName" : "1.0.2",
-    "versionCode" : 102,
-    "transformPx" : false,
+	"name": "种植溯源",
+	"appid": "__UNI__D087881",
+	"description": "",
+	"versionName": "1.0.2",
+	"versionCode": 102,
+	"transformPx": false,
 	/* 5+App特有相关 */
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueStyleCompiler" : "uni-app",
-        "compilerVersion" : 3,
-        "compatible" : {
-            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+	"app-plus": {
+		"usingComponents": true,
+		"nvueStyleCompiler": "uni-app",
+		"compilerVersion": 3,
+		"compatible": {
+			"ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
 		},
-        "screenOrientation" : [
+		"screenOrientation": [
 			"portrait-primary",
 			"portrait-secondary",
 			"landscape-primary",
 			"landscape-secondary"
 		],
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
 		},
 		/* 模块配置 */
-        "modules" : {
-            "Geolocation" : {},
-            "Maps" : {},
-            "LivePusher" : {},
-            "VideoPlayer" : {},
-            "Barcode" : {},
-            "Camera" : {},
-            "UniMP" : {
-                "description" : "uni小程序"
+		"modules": {
+			"Geolocation": {},
+			"Maps": {},
+			"LivePusher": {},
+			"VideoPlayer": {},
+			"Barcode": {},
+			"Camera": {},
+			"UniMP": {
+				"description": "uni小程序"
 			}
 		},
 		/* 应用发布信息 */
-        "distribute" : {
+		"distribute": {
 			/* android打包配置 */
-            "android" : {
-                "permissions" : [
+			"android": {
+				"permissions": [
 					"<uses-feature android:name=\"android.hardware.camera\"/>",
 					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
 					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
@@ -60,57 +60,57 @@
 					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
 				],
-                "minSdkVersion" : 21
+				"minSdkVersion": 21
 			},
 			/* ios打包配置 */
-            "ios" : {
-                "dSYMs" : false
+			"ios": {
+				"dSYMs": false
 			},
 			/* SDK配置 */
-            "sdkConfigs" : {
-                "ad" : {},
-                "geolocation" : {
-                    "amap" : {
-                        "name" : "amapC2GgorTaY",
-                        "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "a8c8821159c1781d4ea4651df856b872",
-                        "appkey_android" : "a8c8821159c1781d4ea4651df856b872"
+			"sdkConfigs": {
+				"ad": {},
+				"geolocation": {
+					"amap": {
+						"name": "amapC2GgorTaY",
+						"__platform__": ["ios", "android"],
+						"appkey_ios": "a8c8821159c1781d4ea4651df856b872",
+						"appkey_android": "a8c8821159c1781d4ea4651df856b872"
 					},
-                    "system" : {
-                        "__platform__" : [ "ios", "android" ]
+					"system": {
+						"__platform__": ["ios", "android"]
 					}
 				},
-                "maps" : {
-                    "amap" : {
-                        "name" : "amapC2GgorTaY",
-                        "appkey_ios" : "a8c8821159c1781d4ea4651df856b872",
-                        "appkey_android" : "a8c8821159c1781d4ea4651df856b872"
+				"maps": {
+					"amap": {
+						"name": "amapC2GgorTaY",
+						"appkey_ios": "a8c8821159c1781d4ea4651df856b872",
+						"appkey_android": "a8c8821159c1781d4ea4651df856b872"
 					}
 				}
 			}
 		}
 	},
 	/* 快应用特有相关 */
-    "quickapp" : {},
+	"quickapp": {},
 	/* 小程序特有相关 */
-    "mp-weixin" : {
-        "appid" : "",
-        "setting" : {
-            "urlCheck" : false
+	"mp-weixin": {
+		"appid": "",
+		"setting": {
+			"urlCheck": false
 		},
-        "usingComponents" : true
+		"usingComponents": true
 	},
-    "mp-alipay" : {
-        "usingComponents" : true
+	"mp-alipay": {
+		"usingComponents": true
 	},
-    "mp-baidu" : {
-        "usingComponents" : true
+	"mp-baidu": {
+		"usingComponents": true
 	},
-    "mp-toutiao" : {
-        "usingComponents" : true
+	"mp-toutiao": {
+		"usingComponents": true
 	},
-    "uniStatistics" : {
-        "enable" : false
+	"uniStatistics": {
+		"enable": false
 	},
-    "vueVersion" : "3"
+	"vueVersion": "3"
 }

pages.json

@@ -198,32 +198,33 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"tabBar": {
-		"color": "#FFFFFF",
-		"selectedColor": "#34D190",
+		"color": "#282828",
+		"selectedColor": "#0122C7",
 		"borderStyle": "white",
-		"backgroundColor": "#FFFFFF",
-		"iconWidth": "40px",
+		"backgroundColor": "#ffffff",
 		"list": [{
 				"pagePath": "pages/index/massif",
-				"text": "",
-				"iconPath": "static/main/index/sy.png",
-				"selectedIconPath": "static/main/index/sydj.png"
+				"text": "首45",
+				"iconPath": "static/tabs-icon/home.png",
+				"selectedIconPath": "static/tabs-icon/home-a.png"
 			},
 			{
 				"pagePath": "pages/index/index",
-				"text": "",
-				"iconPath": "static/main/index/dk.png",
-				"selectedIconPath": "static/main/index/dkdj.png"
+				"text": "审1批",
+				"iconPath": "static/tabs-icon/Task.png",
+				"selectedIconPath": "static/tabs-icon/Task-a.png"
 			},
-
 			{
 				"pagePath": "pages/index/personal",
-				"text": "",
-				"iconPath": "static/main/index/wd.png",
-				"selectedIconPath": "static/main/index/wddj.png"
+				"text": "任务",
+				"iconPath": "static/tabs-icon/approval.png",
+				"selectedIconPath": "static/tabs-icon/approval-a.png"
 			}
 
 		]
 	},
+
+
+
 	"uniIdRouter": {}
 }

pages/Login/login.vue

@@ -7,6 +7,9 @@
 
 		<Myindex style="float: right;"></Myindex>
 
+		<view class="" v-show="false">
+			<image src="/static/tabs-icon/dk.png"></image>
+		</view>
 
 
 		<view class="content">
@@ -159,9 +162,6 @@
 				</view> -->
 
 			</view>
-
-
-
 		</view>
 		<view class="agreement">
 			<text>登录代表您已经同意</text> <text style="color:#2D94FE ;">服务协议、隐私政策</text>
@@ -193,6 +193,8 @@
 		.input-card {
 			width: 700rpx;
 			box-sizing: border-box;
+			border-radius: 20rpx;
+			overflow: hidden;
 
 			.card-head {
 				background-color: #fff;

pages/index/index.vue

@@ -99,6 +99,10 @@
 					</view>
 				</view>
 
+
+
+
+
 			</view>
 		</view>
 

pages/index/massif.vue

@@ -62,6 +62,8 @@
 				<view class="land-info">
 					<view class="land-area">
 						土地面积
+
+
 						<view class="">
 							{{dataobj.total_area|| "--"}}亩
 						</view>
@@ -97,7 +99,9 @@
 
 				</view>
 				<view class="live">
-					<u--image src="/static/img/viedobg.png" v-if="video_url" width="100%"></u--image>
+					<u--image
+						src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png"
+						v-if="video_url" width="100%"></u--image>
 					<u--image :src="u('K')" v-else width="100%"></u--image>
 
 					<view class=""
@@ -497,7 +501,7 @@
 	const bgc = (icon) => {
 		return `/static/main/index/${icon}.png`
 	}
-	const video_url = ref(5)
+	const video_url = ref()
 	//列表获取
 	const getlist = () => {
 		lindexist({
@@ -515,7 +519,7 @@
 				}
 				// video_url=res.data.
 
-				threshold = res.data.monitor.threshold
+				threshold = res.data?.monitor?.threshold || ""
 				if (Object.keys(res.data).length > 0) {
 					getlist3(res.data.id)
 					Object.assign(dataobj, res.data);
@@ -584,7 +588,7 @@
 		}).then((res) => {
 			if (res.code == 1) {
 
-				tdId.value = res.data[0].id
+				tdId.value = res.data[0]?.id || ''
 				getlist()
 				if (res.data.length > 0) {
 					columns.splice(0, columns.length, ...res.data.map((step, index) => {

pages/landDetail/index.vue

@@ -12,8 +12,8 @@
 				</view>
 			</view>
 			<view class="video" style="position: relative;">
-				<u--image src="/static/img/viedobg.png" width="100%" height="300rpx" @click="goLive"
-					v-if="videoUrl"></u--image>
+				<u--image src="https://ceshi-worker-task.lihaink.cn/uploads/images/20231223/20231223092144475437017.png"
+					width="100%" height="300rpx" @click="goLive" v-if="videoUrl"></u--image>
 				<u--image src="/static/main/index/k.png" width="100%" height="300rpx" v-else></u--image>
 
 				<view class=""
@@ -144,7 +144,6 @@
 		onShow
 	} from "@dcloudio/uni-app"
 	const videoUrl = ref('')
-	console.log(videoUrl.value)
 
 	const goLive = () => {
 		uni.navigateTo({
@@ -223,10 +222,9 @@
 		}).then((res) => {
 
 			if (res.code == 1) {
-				console.log(res.data)
 				if (res.data.user_id == 23) {
-					videoUrl.value =
-						'http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_4.live.mp4?secret=YwDtp2llj80HA19JhMXL4Po99nsMAyNT'
+					// videoUrl.value =
+					// 	'http://rtsp.lihaink.cn/live/lihai_lot_walnutpi_dev_4.live.mp4?secret=YwDtp2llj80HA19JhMXL4Po99nsMAyNT'
 				}
 				console.log(videoUrl.value)
 				// videoUrl.value=res.data.

unpackage/dist/build/app-plus/manifest.json

@@ -123,7 +123,7 @@
     },
     "allowsInlineMediaPlayback": true,
     "safearea": {
-      "background": "#FFFFFF",
+      "background": "#ffffff",
       "bottom": {
         "offset": "auto"
       }
@@ -144,33 +144,33 @@
     },
     "tabBar": {
       "position": "bottom",
-      "color": "#FFFFFF",
-      "selectedColor": "#34D190",
+      "color": "#282828",
+      "selectedColor": "#0122C7",
       "borderStyle": "rgba(255,255,255,0.4)",
       "blurEffect": "none",
       "fontSize": "10px",
-      "iconWidth": "40px",
+      "iconWidth": "24px",
       "spacing": "3px",
       "height": "50px",
-      "backgroundColor": "#FFFFFF",
+      "backgroundColor": "#ffffff",
       "list": [
         {
           "pagePath": "pages/index/massif",
-          "text": "",
-          "iconPath": "/static/main/index/sy.png",
-          "selectedIconPath": "/static/main/index/sydj.png"
+          "text": "首页",
+          "iconPath": "/static/tabs-icon/home.png",
+          "selectedIconPath": "/static/tabs-icon/home-a.png"
         },
         {
           "pagePath": "pages/index/index",
-          "text": "",
-          "iconPath": "/static/main/index/dk.png",
-          "selectedIconPath": "/static/main/index/dkdj.png"
+          "text": "审批",
+          "iconPath": "/static/tabs-icon/Task.png",
+          "selectedIconPath": "/static/tabs-icon/Task-a.png"
         },
         {
           "pagePath": "pages/index/personal",
-          "text": "",
-          "iconPath": "/static/main/index/wd.png",
-          "selectedIconPath": "/static/main/index/wddj.png"
+          "text": "任务",
+          "iconPath": "/static/tabs-icon/approval.png",
+          "selectedIconPath": "/static/tabs-icon/approval-a.png"
         }
       ],
       "selectedIndex": 0,