Mike 7 سال پیش
والد
کامیت
9b22ff27e0

+ 3 - 1
miaomiao/www/css/style.css

xqd
@@ -694,7 +694,9 @@ a:visited,a:link{
     -webkit-transform: translate3d(0,0,0);
   }
 }
- 
+ .item.active, .item.activated{
+    background-color: #fff; 
+ }
 .bounce-animation {
   -webkit-animation: bounce ease-in 1; 
   animation: bounce ease-in 1;

+ 1 - 1
miaomiao/www/js/controllers/account.js

xqd
@@ -42,7 +42,7 @@
             userService.getVerifyCode($scope.vm.mobile).then(function (result) {
                 wait(50);
                 // $scope.returncode = result.data;
-                msg.success(result.data.data.verify_code);
+                if(result.data.data.verify_code)msg.success(result.data.data.verify_code);
             }, function (error) {
                 $scope.vm.waitSeconds = "获取验证码";
                 wait(0);

+ 27 - 27
miaomiao/www/js/controllers/home.js

xqd xqd xqd xqd
@@ -182,19 +182,19 @@
         };
 
         $scope.openSupport = function () {
-            msg.alert("支持乘数","支持乘数支持乘数支持乘数支持乘数");
-        };
-         $ionicModal.fromTemplateUrl('supportExplain.html', {
-             scope: $scope
-         }).then(function(modal) {
-             $scope.supportmodal = modal;
-         });
-         $scope.openSupportmodal = function() {
-             $scope.supportmodal.show();
-         };
-         $scope.closeSupportmodal = function() {
-             $scope.supportmodal.hide();
-         };
+            msg.alert("支持乘数说明","支持乘数支持乘数支持乘数支持乘数");
+        };
+         // $ionicModal.fromTemplateUrl('supportExplain.html', {
+         //     scope: $scope
+         // }).then(function(modal) {
+         //     $scope.supportmodal = modal;
+         // });
+         // $scope.openSupportmodal = function() {
+         //     $scope.supportmodal.show();
+         // };
+         // $scope.closeSupportmodal = function() {
+         //     $scope.supportmodal.hide();
+         // };
         $scope.multi = {
             a: '',
             b: '',
@@ -304,7 +304,7 @@
 
         $scope.collectionDream = function(is_collection){
             homeService.collectionDream(id,is_collection).then(function(result){
-                //$scope.dream.is_collection=result.data.data;
+                $scope.dream.is_collection=result.data.data;
             })
         };
 
@@ -480,19 +480,19 @@
                     msg.hide();
                 });
             };
-             $ionicModal.fromTemplateUrl('supportExplain.html', {
-                 scope: $scope
-             }).then(function(modal) {
-                 $scope.supportmodal = modal;
-             });
-             $scope.openSupportmodal = function() {
-                 $scope.supportmodal.show();
-             };
-             $scope.closeSupportmodal = function() {
-                 $scope.supportmodal.hide();
-             };
+             // $ionicModal.fromTemplateUrl('supportExplain.html', {
+             //     scope: $scope
+             // }).then(function(modal) {
+             //     $scope.supportmodal = modal;
+             // });
+             // $scope.openSupportmodal = function() {
+             //     $scope.supportmodal.show();
+             // };
+             // $scope.closeSupportmodal = function() {
+             //     $scope.supportmodal.hide();
+             // };
             $scope.openSupport = function () {
-                msg.alert("支持乘数","支持乘数支持乘数支持乘数支持乘数");
+                msg.alert("支持乘数说明","支持乘数支持乘数支持乘数支持乘数");
             };
             $scope.multi = {
                 a: '',
@@ -789,7 +789,7 @@
             $state.go('app.home_dreamdetail',{id:id});
         };
         $scope.toUser = function (id) {
-            $state.go('app.home_dreamdetail',{id:id});
+            $state.go('app.home_userDetail',{id:id});
         };
    
         $scope.$on('$ionicView.beforeEnter', function () {

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

xqd xqd
@@ -73,7 +73,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="item" style="padding:5px; border-top: 1px solid #E6E6E6;">
+                <div class="item" style="padding:0 5px; border-top: 1px solid #E6E6E6;">
                     <div class="row">
                         <div class="col" style="text-align:left">
                             <p style="color: #FF6600; font-size: 16px">{{dream.get_coin}}</p>
@@ -102,10 +102,10 @@
                         </div>
                     </div>
                 </div>
-                <div ng-if="dream.top3user.length==0">
+                <div ng-if="dream.top3user.length==0" style="background: #f6f6f6;">
                     <div class="row" >
-                        <div class="col">
-                            <img src="img/pic_leaves.png" style="height: 100%; width: 100%">
+                        <div class="col" align="center">
+                            <img src="img/pic_leaves.png">
                         </div>
                     </div>
                 </div>

+ 2 - 2
miaomiao/www/templates/my/my-dream.html

xqd
@@ -1,11 +1,11 @@
 <ion-view view-title="瞄喵">
     <ion-nav-buttons side="right">
-        <button class="button button-clear homeIcon" ui-sref="app.my_message">
+<!--         <button class="button button-clear homeIcon" ui-sref="app.my_message">
             <img src="img/icon_message_h.svg" style="height: 100%; width: 100%">
         </button>
         <button class="button button-clear button-small" style="padding-top: 3px;">
             <img src="img/icon_share.svg" style="height: 16px; width: 20px;">
-        </button>
+        </button> -->
     </ion-nav-buttons>
     <ion-content>
        <div ng-repeat="dream in dreams" ng-if="100*dream.get_coin/dream.coin!=100" class="list">