移除多余的组建

package.json

@@ -23,8 +23,6 @@
     "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
-    "vuex": "^2.1.1",
-    "vuex-i18n": "^1.3.1",
     "vux": "^2.9.2"
   },
   "devDependencies": {

packages/common/scripts/hlsUtil.js

@@ -92,7 +92,7 @@ export default {
   // 校验日期
   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)
   },
 

packages/common/styles/platform-iosx.less

@@ -8,7 +8,7 @@
       bottom: 1.68rem;
     }
     .has-footer {
-     // padding-bottom: 2.84rem;
+      padding-bottom: 1.56rem;
       .scrollContent{
         padding-bottom: 2.84rem;
       }
@@ -34,7 +34,7 @@
       bottom: 1.68rem;
     }
     .has-footer {
-     // padding-bottom: 2.84rem;
+      padding-bottom: 1.56rem;
       .scrollContent{
         padding-bottom: 2.84rem;
       }

packages/components/Select/select.vue

@@ -3,12 +3,21 @@
     <h-content
       :class="{'show-select-up': state == 1}"
       class="show-select-wrapper">
-      <popup-header
+      <!-- <popup-header
         :left-text="cancelText"
         :right-text="confirmText"
         :title="popupTitle"
         @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
         :data="list"
         v-model="tempValue"
@@ -30,9 +39,11 @@
     width: 100%;
     height: 100%;
     background-color: transparent;
+
     &.active {
       background-color: rgba(0, 0, 0, 0.2);
     }
+
     .show-select-wrapper {
       -webkit-transform: translate3d(0, 100%, 0);
       transform: translate3d(0, 100%, 0);
@@ -46,10 +57,15 @@
       top: auto;
       padding-top: 0px;
       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 {
@@ -120,9 +136,9 @@ export default {
       let vm = this
       if (index > -1) {
         let code = vm.code
-        let code_name = vm.code + '_n' // eslint-disable-line
+          let code_name = vm.code + '_n' // eslint-disable-line
         vm.object[code] = vm.value
-        vm.object[code_name] = vm.name // eslint-disable-line
+          vm.object[code_name] = vm.name // eslint-disable-line
         vm.callBack(vm.index, vm.object, vm.childs)
       }
       this.state = 0

src/main.js

@@ -3,8 +3,6 @@
 import Vue from 'vue'
 import FastClick from 'fastclick'
 import App from './App'
-import Vuex from 'vuex'
-import vuexI18n from 'vuex-i18n'
 import router from './router/index'
 
 import flexible from './common/ydui.flexible'
@@ -22,12 +20,7 @@ import filter from './scripts/filter'
  */
 
 import {
-  ViewBox,
-  Tabbar,
-  TabbarItem,
-  XHeader,
   Picker,
-  PopupHeader,
 } from 'vux'
 
 import './scripts/prototype'
@@ -61,23 +54,8 @@ Vue.use(directives)
 
 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)
 
-/** i18n **/
-let store = new Vuex.Store({
-  modules: {
-    i18n: vuexI18n.store,
-  },
-})
-Vue.use(vuexI18n.plugin, store)
-
 Vue.prototype.hlsPopup = window.hlsPopup = hlsPopup
 Vue.prototype.$devicePixelRatio = 2
 

src/scripts/hlsUtil.js

@@ -92,7 +92,7 @@ export default {
   // 校验日期
   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)
   },