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.10-15.19.30"
+  "release": "2017.08.11-16.49.51"
 }

miaomiao/www/chcp.manifest

@@ -29,7 +29,7 @@
   },
   {
     "file": "css/style.css",
-    "hash": "e4885711bbb6a15da9f350020fdae4b4"
+    "hash": "3d84674e5497411bb6eb21da529ea38c"
   },
   {
     "file": "img/alipay.png",
@@ -373,11 +373,11 @@
   },
   {
     "file": "js/controllers/home.js",
-    "hash": "2d2ea6701c98cf2bc5300f1f28470bd4"
+    "hash": "b3af09342eabd861ae10cbc1f32600a3"
   },
   {
     "file": "js/controllers/my.js",
-    "hash": "9b41b876414cecaa8169077c9ae244e6"
+    "hash": "11e33fcf2993706d761fc4d6e1c514dc"
   },
   {
     "file": "js/controllers/tabs.js",
@@ -713,15 +713,15 @@
   },
   {
     "file": "templates/add/index.html",
-    "hash": "dbd6da8a2a31c6cf23def0427e085d29"
+    "hash": "48a24aa2af91b082a939628b4057e551"
   },
   {
     "file": "templates/home/dream-detail.html",
-    "hash": "bba5497e83fe870116ad882e60af6329"
+    "hash": "aa9aa236083feb4ad75d0b74c676212d"
   },
   {
     "file": "templates/home/index.html",
-    "hash": "ec81a4ade03177e1bca7a559a5f122ba"
+    "hash": "b141632617dc331ac9cb39e4bf79e6a3"
   },
   {
     "file": "templates/home/oldDream.html",
@@ -773,7 +773,7 @@
   },
   {
     "file": "templates/my/my-dream.html",
-    "hash": "11c183d37c9484f41ab6688567337517"
+    "hash": "f86ee815e900a04bb91368d3ce380752"
   },
   {
     "file": "templates/my/my-message-reply.html",
@@ -813,6 +813,6 @@
   },
   {
     "file": "templates/tabs.html",
-    "hash": "2222e6d0cc59f701194f64a8f7f0e4de"
+    "hash": "b284695cab3a6e5bf4b435feeb095c20"
   }
 ]

miaomiao/www/templates/add/index.html

@@ -38,7 +38,7 @@
             <div class="item item-input-inset itemjs">
                 <label class="item-input-wrapper" style="background: #fff; border: 1px solid #D7D7D7; margin: 0 12px 0 5px">
                     ￥
-                    <input type="text" ng-model="vm.coin">
+                    <input type="tel" ng-model="vm.coin">
                 </label>
             </div>
         </div>

miaomiao/www/templates/home/dream-detail.html

@@ -45,8 +45,8 @@
                 <div class="item" style="padding: 0">
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
-                            <div class="box banner" style="height: 220px" >
-                                <video ng-src="{{dream.video | trustUrl}}" width="100%"  class="centerme" controls="controls" ></video>
+                            <div class="box banner">
+                                <video ng-src="{{dream.video | trustUrl}}" width="100%" style="max-height: 400px" class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >