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

miaomiao/www/css/ionic.app.css

@@ -1331,7 +1331,8 @@ $dark:                            #444 !default;
   content: ""; }
 
 .ion-checkmark:before {
-  content: ""; }
+  content: ""; 
+}
 
 .ion-checkmark-circled:before {
   content: ""; }
@@ -8225,7 +8226,8 @@ input:checked + .checkbox-icon:after {
 
 .item-radio .item-content {
   /* give some room to the right for the checkmark icon */
-  padding-right: 64px; }
+    padding-right: 64px; 
+}
 
 .item-radio .radio-icon {
   /* checkmark icon will be hidden by default */
@@ -8244,12 +8246,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: url("../img/icon_select.svg") no-repeat 95% 30px;
+    background: #f7f7f7;
   }
   .item-radio input:checked + .radio-content .radio-icon {
     /* show the checkmark icon when its checked */
-    visibility: hidden; }
+    visibility: hidden; 
+}
 
 /**
  * Range

miaomiao/www/css/style.css

@@ -853,4 +853,19 @@ ion-tabs.tabs-color-active-calm .tab-item.tab-item-active, ion-tabs.tabs-color-a
 .checkbox input:checked:before,
 .checkbox input:checked + .checkbox-icon:before {
     background: #00C3DA;
-    border-color: #00C3DA; }
+    border-color: #00C3DA; 
+}
+
+.item-radio input:checked + .radio-content .item-content {
+    background: url("../img/pay_on.png") no-repeat 95%;
+}
+.item-radio .radio-icon {
+    visibility: visible;
+}
+
+.ion-checkmark:before {
+    content: url(../img/pay_no.png);
+}
+.popup-buttons{
+    padding: 25px 10px;
+}

miaomiao/www/js/controllers/home.js

@@ -104,14 +104,19 @@
         };
 
             $scope.ages = [
+                // {"value": 0, "age": "所有"},
+                // {"value": 7, "age": "<18"},
+                // {"value": 1, "age": "18-21"},
+                // {"value": 2, "age": "22-25"},
+                // {"value": 3, "age": "26-29"},
+                // {"value": 4, "age": "30-33"},
+                // {"value": 5, "age": "34-37"},
+                // {"value": 6, "age": ">37"}
                 {"value": 0, "age": "所有"},
                 {"value": 7, "age": "<18"},
-                {"value": 1, "age": "18-21"},
-                {"value": 2, "age": "22-25"},
-                {"value": 3, "age": "26-29"},
-                {"value": 4, "age": "30-33"},
-                {"value": 5, "age": "34-37"},
-                {"value": 6, "age": ">37"}
+                {"value": 1, "age": "19-25"},
+                {"value": 2, "age": "26-35"},
+                {"value": 3, "age": ">36"}
             ];
 
             $scope.doFilter = function () {
@@ -486,7 +491,7 @@
                     $scope.multi.promise =  $scope.dream.a;
                     var newtop3user = '' ;
                     angular.forEach($scope.dream.top3user, function(user) {  
-                    newtop3user= newtop3user +user.id+","
+                        newtop3user= newtop3user +user.id+","
                     });   
                     if(top3user!=''&&newtop3user!=top3user){
                         //测试动画切换
@@ -538,7 +543,6 @@
 
             $scope.cacheShare = function(ev){
                 ev.stopPropagation();
-                debugger;
                 $scope.toshare = false;
             };
 
@@ -669,7 +673,6 @@
                 msg.text("发送成功",1000);
 
             });
-            $scope.collectionDream(1);
 
         };
 

miaomiao/www/js/controllers/my.js

@@ -324,12 +324,12 @@
                     to_user_id: $scope.item.id
                 };
                 myService.sendLetter(data).then(function (result) {
-                    msg.success('回复成功');
+                    msg.success('发送成功');
                     $scope.vm.content = '';
                     $scope.item = null;
                     $scope.modal.hide();
                 }, function (error) {
-                    msg.error('回复失败');
+                    msg.error('发送失败');
                 });
             };
             $scope.hideModal = function(){
@@ -494,7 +494,7 @@
       
       $scope.ios={
         isIOS:ionic.Platform.isIOS(),
-        productid:''
+        productid:'apple100001'
       }
     
       //充值

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

@@ -171,12 +171,14 @@
                             </a>
                         </div>
                         <div class="item" style="border-bottom:15px solid #F2F2F2;" ng-click="add_comment()" ng-repeat="interaction in dream.interactions">
-                            <div ng-click="replay($event,dream.user.nickname,dream.user.id,$index)">
-                                <img class="head" ng-src="{{dream.user.avatar | avator}}" />
+                            <div>
+                                <img ng-click="report($event,dream.id,interaction.id,dream.user_id)" class="head" ng-src="{{dream.user.avatar | avator}}" />
                                 <span class="utitle">{{dream.user.nickname}}</span>
-                                <!--<span class="utitle kz">{{dream.end_time | lastDate}}</span>-->
                                 <span class="utitle kz">{{dream.created_at}}</span>
-                                <p class="subtile" style="white-space:normal; color: #666666">{{interaction.title}}</p>
+                                <div ng-click="replay($event,dream.user.nickname,dream.user.id,$index)" style="text-align: right; padding-right: 10px; margin-top: -10px;"><span style="background: #00C3DA; color: #fff; padding: 1px 12px; border-radius: 10px; font-size: 12px;">留言</span></div>
+                                <div class="subtile" style="white-space:normal; width: 80%; color: #666666;">
+                                    {{interaction.title}}
+                                </div>
                                 <div class="picts item">
                                     <img class="slt" ng-click="openCommentPic(interaction.pic1,$event)" ng-src="{{interaction.pic1}}" ng-if="interaction.pic1" />
                                     <img class="slt" ng-click="openCommentPic(interaction.pic2,$event)" ng-src="{{interaction.pic2}}" ng-if="interaction.pic2" />
@@ -188,12 +190,12 @@
                                     <img class="slt" ng-click="openCommentPic(interaction.pic8,$event)" ng-src="{{interaction.pic8}}" ng-if="interaction.pic8" />
                                     <img class="slt" ng-click="openCommentPic(interaction.pic9,$event)" ng-src="{{interaction.pic9}}" ng-if="interaction.pic9" />
                                 </div>
-                                <div class="box banner" ng-if="interaction.video">
+                                <div class="box banner" style="margin-top: 10px;" ng-if="interaction.video">
                                     <video ng-src="{{ interaction.video | trustUrl}}" poster="{{ interaction.video+'.jpg' | videoPoster | trustUrl}}" width="100%" style="max-height: 400px;" class="centerme" controls="controls"></video>
                                 </div>
                             </div>
                             <div class="list">
-                                <div class="item" ng-repeat="c in interaction.comments" ng-click="replayOther($event,c.user_nickname,c.user_id,$parent.$parent.$index,$index)" ng-if="interaction.showmore||$index<4">
+                                <div class="item" ng-repeat="c in interaction.comments" ng-if="interaction.showmore||$index<4">
                                     <div class="row">
                                         <div class="col-20" style="text-align: right">
                                             <img ng-click="report($event,dream.id,interaction.id,c.user_id)" class="head" ng-src="{{c.user_avatar | avator}}" />
@@ -201,6 +203,7 @@
                                         <div class="col-80" style="border-bottom: 1px solid #E6E6E6">
                                             <span style="margin-top: 10px; display: inline-block;font-size: 12px">{{c.user_nickname}}</span>
                                             <span style="font-size: 12px" class="utitle kz">{{c.updated_at}}</span>
+                                            <div ng-click="replayOther($event,c.user_nickname,c.user_id,$parent.$parent.$index,$index)" style="text-align: right; padding-right: 10px;"><span style="color: #00C3DA; padding: 1px 12px; border-radius: 10px; font-size: 12px;">回复</span></div>
                                             <p style="white-space:normal; color: #666666;font-size: 12px">
                                                 <span ng-if="c.to_user_nickname&&c.to_user_nickname!=''&&c.to_user_nickname!=dream.user.nickname" style="font-size: 12px">
                                                     回复<span style="color:#333333;font-size: 12px"> {{c.to_user_nickname}}</span> ：

miaomiao/www/templates/home/index.html

@@ -65,10 +65,11 @@
                                 <div class="col col-10" style="margin-top: 7%" ng-click="next(1)">
                                     <i class="icon ion-ios-arrow-left" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
                                 </div>
-                                <div class="col" style="overflow: hidden;padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
-                                    <span class="subcontent" ng-repeat="user in index.users">
-                                        <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.other_user.avatar |avator}}" class="chosenClass" style="padding: 0.5%;" />
-                                    </span>
+                                <div class="col" style="overflow: hidden; padding:0 5px;" on-drag-right="next(2)" on-drag-left="next(1)">
+                                    <div style="position: relative; display: inline-block; width: 35%; text-align: center; height: 100%;" class="subcontent" ng-repeat="user in index.users">
+                                        <span style="border-radius: 100%; position: absolute; right: 5%; padding: 2px 5px; font-size: 13px; background-color: #EF4941;">新</span>
+                                        <img ng-click="clickAvatar(user.id,user.dream_id)" ng-if="$index<4" ng-src="{{user.avatar |avator}}" class="chosenClass" style="width: 70%;" />
+                                    </div>
                                 </div>
                                 <div class="col col-10" style="margin-top: 7%; text-align: right" ng-click="next(2)">
                                     <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>

miaomiao/www/templates/my/my-recharge.html

@@ -15,7 +15,7 @@
                         <div>剩余梦想币</div>
                         <div class="re-num">{{vm.coin}}</div>
                     </div>
-                    <div ng-show="showWithdraw" class="col col-33" style="padding: 30px 0 0 20px;display: none">
+                    <div ng-if="!ios.isIOS" class="col col-33" style="padding: 30px 0 0 20px;display: none">
                         <a ng-click="withdraw()" style="border: 1px solid #00C3DA; color: #00C3DA; padding: 5px 25px; border-radius: 30px;">提现</a>
                     </div>
                 </div>
@@ -39,30 +39,33 @@
                     </ion-radio> -->
                 </ion-list>      
             </div>
-          <div ng-if="ios.isIOS">
+            <div ng-if="ios.isIOS">
                 <div class="item" style="color: #969696; padding-top: 20px">
-                     请选择充值金额
-             </div>
-            <ion-list>
-                <ion-radio ng-repeat="product in products" ng-model="vm.number"  ng-value="product.productId">
-                  <span>{{product.title}}</span>
-                </ion-radio>
-                    <!-- 
-                <ion-radio ng-model="ios.productid" ng-value="'apple100001'">
-                    <span>充值6元</span>
-                </ion-radio>
-                <ion-radio ng-model="ios.productid" ng-value="'apple100002'">
-                    <span>充值50元</span>
-                </ion-radio>
-                <ion-radio ng-model="ios.productid" ng-value="'apple100003'">
-                  <span>充值188元</span>
-                </ion-radio>
-                <ion-radio ng-model="ios.productid" ng-value="apple100004">
-                    <span>充值898元</span>
-                </ion-radio> -->
-            
-            </ion-list> 
-          </div>
+                    请选择充值金额
+                </div>
+                <ion-list>
+                    <!-- <ion-radio ng-repeat="product in products" ng-model="vm.number"  ng-value="product.productId">
+                    <span>{{product.title}}</span>
+                    </ion-radio> -->
+                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100001'">
+                        <span>10梦想币</span>
+                        <span class="fr">1元</span>
+                    </ion-radio>
+                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100002'">
+                        <span>180梦想币+赠送5梦想币</span>
+                        <span class="fr">18元</span>
+                    </ion-radio>
+                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="'apple100003'">
+                        <span>680梦想币+赠送50梦想币</span>
+                        <span class="fr">68元</span>
+                    </ion-radio>
+                    <ion-radio style="color: #000000;" ng-model="ios.productid" ng-value="apple100004">
+                        <span>1280梦想币+赠送100梦想币</span>
+                        <span class="fr">128元</span>
+                    </ion-radio>
+                
+                </ion-list> 
+            </div>
         </div>
         <div class="padding">
             <button  class="button button-block button-calm" ng-click="charge(vm.number)">