From 452d32042fbdc66aa62af653f7f899b1b057c5b0 Mon Sep 17 00:00:00 2001
From: taohebin <taohebin@dcloud.io>
Date: Mon, 3 Jul 2023 12:09:59 +0800
Subject: [PATCH] =?UTF-8?q?getnetworktype=20=E4=BE=8B=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  9 +++
 .../get-network-type/get-network-type.uvue    | 70 +++++++++++++++++++
 pages/component/list/list.uvue                | 14 ++--
 pages/tabBar/API/API.uvue                     |  3 +-
 pages/tabBar/component/component.uvue         |  2 +-
 5 files changed, 86 insertions(+), 12 deletions(-)
 create mode 100644 pages/API/get-network-type/get-network-type.uvue

diff --git a/pages.json b/pages.json
index 42e8900c..10efccf4 100644
--- a/pages.json
+++ b/pages.json
@@ -545,6 +545,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/API/get-network-type/get-network-type",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
     "globalStyle": {
         "pageOrientation": "portrait",
diff --git a/pages/API/get-network-type/get-network-type.uvue b/pages/API/get-network-type/get-network-type.uvue
new file mode 100644
index 00000000..0ef57cb5
--- /dev/null
+++ b/pages/API/get-network-type/get-network-type.uvue
@@ -0,0 +1,70 @@
+<template>
+	<view>
+		<page-head :title="title"></page-head>
+		<view class="uni-padding-wrap uni-common-mt">
+			<view style="background:#FFFFFF; padding:40rpx;">
+				<view class="uni-hello-text uni-center">网络状态</view>
+				<view v-if="hasNetworkType === false">
+					<view class="uni-h2 uni-center uni-common-mt">未获取</view>
+					<view class="uni-hello-text uni-center uni-common-mt">请点击下面按钮获取网络状态</view>
+				</view>
+				<view v-if="hasNetworkType === true">
+					<view class="uni-h2 uni-center uni-common-mt">{{networkType}}</view>
+				</view>
+			</view>
+			<view class="uni-btn-v uni-common-mt">
+				<button type="primary" @tap="getNetworkType">获取设备网络状态</button>
+				<button class="uni-common-mt" @tap="clear">清空</button>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+				title: 'getNetworkType',
+				hasNetworkType: false,
+				networkType: '',
+				connectedWifi: '',
+				pageVisible: false
+			}
+		},
+		onLoad() {
+			this.pageVisible = true;
+		},
+		onUnload: function() {
+			this.pageVisible = false;
+			this.networkType = '';
+			this.hasNetworkType = false;
+		},
+		methods: {
+			getNetworkType: function() {
+				uni.getNetworkType({
+					success: (res) => {
+						console.log(res)
+						this.hasNetworkType = true;
+						this.networkType = res.networkType
+					},
+					fail: () => {
+						if (this.pageVisible) {
+							uni.showModal({
+								content: '获取失败！',
+								showCancel: false
+							})
+						}
+					}
+				})
+			},
+			clear: function() {
+				this.hasNetworkType = false;
+				this.networkType = '';
+				this.connectedWifi = '';
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/pages/component/list/list.uvue b/pages/component/list/list.uvue
index 504d81b6..f55815c5 100644
--- a/pages/component/list/list.uvue
+++ b/pages/component/list/list.uvue
@@ -2,9 +2,9 @@
 	<view style="height: 100%;width: 100%;">
 		<page-head :title="title"></page-head>
 		<view class="container">
-			<list class="uni-list" :refresher-enabled="true" @refresherrefresh="onRefresherrefresh"
+			<list class="uni-list-inner" :refresher-enabled="true" @refresherrefresh="onRefresherrefresh"
 				:refresher-triggered="refresherTriggered">
-				<cell class="list_cell" v-for="(item, index) in dataList" :key="item.id">
+				<cell v-for="(item, index) in dataList" :key="item.id">
 					<view class="list-item">
 						<text class="list-item-title" :value="item.name"></text>
 					</view>
@@ -45,7 +45,7 @@
 </script>
 
 <style>
-	.uni-list {
+	.uni-list-inner {
 		background-color: #eee;
 		position: relative;
 		width: 100%;
@@ -61,12 +61,6 @@
 		border: dashed;
 		height: 100%;
 		width: 100%;
-	}
-	
-	.list_cell{
-		display: flex;
-		justify-content: center;
-		align-items: center;
 	}
 
 	.list-item {
@@ -74,8 +68,8 @@
 		margin-right: 12px;
 		margin-top: 12px;
 		padding: 20px;
+		border-radius: 5px;
 		background-color: #fff;
-		border-radius: 5px;
 	}
 
 	.list-item-title {
diff --git a/pages/tabBar/API/API.uvue b/pages/tabBar/API/API.uvue
index 3e0b1cc5..c01c024b 100644
--- a/pages/tabBar/API/API.uvue
+++ b/pages/tabBar/API/API.uvue
@@ -121,7 +121,8 @@
                     pages: [
                         {
                             name: "获取设备网络状态",
-                            url: "get-network-type",
+                            url: "get-network-type",
+							enable:true
                         },
                         {
                             name: "获取系统信息",
diff --git a/pages/tabBar/component/component.uvue b/pages/tabBar/component/component.uvue
index 504864e1..2b870d6f 100644
--- a/pages/tabBar/component/component.uvue
+++ b/pages/tabBar/component/component.uvue
@@ -71,7 +71,7 @@
                         // #endif
 						{
 							name:'list',
-							enable:false
+							enable:true
 						}
                     ] as Page[]
                 }, {
-- 
GitLab