Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
W
wechatapp.shangjiadao.com
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxuelai
wechatapp.shangjiadao.com
Commits
ca309eaf
Commit
ca309eaf
authored
Sep 10, 2019
by
lvtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
111b9adc
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
160 additions
and
301 deletions
+160
-301
constants.js
constants/constants.js
+4
-4
index.wxss
src/components/clockitemv2/index.wxss
+4
-0
index.wxml
src/pages/exchangebusiness/index.wxml
+1
-1
index.wxss
src/pages/exchangebusiness/index.wxss
+4
-1
rule.wxml
src/pages/integralfile/rule.wxml
+3
-1
rule.wxss
src/pages/integralfile/rule.wxss
+7
-1
index.wxss
src/pages/mall/index.wxss
+4
-2
index.json
src/pages/mynews/index.json
+2
-1
index.wxml
src/pages/mynews/index.wxml
+56
-80
index.wxss
src/pages/mynews/index.wxss
+32
-30
index.wxss
src/pages/mytask/index.wxss
+6
-4
index.wxml
src/pages/rankingList/index.wxml
+1
-1
index.wxss
src/pages/rankingList/index.wxss
+4
-1
index.js
src/pages/websiteindex/index.js
+14
-153
index.wxml
src/pages/websiteindex/index.wxml
+2
-7
index.wxss
src/pages/websiteindex/index.wxss
+3
-2
index.wxml
ucenter/index.wxml
+1
-1
index.wxss
ucenter/index.wxss
+12
-11
No files found.
constants/constants.js
View file @
ca309eaf
export
default
{
imageRoot
:
'https://cdn.img.shangjiadao.cn/source/images/dakav5/'
,
host
:
'https://qxapi.qingxiao.online/daka'
,
host2
:
'https://wx.m.shangjiadao.cn'
,
//
host: 'https://qxapi.qingxiao.online/daka',
//
host2: 'https://wx.m.shangjiadao.cn',
storageVersion
:
'4.0'
,
imageVersion
:
'20190826'
,
//
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'
...
...
src/components/clockitemv2/index.wxss
View file @
ca309eaf
...
...
@@ -182,6 +182,10 @@
width: 31rpx;
height: 36rpx;
display: block;
position: absolute;
top: 50%;
left: 46rpx;
transform: translateY(-50%);
}
.sign-item-content-video .video-image {
display: block;
...
...
src/pages/exchangebusiness/index.wxml
View file @
ca309eaf
<!--business/pages/exchangebusiness/index.wxml-->
<view class="container">
<view class="exchangebusiness-container
clearfix
">
<view class="exchangebusiness-container">
<view class="content-item" wx:for="{{schoolList}}" wx:key="{{index}}" bindtap='gocampusmgt' data-item="{{item}}">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
...
...
src/pages/exchangebusiness/index.wxss
View file @
ca309eaf
/* business/pages/exchangebusiness/index.wxss */
page,.container{
height: 100%;
}
.exchangebusiness-container {
padding-bottom: 100rpx;
min-height: calc(100% - 150rpx)
}
.exchangebusiness-container .content-item{
padding: 47rpx 24rpx;
...
...
src/pages/integralfile/rule.wxml
View file @
ca309eaf
...
...
@@ -121,6 +121,8 @@
<image class="instr-bg" src="{{imageRoot}}2c/pointsrule/rule_bg.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix"></image>
</view>
</block>
<empty-content text="暂未设置积分" emptyimg="common/empty/empty_no.png" wx:else></empty-content>
<view class="empty-content-box" wx:else>
<empty-content text="暂未设置积分" emptyimg="common/empty/empty_no.png" ></empty-content>
</view>
<sjdbottombar></sjdbottombar>
</view>
src/pages/integralfile/rule.wxss
View file @
ca309eaf
page,.container{
height: 100%;
}
.container{
padding: 0 24rpx
50rpx
;
padding: 0 24rpx;
}
.pointrule-box{
margin-bottom: 60rpx;
...
...
@@ -82,3 +85,6 @@
width: 100%;
height: 100%;
}
.empty-content-box{
height: calc(100% - 150rpx)
}
\ No newline at end of file
src/pages/mall/index.wxss
View file @
ca309eaf
...
...
@@ -3,9 +3,11 @@
font-family:'hyxl';
src:url('https://wxloss.oss-cn-hangzhou.aliyuncs.com/font/hyxl.ttf') format('truetype');
}
page,.container{
height: 100%;
}
.container {
background-color: #fff;
padding-bottom: 50rpx;
}
.header-box {
padding: 46rpx 24rpx 0 24rpx;
...
...
@@ -268,6 +270,6 @@
line-height: 1;
}
.empty-content-box {
height: 400rpx
;
min-height: calc(100% - 600rpx)
;
position: relative;
}
\ No newline at end of file
src/pages/mynews/index.json
View file @
ca309eaf
{
"usingComponents"
:
{
"activity-bar"
:
"../../../components/activitybar"
,
"sjdbottombar"
:
"../../../components/sjdbottombar"
"sjdbottombar"
:
"../../../components/sjdbottombar"
,
"empty-content"
:
"../../../components/emptycontent"
},
"navigationBarTitleText"
:
"消息"
,
"enablePullDownRefresh"
:
true
...
...
src/pages/mynews/index.wxml
View file @
ca309eaf
<!--src/pages/mynews/index.wxml-->
<wxs src="../../../filter/index.wxs" module="filter" />
<view class="container" wx:if="{{sid > 0}}">
<view class="mynews-container
clearfix
">
<view class="header-box"
>
<view class="box {{currentType == 1 ? 'active' : ''}}" data-currenttype="1" bindtap="typeselect"
>
<image class="boximg" src="{{imageRoot}}2c/common/themenotice.png?{{imageVersion}}"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
></image>
<view class="boxname"
>
<text class=""
selectable="false" space="false" decode="false"
>主题发布通知</text>
<view class="red
dot" wx:if="{{themeNotice > 0}}">
</view>
<view class="mynews-container">
<view class="header-box">
<view class="box {{currentType == 1 ? 'active' : ''}}" data-currenttype="1" bindtap="typeselect">
<image class="boximg" src="{{imageRoot}}2c/common/themenotice.png?{{imageVersion}}" ></image>
<view class="boxname">
<text class="" >主题发布通知</text>
<view class="red
-dot" wx:if="{{themeNotice > 0}}">{{themeNotice}}
</view>
</view>
<view class="line"
></view>
<view class="line" ></view>
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<button form-type="submit" class="createidbutton">生成form</button>
</form>
</view>
<view class="box {{currentType == 2 ? 'active' : ''}}" data-currenttype="2" bindtap="typeselect"
>
<image class="boximg" src="{{imageRoot}}2c/common/likenotice.png?{{imageVersion}}"
mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""
></image>
<view class="boxname"
>
<text class=""
selectable="false" space="false" decode="false"
>点赞、评论通知</text>
<view class="red
dot" wx:if="{{likeCommentNotice > 0}}">
</view>
<view class="box {{currentType == 2 ? 'active' : ''}}" data-currenttype="2" bindtap="typeselect">
<image class="boximg" src="{{imageRoot}}2c/common/likenotice.png?{{imageVersion}}" ></image>
<view class="boxname" >
<text class="" >点赞、评论通知</text>
<view class="red
-dot" wx:if="{{likeCommentNotice > 0}}">{{likeCommentNotice}}
</view>
</view>
<view class="line"
></view>
<view class="line" ></view>
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<button form-type="submit" class="createidbutton">生成form</button>
</form>
</view>
</view>
<view class="contentbox" >
<view class="mynotice-container clearfix" wx:if="{{currentType == 2}}">
<view class="" wx:if="{{!emptyPage}}">
<view class="examinelist-item" wx:for="{{likeNoticeList}}" wx:key="{{index}}" bindtap="goClockDetail" data-item="{{item}}">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<view class="item-top" >
<view class="user" >
<image class="avatar" src="{{filter.imagify(item.avatar, 'image/resize,w_320/format,jpg/quality,q_50')}}" lazy-load="false" binderror="" bindload=""></image>
<view class="usertext" selectable="false" space="false" decode="false">{{ item.type==1?item.nickname:item.pid==0?item.nickname+'给你评论':item.nickname+'回复你'}}</view>
</view>
<view class="time" >
{{item.created_at}}
</view>
</view>
<view class="item-bottom" >
{{item.type==1?'给你的打卡点了赞':item.content}}
</view>
<view class="contentbox">
<view class="mynotice-container" wx:if="{{currentType == 2}}">
<block wx:if="{{!emptyPage}}">
<view class="examinelist-item" wx:for="{{likeNoticeList}}" wx:key="{{index}}" bindtap="goClockDetail" data-item="{{item}}">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<view class="item-top">
<view class="user">
<image class="avatar" src="{{filter.imagify(item.avatar, 'image/resize,w_320/format,jpg/quality,q_50')}}" lazy-load="false" binderror="" bindload=""></image>
<view class="usertext">{{item.type==1?item.nickname:item.pid==0?item.nickname+'给你评论':item.nickname+'回复你'}}</view>
</view>
<list-loading loading="{{listLoading}}"></list-loading>
</view>
<view class="empty-box" wx:if="{{emptyPage}}">
<view class="icon-box" >
<image class="empty-icon" src="{{imageRoot}}2c/common/empty2.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
<view class="time">{{item.created_at}}</view>
</view>
<view class="item-bottom">{{item.type==1?'给你的打卡点了赞':item.content}}</view>
</view>
<view class="text" >还没有任何消息哦~</view>
<list-loading loading="{{listLoading}}"></list-loading>
</block>
<view class="empty-box" wx:if="{{emptyPage}}">
<empty-content text="还没有任何消息哦~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
</view>
<sjdbottombar wx:if="{{!hasmore}}"></sjdbottombar>
</view>
<view class="themenotice-container clearfix" wx:if="{{currentType == 1}}">
<view class="" wx:if="{{!emptyPage}}">
<view class="themenotice-item" wx:for="{{noticeList}}" wx:key="{{index}}" bindtap="goThemeDetail" data-subjecttype="{{item.subject_type}}" data-id="{{item.class_id}}" data-tid="{{item.id}}" data-item="{{item}}">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<view class="item-top" >
<view class="user" >
{{item.school_title}}
</view>
<view class="time" >
{{item.created_at}}
</view>
</view>
<view class="item-bottom" >
<view class="item-text" >
发布了主题:
</view>
<view class="item-content" >
{{item.title}}
</view>
</view>
<view class="themenotice-container" wx:if="{{currentType == 1}}">
<block wx:if="{{!emptyPage}}">
<view class="themenotice-item"wx:for="{{noticeList}}" wx:key="{{index}}" bindtap="goThemeDetail" data-subjecttype="{{item.subject_type}}" data-id="{{item.class_id}}" data-tid="{{item.id}}" data-item="{{item}}">
<form report-submit="true" bindsubmit="formIdCreate" class="createidform">
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<view class="item-top">
<view class="user">{{item.school_title}}</view>
<view class="time">{{item.created_at}}</view>
</view>
<view class="item-bottom">
<view class="item-text">发布了主题:</view>
<view class="item-content">{{item.title}}</view>
</view>
</view>
<list-loading loading="{{listLoading}}"></list-loading>
</block>
<view class="empty-box" wx:if="{{emptyPage}}">
<empty-content text="还没有任何消息哦~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
</view>
<view class="empty-box" wx:if="{{emptyPage}}">
<view class="icon-box" >
<image class="empty-icon" src="{{imageRoot}}2c/common/empty2.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="text" >还没有任何消息哦~</view>
</view>
<sjdbottombar wx:if="{{!hasmore}}"></sjdbottombar>
</view>
</view>
<sjdbottombar></sjdbottombar>
</view>
<view class=""
wx:if="{{sid == activtySchoolInfo.sid}}">
<view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
<activity-bar
classid="{{activtySchoolInfo.id}}"
sid="{{activtySchoolInfo.sid}}"
...
...
@@ -103,10 +85,4 @@
>
</activity-bar>
</view>
</view>
<view class="empty-box" wx:if="{{sid == 0}}">
<view class="icon-box" >
<image class="empty-icon" src="{{imageRoot}}2c/common/empty2.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
</view>
<view class="text" >还没有任何消息哦~</view>
</view>
\ No newline at end of file
src/pages/mynews/index.wxss
View file @
ca309eaf
page{
background: #F7F7F9;
height: 100%;
}
.container{
height: 100%;
}
/* src/pages/mynews/index.wxss */
.mynews-container {
min-height: 100vh;
background-color: #F7F7F9;
height: 100%;
}
.header-box {
background
-color
: #fff;
background: #fff;
padding-top: 28rpx;
display: flex;
justify-content: space-around;
...
...
@@ -30,14 +36,22 @@
position: relative;
display: inline-block;
}
.boxname .reddot {
background-color: #FF3030;
width: 12rpx;
height: 12rpx;
border-radius: 50%;
.boxname .red-dot {
position: absolute;
right: -12rpx;
top: 0;
top: -10rpx;
right: -30rpx;
box-sizing: border-box;
display: inline-block;
padding: 0 10rpx;
height: 30rpx;
min-width: 30rpx;
background:rgba(255,48,48,1);
border-radius: 15rpx;
font-size: 20rpx;
font-weight: 500;
color: #fff;
text-align: center;
line-height: 30rpx;
}
.boxname text {
font-size: 24rpx;
...
...
@@ -47,17 +61,18 @@
width: 89rpx;
height: 8rpx;
border-radius: 4rpx;
background
-color
: transparent;
background: transparent;
margin: 0 auto;
}
.box.active .line{
background
-color
: #FFD146;
background: #FFD146;
}
.contentbox {
padding-top: 188rpx;
min-height: calc(100% - 134rpx);
}
.themenotice-container {
padding: 36rpx 24rpx 50rpx;
padding: 36rpx 24rpx
0
50rpx;
}
.themenotice-container .themenotice-item{
background:rgba(255,255,255,1);
...
...
@@ -68,6 +83,9 @@
position: relative;
box-shadow:0px 10rpx 0px 0px rgba(0, 0, 0, 0.04);
}
.themenotice-container .themenotice-item:last-of-type{
margin-bottom: 0;
}
.themenotice-container .themenotice-item .item-top{
padding-top: 30rpx;
padding: 33rpx 22rpx 60rpx 24rpx;
...
...
@@ -156,21 +174,5 @@
}
.empty-box{
padding-top: 197rpx;
}
.empty-box .icon-box{
width:228rpx;
height:169rpx;
margin: 0 auto;
}
.empty-box .icon-box .empty-icon{
width:228rpx;
height:169rpx;
}
.empty-box .text{
font-size:26rpx;
font-weight:400;
padding-top: 77rpx;
color:rgba(0,0,0,.5);
text-align: center;
height: calc(100%-200rpx)
}
\ No newline at end of file
src/pages/mytask/index.wxss
View file @
ca309eaf
...
...
@@ -157,8 +157,9 @@ page{
.circlelist-content{
padding: 60rpx 24rpx 0;
min-height: calc(100% - 150rpx);
}
.circle-item {
.circle
list-content .circle
-item {
padding: 32rpx 10rpx 20rpx 33rpx;
border-radius: 20rpx;
background-color: #fff;
...
...
@@ -167,6 +168,10 @@ page{
border-bottom: none;
box-shadow:0px 5rpx 10rpx 0px rgba(0, 0, 0, 0.05);
overflow: hidden;
margin-bottom: 24rpx;
}
.circlelist-content .circle-item:last-of-type{
margin-bottom: 0;
}
.circle-item.rili {
padding-bottom: 64rpx;
...
...
@@ -308,9 +313,6 @@ page{
margin-top: 10rpx;
}
.empty-content-box {
/* height: 100vh; */
position: relative;
text-align: center;
padding-top: 300rpx;
height: calc(100% - 150rpx)
}
\ No newline at end of file
src/pages/rankingList/index.wxml
View file @
ca309eaf
...
...
@@ -245,11 +245,11 @@
<view wx:if="{{pointsTotalEmpty}}" class="empty-content-box" >
<empty-content text="还没有更多哦~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
</view>
<sjdbottombar></sjdbottombar>
</view>
</view>
</view>
</view>
<sjdbottombar></sjdbottombar>
<!-- <go-top wx:if="{{backTopValue}}"></go-top> -->
<view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
<activity-bar
...
...
src/pages/rankingList/index.wxss
View file @
ca309eaf
/* src/pages/a/index.wxss */
page,.container{
height: 100%;
}
.rankingList-container {
min-height:
100vh
;
min-height:
calc(100% - 150rpx)
;
background-color: #fff;
}
...
...
src/pages/websiteindex/index.js
View file @
ca309eaf
...
...
@@ -61,7 +61,6 @@ Page({
latitude
:
''
,
longitude
:
''
,
websiteCourses
:
''
,
tabList
:
[
'全部'
,
'学员动态'
,
'机构介绍'
],
tabIndex
:
0
,
tabshow
:
false
,
boxTop
:
{
...
...
@@ -205,9 +204,7 @@ Page({
onPullDownRefresh
:
function
()
{
// Do something when pull down.
},
onReachBottom
:
function
()
{
// Do something when page reach bottom.
},
onPageScroll
:
function
(
e
)
{
// Do something when page scroll
let
that
=
this
let
scrollTop
=
e
.
scrollTop
...
...
@@ -594,9 +591,7 @@ Page({
data
}
=
res
;
if
(
code
==
200
)
{
let
_tabList
=
[
'全部'
,
'学员动态'
,
'机构介绍'
];
if
(
data
)
{
_tabList
=
[
'全部'
];
const
myLocation
=
LocalStorage
.
getItem
(
'myLocation'
);
const
that
=
this
;
if
(
myLocation
)
{
...
...
@@ -623,7 +618,18 @@ Page({
})
}
data
.
banner
=
data
.
banner
?
JSON
.
parse
(
data
.
banner
)
:
''
;
data
.
sort
=
data
.
sort
?
JSON
.
parse
(
data
.
sort
)
:
[{
// 排序处理,体验课放在第三位
let
dataSort
=
''
;
if
(
data
.
sort
){
dataSort
=
JSON
.
parse
(
data
.
sort
)
let
index
=
dataSort
.
findIndex
(
item
=>
item
.
name
==
"course"
);
if
(
index
!==
2
){
dataSort
.
splice
(
index
,
1
)
dataSort
.
splice
(
2
,
0
,{
name
:
'course'
,
desc
:
'体验课'
})
}
}
data
.
sort
=
data
.
sort
?
dataSort
:
[{
name
:
'schoolinfo'
,
desc
:
'机构信息'
,
},
{
...
...
@@ -639,15 +645,6 @@ Page({
name
:
'orgdesc'
,
desc
:
'机构介绍'
,
},
];
data
.
sort
.
forEach
((
value
,
index
)
=>
{
if
(
value
.
name
==
"orgdesc"
&&
_tabList
.
length
<
4
)
{
_tabList
.
push
(
'机构介绍'
)
}
if
(
value
.
name
==
"clocklist"
&&
_tabList
.
length
<
4
)
{
_tabList
.
push
(
'学员动态'
)
}
})
}
else
{
this
.
setData
({
websitehomeEmpty
:
true
...
...
@@ -655,33 +652,7 @@ Page({
this
.
schoolInfoGet
()
}
this
.
setData
({
schoolInfo
:
data
?
data
:
''
,
// tabList: _tabList,
},
()
=>
{
// const that = this;
// wx.createSelectorQuery().select('#banner').boundingClientRect(function (rect) {
// that.setData({
// "boxTop.banner": rect ? rect.top : ''
// })
// }).exec()
// wx.createSelectorQuery().select('#student-clock').boundingClientRect(function (rect) {
// that.setData({
// "boxTop.studentclock": rect ? rect.top : ''
// })
// }).exec()
// wx.createSelectorQuery().select('#business-info').boundingClientRect(function (rect) {
// that.setData({
// "boxTop.businessinfo": rect ? rect.top : ''
// })
// }).exec()
// this._observer = wx.createIntersectionObserver(this)
// this._observer
// .relativeTo('.scroll-container-box')
// .observe('.get-student', (res) => {
// this.setData({
// fixBottomBtn: res.intersectionRatio < 0.001
// })
// })
schoolInfo
:
data
?
data
:
''
})
}
}).
catch
((
e
)
=>
{
...
...
@@ -945,47 +916,7 @@ Page({
})
},
tabChange
(
e
)
{
const
index
=
e
.
detail
.
value
;
const
_tabList
=
this
.
data
.
tabList
;
const
{
banner
,
studentclock
,
businessinfo
}
=
this
.
data
.
boxTop
;
var
scrolltop
=
0
;
// switch (_tabList[index]) {
// case '全部':
// this.data.scrolltop = 1;
// break;
// case '学员动态':
// this.data.scrollTop = studentclock>businessinfo?1200:500
// break;
// case '机构介绍':
// this.data.scrollTop = businessinfo>studentclock?1200:500
// break;
// default:
// break;
// }
if
(
_tabList
[
index
]
==
"全部"
){
this
.
setData
({
tabIndex
:
index
,
scrollTop
:
0
})
}
if
(
_tabList
[
index
]
==
"学员动态"
){
this
.
setData
({
tabIndex
:
index
,
scrollTop
:
studentclock
>
businessinfo
?
1300
:
500
})
}
if
(
_tabList
[
index
]
==
"机构介绍"
){
this
.
setData
({
tabIndex
:
index
,
scrollTop
:
businessinfo
>
studentclock
?
1300
:
500
})
}
},
websiteintrosGet
()
{
websiteintros
({
school_id
:
this
.
data
.
sid
,
...
...
@@ -1009,20 +940,6 @@ Page({
url
:
`/src/pages/websiteindex/businessinfolist?sid=
${
this
.
data
.
sid
}
`
,
})
},
// 换一批 (待删)
// changeClocklist() {
// let _clockPage = this.data.clockPage;
// if (_clockPage * 2 >= this.data.clockTotal) {
// _clockPage = 1
// } else {
// _clockPage += 1;
// }
// this.setData({
// clockPage: _clockPage,
// }, () => {
// this.clockListGet()
// })
// },
touchStart
(
e
)
{
const
{
clientX
,
...
...
@@ -1217,62 +1134,6 @@ Page({
audioStorage
,
})
},
scroll
:
debounce
(
function
(
e
){
// let that = this
// let scrollTop = e.detail.scrollTop
// const _tabList = this.data.tabList;
// const {
// banner,
// studentclock,
// businessinfo
// } = this.data.boxTop
// if (scrollTop > (this.data.titleBarHeight + this.data.statusBarHeight + 10)) {
// this.setData({
// tabshow: true
// })
// } else {
// this.setData({
// tabshow: false
// })
// }
// wx.createSelectorQuery().select('#student-clock').boundingClientRect(function (rect) {
// if(studentclock<businessinfo){
// return false;
// }
// try {
// if(rect.top<200){
// that.setData({
// tabIndex: _tabList.indexOf('学员动态')
// })
// }else{
// that.setData({
// tabIndex: _tabList.indexOf('机构介绍')
// })
// }
// } catch (error) {
// }
// }).exec()
// wx.createSelectorQuery().select('#business-info').boundingClientRect(function (rect) {
// if(studentclock>businessinfo){
// return false;
// }
// try {
// if(rect.top<200){
// that.setData({
// tabIndex: _tabList.indexOf('机构介绍')
// })
// }else{
// that.setData({
// tabIndex: _tabList.indexOf('学员动态')
// })
// }
// } catch (error) {
// }
// }).exec()
},
100
),
// 跟打卡之后积分获取弹窗有关的操作
closefeedback
()
{
this
.
setData
({
...
...
src/pages/websiteindex/index.wxml
View file @
ca309eaf
<wxs src="../../../filter/index.wxs" module="filter" />
<view
scroll-y class="scroll-container-box" style="height: 100vh" bindscroll="" scroll-top="{{scrollTop}}"
>
<view
class="scroll-container-box"
>
<view class="nav-custombox" style="padding-top: {{statusBarHeight}}px">
<view class="nav-title-box" style="height: {{titleBarHeight}}px">
<view class="title">{{schoolInfo.title?schoolInfo.title:schoolDetail.title}}</view>
...
...
@@ -13,12 +13,7 @@
</view>
</view> -->
</view>
<!-- <view class="top-bar" style="padding-top:{{statusBarHeight}}px" wx:if="{{tabshow}}">
<view class="tabs-wrapper" >
<w-tabs bind:onChange="tabChange" borderSize="{{3}}" lineSize="{{0.5}}" options="{{ tabList }}" currentIndex="{{ tabIndex }}" activeColor="#FFC000"/>
</view>
</view> -->
<view class="container" bindtouchmove="touchStart" bindtouchend="touchEnd">
<view class="container" bindtouchmove="touchStart" bindtouchend="touchEnd" style="padding-bottom: {{websiteCourses.switch==1? '105rpx': '0'}}">
<view class="share-btn-wrapper" style="top:{{titleBarHeight+statusBarHeight+50}}px" >
<view class="share-btn {{shareBtnShow==1?'share-btn-hide':''}} {{shareBtnShow==2?'share-btn-show':''}}" >
<button open-type="share"></button>
...
...
src/pages/websiteindex/index.wxss
View file @
ca309eaf
page{
padding-bottom: 120rpx;
background: #F7F7F7;
}
@keyframes btnShow{
...
...
@@ -18,10 +19,10 @@ page{
}
}
.scroll-container-box{
height: 100vh
;
padding-bottom: env(safe-area-inset-bottom)
;
}
.container{
padding-bottom: 230rpx;
/* padding-bottom: 230rpx; */
width: 100%;
overflow-x: hidden;
}
...
...
ucenter/index.wxml
View file @
ca309eaf
...
...
@@ -16,7 +16,7 @@
<button form-type="submit" class="createidbutton">生成form</button>
</form>
<image class="icon" src="{{imageRoot}}2c/optimize/icon_message.png?{{imageVersion}}"></image>
<view class="red-dot" wx:if="{{noticecount>0}}"></view>
<view class="red-dot" wx:if="{{noticecount>0}}">
{{noticecount}}
</view>
</view>
<view class="right-item" bindtap="toSetting" wx:if="{{!noUserinfo}}" >
<loginbtn loginCode="{{loginCode}}"/>
...
...
ucenter/index.wxss
View file @
ca309eaf
...
...
@@ -72,10 +72,18 @@ page{
position: absolute;
top: -7rpx;
right: -7rpx;
width: 14rpx;
height: 14rpx;
background: rgba(255,65,65,1);
border-radius: 50%;
box-sizing: border-box;
display: inline-block;
padding: 0 10rpx;
height: 30rpx;
min-width: 30rpx;
background:rgba(255,48,48,1);
border-radius: 15rpx;
font-size: 20rpx;
font-weight: 500;
color: #fff;
text-align: center;
line-height: 30rpx;
}
.scorebox{
margin-top: -106rpx;
...
...
@@ -124,13 +132,6 @@ page{
width: 12rpx;
height: 21rpx;
}
.reddot {
width: 18rpx;
height: 18rpx;
border-radius: 50%;
background-color: #FF3030;
}
.exchange-identity{
width: 420rpx;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment