Skip to content

W
wechatapp.shangjiadao.com
Commit a02fe76e authored by sujie@126.com's avatar sujie@126.com
Browse files
Options

Merge branch 'wxl-develop' of git.server:wangxuelai/wechatapp.shangjiadao.com into sj-dev-v1

parents c3fc4b2c 0d35d87b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 875 deletions
app.js
View file @ a02fe76e
......@@ -8,9 +8,9 @@ import {
needLogin
} from './utilities/index.js';
const mtjwxsdk = require('./js/mtj-wx-sdk.js');
wx.setEnableDebug({
enableDebug: true
})
// wx.setEnableDebug({
// enableDebug: true
// })
import tracker from './js/tracker_es.min.js'
tracker({
token: "c92deb3f301e16682ecf598120083403",
......
business/pages/circlemember/index.js
View file @ a02fe76e
......@@ -83,7 +83,7 @@ Page({
return {
title: `邀请您加入班级`,
path: `/src/pages/inviteindex/index?id=${this.data.id}`,
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav3/images/2c/common/invite.png'
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/common/invite.png'
}
}
......
business/pages/orgadsetting/index.js
View file @ a02fe76e
......@@ -49,11 +49,13 @@ Page({
src: `${app.globalData.imageRoot}banner/banner2.png`,
id: 2,
selected: false
}, {
src: `${app.globalData.imageRoot}banner/banner3.png`,
id: 3,
selected: false
}, {
},
// {
// src: `${app.globalData.imageRoot}banner/banner3.png`,
// id: 3,
// selected: false
// },
{
src: `${app.globalData.imageRoot}banner/banner4.png`,
id: 4,
selected: false
......
business/pages/rankingList/index.js
View file @ a02fe76e
......@@ -313,7 +313,7 @@ Page({
this.setData({
myrank: data.my_rank || null
})
if (this.data.Totalpage == 1) { // 在第一页做数据截取
if (this.data.likeTotalpage == 1) { // 在第一页做数据截取
const topThreeJoiner = data.list.splice(0,3);
this.setData({
no1Joiner: topThreeJoiner[0] || null,
......
components/btabbar/index.wxml
View file @ a02fe76e
<view class="btabbar">
<view class="btabbaritem class {{current == 'class' ? 'active' : ''}}" bindtap="chooseTab" data-type="class" hover-class="none" hover-stop-propagation="false">
<image class="icon class" wx:if="{{current != 'class'}}" src="{{imageRoot}}2b/tabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current == 'class'}}" src="{{imageRoot}}2b/tabbar/classactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current != 'class'}}" src="/images/btabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current == 'class'}}" src="/images/btabbar/classactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">课程列表</text>
</view>
<view class="btabbaritem message {{current == 'message' ? 'active' : ''}}" bindtap="chooseTab" data-type="message" hover-class="none" hover-stop-propagation="false">
<image class="icon message" wx:if="{{current != 'message'}}" src="{{imageRoot}}2b/tabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current == 'message'}}" src="{{imageRoot}}2b/tabbar/messageactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current != 'message'}}" src="/images/btabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current == 'message'}}" src="/images/btabbar/messageactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">消息</text>
<view class="message-count" hover-class="none" hover-stop-propagation="false" wx:if="{{waitJob > 0}}">{{waitJob > 99 ? '99+' : waitJob}}</view>
</view>
<view class="btabbaritem ucenter {{current == 'ucenter' ? 'active' : ''}}" bindtap="chooseTab" data-type="ucenter" hover-class="none" hover-stop-propagation="false">
<image class="icon ucenter" wx:if="{{current != 'ucenter'}}" src="{{imageRoot}}2b/tabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current == 'ucenter'}}" src="{{imageRoot}}2b/tabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current != 'ucenter'}}" src="/images/btabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current == 'ucenter'}}" src="/images/btabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">我</text>
</view>
</view>
\ No newline at end of file
components/ctabbar/index.wxml
View file @ a02fe76e
<view class="btabbar">
<view class="btabbaritem home {{current == 'home' ? 'active' : ''}}" bindtap="chooseTab" data-type="home" hover-class="none" hover-stop-propagation="false">
<image class="icon home" wx:if="{{current != 'home'}}" src="{{imageRoot}}2c/tabbar/home.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon home" wx:if="{{current == 'home'}}" src="{{imageRoot}}2c/tabbar/homeactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon home" wx:if="{{current != 'home'}}" src="/images/ctabbar/home.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon home" wx:if="{{current == 'home'}}" src="/images/ctabbar/homeactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">首页</text>
</view>
<view class="btabbaritem class {{current == 'class' ? 'active' : ''}}" bindtap="chooseTab" data-type="class" hover-class="none" hover-stop-propagation="false">
<image class="icon class" wx:if="{{current != 'class'}}" src="{{imageRoot}}2c/tabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current == 'class'}}" src="{{imageRoot}}2c/tabbar/classactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current != 'class'}}" src="/images/ctabbar/class.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon class" wx:if="{{current == 'class'}}" src="/images/ctabbar/classactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">课程列表</text>
</view>
<view class="btabbaritem message {{current == 'message' ? 'active' : ''}}" bindtap="chooseTab" data-type="message" hover-class="none" hover-stop-propagation="false">
<image class="icon message" wx:if="{{current != 'message'}}" src="{{imageRoot}}2c/tabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current == 'message'}}" src="{{imageRoot}}2c/tabbar/messageactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current != 'message'}}" src="/images/ctabbar/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon message" wx:if="{{current == 'message'}}" src="/images/ctabbar/messageactive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">消息</text>
<view class="message-count" hover-class="none" hover-stop-propagation="false" wx:if="{{noticecount > 0}}">{{noticecount > 99 ? '99+' : noticecount}}</view>
<!-- <view class="message-count" hover-class="none" hover-stop-propagation="false">1</view> -->
</view>
<view class="btabbaritem ucenter {{current == 'ucenter' ? 'active' : ''}}" bindtap="chooseTab" data-type="ucenter" hover-class="none" hover-stop-propagation="false">
<image class="icon ucenter" wx:if="{{current != 'ucenter'}}" src="{{imageRoot}}2c/tabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current == 'ucenter'}}" src="{{imageRoot}}2c/tabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current != 'ucenter'}}" src="/images/ctabbar/ucenter.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<image class="icon ucenter" wx:if="{{current == 'ucenter'}}" src="/images/ctabbar/ucenteractive.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
<text class="btabbaritemname" selectable="false" space="false" decode="false">我</text>
</view>
</view>
\ No newline at end of file
constants/api.js
View file @ a02fe76e
......@@ -121,9 +121,9 @@ const apis = {
customerStaticGet: `${api}student/info`
},
myAchievement: {
certificates: `${api}student/certificates`,
certificate: `${api}student/certificate`,
honors: `${api}student/honors`,
certificates: `${api}common/certificates`,
certificate: `${api}common/certificate`,
honors: `${api}common/honors`,
}
},
business: {
......
constants/constants.js
View file @ a02fe76e
export default {
export default {
imageRoot: 'https://cdn.img.shangjiadao.cn/source/images/dakav3/',
// host: 'https://wx.m.shangjiadao.cn/daka',
// host2: 'https://wx.m.shangjiadao.cn',
host: 'https://wx.m.shangjiadao.cn/daka',
host2: 'https://wx.m.shangjiadao.cn',
storageVersion: '3.0',
imageVersion: '20190512',
host: 'https://clock.wp53.cn',
host2: 'https://test.wp53.cn',
// host: 'https://clock.wp53.cn',
// host2: 'https://test.wp53.cn',
appId: 'wxc1246ea029394785',
miniProgram: {
clock: 'wxdeee20e52a1fd7ee'
......
constants/messages.js
View file @ a02fe76e
......@@ -44,5 +44,11 @@ export default {
30004: '您已结业，无法提交打卡',
30005: '该学生不存在',
30006: '该手机号已经领取过',
40002: '您已经打过卡了'
30009: '获取证书不存在',
40002: '您已经打过卡了',
40001: '主题类型错误',
40002: '已打卡',
40003: '已打卡待审核',
40008: '主题不在规定时间内',
40009: '补卡次数已使用完'
}
\ No newline at end of file
project.config.json deleted 100644 → 0
View file @ c3fc4b2c
This diff is collapsed.
src/pages/beforeinvitation/index.js
View file @ a02fe76e
......@@ -24,7 +24,8 @@ Page({
bgsrc: '',
loaded: false,
themeDetail: {},
userInfo: {}
userInfo: {},
d: ''
},
/**
......@@ -33,19 +34,22 @@ Page({
onLoad: function (options) {
if (options.scene) {
let sceneQuery = scenQueryGet(options.scene);
const {i, ctd} = sceneQuery;
const {t, ctd, d} = sceneQuery;
this.setData({
tid: i,
consumerId: ctd
tid: t,
consumerId: ctd,
d: d || ''
})
} else {
const {
tid,
consumerId
consumerId,
d
} = options;
this.setData({
tid,
consumerId
consumerId,
d: d || ''
})
}
this.getThemeDetail();
......@@ -149,7 +153,7 @@ Page({
navigate () {
if (this.data.auditStatus != 3) { // 游客的跳转
wx.reLaunch({
url: `/src/pages/invitation/index?tid=${this.data.tid}&consumerId=${this.data.consumerId}`
url: `/src/pages/invitation/index?tid=${this.data.tid}&consumerId=${this.data.consumerId}&d=${this.data.d}`
})
} else { // 正常用户的跳转 跳转到邀请卡片页面
this.goThemeIndex();
......@@ -162,7 +166,7 @@ Page({
})
} else if (this.data.themeDetail.subject_type == 2) {
wx.reLaunch({
url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}`
url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}&d=${this.data.d}`
})
}
}
......
src/pages/calendarthemeindex/index.js
View file @ a02fe76e
......@@ -203,23 +203,13 @@ Page({
multi: false,
noDefault: false,
whenChangeMonth(current, next) {
// console.log(current);
// console.log(next);
},
afterCalendarRender(ctx) {
const data = [];
// 异步请求
setTimeout(() => {
// setTodoLabels({
// pos: 'top',
// dotColor: '#40',
// days: data
// });
}, 1000);
// enableArea([that.data.params.startDate, that.data.params.endDate]);
setTimeout(() => {
// setSelectedDays(data);
//jump(2018, 6, 6)
}, 2000);
}
});
......@@ -287,9 +277,13 @@ Page({
let shareObj = {
}
const _activeDay = this.data.activeDay;
const month = Number(_activeDay.month) < 10 ? '0' + _activeDay.month : _activeDay.month
const day = Number(_activeDay.day) < 10 ? '0' + _activeDay.day : _activeDay.day
const clockdate = _activeDay.year + month + day;
let initShareObj = {
title: `我正在参加【${this.data.circleInfo.title}】的打卡`,
path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}`
path: `/src/pages/beforeinvitation/index?tid=${this.data.tid}&consumerId=${visitor && visitor.id || 0}&d=${clockdate.substr(2)}`
}
if (from == 'menu') {
shareObj = initShareObj;
......@@ -384,17 +378,13 @@ Page({
}
}
})
// return;
}
return;
}
res.data.content = content;
// res.data.clock_address.tel_parse = JSON.parse(res.data.clock_address.tel);
this.setData({
circleInfo: res.data
}, () => {
// wx.setNavigationBarTitle({
// title: this.data.circleInfo.title || '圈子主页'
// })
})
}
this.judgeIsClock(this.data.tid);
......@@ -455,8 +445,6 @@ Page({
this.adInfoGet()
this.getCircleDetail(data.class_id);
}
}).then(() => {
this.judgeIsClock(this.data.tid);
})
},
getmycalendar() {
......@@ -516,15 +504,17 @@ Page({
// this.getWeeksDay(new Date(fixdate),rest_dates,clockDates);
this.getBetweenDateStr(data.calendar_set.start_time.split(' ')[0], data.calendar_set.end_time.split(' ')[0], rest_dates, clockDates);
// console.log()
if (this.data.fixdate) {
const fixdatea = '20' + this.data.d.slice(0, 2) + '-' + this.data.d.slice(2, 4) + '-' + this.data.d.slice(4, 6);
if(fixdatea==fixdate,data.calendar_set.end_time.split(' ')[0]){
if(this.data.fixdate==data.calendar_set.end_time.split(' ')[0]){
this.setData({
isEndClock:true
})
}
}
}
}).then(() => {
this.judgeIsClock(this.data.tid);
})
},
positionGet(id, callBack) {
......@@ -617,13 +607,11 @@ Page({
personalClockInfo: data
})
if (this.data.pagefrom == 'clockeditor') {
console.log(this.data.isEndClock, 'this.data.isEndClock')
if (this.data.isEndClock) {
this.graduatePoster();
} else {
this.generateNewPoster();
}
}
}
}
......@@ -1767,6 +1755,7 @@ Page({
if (today.getTime() > new Date(_activeDay.date).getTime()) {
_activeDay.isAfter = true;
}
console.log(_activeDay)
this.setData({
weeksArr: _weeksArr,
activeDay: _activeDay,
......@@ -1977,10 +1966,10 @@ Page({
title: '日签生成中...'
})
generateCustomerQrcode({
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `src/pages/beforeinvitation/index`
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `src/pages/beforeinvitation/index`
// scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
// page: `src/pages/themeindex/index`
}).then((res) => {
const {
code,
......@@ -2220,8 +2209,10 @@ Page({
})
let qrcode = '';
generateCustomerQrcode({
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
// scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
// page: `src/pages/themeindex/index`
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `src/pages/beforeinvitation/index`
}).then((res) => {
const {
code,
......@@ -2241,7 +2232,8 @@ Page({
return;
}
return certificate({
subject_id: this.data.tid
subject_id: this.data.tid,
consumer_id: visitor.id
})
}).then((res) => {
const {
......
src/pages/calendarthemeindex/index.wxml
View file @ a02fe76e
......@@ -121,7 +121,6 @@
bindtap="selectday" hover-class="none"
hover-stop-propagation="false">
{{item.isToday?'今': item.isRise&&item.isClockTime?'休':item.day}}
<image class="isClock-box" src="{{imageRoot}}2c/themeindex/yes-icon.png"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
wx:if="{{item.isClock}}">
......
src/pages/circlemember/index.wxml
View file @ a02fe76e
......@@ -23,7 +23,7 @@
<view class="member-hold-data" hover-class="none" hover-stop-propagation="false" wx:if="{{item.clock_day > 0}}">
<text class="" selectable="false" space="false" decode="false">坚持打卡</text>
<text class="count-static" selectable="false" space="false" decode="false">{{item.clock_day}}</text>
<text class="" selectable="false" space="false" decode="false">天</text>
<text class="" selectable="false" space="false" decode="false">次</text>
</view>
</view>
</view>
......
src/pages/contactindex/index.js
View file @ a02fe76e
......@@ -116,5 +116,10 @@ Page({
current: imgsrc
}
wxPreviewImage(data)
},
goSchoolIndex () {
wx.reLaunch({
url: `/src/pages/schoolindex/index?sid=${this.data.sid}`
})
}
})
\ No newline at end of file
src/pages/contactindex/index.wxml
View file @ a02fe76e
......@@ -2,7 +2,7 @@
<wxs src="./../../../filter/index.wxs" module="filter" />
<view class="container">
<view class="contactindex-container clearfix">
<view class="contactindex-header clearfix">
<view class="contactindex-header clearfix" bindtap="goSchoolIndex">
<view class="header-title" hover-class="none" hover-stop-propagation="false">
{{schoolInfo.title}}
</view>
......
src/pages/invitation/index.js
View file @ a02fe76e
......@@ -25,7 +25,8 @@ Page({
bgsrc: '',
loaded: false,
themeDetail: {},
userInfo: {}
userInfo: {},
d: ''
},
/**
......@@ -34,11 +35,13 @@ Page({
onLoad: function (options) {
const {
tid,
consumerId
consumerId,
d
} = options;
this.setData({
tid,
consumerId
consumerId,
d: d || ''
})
this.getThemeDetail();
this.subjectClassStudent();
......@@ -90,9 +93,8 @@ Page({
*/
onShareAppMessage: function () {
return {
// title: '入学通知书',
// path: '/src/pages/inviteindex/index',
// query: `id=${this.data.id}`
title: '入学通知书',
path: `/src/pages/invitation/index?tid=${this.data.tid}&consumerId=${this.data.consumerId}&d=${this.data.d}`,
}
},
subjectClassStudent () {
......@@ -149,7 +151,7 @@ Page({
})
} else if (this.data.themeDetail.subject_type == 2) {
wx.reLaunch({
url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}`
url: `/src/pages/calendarthemeindex/index?id=${this.data.themeDetail.class_id}&tid=${this.data.tid}&d=${this.data.d}`
})
}
}
......
src/pages/invitation/index.wxss
View file @ a02fe76e
.container {
display: flex;
align-items: center;
justify-content: center;
height: 100vh;
background-color: #FFD85C;
}
.invitation-container {
background-color: #fff;
min-height: 100vh;
height: 1206rpx;
width: 100%;
position: relative;
}
.bg {
......@@ -94,7 +102,7 @@
}
.gobtn {
width:253rpx;
position:fixed;
position: absolute;
left:50%;
transform:translateX(-50%);
bottom:121rpx;
......
src/pages/invitationcard/index.js
View file @ a02fe76e
......@@ -156,18 +156,22 @@ Page({
})
},
generateCustomerQrcode () {
let url = '';
// let url = '';
// let scene = '';
// if (this.data.themeDetail.subject_type == 1) { // 作业打卡
// url = 'src/pages/themeindex/index';
// scene
// } else if (this.data.themeDetail.subject_type == 2) { // 日历打卡
// url = 'src/pages/themeindex/index';
// url = 'src/pages/calendarthemeindex/index';
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `src/pages/beforeinvitation/index`
// }
const visitor = LocalStorage.getItem('visitor');
generateCustomerQrcode({
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `/src/pages/beforeinvitation/index`
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `src/pages/beforeinvitation/index`
// scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
// page: `src/pages/themeindex/index`
}).then((res) => {
const {
code,
......
src/pages/inviteindex/index.js
View file @ a02fe76e
......@@ -88,8 +88,8 @@ Page({
onShareAppMessage: function () {
return {
title: '入学通知书',
path: '/src/pages/inviteindex/index',
query: `id=${this.data.id}`
path: `/src/pages/inviteindex/index?id=${this.data.id}`,
imageUrl:'https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/common/invite.png'
}
},
getCircleDetail() {
......
src/pages/inviteindex/index.wxss
View file @ a02fe76e
/* business/pages/inviteindex/index.wxss */
.container {
height: 100vh;
display: flex;
align-items: center;
justify-content: center;
}
.inviteindex-container{
width: 100%;
height: 100vh;
height: 1220rpx;
/* background: url('http://sowcar.com/t6/697/1554715929x1033062821.png') no-repeat center; */
/* background-size:cover; */
position: relative;
......
src/pages/myachievement/index.js
View file @ a02fe76e
......@@ -79,12 +79,14 @@ Page({
posterBox: {
},
currentSubjectId: 0
currentSubjectId: 0,
custormeId: 0
},
onLoad: function(options) { // Do some initialize when page load.
const {sid} = options;
const {sid, custormeId} = options;
this.setData({
sid
sid,
custormeId
});
if (sid == 0) {
return;
......@@ -110,6 +112,11 @@ Page({
onReachBottom: function() { // Do something when page reach bottom.
},
onShareAppMessage: function (option) { // return custom share data when user share.
return {
title: '排行榜',
path: `/src/pages/myachievement/index?sid=${this.data.sid}&custormeId=${this.data.custormeId}`,
// imageUrl: 'https://cdn.img.shangjiadao.cn/source/images/dakav3/2c/rankinglist/sharebg.png'
}
},
onPageScroll: function() { // Do something when page scroll
......@@ -118,7 +125,8 @@ Page({
},
getCertificates () {
certificates({
school_id: this.data.sid
school_id: this.data.sid,
consumer_id: this.data.custormeId
}).then((res) => {
const {code, data} = res;
if (code != 200) {
......@@ -135,7 +143,8 @@ Page({
},
getHonors () {
honors({
school_id: this.data.sid
school_id: this.data.sid,
consumer_id: this.data.custormeId
}).then((res) => {
const {code, data} = res;
if (code != 200) {
......
src/pages/myachievement/index.json
View file @ a02fe76e
{
"navigationBarTitleText": "",
"navigationBarTitleText": "我的成就",
"navigationBarBackgroundColor": "#FFD85C",
"usingComponents": {
"poster-box": "../../../components/posterbox",
......
src/pages/mynews/index.js
View file @ a02fe76e
......@@ -384,6 +384,13 @@ Page({
})
})
},
goClockDetail (e) {
const {dataset} = e.currentTarget;
const item = dataset.item;
wx.navigateTo({
url: `/src/pages/clockdetail/index?tid=${item.subject_id}&cid=${item.record_id}`
})
},
likeNoticeRead() {
noticeread({
type: 2,
......
src/pages/rankingList/index.js
View file @ a02fe76e
......@@ -312,7 +312,7 @@ Page({
this.setData({
myrank: data.my_rank || null
})
if (this.data.Totalpage == 1) { // 在第一页做数据截取
if (this.data.likeTotalpage == 1) { // 在第一页做数据截取
const topThreeJoiner = data.list.splice(0,3);
this.setData({
no1Joiner: topThreeJoiner[0] || null,
......
src/pages/schoolclasslist/index.wxss
View file @ a02fe76e
......@@ -237,13 +237,13 @@
border-radius: 4rpx 0px 0px 4rpx;
box-shadow:0px 0px 9rpx 0px rgba(0, 0, 0, 0.05);
line-height: 50rpx;
color: #878D9A;
color: #000;
font-size: 24rpx;
position: fixed;
right: 0;
bottom: 200rpx;
z-index: 100;
background-color: #fff;
background-color: #FFD146;
}
.themestatus {
text-align: right;
......
src/pages/themeindex/index.js
View file @ a02fe76e
......@@ -1121,10 +1121,10 @@ Page({
title: '日签生成中...'
})
generateCustomerQrcode({
// scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
// page: `/src/pages/beforeinvitation/index`
scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
page: `src/pages/themeindex/index`
scene: `ctd=${visitor && visitor.id}&t=${this.data.tid}`,
page: `src/pages/beforeinvitation/index`
// scene: `i=${this.data.id}&t=${this.data.tid}&p=7`,
// page: `src/pages/themeindex/index`
}).then((res) => {
const {
code,
......
ucenter/index.js
View file @ a02fe76e
......@@ -275,8 +275,9 @@ Page({
})
},
goMyAchievement () {
const visitor = LocalStorage.getItem('visitor');
wx.navigateTo({
url: `/src/pages/myachievement/index?sid=${this.data.sid}`,
url: `/src/pages/myachievement/index?sid=${this.data.sid}&custormeId=${visitor && visitor.id || 0}`,
})
}
})
\ No newline at end of file
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