From a64e8b6ccf1e367fcd0592b5c11d741077006d7b Mon Sep 17 00:00:00 2001
From: zhaofengliang <zhaofengliang@dcloud.io>
Date: Mon, 1 Jul 2024 20:02:54 +0800
Subject: [PATCH] Merge branch 'dev-provider' into dev

---
 pages/API/get-provider/get-provider.uvue | 170 +++++++++++++----------
 1 file changed, 97 insertions(+), 73 deletions(-)

diff --git a/pages/API/get-provider/get-provider.uvue b/pages/API/get-provider/get-provider.uvue
index 71d5d178..6890c95c 100644
--- a/pages/API/get-provider/get-provider.uvue
+++ b/pages/API/get-provider/get-provider.uvue
@@ -1,87 +1,111 @@
 <template>
-  <!-- #ifdef APP -->
-  <scroll-view class="page-scroll-view">
-  <!-- #endif -->
-    <view class="page">
-      <page-head :title="title"></page-head>
-      <view class="service-item" v-for="(item, index) in serviceList" :key="index">
-        <text class="service-name">{{item.name}}:</text>
-        <view class="provider-list">
-          <text class="provider-item" v-for="(item2, index2) in item.provider" :key="index2">{{item2}}</text>
-        </view>
-      </view>
-      <button class="btn-get-provider" type="primary" @click="getProvider">getProvider</button>
-    </view>
-  <!-- #ifdef APP -->
-  </scroll-view>
-  <!-- #endif -->
+	<!-- #ifdef APP -->
+	<scroll-view class="page-scroll-view">
+	<!-- #endif -->
+		<view class="page">
+			<page-head :title="title"></page-head>
+			<view class="service-item" v-for="(item, index) in serviceList" :key="index">
+				<text class="service-name">{{item.name}}:</text>
+				<view class="provider-list">
+					<text class="provider-item" v-for="(item2, index2) in item.provider" :key="index2">
+						{{item2}}
+						{{item.providerObj.length > 0 ? ':'+ JSON.stringify(item.providerObj[index2]) : '' }}
+					</text>
+				</view>
+			</view>
+			<button class="btn-get-provider" type="primary" @click="getProviderIds">getProviderIds</button>
+			<button class="btn-get-provider" type="primary" @click="getProviderObject">getProviderObject</button>
+		</view>
+	<!-- #ifdef APP -->
+	</scroll-view>
+	<!-- #endif -->
 </template>
 
 <script>
-  type ProviderItem = {
-    service : string,
-    name : string,
-    provider : string[]
-  }
 
-  export default {
-    data() {
-      return {
-        title: 'provider',
-        serviceList: [
-          { service: "oauth", name: "登陆", provider: [] },
-          { service: "share", name: "分享", provider: [] },
-          { service: "payment", name: "支付", provider: [] },
-          { service: "push", name: "推送", provider: [] },
-          { service: "location", name: "定位", provider: [] }
-        ] as ProviderItem[]
-      }
-    },
-    methods: {
-      getProvider() {
-        this.serviceList.forEach((item : ProviderItem) => {
-          uni.getProvider({
-            service: item.service,
-            success: (e) => {
-              this.updateProvider(e.service, e.provider);
-            }
-          })
-        })
-      },
-      updateProvider(service : string, provider : string[]) {
-        const item : ProviderItem | null = this.serviceList.find((item : ProviderItem) : boolean => {
-          return item.service == service
-        });
-        if (item != null) {
-          item.provider = provider
-        }
-      }
-    }
-  }
+	type ProviderItem = {
+		service : string,
+		name : string,
+		provider : string[],
+		providerObj : UniProvider[]
+	}
+
+
+	export default {
+		data() {
+			return {
+				title: 'provider',
+				flag: false,
+				serviceList: [
+					{ service: "oauth", name: "登陆", provider: [], providerObj: [] },
+					{ service: "share", name: "分享", provider: [], providerObj: [] },
+					{ service: "payment", name: "支付", provider: [], providerObj: [] },
+					{ service: "push", name: "推送", provider: [], providerObj: [] },
+					{ service: "location", name: "定位", provider: [], providerObj: [] }
+				] as ProviderItem[],
+				providerObjList: [] as UniProvider[]
+			}
+		},
+		methods: {
+			getProviderIds() {
+				this.serviceList.forEach((item : ProviderItem) => {
+					let providerIds = uni.getProviderIds({
+						service: item.service
+					})
+					this.updateProvider(item.service, providerIds);
+				})
+			},
+			updateProvider(service : string, provider ?: string[] | null) {
+				const item : ProviderItem | null = this.serviceList.find((item : ProviderItem) : boolean => {
+					return item.service == service
+				});
+				if (item != null && provider != null) {
+					item.provider = provider
+				}
+			},
+			getProviderObject() {
+				this.flag = true
+				this.getProviderIds()
+				let objList = []
+				this.serviceList.forEach((value) => {
+					value.provider.forEach((provider) => {
+						let obj = uni.getProviderObject({
+							service: value.service,
+							provider: provider
+						})
+						if (obj != null) {
+							value.providerObj.push(obj)
+						}
+
+					})
+				})
+			}
+		},
+	}
 </script>
 
 <style>
-  .page {
-    padding: 15px;
-  }
+	.page {
+		padding: 15px;
+	}
 
-  .service-item {
-    margin-top: 10px;
-  }
+	.service-item {
+		margin-top: 10px;
+	}
 
-  .service-name {
-    font-weight: bold;
-  }
+	.service-name {
+		font-weight: bold;
+	}
 
-  .provider-list {
-    margin-left: 32px;
-  }
+	.provider-list {
+		margin-left: 32px;
+	}
 
-  .provider-item {
-    line-height: 1.5;
-  }
+	.provider-item {
+		line-height: 1.5;
+	}
 
-  .btn-get-provider {
-    margin-top: 30px;
-  }
+	.btn-get-provider {
+		margin-top: 30px;
+	}
 </style>
-- 
GitLab