Commit b433d1b6 authored by Nature's avatar Nature

移除多余的组建

parent caf44d72
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
"fastclick": "https://hel.hand-china.com/easyUI/fastclick.git", "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
"vue": "^2.5.2", "vue": "^2.5.2",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"vuex": "^2.1.1",
"vuex-i18n": "^1.3.1",
"vux": "^2.9.2" "vux": "^2.9.2"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
// 校验日期 // 校验日期
verifyBirthday: function (year, month, day, birthday) { verifyBirthday: function (year, month, day, birthday) {
// 年月日是否合理 // 年月日是否合理
return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1)) === month && return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1).toString()) === month &&
birthday.getDate().toString() === day) birthday.getDate().toString() === day)
}, },
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
bottom: 1.68rem; bottom: 1.68rem;
} }
.has-footer { .has-footer {
// padding-bottom: 2.84rem; padding-bottom: 1.56rem;
.scrollContent{ .scrollContent{
padding-bottom: 2.84rem; padding-bottom: 2.84rem;
} }
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
bottom: 1.68rem; bottom: 1.68rem;
} }
.has-footer { .has-footer {
// padding-bottom: 2.84rem; padding-bottom: 1.56rem;
.scrollContent{ .scrollContent{
padding-bottom: 2.84rem; padding-bottom: 2.84rem;
} }
......
...@@ -3,12 +3,21 @@ ...@@ -3,12 +3,21 @@
<h-content <h-content
:class="{'show-select-up': state == 1}" :class="{'show-select-up': state == 1}"
class="show-select-wrapper"> class="show-select-wrapper">
<popup-header <!-- <popup-header
:left-text="cancelText" :left-text="cancelText"
:right-text="confirmText" :right-text="confirmText"
:title="popupTitle" :title="popupTitle"
@on-click-left="returnItem(-1)" @on-click-left="returnItem(-1)"
@on-click-right="returnItem(1)"/> @on-click-right="returnItem(1)"/>-->
<h-header style="padding-top: 0">
<div slot="left" class="h-header-btn" @click="returnItem(-1)">
{{ cancelText }}
</div>
<div slot="center">{{ popupTitle }}</div>
<div slot="right" class="h-header-btn" @click="returnItem(1)">
{{ confirmText }}
</div>
</h-header>
<picker <picker
:data="list" :data="list"
v-model="tempValue" v-model="tempValue"
...@@ -30,9 +39,11 @@ ...@@ -30,9 +39,11 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: transparent; background-color: transparent;
&.active { &.active {
background-color: rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.2);
} }
.show-select-wrapper { .show-select-wrapper {
-webkit-transform: translate3d(0, 100%, 0); -webkit-transform: translate3d(0, 100%, 0);
transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0);
...@@ -46,10 +57,15 @@ ...@@ -46,10 +57,15 @@
top: auto; top: auto;
padding-top: 0px; padding-top: 0px;
background-color: #fff; background-color: #fff;
.vux-popup-header {
// border-bottom: 1px solid rgba(0,0,0,.1) !important; /*no*/
}
.h-header {
.h-header-left .h-header-btn {
color: #828282;
}
.h-header-right .h-header-btn {
color: #5D98F6;
}
}
} }
.show-select-up { .show-select-up {
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
import Vue from 'vue' import Vue from 'vue'
import FastClick from 'fastclick' import FastClick from 'fastclick'
import App from './App' import App from './App'
import Vuex from 'vuex'
import vuexI18n from 'vuex-i18n'
import router from './router/index' import router from './router/index'
import flexible from './common/ydui.flexible' import flexible from './common/ydui.flexible'
...@@ -22,12 +20,7 @@ import filter from './scripts/filter' ...@@ -22,12 +20,7 @@ import filter from './scripts/filter'
*/ */
import { import {
ViewBox,
Tabbar,
TabbarItem,
XHeader,
Picker, Picker,
PopupHeader,
} from 'vux' } from 'vux'
import './scripts/prototype' import './scripts/prototype'
...@@ -61,23 +54,8 @@ Vue.use(directives) ...@@ -61,23 +54,8 @@ Vue.use(directives)
Vue.use(filter) Vue.use(filter)
Vue.use(Vuex)
// Vue.directive('transfer-dom', TransferDom);
Vue.component('x-header', XHeader)
Vue.component('view-box', ViewBox)
Vue.component('tabbar', Tabbar)
Vue.component('tabbar-item', TabbarItem)
Vue.component('PopupHeader', PopupHeader)
Vue.component('picker', Picker) Vue.component('picker', Picker)
/** i18n **/
let store = new Vuex.Store({
modules: {
i18n: vuexI18n.store,
},
})
Vue.use(vuexI18n.plugin, store)
Vue.prototype.hlsPopup = window.hlsPopup = hlsPopup Vue.prototype.hlsPopup = window.hlsPopup = hlsPopup
Vue.prototype.$devicePixelRatio = 2 Vue.prototype.$devicePixelRatio = 2
......
...@@ -92,7 +92,7 @@ export default { ...@@ -92,7 +92,7 @@ export default {
// 校验日期 // 校验日期
verifyBirthday: function (year, month, day, birthday) { verifyBirthday: function (year, month, day, birthday) {
// 年月日是否合理 // 年月日是否合理
return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1)) === month && return (birthday.getFullYear().toString() === year && ((birthday.getMonth() + 1) < 10 ? '0' + (birthday.getMonth() + 1) : (birthday.getMonth() + 1).toString()) === month &&
((birthday.getDate()) < 10 ? '0' + (birthday.getDate()).toString() : birthday.getDate().toString()) === day) ((birthday.getDate()) < 10 ? '0' + (birthday.getDate()).toString() : birthday.getDate().toString()) === day)
}, },
......
This diff is collapsed.
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