Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
tjty-app
Project
Project
Details
Activity
Releases
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
王永飞
tjty-app
Commits
fded5f49
Commit
fded5f49
authored
Nov 23, 2022
by
刘鑫鹏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了一些bug
parent
817f245e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
99 additions
and
96 deletions
+99
-96
application.vue
...-app/pages_course/tjty_course_application/application.vue
+2
-2
appointment.vue
...-app/pages_course/tjty_course_appointment/appointment.vue
+2
-2
course.vue
tjty-app/pages_course/tjty_course_course/course.vue
+10
-62
myActivity.vue
tjty-app/pages_my/myActicity/myActivity.vue
+64
-29
myCourse.vue
tjty-app/pages_my/my_course/myCourse.vue
+21
-1
No files found.
tjty-app/pages_course/tjty_course_application/application.vue
View file @
fded5f49
...
@@ -11,8 +11,8 @@
...
@@ -11,8 +11,8 @@
<view
class=
"Info"
>
<view
class=
"Info"
>
<uni-forms
ref=
"form"
border
:model=
"formInfo"
:modelValue=
"formInfo"
>
<uni-forms
ref=
"form"
border
:model=
"formInfo"
:modelValue=
"formInfo"
>
<uni-forms-item
label=
"姓名"
required
name=
"name"
>
<uni-forms-item
label=
"姓名"
required
name=
"name"
>
<uni-easyinput
:inputBorder=
"false"
v-model=
"formInfo.name"
placeholder=
"请输入姓名"
<uni-easyinput
:inputBorder=
"false"
v-model=
"formInfo.name"
placeholder=
"请输入姓名"
:c
learable=
"false"
></uni-easyinput>
maxlength=
"16"
learable=
"false"
></uni-easyinput>
</uni-forms-item>
</uni-forms-item>
<uni-forms-item
label=
"性别"
required
name=
"sex"
>
<uni-forms-item
label=
"性别"
required
name=
"sex"
>
<picker
@
change=
"sexPickerChange"
:value=
"index"
:range=
"array"
range-key=
"name"
>
<picker
@
change=
"sexPickerChange"
:value=
"index"
:range=
"array"
range-key=
"name"
>
...
...
tjty-app/pages_course/tjty_course_appointment/appointment.vue
View file @
fded5f49
...
@@ -115,8 +115,8 @@
...
@@ -115,8 +115,8 @@
.appoint-card-ainfo
{
.appoint-card-ainfo
{
// margin: ;
// margin: ;
margin-left
:
50px
;
//
margin-left: 50px;
padding
:
5%
5%
0
5%
;
font-size
:
16px
;
font-size
:
16px
;
font-family
:
Source
Han
Sans
CN
,
Source
Han
Sans
CN-Regular
;
font-family
:
Source
Han
Sans
CN
,
Source
Han
Sans
CN-Regular
;
font-weight
:
400
;
font-weight
:
400
;
...
...
tjty-app/pages_course/tjty_course_course/course.vue
View file @
fded5f49
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
class=
"bottomAdd"
v-show=
"total >= max"
@
tap=
"more"
>
查看更多
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
...
@@ -91,6 +91,7 @@
...
@@ -91,6 +91,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
...
@@ -131,6 +132,7 @@
...
@@ -131,6 +132,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
...
@@ -170,6 +172,7 @@
...
@@ -170,6 +172,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
...
@@ -210,6 +213,7 @@
...
@@ -210,6 +213,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</scroll-view>
</scroll-view>
</swiper-item>
</swiper-item>
...
@@ -242,7 +246,8 @@
...
@@ -242,7 +246,8 @@
},
},
data
()
{
data
()
{
return
{
return
{
max
:
5
,
max
:
10
,
f
:
10
,
// token:uni.getStorageSync("token"),
// token:uni.getStorageSync("token"),
onMore
:
true
,
onMore
:
true
,
loadStatus
:
'loading'
,
loadStatus
:
'loading'
,
...
@@ -334,15 +339,11 @@
...
@@ -334,15 +339,11 @@
onLoad
()
{
onLoad
()
{
this
.
login
()
this
.
login
()
this
.
list
(
1
,
this
.
queryParams
.
pageNum
)
this
.
list
(
1
,
this
.
queryParams
.
pageNum
)
// this.getList()
// this.getList()
},
},
// onReachBottom(){ //上拉触底函数
// if(!this.isLoadMore){ //此处判断,上锁,防止重复请求
// this.isLoadMore=true
// this.page+=1
// this.list()
// }},
methods
:
{
methods
:
{
more
()
{
more
()
{
...
@@ -376,30 +377,6 @@
...
@@ -376,30 +377,6 @@
}
}
},
},
//下拉刷新
// refresh() {
// this.triggered = true;
// //重置关键数据
// this.queryParams.pageNum = 1
// this.total = 0
// // this.queryParams.pageSize = 10
// this.isloading = false
// this.ByTypelist = []
// this.onMore = true
// //重新发起数据请求
// this.list()
// // this.triggered = false
// setTimeout(() => {
// this.triggered = false
// }, 1000);
// },
//获取更新token
//获取更新token
getWXUserCode
()
{
getWXUserCode
()
{
console
.
log
(
this
.
token
);
console
.
log
(
this
.
token
);
...
@@ -419,40 +396,11 @@
...
@@ -419,40 +396,11 @@
}
}
});
});
},
},
// ReachBottom() {
// if (this.queryParams.pageNum * this.queryParams.pageSize >= this.total)
// return uni.$showMsg('数据加载完毕!')
// // if (this.isloading) return
// //让页码自增1
// this.queryParams.pageNum += 1
// console.log(this.queryParams.pageNum)
// // 重新获取列表数据
// this.flag = false
// this.list(this.type, this.queryParams.pageNum)
// },
// lowerBottom() {
// // console.log('触底加载更多');
// if (this.isloading) return
// if (!this.onMore) {
// uni.showToast({
// title: '没有更多数据了',
// icon: "none"
// })
// return
// }
// this.queryParams.pageNum += 1
// this.list(id,this.queryParams.pageNum)
// },
toAppoint
(
item
)
{
toAppoint
(
item
)
{
uni
.
navigateTo
({
uni
.
navigateTo
({
url
:
'/pages_course/tjty_course_appointment/appointment?id='
+
item
.
courseId
url
:
'/pages_course/tjty_course_appointment/appointment?id='
+
item
.
courseId
})
})
},
},
// 获取标题区域宽度,和每个子元素节点的宽度以及元素距离左边栏的距离
// 获取标题区域宽度,和每个子元素节点的宽度以及元素距离左边栏的距离
getScrollW
()
{
getScrollW
()
{
const
query
=
uni
.
createSelectorQuery
().
in
(
this
);
const
query
=
uni
.
createSelectorQuery
().
in
(
this
);
...
@@ -710,7 +658,7 @@
...
@@ -710,7 +658,7 @@
.bottomAdd
{
.bottomAdd
{
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
margin-left
:
50%
;
color
:
rgb
(
94
,
94
,
94
);
color
:
rgb
(
94
,
94
,
94
);
padding-bottom
:
10px
;
padding-bottom
:
10px
;
}
}
...
...
tjty-app/pages_my/myActicity/myActivity.vue
View file @
fded5f49
...
@@ -25,14 +25,16 @@
...
@@ -25,14 +25,16 @@
<view
class=
"info"
>
<view
class=
"info"
>
<view
class=
"question"
>
<view
class=
"question"
>
<text>
{{
item
.
activityName
}}
</text>
<text>
{{
item
.
activityName
}}
</text>
<view
class=
"item1"
>
<!--
<view
class=
"item1"
>
-->
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_weikaishi@2x.png"
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_weikaishi@2x.png"
v-if=
"item.activityStatus==='0'"
></image>
v-if=
"item.activityStatus==='0'"
></image>
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_jinxingzhong@2x.png"
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_jinxingzhong@2x.png"
v-else-if=
"item.activityStatus==='1'"
></image>
v-else-if=
"item.activityStatus==='1'"
></image>
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_yijieshu@2x.png"
v-else
>
<image
class=
"image-status"
src=
"../../static/oper-icon/content_tag_yijieshu@2x.png"
v-else
>
</image>
</image>
</view>
<!--
</view>
-->
</view>
</view>
<dividerface></dividerface>
<dividerface></dividerface>
...
@@ -67,6 +69,10 @@
...
@@ -67,6 +69,10 @@
import
{
import
{
getMyActivitySignupByWechatId
getMyActivitySignupByWechatId
}
from
"@/api/myActivity.js"
;
}
from
"@/api/myActivity.js"
;
import
{
getSinInInfo
}
from
"@/api/activity.js"
;
import
{
import
{
userInfo
userInfo
}
from
'os'
;
}
from
'os'
;
...
@@ -77,6 +83,7 @@
...
@@ -77,6 +83,7 @@
status
:
1
,
status
:
1
,
myActivitylist
:
[],
myActivitylist
:
[],
total
:
0
,
total
:
0
,
signInList
:
[]
}
}
},
},
computed
:
{
computed
:
{
...
@@ -84,7 +91,9 @@
...
@@ -84,7 +91,9 @@
},
},
onLoad
()
{
onLoad
()
{
this
.
wechatId
=
this
.
userInfo
.
wechatId
this
.
wechatId
=
this
.
userInfo
.
wechatId
this
.
getList
(
this
.
wechatId
)
this
.
getList
(
this
.
wechatId
)
// this.getlista(this.wechatId,this.activityId)
},
},
methods
:
{
methods
:
{
getList
(
wechatId
)
{
getList
(
wechatId
)
{
...
@@ -96,6 +105,14 @@
...
@@ -96,6 +105,14 @@
console
.
log
(
this
.
total
)
console
.
log
(
this
.
total
)
});
});
},
},
// getlista(wechatId,activityId){
// getSinInInfo(wechatId,activityId).then(response=>{
// console.log("jkbnj",response)
// this.signInList =[...this.signInList, ...response.rows] || []
// })
// },
goActivity
(
type
,
wechatId
,
activityId
)
{
goActivity
(
type
,
wechatId
,
activityId
)
{
if
(
type
===
'1'
)
{
if
(
type
===
'1'
)
{
...
@@ -114,9 +131,15 @@
...
@@ -114,9 +131,15 @@
},
},
goDetail
(
type
,
wechatId
,
activityId
){
goDetail
(
type
,
wechatId
,
activityId
){
if
(
type
===
'2'
){
if
(
type
===
'2'
){
uni
.
navigateTo
({
// uni.navigateTo({
url
:
`/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=
${
activityId
}
`
// url: `/pages_events/tjty_ans_detail/tjty_ans_detail?activityId=${activityId}`
// })
getSinInInfo
(
wechatId
,
activityId
).
then
(
response
=>
{
console
.
log
(
"jkbnj"
,
response
)
this
.
signInList
=
response
.
data
})
})
}
}
else
{
else
{
uni
.
navigateTo
({
uni
.
navigateTo
({
...
@@ -146,7 +169,18 @@
...
@@ -146,7 +169,18 @@
border-radius
:
16px
;
border-radius
:
16px
;
box-shadow
:
0px
3px
10px
0px
#dddddd
;
box-shadow
:
0px
3px
10px
0px
#dddddd
;
.image-status
{
position
:
relative
;
// top: -120rpx;
left
:
82%
;
width
:
120rpx
;
height
:
120rpx
;
z-index
:
4
;
}
// :nth-child(1) {
// :nth-child(1) {
...
@@ -161,7 +195,17 @@
...
@@ -161,7 +195,17 @@
color
:
#333333
;
color
:
#333333
;
line-height
:
36px
;
line-height
:
36px
;
.question
{
margin-top
:
5%
;
margin
:
2%
18%
0
5%
;
min-height
:
72px
;
height
:
auto
;
line-height
:
30px
;
font-size
:
18px
;
font-family
:
Source
Han
Sans
CN
,
Source
Han
Sans
CN-Regular
;
}
.item
{
.item
{
...
@@ -178,35 +222,26 @@
...
@@ -178,35 +222,26 @@
}
}
.item1
{
.item1
{
//
padding: 5% 5%;
padding
:
5%
5%
;
//
font-size: 35rpx;
font-size
:
35rpx
;
//
font-family: Source Han Sans CN, Source Han Sans CN-Regular;
font-family
:
Source
Han
Sans
CN
,
Source
Han
Sans
CN-Regular
;
//
font-weight: 200;
font-weight
:
200
;
//
color: #333333;
color
:
#333333
;
.image-status
{
//
.image-status {
position
:
relative
;
//
position: relative;
top
:
-6
0rpx
;
// top: -9
0rpx;
left
:
98%
;
//
left: 98%;
width
:
120rpx
;
//
width: 120rpx;
height
:
120rpx
;
//
height: 120rpx;
z-index
:
9
;
//
z-index: 9;
}
//
}
}
}
}
}
.question
{
margin-top
:
5%
;
margin
:
2%
15%
0
5%
;
min-height
:
72px
;
height
:
auto
;
line-height
:
30px
;
font-size
:
18px
;
font-family
:
Source
Han
Sans
CN
,
Source
Han
Sans
CN-Regular
;
}
}
}
...
...
tjty-app/pages_my/my_course/myCourse.vue
View file @
fded5f49
...
@@ -23,6 +23,7 @@
...
@@ -23,6 +23,7 @@
<view
class=
"item"
>
上课地点:
{{
item
.
mechanismAddress
|
ellipsis
}}
</view>
<view
class=
"item"
>
上课地点:
{{
item
.
mechanismAddress
|
ellipsis
}}
</view>
</view>
</view>
</view>
</view>
<view
style=
"margin-left: 35%;margin-bottom: 20px;"
@
tap=
"more"
v-show=
"total >= queryParams.pageNum * queryParams.pageSize"
>
点击加载更多...
</view>
</view>
</view>
</
template
>
</
template
>
...
@@ -38,7 +39,7 @@ import { userInfo } from 'os'
...
@@ -38,7 +39,7 @@ import { userInfo } from 'os'
export
default
{
export
default
{
data
(){
data
(){
return
{
return
{
max
:
10
,
wechatId
:
""
,
wechatId
:
""
,
AppointmentList
:[],
AppointmentList
:[],
queryParams
:
{
queryParams
:
{
...
@@ -69,6 +70,22 @@ import { userInfo } from 'os'
...
@@ -69,6 +70,22 @@ import { userInfo } from 'os'
}
}
},
},
methods
:{
methods
:{
more
()
{
this
.
max
+=
10
;
//每次点击加1条
if
(
this
.
queryParams
.
pageNum
*
this
.
queryParams
.
pageSize
>=
this
.
total
)
return
uni
.
$showMsg
(
'数据加载完毕!'
)
// if (this.isloading) return
//让页码自增1
this
.
queryParams
.
pageNum
+=
1
console
.
log
(
this
.
queryParams
.
pageNum
)
// 重新获取列表数据
this
.
flag
=
false
this
.
getList
(
this
.
wechatId
,
this
.
queryParams
.
pageNum
)
},
getList
(
wechatId
,
pageNum
)
{
getList
(
wechatId
,
pageNum
)
{
listByWid
(
wechatId
,
pageNum
).
then
(
response
=>
{
listByWid
(
wechatId
,
pageNum
).
then
(
response
=>
{
console
.
log
(
response
)
console
.
log
(
response
)
...
@@ -142,5 +159,8 @@ import { userInfo } from 'os'
...
@@ -142,5 +159,8 @@ import { userInfo } from 'os'
height
:
334rpx
;
height
:
334rpx
;
}
}
}
}
</
style
>
</
style
>
\ No newline at end of file
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