From 3083c25ca404d26ec43b02d97251b2e8ade9c5d8 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 14 Jun 2019 16:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1001743=E3=80=91C=E7=AB=AF=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E5=90=8D-=E5=9B=BA=E5=AE=9A=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=AE=BE=E7=BD=AE=E4=B8=8B=E5=BD=93=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A=E6=97=B6=EF=BC=8C=E6=8A=A5?= =?UTF-8?q?=E5=90=8D=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [签到][增加]:[增加签到的页面] --- app.json | 1 + pages/acSignIn/index.js | 55 +++++++++++++++++++++ pages/acSignIn/index.json | 3 ++ pages/acSignIn/index.wxml | 10 ++++ pages/acSignIn/index.wxss | 71 +++++++++++++++++++++++++++ pages/getuserinfo/index.js | 6 +++ pages/index/index.js | 9 ++++ pages/radetail/index.js | 12 +++-- pages/radetail/index.wxml | 14 +++--- pages/radetail/index.wxss | 45 +++-------------- pages/radetail/joinActivity/edit.wxml | 3 +- pages/radetail/joinActivity/edit.wxss | 3 +- pages/radetail/success/index.js | 5 ++ pages/radetail/success/index.wxml | 2 +- 14 files changed, 186 insertions(+), 53 deletions(-) create mode 100644 pages/acSignIn/index.js create mode 100644 pages/acSignIn/index.json create mode 100644 pages/acSignIn/index.wxml create mode 100644 pages/acSignIn/index.wxss diff --git a/app.json b/app.json index 2358f2c..26755a1 100644 --- a/app.json +++ b/app.json @@ -11,6 +11,7 @@ "pages/spellGroup/spellGroup", "pages/complete/index", "pages/topicDetail/index", + "pages/acSignIn/index", "pages/main/index", "pages/index/searchbar/index", "pages/index/merchantList/index", diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js new file mode 100644 index 0000000..8975fcb --- /dev/null +++ b/pages/acSignIn/index.js @@ -0,0 +1,55 @@ +const util = require("../../utils/util.js"); +const Http = require("../../utils/HttpBasics"); +const config = require("../../config/config"); +Page({ + /** + * 页面的初始数据 + */ + data: { + showPage: false, + showPage1:false + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + let that = this; + if(options&&options.id){ + that.signIn(options.id); + that.setData({ + id:options.id + }) + } + }, + signIn(id){ + let that = this; + Http.post({ + url: config.api.activitySign, + data: { + activityId:id + } + }).then(res => { + console.log(res) + that.setData({ + showPage:true + }) + }).catch(err=>{ + console.log(err); + that.setData({ + showPage1: true + }) + }) + }, + //跳转到报名详情页 + goSignUp(e) { + let activityId = e.currentTarget.dataset.id; + wx.navigateTo({ + url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, + }) + }, + goback: function () { + wx.switchTab({ + url: '/pages/main/index', + }) + }, +}) \ No newline at end of file diff --git a/pages/acSignIn/index.json b/pages/acSignIn/index.json new file mode 100644 index 0000000..5f0c9e6 --- /dev/null +++ b/pages/acSignIn/index.json @@ -0,0 +1,3 @@ +{ + "navigationBarTitleText": "签到" +} \ No newline at end of file diff --git a/pages/acSignIn/index.wxml b/pages/acSignIn/index.wxml new file mode 100644 index 0000000..5d4b765 --- /dev/null +++ b/pages/acSignIn/index.wxml @@ -0,0 +1,10 @@ + + 签到成功 + + + + + 对不起,您未报名参加该活动 + + + \ No newline at end of file diff --git a/pages/acSignIn/index.wxss b/pages/acSignIn/index.wxss new file mode 100644 index 0000000..5214773 --- /dev/null +++ b/pages/acSignIn/index.wxss @@ -0,0 +1,71 @@ +.success text{ + display: block; + text-align: center; +} +.tit{ + font-size: 40rpx; + font-weight:bold; +} +.mess{ + margin-top: 40rpx; + font-size: 30rpx; +} +.fl{ + float: left; +} +.fr{ + float: right; +} +.goback{ + width:400rpx!important; + height:80rpx; + line-height: 80rpx; + border-radius:10rpx; + background: orange; + color: #fff; + font-size: 32rpx; + margin-top: 20rpx; +} +.btns { + padding-bottom: 37rpx; + padding-top: 37rpx; + z-index: 100; + background: #fff; + width: 625rpx; + margin:100rpx auto 0; +} +.success{ + margin-top: 200rpx; +} +.btns > button { + width: 277rpx; + height: 95rpx; + border-radius: 10rpx; + text-align: center; +} + +.btns .fl { + margin-left: 20rpx; + color: #fff; + background: rgba(255, 169, 2, 1); + box-shadow: 0px 8px 8px 1px rgba(255, 169, 2, 0.32); +} + +.btns .fl text { + display: block; + font-size: 30rpx; + line-height: 34rpx; +} + +.btns .fl text:nth-of-type(1) { + margin-top: 12rpx; +} + +.btns .fr { + font-size: 30rpx; + color: #fff; + margin-right: 20rpx; + line-height: 95rpx; + background: rgba(236, 59, 45, 1); + box-shadow: 0px 8px 8px 1px rgba(246, 93, 51, 0.32); +} \ No newline at end of file diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 2e49308..cc47711 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -133,6 +133,12 @@ Page({ url: `/pages/radetail/index?id=${that.data.optionData.id}`, }) } + // 报名签到 + else if (that.data.optionData.id && app.globalData.type == 'si') { + wx.redirectTo({ + url: `/pages/acSignIn/index?id=${that.data.optionData.id}`, + }) + } // 门店详情 else if (that.data.optionData.id && app.globalData.type == 'md') { wx.redirectTo({ diff --git a/pages/index/index.js b/pages/index/index.js index 2986528..d9da88c 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -68,6 +68,9 @@ Page({ } else if (options.type == 'ra') { //活动详情 options.id = this.data.newArr[2]; + } else if (options.type == 'si') { + //活动签到 + options.id = this.data.newArr[2]; } } } @@ -167,6 +170,12 @@ Page({ url: `/pages/radetail/index?id=${options.id}`, }) } + //活动签到 + else if (options && options.id && app.globalData.type == 'si') { + wx.redirectTo({ + url: `/pages/acSignIn/index?id=${options.id}`, + }) + } // 宣传页详情 else if (options && options.bt && options.id && app.globalData.type == 'bd') { if (options.bt == '2') { diff --git a/pages/radetail/index.js b/pages/radetail/index.js index b79bb35..8b7f4bc 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -36,11 +36,13 @@ Page({ that.setData({ data: res.data.activity }) - if (res.data && res.data.activity && res.data.activity.question){ - that.setData({ - question: JSON.parse(res.data.activity.question) - }) - } + + that.setData({ + activityStartTime:util.formatTime(res.data.activity.activityStartTime, "yyyy-MM-dd hh:mm:ss"), + activityEndTime:util.formatTime(res.data.activity.activityEndTime, "yyyy-MM-dd hh:mm:ss"), + startTime: util.formatTime(res.data.activity.startTime, "yyyy-MM-dd hh:mm:ss"), + endTime: util.formatTime(res.data.activity.endTime, "yyyy-MM-dd hh:mm:ss") + }) if (res.data.activity.type == 2) { wx.request({ url: configUrls + config.api.acPrintHtmlById, diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 0d91bb0..376936e 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -13,13 +13,13 @@ {{data.subTitle}} 活动说明 - {{data.detail}} + {{data.detail}} - 活动人数:30人 - 活动开始时间:2019.06.11 08:11:30 - 活动结束时间:2019.06.11 08:11:30 - 报名开始时间:2019.06.11 08:11:30 - 报名结束时间:2019.06.11 08:11:30 + 活动人数:{{data.personLimit}}人 + 活动开始时间:{{activityStartTime}} + 活动结束时间:{{activityEndTime}} + 报名开始时间:{{startTime}} + 报名结束时间:{{endTime}} @@ -31,6 +31,6 @@ - + \ No newline at end of file diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss index 4b408b9..054e015 100644 --- a/pages/radetail/index.wxss +++ b/pages/radetail/index.wxss @@ -23,7 +23,6 @@ .act { position: relative; - z-index: 1000000000; background: #fff; border-radius: 12rpx; width: 705rpx; @@ -85,13 +84,6 @@ letter-spacing: 0; margin: 0 auto; } - -.orbg { - position: absolute; - top: 256rpx; - z-index: 1000000; -} - .banner text { position: absolute; right: 0; @@ -563,6 +555,7 @@ button::after{ border: none; } .coupons { width: 100%; position: relative; + margin-bottom: 160rpx; } .coupons-body { @@ -584,11 +577,9 @@ button::after{ border: none; } .act { position: relative; - z-index: 1000000000; background: #fff; border-radius: 12rpx; width: 705rpx; - /* height: 212rpx; */ margin: 24rpx auto 0; padding-bottom: 20rpx; } @@ -652,12 +643,6 @@ button::after{ border: none; } margin: 0 auto; } -.orbg { - position: absolute; - top: 256rpx; - z-index: 1000000; -} - .banner text { position: absolute; right: 0; @@ -1096,28 +1081,6 @@ scroll-view { font-size: 26rpx; line-height: 15rpx; } -button::after{ border: none; } -.goback{ - position: fixed; - right: 50rpx; - bottom: 60rpx; - width:100rpx!important; - height:100rpx; - z-index: 100; - background:rgba(255,255,255,1); - line-height: 95rpx; - border:1rpx solid rgba(227,227,227,1); - border-radius:50%; -} -.goback image{ - position: absolute; - width: 60rpx; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; -} .signUp{ position: fixed; bottom: 30rpx; @@ -1150,4 +1113,10 @@ button::after{ border: none; } font-size: 40rpx; border-top:6rpx solid orange; margin: 20rpx auto 0; +} +.detail{ + font-size: 26rpx; + line-height: 40rpx; + margin-bottom: 20rpx; + color: #666; } \ No newline at end of file diff --git a/pages/radetail/joinActivity/edit.wxml b/pages/radetail/joinActivity/edit.wxml index 40e08b8..393fde9 100644 --- a/pages/radetail/joinActivity/edit.wxml +++ b/pages/radetail/joinActivity/edit.wxml @@ -26,7 +26,8 @@ 调查问卷 - {{index+1}}.{{item.ques}} + + {{item.ques}} diff --git a/pages/radetail/joinActivity/edit.wxss b/pages/radetail/joinActivity/edit.wxss index 383eb3b..267e537 100644 --- a/pages/radetail/joinActivity/edit.wxss +++ b/pages/radetail/joinActivity/edit.wxss @@ -92,7 +92,7 @@ radio { } .ques text{ display: block; - text-align: center; + text-align: left; } .questionTitle{ width: 180rpx; @@ -100,6 +100,7 @@ radio { border-top:6rpx solid orange; border-bottom:6rpx solid orange; margin: 40rpx auto 0; + text-align: center!important; } .ques text{ display: block; diff --git a/pages/radetail/success/index.js b/pages/radetail/success/index.js index 9800a86..7c26ad7 100644 --- a/pages/radetail/success/index.js +++ b/pages/radetail/success/index.js @@ -20,6 +20,11 @@ Page({ index1: 0, showPage:false }, + gotomyAc(){ + wx.navigateTo({ + url: '/pages/user/myactivity/index', + }) + }, /** * 获得生日 */ diff --git a/pages/radetail/success/index.wxml b/pages/radetail/success/index.wxml index fb14756..9da840c 100644 --- a/pages/radetail/success/index.wxml +++ b/pages/radetail/success/index.wxml @@ -7,7 +7,7 @@ - \ No newline at end of file