heibaikn
diff --git a/Collapse file
‎Cute-JavaScript/Cute-JS/README.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/README.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff b/Collapse file
‎Cute-JavaScript/Cute-JS/README.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/README.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎Cute-JavaScript/Cute-JS/level1/6.数字.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/level1/6.数字.md
+4Lines changed: 4 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎Cute-JavaScript/Cute-JS/level1/6.数字.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/level1/6.数字.md
+4Lines changed: 4 additions & 0 deletions
Display the source diff
Display the rich diff
diff --git a/Collapse file
‎Cute-JavaScript/Cute-JS/level1/9.正则表达式.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/level1/9.正则表达式.md
+8Lines changed: 8 additions & 0 deletions
Display the source diff
Display the rich diff b/Collapse file
‎Cute-JavaScript/Cute-JS/level1/9.正则表达式.md‎
Copy file name to clipboardExpand all lines: Cute-JavaScript/Cute-JS/level1/9.正则表达式.md
+8Lines changed: 8 additions & 0 deletions
Display the source diff
Display the rich diff
@@ -26,7 +26,7 @@
 ## JavaScript中级
 15. [JS对象介绍](https://github.com/pingan8787/Leo-JavaScript/tree/master/Cute-JavaScript/Cute-JS/level2/1.JS对象介绍.md)
 16. [JSON对象介绍](https://github.com/pingan8787/Leo-JavaScript/tree/master/Cute-JavaScript/Cute-JS/level2/2.JSON对象介绍.md)
-17. [JSON对象介绍](https://github.com/pingan8787/Leo-JavaScript/tree/master/Cute-JavaScript/Cute-JS/level2/3.WebAPI介绍.md)
+17. [WebAPI介绍](https://github.com/pingan8787/Leo-JavaScript/tree/master/Cute-JavaScript/Cute-JS/level2/3.WebAPI介绍.md)
 
 更新中
 
 
@@ -178,7 +178,11 @@ Number.isSafeInteger(3.0);                  // true
 数字类型原型上的方法:   
 
 |方法|描述|案例|
+<<<<<<< HEAD
 |---|---|---|
+=======
+|---|---|-|
+>>>>>>> d5d80312677f93c2655fa2cf4a9df26085ea78b5
 |`toExponential()`|返回一个数字的指数形式的字符串|1.23e+2|
 |`toFixed()`|返回指定小数位数的表示形式|var a=123,b=a.toFixed(2)//b="123.00"|
 |`toPrecision()`|返回一个指定精度的数字。|a=123中，3会由于精度限制消失var a=123,b=a.toPrecision(2)//b="1.2e+2"|
 
@@ -24,7 +24,11 @@ let reg = new RegExp("^[a-zA-z]", "gi");
 正则表达式的返回值，是一个新的`RegExp`对象，具有指定的模式和标志。  
 **返回信息介绍**：     
 |对象|属性|描述|案例中对应的值|
+<<<<<<< HEAD
 |---|---|---|---|
+=======
+|---|---|-|-|
+>>>>>>> d5d80312677f93c2655fa2cf4a9df26085ea78b5
 |`reg`|`lastIndex`|下一个匹配的索引（仅在使用`g`参数时可用）|`0`|
 |`reg`|`source`|模式文本。在正则表达式创建时更新，不执行。|`"ab+c"`|
 |`reg`|`ignoreCase`|是否使用了 "i" 标记使正则匹配忽略大小写。|`true`|
@@ -79,7 +83,11 @@ let result2 = /(leo \S)/g.exec("hello leo hi leo!");
 ```
 **返回信息介绍**：     
 |对象|属性|描述|案例中对应的值|
+<<<<<<< HEAD
 |---|---|---|---|
+=======
+|---|---|-|-|
+>>>>>>> d5d80312677f93c2655fa2cf4a9df26085ea78b5
 |`result`|`[0]`|匹配到的所有字符串|`"leo"`|
 |`result`|`input`|初始字符串。|`"hello leo!"`|
 |`result`|`index`|在输入的字符串中匹配到的以0开始的索引值。|`6`|