add

miaomiao/www/chcp.json

@@ -1,9 +1,5 @@
 {
   "update": "now",
   "content_url": "http://i.9026.com/miaomiao",
-<<<<<<< HEAD
-  "release": "2017.09.02-16.49.45"
-=======
-  "release": "2017.09.01-08.49.55"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
+  "release": "2017.09.02-16.52.56"
 }

miaomiao/www/chcp.manifest

@@ -17,11 +17,7 @@
   },
   {
     "file": ".idea/workspace.xml",
-<<<<<<< HEAD
     "hash": "6ff3076c1f20153c10c433ddb98f539b"
-=======
-    "hash": "4dccb5b2632a85a6c913084c8036c5a9"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
   },
   {
     "file": ".idea/www.iml",
@@ -41,11 +37,7 @@
   },
   {
     "file": "css/style.css",
-<<<<<<< HEAD
     "hash": "bddb3aafcb750356fecf998cf98a7137"
-=======
-    "hash": "12e08ce3bb3b904cf93696fd77e69d40"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
   },
   {
     "file": "img/alipay.png",
@@ -417,11 +409,7 @@
   },
   {
     "file": "js/controllers/account.js",
-<<<<<<< HEAD
-    "hash": "6274ccc8a062d00c574c9ecb39377dde"
-=======
-    "hash": "c200065bb945d24c13ca5ee6dbe476ee"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
+    "hash": "0f03bbbf46a40b7573db7b5d7932dbaf"
   },
   {
     "file": "js/controllers/add.js",
@@ -429,19 +417,11 @@
   },
   {
     "file": "js/controllers/home.js",
-<<<<<<< HEAD
     "hash": "98b1ceddbcbaf73f6ef4096b97155e0c"
   },
   {
     "file": "js/controllers/my.js",
     "hash": "4cf36ed29397fd81c15f10873e02ad67"
-=======
-    "hash": "33c069f2d76b5b4470aa5d12b60293ff"
-  },
-  {
-    "file": "js/controllers/my.js",
-    "hash": "56b6a6a750bb9831136150eb4bfb5857"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
   },
   {
     "file": "js/controllers/tabs.js",
@@ -473,7 +453,7 @@
   },
   {
     "file": "js/services/httpinterceptor.js",
-    "hash": "2ce2b5feecdd7a63198517fba12fc55e"
+    "hash": "b2f16e21dec7f04236fbf52acac5969c"
   },
   {
     "file": "js/services/jpushservice.js",
@@ -493,7 +473,7 @@
   },
   {
     "file": "js/services/userservice.js",
-    "hash": "f1814381fe82dccfe9fd811711ba4f30"
+    "hash": "a0388334119f5f02c037d388ea6abb6e"
   },
   {
     "file": "js/services/utilservice.js",
@@ -805,19 +785,11 @@
   },
   {
     "file": "templates/home/dream-detail.html",
-<<<<<<< HEAD
     "hash": "641b358d0fefe04bee514cfb6d4a0d4b"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "815da24a5409a0649a51c91236a8c8bf"
-=======
-    "hash": "026501c53c29696aff53fd7b3469cdd7"
-  },
-  {
-    "file": "templates/home/index.html",
-    "hash": "c5804a0ccf0a07b355917d3b1806cc3d"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
+    "hash": "8c1698392eee3f05e5e8385ed496349f"
   },
   {
     "file": "templates/home/oldDream.html",
@@ -837,11 +809,7 @@
   },
   {
     "file": "templates/home/userDetail.html",
-<<<<<<< HEAD
     "hash": "f7d500ace952ee68e983af8ecc381153"
-=======
-    "hash": "da14043cd0cbd05516eb046a687858e3"
->>>>>>> 29e0987032093d768acad70ea8756f79cfdb7030
   },
   {
     "file": "templates/my/aboutMiao.html",

miaomiao/www/templates/home/index.html

@@ -1,4 +1,4 @@
-<ion-view view-title="瞄喵">
+<ion-view view-title="瞄瞄">
     <ion-nav-buttons side="left">
         <button class="button button-clear" style="height: 30px; width: 30px;margin-top: 1.6px;margin-left: 2px;" ng-click="openPopover($event)">
             <img src="img/icon_menu.svg" style="height: 60%; width: 100%;">