Merge branch 'web' of https://hel.hand-china.com/heasy/hls-webapp-cli into web

template/README.md

@@ -6,16 +6,16 @@
 
 ``` bash
 # install dependencies
-npm install
+yarn install
 
 # serve with hot reload at localhost:8080
-npm run dev
+yarn run dev
 
 # build for production with minification
-npm run build
+yarn run build
 
 # build for production and view the bundle analyzer report
-npm run build --report
+yarn run build --report
 ```
 
 For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

template/src/scripts/filter.js

@@ -2,9 +2,8 @@ export default (Vue) => {
   Vue.filter('currency', function (val) {
     if (!val) return '0.00'
 
-    var intPart = Number(val).toFixed(0) // 获取整数部分
+    var intPart = parseInt(Number(val)) // 获取整数部分
     var intPartFormat = intPart.toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,') // 将整数部分逢三一断
-
     var floatPart = '.00' // 预定义小数部分
     var value2Array = (val + '').split('.')
 
@@ -21,6 +20,10 @@ export default (Vue) => {
       return intPartFormat + floatPart
     }
   })
+  Vue.filter('uncurrency', function (val) {
+    if (!val) return null
+    return Number((val).replace(/,/gi, ''))
+  })
   Vue.filter('datetime', timestamp => {
     function format (number) {
       return number.toString().padStart(2, '0')
@@ -35,3 +38,4 @@ export default (Vue) => {
     return `${YYYY}-${format(MM)}-${format(DD)} ${format(hh)}:${format(mm)}:${format(ss)}`
   })
 }
+

template/src/scripts/hlsPopup.js

 import Vue from 'vue'
 import {ToastPlugin, AlertPlugin, ConfirmPlugin, LoadingPlugin, DatetimePlugin} from 'vux'
-import {ActionSheetPlugin, ShowPicturePlugin, SelectPlugin, NotifyPlugin, HlsModalPlugin, NumberKeyboardPlugin} from 'hls-easy-ui'
+import {ActionSheetPlugin, ShowPicturePlugin, SelectPlugin, NotifyPlugin, NumberKeyboardPlugin} from 'hls-easy-ui'
 Vue.use(ToastPlugin)
 Vue.use(AlertPlugin)
 Vue.use(ConfirmPlugin)
@@ -11,7 +11,6 @@ Vue.use(ShowPicturePlugin)
 Vue.use(SelectPlugin)
 Vue.use(NumberKeyboardPlugin)
 Vue.use(NotifyPlugin)
-Vue.use(HlsModalPlugin)
 
 export default {