diff --git a/src/components/points-and-badge/badge.vue b/src/components/points-and-badge/badge.vue index 3263cdd5..4f12ec4c 100644 --- a/src/components/points-and-badge/badge.vue +++ b/src/components/points-and-badge/badge.vue @@ -1,82 +1,104 @@ diff --git a/src/components/points-and-badge/points.vue b/src/components/points-and-badge/points.vue index a3e5ec65..c333c690 100644 --- a/src/components/points-and-badge/points.vue +++ b/src/components/points-and-badge/points.vue @@ -18,7 +18,7 @@ +{{showData.num}} - {{showData.tip}} + {{showData.message}} { + + } ); }; defineExpose({ open, close }); diff --git a/src/manifest.json b/src/manifest.json index 3013d5af..5bb0c580 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,89 +1,101 @@ { - "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 - }, - /* 模块配置 */ - "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" -} + "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 diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue index acca313e..cbaf7efd 100644 --- a/src/pages/me/index.vue +++ b/src/pages/me/index.vue @@ -48,7 +48,8 @@ 工号:{{ user_info.loginName }} - 签到 + + 签到 已签 @@ -159,7 +160,7 @@ @confirm="avatarOnConfirm" > - + @@ -183,7 +184,7 @@ import checkIn from '@/components/points-and-badge/check-in'; import badge from '@/components/points-and-badge/badge'; import points from '@/components/points-and-badge/points'; - import {pop_up_time} from '@/enum'; + import { pop_up_time } from '@/enum'; const { avatarCropperUrl, click_update_avatar, avatarCropperStatus, avatarOnCancel, avatarOnConfirm } = useUpdateAvatar({ success: (userData) => { user_info.imageAddr = userData.imageAddr; @@ -246,6 +247,20 @@ // 签到打开 const checkInClick = () => { checkInRef.value.open(user_info.checkInToday, user_info.checkInDays); + + // badgeRef.value.open( + // [], + // [ + // { + // pointsBadgeImg: '/traoss/tras3/show/S3F0250181220722025110713501700000661177', + // pointsBadgeName: '黄金徽章' + // }, + // { + // pointsBadgeImg: '/traoss/tras3/show/S3F0250181220722025110713501700000661177', + // pointsBadgeName: '黄金徽章2' + // } + // ] + // ); }; // 签到成功回调 const checkInFun = (status, pointsList = [], badgesList = []) => { @@ -254,7 +269,13 @@ } pointsRef.value.open(pointsList, badgesList); }; - + const badgeConfirm = (status, pointsList = [], badgesList = []) => { + // nextTick(() => { + // badgeRef.value.close(); + // }) + + badgeRef.value.close(); + }; // 积分确认 const pointsConfirm = (status, pointsList = [], badgesList = []) => { console.log('xxx', status, pointsList, badgesList); diff --git a/src/pages/pointsAndRank/rank.vue b/src/pages/pointsAndRank/rank.vue index 4289dc86..7fad4a3d 100644 --- a/src/pages/pointsAndRank/rank.vue +++ b/src/pages/pointsAndRank/rank.vue @@ -24,7 +24,7 @@ 当前段位:{{dataInfo.currentRankName}} 我的累计积分: - {{dataInfo.currentPoints}}/{{dataInfo.countPoints}} + {{dataInfo.countPoints}} diff --git a/src/static/images/test/xz.png b/src/static/images/test/xz.png index f5081577..13cfd3c6 100644 Binary files a/src/static/images/test/xz.png and b/src/static/images/test/xz.png differ diff --git a/src/static/images/test/xz1.png b/src/static/images/test/xz1.png new file mode 100644 index 00000000..a77a124a Binary files /dev/null and b/src/static/images/test/xz1.png differ diff --git a/src/static/images/test/xz2.png b/src/static/images/test/xz2.png new file mode 100644 index 00000000..82ed1ae9 Binary files /dev/null and b/src/static/images/test/xz2.png differ diff --git a/src/static/images/test/xz3.png b/src/static/images/test/xz3.png new file mode 100644 index 00000000..7bf9600f Binary files /dev/null and b/src/static/images/test/xz3.png differ diff --git a/src/static/images/test/xz4.png b/src/static/images/test/xz4.png new file mode 100644 index 00000000..0012f157 Binary files /dev/null and b/src/static/images/test/xz4.png differ diff --git a/src/static/images/test/xz5.png b/src/static/images/test/xz5.png new file mode 100644 index 00000000..b86ad563 Binary files /dev/null and b/src/static/images/test/xz5.png differ