Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

main.js

@@ -29,6 +29,7 @@ Vue.prototype.$socket = webim;
 App.mpType = 'app'
 import * as filters from './filters' 
 import * as config from './config'
+import utils from '@/util/util.js'
 
 let urlAddress = 'liangxin.zthymaoyi.com'
 
@@ -36,6 +37,7 @@ Vue.prototype.$url = 'https://'+urlAddress+'/upload/'
 Vue.prototype.$uploadUrl = 'https://'+urlAddress+'/file/upload'
 Vue.prototype.$ws = 'wss://'+urlAddress+'/chat'
 Vue.prototype.$ossUrl = 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData'
+Vue.prototype.utils = utils
 
 // let urlAddress = 'localhost'
 // Vue.prototype.$url = 'https://liangxin.zthymaoyi.com/upload/'

util/util.js

@@ -380,6 +380,22 @@ const utils = {
 			return false;
 		}
 	},
+	//判断保留两位小数
+	isTwoPoint: function(str) {
+	if(str.indexOf('.')>-1){
+		let _str = str.split('.')
+		if(_str[1].length>2) return true
+		return false
+	}else{
+		return false
+	}
+
+		// if (str === '' || str === undefined || str === null) {
+		// 	return true;
+		// } else {
+		// 	return false;
+		// }
+	},
 	expireTime: function(str) {
 		if (!str) {
 			return;
@@ -518,6 +534,7 @@ module.exports = {
 	transDate: utils.transDate,
 	isNumber: utils.isNumber,
 	isEmpty: utils.isEmpty,
+	isTwoPoint:utils.isTwoPoint,
 	expireTime: utils.expireTime,
 	payOrder: utils.payOrder,
 	login: utils.login