From e4991358b8523b06e81638da52d65af6cd4d4d64 Mon Sep 17 00:00:00 2001 From: guoguoyaa Date: Fri, 4 Mar 2022 18:09:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?"=E6=88=91=E7=9A=84"=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mindspore/config/services-config.js | 6 ++++++ src/mindspore/package-my/events/my-list.js | 19 +++++++++++++++-- src/mindspore/package-my/events/my-list.wxml | 3 +-- src/mindspore/package-my/events/my-list.wxss | 19 +++++++++++++++-- src/mindspore/pages/my/my.js | 22 ++++++++++---------- 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/mindspore/config/services-config.js b/src/mindspore/config/services-config.js index 5eba276..d5b462a 100644 --- a/src/mindspore/config/services-config.js +++ b/src/mindspore/config/services-config.js @@ -110,6 +110,9 @@ var commonServiceConfig = { // 我的待发布活动列表（发布中） MY_WAITING_ACTIVITIES:'/mywaitingactivities/', + // 待发布活动列表（超级管理员） + WAITING_ACTIVITIES:'/waitingactivities/', + // 活动收藏列表（已收藏） ACTIVITY_COLLECTIONS:'/activitycollections/', @@ -161,6 +164,9 @@ var commonServiceConfig = { // 修改日程 EVENT_COLLECT: '/collectactivity/', + // 收藏活动： + EVENT_COLLECTS:'/activity/action/collect/', + // 修改日程 EVENT_UNCOLLECT: '/collectactivitydel/{id}/', diff --git a/src/mindspore/package-my/events/my-list.js b/src/mindspore/package-my/events/my-list.js index 1684d4e..0a2234e 100644 --- a/src/mindspore/package-my/events/my-list.js +++ b/src/mindspore/package-my/events/my-list.js @@ -9,7 +9,7 @@ let remoteMethods = { if (that.data.type == 4) { service = 'DRAFTS'; } else if (that.data.type == 1) { - service = 'MY_WAITING_ACTIVITIES'; + service = 'WAITING_ACTIVITIES'; } else if (that.data.type == 5) { service = 'MY_WAITING_ACTIVITIES'; } else if (that.data.type == 2) { @@ -64,7 +64,7 @@ let remoteMethods = { appAjax.postJson({ autoShowWait: true, type: 'POST', - service: 'EVENT_COLLECT', + service: 'EVENT_COLLECTS', data: { activity: that.data.curId, }, @@ -158,7 +158,15 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + let that=this remoteMethods.getList((res) => { + res.forEach(item=>{ + if(item.start_date==item.end_date){ + item.date=that.timefomart(item.start_date) + }else{ + item.date=that.timefomart(item.start_date)+'—'+that.timefomart(item.end_date) + } + }) this.setData({ list: res, }); @@ -346,4 +354,11 @@ Page({ url: `/package-my/events/send-email?id=${e.currentTarget.dataset.id}`, }); }, + timefomart:function(time){ + if(time){ + return time.slice(5).replace('-','月')+'日' + }else{ + return null + } + } }); diff --git a/src/mindspore/package-my/events/my-list.wxml b/src/mindspore/package-my/events/my-list.wxml index 6e32395..6e1442b 100644 --- a/src/mindspore/package-my/events/my-list.wxml +++ b/src/mindspore/package-my/events/my-list.wxml @@ -34,7 +34,6 @@ - @@ -95,7 +94,7 @@ 活动一经发布，暂不支持自行下架删除。如有需要，请联系 - 小助手 (微信号openeuler123) + 小助手 (微信号mindspore0328) 下架活动 diff --git a/src/mindspore/package-my/events/my-list.wxss b/src/mindspore/package-my/events/my-list.wxss index 24bb050..8f94884 100644 --- a/src/mindspore/package-my/events/my-list.wxss +++ b/src/mindspore/package-my/events/my-list.wxss @@ -119,7 +119,19 @@ page { display: flex; } -.container .event-list-wrapper .event-item .body .right .button,.buttons button { +.container .event-list-wrapper .event-item .body .right .button button { + height: 68rpx; + min-width: 144rpx; + width: fit-content; + text-align: center; + line-height: 68rpx; + color: #fff; + background-color: #40ADFF; + border-radius: 8rpx; + font-size: 28rpx; + display: inline-block; +} +.container .event-list-wrapper .event-item .body .right .buttons button { height: 68rpx; min-width: 144rpx; width: fit-content; @@ -132,7 +144,10 @@ page { display: inline-block; } -.container .event-list-wrapper .event-item .body .right .button,.buttons .register { +.container .event-list-wrapper .event-item .body .right .button .register { + background-color: #6682ca; +} +.container .event-list-wrapper .event-item .body .right .buttons .register { background-color: #6682ca; } diff --git a/src/mindspore/pages/my/my.js b/src/mindspore/pages/my/my.js index 15db920..bb288b5 100644 --- a/src/mindspore/pages/my/my.js +++ b/src/mindspore/pages/my/my.js @@ -61,18 +61,18 @@ Page({ avatarUrl: sessionUtil.getUserInfoByKey('avatarUrl'), nickName: sessionUtil.getUserInfoByKey('nickName'), level: sessionUtil.getUserInfoByKey('level'), - avtivityLevel:2, // sessionUtil.getUserInfoByKey('eventLevel') - }); - remoteMethods.getMyMeeting((res) => { - this.setData({ - meetingCount: res.length, - }); - }); - remoteMethods.getMyCollect((res) => { - this.setData({ - collectCount: res.length, - }); + avtivityLevel:sessionUtil.getUserInfoByKey('eventLevel'), // sessionUtil.getUserInfoByKey('eventLevel') }); + // remoteMethods.getMyMeeting((res) => { + // this.setData({ + // meetingCount: res.length, + // }); + // }); + // remoteMethods.getMyCollect((res) => { + // this.setData({ + // collectCount: res.length, + // }); + // }); remoteMethods.getCounts((res)=>{ this.setData({ collectedActivitiesCount: res.collected_activities_count||0, -- Gitee From 7096bc5be51e5f17f88c30ea553e24ba6a56b4bc Mon Sep 17 00:00:00 2001 From: guoguoyaa Date: Mon, 7 Mar 2022 17:30:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mindspore/app.js | 9 ++- src/mindspore/app.json | 4 +- src/mindspore/config/services-config.js | 3 + .../package-events/events/sign-success.js | 63 ++++++++++++++++ .../package-events/events/sign-success.json | 3 + .../package-events/events/sign-success.wxml | 14 ++++ .../package-events/events/sign-success.wxss | 71 ++++++++++++++++++ src/mindspore/package-events/events/sign.js | 46 ++++++++++++ src/mindspore/package-events/events/sign.json | 3 + src/mindspore/package-events/events/sign.wxml | 9 +++ src/mindspore/package-events/events/sign.wxss | 64 ++++++++++++++++ src/mindspore/project.private.config.json | 9 ++- .../static/reserve/meeting-success.png | Bin 0 -> 25578 bytes 13 files changed, 295 insertions(+), 3 deletions(-) create mode 100644 src/mindspore/package-events/events/sign-success.js create mode 100644 src/mindspore/package-events/events/sign-success.json create mode 100644 src/mindspore/package-events/events/sign-success.wxml create mode 100644 src/mindspore/package-events/events/sign-success.wxss create mode 100644 src/mindspore/package-events/events/sign.js create mode 100644 src/mindspore/package-events/events/sign.json create mode 100644 src/mindspore/package-events/events/sign.wxml create mode 100644 src/mindspore/package-events/events/sign.wxss create mode 100644 src/mindspore/static/reserve/meeting-success.png diff --git a/src/mindspore/app.js b/src/mindspore/app.js index bbe3e3d..37eb701 100644 --- a/src/mindspore/app.js +++ b/src/mindspore/app.js @@ -1,6 +1,6 @@ //app.js App({ - onLaunch: function () { + onLaunch: function (options) { var self = this; wx.getSystemInfo({ success(res) { @@ -9,6 +9,13 @@ App({ } }, }); + console.log("options:",options) + if(options.scene == 1011){ + //这里写入相关业务代码 + wx.navigateTo({ + url:`/package-events/events/sign-success?id=5` + }); + } }, onShow() {}, loginCallback: null, diff --git a/src/mindspore/app.json b/src/mindspore/app.json index 0e54d42..042d93b 100644 --- a/src/mindspore/app.json +++ b/src/mindspore/app.json @@ -40,7 +40,9 @@ "sign-up/sign-up-success", "events/poster", "sign-up/career-direction", - "sign-up/career-name" + "sign-up/career-name", + "events/sign", + "events/sign-success" ] }, { diff --git a/src/mindspore/config/services-config.js b/src/mindspore/config/services-config.js index d5b462a..f2d56d1 100644 --- a/src/mindspore/config/services-config.js +++ b/src/mindspore/config/services-config.js @@ -202,6 +202,9 @@ var commonServiceConfig = { // 获取我的活动报名信息 GET_SIGNUP_INFO: '/ticket/{id}/', + + // 活动签到 + SIGN:'/sign/' }; let servicesConfig = _.deepExtend(true, commonServiceConfig); diff --git a/src/mindspore/package-events/events/sign-success.js b/src/mindspore/package-events/events/sign-success.js new file mode 100644 index 0000000..7978f09 --- /dev/null +++ b/src/mindspore/package-events/events/sign-success.js @@ -0,0 +1,63 @@ +// package-events/events/sign-success.js +const appAjax = require('./../../utils/app-ajax'); + +let that = null; +let remoteMethods = { + sign: function (_callback) { + let service = 'SIGN'; + appAjax.postJson({ + autoShowWait: true, + type: 'POST', + service, + data: { + activity: that.data.id + }, + success: function (ret) { + _callback && _callback(ret); + } + }); + } +} +Page({ + + /** + * 页面的初始数据 + */ + data: { + status: 0, + id: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + that = this; + this.setData({ + id: options.id || decodeURIComponent(options.scene) + }) + remoteMethods.sign((res) => { + if(res.code === 400) { + this.setData({ + status: 1 + }) + } + + if(res.code === 201) { + this.setData({ + status: 2 + }) + } + }) + }, + back() { + wx.switchTab({ + url: '/pages/events/events' + }) + }, + toSignUp() { + wx.redirectTo({ + url: `/package-events/sign-up/sign-up?isScan=1&id=${this.data.id}` + }) + } +}) \ No newline at end of file diff --git a/src/mindspore/package-events/events/sign-success.json b/src/mindspore/package-events/events/sign-success.json new file mode 100644 index 0000000..52fe570 --- /dev/null +++ b/src/mindspore/package-events/events/sign-success.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "活动签到" +} \ No newline at end of file diff --git a/src/mindspore/package-events/events/sign-success.wxml b/src/mindspore/package-events/events/sign-success.wxml new file mode 100644 index 0000000..7218948 --- /dev/null +++ b/src/mindspore/package-events/events/sign-success.wxml @@ -0,0 +1,14 @@ + + + + 您还未报名该活动，赶快去报名吧！ + + + + + 签到成功！ + 快去参加活动吧 + + + + diff --git a/src/mindspore/package-events/events/sign-success.wxss b/src/mindspore/package-events/events/sign-success.wxss new file mode 100644 index 0000000..ab1b0ca --- /dev/null +++ b/src/mindspore/package-events/events/sign-success.wxss @@ -0,0 +1,71 @@ +/* package-events/events/sign-success.wxss */ +/* package-events/events/sign.wxss */ +page { + background-color: #f5f7fa !important; +} + +.container { + padding: 0 !important; +} + +.container button { + width: 500rpx; + height: 90rpx; + line-height: 90rpx; + text-align: center; + color: #fff; + background-color: #40ADFF; + border-radius: 8rpx; +} + +.container .post-wrapper { + width: 750rpx; + height: 1312rpx; + background-size: 100% 100% !important; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; + background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/sign/sign-bg.png) no-repeat; +} + +.container .post-wrapper .text { + margin-top: 660rpx; + color: #333; + font-size: 28rpx; + line-height: 40rpx; +} + +.container .post-wrapper button { + margin-top: 128rpx; +} + +.container .success-wrapper { + display: flex; + flex-direction: column; + align-items: center; +} + +.container .success-img { + width: 234rpx; + height: 218rpx; + margin-top: 406rpx; +} + +.container .success-text { + margin-top: 15rpx; + font-size: 34rpx; + color: #333; + line-height: 48rpx; +} + +.container .success-desc { + margin-top: 20rpx; + color: #6d7278; + font-size: 28rpx; + line-height: 38rpx; +} + +.container .back { + margin-top: 128rpx; +} \ No newline at end of file diff --git a/src/mindspore/package-events/events/sign.js b/src/mindspore/package-events/events/sign.js new file mode 100644 index 0000000..59fd5af --- /dev/null +++ b/src/mindspore/package-events/events/sign.js @@ -0,0 +1,46 @@ +// package-events/events/sign.js +const appAjax = require('./../../utils/app-ajax'); + +let that = null; +let remoteMethods = { + getDraftDetail: function (_callback) { + let service = 'EVENT_DETAIL'; + appAjax.postJson({ + autoShowWait: true, + type: 'GET', + service, + otherParams: { + id: that.data.id + }, + success: function (ret) { + _callback && _callback(ret); + } + }); + } +} + +Page({ + + /** + * 页面的初始数据 + */ + data: { + id: '', + info: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + that = this; + this.setData({ + id: options.id || '' + }) + remoteMethods.getDraftDetail(res => { + this.setData({ + info: res + }) + }) + } +}) \ No newline at end of file diff --git a/src/mindspore/package-events/events/sign.json b/src/mindspore/package-events/events/sign.json new file mode 100644 index 0000000..52fe570 --- /dev/null +++ b/src/mindspore/package-events/events/sign.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "活动签到" +} \ No newline at end of file diff --git a/src/mindspore/package-events/events/sign.wxml b/src/mindspore/package-events/events/sign.wxml new file mode 100644 index 0000000..9abe02b --- /dev/null +++ b/src/mindspore/package-events/events/sign.wxml @@ -0,0 +1,9 @@ + + + + {{info.title}} + + 扫一扫二维码签到吧！ + + + diff --git a/src/mindspore/package-events/events/sign.wxss b/src/mindspore/package-events/events/sign.wxss new file mode 100644 index 0000000..00cd396 --- /dev/null +++ b/src/mindspore/package-events/events/sign.wxss @@ -0,0 +1,64 @@ +/* package-events/events/sign.wxss */ +page { + background-color: #f5f7fa !important; +} + +.container { + padding: 0 !important; +} + +.container .post-wrapper { + width: 750rpx; + height: 1312rpx; + background-size: 100% 100% !important; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; +} + +.bg1 { + background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg1.png) no-repeat; +} + +.bg2 { + background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg2.png) no-repeat; +} + +.bg3 { + background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg3.png) no-repeat; +} + +.bg4 { + background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg4.png) no-repeat; +} + +.container .post-wrapper .title { + color: #fff; + font-size: 40rpx; + line-height: 48rpx; + margin-top: 173rpx; + text-align: center; +} + +.container .post-wrapper .qrcode { + width: 519rpx; + height: 519rpx; + margin-top: 139rpx; + border-radius: 50%; + background-color: #fff; +} + +.container .post-wrapper .qrcode-text { + font-size: 28rpx; + line-height: 40rpx; + color: #333; + text-align: center; + margin-top: 22rpx; +} + +.container .post-wrapper .logo { + margin-top: 158rpx; + width: 171rpx; + height: 148rpx; +} \ No newline at end of file diff --git a/src/mindspore/project.private.config.json b/src/mindspore/project.private.config.json index 75f8176..177a469 100644 --- a/src/mindspore/project.private.config.json +++ b/src/mindspore/project.private.config.json @@ -36,7 +36,14 @@ "name": "", "pathName": "pages/my/my", "query": "", - "scene": null, + "launchMode": "default", + "scene": null + }, + { + "name": "扫描进入", + "pathName": "pages/my/my", + "query": "", + "scene": 1011, "launchMode": "default" } ] diff --git a/src/mindspore/static/reserve/meeting-success.png b/src/mindspore/static/reserve/meeting-success.png new file mode 100644 index 0000000000000000000000000000000000000000..d8f5a6f342be44b3b0fe889822b7bfc7904fa33a GIT binary patch literal 25578 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 WBH-=)QLl#p0000 Date: Mon, 7 Mar 2022 19:37:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mindspore/app.js | 4 +-- src/mindspore/config/services-config.js | 2 +- .../package-events/events/sign-success.js | 8 +++++ .../package-events/events/sign-success.wxss | 2 +- src/mindspore/package-events/events/sign.wxml | 7 ++-- src/mindspore/package-events/events/sign.wxss | 32 +++++++++++-------- src/mindspore/package-my/events/my-list.js | 5 ++- src/mindspore/package-my/events/my-list.wxml | 2 +- src/mindspore/project.private.config.json | 7 ++++ 9 files changed, 46 insertions(+), 23 deletions(-) diff --git a/src/mindspore/app.js b/src/mindspore/app.js index 37eb701..9debf58 100644 --- a/src/mindspore/app.js +++ b/src/mindspore/app.js @@ -10,10 +10,10 @@ App({ }, }); console.log("options:",options) - if(options.scene == 1011){ + if(options.scene == 1011&&options.query.id){ //这里写入相关业务代码 wx.navigateTo({ - url:`/package-events/events/sign-success?id=5` + url:`/package-events/events/sign-success?id=${options.query.id}` }); } }, diff --git a/src/mindspore/config/services-config.js b/src/mindspore/config/services-config.js index b6f3c71..2fe02cd 100644 --- a/src/mindspore/config/services-config.js +++ b/src/mindspore/config/services-config.js @@ -108,7 +108,7 @@ var commonServiceConfig = { GET_DRAFT_LIST: '/activitiesdraft/', // 我的待发布活动列表（发布中） - MY_WAITING_ACTIVITIES:'/waitingactivities/', + MY_WAITING_ACTIVITIES:'/mywaitingactivities/', // 待发布活动列表（超级管理员） WAITING_ACTIVITIES:'/waitingactivities/', diff --git a/src/mindspore/package-events/events/sign-success.js b/src/mindspore/package-events/events/sign-success.js index 7978f09..67cc6f0 100644 --- a/src/mindspore/package-events/events/sign-success.js +++ b/src/mindspore/package-events/events/sign-success.js @@ -1,5 +1,7 @@ // package-events/events/sign-success.js const appAjax = require('./../../utils/app-ajax'); +const sessionUtil = require('../../utils/app-session.js'); + let that = null; let remoteMethods = { @@ -33,6 +35,12 @@ Page({ */ onLoad: function (options) { that = this; + if (!sessionUtil.getUserInfoByKey('access')) { + wx.navigateTo({ + url: '/pages/auth/auth', + }); + return; + } this.setData({ id: options.id || decodeURIComponent(options.scene) }) diff --git a/src/mindspore/package-events/events/sign-success.wxss b/src/mindspore/package-events/events/sign-success.wxss index ab1b0ca..6baf1a9 100644 --- a/src/mindspore/package-events/events/sign-success.wxss +++ b/src/mindspore/package-events/events/sign-success.wxss @@ -26,7 +26,7 @@ page { flex-direction: column; align-items: center; overflow: hidden; - background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/sign/sign-bg.png) no-repeat; + background: url(https://community-meeting-minutes.obs.cn-north-4.myhuaweicloud.com/imgs/sign-up/bg-sign.png) no-repeat; } .container .post-wrapper .text { diff --git a/src/mindspore/package-events/events/sign.wxml b/src/mindspore/package-events/events/sign.wxml index 9abe02b..31b6e3d 100644 --- a/src/mindspore/package-events/events/sign.wxml +++ b/src/mindspore/package-events/events/sign.wxml @@ -1,9 +1,10 @@ - - {{info.title}} + + + MSG|海外MSG线上活动正式开启 + 扫一扫二维码签到吧！ - diff --git a/src/mindspore/package-events/events/sign.wxss b/src/mindspore/package-events/events/sign.wxss index 00cd396..4995346 100644 --- a/src/mindspore/package-events/events/sign.wxss +++ b/src/mindspore/package-events/events/sign.wxss @@ -9,8 +9,8 @@ page { .container .post-wrapper { width: 750rpx; - height: 1312rpx; - background-size: 100% 100% !important; + height: 1503rpx; + /* background-size: 100% 100% !important; */ display: flex; flex-direction: column; align-items: center; @@ -18,33 +18,37 @@ page { } .bg1 { - background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg1.png) no-repeat; + background: url(https://community-meeting-minutes.obs.cn-north-4.myhuaweicloud.com/imgs/poster/bg1.png) no-repeat; + background-size: cover; } .bg2 { - background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg2.png) no-repeat; + background: url(https://community-meeting-minutes.obs.cn-north-4.myhuaweicloud.com:443/imgs/poster/bg2.png) no-repeat; + background-size: cover; } .bg3 { - background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg3.png) no-repeat; + background: url(https://community-meeting-minutes.obs.cn-north-4.myhuaweicloud.com:443/imgs/poster/bg3.png) no-repeat; + background-size: cover; } .bg4 { - background: url(https://openeuler-website.obs.ap-southeast-1.myhuaweicloud.com/poster/bg4.png) no-repeat; + background: url(https://community-meeting-minutes.obs.cn-north-4.myhuaweicloud.com:443/imgs/poster/bg4.png) no-repeat; + background-size: cover; } .container .post-wrapper .title { color: #fff; font-size: 40rpx; line-height: 48rpx; - margin-top: 173rpx; + margin-top: 186rpx; text-align: center; } .container .post-wrapper .qrcode { - width: 519rpx; - height: 519rpx; - margin-top: 139rpx; + width: 504rpx; + height: 504rpx; + margin-top: 166rpx; border-radius: 50%; background-color: #fff; } @@ -52,13 +56,13 @@ page { .container .post-wrapper .qrcode-text { font-size: 28rpx; line-height: 40rpx; - color: #333; + color: #f5f7fa; text-align: center; margin-top: 22rpx; } .container .post-wrapper .logo { - margin-top: 158rpx; - width: 171rpx; - height: 148rpx; + width: 310rpx; + height: 100rpx; + margin-top: 278rpx; } \ No newline at end of file diff --git a/src/mindspore/package-my/events/my-list.js b/src/mindspore/package-my/events/my-list.js index 0a2234e..6c21a99 100644 --- a/src/mindspore/package-my/events/my-list.js +++ b/src/mindspore/package-my/events/my-list.js @@ -336,8 +336,11 @@ Page({ this.sendEmail(e); } }, - toUpdateSchedules(e){ + toSign(e){ console.log(e) + wx.navigateTo({ + url: `/package-events/events/sign`, + }); }, copyWechat() { wx.setClipboardData({ diff --git a/src/mindspore/package-my/events/my-list.wxml b/src/mindspore/package-my/events/my-list.wxml index 6e1442b..d1d25f8 100644 --- a/src/mindspore/package-my/events/my-list.wxml +++ b/src/mindspore/package-my/events/my-list.wxml @@ -28,7 +28,7 @@ -