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
759969be
Commit
759969be
authored
Mar 23, 2020
by
lvtz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
bf14aac9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
13 deletions
+20
-13
landpage.js
src/pages/themeindex/landpage.js
+16
-9
landpage.wxml
src/pages/themeindex/landpage.wxml
+4
-4
No files found.
src/pages/themeindex/landpage.js
View file @
759969be
...
...
@@ -201,6 +201,7 @@ Page({
});
});
this
.
subjectSignStudents
();
this
.
judgeIsSchoolStudent
(
this
.
data
.
sid
);
wx
.
login
({
success
(
res
)
{
console
.
log
(
res
,
"load"
);
...
...
@@ -503,7 +504,7 @@ Page({
this
.
schoolInfoGet
(
data
.
school_id
);
// this.getCircleDetail(data.class_id);
data
.
content
=
JSON
.
parse
(
data
.
content
);
data
.
contentDetail
=
JSON
.
parse
(
data
.
land_content
.
content
)
;
data
.
contentDetail
=
data
.
land_content
?
JSON
.
parse
(
data
.
land_content
.
content
)
:
''
;
this
.
setData
({
themeSelect
:
data
...
...
@@ -1168,14 +1169,20 @@ Page({
const
visitor
=
LocalStorage
.
getItem
(
"visitor"
);
let
that
=
this
;
const
{
encryptedData
,
iv
}
=
e
.
detail
;
console
.
log
(
e
,
'手机爱吃'
)
that
.
setData
({
sessionCode
:
that
.
data
.
sessionCode
,
encryptData
:
encryptedData
,
iv
},()
=>
{
that
.
joinClock
();
});
if
(
e
.
detail
.
errMsg
==
'getPhoneNumber:fail user deny'
)
{
//用户点击拒绝
wx
.
showToast
({
title
:
'获取手机号失败'
,
icon
:
'none'
})
}
else
{
//允许授权执行跳转
that
.
setData
({
sessionCode
:
that
.
data
.
sessionCode
,
encryptData
:
encryptedData
,
iv
},()
=>
{
that
.
joinClock
();
});
}
// if (!encryptedData) {
// wx.login({
// success(res) {
...
...
src/pages/themeindex/landpage.wxml
View file @
759969be
...
...
@@ -40,7 +40,7 @@
</view>
</view>
<view class="section contact-box">
<view class="section contact-box"
wx:if="{{themeSelect.land_content}}"
>
<view class="left">
<image class="avatar" src="https://cdn.img.shangjiadao.cn/qingxiao/daka/images/2c/sharemoretheme/newunlockbg.png" wx:if="{{themeSelect.land_content.teacher.avatar}}"></image>
<image class="avatar" src="{{imageRoot}}common/empty/avatar_teacher.png?{{imageVersion}}" wx:else></image>
...
...
@@ -65,8 +65,8 @@
<!-- <view class="text" bindtap="goInviteFriend">邀请好友</view> -->
<view class="section recomend-clockbox">
<view class="title">精选打卡预览
({{clockTotal}}篇打卡)
</view>
<block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 &&
isClock) || (themeSelect.is_cheat == 1 && !isSchoolStudent
) || clockTotal == 0}}">
<view class="title">精选打卡预览
<block wx:if="{{clockTotal > 0}}">({{clockTotal}}篇打卡)</block>
</view>
<block wx:if="{{themeSelect.is_cheat == 0 || (themeSelect.is_cheat == 1 &&
themeSelect.is_clock
) || clockTotal == 0}}">
<view class="clock-list" wx:if="{{!emptyPage}}">
<block wx:for="{{clockList}}" wx:key="bigindex" wx:for-index="bigindex" wx:for-item="bigitem">
<view class="clock-item" wx:key="index" wx:for="{{bigitem}}">
...
...
@@ -104,7 +104,7 @@
</block>
<list-loading loading="{{clockGetting}}"></list-loading>
</view>
<view class="empty-content-box" wx:if="{{
(clockTotal + selfcount)
== 0}}">
<view class="empty-content-box" wx:if="{{
clockTotal
== 0}}">
<empty-content text="还没有精选打卡内容~" emptyimg="common/empty/empty_c_sraech.png" width="263" height="219"></empty-content>
</view>
</block>
...
...
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