Skip to content

W
wechatapp.shangjiadao.com
Commit 6d16a52e authored by lvtz's avatar lvtz
Browse files
Options

fix

parent 224128ca
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 78 deletions
business/components/commentClockItemShare/index.wxml
View file @ 6d16a52e
......@@ -5,16 +5,16 @@
<view class="modal-share-wrap">
<view class="share-list">
<button class="share-item share-button" open-type="share" data-type="share_clock">
<image src="{{localImageRoot}}2b/themeindex/share_wx.png"></image>
<image src="{{imageRoot}}2b/themeindex/share_wx.png"></image>
<view class="share-item-name">分享给学生(或班级群)</view>
</button>
<view class="share-item" bindtap="goPoster">
<image src="{{localImageRoot}}2b/themeindex/share_poster.png"></image>
<image src="{{imageRoot}}2b/themeindex/share_poster.png"></image>
<view class="share-item-name">生成海报{{shareModalShow}}</view>
</view>
</view>
<view class="close-img" bindtap="closeShareModal">
<image src="{{localImageRoot}}2b/themeindex/close_icon.png"></image>
<image src="{{imageRoot}}2b/themeindex/close_icon.png"></image>
</view>
</view>
</view>
......
business/pages/organizationalmgt/newinfo.wxml
View file @ 6d16a52e
......@@ -45,7 +45,7 @@
<view class="line-item">
<view class="item-label">地址</view>
<view class="right" bindtap="addressSelect">
<image class="icon-address" src="{{localImageRoot}}2b/organizationalmgt/icon_address.png?{{imageVersion}}"></image>
<image class="icon-address" src="{{imageRoot}}2b/organizationalmgt/icon_address.png?{{imageVersion}}"></image>
<view class="iteminput">{{params.province ? params.province+params.city+params.area : '请选择地址'}}</view>
<!-- <image class="arrowsmall" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"></image> -->
</view>
......@@ -62,8 +62,8 @@
<view class="right content-box">
<view class="item-box" wx:for="{{allSubject}}" wx:for-index="idx" wx:for-item="item" wx:key="idx" data-active-item="{{item}}" bindtap="selectSubject" >
<view class="{{selectedSubjectStyle[item.id]?'item-box-inner selectd-item-box-inner':'item-box-inner'}}">{{item.name}}
<image class="icon-select" src="{{localImageRoot}}2b/organizationalmgt/icon_select_active.png?{{imageVersion}}" wx:if="{{selectedSubjectStyle[item.id]}}"></image>
<image class="icon-select" src="{{localImageRoot}}2b/organizationalmgt/icon_select.png?{{imageVersion}}" wx:else></image>
<image class="icon-select" src="{{imageRoot}}2b/organizationalmgt/icon_select_active.png?{{imageVersion}}" wx:if="{{selectedSubjectStyle[item.id]}}"></image>
<image class="icon-select" src="{{imageRoot}}2b/organizationalmgt/icon_select.png?{{imageVersion}}" wx:else></image>
</view>
</view>
</view>
......
business/pages/themead/index.wxml
View file @ 6d16a52e
......@@ -15,7 +15,7 @@
<view class="section-box">
<image class="cover" src="{{filter.imagify(params.cover)}}" mode="aspectFill" />
<view class="change-btn" bindtap="updateBanner">
<image class="icon-pic" src="{{localImageRoot}}2b/themeadd/icon_pic.png?{{imageVersion}}"/>更换图片</view>
<image class="icon-pic" src="{{imageRoot}}2b/themeadd/icon_pic.png?{{imageVersion}}"/>更换图片</view>
</view>
</view>
<view class="section introduce-setting">
......@@ -60,7 +60,7 @@
<image class="img" src="{{filter.imagify(params.img)}}" mode="aspectFill"></image>
</view>
<view class="wx-addbox wx-addbox-empty" wx:else bindtap="updateWxcode">
<image class="icon-add" src="{{localImageRoot}}2b/helpcenter/icon_add.png?{{imageVersion}}"></image>
<image class="icon-add" src="{{imageRoot}}2b/helpcenter/icon_add.png?{{imageVersion}}"></image>
</view>
<view class="qr-text" bindtap="updateWxcode" wx:if="{{params.img}}">更换二维码</view>
</view>
......
business/pages/themead/landpage.wxml
View file @ 6d16a52e
......@@ -45,15 +45,15 @@
<view class="modal-content">
<view class="opt-box">
<button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?id=1" send-message-img="{{imageRoot}}service/works.png?{{imageVersion}}">
<image class="icon-opt" src="{{localImageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
<image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
<view class="item-title">添加微信</view>
</button>
<view class="opt-item" bindtap="bindCall" wx:if="{{landPageInfo.mobile}}">
<image class="icon-opt" src="{{localImageRoot}}2c/themeindex/icon_call.png?{{imageVersion}}"></image>
<image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_call.png?{{imageVersion}}"></image>
<view class="item-title">拨打电话</view>
</view>
</view>
<image class="icon-cancel" src="{{localImageRoot}}2c/themeindex/icon_close.png?{{imageVersion}}" bindtap="bindModalContact"></image>
<image class="icon-cancel" src="{{imageRoot}}2c/themeindex/icon_close.png?{{imageVersion}}" bindtap="bindModalContact"></image>
</view>
</view>
<view class="bottombtnbox">
......
business/pages/themeeditor/chooseclass.wxml
View file @ 6d16a52e
......@@ -13,7 +13,7 @@
<view class="teachername">
<text wx:for="{{item.school_teachers}}" wx:key="id" wx:for-item="teacher">{{teacher.nickname}}</text>
</view>
<image class="selectedicon" src="{{localImageRoot}}2b/common/{{filter.indexOf(classes, item.id) == -1 ? 'notselect' : 'select'}}.png"></image>
<image class="selectedicon" src="{{imageRoot}}2b/common/{{filter.indexOf(classes, item.id) == -1 ? 'notselect' : 'select'}}.png"></image>
</view>
</view>
</view>
......
business/pages/themeeditor/setting.wxml
View file @ 6d16a52e
......@@ -9,7 +9,7 @@
<text class="title" style="color: #999999">(无通知)</text>
</view>
<view class="item-r">
<image class="selectedicon" src="{{localImageRoot}}2b/common/{{join_rule_type == 1 ? 'select1' : 'notselect'}}.png"></image>
<image class="selectedicon" src="{{imageRoot}}2b/common/{{join_rule_type == 1 ? 'select1' : 'notselect'}}.png"></image>
</view>
</view>
</view>
......@@ -23,7 +23,7 @@
<view wx:if="{{ join_rule_type == 2 }}" style="font-size: 22rpx;color: #999999;"><text wx:for="{{classes}}" wx:for-item="class" wx:key="id">{{class.title}}<text wx:if="{{index < classes.length}}">,</text></text></view>
</view>
<view class="item-r">
<image class="selectedicon" src="{{localImageRoot}}2b/common/{{join_rule_type == 2 ? 'select1' : 'notselect'}}.png"></image>
<image class="selectedicon" src="{{imageRoot}}2b/common/{{join_rule_type == 2 ? 'select1' : 'notselect'}}.png"></image>
</view>
</view>
</view>
......@@ -34,7 +34,7 @@
<view style="font-size: 22rpx;color: #999999;" wx:if="{{ join_rule_type == 3 }}">{{join_secret ? '已设置(密码:' + join_secret + ')' : '未设置'}}<text bindtap="changePsd" style="font-size: 22rpx;color: #16B0FD;margin-left: 20rpx">修改</text></view>
</view>
<view class="item-r">
<image class="selectedicon" src="{{localImageRoot}}2b/common/{{join_rule_type == 3 ? 'select1' : 'notselect'}}.png" ></image>
<image class="selectedicon" src="{{imageRoot}}2b/common/{{join_rule_type == 3 ? 'select1' : 'notselect'}}.png" ></image>
</view>
</view>
</view>
......@@ -45,7 +45,7 @@
<view wx:if="{{ join_rule_type == 4 }}" style="font-size: 22rpx;color: #999999;"><text wx:for="{{classes}}" wx:for-item="class" wx:key="id">{{class.title}}<text wx:if="{{index < (classes.length - 1)}}">,</text></text></view>
</view>
<view class="item-r">
<image class="selectedicon" src="{{localImageRoot}}2b/common/{{join_rule_type == 4 ? 'select1' : 'notselect'}}.png" ></image>
<image class="selectedicon" src="{{imageRoot}}2b/common/{{join_rule_type == 4 ? 'select1' : 'notselect'}}.png" ></image>
</view>
</view>
</view>
......
business/pages/themeindex/addmember.wxml
View file @ 6d16a52e
......@@ -11,8 +11,8 @@
<view class="teacher-name">{{item.nickname}}</view>
</view>
<view class="teacher-right">
<image class="icon-checkbox" src="{{localImageRoot}}2b/themeindex/check_active.png" wx:if="{{filter.checkSelect(item, checkedIdArr)}}"></image>
<image class="icon-checkbox" src="{{localImageRoot}}2b/themeindex/check.png" wx:else></image>
<image class="icon-checkbox" src="{{imageRoot}}2b/themeindex/check_active.png" wx:if="{{filter.checkSelect(item, checkedIdArr)}}"></image>
<image class="icon-checkbox" src="{{imageRoot}}2b/themeindex/check.png" wx:else></image>
</view>
</view>
</block>
......
business/pages/themeindex/index.wxml
View file @ 6d16a52e
......@@ -147,18 +147,18 @@
</view>
</view>
<!-- 底部按钮 -->
<!-- {{localImageRoot}}2b/themeindex/bottomTabbar.png?v=1') -->
<!-- {{imageRoot}}2b/themeindex/bottomTabbar.png?v=1') -->
<view class="fixed-tabbar" style="background-image: url('https://s1.ax1x.com/2020/03/23/8TVEIf.png?v=1')">
<view class="tabbar-list">
<view class="tabbar-item" bindtap="handleClickSetting">
<image class="tabbar-img" src="{{localImageRoot}}2b/themeindex/tabbar_setting.png"></image>
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_setting.png"></image>
<text class="tabbar-text">高级设置</text>
</view>
<view class="tabbar-item">
<button class="tabbar-share" open-type="share">分享</button>
</view>
<view class="tabbar-item" bindtap="goClock">
<image class="tabbar-img" src="{{localImageRoot}}2b/themeindex/tabbar_data.png"></image>
<image class="tabbar-img" src="{{imageRoot}}2b/themeindex/tabbar_data.png"></image>
<text class="tabbar-text">打卡数据</text>
</view>
</view>
......@@ -170,7 +170,7 @@
<view class="modal-title">
打卡内容详情
<view class="close-img" bindtap="closeDetailModal">
<image src="{{localImageRoot}}2b/themeindex/close_icon.png"></image>
<image src="{{imageRoot}}2b/themeindex/close_icon.png"></image>
</view>
</view>
<view class="modal-detail-wrap" wx:if="{{params.content.length > 0}}">
......@@ -187,7 +187,7 @@
<view class="modal-title">
高级设置
<view class="close-img" bindtap="closeSettingModal">
<image src="{{localImageRoot}}2b/themeindex/close_icon.png"></image>
<image src="{{imageRoot}}2b/themeindex/close_icon.png"></image>
</view>
</view>
<view class="modal-setting-wrap">
......@@ -198,7 +198,7 @@
<view class="setting-left-tip">已打卡学生管理、点评老师管理</view>
</view>
<view class="modal-setting-right">
<image src="{{localImageRoot}}2b/themeindex/setting_right.png"></image>
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="modal-setting-item">
......@@ -207,7 +207,7 @@
<view class="setting-left-tip">作业内容、作业要求、参与打卡方式等设置</view>
</view>
<view class="modal-setting-right">
<image src="{{localImageRoot}}2b/themeindex/setting_right.png"></image>
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
<view class="modal-setting-item">
......@@ -216,7 +216,7 @@
<view class="setting-left-tip">配置此页面后可在学生加入打卡前展示，此功能可收集有意向学生的联系方式。 <text class="setting-more-tip">了解更多</text></view>
</view>
<view class="modal-setting-right">
<image src="{{localImageRoot}}2b/themeindex/setting_right.png"></image>
<image src="{{imageRoot}}2b/themeindex/setting_right.png"></image>
</view>
</view>
</view>
......
business/pages/themeindex/jobclockdata.wxml
View file @ 6d16a52e
......@@ -34,7 +34,7 @@
<view class="total-item">
<view class="total-num">{{staticData.comment_count}}</view>
<view class="total-tip">评论数
<image class="imgTip" src="{{localImageRoot}}2b/themeindex/help_tip.png"></image>
<image class="imgTip" src="{{imageRoot}}2b/themeindex/help_tip.png"></image>
</view>
</view>
<view class="total-item">
......@@ -69,7 +69,7 @@
</view>
<view class="like-right">
<view class="like-zan">{{item.like_count}}赞</view>
<image class="phone-img" data-phone="{{item.mobile}}" bindtap="callPhone" src="{{localImageRoot}}2b/themeindex/call_phone.png"></image>
<image class="phone-img" data-phone="{{item.mobile}}" bindtap="callPhone" src="{{imageRoot}}2b/themeindex/call_phone.png"></image>
</view>
</view>
</block>
......@@ -98,7 +98,7 @@
</view>
<view class="like-right">
<view class="like-zan">{{item.integral_count}}积分</view>
<image class="phone-img" data-phone="{{item.mobile}}" bindtap="callPhone" src="{{localImageRoot}}2b/themeindex/call_phone.png"></image>
<image class="phone-img" data-phone="{{item.mobile}}" bindtap="callPhone" src="{{imageRoot}}2b/themeindex/call_phone.png"></image>
</view>
</view>
</block>
......
business/pages/themeindex/members.wxml
View file @ 6d16a52e
......@@ -29,7 +29,7 @@
</view>
</view>
<view class="like-right" data-phone="{{item.mobile}}" bindtap="callphone">
<image class="phone-img" src="{{localImageRoot}}2b/themeindex/call_phone.png"></image>
<image class="phone-img" src="{{imageRoot}}2b/themeindex/call_phone.png"></image>
</view>
</view>
</block>
......
business/pages/themeindex/userjoin.wxml
View file @ 6d16a52e
......@@ -19,7 +19,7 @@
</view>
</view>
<view class="like-right" data-phone="{{item.mobile}}" bindtap="callphone">
<image class="phone-img" src="{{localImageRoot}}2b/themeindex/call_phone.png"></image>
<image class="phone-img" src="{{imageRoot}}2b/themeindex/call_phone.png"></image>
</view>
</view>
</block>
......
components/sjdmediaeditor/index.wxml
View file @ 6d16a52e
......@@ -2,25 +2,25 @@
<view class="sjd-media-editor {{withmask ? 'opacitybody' : ''}}" >
<view class="media-content-box {{exchangeIndex - 1 == index ? 'down' : '' }} {{exchangeIndex == index ? 'up' : '' }}" wx:for="{{content}}" wx:key="index">
<view class="media-box-item media-text-item" data-type="{{item.type}}" data-index="{{index}}" wx:if="{{item.type == 'text'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{localImageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<basetextarea class="basetextarea-style" bindinput="textareaChange" data-type="{{item.type}}" maxlength="500" data-index="{{index}}" value="{{item.value}}" placeholder="{{placeholder}}"></basetextarea>
<text class="word-count" selectable="false" space="false" decode="false">{{item.value.length}}/500</text>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange" >
<image class="exchange-icon" src="{{localImageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
<view class="media-box-item media-img-item" wx:if="{{item.type == 'img'}}" data-index="{{index}}" >
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{localImageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="" src="{{filter.imagify(item.value, 'image/resize,w_640/format,jpg/quality,q_50')}}" mode="widthFix" lazy-load="false" binderror="" data-index="{{index}}" data-src="{{item.value}}" bindtap="prevImg" bindload=""></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image class="exchange-icon" src="{{localImageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
<view class="media-box-item media-voice-item" wx:if="{{item.type == 'voice'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" data-value="{{item.value}}" src="{{localImageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" data-value="{{item.value}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image class="exchange-icon" src="{{localImageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
<image class="exchange-icon" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
<view class="sjd-radio-box">
<!-- 播放的icon -->
......@@ -75,7 +75,7 @@
</view>
</view>
<view class="media-box-item media-video-item" wx:if="{{item.type == 'video'}}">
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{localImageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<image class="del-icon" data-type="{{item.type}}" data-index="{{index}}" src="{{imageRoot}}2b/common/icon_delblue.png?{{imageVersion}}" bindtap="delitem"></image>
<!-- <video class="media-box-video-item" src="{{filter.ossVideofy(item.value,item.mode)}}" poster="{{filter.videoPoster(item.value)}}"></video> -->
<view class="video-play-icon-box" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo">
<image class="video-play-icon" src="{{imageRoot}}2c/common/playicon.png?{{imageVersion}}"></image>
......@@ -83,7 +83,7 @@
<!-- <image class="video-image" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo" src="{{imageRoot}}common/videodefaultbg.png?{{imageVersion}}" mode="widthFix"></image> -->
<image class="video-image" data-index="{{index}}" data-src="{{item.value}}" data-mode="{{item.mode}}" data-from="mediashow" bindtap="playvideo" src="{{filter.videoPoster(item.poster || item.value)}}" mode="aspectFit" lazy-load="false" binderror="imgloaderr" bindload=""></image>
<view class="exchange-btn" wx:if="{{index != 0}}" data-type="{{item.type}}" data-index="{{index}}" bindtap="exchange">
<image wx:if="{{index != 0}}" class="exchange-icon" data-type="{{item.type}}" bindtap="exchange" data-index="{{index}}" src="{{localImageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
<image wx:if="{{index != 0}}" class="exchange-icon" data-type="{{item.type}}" bindtap="exchange" data-index="{{index}}" src="{{imageRoot}}2b/common/exchangeicon.png?{{imageVersion}}"></image>更换顺序
</view>
</view>
</view>
......
components/sjdmediashow/index.wxml
View file @ 6d16a52e
......@@ -81,8 +81,8 @@
<view class="{{expanded ? 'expand-box-withtext' : 'expand-box-withtext down'}}" wx:if="{{widthtext && expandeddefault}}" bindtap="expandAction">
<text class="">{{text}}{{expanded ? '收起' : '展开'}}</text>
<view class="expandicon-box">
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{localImageRoot}}2c/themeindex/arr_up.png?{{imageVersion}}"></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{localImageRoot}}2c/themeindex/arr_down.png?{{imageVersion}}"></image>
<image wx:if="{{expanded}}" class="arrowdowngrey" src="{{imageRoot}}2c/themeindex/arr_up.png?{{imageVersion}}"></image>
<image wx:if="{{!expanded}}" class="arrowdowngrey" src="{{imageRoot}}2c/themeindex/arr_down.png?{{imageVersion}}"></image>
</view>
</view>
<view class="{{expanded ? 'expand-box-withouttext' : 'expand-box-withouttext down'}}" wx:if="{{!widthtext && expandeddefault}}" bindtap="expandAction">
......
src/components/clockitemv2/index.js
View file @ 6d16a52e
......@@ -554,7 +554,7 @@ Component({
switch (item.subject_type) {
case 1:
wx.navigateTo({
url: `/src/pages/themeindex/index?id=${item.class_id}&tid=${item.subject_id}&sid=${this.data.clock.school_id}`
url: `/src/pages/themeindex/landpage?id=${item.class_id}&tid=${item.subject_id}&sid=${this.data.clock.school_id}`
})
break;
case 2:
......
src/pages/clockeditor/index.wxml
View file @ 6d16a52e
......@@ -6,7 +6,7 @@
<view class="theme-titlebox">
<view class="label">作业内容</view>
<view class="arr-box" bindtap="bindExpand">
{{detailExpand? '展开': '收起'}}<image class="icon-arrdown {{detailExpand? '': 'icon-arrup'}}" src="{{localImageRoot}}2c/themeindex/arr_down.png?{{imageVersion}}"></image>
{{detailExpand? '展开': '收起'}}<image class="icon-arrdown {{detailExpand? '': 'icon-arrup'}}" src="{{imageRoot}}2c/themeindex/arr_down.png?{{imageVersion}}"></image>
</view>
</view>
<view class="themedetail" wx:if="{{!detailExpand}}">
......
src/pages/themeindex/index.js
View file @ 6d16a52e
......@@ -516,6 +516,10 @@ Page({
},
userShow() {
const visitor = LocalStorage.getItem('visitor');
this.themeDetail();
this.clockListGet('init');
this.selfClockGet();
return
studentidentity({
class_id: this.data.id,
}).then((res) => {
......@@ -525,11 +529,10 @@ Page({
data
} = res;
if (code == 200 && data) {
this.data.studentStatus = data.student_status || 1;
this.data.userInfoDetail = data;
this.setData({
auditStatus: data.audit_status,
noUser:data.is_visitor,
noUser: data.is_visitor,
studentId: data.student_id,
hasmore: true,
})
......@@ -652,7 +655,8 @@ Page({
},
themeDetail() {
themeDetail({
subject_id: this.data.tid
subject_id: this.data.tid,
extra: "land_content"
}).then((res) => {
const {
data,
......
src/pages/themeindex/index.wxml
View file @ 6d16a52e
......@@ -2,7 +2,8 @@
<view class="container {{posterBoxShow? 'containerDisabledScroll': ''}}">
<view class="section">
<view class="banner-box" >
<image class="banner" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png"></image>
<image class="banner" src="{{filter.imagify(themeSelect.land_content.cover)}}" wx:if="{{themeSelect.land_content.cover}}"></image>
<image class="banner" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png" wx:else></image>
<view class="btn-group">
<!-- <button class="btn" open-type="share">分享</button> -->
<view class="btn" bindtap="goRankList">排行榜</view>
......
src/pages/themeindex/landpage.js
View file @ 6d16a52e
......@@ -388,6 +388,10 @@ Page({
},
userShow() {
const visitor = LocalStorage.getItem("visitor");
this.data.clockPage = 1;
this.themeDetail();
this.clockListGet("init");
return
studentidentity({
class_id: this.data.id
})
......@@ -490,13 +494,13 @@ Page({
if (!data) {
wx.showModal({
title: "提示",
content: "主题已被删除，点击确定返回班级首页",
content: "主题已被删除，点击确定返回首页",
showCancel: false,
confirmText: "确定",
success(r) {
if (r.confirm) {
wx.reLaunch({
url: `/src/pages/circleindex/index?id=${this.data.id}`
url: `/src/pages/website/index?sid=${this.data.sid}`
});
}
}
......@@ -506,35 +510,21 @@ Page({
wx.setNavigationBarTitle({
title: data.title
});
this.queryActivtySchoolInfo(data.school_id);
this.judgeIsClock(this.data.tid);
// this.queryActivtySchoolInfo(data.school_id);
// this.judgeIsClock(this.data.tid);
this.schoolInfoGet(data.school_id);
this.getCircleDetail(data.class_id);
// this.getCircleDetail(data.class_id);
data.content = JSON.parse(data.content);
data.contentDetail = JSON.parse(data.land_content.content);
// const nowTime = new Date(res.datetime.replace(/-/g, "/")).getTime();
// const startTime = new Date(
// data.homework_set.publish_time.replace(/-/g, "/")
// ).getTime();
// const endTime = new Date(
// data.homework_set.end_time.replace(/-/g, "/")
// ).getTime();
// if (nowTime >= startTime && nowTime <= endTime) {
// data.themeStatus = 1; // 进行中
// } else if (nowTime < startTime) {
// data.themeStatus = 2; // 未开始
// } else {
// data.themeStatus = 3; // 未已结束
// }
// this.data.isExpire =
// new Date(data.homework_set.end_time.replace(/-/g, "/")).getTime() -
// new Date(res.datetime).getTime() >
// 0
// ? false
// : true;
this.setData({
themeSelect: data
});
// if(this.data.themeSelect.is_clock){
// wx.redirectTo({
// url: `/src/pages/themeindex/index?id=${this.data.id}&tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
// })
// }
}
});
},
......@@ -840,7 +830,7 @@ Page({
// 去打卡
goClock(e) {
// 先授权
console.log(this.data.themeSelect.is_join, "是佛加入");
console.log(this.data.themeSelect.is_join, "是否已加入");
if (this.data.themeSelect.is_join != 1) {
if(this.data.themeSelect.join_rule_type==3){
this.setData({
......
src/pages/themeindex/landpage.wxml
View file @ 6d16a52e
......@@ -2,7 +2,8 @@
<view class="container">
<view class="section">
<view class="banner-box" >
<image class="banner" src="{{filter.imagify(themeSelect.land_content.cover)}}"></image>
<image class="banner" src="{{filter.imagify(themeSelect.land_content.cover)}}" wx:if="{{themeSelect.land_content.cover}}"></image>
<image class="banner" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png" wx:else></image>
<view class="btn-group">
<button class="btn" open-type="share">分享</button>
<!-- <view class="btn">排行榜</view> -->
......@@ -123,7 +124,7 @@
</view>
</view>
<view class="btn btn-home" bindtap="goWebsiteIndex" wx:if="{{false}}">
<image class="icon-home" src="{{localImageRoot}}common/icon_home.png?{{imageVersion}}"></image>
<image class="icon-home" src="{{imageRoot}}common/icon_home.png?{{imageVersion}}"></image>
<view class="tip">学校首页</view>
</view>
<!-- 没有手机号 需要授权 但是如果加入类型为密码加入 则在输入密码才授权-->
......@@ -142,15 +143,15 @@
<view class="modal-content">
<view class="opt-box">
<button class="opt-item" open-type="contact" show-message-card="true" send-message-title="请求添加微信" send-message-path="/src/pages/themeindex/landpage?id=1" send-message-img="{{imageRoot}}service/clock?{{imageVersion}}" wx:if="{{themeSelect.land_content.img}}">
<image class="icon-opt" src="{{localImageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
<image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_wx.png?{{imageVersion}}"></image>
<view class="item-title">添加微信</view>
</button>
<view class="opt-item" bindtap="bindCall" data-mobile="{{themeSelect.land_content.mobile}}" wx:if="{{themeSelect.land_content.mobile}}">
<image class="icon-opt" src="{{localImageRoot}}2c/themeindex/icon_call.png?{{imageVersion}}"></image>
<image class="icon-opt" src="{{imageRoot}}2c/themeindex/icon_call.png?{{imageVersion}}"></image>
<view class="item-title">拨打电话</view>
</view>
</view>
<image class="icon-cancel" src="{{localImageRoot}}2c/themeindex/icon_close.png?{{imageVersion}}" bindtap="bindModalContact"></image>
<image class="icon-cancel" src="{{imageRoot}}2c/themeindex/icon_close.png?{{imageVersion}}" bindtap="bindModalContact"></image>
</view>
</view>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment