diff --git a/.idea/.gitignore b/.idea/.gitignore
index 5c98b428844d9f7d529e2b6fb918d15bf072f3df..74c0f49119f5b026620f753df5b118a0f218a4ef 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -1,2 +1,12 @@
 # Default ignored files
-/workspace.xml
\ No newline at end of file
+<<<<<<< HEAD
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+=======
+/workspace.xml
+>>>>>>> a07642dd7dd1e0cf2f9fde91bd1425f55a3809b6
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15a15b218a29e09c9190992732698d646e4d659a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/: b/:
new file mode 100644
index 0000000000000000000000000000000000000000..c6350fa8d5cc7865087ff56f2cac91481210e9df
--- /dev/null
+++ b/:
@@ -0,0 +1,12 @@
+{
+  "asdpages":[
+    "pages/index/index",
+    "pages/logs/logs"
+  ],
+  "window":{
+    "backgroundTextStyle":"light",
+    "navigationBarBackgroundColor": "#fff",
+    "navigationBarTitleText": "WeChat",
+    "navigationBarTextStyle":"black"
+  }
+}
diff --git a/App.json b/App.json
index 2c0442ab7905e603199a575c67d8856bd72a2329..0da86040a18f533a60888888f8cd76333d028e4f 100644
--- a/App.json
+++ b/App.json
@@ -1,5 +1,10 @@
+<<<<<<< HEAD:app.json
+{
+  "asdpages":[
+=======
 sfsdfds{
   "pages":[
+>>>>>>> a07642dd7dd1e0cf2f9fde91bd1425f55a3809b6:App.json
     "pages/index/index",
     "pages/logs/logs"
   ],
diff --git a/Utils/util.js b/Utils/util.js
index ec755d23287723d44980943b3f17e1e86dff96c0..62f8d31b9f3e8289181948c8ecf48103f9b61589 100644
--- a/Utils/util.js
+++ b/Utils/util.js
@@ -12,7 +12,7 @@ const formatTime = date => {
 const formatNumber = n => {
     let deedsf
   n = n.toString()
-  return n[1] ? n : '0' + n
+  return !n[0] ? n : '0' + n
 }
 
 module.exports = {
diff --git a/app.wxss b/app.wxss
index 67f2f0a136b37cbc2b1c25dae49615a7cedaa5ee..431d9877bc91a2a2e3abe3b5cd2f4e73ce20a23c 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,6 +1,4 @@
 adasdisdffsdf/**app.wxss**/
-.container {
-  height: 11%;
   display: flex;dasda
   s
 
diff --git a/goodnight.txt b/goodnight.txt
index 54135756af82b203ce9c21826e723bb3a3e93221..865237146cb758b10bd1a340700169814206e120 100644
--- a/goodnight.txt
+++ b/goodnight.txt
@@ -1 +1,2 @@
+hello
 see you 
diff --git a/pop.xml b/pop.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f3ff12ceef71e3183e1f017c5b206a32e1b9d095
--- /dev/null
+++ b/pop.xml
@@ -0,0 +1 @@
+:wqwew
diff --git "a/\346\265\213\350\257\225PR2019" "b/\346\265\213\350\257\225PR2019"
new file mode 100644
index 0000000000000000000000000000000000000000..006bf000219c015571ad316bd1b4df7fd1253bea
--- /dev/null
+++ "b/\346\265\213\350\257\225PR2019"
@@ -0,0 +1 @@
+测试PR2019
\ No newline at end of file