Skip to content

C
clapp
Commit ed34d54f by 莫晓莉
Options

残联修改

parent cc6ced9d
Showing with 152 additions and 88 deletions
pages/comment/evaluate-history/evaluate-history.css
page{
background-color: #fff;
}
.m-list{ .m-list{
padding:25upx 10upx; padding:25upx 10upx;
border-bottom:1upx solid #eee; border-bottom:1upx solid #eee;
} }
.ser-name{ .ser-name{
width:350upx;margin-right:15rpx; font-size:30upx;
/* width:350upx; */
margin-right:15rpx;
} }
.time{ .time{
padding-top:15upx; padding-top:15upx;
color:#ccc; color:#999;
font-size:30upx; font-size:28upx;
} }
.head-img{ .head-img{
flex-shrink: 0; flex-shrink: 0;
...@@ -19,6 +25,8 @@ ...@@ -19,6 +25,8 @@
border-radius:50%; border-radius:50%;
} }
.img-area{ .img-area{
display: flex;
flex-wrap: wrap;
margin-top:15upx; margin-top:15upx;
} }
.img-area .upload-img{ .img-area .upload-img{
...@@ -26,3 +34,4 @@ ...@@ -26,3 +34,4 @@
height:150upx; height:150upx;
margin:5upx 10upx; margin:5upx 10upx;
} }
pages/comment/evaluate-history/evaluate-history.vue
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
<view style="padding:0 35rpx;"> <view style="padding:0 35rpx;">
<view class="flex m-list" v-for="(item,index) in satisHisList" :key="index"> <view class="flex m-list" v-for="(item,index) in satisHisList" :key="index">
<image class="head-img" style="" src="../../../static/img/logo.png"></image> <image class="head-img" style="" src="../../../static/img/logo.png"></image>
<view> <view class="flex1">
<view class="flex"> <!-- <view class="flex"> -->
<view class="ser-name ellipsis2" style="">{{item.disableUserProjectTypeName}}</view> <view class="ser-name ellipsis2" style="">{{item.disableUserProjectTypeName}}</view>
</view> <!-- </view> -->
<view class="time">{{item.createTime}}</view> <view class="time">{{item.createTime}}</view>
<view style="color:#ccc;"> <view style="color:#999;font-size:28rpx;">
{{item.remark}} {{item.remark}}
</view> </view>
<view class="img-area" style="margin-top:25upx;"> <view class="img-area" style="margin-top:25upx;">
<image v-for="(img,index2) in item.imageUrl" :key="index2" class="upload-img" :src="fileUrl+img.imageUrl"></image> <image v-for="(img,index2) in item.imageUrl" :key="index2" class="upload-img" :src="fileUrl+img.imageUrl"></image>
</view> </view>
</view> </view>
......
pages/comment/evaluate/evaluate.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<view> <view>
<view class="btns-area"> <view class="btns-area">
<button @click="satisfactionEvaluation" class="send-btn flex-ac-jc">提交反馈</button> <button @click="satisfactionEvaluation" class="send-btn flex-ac-jc">提交反馈</button>
<button @click="back" class="cancel-btn flex-ac-jc">取 消</button> <button @click="backCancel" class="cancel-btn flex-ac-jc">取 消</button>
</view> </view>
</view> </view>
...@@ -167,16 +167,19 @@ ...@@ -167,16 +167,19 @@
}) })
}else if(!loginType){ }else if(!loginType){
setTimeout(() => { uni.removeStorageSync('user');
uni.reLaunch({ uni.removeStorageSync('token');
url: '../login/login' uni.removeStorageSync('loginType');
})
}, 2000);
uni.showToast({ uni.showToast({
icon:'none', icon:'none',
title:'请先登录', title:'请重新登录',
duration:6000 duration:6000
})
uni.reLaunch({
url: '../login/login'
}) })
} }
// 判断是否登录 // 判断是否登录
this.getApplyProject(); this.getApplyProject();
...@@ -318,6 +321,11 @@ ...@@ -318,6 +321,11 @@
this.evaluationForm.disableUserProjectTypeId=this.applyProjectList[this.applyProjectListIndex].disableUserProjectTypeId; this.evaluationForm.disableUserProjectTypeId=this.applyProjectList[this.applyProjectListIndex].disableUserProjectTypeId;
}, },
backCancel(){
uni.navigateTo({
url:"../user/user"
})({})
}
} }
} }
......
pages/comment/login/login.vue
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
success: () => { success: () => {
uni.setStorageSync('token', token); uni.setStorageSync('token', token);
uni.setStorageSync('user', user); uni.setStorageSync('user', user);
uni.setStorageSync('loginType',0); uni.setStorageSync('loginType',true);
// uni.switchTab({ // uni.switchTab({
// url: '../user/user', // url: '../user/user',
// }) // })
......
pages/comment/service-apl-history/service-apl-history.vue
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<view class="list-area"> <view class="list-area">
<view v-for="(item,index) in applyProjectList" :key="index" class="m-his-list" style=""> <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">申请人：<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;margin-left:15rpx;">{{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;margin-left:15rpx;">{{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;margin-left:15rpx;">{{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.createTime}}</text></view>
<view class="his-item-result mt10">审批结果：{{item.applyResult}}</view> <view class="his-item-result mt10">审批结果：{{item.applyResult}}</view>
</view> </view>
</view> </view>
......
pages/comment/service-apl/service-apl.vue
...@@ -29,11 +29,18 @@ ...@@ -29,11 +29,18 @@
<text style="color:red;">*</text> <text style="color:red;">*</text>
</view> </view>
<view class="flex1"> <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="flex-a-c" style="justify-content:flex-end;">
<view class="picker-content ellip" style=''> <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>
<view class="trangle"></view> <view class="trangle"></view>
</view> </view>
...@@ -46,11 +53,17 @@ ...@@ -46,11 +53,17 @@
<text style="color:red;">*</text> <text style="color:red;">*</text>
</view> </view>
<view class="flex1"> <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="flex-a-c" style="justify-content:flex-end;">
<view class="picker-content ellip" style=''>{{disableLevelIndex>-1?disableLevel[disableLevelIndex].name:'点击选择'}}</view> <view class="picker-content ellip" style=''>{{disableLevelIndex>-1?disableLevel[disableLevelIndex].name:'点击选择'}}</view>
<view class="trangle"></view> <view class="trangle"></view>
</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> </picker>
</view> </view>
</view> </view>
...@@ -89,56 +102,76 @@ ...@@ -89,56 +102,76 @@
user:{},//用户信息 user:{},//用户信息
applyForm:{}, applyForm:{},
disableLevel: [ disableLevel: [
{ '一级',
id:1, '二级',
name: '一级' '三级',
}, { '四级',
id:2, '五级',
name: '二级' '六级',
}, { '七级'
id:3,
name: '三级'
}, { // {
id:4, // id:1,
name: '四级' // name: '一级'
},, { // }, {
id:5, // id:2,
name: '五级' // name: '二级'
},, { // }, {
id:6, // id:3,
name: '六级' // name: '三级'
},{ // }, {
id:7, // id:4,
name: '七级' // name: '四级'
} // },, {
// id:5,
// name: '五级'
// },, {
// id:6,
// name: '六级'
// },{
// id:7,
// name: '七级'
// }
], ],
disableCategoryIndex: -1, // disableCategoryIndex: -1,
disableLevelIndex: -1, disableCategoryIndex: 0,
// disableLevelIndex: -1,
disableLevelIndex: 0,
projectTypeIndex: -1, projectTypeIndex: -1,
projectTypeList: [], //项目类型 projectTypeList: [], //项目类型
disableCategory: [ disableCategory: [
{ '视力障碍',
id:1, '听力障碍',
name: '视力障碍' '言语障碍',
}, { '肢体障碍',
id:2, '智力障碍',
name: '听力障碍' '精神障碍',
}, { '多种障碍'
id:3,
name: '言语障碍' // {
}, { // id:1,
id:4, // name: '视力障碍'
name: '肢体障碍' // },
},, { // {
id:5, // id:2,
name: '智力障碍' // name: '听力障碍'
},, { // }, {
id:6, // id:3,
name: '精神障碍' // name: '言语障碍'
},, { // }, {
id:7, // id:4,
name: '多种障碍' // name: '肢体障碍'
} // },, {
// id:5,
// name: '智力障碍'
// },, {
// id:6,
// name: '精神障碍'
// },, {
// id:7,
// name: '多种障碍'
// }
], ],
} }
...@@ -165,13 +198,20 @@ ...@@ -165,13 +198,20 @@
}, },
//伤残类别 //伤残类别
hurtTypeChange(e) { hurtTypeChange(e) {
this.disableCategoryIndex = e.detail.value; console.log("选择伤残类别==========",e.detail.value);
this.applyForm.disableCategory=this.disableCategory[this.disableCategoryIndex].id; // this.disableCategoryIndex = e.detail.value;
// this.applyForm.disableCategory=this.disableCategory[this.disableCategoryIndex].id;
this.disableCategoryIndex = e.detail.value;
console.log("选择伤残类别id==========",parseInt(this.disableCategoryIndex)+1);
this.applyForm.disableCategory=parseInt(this.disableCategoryIndex)+1;
}, },
//伤残等级 //伤残等级
hurtLevelChange(e) { hurtLevelChange(e) {
// this.disableLevelIndex = e.detail.value;
// this.applyForm.disableLevel=this.disableLevel[this.disableLevelIndex].id;
this.disableLevelIndex = e.detail.value; 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 @@ ...@@ -182,20 +222,20 @@
}, },
//申请服务 //申请服务
applyProject() { applyProject() {
if (this.disableCategoryIndex==-1) { // if (this.disableCategoryIndex==-1) {
uni.showToast({ // uni.showToast({
icon: 'none', // icon: 'none',
title: '请选择伤残类别' // title: '请选择伤残类别'
}); // });
return; // return;
} // }
if (this.disableLevelIndex==-1) { // if (this.disableLevelIndex==-1) {
uni.showToast({ // uni.showToast({
icon: 'none', // icon: 'none',
title: '请选择伤残等级' // title: '请选择伤残等级'
}); // });
return; // return;
} // }
if (this.projectTypeIndex==-1) { if (this.projectTypeIndex==-1) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
......
pages/comment/user/user.vue
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
}] }]
}, },
avatarUrl: "../../static/img/logo.png",//未登录时的头像 avatarUrl: "../../../static/img/logo.png",//未登录时的头像
navList: [ navList: [
{ {
id: 1, id: 1,
......
pages/index/index.vue
...@@ -135,6 +135,13 @@ ...@@ -135,6 +135,13 @@
url:'pages/login/login', url:'pages/login/login',
}) })
}else if(loginType){ }else if(loginType){
uni.removeStorageSync('user');
uni.removeStorageSync('token');
uni.removeStorageSync('loginType');
uni.showToast({
title:'请重新登录',
icon:'none'
})
uni.reLaunch({ uni.reLaunch({
url:'pages/login/login', url:'pages/login/login',
}) })
......
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