From 65f7050cc019e9bc0b9fb0ae66921831c3c25b92 Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Thu, 9 Jul 2020 17:35:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=B2=E5=9D=9B=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/activity/activity.wxml | 8 +- .../components/activity/activity.wxss | 33 +++++++- .../completeInfoDialog/completeInfoDialog.js | 34 +++++++++ .../completeInfoDialog.json | 3 + .../completeInfoDialog.wxml | 13 ++++ .../completeInfoDialog.wxss | 75 +++++++++++++++++++ .../subpages/education/pages/class/class.js | 2 +- .../pages/classDetail/classDetail.js | 2 - .../pages/classDetail/classDetail.wxml | 20 ++--- 9 files changed, 172 insertions(+), 18 deletions(-) create mode 100644 epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.js create mode 100644 epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.json create mode 100644 epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxml create mode 100644 epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxss diff --git a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxml b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxml index 2ad04b6..187d355 100644 --- a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxml +++ b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxml @@ -29,10 +29,10 @@ - - + {{item.signUpFlagStr}} + 报名 \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss index 8617a6e..2e70007 100644 --- a/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss +++ b/epdc-resident-mp-yushan/subpages/education/components/activity/activity.wxss @@ -73,7 +73,38 @@ position: absolute; z-index: 9999; } - +.unavailableBtn { + width: 130rpx; + height: 50rpx; + right: 20rpx; + margin-top: -75rpx; + background-color:#d7d7d7; + /* object-fit: cover; *//* right: 0; + top: 20rpx; */ + position: absolute; + z-index: 9999; + text-align: center; + color: #fff; + border-radius: 20px; + line-height: 50rpx; + font-size: 24rpx; +} +.availableBtn { + width: 130rpx; + height: 50rpx; + right: 20rpx; + margin-top: -75rpx; + background-color:#f9a404 ; + /* object-fit: cover; *//* right: 0; + top: 20rpx; */ + position: absolute; + z-index: 9999; + text-align: center; + color: #fff; + border-radius: 20px; + line-height: 50rpx; + font-size: 24rpx; +} .infos { display: table-cell; padding: 20rpx 20rpx 10rpx 0rpx; diff --git a/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.js b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.js new file mode 100644 index 0000000..903dfef --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.js @@ -0,0 +1,34 @@ +Component({ + data: { + visible: false + }, + properties: { + completeInfoDialogVisible: { + type: Boolean, + value: false, + observer (value) { + this.setData({ + visible: !this.data.visible + }) + } + } + }, + methods: { + navigateToComplete () { + wx.navigateTo({ + url: '/pages/complete/complete' + }) + this.setData({ + visible: false + }) + }, + closeDialog () { + this.setData({ + visible: false + }) + }, + catchmove () { + + } + } +}) \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.json b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.json new file mode 100644 index 0000000..32640e0 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.json @@ -0,0 +1,3 @@ +{ + "component": true +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxml b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxml new file mode 100644 index 0000000..246e086 --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxml @@ -0,0 +1,13 @@ + + + + + + 提示 + 请先完善用户信息 + + 下次再说 + 立即完善 + + + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxss b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxss new file mode 100644 index 0000000..052a9bf --- /dev/null +++ b/epdc-resident-mp-yushan/subpages/education/components/completeInfoDialog/completeInfoDialog.wxss @@ -0,0 +1,75 @@ +.complete-info-dialog { + width: 100%; + height:100vh; + position: fixed; + left: 0rpx; + top: 0rpx; + background: rgba(0,0,0, 0.6); + display: flex; + justify-content: center; + align-items: center; + z-index: 1000; +} +.complete-info-dialog .content { + width: 530rpx; + border-radius: 16rpx; + background: #fff; + box-sizing: border-box; + padding: 0 20rpx; +} +.complete-info-dialog .content .close-dialog { + width: 100%; + height: 60rpx; + display: flex; + align-items: center; + justify-content: flex-end; +} +.complete-info-dialog .content .close-dialog image { + width:24rpx; + height:24rpx; +} +.complete-info-dialog .content .title { + font-size: 36rpx; + color: #333; + width:100%; + line-height: 60rpx; + height: 60rpx; + text-align: center; + margin-bottom: 27rpx; +} +.complete-info-dialog .content .tip { + font-size: 32rpx; + color: #666; + line-height: 50rpx; + text-align:center; + margin-bottom: 36rpx; +} +.complete-info-dialog .content .operation { + width: 100%; + height: 105rpx; + box-sizing: border-box; + padding: 15rpx 0; + display: flex; + justify-content: space-around; + align-items: center; + border-top: 1rpx solid #eaeaea; +} +.complete-info-dialog .content .operation .cancel { + width: 100%; + height:100%; + text-align: center; + line-height: 75rpx; + font-size: 36rpx; + color: #666; +} +.complete-info-dialog .content .operation .cancel + .confirm { + border-left: 1rpx solid #eaeaea; +} +.complete-info-dialog .content .operation .confirm { + width: 100%; + height:100%; + text-align: center; + line-height: 75rpx; + font-size: 36rpx; + color: #04BCA0; +} \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/education/pages/class/class.js b/epdc-resident-mp-yushan/subpages/education/pages/class/class.js index 1fc8ee8..2434670 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/class/class.js +++ b/epdc-resident-mp-yushan/subpages/education/pages/class/class.js @@ -120,7 +120,7 @@ Page({ } }, navigateToDetail(e){ - let url = '/subpages/education/pages/classDetail/classDetail?id='+e.detail.id+"&showJoin="+(this.data.currentTabIndex===0?'1':"0") + let url = '/subpages/education/pages/classDetail/classDetail?id='+e.detail.id wx.navigateTo({ url: url, }) diff --git a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.js b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.js index 063d81a..5bc67c8 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.js +++ b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.js @@ -25,7 +25,6 @@ Page({ cancelSignupVisible: false, cancelSignupTipValue: '', cancelSignupTipVisible: false, - showJoin:"0" }, onLoad: function(options) { if (options.scene) { @@ -42,7 +41,6 @@ Page({ } this.setData({ id: options.id, - showJoin:options.showJoin }) // this.getDetail();//活动详情 // this.clockList();//打卡列表 diff --git a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml index 06fd8b0..fafae9f 100644 --- a/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml +++ b/epdc-resident-mp-yushan/subpages/education/pages/classDetail/classDetail.wxml @@ -129,14 +129,14 @@ - + 已报名 {{detail.signUpNum}}人 - + @@ -147,20 +147,20 @@ - + - 已报名 + {{detail.signUpFlagStr}} - + - + - + - + \ No newline at end of file