Merge branch 'master' of http://git.9026.com/roobe/miao

miaomiao/www/chcp.json

@@ -1,5 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao/www",
-  "release": "2017.08.09-17.09.15"
+  "release": "2017.08.09-18.12.19"
 }

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "5d234f2508c5ed9004b1bc35cec470c7"
+    "hash": "e4885711bbb6a15da9f350020fdae4b4"
   },
   {
     "file": "img/alipay.png",
@@ -111,6 +111,10 @@
     "file": "img/emoticon.png",
     "hash": "47c618360e462e57e7246abcbfa14dca"
   },
+  {
+    "file": "img/haoyou.png",
+    "hash": "69c9dc354fc78ccc222e1934e03bf64d"
+  },
   {
     "file": "img/heart.png",
     "hash": "7fd46cd8946bcd434bc1712ad3847c2d"
@@ -131,6 +135,10 @@
     "file": "img/icon_ WeChat Pay.svg",
     "hash": "d18ba114c75bbf080145d990dfabfd41"
   },
+  {
+    "file": "img/icon_account.svg",
+    "hash": "6ce4b870f55fa95decfaa3335fb7edbb"
+  },
   {
     "file": "img/icon_arrows.svg",
     "hash": "1747f93efac39eeaf3f171f46e2cc709"
@@ -319,6 +327,10 @@
     "file": "img/king.png",
     "hash": "7a74235775e6b25d90e496bea37b3d2b"
   },
+  {
+    "file": "img/pengyouquan.png",
+    "hash": "92aa5d631f405dfb524264c4ec19cdd1"
+  },
   {
     "file": "img/pic_leaves.png",
     "hash": "800c5dd6b7499324be6493035b3779db"
@@ -357,7 +369,7 @@
   },
   {
     "file": "js/controllers/add.js",
-    "hash": "3627417ad378c98ea3cf6b0a6ef5f779"
+    "hash": "f8a7242a729022d8375d4dc8e8f48d05"
   },
   {
     "file": "js/controllers/home.js",
@@ -741,7 +753,7 @@
   },
   {
     "file": "templates/my/index.html",
-    "hash": "f90689fa36f1f8088712586ca3e8ae44"
+    "hash": "be0f4670c535cc227daaceedb787bcb7"
   },
   {
     "file": "templates/my/my-collect.html",