Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
clapp
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
莫晓莉
clapp
Commits
ed34d54f
Commit
ed34d54f
authored
Nov 11, 2020
by
莫晓莉
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
残联修改
parent
cc6ced9d
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
150 additions
and
86 deletions
+150
-86
pages/comment/evaluate-history/evaluate-history.css
+12
-3
pages/comment/evaluate-history/evaluate-history.vue
+4
-4
pages/comment/evaluate/evaluate.vue
+15
-7
pages/comment/login/login.vue
+1
-1
pages/comment/service-apl-history/service-apl-history.vue
+4
-4
pages/comment/service-apl/service-apl.vue
+106
-66
pages/comment/user/user.vue
+1
-1
pages/index/index.vue
+7
-0
No files found.
pages/comment/evaluate-history/evaluate-history.css
View file @
ed34d54f
page
{
background-color
:
#fff
;
}
.m-list
{
padding
:
25
upx
10
upx
;
border-bottom
:
1
upx
solid
#eee
;
}
.ser-name
{
width
:
350
upx
;
margin-right
:
15
rpx
;
font-size
:
30
upx
;
/* width:350upx; */
margin-right
:
15
rpx
;
}
.time
{
padding-top
:
15
upx
;
color
:
#
ccc
;
font-size
:
30
upx
;
color
:
#
999
;
font-size
:
28
upx
;
}
.head-img
{
flex-shrink
:
0
;
...
...
@@ -19,6 +25,8 @@
border-radius
:
50%
;
}
.img-area
{
display
:
flex
;
flex-wrap
:
wrap
;
margin-top
:
15
upx
;
}
.img-area
.upload-img
{
...
...
@@ -26,3 +34,4 @@
height
:
150
upx
;
margin
:
5
upx
10
upx
;
}
pages/comment/evaluate-history/evaluate-history.vue
View file @
ed34d54f
...
...
@@ -2,12 +2,12 @@
<view
style=
"padding:0 35rpx;"
>
<view
class=
"flex m-list"
v-for=
"(item,index) in satisHisList"
:key=
"index"
>
<image
class=
"head-img"
style=
""
src=
"../../../static/img/logo.png"
></image>
<view>
<
view
class=
"flex"
>
<view
class=
"flex1"
>
<
!--
<view
class=
"flex"
>
--
>
<view
class=
"ser-name ellipsis2"
style=
""
>
{{
item
.
disableUserProjectTypeName
}}
</view>
<
/view
>
<
!--
</view>
--
>
<view
class=
"time"
>
{{
item
.
createTime
}}
</view>
<view
style=
"color:#
ccc
;"
>
<view
style=
"color:#
999;font-size:28rpx
;"
>
{{
item
.
remark
}}
</view>
<view
class=
"img-area"
style=
"margin-top:25upx;"
>
...
...
pages/comment/evaluate/evaluate.vue
View file @
ed34d54f
...
...
@@ -34,7 +34,7 @@
<view>
<view
class=
"btns-area"
>
<button
@
click=
"satisfactionEvaluation"
class=
"send-btn flex-ac-jc"
>
提交反馈
</button>
<button
@
click=
"back"
class=
"cancel-btn flex-ac-jc"
>
取 消
</button>
<button
@
click=
"back
Cancel
"
class=
"cancel-btn flex-ac-jc"
>
取 消
</button>
</view>
</view>
...
...
@@ -167,16 +167,19 @@
})
}
else
if
(
!
loginType
){
setTimeout
(()
=>
{
uni
.
reLaunch
({
url
:
'../login/login'
})
},
2000
);
uni
.
removeStorageSync
(
'user'
);
uni
.
removeStorageSync
(
'token'
);
uni
.
removeStorageSync
(
'loginType'
);
uni
.
showToast
({
icon
:
'none'
,
title
:
'请
先
登录'
,
title
:
'请
重新
登录'
,
duration
:
6000
})
uni
.
reLaunch
({
url
:
'../login/login'
})
}
// 判断是否登录
this
.
getApplyProject
();
...
...
@@ -318,6 +321,11 @@
this
.
evaluationForm
.
disableUserProjectTypeId
=
this
.
applyProjectList
[
this
.
applyProjectListIndex
].
disableUserProjectTypeId
;
},
backCancel
(){
uni
.
navigateTo
({
url
:
"../user/user"
})({})
}
}
}
...
...
pages/comment/login/login.vue
View file @
ed34d54f
...
...
@@ -150,7 +150,7 @@
success
:
()
=>
{
uni
.
setStorageSync
(
'token'
,
token
);
uni
.
setStorageSync
(
'user'
,
user
);
uni
.
setStorageSync
(
'loginType'
,
0
);
uni
.
setStorageSync
(
'loginType'
,
true
);
// uni.switchTab({
// url: '../user/user',
// })
...
...
pages/comment/service-apl-history/service-apl-history.vue
View file @
ed34d54f
...
...
@@ -9,10 +9,10 @@
<view
class=
"list-area"
>
<view
v-for=
"(item,index) in applyProjectList"
:key=
"index"
class=
"m-his-list"
style=
""
>
<view
class=
"his-item"
>
申请人:
<text
style=
"color:#ccc;"
>
{{
item
.
name
}}
</text></view>
<view
class=
"his-item mt10"
>
伤残等级:
<text
style=
"color:#ccc;"
>
{{
item
.
disableLevel
|
disableLevelFun
}}
</text></view>
<view
class=
"his-item mt10"
>
伤残类别:
<text
style=
"color:#ccc;"
>
{{
item
.
disableCategory
|
disableCategoryFun
}}
</text></view>
<view
class=
"his-item mt10"
>
项目类型:
<text
style=
"color:#ccc;"
>
{{
item
.
disableUserProjectTypeName
}}
</text></view>
<view
class=
"his-item mt10"
>
申请时间:
<text
style=
"color:#ccc;"
>
{{
item
.
createTime
}}
</text></view>
<view
class=
"his-item mt10"
>
伤残等级:
<text
style=
"color:#ccc;
margin-left:15rpx;
"
>
{{
item
.
disableLevel
|
disableLevelFun
}}
</text></view>
<view
class=
"his-item mt10"
>
伤残类别:
<text
style=
"color:#ccc;
margin-left:15rpx;
"
>
{{
item
.
disableCategory
|
disableCategoryFun
}}
</text></view>
<view
class=
"his-item mt10"
>
项目类型:
<text
style=
"color:#ccc;
margin-left:15rpx;
"
>
{{
item
.
disableUserProjectTypeName
}}
</text></view>
<view
class=
"his-item mt10"
>
申请时间:
<text
style=
"color:#ccc;
margin-left:15rpx;
"
>
{{
item
.
createTime
}}
</text></view>
<view
class=
"his-item-result mt10"
>
审批结果:
{{
item
.
applyResult
}}
</view>
</view>
</view>
...
...
pages/comment/service-apl/service-apl.vue
View file @
ed34d54f
...
...
@@ -29,11 +29,18 @@
<text
style=
"color:red;"
>
*
</text>
</view>
<view
class=
"flex1"
>
<!--
<input
disabled=
"true"
v-model=
"timeList.time9"
/>
-->
<picker
@
change=
"hurtTypeChange"
:value=
"disableCategoryIndex"
:range=
"disableCategory"
range-key=
"name"
>
<!--
<picker
@
change=
"hurtTypeChange"
:value=
"disableCategoryIndex"
:range=
"disableCategory"
range-key=
"name"
>
<view
class=
"flex-a-c"
style=
"justify-content:flex-end;"
>
<view
class=
"picker-content ellip"
style=
''
>
{{
disableCategoryIndex
>-
1
?
disableCategory
[
disableCategoryIndex
].
name
:
'点击选择'
}}
{{
disableCategoryIndex
>
0
?
disableCategory
[
disableCategoryIndex
].
name
:
'点击选择'
}}
</view>
<view
class=
"trangle"
></view>
</view>
</picker>
-->
<picker
@
change=
"hurtTypeChange"
:value=
"disableCategoryIndex"
:range=
"disableCategory"
>
<view
class=
"flex-a-c"
style=
"justify-content:flex-end;"
>
<view
class=
"picker-content ellip"
style=
''
>
{{
disableCategory
[
disableCategoryIndex
]
}}
</view>
<view
class=
"trangle"
></view>
</view>
...
...
@@ -46,11 +53,17 @@
<text
style=
"color:red;"
>
*
</text>
</view>
<view
class=
"flex1"
>
<picker
@
change=
"hurtLevelChange"
:value=
"disableLevelIndex"
:range=
"disableLevel"
range-key=
"name"
>
<
!--
<
picker
@
change=
"hurtLevelChange"
:value=
"disableLevelIndex"
:range=
"disableLevel"
range-key=
"name"
>
<view
class=
"flex-a-c"
style=
"justify-content:flex-end;"
>
<view
class=
"picker-content ellip"
style=
''
>
{{
disableLevelIndex
>-
1
?
disableLevel
[
disableLevelIndex
].
name
:
'点击选择'
}}
</view>
<view
class=
"trangle"
></view>
</view>
</picker>
-->
<picker
@
change=
"hurtLevelChange"
:value=
"disableLevelIndex"
:range=
"disableLevel"
>
<view
class=
"flex-a-c"
style=
"justify-content:flex-end;"
>
<view
class=
"picker-content ellip"
style=
''
>
{{
disableLevel
[
disableLevelIndex
]
}}
</view>
<view
class=
"trangle"
></view>
</view>
</picker>
</view>
</view>
...
...
@@ -89,56 +102,76 @@
user
:{},
//用户信息
applyForm
:{},
disableLevel
:
[
{
id
:
1
,
name
:
'一级'
},
{
id
:
2
,
name
:
'二级'
},
{
id
:
3
,
name
:
'三级'
},
{
id
:
4
,
name
:
'四级'
},,
{
id
:
5
,
name
:
'五级'
},,
{
id
:
6
,
name
:
'六级'
},{
id
:
7
,
name
:
'七级'
}
'一级'
,
'二级'
,
'三级'
,
'四级'
,
'五级'
,
'六级'
,
'七级'
// {
// id:1,
// name: '一级'
// }, {
// id:2,
// name: '二级'
// }, {
// id:3,
// name: '三级'
// }, {
// id:4,
// name: '四级'
// },, {
// id:5,
// name: '五级'
// },, {
// id:6,
// name: '六级'
// },{
// id:7,
// name: '七级'
// }
],
disableCategoryIndex
:
-
1
,
disableLevelIndex
:
-
1
,
// disableCategoryIndex: -1,
disableCategoryIndex
:
0
,
// disableLevelIndex: -1,
disableLevelIndex
:
0
,
projectTypeIndex
:
-
1
,
projectTypeList
:
[],
//项目类型
disableCategory
:
[
{
id
:
1
,
name
:
'视力障碍'
},
{
id
:
2
,
name
:
'听力障碍'
},
{
id
:
3
,
name
:
'言语障碍'
},
{
id
:
4
,
name
:
'肢体障碍'
},,
{
id
:
5
,
name
:
'智力障碍'
},,
{
id
:
6
,
name
:
'精神障碍'
},,
{
id
:
7
,
name
:
'多种障碍'
}
'视力障碍'
,
'听力障碍'
,
'言语障碍'
,
'肢体障碍'
,
'智力障碍'
,
'精神障碍'
,
'多种障碍'
// {
// id:1,
// name: '视力障碍'
// },
// {
// id:2,
// name: '听力障碍'
// }, {
// id:3,
// name: '言语障碍'
// }, {
// id:4,
// name: '肢体障碍'
// },, {
// id:5,
// name: '智力障碍'
// },, {
// id:6,
// name: '精神障碍'
// },, {
// id:7,
// name: '多种障碍'
// }
],
}
...
...
@@ -165,13 +198,20 @@
},
//伤残类别
hurtTypeChange
(
e
)
{
console
.
log
(
"选择伤残类别=========="
,
e
.
detail
.
value
);
// this.disableCategoryIndex = e.detail.value;
// this.applyForm.disableCategory=this.disableCategory[this.disableCategoryIndex].id;
this
.
disableCategoryIndex
=
e
.
detail
.
value
;
this
.
applyForm
.
disableCategory
=
this
.
disableCategory
[
this
.
disableCategoryIndex
].
id
;
console
.
log
(
"选择伤残类别id=========="
,
parseInt
(
this
.
disableCategoryIndex
)
+
1
);
this
.
applyForm
.
disableCategory
=
parseInt
(
this
.
disableCategoryIndex
)
+
1
;
},
//伤残等级
hurtLevelChange
(
e
)
{
// this.disableLevelIndex = e.detail.value;
// this.applyForm.disableLevel=this.disableLevel[this.disableLevelIndex].id;
this
.
disableLevelIndex
=
e
.
detail
.
value
;
this
.
applyForm
.
disableLevel
=
this
.
disableLevel
[
this
.
disableLevelIndex
].
id
;
console
.
log
(
"选择伤残等级id=========="
,
parseInt
(
this
.
disableLevelIndex
)
+
1
);
this
.
applyForm
.
disableLevel
=
parseInt
(
this
.
disableLevelIndex
)
+
1
;
},
...
...
@@ -182,20 +222,20 @@
},
//申请服务
applyProject
()
{
if
(
this
.
disableCategoryIndex
==-
1
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
'请选择伤残类别'
});
return
;
}
if
(
this
.
disableLevelIndex
==-
1
)
{
uni
.
showToast
({
icon
:
'none'
,
title
:
'请选择伤残等级'
});
return
;
}
//
if (this.disableCategoryIndex==-1) {
//
uni.showToast({
//
icon: 'none',
//
title: '请选择伤残类别'
//
});
//
return;
//
}
//
if (this.disableLevelIndex==-1) {
//
uni.showToast({
//
icon: 'none',
//
title: '请选择伤残等级'
//
});
//
return;
//
}
if
(
this
.
projectTypeIndex
==-
1
)
{
uni
.
showToast
({
icon
:
'none'
,
...
...
pages/comment/user/user.vue
View file @
ed34d54f
...
...
@@ -96,7 +96,7 @@
}]
},
avatarUrl
:
"../../static/img/logo.png"
,
//未登录时的头像
avatarUrl
:
"../../
../
static/img/logo.png"
,
//未登录时的头像
navList
:
[
{
id
:
1
,
...
...
pages/index/index.vue
View file @
ed34d54f
...
...
@@ -135,6 +135,13 @@
url
:
'pages/login/login'
,
})
}
else
if
(
loginType
){
uni
.
removeStorageSync
(
'user'
);
uni
.
removeStorageSync
(
'token'
);
uni
.
removeStorageSync
(
'loginType'
);
uni
.
showToast
({
title
:
'请重新登录'
,
icon
:
'none'
})
uni
.
reLaunch
({
url
:
'pages/login/login'
,
})
...
...
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