diff --git a/.env.development b/.env.development
index 076c341c..f50f603d 100644
--- a/.env.development
+++ b/.env.development
@@ -3,9 +3,9 @@ ENV = 'development'
# 'development'
-# VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# VITE_APP_BASE_API_Url = 'http://192.168.247.200'
# VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001'
diff --git a/src/androidPrivacy.json b/src/androidPrivacy.json
new file mode 100644
index 00000000..3a67d53b
--- /dev/null
+++ b/src/androidPrivacy.json
@@ -0,0 +1,38 @@
+{
+ "version": "1",
+ "prompt": "template",
+ "title": "个人信息保护提示",
+ "message": "欢迎使用吉AI学！
请你务必审慎阅读、充分理解《用户隐私协议》各条款，帮助您了解我们为您提供的服务、我们如何处理个人信息以及您享有的权利。我们会严格按照相关法律法规要求，采取各种安全措施来保护您的个人信息。
如果你同意，请点击下面按钮开始接受我们的服务。
1.为了保障软件的安全运行和账户安全，我们会申请手机您的设备信息、IP地址、WLAN MAC地址。
2.上传或拍摄图片，需要使用您的媒体影音、图片、视频、音频、相机、等权限。
3.为了实现AI问答、课程学习等APP内功能，我们需要使用您的麦克风权限。",
+ "buttonAccept": "同意并接受",
+ "buttonRefuse": "暂不同意",
+ "hrefLoader": "system",
+ "backToExit":"true",
+ "second": {
+ "title": "确认提示",
+ "message": " 进入应用前，你需先同意《用户隐私协议》，否则将退出应用。",
+ "buttonAccept": "同意并继续",
+ "buttonRefuse": "退出应用"
+ },
+ "disagreeMode":{
+ "support": false,
+ "loadNativePlugins": false,
+ "visitorEntry": false,
+ "showAlways": false
+ },
+ "styles": {
+ "backgroundColor": "#fff",
+ "borderRadius":"5px",
+ "title": {
+ "color": "#000"
+ },
+ "buttonAccept": {
+ "color": "#F91B59"
+ },
+ "buttonRefuse": {
+ "color": "#333"
+ },
+ "buttonVisitor": {
+ "color": "#00ffff"
+ }
+ }
+}
diff --git a/src/common/imgSvg.ts b/src/common/imgSvg.ts
index 5608ed43..ae7f6951 100644
--- a/src/common/imgSvg.ts
+++ b/src/common/imgSvg.ts
@@ -94,7 +94,7 @@ export const pkAnonymousClose = () : string => {
// Pk页匿名开
export const pkAnonymousOpen = () : string => {
const svgXml = `
-
+
`.trim();
return `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svgXml)}`;
};
diff --git a/src/components/points-and-badge/badge.vue b/src/components/points-and-badge/badge.vue
index 4f12ec4c..e2bffedb 100644
--- a/src/components/points-and-badge/badge.vue
+++ b/src/components/points-and-badge/badge.vue
@@ -87,14 +87,19 @@
// 退出签到
const close = () => {
- uni.showTabBar({
- success() {
- opacity.value = 0;
- nextTick(() => {
- popup.value.close();
- });
- }
+ opacity.value = 0;
+ nextTick(() => {
+ popup.value.close();
});
+
+ // uni.showTabBar({
+ // success() {
+ // opacity.value = 0;
+ // nextTick(() => {
+ // popup.value.close();
+ // });
+ // }
+ // });
};
// 点击
const clickFun = (status = true) => {
@@ -109,19 +114,25 @@
console.log('badges', badges);
badgesList.value = badges;
pointsList.value = points;
- // popup.value.open();
- uni.hideTabBar({
- success() {
- opacity.value = 1;
- console.log('成功');
- popup.value.open('center');
- }
- });
+
+
+ opacity.value = 1;
+ console.log('成功');
+ popup.value.open('center');
+ // uni.hideTabBar({
+ // success() {
+
+
+ // opacity.value = 1;
+ // console.log('成功');
+ // popup.value.open('center');
+ // }
+ // });
};
onUnmounted(() => {
- uni.showTabBar({
- success() {}
- });
+ // uni.showTabBar({
+ // success() {}
+ // });
});
defineExpose({ open, close });
diff --git a/src/manifest.json b/src/manifest.json
index 5bb0c580..05f2606c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,101 +1,102 @@
{
- "name": "tra-app",
- "appid": "__UNI__EDE0E52",
- "description": "",
- "versionName": "0.0.3",
- "versionCode": 3,
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "renderer": "auto",
- "orientation": ["portrait-primary"],
- "splashscreen": {
- "alwaysShowBeforeRender": true,
- "waiting": false,
- "autoclose": true,
- "delay": 0
- },
- "safearea": {
- "background": "#CCCCCC",
- "bottom": {
- "offset": "none|auto"
- },
- "left": {
- "offset": "none|auto"
- },
- "right": {
- "offset": "none|auto"
- }
- },
- /* 模块配置 */
- "modules": {
- "Camera": {},
- "Barcode": {},
- "Record": {},
- "VideoPlayer": {}
- },
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ]
- },
- /* ios打包配置 */
- "ios": {
- "dSYMs": false
- },
- /* SDK配置 */
- "sdkConfigs": {},
- "splashscreen": {
- "androidStyle": "common",
- "android": {
- "hdpi": "src/static/images/login/open.9.png",
- "xhdpi": "src/static/images/login/open.9.png",
- "xxhdpi": "src/static/images/login/open.9.png"
- }
- }
- }
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "",
- "setting": {
- "urlCheck": false
- },
- "usingComponents": true
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "vueVersion": "3"
-}
\ No newline at end of file
+ "name" : "tra-app",
+ "appid" : "__UNI__EDE0E52",
+ "description" : "",
+ "versionName" : "0.0.3",
+ "versionCode" : 3,
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "renderer" : "auto",
+ "orientation" : [ "portrait-primary" ],
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : true,
+ "waiting" : false,
+ "autoclose" : true,
+ "delay" : 0
+ },
+ "safearea" : {
+ "background" : "#CCCCCC",
+ "bottom" : {
+ "offset" : "none|auto"
+ },
+ "left" : {
+ "offset" : "none|auto"
+ },
+ "right" : {
+ "offset" : "none|auto"
+ }
+ },
+ /* 模块配置 */
+ "modules" : {
+ "Camera" : {},
+ "Barcode" : {},
+ "Record" : {},
+ "VideoPlayer" : {}
+ },
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "permissions" : [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ /* ios打包配置 */
+ "ios" : {
+ "dSYMs" : false
+ },
+ /* SDK配置 */
+ "sdkConfigs" : {},
+ "splashscreen" : {
+ "androidStyle" : "common",
+ "android" : {
+ "hdpi" : "src/static/images/login/open.9.png",
+ "xhdpi" : "src/static/images/login/open.9.png",
+ "xxhdpi" : "src/static/images/login/open.9.png"
+ },
+ "useOriginalMsgbox" : true
+ }
+ }
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "",
+ "setting" : {
+ "urlCheck" : false
+ },
+ "usingComponents" : true
+ },
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "vueVersion" : "3"
+}
diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue
index 6ebc258e..e3c64d40 100644
--- a/src/pages/competition/matching.vue
+++ b/src/pages/competition/matching.vue
@@ -8,7 +8,7 @@
-
+
{{ data_info.isAnony === 'N' ? '不匿名' : '匿名' }}
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index b09b748d..2514c9f8 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -49,7 +49,7 @@
- 签到
+ 签到
已签
diff --git a/上架信息/应用截图/2064-2752/1.png b/上架信息/应用截图/2064-2752/1.png
new file mode 100644
index 00000000..6ed317c8
Binary files /dev/null and b/上架信息/应用截图/2064-2752/1.png differ
diff --git a/上架信息/应用截图/2064-2752/2.png b/上架信息/应用截图/2064-2752/2.png
new file mode 100644
index 00000000..9bc1653b
Binary files /dev/null and b/上架信息/应用截图/2064-2752/2.png differ
diff --git a/上架信息/应用截图/2064-2752/3.png b/上架信息/应用截图/2064-2752/3.png
new file mode 100644
index 00000000..3c7650db
Binary files /dev/null and b/上架信息/应用截图/2064-2752/3.png differ
diff --git a/上架信息/应用截图/2064-2752/4.png b/上架信息/应用截图/2064-2752/4.png
new file mode 100644
index 00000000..40d858d1
Binary files /dev/null and b/上架信息/应用截图/2064-2752/4.png differ