YanaDH hace 8 años
padre
commit
5f00aaa760

+ 5 - 3
miaomiao/www/css/ionic.app.css

xqd xqd
@@ -5688,7 +5688,7 @@ ion-tabs.tabs-color-active-dark .tab-item {
     display: -moz-flex;
     display: -ms-flexbox;
     display: flex;
-    position: absolute;
+    /*position: absolute;*/
     top: 16px;
     right: 32px; }
   .item.item-button-right .badge {
@@ -8241,10 +8241,12 @@ input:checked + .checkbox-icon:after {
   left: -9999px; }
   .item-radio input:checked + .radio-content .item-content {
     /* style the item content when its checked */
-    background: #f7f7f7; }
+    /*background: #f7f7f7;*/
+    background: url("../img/icon_select.svg") no-repeat 95% 30px;
+  }
   .item-radio input:checked + .radio-content .radio-icon {
     /* show the checkmark icon when its checked */
-    visibility: visible; }
+    visibility: hidden; }
 
 /**
  * Range

+ 16 - 5
miaomiao/www/css/style.css

xqd
@@ -281,18 +281,29 @@ padding:10px;
 .re-border {
 padding-right:3px;  
 }
+.recharge{
+    letter-spacing: 1px;
+}
+.recharge input::-webkit-input-placeholder{
+    color: #C8C8C8;
+    font-size: 16px;
+    letter-spacing: 1px;
+}
+.recharge .item{
+    border-bottom: 1px solid #E6E6E6;
+}
 .re-num {
-    font-size:2rem;
-    font-weight:bold;
-    padding:10px;
+    font-size: 1.6rem;
+    padding:10px 0;
 }
 .re-radio img{
-    max-width:50px;
+    max-width:40px;
     padding:3px;
 }
 .re-radio span{
     position:relative;
-    top:-20px;
+    top:-12px;
+    font-size: 16px;
     padding:15px;
 }
 .ion-volume-medium {

+ 12 - 0
miaomiao/www/img/icon_ Alipay.svg

xqd
@@ -0,0 +1,12 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #00a7ff;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_ Alipay</title>
+  <path class="cls-1" d="M43,29.88V10.19A7.69,7.69,0,0,0,35.31,2.5H10.69A7.69,7.69,0,0,0,3,10.19V34.81a7.69,7.69,0,0,0,7.69,7.69H35.31a7.7,7.7,0,0,0,7.57-6.33c-2-.88-10.88-4.7-15.48-6.9-3.51,4.25-7.18,6.79-12.71,6.79S5.46,32.65,5.9,28.48C6.2,25.75,8.07,21.27,16.23,22A36.7,36.7,0,0,1,26,24.4,27.64,27.64,0,0,0,28.23,19H12.69V17.42h7.69V14.66H11V13h9.38V9a.75.75,0,0,1,.78-.63H25V13H35v1.7H25v2.77h8.16a31.5,31.5,0,0,1-3.31,8.31C32.21,26.59,43,29.88,43,29.88ZM14.07,33.42c-5.84,0-6.77-3.69-6.46-5.23s2-3.54,5.25-3.54A24.38,24.38,0,0,1,24,27.56c-2.82,3.67-6.28,5.86-9.89,5.86Z" transform="translate(-3 -2.5)"/>
+</svg>

+ 23 - 0
miaomiao/www/img/icon_ WeChat Pay.svg

xqd
@@ -0,0 +1,23 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #2da122;
+      }
+
+      .cls-1, .cls-2 {
+        fill-rule: evenodd;
+      }
+
+      .cls-2 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <title>icon_ WeChat Pay</title>
+  <path class="cls-1" d="M36.5,2.5H9.5A6.49,6.49,0,0,0,3,9V36a6.49,6.49,0,0,0,6.5,6.5h27A6.49,6.49,0,0,0,43,36V9a6.49,6.49,0,0,0-6.5-6.5Z" transform="translate(-3 -2.5)"/>
+  <path class="cls-2" d="M18,29.3a20.26,20.26,0,0,1-4.2-.6L9.6,30.8l1.2-3.6c-3-2.1-4.9-4.9-4.9-8.2C5.9,13.2,11.4,8.7,18,8.7c6,0,11.2,3.6,12.2,8.5-.4,0-.8-.1-1.2-.1-5.8,0-10.3,4.3-10.3,9.6a6.9,6.9,0,0,0,.4,2.5,3.75,3.75,0,0,1-1.1.1Z" transform="translate(-3 -2.5)"/>
+  <path class="cls-2" d="M35.9,33.5l.9,3-3.3-1.8a15.06,15.06,0,0,1-3.6.6c-5.8,0-10.3-3.9-10.3-8.8s4.5-8.8,10.3-8.8c5.4,0,10.3,4,10.3,8.8,0,2.8-1.8,5.2-4.3,7Z" transform="translate(-3 -2.5)"/>
+  <path class="cls-1" d="M13.9,15.1m-1.6,0A1.7,1.7,0,1,0,14,13.4a1.75,1.75,0,0,0-1.7,1.7Zm14.4,8.8-1.3,0a1.3,1.3,0,1,0,1.3-1.3,1.21,1.21,0,0,0-1.3,1.3Zm-2.9-8.8-1.7,0a1.7,1.7,0,1,0,1.7-1.7,1.83,1.83,0,0,0-1.7,1.7Z" transform="translate(-3 -2.5)"/>
+  <path class="cls-1" d="M33.3,23.9m-1.3,0a1.3,1.3,0,1,0,1.3-1.3A1.21,1.21,0,0,0,32,23.9Z" transform="translate(-3 -2.5)"/>
+</svg>

+ 11 - 0
miaomiao/www/img/icon_arrows.svg

xqd
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #999;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path id="圆角矩形_4" data-name="圆角矩形 4" class="cls-1" d="M12.3,6.279a0.96,0.96,0,0,0,0,1.392L25.27,20.2a1.045,1.045,0,0,0,1.441,0,0.96,0.96,0,0,0,0-1.392L13.74,6.279A1.045,1.045,0,0,0,12.3,6.279ZM25.27,18.8L12.3,31.329a0.96,0.96,0,0,0,0,1.392,1.045,1.045,0,0,0,1.441,0L26.711,20.2a0.96,0.96,0,0,0,0-1.392A1.045,1.045,0,0,0,25.27,18.8Z"/>
+</svg>

+ 11 - 0
miaomiao/www/img/icon_back.svg

xqd
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <path id="圆角矩形_4" data-name="圆角矩形 4" class="cls-1" d="M26.707,6.565a1,1,0,0,1,0,1.414L13.979,20.707a1,1,0,0,1-1.414-1.414L25.293,6.565A1,1,0,0,1,26.707,6.565ZM13.979,19.293L26.707,32.021a1,1,0,1,1-1.414,1.414L12.565,20.707A1,1,0,0,1,13.979,19.293Z"/>
+</svg>

+ 31 - 0
miaomiao/www/img/icon_gold.svg

xqd
@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="82" height="82" viewBox="0 0 82 82">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #e6b623;
+      }
+
+      .cls-2 {
+        fill: #fff45a;
+      }
+
+      .cls-3 {
+        fill: #f5b00d;
+      }
+
+      .cls-4 {
+        fill: #daa11b;
+      }
+
+      .cls-5 {
+        fill: #fee667;
+      }
+    </style>
+  </defs>
+  <circle id="椭圆_1" data-name="椭圆 1" class="cls-1" cx="41" cy="41" r="41"/>
+  <circle id="椭圆_1_拷贝_4" data-name="椭圆 1 拷贝 4" class="cls-2" cx="40.781" cy="40.125" r="40"/>
+  <circle id="椭圆_1_拷贝" data-name="椭圆 1 拷贝" class="cls-3" cx="41.281" cy="39.625" r="35"/>
+  <circle id="椭圆_1_拷贝_2" data-name="椭圆 1 拷贝 2" class="cls-4" cx="40.75" cy="40.031" r="32"/>
+  <circle id="椭圆_1_拷贝_3" data-name="椭圆 1 拷贝 3" class="cls-5" cx="40.844" cy="40.125" r="30"/>
+  <image id="皇冠_1_拷贝" data-name="皇冠 (1) 拷贝" x="19" y="18" width="44" height="38" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAmCAMAAACIwYlVAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABWVBMVEX1sRL////1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRL1sRIAAACUHrOTAAAAcXRSTlMAAHKdLl91rUd7pM8LXZZxBScsE4KYMPBveUbeGkpLuk+LoPlBpS80DQKR1g6v3CAWUrfqKLj6kykBbdUhjpcVVQNp2OkGYvsXXtrCM/JzKkw9zpUI7/1gvonoULH8zDeP7rIUx4Xjn1asEWUbeMuGw8FuY1IAAAABYktHRHI2Dg1YAAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH4QcfDwkzzthkPAAAAXlJREFUOMuN1Pk/AkEUAPBZJSJdisgRpQiRIzmTEHKT+75v3v//iz3aY2ZnZvf99Gbf97OfOR9C5qgDAIc6EAxBsU6Qot4edsm4wR5ulLHbHkZNom322MSoxevz21wgHjgOBM2ilYKDAQGFAMKkbWuPmLADoANJK+8kcBSgi8DdkpNxD2594qdeAsdk3AfQj1tPXCokiGkMAIQQSqbQ4JARp+VDGcbwiCCkksrWjWZCY5odByWyOo5NTE5p+zwNkJvJ17C3hqM1PDs3L44WNLwoV5fkvxdAjWVpWFwpSfnqmobXlWo5vYFQWMMZsbK5peQV/bi31frO7l5cw7B/cKimRzo+rgItTvT01HCRzsAinAZ8bmEvigZ8aYGvjPe5cM3HLuzy3/DxLYbvuPbej+EsFz/gb/CxzMMR4sE+8XCQwM8c+0K2ggQHv5LYX2XjN1OTeWfa3IcJfzJxxdy+vpj4m9Lrflg4T8Fuhi3RumiegX+pLffPahbCP/rbTxXhw1TeAAAAAElFTkSuQmCC"/>
+</svg>

+ 18 - 0
miaomiao/www/img/icon_select.svg

xqd
@@ -0,0 +1,18 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="30" height="23.55" viewBox="0 0 30 23.55">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #00c3da;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_pay</title>
+  <g>
+    <path class="cls-1" d="M7.59,21.38a3.68,3.68,0,0,0,3.34,3.93,3.68,3.68,0,0,0,3.34-3.93,3.68,3.68,0,0,0-3.34-3.93,3.68,3.68,0,0,0-3.34,3.93Z" transform="translate(-7.59 -11.11)"/>
+    <path class="cls-1" d="M33.5,28.8a3.18,3.18,0,0,0,3.14-1.34,4.69,4.69,0,0,0,.82-3.85A3,3,0,0,0,32,22.44a4.69,4.69,0,0,0-.82,3.85A3.18,3.18,0,0,0,33.5,28.8Z" transform="translate(-7.59 -11.11)"/>
+    <path class="cls-1" d="M15.71,15.51a4.73,4.73,0,0,0,1.72,3.8,2.81,2.81,0,0,0,3.44,0,4.73,4.73,0,0,0,1.72-3.8,4.73,4.73,0,0,0-1.72-3.8,2.81,2.81,0,0,0-3.44,0,4.73,4.73,0,0,0-1.72,3.8Z" transform="translate(-7.59 -11.11)"/>
+    <path class="cls-1" d="M28,21a3.39,3.39,0,0,0,3.21-1.83,5.47,5.47,0,0,0,.51-4.36A3.39,3.39,0,0,0,29,12.3a3.39,3.39,0,0,0-3.21,1.83,5.47,5.47,0,0,0-.51,4.36A3.39,3.39,0,0,0,28,21Z" transform="translate(-7.59 -11.11)"/>
+    <path class="cls-1" d="M29.71,29.19c-.25,3.73-3.85,5.73-8.1,5.44S14,31.9,14.29,28.17s4-6.09,8.16-6.24c4.31.87,7.52,3.53,7.27,7.26Z" transform="translate(-7.59 -11.11)"/>
+  </g>
+</svg>

+ 16 - 0
miaomiao/www/img/icon_share.svg

xqd
@@ -0,0 +1,16 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <title>icon_share</title>
+  <g>
+    <path class="cls-1" d="M28.8,36.6H8.8a5.29,5.29,0,0,1-5.2-5.2v-20A5.29,5.29,0,0,1,8.8,6.2H18a.94.94,0,0,1,1,1,1.07,1.07,0,0,1-1,1H8.8a3.16,3.16,0,0,0-3.2,3.2v20a3.16,3.16,0,0,0,3.2,3.2h20A3.16,3.16,0,0,0,32,31.4v-10a1,1,0,0,1,2,0v10a5.16,5.16,0,0,1-5.2,5.2Z" transform="translate(-3.6 -4.6)"/>
+    <path class="cls-1" d="M34.6,16a.94.94,0,0,1-1-1V6.6H25.2a.94.94,0,0,1-1-1,.94.94,0,0,1,1-1h9.4a.94.94,0,0,1,1,1V15a.94.94,0,0,1-1,1Z" transform="translate(-3.6 -4.6)"/>
+    <path class="cls-1" d="M17,24.2a1.2,1.2,0,0,1-.8-.2,1,1,0,0,1,0-1.4L33.8,5a1,1,0,1,1,1.4,1.4L17.8,24a1.2,1.2,0,0,1-.8.2Z" transform="translate(-3.6 -4.6)"/>
+  </g>
+</svg>

+ 8 - 3
miaomiao/www/js/controllers/home.js

xqd xqd xqd
@@ -360,7 +360,12 @@
                     msg.hide();
                 });
             };
-            $scope.load(id)
+            $scope.load(id);
+
+            $scope.toDetail = function (id) {
+                $state.go('app.home_dreamdetail',{id:id});
+            };
+
         }]);
     app.controller('searchCtrl', ["$scope","homeService", "$state", "msg", "$ionicTabsDelegate", "$ionicNavBarDelegate"
         , function ($scope,homeService, $state, msg, $ionicTabsDelegate, $ionicNavBarDelegate) {
@@ -374,7 +379,7 @@
                 $scope.dream_infos = result.data.data.dream_infos;
                 $scope.user_infos = result.data.data.user_infos;
             });
-        }
+        };
         $scope.search = function (keyword) {
             $scope.vm.keyword = keyword;
             homeService.search(keyword).then(function(result){
@@ -382,7 +387,7 @@
                 $scope.dream_infos = result.data.data.dream_infos;
                 $scope.user_infos = result.data.data.user_infos;
             });
-        }
+        };
         $scope.toDetail = function (id) {
             $state.go('app.home_dreamdetail',{id:id});
         };

+ 1 - 1
miaomiao/www/js/filters/filter.js

xqd
@@ -64,7 +64,7 @@
         return function (end_time) {
             var end_time = new Date(end_time.replace(/-/g, "/"));
             var date = new Date();
-            var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24)
+            var inter = (end_time.getTime() - date.getTime()) / (1000*3600*24);
             // number = Math.abs(inter * 100) / 100;
             number = inter.toFixed(2);
             return number;

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

xqd xqd xqd
@@ -22,11 +22,11 @@
                     <ion-slides slider="data.slider">
                         <ion-slide-page ng-if="dream.video">
                             <div class="box banner">
-                                <video ng-src="{{dream.video | trustUrl}}" height="300px" width="100%"  class="centerme" controls="controls" ></video>
+                                <video ng-src="{{dream.video | trustUrl}}" height="170px" width="100%"  class="centerme" controls="controls" ></video>
                             </div>
                         </ion-slide-page>
                         <ion-slide-page ng-repeat="img in dream.imgs" >
-                            <div class="box banner"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
+                            <div class="box banner" style="height: 170px; width: 100%"><img ng-src="{{img.pic}}" style="width: 100%" /></div>
                         </ion-slide-page>
                     </ion-slides>
                 </div>
@@ -137,19 +137,19 @@
         
         <div ng-if="type==3" class="phbcontent">
             <div class="row" style="background: #F2F2F2; width: 100%; height: 200px; text-align: center">
-                <div class="col top2" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
+                <div class="col top2" ng-if="dream.top3user.length>1" style="background: url('img/img_No2.svg') no-repeat; background-size: 100% 100%;">
                     <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[1].avatar }}" /><br>
                     {{ dream.top3user[1].nickname }}<br>
                     <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
                     <em style="font-size: 18px">{{ dream.top3user[1].score }}</em>
                 </div>
-                <div class="col top1" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
+                <div class="col top1" ng-if="dream.top3user.length>0" style="background: url('img/img_No1.svg') no-repeat; background-size: 100% 100%;">
                     <img style="width: 80px; margin: 28px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[0].avatar }}" /><br>
                     {{ dream.top3user[0].nickname }}<br>
                     <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
                     <em style="font-size: 18px">{{ dream.top3user[0].score }}</em>
                 </div>
-                <div class="col top2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
+                <div class="col top2" ng-if="dream.top3user.length>2" style="background: url('img/img_No3.svg') no-repeat; background-size: 100% 100%;">
                     <img style="width: 67px; margin: 22px 0 8px 0; border-radius: 100%;" src="{{ dream.top3user[2].avatar }}" /><br>
                     {{ dream.top3user[2].nickname }}<br>
                     <img src="img/icon_gongxian.svg" style="height: 20px; width: 20px; margin-top: 5px" />
@@ -177,7 +177,7 @@
                 </div> -->
                 <div class="item" ng-repeat="user in dream.topuser" style="border-bottom: 1px solid #DFDFDF">
                     <div style="float:left; color: #808080; font-size: 30px; font-weight: bold; margin-top: 10px">
-                        {{$index+4}}
+                        {{$index + 4}}
                     </div>
                     <div style="padding-left:20px; float:left;">
                         <div style="float:left;">

+ 12 - 11
miaomiao/www/templates/home/userDetail.html

xqd xqd xqd xqd
@@ -1,6 +1,7 @@
 <ion-view>
     <ion-nav-buttons side="right">
-        <button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>
+        <!--<button class="button button-clear icon ion-email-unread" style="padding-left:10px"></button>-->
+        <button class="button button-clear button-small" style="padding-top: 5px"><img src="img/icon_share.svg" style="height: 20px; width: 20px;"></button>
     </ion-nav-buttons>
     <ion-content>
         <div class="user-box">
@@ -33,12 +34,12 @@
                 </div>
             </div>
         </div>
-        <!--<div class="row user-dz" ng-repeat="item in user.imgs">-->
         <div class="row user-dz">
-            <div class="col">
-                <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
+        <!--<div class="row user-dz">-->
+            <div class="col" ng-repeat="item in user.imgs">
+                <img style="width: 80px; height: 80px;" ng-src="{{item.pic}}">
             </div>
-            <div class="col">
+            <!--<div class="col">
                 <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
             </div>
             <div class="col">
@@ -46,18 +47,18 @@
             </div>
             <div class="col">
                 <img style="width: 80px; height: 80px;" src="https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=1784265725,2575462984&fm=117&gp=0.jpg">
-            </div>
+            </div>-->
         </div>
         <div class="list padding" style="font-size: 18px; color: #828282">
             <div class="row" style="padding: 20px 0; border-bottom: 1px solid #E6E6E6">
                 <div class="col">
-                    年龄:
+                    年龄:{{user.user.birthday | getage}}
                 </div>
                 <div class="col">
                     身高:{{user.user.height}}cm
                 </div>
             </div>
-            <div class="row" style="padding: 20px 0">
+            <div class="row" style="padding: 20px 0 0 0">
                 <div class="col">
                     情感:{{user.user.emotion}}
                 </div>
@@ -68,13 +69,13 @@
         </div>
         <div class="user-dz"></div>
         <div class="list list-user-set list-set-arrow" style="color: #818181;">
-            <a class="item" ui-sref="app.my_message">
+            <a class="item" ng-click="toDetail(user.id)">
                 <em class="fl">当前梦想</em>
             </a>
-            <a class="item" ui-sref="app.my_profile">
+            <a class="item">
                 <em class="fl">曾经的梦想</em>
             </a>
-            <a class="item" ui-sref="app.my_dream">
+            <a class="item">
                 <em class="fl">支持的梦想</em>
             </a>
         </div>

+ 3 - 2
miaomiao/www/templates/my/index.html

xqd
@@ -33,12 +33,13 @@
                 <div class="mysecond">回帖</div>
             </div>
         </div>
-        <div class="list list-user-set list-set-arrow">
+        <div class="list list-user-set list-set-arrow" style="color: #B6B6B6">
             <a class="item item-icon-left" ui-sref="app.my_recharge">
                 <i class="icon ion-card"></i>
                 <em class="fl">账户余额</em>
                 <i class="fr">
-                    {{user.coin}}</i>
+                    {{user.coin}}
+                </i>
             </a>
             <a class="item item-icon-left" ui-sref="app.my_message">
                 <i class="icon ion-email"></i>

+ 26 - 5
miaomiao/www/templates/my/my-message.html

xqd
@@ -1,13 +1,34 @@
 <ion-view view-title="我的消息">
+    <ion-nav-buttons side="right">
+        <button class="button button-clear" style="font-size: 16px; margin-top: 3px">
+            全部设为已读
+        </button>
+    </ion-nav-buttons>
     <ion-content>
-        <div class="list list-user-set list-set-arrow">
-            <a class="item item-icon-left" ui-sref="app.my_message_sys" ng-click="systemInfo()">
-                <i class="icon ion-volume-medium"></i>
+        <div class="list padding list-user-set" style="color: #737373">
+            <a class="item" ui-sref="app.my_message_sys" ng-click="systemInfo()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">系统消息</em>
+                <i class="fr">
+                    <em class="badge badge-assertive" style="background: red;">300</em>
+                </i>
+                <i class="fr" style="margin-right: 10px">
+                    300条系统消息
+                </i>
             </a>
-            <a class="item item-icon-left" ui-sref="app.my_message_reply" ng-click="replyMy()">
-                <i class="icon ion-ios-compose"></i>
+            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
                 <em class="fl">回复我的</em>
+                <i class="fr">
+                    <em class="badge badge-assertive" style="background: red;">300</em>
+                </i>
+                <i class="fr" style="margin-right: 10px">
+                    300条回复消息
+                </i>
+            </a>
+            <a class="item" ui-sref="app.my_message_reply" ng-click="replyMy()" style="border-bottom: 1px solid #EAEAEA">
+                <em class="fl">私信</em>
+                <i class="fr" style="color: #B3B3B3">
+                    哈哈哈
+                </i>
             </a>
           
         </div>

+ 21 - 11
miaomiao/www/templates/my/my-recharge.html

xqd
@@ -5,25 +5,35 @@
         </button>
     </ion-nav-buttons>
     <ion-content>
-        <div class="list">
+        <div class="list recharge padding">
             <div class="item" style="padding:20px">
-                <span><i class="icon ion-ios-star-outline calm re-border"></i>剩余梦想币</span>
-                <div class="re-num">{{vm.coin}}</div>
+                <div class="row">
+                    <div class="col col-20">
+                        <img src="img/icon_gold.svg" style="height: 100%; width: 100%">
+                    </div>
+                    <div class="col">
+                        <div>剩余梦想币</div>
+                        <div class="re-num">{{vm.coin}}</div>
+                    </div>
+                    <div class="col col-33" style="padding: 30px 0 0 20px">
+                        <a style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
+                    </div>
+                </div>
             </div>
-            <div class="item item-input">
-                <span class="input-label">金额</span>
-                <input type="number" placeholder="请输入充值金额" ng-model="vm.money" >
+            <div class="item item-input" style="padding-top: 20px; padding-bottom: 20px">
+                <span class="input-label" style="width: 60px">金额</span>
+                <input type="number" placeholder="请输入充值金额" ng-model="vm.money">
             </div>
-            <div class="item item-divider" style="color: #D2D2D2">
-               请选择以下支付方式
+            <div class="item" style="color: #969696; padding-top: 40px">
+               选择支付方式
             </div>
             <ion-list class="re-radio">
                 <ion-radio ng-model="choice" ng-value="'A'">
-                    <img ng-src="img/alipay.png" />
-                    <span>支付宝支付</span> 
+                    <img ng-src="img/icon_ Alipay.svg" />
+                    <span>支付宝支付</span>
                 </ion-radio>
                 <ion-radio ng-model="choice" ng-value="'B'">
-                <img ng-src="img/weixinpay.png" /><span>微信支付</span>
+                <img ng-src="img/icon_ WeChat Pay.svg" /><span>微信支付</span>
                   </ion-radio>
             </ion-list>
         </div>