合并dev

src/common/common.ts

@@ -23,6 +23,7 @@ export const goLink = (path = '', params = {}, type:false|true = false) => {
     }
   
 }
+<<<<<<< HEAD
 /**
  * 判断对象为空
  * @param object 
@@ -86,4 +87,19 @@ export const retrieval = (data: any, message: string="请填写完信息", rules
       }
       resolve(null);
     })
-  }
+  }
+=======
+
+// 金额千位分割符
+export const formatKbPrice = (number: string) => {
+    const ret = Array.from(number).reverse().reduce((result: string[],next,i,arr) => {
+        if((i+1)%3 === 0 && (i+1) !== arr.length) {
+            result.push(next,',')
+            return result;
+        }
+        result.push(next);
+        return result;
+    },[])
+    return ret.reverse().join('');
+}
+>>>>>>> 1557571 (确认订单)