YanaDH 8 years ago
parent
commit
05b8508ce5

+ 7 - 10
miaomiao/www/css/style.css

@@ -460,23 +460,19 @@ padding-right:3px;
     width:100%;
     width:100%;
     bottom:0;
     bottom:0;
     z-index:888;
     z-index:888;
-    background-color:#F7F7F7;
+    background-color:#fff;
     font-size:1.2rem;
     font-size:1.2rem;
 }
 }
 .detail-like .box {
 .detail-like .box {
-    border:1px solid  #EAEAEA;
+    border:2px solid  #EAEAEA;
     background: #fff;
     background: #fff;
-    color: #CECECE;
-    padding: 15px 1%;
+    padding: 5px 2%;
     margin:2%;
     margin:2%;
+    border-radius: 20px;
     text-align:center;
     text-align:center;
 }
 }
-.detail-like .box em{
-    font-size:16px;
-    color:#00C3DA;
-}
 .detail-like .selected{
 .detail-like .selected{
-    border:1px solid  #00C3DA;
+    border:2px solid  #00C3DA;
 }
 }
 .detail-like .send {
 .detail-like .send {
     font-size:1.2rem;
     font-size:1.2rem;
@@ -485,7 +481,8 @@ padding-right:3px;
     padding: 0 1rem;
     padding: 0 1rem;
     margin-bottom: 10px;
     margin-bottom: 10px;
 }
 }
-.detail-like .send span{
+
+.detail-like .send div{
     /*position:relative;*/
     /*position:relative;*/
     color: #929292;
     color: #929292;
     top:15px;
     top:15px;

+ 22 - 0
miaomiao/www/js/controllers/home.js

@@ -39,7 +39,23 @@
             users: [],
             users: [],
             dreams:[]
             dreams:[]
         };
         };
+        $scope.next=function(type){
+            debugger;
+            //type:1 前一个,type:2 后一个
+            if($scope.index.users.length>0){
 
 
+                if(type==1)
+                {
+                   var temp=  $scope.index.users.splice(0,1);
+                    $scope.index.users.splice($scope.index.users.length-1,1,temp);
+
+                }
+                if (type==2){
+                    var temp= $scope.index.users.splice($scope.index.users.length-1,1);
+                    $scope.index.users.splice(0,1,temp);
+                }
+            }
+        }
         $scope.load = function (init) {
         $scope.load = function (init) {
             if (init) {
             if (init) {
                 $scope.filter.pageIndex = 1;
                 $scope.filter.pageIndex = 1;
@@ -104,6 +120,12 @@
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
         , function ($scope, $state,$ionicModal, storage , msg, common, config, homeService, $ionicTabsDelegate, $stateParams, $ionicModal, $timeout, $ionicScrollDelegate, $interval) {
         var id = $stateParams.id;
         var id = $stateParams.id;
         var top3user = '';
         var top3user = '';
+
+            $scope.chosedIndex = 0;
+            $scope.clickAvatar = function(index){
+                $scope.chosedIndex = index;
+            };
+
         // id=5;
         // id=5;
         $scope.load = function (id) {
         $scope.load = function (id) {
             msg.loading();
             msg.loading();

+ 73 - 17
miaomiao/www/templates/home/dream-detail.html

@@ -285,36 +285,92 @@
     </script>
     </script>
     </ion-content>
     </ion-content>
     <div class="detail-like" ng-if="tosupport">
     <div class="detail-like" ng-if="tosupport">
+        <div style="text-align: center; border-bottom: 3px solid #1E1D1C">
+            <img src="img/img_miao.png" style="width: 25%; height: 55px;margin-bottom: -13px">
+        </div>
         <div>
         <div>
             <div class="row">
             <div class="row">
-                <div class="col box {{index==1?'selected':''}}" ng-click="changeIndex(1)" ng-model="coin">
-                    <em>5个</em>虚拟币
-                </div>
                 <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
                 <div class="col box {{index==2?'selected':''}}" ng-click="changeIndex(2)" ng-model="coin">
-                    <em>10个</em>虚拟币
+                    <div style="float:left; width: 40%; margin-right: 8%">
+                        <img src="img/icon_kiss.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        20
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
                 </div>
                 </div>
-                <div class="col box {{index==3?'selected':''}}" ng-click="changeIndex(3)" ng-model="coin">
-                    <em>20个</em>虚拟币
+                <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
+                    <div style="float:left; width: 40%; margin-right: 8%">
+                        <img src="img/icon_candy.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        50
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
+                </div>
+                <div class="col box {{index==10?'selected':''}}" ng-click="changeIndex(10)" ng-model="coin">
+                    <div style="float:left; width: 40%; margin-right: 2%">
+                        <img src="img/icon_balloon.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        100
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
-                <div class="col box {{index==4?'selected':''}}" ng-click="changeIndex(4)" ng-model="coin">
-                    <em>50个</em>虚拟币
+                <div class="col box {{index==20?'selected':''}}" ng-click="changeIndex(20)" ng-model="coin">
+                    <div style="float:left; width: 40%; margin-right: 0.5%">
+                        <img src="img/icon_rose.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        200
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
                 </div>
                 </div>
-                <div class="col box {{index==5?'selected':''}}" ng-click="changeIndex(5)" ng-model="coin">
-                    <em>100个</em>虚拟币
+                <div class="col box {{index==30?'selected':''}}" ng-click="changeIndex(30)" ng-model="coin">
+                    <div style="float:left; width: 40%; margin-right: 0.5%">
+                        <img src="img/icon_haert.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        300
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
                 </div>
                 </div>
-                <div class="col box {{index==6?'selected':''}}" ng-click="changeIndex(6)" ng-model="coin">
-                    <em>200个</em>虚拟币
+                <div class="col box {{index==50?'selected':''}}" ng-click="changeIndex(50)" ng-model="coin">
+                    <div style="float:left; width: 40%; margin-right: 2.3%">
+                        <img src="img/icon_diamond.png" style="width: 100%;">
+                    </div>
+                    <div style="float:left; color: #000;font-size: 16px; margin-top: 12%; margin-right: 3%">
+                        500
+                    </div>
+                    <div style="float:left; width: 20%; margin-top: 15%;">
+                        <img src="img/icon_gold.svg" style="width: 100%">
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
-            
         </div>
         </div>
         <div class="send">
         <div class="send">
-            <span>余额:<img src="img/icon_gold.svg" />{{dream.user_coin}}</span>&nbsp;
-            <div class="calm" ng-click="openRechargeModal()" style="height: 300px">
-                <!--<img src="img/icon_ recharge.png" />-->
-                <span style="vertical-align:middle;"><img src="img/icon_ recharge.png"></span>
+            <div style="float:left;">余额:
+                <span style="width: 60px;">
+                    <img src="img/icon_gold.svg"/>
+                </span>
+                {{dream.user_coin}}
+            </div>&nbsp;
+            <div class="calm" ng-click="openRechargeModal()" style="float: left;">
+                <div style="float:left; padding-top: 4px;">
+                    <img src="img/icon_ recharge.png">
+                </div>
                 <em>充值</em>
                 <em>充值</em>
             </div>
             </div>
             <span style="height:100%;float: right;">
             <span style="height:100%;float: right;">

+ 3 - 3
miaomiao/www/templates/home/index.html

@@ -37,15 +37,15 @@
                 </ion-slide-page>
                 </ion-slide-page>
             </ion-slides>
             </ion-slides>
             <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA; height: 90px">
             <div class="row" ng-if="index.users.length>0" style="background: #FAFAFA; height: 90px">
-                <div class="col col-10" style="margin-top: 7%">
-                    <i class="icon ion-ios-arrow-left" ng-click="change('next')" style="font-size: 1.5rem; color: #00C3DA; line-height: 100%"></i>
+                <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>
                 <div class="col" ng-click="change('back')" style="overflow: hidden;">
                 <div class="col" ng-click="change('back')" style="overflow: hidden;">
                      <span class="subcontent">
                      <span class="subcontent">
                         <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar}}" ng-repeat="user in index.users" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 2px;"/>
                         <img ng-click="clickAvatar($index)" ng-if="$index<4" ng-src="{{user.avatar}}" ng-repeat="user in index.users" ng-class="{'defaultClass':$index !=chosedIndex,'chosenClass':$index ==chosedIndex}" style="padding: 2px;"/>
                      </span>
                      </span>
                 </div>
                 </div>
-                <div class="col col-10" style="margin-top: 7%; text-align: right">
+                <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>
                     <i class="icon ion-ios-arrow-right" style="font-size: 1.5rem; color: #00C3DA;"></i>
                 </div>
                 </div>
             </div>
             </div>