From 571d24d3e47f58fd933e0cd85a013aeaeb07d428 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Fri, 12 Apr 2024 14:47:00 +0800
Subject: [PATCH] =?UTF-8?q?ios=E4=BD=8D=E7=BD=AE=E6=8E=88=E6=9D=83?=
=?UTF-8?q?=E6=8F=8F=E8=BF=B0=E5=92=8C=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/BaseLogin/index.vue | 5 ++++-
manifest.json | 7 ++++---
pages/index/index.vue | 2 ++
pages/learningCenter/reciteDetail.vue | 1 -
pages/merchant/teacher_detail.vue | 2 +-
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/components/BaseLogin/index.vue b/components/BaseLogin/index.vue
index 96a6495..859f1d7 100644
--- a/components/BaseLogin/index.vue
+++ b/components/BaseLogin/index.vue
@@ -67,7 +67,7 @@
-
+
其他方式登陆
@@ -113,6 +113,9 @@ export default {
pwdPlaceholder() {
return "请填写密码";
},
+ showWeixinLogin() {
+ return Number(uni.getStorageSync('showWeixinLogin')) === 1
+ },
},
watch: {
type() {
diff --git a/manifest.json b/manifest.json
index 4e3d0f3..6ff66f0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "梦航教育宝",
"appid" : "__UNI__640EC10",
"description" : "1.1",
- "versionName" : "1.0.3",
- "versionCode" : 103,
+ "versionName" : "1.0.4",
+ "versionCode" : 104,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -61,7 +61,8 @@
"urltypes" : "zsff.xinbadaweb.cn",
"privacyDescription" : {
"NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息",
- "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息"
+ "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册，以便为你编辑用户信息",
+ "NSLocationWhenInUseUsageDescription": "该应用需要获取你的地理位置，以便为你推荐附近的线下课程"
}
},
/* SDK配置 */
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8bd5c2f..ee29581 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -669,8 +669,10 @@ export default {
try {
const { data } = await getCopyrightInfo();
uni.setStorageSync('openMember', data.is_open_member);
+ uni.setStorageSync('showWeixinLogin', data.is_show_weixin_login);
} catch (err) {
uni.setStorageSync('openMember', 0);
+ uni.setStorageSync('showWeixinLogin', 0);
}
},
getPositionAddress(longitude, latitude,) {
diff --git a/pages/learningCenter/reciteDetail.vue b/pages/learningCenter/reciteDetail.vue
index 6a4e31c..4b4cc6f 100644
--- a/pages/learningCenter/reciteDetail.vue
+++ b/pages/learningCenter/reciteDetail.vue
@@ -31,7 +31,6 @@
-->
-