| SunshineIns/src/page/ActiveManageEdit.jsx | ●●●●● patch | view | raw | blame | history | |
| SunshineLnsMinApp/pages/activityDetail/activityDetail.js | ●●●●● patch | view | raw | blame | history | |
| SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml | ●●●●● patch | view | raw | blame | history | |
| SunshineLnsMinApp/pages/activityDetail/activityDetail.wxss | ●●●●● patch | view | raw | blame | history | |
| SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js | ●●●●● patch | view | raw | blame | history | |
| SunshineLnsMinApp/pages/myTranslate/myTranslate.js | ●●●●● patch | view | raw | blame | history |
SunshineIns/src/page/ActiveManageEdit.jsx
@@ -118,8 +118,8 @@ return; } if (savedate.activityPhone) { if (!validator.phone(savedate.activityPhone)) { return message.warning("联系电话格式不正确"); if (!savedate.activityPhone) { return message.warning("联系电话不能为空"); } } Fetch.saveActive(savedate) @@ -396,15 +396,8 @@ <Option value='act_3'>普法预约</Option> </Select> </Col> <Col span={12} pull={0}></Col> </Row> </div> <div style={divStyle}> <Row type="flex" align='middle' justify="space-around"> <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>主持人</span></Col> <Col span={6} push={0} ><Input disabled={disabled} placeholder="请输入主持人姓名" style={{ width: '300px' }} name='host' onChange={this.saveInputChange} value={savedate.host || ""} /></Col> <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>报名要求</span></Col> <Col span={6} push={0} ><Input disabled={disabled} placeholder="请输入报名要求" style={{ width: '300px' }} name='requirement' onChange={this.saveInputChange} value={savedate.requirement || ""} /></Col> </Row> </div> @@ -448,6 +441,12 @@ <Col span={18} push={0} ><TextArea disabled={disabled} rows={4} placeholder="请输入活动描述" style={{ width: '92%' }} value={savedate.activityDesc || ""} onChange={this.saveInputChange} name='activityDesc' /></Col> </Row> </div> <div style={divStyle}> <Row type="flex" align='middle' justify="space-around"> <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>报名要求</span></Col> <Col span={18} push={0} ><TextArea disabled={disabled} placeholder="请输入报名要求" style={{ width: '92%' }} name='requirement' onChange={this.saveInputChange} value={savedate.requirement || ""} /></Col> </Row> </div> <div style={divStyle}> <Row type="flex" align='top' justify="space-around"> SunshineLnsMinApp/pages/activityDetail/activityDetail.js
@@ -14,14 +14,16 @@ flag: true, hiddenApply: true, // canApply: true， statusWord: '' statusWord: '', signStatus: '', id: "" }, onLoad: function (options) { var that = this; that.setData({ id: options.id, signStatus: options.signStatus || '', flag: options.flag }) @@ -37,42 +39,48 @@ console.log('传过来',options.flag) // 处理报名状态 if(options.flag == 'true') { //可报名 console.log('可报名') if (res.data.data.activityPersonNum < res.data.data.activityPersonQuota) { if (res.data.data.activityStatus == 1) { that.setData({ canApply: true }) if (options.signStatus) { that.setData({ signStatus: options.signStatus }) }else{ if(options.flag == 'true') { //可报名 console.log('可报名') if (res.data.data.activityPersonNum < res.data.data.activityPersonQuota) { if (res.data.data.activityStatus == 1) { that.setData({ canApply: true }) } if (res.data.data.activityStatus == 2) { that.setData({ canApply: false, statusWord: '活动正在进行' }) } if (res.data.data.activityStatus == 3) { that.setData({ canApply: false, statusWord: '活动已结束' }) } } if (res.data.data.activityStatus == 2) { else{ that.setData({ canApply: false, statusWord: '活动正在进行' statusWord: '报名人数已满' }) } if (res.data.data.activityStatus == 3) { that.setData({ canApply: false, statusWord: '活动已结束' }) } } else{ }else{ //不可报名 console.log('不可报名') that.setData({ canApply: false, statusWord: '报名人数已满' statusWord: '您已报名' }) } }else{ //不可报名 console.log('不可报名') that.setData({ canApply: false, statusWord: '您已报名' }) } } @@ -80,6 +88,52 @@ }) }, // 签到 sign: function () { var id = this.data.id; var userinfo = wx.getStorageSync("user"); var userId = userinfo.id; // 只允许从相机扫码 wx.scanCode({ onlyFromCamera: true, success(res) { console.log(res) wx.showLoading({ title: '识别中', }) wx.request({ url: app.globalData.url + '/api/activity/sign?id'+id+'&code='+res.result+'&userId='+userId, method: 'GET', header: { "Content-Type": "application/json" }, success: function (res) { wx.hideLoading(); if (res.data.code == 0) { wx.showToast({ title: '签到成功！', icon: 'success', duration: 2000 }) } else { wx.showToast({ title: '报名失败,请稍后重试!', icon: 'none' }) } } }) } }) }, // 返回 goBack: function () { wx.navigateBack({ delta: 1 }); }, apply: function () { // wx.navigateTo({ // url: '../apply/apply', SunshineLnsMinApp/pages/activityDetail/activityDetail.wxml
@@ -1,69 +1,82 @@ <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" width="100%" height="32vh" duration="{{duration}}"> <block wx:for="{{activity.attList}}" wx:key="{{item.attId}}"> <swiper-item> <image src="{{item.imgPath}}" class="slide-image" mode="aspectFit"/> </swiper-item> </block> <block wx:for="{{activity.attList}}" wx:key="{{item.attId}}"> <swiper-item> <image src="{{item.imgPath}}" class="slide-image" mode="aspectFit" /> </swiper-item> </block> </swiper> <view class="activityDetail-main"> <view class="headLineTitle"> {{activity.activityTitle}} </view> <view class="headLineInfo"> {{activity.startTime}} <text decode="{{true}}" space="{{true}}"> </text> <view class="info-viewer">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view> </view> <view class="headLineInfo"> {{activity.activityAddress}} </view> <view class="headLineTitle"> {{activity.activityTitle}} </view> <view class="headLineInfo"> {{activity.startTime}} <text decode="{{true}}" space="{{true}}"> </text> <view class="info-viewer">{{activity.activityPersonNum}}/{{activity.activityPersonQuota}}人</view> </view> <view class="headLineInfo"> {{activity.activityAddress}} </view> </view> <div class="index-gray tel-area"> <view>南沙区人民检察院新媒办</view> <image src="{{tel}}" bindtap='call'></image> <view>南沙区人民检察院新媒办</view> <image src="{{tel}}" bindtap='call'></image> </div> <view class="activityDetail-main"> <view class="activityDetail-content"> {{activity.activityDesc}} </view> <view class="activityDetail-content"> {{activity.activityDesc}} </view> </view> <!-- 我要报名窗口 --> <block wx:if="{{canApply == true}}"> <view class="activityDetail-apply" hidden="{{!hiddenApply}}"> <div class="activityDetail-main-buttton" bindtap="apply">我要报名</div> </view> </block> <!-- 不满足条件不可报名的各种情况 --> <block wx:if="{{statusWord}}"> <view class="activityDetail-apply"> <div class="activityDetail-main-buttton">{{statusWord}}</div> </view> </block> <view wx:if="{{signStatus}}"> <div class="submit" bindtap='submit'>提交报名</div> <view wx:if="{{signStatus == 2}}"> <view class="submit" bindtap='sign'>签到</view> </view> <view wx:else> <view class="submit bg-grey" bindtap='goBack'>返回</view> </view> </view> <view wx:else> <!-- 我要报名窗口 --> <block wx:if="{{canApply == true}}"> <view class="activityDetail-apply" hidden="{{!hiddenApply}}"> <div class="activityDetail-main-buttton" bindtap="apply">我要报名</div> </view> </block> <!-- 不满足条件不可报名的各种情况 --> <block wx:if="{{statusWord}}"> <view class="activityDetail-apply"> <div class="activityDetail-main-buttton">{{statusWord}}</div> </view> </block> </view> <view hidden="{{hiddenApply}}"> <div class="apply"> <div class="apply-message"> <span></span> <span>报名信息</span> </div> <div class="apply"> <div class="apply-message"> <span></span> <span>报名信息</span> </div> <div class="apply-list"> <div class="apply-list-left">姓名</div> <input data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}' placeholder='请输入姓名'></input> </div> <div class="apply-list"> <div class="apply-list-left">电话号码</div> <input data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}' placeholder='请输入电话号码'></input> </div> </div> <div class="apply-list"> <div class="apply-list-left">姓名</div> <input data-name="proposerName" bindinput="inputChange" value='{{peopleInfo.proposerName}}' placeholder='请输入姓名'></input> </div> <div class="apply-list"> <div class="apply-list-left">电话号码</div> <input data-name="proposerPhone" bindinput="inputChange" value='{{peopleInfo.proposerPhone}}' placeholder='请输入电话号码'></input> </div> </div> <div style="display:flex;justify-content:center;margin:4vh 0"> <div class="submit" bindtap='submit'>提交报名</div> </div> <div style="display:flex;justify-content:center;margin:4vh 0"> <div class="submit" bindtap='submit'>提交报名</div> </div> </view> SunshineLnsMinApp/pages/activityDetail/activityDetail.wxss
@@ -59,7 +59,6 @@ .tel-area{ height: 6vh; margin-top: ; padding: 0 2vh; font-size: 14px; display:flex; SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js
@@ -12,6 +12,7 @@ loading: false, peopleInfo: {}, signStatus: '', id: "" }, /** @@ -121,11 +122,39 @@ // 签到 sign: function () { var id = this.data.id; var userinfo = wx.getStorageSync("user"); var userId = userinfo.id; // 只允许从相机扫码 wx.scanCode({ onlyFromCamera: true, success(res) { console.log(res) wx.showLoading({ title: '识别中', }) wx.request({ url: app.globalData.url + '/api/activity/sign?id'+id+'&code='+res.result+'&userId='+userId, method: 'GET', header: { "Content-Type": "application/json" }, success: function (res) { wx.hideLoading(); if (res.data.code == 0) { wx.showToast({ title: '签到成功！', icon: 'success', duration: 2000 }) } else { wx.showToast({ title: '报名失败,请稍后重试!', icon: 'none' }) } } }) } }) }, SunshineLnsMinApp/pages/myTranslate/myTranslate.js
@@ -100,7 +100,7 @@ var activityType = this.data.dataSet[id].activityType; var signStatus = this.data.dataSet[id].signStatus; var id = this.data.dataSet[id].id; console.log(activityType) console.log(signStatus); if (activityType == "法治培训") { @@ -109,7 +109,7 @@ }) } else if (activityType == "南检活动") { wx.navigateTo({ url: '../scanEvildoing/scanEvildoing?id=' + businessId, url: '../activityDetail/activityDetail?id=' + id + '&signStatus=' + signStatus, }) } else if (activityType == "基地参观") { wx.navigateTo({
