Commit 14d2a9ad authored by 李俊赕's avatar 李俊赕
parents a943e878 d307bdb4
...@@ -12,11 +12,12 @@ let apiFun = function(vm) { ...@@ -12,11 +12,12 @@ let apiFun = function(vm) {
let commonApi = commonApiFun(vm); let commonApi = commonApiFun(vm);
let settledApi = settledApiFun(vm) let settledApi = settledApiFun(vm)
let cloudApi = cloudRulesApiFun(vm) let cloudApi = cloudRulesApiFun(vm)
let learnApi=learnApiFun(vm)
let apiUrl = { let apiUrl = {
...commonApi, ...commonApi,
...settledApi, ...settledApi,
...cloudApi, ...cloudApi,
...learnApiFun ...learnApi
} }
return apiUrl return apiUrl
} }
......
...@@ -3,7 +3,7 @@ const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl ...@@ -3,7 +3,7 @@ const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
let learnApiFun = function(vm){ let learnApiFun = function(vm){
/* 查询用户基本信息 */ /* 查询用户基本信息 */
let getTrainingNoticeList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/get-cert-list', params); let getTrainingNoticeList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/notice/list', params);
const learnApi = { const learnApi = {
getTrainingNoticeList, getTrainingNoticeList,
......
...@@ -5,11 +5,10 @@ ...@@ -5,11 +5,10 @@
<image :src="url" style="width: 100%;" mode="widthFix"></image> <image :src="url" style="width: 100%;" mode="widthFix"></image>
<view class="introduction"> <view class="introduction">
<slot></slot> <slot></slot>
</view>
<view class="settle-bottom"> <view class="settle-bottom">
<slot name="bottom"></slot> <slot name="bottom"></slot>
</view> </view>
</view>
</view> </view>
</template> </template>
...@@ -33,22 +32,19 @@ ...@@ -33,22 +32,19 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.settle-view {
background-color: #F4F5F7;
}
.introduction { .introduction {
border-radius: 12rpx; border-radius: 12rpx;
margin-left: 30rpx;
margin-right: 30rpx;
margin-top: -112rpx;
background-color: #F4F5F7;
overflow: auto; overflow: auto;
height: calc(100vh - 312rpx); position: fixed;
top: 320rpx;
bottom: 0rpx;
left: 30rpx;
right: 30rpx;
} }
.settle-bottom { .settle-bottom {
position: fixed; position: fixed;
width: calc(100vw - 60rpx);
bottom: 44rpx; bottom: 44rpx;
width: 100%;
} }
</style> </style>
...@@ -93,7 +93,8 @@ ...@@ -93,7 +93,8 @@
{ {
"path": "pages/settle/select", "path": "pages/settle/select",
"style": { "style": {
"navigationBarTitleText": "选择可服务的城市" "navigationBarTitleText": "选择可服务的城市",
"navigationBarBackgroundColor":"#FFFFFF"
} }
}, },
......
This diff is collapsed.
This diff is collapsed.
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
...@@ -201,7 +202,7 @@ ...@@ -201,7 +202,7 @@
.line-view { .line-view {
background-color: #F4F5F7; background-color: #F4F5F7;
height: 1rpx; height: 2rpx;
width: 100%; width: 100%;
margin-bottom: 30rpx; margin-bottom: 30rpx;
margin-top: 30rpx; margin-top: 30rpx;
...@@ -212,7 +213,7 @@ ...@@ -212,7 +213,7 @@
color: #333333; color: #333333;
font-weight: bold; font-weight: bold;
font-size: 32rpx; font-size: 32rpx;
margin-top: 6rpx; margin-top: 8rpx;
} }
.item-content { .item-content {
...@@ -232,10 +233,12 @@ ...@@ -232,10 +233,12 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
background-color: #D1D4D4; background-color: #D1D4D4;
&.active { &.active {
background-color: #2272FF; background-color: #2272FF;
} }
.bottom_title { .bottom_title {
color: #fff; color: #fff;
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<view class="content"> <view class="content">
<view class="area-nav flex" v-if="selectType == 'area'"> <view class="area-nav flex" v-if="selectType == 'area'">
<view class="nav-left"> <view class="nav-left">
<view :class="['nav-item',{'active':currentProvinceIndex===index}]" v-for="(areaItem, index) in areaList" :key="index" <view :class="['nav-item',{'active':currentIndex===index}]" v-for="(areaItem, index) in areaList" :key="index"
@click="getareaList(areaItem.id,1,index)"> @click="getareaList(areaItem.id,1,index)">
{{ areaItem.name }} {{ areaItem.name }}
</view> </view>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!-- <i class="iconfont icon-tijiao"></i> --> <!-- <i class="iconfont icon-tijiao"></i> -->
</view> </view>
</view> </view>
<view class="btn-wrap fixed flex flex-xc"> <view class="btn-wrap fixed flex flex-xc" v-if="selectType == 'area'">
<button class="btn-submit" @click="goBack('confirm')"> <button class="btn-submit" @click="goBack('confirm')">
确定 确定
</button> </button>
...@@ -202,13 +202,13 @@ ...@@ -202,13 +202,13 @@
areaIds: prevVue.baseInfo.service_area, areaIds: prevVue.baseInfo.service_area,
areaTxts: prevVue.areaTxts areaTxts: prevVue.areaTxts
} }
title = '选择可服务的城市' title = '接单城市'
} else if (selectType === 'working_age') { } else if (selectType === 'working_age') {
this.selected = { this.selected = {
working_age: prevVue.baseInfo.working_age, working_age: prevVue.baseInfo.working_age,
workingAgeTxt: prevVue.workingAgeTxt workingAgeTxt: prevVue.workingAgeTxt
} }
title = '选择工作工龄' title = '电工工龄'
} }
uni.setNavigationBarTitle({ uni.setNavigationBarTitle({
title title
...@@ -385,6 +385,7 @@ ...@@ -385,6 +385,7 @@
selectAge(item) { selectAge(item) {
this.selected.working_age = item.value this.selected.working_age = item.value
this.selected.workingAgeTxt = item.name this.selected.workingAgeTxt = item.name
this.goBack('confirm')
}, },
selectAllarea(idx){ selectAllarea(idx){
const allChildren = this.areaList[this.currentIndex] const allChildren = this.areaList[this.currentIndex]
...@@ -409,7 +410,10 @@ ...@@ -409,7 +410,10 @@
} }
</script> </script>
<style lang="scss"> <style lang="scss" scoped>
.content {
background-color: #F3F3F3;
}
.nav-item, .nav-item,
.age-item { .age-item {
position: relative; position: relative;
...@@ -474,9 +478,9 @@ ...@@ -474,9 +478,9 @@
.age-box { .age-box {
padding-top: 40rpx; padding-top: 40rpx;
height: calc(100vh - 180rpx); // height: calc(100vh - 180rpx);
overflow: auto; overflow: auto;
margin-bottom: 44rpx;
.age-item { .age-item {
position: relative; position: relative;
} }
......
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