Commit a8beaaae authored by wangjiankun's avatar wangjiankun

18 组织架构、标签添加关闭app功能按钮,并修改返回按钮样式使其与每个页面的样式一致(点开按钮位置无变化) 搜索框改为van-search 带验证软键盘有无改变

parent fc008f2a
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
src="@assets/images/back.png" src="@assets/images/back.png"
alt="" alt=""
> >
<img
class="close"
@click="closeApp"
src="@assets/images/close.png"
alt=""
>
</div> </div>
<div class="title"> <div class="title">
<span>标签</span> <span>标签</span>
...@@ -40,6 +46,7 @@ ...@@ -40,6 +46,7 @@
<script> <script>
import {Checkbox, CheckboxGroup} from 'vant' import {Checkbox, CheckboxGroup} from 'vant'
import {get} from '@/api/test' import {get} from '@/api/test'
import {sendInfoToJava} from "../../utils/mt-utils";
export default { export default {
name: 'LabelTrain', name: 'LabelTrain',
...@@ -62,6 +69,10 @@ export default { ...@@ -62,6 +69,10 @@ export default {
} }
}, },
methods: { methods: {
// 关闭app
closeApp() {
sendInfoToJava('close')
},
// 点击返回 // 点击返回
arrowBack() { arrowBack() {
this.$emit('arrowBack') this.$emit('arrowBack')
...@@ -123,10 +134,21 @@ export default { ...@@ -123,10 +134,21 @@ export default {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
height: 100%; height: 100%;
display: flex;
align-items: center;
& > img{ & > img{
width: 12px; width: 12px;
height: 21px; height: 21px;
padding: 10px 15px; padding: 10px 15px;
/*vertical-align: middle;*/
}
.close{
width: 19px;
height: 19px;
margin-left: 15px;
/*padding: 0 15px;*/
/*vertical-align: middle;*/
padding: 10px 0;
} }
} }
.title{ .title{
......
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
src="@assets/images/back.png" src="@assets/images/back.png"
alt="" alt=""
> >
<img
class="close"
@click="closeApp"
src="@assets/images/close.png"
alt=""
>
</div> </div>
<div class="title"> <div class="title">
<span>选择可见范围</span> <span>选择可见范围</span>
...@@ -27,14 +33,22 @@ ...@@ -27,14 +33,22 @@
<!--class="iconfont icon-sousuo"--> <!--class="iconfont icon-sousuo"-->
<!--@click="searchPeople"--> <!--@click="searchPeople"-->
<!--&gt;</i>--> <!--&gt;</i>-->
<input <!-- <input-->
type="text" <!-- type="text"-->
id="searchInput" <!-- id="searchInput"-->
style="padding-left: 25px" <!-- style="padding-left: 25px"-->
placeholder='搜索' <!-- placeholder='搜索'-->
@keydown.enter="searchPeople" <!-- @keydown.enter="searchPeople"-->
v-model.trim="searchName" <!-- v-model.trim="searchName"-->
> <!-- >-->
<form action="/">
<van-search
shape="round"
v-model.trim="searchName"
placeholder="搜索"
@search="searchPeople"
/>
</form>
</div> </div>
</div> </div>
<!--面包屑--> <!--面包屑-->
...@@ -161,6 +175,7 @@ ...@@ -161,6 +175,7 @@
import organizationAPI from './organization' import organizationAPI from './organization'
import util from './utils' import util from './utils'
import { icon,popup } from 'vant'; import { icon,popup } from 'vant';
import {sendInfoToJava} from "../../utils/mt-utils";
export default { export default {
components: { components: {
...@@ -319,6 +334,9 @@ ...@@ -319,6 +334,9 @@
// 方法集合 // 方法集合
methods: { methods: {
// 点击返回 // 点击返回
closeApp() {
sendInfoToJava('close')
},
arrowBack() { arrowBack() {
this.$emit('closeDialog') this.$emit('closeDialog')
}, },
...@@ -708,10 +726,20 @@ function compare (property) { ...@@ -708,10 +726,20 @@ function compare (property) {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
height: 100%; height: 100%;
display: flex;
align-items: center;
& > img{ & > img{
width: 12px; width: 12px;
height: 21px; height: 21px;
padding: 10px 15px; padding: 10px 15px;
/*vertical-align: middle;*/
}
.close{
width: 19px;
height: 19px;
margin-left: 15px;
/*vertical-align: middle;*/
padding: 10px 0;
} }
} }
.title{ .title{
...@@ -829,7 +857,7 @@ function compare (property) { ...@@ -829,7 +857,7 @@ function compare (property) {
overflow-y: auto; overflow-y: auto;
.searchBox { .searchBox {
width: 20rem; width: 20rem;
height: 1.43rem; height: 1.6rem;
background-color: #fff; background-color: #fff;
margin: 0 auto; margin: 0 auto;
margin-top: .67rem; margin-top: .67rem;
...@@ -1064,3 +1092,30 @@ function compare (property) { ...@@ -1064,3 +1092,30 @@ function compare (property) {
text-overflow: ellipsis; text-overflow: ellipsis;
} }
</style> </style>
<style lang="less">
.label-train{
.organization{
.block{
.content{
.searchBox{
overflow: hidden;
.searchBlock{
.van-search{
width: 100%;
height: 100%;
padding: 0;
.van-search__content{
height: 100%;
background-color: #ffffff;
.van-cell{
padding: 0;
}
}
}
}
}
}
}
}
}
</style>
...@@ -6,7 +6,7 @@ import Storage from 'vue-ls' ...@@ -6,7 +6,7 @@ import Storage from 'vue-ls'
import {sessionOptions, localOptions} from './config/vue-ls.config' import {sessionOptions, localOptions} from './config/vue-ls.config'
import * as _ from 'lodash' import * as _ from 'lodash'
import 'vant/lib/icon/local.css' import 'vant/lib/icon/local.css'
import {ActionSheet, Loading, Slider, Overlay, PullRefresh, Field, Image, Toast, Dialog} from 'vant' import {ActionSheet, Loading, Slider, Overlay, PullRefresh, Field, Image, Toast, Dialog, Search} from 'vant'
import wnsdk from '@tjmt/wnsdk' import wnsdk from '@tjmt/wnsdk'
import {curriculumTrainRouter, setgoindex} from './utils' import {curriculumTrainRouter, setgoindex} from './utils'
import './assets/style/resetui.less' import './assets/style/resetui.less'
...@@ -31,6 +31,7 @@ Vue.use(Overlay) ...@@ -31,6 +31,7 @@ Vue.use(Overlay)
Vue.use(Slider) Vue.use(Slider)
Vue.use(Loading) Vue.use(Loading)
Vue.use(ActionSheet) Vue.use(ActionSheet)
Vue.use(Search)
Vue.config.productionTip = false Vue.config.productionTip = false
// 定义线上课程 线下培训 跳转方法 // 定义线上课程 线下培训 跳转方法
Vue.prototype.$curriculumTrainRouter = curriculumTrainRouter Vue.prototype.$curriculumTrainRouter = curriculumTrainRouter
......
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