From a58b0474bd1b13391171281fe5ec69a32993f1df Mon Sep 17 00:00:00 2001
From: wang hou sheng <76928547+wanghousheng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:00:34 +0800
Subject: [PATCH] 1

---
 app/admin/controller/Wxserve.php       |  4 ++--
 app/common/library/wxserver/Server.php | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/admin/controller/Wxserve.php b/app/admin/controller/Wxserve.php
index a30d6337..bffaeaeb 100644
--- a/app/admin/controller/Wxserve.php
+++ b/app/admin/controller/Wxserve.php
@@ -227,8 +227,8 @@ class Wxserve extends Controller
     {
         $appid = $this->request->get('appid');
         $obj = new Server();
-        $res = $obj->getPrivacySetting($appid);
-        if ($res) {
+        $res = $obj->privacyInfo($appid);
+        if ($res == 'ok') {
             $result = $obj->submitAuditOne($appid);
             if ($result['status']) {
                 return $this->renderSuccess('success');
diff --git a/app/common/library/wxserver/Server.php b/app/common/library/wxserver/Server.php
index 8583203f..830ee6d2 100644
--- a/app/common/library/wxserver/Server.php
+++ b/app/common/library/wxserver/Server.php
@@ -538,13 +538,13 @@ class Server
         if ($token) {
             $url = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting?access_token=$token";
             $setting_list = [
-//                ['privacy_key' => 'PhoneNumber', 'privacy_text' => '用于用户一键登录'],
+                ['privacy_key' => 'PhoneNumber', 'privacy_text' => '用于用户一键登录'],
                 ['privacy_key' => 'Location', 'privacy_text' => '用于用户选择自提点'],
-//                ['privacy_key' => 'AlbumWriteOnly', 'privacy_text' => '用于用户保存海报'],
-//                ['privacy_key' => 'Address', 'privacy_text' => '用于用户快速获取微信地址'],
-//                ['privacy_key' => 'Invoice', 'privacy_text' => '用于用户申请开票'],
-//                ['privacy_key' => 'Album', 'privacy_text' => '用于用户上传图片'],
-//                ['privacy_key' => 'Clipboard', 'privacy_text' => '用于用户复制粘贴'],
+                ['privacy_key' => 'AlbumWriteOnly', 'privacy_text' => '用于用户保存海报'],
+                ['privacy_key' => 'Address', 'privacy_text' => '用于用户快速获取微信地址'],
+                ['privacy_key' => 'Invoice', 'privacy_text' => '用于用户申请开票'],
+                ['privacy_key' => 'Album', 'privacy_text' => '用于用户上传图片'],
+                ['privacy_key' => 'Clipboard', 'privacy_text' => '用于用户复制粘贴'],
             ];
             $data['setting_list'] = $setting_list;
             $data['owner_setting']['contact_qq'] = '527264601';