From 5f880a362678bca5e1430c0f4d3cc1f8561a4c23 Mon Sep 17 00:00:00 2001
From: haml-707 <845831435@qq.com>
Date: Sat, 28 Oct 2023 19:26:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E6=A0=A1=E9=AA=8C=EF=BC=8C=E5=8F=8A=E9=94=99=E8=AF=AF=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/openeuler/app.js | 2 -
.../components/meeting-list/meeting-list.js | 3 +-
.../components/privacy-text/privacy-text.wxml | 10 +++--
.../privacy-update/privacy-update.js | 17 --------
.../privacy-update/privacy-update.json | 4 --
.../privacy-update/privacy-update.less | 28 -------------
.../privacy-update/privacy-update.wxml | 8 ----
.../privacy-update/privacy-update.wxss | 24 -----------
src/openeuler/components/privacy/privacy.wxss | 6 +--
src/openeuler/config/constants.js | 6 +--
src/openeuler/config/services-config.js | 2 +-
.../package-events/publish/publish.js | 8 ++--
.../package-meeting/meeting/detail.js | 1 -
.../package-meeting/reserve/reserve.js | 4 ++
.../package-meeting/reserve/reserve.wxml | 4 +-
src/openeuler/package-my/my/privecy.json | 3 +-
src/openeuler/package-my/my/privecy.wxml | 1 -
src/openeuler/package-my/my/qrcode.js | 7 +++-
src/openeuler/pages/auth/auth.wxss | 7 +---
src/openeuler/pages/events/events.js | 2 +-
src/openeuler/utils/app-ajax.js | 40 ++++---------------
21 files changed, 43 insertions(+), 144 deletions(-)
delete mode 100644 src/openeuler/components/privacy-update/privacy-update.js
delete mode 100644 src/openeuler/components/privacy-update/privacy-update.json
delete mode 100644 src/openeuler/components/privacy-update/privacy-update.less
delete mode 100644 src/openeuler/components/privacy-update/privacy-update.wxml
delete mode 100644 src/openeuler/components/privacy-update/privacy-update.wxss
diff --git a/src/openeuler/app.js b/src/openeuler/app.js
index 523ebdc..23780e4 100644
--- a/src/openeuler/app.js
+++ b/src/openeuler/app.js
@@ -6,10 +6,8 @@ App({
if (wx.canIUse('getUpdateManager')) {
//创建 UpdateManager 实例
const updateManager = wx.getUpdateManager();
- console.log('是否进入模拟更新');
//检测版本更新
updateManager.onCheckForUpdate(function (res) {
- console.log('是否获取版本');
// 请求完新版本信息的回调
if (res.hasUpdate) {
//监听小程序有版本更新事件
diff --git a/src/openeuler/components/meeting-list/meeting-list.js b/src/openeuler/components/meeting-list/meeting-list.js
index 124eb54..d11c9cd 100644
--- a/src/openeuler/components/meeting-list/meeting-list.js
+++ b/src/openeuler/components/meeting-list/meeting-list.js
@@ -208,6 +208,7 @@ Component({
})
} else {
wx.requestSubscribeMessage({
+ // tmplIds 对应消息模板
tmplIds: ['2xSske0tAcOVKNG9EpBjlb1I-cjPWSZrpwPDTgqAmWI', 'UpxRbZf8Z9QiEPlZeRCgp_MKvvqHlo6tcToY8fToK50'],
success(res) {
remoteMethods.collect(that.data.id, function (res) {
@@ -236,7 +237,7 @@ Component({
copyLink: function () {
wx.setClipboardData({
data: this.data.curJoinUrl,
- success: function (res) {
+ success: function () {
that.setData({
showDialog: false
})
diff --git a/src/openeuler/components/privacy-text/privacy-text.wxml b/src/openeuler/components/privacy-text/privacy-text.wxml
index caa3e26..d31e74c 100644
--- a/src/openeuler/components/privacy-text/privacy-text.wxml
+++ b/src/openeuler/components/privacy-text/privacy-text.wxml
@@ -3,12 +3,16 @@
openEuler小程序隐私声明
我们深知您的隐私对您的重要性，并充分尊重您的隐私。在向我们提交您的个人信息之前，请您仔细阅读本《隐私政策声明》（以下简称“本声明”）。如果您对于我们处理您的个人信息的方式有任何疑问，欢迎与我们联系。本声明中的“我们”是指openEuler社区，“服务”是指openEuler小程序。
+ 版本更新说明
+ 请您仔细阅读此次隐私声明的更新内容：
+ 1. “我们如何收集和处理您的个人信息” 章节中，根据个人信息处理的合法基础进行了刷新。
+ 2. “如何访问或控制您的个人信息” 章节中，该等权利刷新为上述权利。
1.我们如何收集和处理您的个人信息
a) 当您登录时，我们会收集您的微信昵称、头像和性别，用于确认您是否具有创建会议的权限，向您发送会议通知及向第三方告知会议的组织人（maintainer）等。无论您是否拥有相关权限，您均可以收藏、订阅会议信息。
b) 当您预定会议之前，我们会收集您的Gitee ID和所属SIG组别名称，用于配置预定会议权限，并作为会议信息的部分展示在小程序。
c ) 当您预定会议时，如您填写邮箱地址我们会收集填写邮箱并向其发送会议通知。
d ) 当您创建会议后，我们会将您的Gitee ID及会议相关信息同步至本服务页面及openEuler社区网站（https://www.openeuler.org）以便对您的会议感兴趣的个人或组织及时获取相关信息。
- e ) 当您创建活动之前，我们会收集您的Gitee ID、所属企业名称用于配置活动发布权限，Gitee ID和您的所属企业名称会作为活动的发布者信息呈现在活动详情页。
+ e ) 当您创建活动之前，我们会收集您的Gitee ID用于配置活动发布权限。
f ) 当您为您创建的活动添加议题时，我们会收集您所填写议题的嘉宾名称、职位用于在活动议题的内容中展示。
g ) 当您在下载活动海报时，我们会申请您的相册保存权限，保存小程序生成的活动海报。
h ) 当您在活动详情页面点击地址时，我们在获取您的同意后会关联启动腾讯地图。
@@ -40,7 +44,7 @@
如果您对本协议有任何疑问或主张任何与个人信息有关的权利，您可以通过以下方式与我们联系
联系邮箱：contact@openeuler.io
联系热线：+86 18683791700
- 最近更新时间：2023年9月19日
- 隐私声明版本：v2023091901
+ 最近更新时间：2023年10月28日
+ 隐私声明版本：v2023102801
\ No newline at end of file
diff --git a/src/openeuler/components/privacy-update/privacy-update.js b/src/openeuler/components/privacy-update/privacy-update.js
deleted file mode 100644
index 3258f1a..0000000
--- a/src/openeuler/components/privacy-update/privacy-update.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// components/privacy-update.js
-Component({
- /**
- * 组件的属性列表
- */
- properties: {},
-
- /**
- * 组件的初始数据
- */
- data: {},
-
- /**
- * 组件的方法列表
- */
- methods: {},
-});
diff --git a/src/openeuler/components/privacy-update/privacy-update.json b/src/openeuler/components/privacy-update/privacy-update.json
deleted file mode 100644
index b18bd46..0000000
--- a/src/openeuler/components/privacy-update/privacy-update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "component": true,
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/src/openeuler/components/privacy-update/privacy-update.less b/src/openeuler/components/privacy-update/privacy-update.less
deleted file mode 100644
index b09c797..0000000
--- a/src/openeuler/components/privacy-update/privacy-update.less
+++ /dev/null
@@ -1,28 +0,0 @@
-/* pages/my/privecy.wxss */
-.container {
- display: flex;
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
-}
-
-.privecy-text text {
- display: block;
- margin: 24rpx 0;
- line-height: 56rpx;
- font-size: 36rpx;
-}
-
-.font-h1 {
- font-size: 40rpx;
-}
-.center {
- text-align: center !important;
-}
-
-.title {
- color: #000000;
-}
-
-.content {
- color: #6c7279ff;
-}
diff --git a/src/openeuler/components/privacy-update/privacy-update.wxml b/src/openeuler/components/privacy-update/privacy-update.wxml
deleted file mode 100644
index ddbb21b..0000000
--- a/src/openeuler/components/privacy-update/privacy-update.wxml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- 版本更新说明
- 请您仔细阅读此次隐私声明的更新内容：
- ● “我们将保留多久您的个人信息” 章节中，明确了注销账号后的个人信息处理时间
- ● “如何访问或控制您的个人信息” 章节中，该等权利刷新为上述权利
-
-
\ No newline at end of file
diff --git a/src/openeuler/components/privacy-update/privacy-update.wxss b/src/openeuler/components/privacy-update/privacy-update.wxss
deleted file mode 100644
index a850b87..0000000
--- a/src/openeuler/components/privacy-update/privacy-update.wxss
+++ /dev/null
@@ -1,24 +0,0 @@
-/* pages/my/privecy.wxss */
-.container {
- display: flex;
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
-}
-.privecy-text text {
- display: block;
- margin: 24rpx 0;
- line-height: 56rpx;
- font-size: 36rpx;
-}
-.font-h1 {
- font-size: 40rpx;
-}
-.center {
- text-align: center !important;
-}
-.title {
- color: #000000;
-}
-.content {
- color: #6c7279ff;
-}
diff --git a/src/openeuler/components/privacy/privacy.wxss b/src/openeuler/components/privacy/privacy.wxss
index ef1677e..c2ed6c8 100644
--- a/src/openeuler/components/privacy/privacy.wxss
+++ b/src/openeuler/components/privacy/privacy.wxss
@@ -59,10 +59,10 @@
.btns .reject {
background: #f4f4f5;
- color: #909399;
+ color: #000;
}
.btns .agree {
- background: #002fa7;
- color: #fff;
+ background: #f4f4f5;
+ color: #000;
}
\ No newline at end of file
diff --git a/src/openeuler/config/constants.js b/src/openeuler/config/constants.js
index 4b48769..a803688 100644
--- a/src/openeuler/config/constants.js
+++ b/src/openeuler/config/constants.js
@@ -5,8 +5,8 @@ let _ = require('../utils/underscore-extend.js');
// 服务连接配置
let serviceConfig = {
-// SERVICE_URL: 'https://api.openeuler.org/meetings', // 正式环境
- SERVICE_URL: 'https://meetingserver-openeuler.test.osinfra.cn', // 测试环境
+ SERVICE_URL: 'https://api.openeuler.org/meetings', // 正式环境
+ // SERVICE_URL: 'https://meetingserver-openeuler.test.osinfra.cn', // 测试环境
};
// 存储配置
@@ -17,6 +17,4 @@ let storageConfig = {
// 所有配置
let constants = _.deepExtend(true, serviceConfig, storageConfig);
-console.log(constants);
-
module.exports = constants;
diff --git a/src/openeuler/config/services-config.js b/src/openeuler/config/services-config.js
index 4c5f55b..5d75397 100644
--- a/src/openeuler/config/services-config.js
+++ b/src/openeuler/config/services-config.js
@@ -108,7 +108,7 @@ let commonServiceConfig = {
// 我发布的活动
MY_EVENTS_LIST: '/sponsoractivities/',
- // 我发布的活动
+ // 下架活动
DEL_EVENT: '/activitydel/{id}/',
// 所有活动
diff --git a/src/openeuler/package-events/publish/publish.js b/src/openeuler/package-events/publish/publish.js
index bcfc314..eb3c9b4 100644
--- a/src/openeuler/package-events/publish/publish.js
+++ b/src/openeuler/package-events/publish/publish.js
@@ -519,9 +519,11 @@ Page({
return;
}
remoteMethods.addEvents(postData, (res) => {
- wx.redirectTo({
- url: '/package-events/publish/success?type=2',
- });
+ if (res.code === 201) {
+ wx.redirectTo({
+ url: '/package-events/publish/success?type=2',
+ });
+ }
});
},
saveDraft() {
diff --git a/src/openeuler/package-meeting/meeting/detail.js b/src/openeuler/package-meeting/meeting/detail.js
index 4a0385e..285a8bd 100644
--- a/src/openeuler/package-meeting/meeting/detail.js
+++ b/src/openeuler/package-meeting/meeting/detail.js
@@ -61,7 +61,6 @@ Page({
});
},
getPlatform: function (target) {
- console.log(target);
return this.data.platformList.find((item) => {
return item.name === target;
});
diff --git a/src/openeuler/package-meeting/reserve/reserve.js b/src/openeuler/package-meeting/reserve/reserve.js
index adb63be..0998cde 100644
--- a/src/openeuler/package-meeting/reserve/reserve.js
+++ b/src/openeuler/package-meeting/reserve/reserve.js
@@ -51,6 +51,10 @@ let localMethods = {
this.toast('请选择开始时间');
return;
}
+ if (new Date() > new Date(`${that.data.date} ${that.data.start}`)) {
+ this.toast('会议时间已过，请正确选择');
+ return;
+ }
if (!that.data.end) {
this.toast('请选择结束时间');
return;
diff --git a/src/openeuler/package-meeting/reserve/reserve.wxml b/src/openeuler/package-meeting/reserve/reserve.wxml
index 07b59d1..a00e274 100644
--- a/src/openeuler/package-meeting/reserve/reserve.wxml
+++ b/src/openeuler/package-meeting/reserve/reserve.wxml
@@ -7,7 +7,7 @@
会议名称
*
-
+
@@ -63,7 +63,7 @@
Etherpad链接
-
+
自动录制会议
diff --git a/src/openeuler/package-my/my/privecy.json b/src/openeuler/package-my/my/privecy.json
index 1cddc7c..73aa770 100644
--- a/src/openeuler/package-my/my/privecy.json
+++ b/src/openeuler/package-my/my/privecy.json
@@ -1,7 +1,6 @@
{
"usingComponents": {
- "privacy-text": "/components/privacy-text/privacy-text",
- "privacy-update": "/components/privacy-update/privacy-update"
+ "privacy-text": "/components/privacy-text/privacy-text"
},
"navigationBarTitleText": "社区隐私声明"
}
\ No newline at end of file
diff --git a/src/openeuler/package-my/my/privecy.wxml b/src/openeuler/package-my/my/privecy.wxml
index 8944f90..5a57201 100644
--- a/src/openeuler/package-my/my/privecy.wxml
+++ b/src/openeuler/package-my/my/privecy.wxml
@@ -1,4 +1,3 @@
-
查看历史版本隐私声明请点击 此处。
\ No newline at end of file
diff --git a/src/openeuler/package-my/my/qrcode.js b/src/openeuler/package-my/my/qrcode.js
index 94d4272..dc14e14 100644
--- a/src/openeuler/package-my/my/qrcode.js
+++ b/src/openeuler/package-my/my/qrcode.js
@@ -49,8 +49,11 @@ Page({
duration: 2000,
});
},
- fail: function (err) {
- console.log(err);
+ fail: function () {
+ wx.showModal({
+ title: '保存失败~',
+ content: '请尝试点击右上角 “...” => “设置” 同意添加到相册后再保存~',
+ });
},
complete(res) {
console.log(res);
diff --git a/src/openeuler/pages/auth/auth.wxss b/src/openeuler/pages/auth/auth.wxss
index ce61f42..1f7c79e 100644
--- a/src/openeuler/pages/auth/auth.wxss
+++ b/src/openeuler/pages/auth/auth.wxss
@@ -117,8 +117,8 @@ page {
text-align: left;
}
van-dialog button {
- background-color: #002fa7;
- color: #fff;
+ color: #000;
+ background: #f4f4f5;
}
.btn-box {
display: flex;
@@ -131,7 +131,4 @@ van-dialog button {
}
.btn-box button:last-child {
margin-left: 12rpx;
- color: #000;
- background-color: transparent;
- border: 1px solid #000;
}
\ No newline at end of file
diff --git a/src/openeuler/pages/events/events.js b/src/openeuler/pages/events/events.js
index 54f5c42..cb30fe7 100644
--- a/src/openeuler/pages/events/events.js
+++ b/src/openeuler/pages/events/events.js
@@ -166,7 +166,7 @@ Page({
}
} else {
this.setData({
- showDialoogDel: true,
+ showDialogDel: true,
});
}
} else {
diff --git a/src/openeuler/utils/app-ajax.js b/src/openeuler/utils/app-ajax.js
index d5339c4..5166852 100644
--- a/src/openeuler/utils/app-ajax.js
+++ b/src/openeuler/utils/app-ajax.js
@@ -7,30 +7,6 @@ const underscore = require('./underscore-extend.js');
const servicesConfig = require('../config/services-config.js');
const CONSTANTS = require('../config/constants.js');
-/* 基础通信参数 */
-const _authClient = function () {
- const deviceId = 'miniprogram';
-
- const auth = {
- authParams: {
- timestamp: new Date().getTime(),
- deviceId: deviceId,
- },
- clientParams: {
- os: 'mini',
- network: '',
- deviceId: deviceId,
- appVersion: CONSTANTS.APP_VERSION,
- },
- openId: appSession.getUserInfoByKey('openId') || '',
- appId: CONSTANTS.APP_ID,
- areaCode: CONSTANTS.AREA_CODE,
- miniId: CONSTANTS.MINI_ID,
- };
-
- return auth;
-};
-
/**
* 获取service
* @param {Object} params
@@ -76,8 +52,6 @@ const appAjax = {
* complete: "" // 完成回调
*/
postJson: function (params) {
- let authClient = _authClient();
-
// 默认参数
let defaultParams = {
service: '', // 服务的配置名称
@@ -87,7 +61,6 @@ const appAjax = {
loadingText: '加载中...', // 加载的提示语
autoCloseWait: true, // 自动关闭菊花
headers: {
- 'base-params': JSON.stringify(authClient),
Authorization: appSession.getToken() ? 'Bearer ' + appSession.getToken() : '',
},
isAsync: true,
@@ -124,13 +97,16 @@ const appAjax = {
if (res.statusCode === 401) {
wx.removeStorageSync('_app_userinfo_session');
ajaxParams.success(0, res);
- wx.navigateTo({
- url: '/pages/auth/auth',
- });
+ const pages = getCurrentPages(); // 当前页面
+ if (pages[0].route !== '/pages/auth/auth') {
+ wx.navigateTo({
+ url: '/pages/auth/auth',
+ });
+ }
return;
}
if (res.statusCode.toString()[0] != 2) {
- let message = '有点忙开个小差，稍后再试~';
+ let message = (res?.data?.detail && res.statusCode.toString() === 400) || '有点忙开个小差，稍后再试~';
if (ajaxParams.error) {
ajaxParams.error(message, res);
} else {
@@ -152,7 +128,7 @@ const appAjax = {
wx.setStorageSync(CONSTANTS.APP_USERINFO_SESSION, data);
}
}
- let message = '有点忙开个小差，稍后再试~';
+ let message = (res?.data?.detail && res.statusCode.toString() === 400) || '有点忙开个小差，稍后再试~';
ajaxParams.error && ajaxParams.error(message, res);
},
complete: function (res) {
--
Gitee